Merge branch 'master' into ma

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -64,7 +64,7 @@
                   </span>
               </p>
             </div>
-             <!-- 满减展示 -->
+            <!-- 满减展示 -->
             <div class="item-price-row" v-if="promotionMap['FULL_DISCOUNT']">
               <p>
                 <span class="item-price-title">促&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;销</span>
@@ -111,7 +111,7 @@
               <span class="inventory"> 库存{{skuDetail.quantity}}</span>
             </div>
           </div>
-          <div class="item-select">
+          <div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'">
             <div class="item-select-title">
               <p>重量</p>
             </div>
@@ -119,10 +119,10 @@
               <span class="inventory"> {{skuDetail.weight}}kg</span>
             </div>
           </div>
-          <div class="add-buy-car" v-if="$route.query.way === 'POINT'">
+          <div class="add-buy-car" v-if="$route.query.way === 'POINT' && skuDetail.isAuth === 'PASS'">
             <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="pointPay">积分购买</Button>
           </div>
-          <div class="add-buy-car" v-else>
+          <div class="add-buy-car" v-if="$route.query.way !== 'POINT' && skuDetail.isAuth === 'PASS'">
             <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="addShoppingCartBtn">加入购物车</Button>
             <Button type="warning" :loading="loading1" :disabled="skuDetail.quantity === 0" @click="buyNow">立即购买</Button>
           </div>

buyer/src/components/verify/index.vue

@@ -98,14 +98,14 @@ export default {
     }
   },
   created () {
-    this.getImg();
+    // this.getImg();
   },
   watch: {
     verifyType: {
       immediate: true,
       handler: function (v) {
         this.type = v;
-        this.refresh();
+        // this.refresh();
       }
     },
     show (v) {

buyer/src/pages/home/memberCenter/Favorites.vue

@@ -30,13 +30,13 @@
     </div>
     <empty v-else />
     <!-- 分页 -->
-    <div class="page-size mt_10" v-if="paging">
+    <!-- <div class="page-size mt_10" v-if="paging">
       <Page :total="total" @on-change="changePageNum"
         @on-page-size-change="changePageSize"
         :page-size="params.pageSize"
         show-sizer>
       </Page>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -61,7 +61,7 @@ export default {
       total: 0, // 收藏总数
       params: { // 请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 100,
         type: 'GOODS'
       },
       spinShow: false // 加载状态

buyer/src/pages/home/orderCenter/OrderDetail.vue

@@ -3,6 +3,7 @@
     <card _Title="订单详情" :_Size="16"></card>
     <div class="order-card">
       <p class="global_color fontsize_18">{{ order.orderStatusValue }}</p>
+      <p class="global_color fontsize_16" v-if="order.orderStatusValue === '待核验'">核验码：{{order.orderCode || 'AHDN4123'}}</p>
       <p class="global_color">订单号：{{ order.order.sn }}</p>
       <div style="color:#999;" class="operation-time">操作时间：{{order.order.updateTime}}</div>
       <Steps class="progress" :current="progressList.length" direction="vertical">
@@ -22,8 +23,8 @@
     </div>
     <div class="order-card">
       <h3>付款信息</h3>
-      <p>支付方式：在线支付</p>
-      <p>付款状态：未付款</p>
+      <p>支付方式：{{order.paymentMethodValue}}</p>
+      <p>付款状态：{{order.payStatusValue}}</p>
     </div>
     <div class="order-card">
       <h3>配送信息</h3>

buyer/src/pages/home/userCenter/MyTracks.vue

@@ -15,6 +15,14 @@
         </span>
       </li>
     </ul>
+    <!-- 分页 -->
+    <div class="page-size">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
   </div>
 </template>
 
@@ -25,7 +33,14 @@ export default {
   data () {
     return {
       list: [], // 我的足迹，商品列表
-      spinShow: false // 控制loading是否加载
+      spinShow: false, // 控制loading是否加载
+      params: {
+        pageNumber: 1,
+        pageSize: 30,
+        order: 'desc',
+        sort: 'createTime'
+      },
+      total: 0
     };
   },
   mounted () {
@@ -71,7 +86,16 @@ export default {
         }
       })
     },
-    getList () {
+    changePageNum (val) { // 修改页码
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) { // 修改页数
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    getList () { // 获取足迹列表
       this.spinShow = true;
       tracksList(this.params).then(res => {
         this.spinShow = false

manager/src/views/my-components/verify/index.vue

@@ -98,14 +98,14 @@ export default {
     }
   },
   created () {
-    this.getImg();
+    // this.getImg();
   },
   watch: {
     verifyType: {
       immediate: true,
       handler: function (v) {
         this.type = v;
-        this.refresh();
+        // this.refresh();
       }
     },
     show (v) {

seller/src/views/my-components/verify/index.vue

@@ -98,14 +98,14 @@ export default {
     }
   },
   created () {
-    this.getImg();
+    // this.getImg();
   },
   watch: {
     verifyType: {
       immediate: true,
       handler: function (v) {
         this.type = v;
-        this.refresh();
+        // this.refresh();
       }
     },
     show (v) {