冲突

pageC/applicationRefund/applicationRefund.vue

@@ -24,10 +24,10 @@
           </view>
           <view class="commodity-price" v-if="goodsDetail.goods">
             <text style="font-size: 20rpx">￥</text>
-            <text>{{ goodsDetail.goods.price.split(".")[0] }}</text
+            <text>{{ goodsDetail.goods.discount_price.split(".")[0] }}</text
             >.
             <text style="font-size: 20rpx">{{
-              goodsDetail.goods.price.split(".")[1]
+              goodsDetail.goods.discount_price.split(".")[1]
             }}</text>
           </view>
         </view>

pageC/orderForm/component/orderInofrmation.vue

@@ -32,10 +32,10 @@
             <view class="commodity-title"> {{ item.goods.name_cn }} </view>
             <view class="commodity-price" v-if="item.sku_item">
               <text style="font-size: 20rpx">￥</text>
-              <text>{{ item.sku_item.price.split(".")[0] }}</text
+              <text>{{ item.discount_price.split(".")[0] }}</text
               >.
               <text style="font-size: 20rpx">{{
-                item.sku_item.price.split(".")[1]
+                item.discount_price.split(".")[1]
               }}</text>
             </view>
           </view>

pageC/orderForm/component/refundCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="detail" @click="$emit('toRefundDetail', itemInfo)">
+  <view class="detail">
     <view class="title">
       <view class="title-left">
         <image class="header-img" :src="itemInfo.image" mode=""></image>
@@ -31,7 +31,11 @@
         >平台介入</text
       >
     </view>
-    <view class="commodity-information" v-for="item in itemInfo.order_goods">
+    <view
+      class="commodity-information"
+      v-for="item in itemInfo.order_goods"
+      @click="$emit('toRefundDetail', item)"
+    >
       <view class="commodity-1" v-if="item.refund">
         <image class="commodity-img" :src="item.sku_item.image" mode=""></image>
         <view class="information-right">
@@ -82,14 +86,18 @@
                 删除记录</button
               ><button
                 class="status-2"
-                v-if="item.refund.status == 1 || item.refund.status == 0"
+                v-if="
+                  item.refund.status == 1 ||
+                  item.refund.status == 0 ||
+                  item.refund.status == 3
+                "
                 @click="$emit('toRefundDetail', item)"
               >
                 售后详情
               </button>
               <button
                 class="status-2"
-                v-if="item.refund.status == 2"
+                v-if="item.refund.status == 2 || item.refund.status == 3"
                 @click.stop="$emit('unreviewAfter', item)"
               >
                 继续申请
@@ -277,6 +285,7 @@ export default {
       height: 58rpx;
       line-height: 58rpx;
       border: 2rpx solid #f83224;
+      margin-left: 10rpx;
     }
   }
 }

pageC/orderForm/orderForm.vue

