下线星星兑换活动

src/components/buy/address.vue

 <template>
   <div class="address">
-    <mt-header title="添加地址">
+    <mt-header style="background: #F93021" title="添加地址">
         <mt-button icon="back" slot="left" @click="closeAdd();buttonClick('返回')">返回</mt-button>
     </mt-header>
-    <mt-field label="收货人" v-model="receiveName"></mt-field>
-    <mt-field label="手机号" v-model="receiveMobile"></mt-field>
-    <mt-cell title="所在地区" :value="addressArea" @click.native="showPicker" is-link></mt-cell>
-    <mt-field label="详细地址" v-model="address"></mt-field>
-    <div @click="onSave();buttonClick('保存地址')" class="btn">保存</div>
+    <div style="padding: 10px">
+      <mt-field label="收货人" v-model="receiveName"></mt-field>
+      <mt-field label="手机号" v-model="receiveMobile"></mt-field>
+      <mt-cell title="所在地区" :value="addressArea" @click.native="showPicker" is-link></mt-cell>
+      <mt-field label="详细地址" v-model="address"></mt-field>
+      <div @click="onSave();buttonClick('保存地址')" class="btn">保存并使用</div>
+    </div>
     <my-address :showAddressPicker="showAddressPicker" @save-address="saveAddress" @hide-picker="hidePicker" :init="addressArea">
     </my-address>
   </div>
@@ -115,6 +117,7 @@ export default {
 }
 </script>
 <style scoped lang="less">
+  @import "../../util/public";
   image[lazy=loading] {
     width: 140px;
     height: 300px;
@@ -133,14 +136,20 @@ export default {
       height: 11.73333vw;
       line-height: 11.73333vw;
       color: #fff;
-      font-size: 1.4rem;
       text-align: center;
-      background: #60ADF0;
+      background: #F93021;
       -webkit-box-shadow: 0 2px 6.66667vw 0 rgba(200, 205, 220, 0.7);
       box-shadow: 0 2px 6.66667vw 0 rgba(200, 205, 220, 0.7);
       border-radius: 20px;
       margin-left: 1rem;
       margin-right: 1rem;
+      width: 85vw;
+      font-size:14*@toVw;
+      font-family:PingFang-SC-Medium;
+      font-weight:500;
+      color:rgba(255,255,255,1);
+      position: fixed;
+      bottom: 20*@toVw;
     }
   }
 

src/components/buy/buy.vue

@@ -15,41 +15,37 @@
     <div class="block-title">订单信息</div>
     <div class="shop-block" v-if="groupDetail.goods_desc">
       <div class="shop">
-        <div class="img-block">
-          <img :src="groupDetail.goods_desc.img[0].url">
-        </div>
         <div>
-          <div class="title">
-            {{groupDetail.name}}
-          </div>
-          <div class="content">
-            {{groupDetail.goods_desc.desc}}
-          </div>
           <div class="price" v-if="!type">
-             ￥{{groupDetail.current_price/100}}
-          </div>
+          ￥{{groupDetail.current_price/100}}
+        </div>
           <div class="price" v-if="type">
-             ￥{{groupDetail.original_price/100}}
+            ￥{{groupDetail.original_price/100}}
           </div>
+          <div class="title">
+            {{groupDetail.name}}
+          </div>
+
         </div>
       </div>
     </div>
-    <div class="you-block" v-if="groupDetail.goods_type !== 4 &&( saleObj || canSale )" @click="buttonClick('功能','显示优惠券');showSale()">
-      优惠券<img :src="youHuiUrl">
-      <div class="you-content">
-        <span v-if="!saleObj && !canSale">暂无可用</span>
-        <span v-if="!saleObj && canSale" style="color: #F83534">有可用优惠</span>
-        <span v-if="saleObj" style="color: #F83534">-{{saleObj.money | price}}</span>
-        >
+    <div v-if="groupDetail.goods_type !== 4 &&( saleObj || canSale )">
+      <div class="block-title">优惠券</div>
+      <div class="you-block" @click="buttonClick('功能','显示优惠券');showSale()">
+        优惠券<img :src="youHuiUrl">
+        <div class="you-content">
+          <span v-if="!saleObj && !canSale">暂无可用</span>
+          <span v-if="!saleObj && canSale" style="color: #F83534">有可用优惠</span>
+          <span v-if="saleObj" style="color: #F83534">-{{saleObj.money | price}}</span>
+          >
+        </div>
       </div>
     </div>
-    <footer>
-      <!--<div v-if="groupDetail.is_real !== 1" class="phone-block">-->
-      <!--<input placeholder="请输入手机号" class="phone-input" v-model="mobile"/>-->
-      <!--</div>-->
 
+    <footer>
       <div class="sub-block">
         <span>￥{{priceTotal}}</span>
+        <span class="tips-price" v-if="groupDetail.goods_desc">{{groupDetail.goods_desc.tips?groupDetail.goods_desc.tips:''}}</span>
         <div class="pay-btn" @click="payOrder(orderFlag)">确认支付</div>
       </div>
     </footer>
@@ -318,7 +314,8 @@
   .you-block{
     line-height: 40 * @toVw;
     height: 40 * @toVw;
-    padding: 0 15 * @toVw;
+    padding: 5*@toVw 15 * @toVw;
+    background: white;
     img{
       width: 16 * @toVw;
       vertical-align: middle;
@@ -395,24 +392,10 @@
     }
     .shop-block{
       background: white;
+      padding:5*@toVw 10*@toVw;
       .shop{
         padding: 20/7.5vw;
-        border-bottom: 1px solid #d8d8d8;
         position: relative;
-        &:after{
-          content:'';
-          display: block;
-          clear: both;
-        }
-        .img-block{
-          float: left;
-          margin-right: 20/7.5vw;
-          img{
-            width: 250/7.5vw;
-          }
-          min-height: 120px;
-        }
-
         .title{
           font-size: 18px;
           overflow: hidden;
@@ -421,34 +404,36 @@
           color: #333333;
           margin-bottom: 5/7.5vw;
         }
-        .content{
-          font-size: 12px;
-          line-height: 1.4em;
-          color: #CCCCCC;
-          height: 4.2em;
-          overflow: hidden;
-
-        }
         .price{
           font-size: 18px;
-          color: #FF001F;
-          position: absolute;
-          left: 300/7.5vw;
-          bottom: 20/7.5vw;
+          float: right;
         }
       }
     }
     footer{
       position: fixed;
+      background: white;
       bottom: 0;
       width: 100%;
       .sub-block{
         border-top: 1px solid #d8d8d8;
         padding-left: 20/7.5vw;
         line-height: 100/7.5vw;
+        .tips-price{
+          font-size: 16*@toVw;
+          display: inline-block;
+          vertical-align: middle;
+          max-width: 135*@toVw;
+          font-family:PingFang-SC-Medium;
+          font-weight:500;
+          color:rgba(255,66,88,1);
+          white-space: nowrap;
+          text-overflow:ellipsis;
+          overflow:hidden;
+        }
       }
       span{
-        font-size: 20px;
+        font-size: 24*@toVw;
         color: #F83534;
       }
       .pay-btn{