Merge branch 'dev' of http://git.singsingenglish.com/new-sing/wechat into dev

src/components/logistics.vue

@@ -21,7 +21,11 @@
           <div class="item-content">
             <div class="dl">
               <div class="dt">收件地址：</div>
-              <div class="dd">{{item.receive_address}}</div>
+              <div class="dd">
+                <template v-if="item.receive_name">{{item.receive_name}}</template>
+                <template v-if="item.receive_mobile">{{item.receive_mobile}}</template>
+                <template v-if="item.receive_address">{{item.receive_address}}</template>
+              </div>
             </div>
             <div class="dl">
               <div class="dt">物流信息：</div>
@@ -131,10 +135,9 @@
         //border-bottom: solid 1*@toVw #E2E2E2;
         border-bottom: solid 0.55px #E2E2E2;
         h2 {
-          height:20*@toVw;
+          line-height:20*@toVw;
           font-size:14*@toVw;
           color:rgba(51,51,51,1);
-          line-height:20*@toVw;
           font-weight: normal;
           & + h2 {
             margin-top: 4*@toVw;