From b3863568d6ed6cf26ab180e18262d369d291c180 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 25 Jun 2021 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/goodsDetail/ShowGoods.vue   |  9 ++++++---
 buyer/src/pages/home/orderCenter/OrderDetail.vue | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index e9b2b40e..4378d9ac 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -123,7 +123,7 @@
             <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="pointPay">积分购买</Button>
           </div>
           <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="error" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'" :loading="loading" :disabled="skuDetail.quantity === 0" @click="addShoppingCartBtn">加入购物车</Button>
             <Button type="warning" :loading="loading1" :disabled="skuDetail.quantity === 0" @click="buyNow">立即购买</Button>
           </div>
 
@@ -199,7 +199,6 @@ export default {
         skuId: this.skuDetail.id
       };
       this.loading = true;
-      console.log(11111111);
       addCartGoods(params).then(res => {
         debugger;
         this.loading = false;
@@ -219,11 +218,15 @@ export default {
         skuId: this.skuDetail.id,
         cartType: 'BUY_NOW'
       };
+      // 虚拟商品购买
+      if (this.skuDetail.goodsType === 'VIRTUAL_GOODS') {
+        params.cartType = 'VIRTUAL'
+      }
       this.loading1 = true;
       addCartGoods(params).then(res => {
         this.loading1 = false;
         if (res.success) {
-          this.$router.push({path: '/pay', query: {way: 'BUY_NOW'}});
+          this.$router.push({path: '/pay', query: {way: params.cartType}});
         } else {
           this.$Message.warning(res.message);
         }
diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index a073cc4e..6ebc1468 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -2,8 +2,7 @@
   <div class="order-detail" v-if="order.order">
     <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 fontsize_18">{{ order.orderStatusValue }} <span class="verificationCode" v-if="order.order.verificationCode">核验码：{{order.order.verificationCode}}</span></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">
@@ -235,7 +234,12 @@ table {
     font-size: 20px;
   }
 }
-
+.verificationCode {
+  font-size: 16px;
+  margin-left: 240px;
+  color: rgb(65, 63, 63);
+  font-weight: bold;
+}
 /** 订单进度条 */
 .progress {
   margin: 15px 0;