Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

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

@@ -54,7 +54,7 @@
         ></Step>
       </Steps>
     </div>
-    <div class="order-card" v-if="order.order.deliveryMethod == 'LOGISTICS'">
+    <div class="order-card" v-if="order.order.deliveryMethod === 'LOGISTICS' && order.order.orderType !== 'VIRTUAL'">
       <h3>收货人信息</h3>
       <p>收货人：{{ order.order.consigneeName }}</p>
       <p>手机号码：{{ order.order.consigneeMobile | secrecyMobile }}</p>
@@ -63,7 +63,7 @@
         {{ order.order.consigneeDetail }}
       </p>
     </div>
-    <div class="order-card" v-if="order.order.deliveryMethod == 'SELF_PICK_UP'">
+    <div class="order-card" v-if="order.order.deliveryMethod === 'SELF_PICK_UP'">
       <h3>自提点信息</h3>
       <p>自提点名称：{{ order.order.storeAddressPath }}</p>
       <p>联系方式：{{ order.order.storeAddressMobile }}</p>
@@ -73,7 +73,7 @@
       <p>支付方式：{{ order.paymentMethodValue }}</p>
       <p>付款状态：{{ order.payStatusValue }}</p>
     </div>
-    <div class="order-card" v-if="!order.order.verificationCode">
+    <div class="order-card" v-if="!order.order.verificationCode && order.order.orderType !== 'VIRTUAL'">
       <h3>配送信息</h3>
       <p>配送方式：{{ order.deliveryMethodValue }}</p>
       <p v-if="order.order.deliveryMethod === 'LOGISTICS'">配送状态：{{ order.deliverStatusValue }}</p>
@@ -187,7 +187,7 @@
           ><span>{{ order.order.goodsPrice | unitPrice("￥") }}</span
           ><br />
         </div>
-        <div>
+        <div v-if="order.order.orderType !== 'VIRTUAL'">
           <span>运费：</span
           ><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span
           ><br />

buyer/src/pages/payment/Pay.vue

@@ -18,7 +18,7 @@
     <Divider />
     <div class="content width_1200">
       <!-- 收货地址 -->
-      <div class="address" v-if="selectedDeliverMethod === 'LOGISTICS'">
+      <div class="address" v-if="selectedDeliverMethod === 'LOGISTICS' && goodsType !== 'VIRTUAL_GOODS'">
         <div class="card-head">
           <span>收货人信息</span>
           <span @click="goAddressManage">管理收货人地址</span>
@@ -89,7 +89,7 @@
       </div>
       <div>
       </div>
-      <div class="goods-content">
+      <div class="goods-content" v-if="goodsType !== 'VIRTUAL_GOODS'">
         <div class="card-head mt_20 mb_20">
           <span>配送方式</span>
         </div>
@@ -227,7 +227,7 @@
         }}&nbsp;&nbsp;{{ selectedAddress.mobile }}
       </div>
       <div class="pay-address" v-if="addressList.length && selectedDeliverMethod === 'SELF_PICK_UP'">
-        自提地点：{{selectedStoreAddress.address}} &nbsp;&nbsp;联系方式：{{ selectedStoreAddress.mobile }} 
+        自提地点：{{selectedStoreAddress.address}} &nbsp;&nbsp;联系方式：{{ selectedStoreAddress.mobile }}
       </div>
     </div>
     <BaseFooter></BaseFooter>
@@ -266,6 +266,7 @@ export default {
       invoiceAvailable: false, // 发票编辑按钮
       showEditBtn: "", // 鼠标移入显示编辑按钮
       orderMark: "", // 订单备注
+      goodsType: "", // 商品类型
       storeMoreAddr: false,
       invoiceData: {
         // 发票数据
@@ -390,6 +391,9 @@ export default {
             this.goodsList = res.result.cartList;
             this.priceDetailDTO = res.result.priceDetailDTO;
             this.skuList = res.result.skuList;
+            if (res.result.skuList[0] && res.result.skuList[0].goodsSku) {
+              this.goodsType = res.result.skuList[0].goodsSku.goodsType;
+            }
             this.storeId = this.goodsList[0].storeId
             if (res.result.receiptVO) {
               this.invoiceData = res.result.receiptVO;

seller/src/views/shop/bill/billDetail.vue

@@ -325,7 +325,7 @@ export default {
                   return h("div", this.$options.filters.unitPrice(params.row.billPrice, "￥")
                   );
                 }else{
-                  return h("priceColorScheme", {props: {value: (0-params.row.finalPrice), color: this.$mainColor}});
+                  return h("priceColorScheme", {props: {value: (0-params.row.billPrice), color: this.$mainColor}});
                 }
               },
             },
@@ -337,7 +337,7 @@ export default {
           align: 'center',
           children: [{
             title: "补贴",
-            key: "billPrice",
+            key: "subsidy",
             render: (h, params) => {
               if (params.row.pointSettlementPrice == 0) {
                 return h("div", "-");
@@ -351,25 +351,25 @@ export default {
           },
             {
               title: "用户实付",
-              key: "billPrice",
+              key: "finalPrice",
-              render: (h, params) => {
-                if(params.row.flowType == "PAY"){
-                  return h("div", this.$options.filters.unitPrice(params.row.siteCouponCommission, "￥")
-                  );
-                }else{
-                  return h("priceColorScheme", {props: {value: (0-params.row.siteCouponCommission)}});
-                }
-              },
-            },
-            {
-              title: "合计",
-              key: "billPrice",
               render: (h, params) => {
                 if(params.row.flowType == "PAY"){
                   return h("div", this.$options.filters.unitPrice(params.row.finalPrice, "￥")
                   );
                 }else{
-                  return h("priceColorScheme", {props: {value: (0-params.row.billPrice)}});
+                  return h("priceColorScheme", {props: {value: (0-params.row.finalPrice)}});
+                }
+              },
+            },
+            {
+              title: "合计",
+              key: "total",
+              render: (h, params) => {
+                if(params.row.flowType == "PAY"){
+                  return h("div", this.$options.filters.unitPrice((params.row.finalPrice+(params.row.pointSettlementPrice+params.row.kanjiaSettlementPrice+params.row.siteCouponCommission)), "￥")
+                  );
+                }else{
+                  return h("priceColorScheme", {props: {value: (0-(params.row.finalPrice+(params.row.pointSettlementPrice+params.row.kanjiaSettlementPrice+params.row.siteCouponCommission)))}});
                 }
               },
             },
@@ -381,7 +381,7 @@ export default {
           align: 'center',
           children: [{
             title: "平台服务费",
-            key: "billPrice",
+            key: "commissionPrice",
             render: (h, params) => {
               if (params.row.commissionPrice == 0) {
                 return h("div", "-");
@@ -405,18 +405,6 @@ export default {
                 }else{
                   return h("priceColorScheme", {props: {value: (0-params.row.distributionRebate)}});
                 }
-
-                // if (params.row.distributionRebate == null) {
-                //   return h("div", "-");
-                // } else {
-                //   return h(
-                //     "div",
-                //     this.$options.filters.unitPrice(
-                //       params.row.distributionRebate,
-                //       "￥"
-                //     )
-                //   );
-                // }
               },
             },
             {