@@ -277,9 +277,13 @@ export default {
 
     //售后订单详情
     toRefundDetail(value) {
-      uni.navigateTo({
-        url: `/pageC/refundDetail/refundDetail?orderId=${value.order_goods[0].refund.id}`,
-      });
+      console.log(value);
+      return;
+      if (value.refund) {
+        uni.navigateTo({
+          url: `/pageC/refundDetail/refundDetail?orderId=${value.refund.id}`,
+        });
+      }
     },
 
     //删除售后订单

pageC/orderFormDetail/component/commodityDetail.vue

@@ -24,10 +24,10 @@
               <view class="commodity-title">{{ item.goods_name }} </view>
               <view class="commodity-price">
                 <text style="font-size: 20rpx">￥</text>
-                <text>{{ item.sku_item.price.split(".")[0] }}</text
+                <text>{{ item.discount_price.split(".")[0] }}</text
                 >.
                 <text style="font-size: 20rpx">{{
-                  item.sku_item.price.split(".")[1]
+                  item.discount_price.split(".")[1]
                 }}</text>
               </view>
             </view>

pageD/deliverGoods/deliverGoods.vue

@@ -238,6 +238,7 @@ export default {
 <style lang="scss" scoped>
 .page {
   padding: 20rpx 24rpx;
+  padding-bottom: 186rpx;
 
   .goods-detail {
     background-color: #fff;
@@ -352,6 +353,7 @@ export default {
   padding-bottom: 80rpx;
   height: 66rpx;
   width: 100%;
+  z-index: 10000;
 
   .status-2 {
     background-color: #f83224;

pageD/orderDetail/component/commodityDetail.vue

@@ -19,10 +19,10 @@
             <view class="commodity-title">{{ item.goods_name }} </view>
             <view class="commodity-price">
               <text style="font-size: 20rpx">￥</text>
-              <text>{{ item.sku_item.price.split(".")[0] }}</text
+              <text>{{ item.discount_price.split(".")[0] }}</text
               >.
               <text style="font-size: 20rpx">{{
-                item.sku_item.price.split(".")[1]
+                item.discount_price.split(".")[1]
               }}</text>
             </view>
           </view>

pageD/orderFormManage/component/detailCard.vue

@@ -20,10 +20,10 @@
             <view class="title"> {{ item.goods_name }}</view>
             <view class="price" v-if="item.sku_item">
               <text style="font-size: 20rpx">￥</text>
-              <text>{{ item.sku_item.price.split(".")[0] }}</text
+              <text>{{ item.discount_price.split(".")[0] }}</text
               >.
               <text style="font-size: 20rpx">{{
-                item.sku_item.price.split(".")[1]
+                item.discount_price.split(".")[1]
               }}</text>
             </view>
           </view>

pageD/orderInformation/orderInformation.vue

@@ -137,14 +137,7 @@
         <text class="_label-1">下单时间</text>
         <view class="num">{{ orderInformation.created_at }} </view>
       </view>
-      <view
-        class="order"
-        v-if="
-          orderInformation.status != 'domestic_undelivered' &&
-          orderInformation.status != 'domestic_delivered' &&
-          orderInformation.status != 'domestic_received'
-        "
-      >
+      <view class="order" v-if="isShowPayTime">
         <text class="_label-1">付款时间</text>
         <view class="num"> {{ orderInformation.paid_at }} </view>
       </view>
@@ -276,7 +269,31 @@ export default {
       show: false,
     };
   },
-  computed: {},
+  computed: {
+    //判断是否显示付款时间
+    isShowPayTime() {
+      if (
+        this.orderInformation.type == "group_package" ||
+        this.orderInformation.type == "mall_order"
+      ) {
+        if (
+          this.orderInformation.status == "packaging" ||
+          this.orderInformation.status == "group_unpaid" ||
+          this.orderInformation.status == "unpaid"
+        ) {
+          return false;
+        } else {
+          return true;
+        }
+      } else if (
+        this.orderInformation.status == "domestic_undelivered" ||
+        this.orderInformation.status == "domestic_delivered" ||
+        this.orderInformation.status == "domestic_received"
+      ) {
+        return false;
+      }
+    },
+  },
   onLoad(options) {
     this.orderStauts = options.orderStatus;
     this.getDetail();

pageD/paymentOrder/paymentOrder.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="page">
     <view class="_top">
-      <view class="select" v-if="payType == 'customer'">
+      <view class="select" v-if="payType == 'customer_service'">
         <uni-section title="本地数据" type="line">
           <uni-data-select
             v-model="value"
@@ -83,7 +83,7 @@
         mode=""
       ></image>
     </view>
-    <view class="pay" @click="switchType('customer')">
+    <view class="pay" @click="switchType('customer_service')">
       <view style="display: flex">
         <image
           class="balance-icon"
@@ -98,7 +98,7 @@
         </view>
       </view>
       <image
-        v-if="payType == 'customer'"
+        v-if="payType == 'customer_service'"
         class="select"
         src="../../static/mine/342.png"
         mode=""