上传

pageC/applicationRefund/applicationRefund.vue

@@ -24,10 +24,12 @@
           </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.refund.refund_price.split(".")[0]
+            }}</text
             >.
             <text style="font-size: 20rpx">{{
-              goodsDetail.goods.price.split(".")[1]
+              goodsDetail.goods.refund.refund_price.split(".")[1]
             }}</text>
           </view>
         </view>

pageD/logisticsProgress/logisticsProgress.vue

@@ -10,7 +10,18 @@
     <view class="logistics">
       <view class="package" v-if="packageNum > 1">
         <view class="package-title">您的订单已被分成多个包裹发出：</view>
-        <view></view>
+        <view class="package-list">
+          <view class="package-content"
+            ><image
+              class="package-img"
+              src="../../static/mine/356.png"
+              mode="scaleToFill"
+            /><view>
+              <view class="title-first">包裹一</view
+              ><view class="title-last">运送中</view>
+            </view></view
+          >
+        </view>
       </view>
 
       <view class="warehouse-packaging" v-if="warehouse.length > 0">
@@ -177,12 +188,39 @@ export default {
   .logistics {
     background-color: #fff;
     border-radius: 16rpx;
-    padding: 0 20rpx;
+    padding: 20rpx 20rpx;
     position: relative;
     top: -20rpx;
-    padding-bottom: 20rpx;
     .package {
-      margin-top: 20rpx;
+      .package-title {
+        font-size: 24rpx;
+        color: #222222;
+      }
+      .package-list {
+        display: flex;
+        .package-content {
+          width: 172rpx;
+          height: 88rpx;
+          border-radius: 12rpx;
+          border: 2rpx solid #ff1515;
+          display: flex;
+          align-items: center;
+          justify-content: space-around;
+          margin-right: 20rpx;
+
+          .package-img {
+            width: 36rpx;
+            height: 36rpx;
+          }
+          .title-first {
+            font-size: 26rpx;
+            font-weight: 600;
+          }
+          .title-last {
+            font-size: 20rpx;
+          }
+        }
+      }
     }
 
     ._detail-1 {

pageD/orderDetail/orderDetail.vue

@@ -78,38 +78,17 @@
           {{ transportType }}
         </view>
       </view>
-      <!-- <view class="order-number">
-        <text> 包裹类型 </text>
-        <view> 海运 </view>
-      </view> -->
-      <!-- <view class="order-number">
-        <text> 包裹数量 </text>
-        <view> 210 </view>
-      </view> -->
     </view>
     <view
       class="footer"
       v-if="
         orderDetail.status != 'undelivered' &&
-        orderDetail.status != 'undifference'
+        orderDetail.status != 'undifference' &&
+        orderDetail.status != 'unfill'
       "
     >
       <button
         class="status-2"
-        @click="toPay"
-        v-if="orderDetail.status == 'unfill'"
-      >
-        缴纳保证金
-      </button>
-      <!-- <button
-        class="status-1"
-        v-if="orderDetail.status == 'merdelivered'"
-        @click="addRemark"
-      >
-        备注
-      </button> -->
-      <button
-        class="status-2"
         @click="toSendOutGoods"
         v-if="orderDetail.status == 'merdelivered'"
       >
@@ -129,6 +108,18 @@
         立即付款
       </button> -->
     </view>
+    <view
+      class="footer"
+      v-else-if="orderDetail.goods[0].delivery_status == 'unfill'"
+    >
+      <button
+        class="status-2"
+        @click="toPay"
+        v-if="orderDetail.goods[0].delivery_status == 'unfill'"
+      >
+        缴纳保证金
+      </button></view
+    >
 
     <Remark :show="remarkShow" @remarkClose="remarkClose" />
   </view>

pageD/orderFormManage/component/detailCard.vue

@@ -18,7 +18,7 @@
         <view class="detail-right">
           <view class="title-price">
             <view class="title"> {{ item.goods_name }}</view>
-            <view class="price">
+            <view class="price" v-if="item.sku_item">
               <text style="font-size: 20rpx">￥</text>
               <text>{{ item.sku_item.price.split(".")[0] }}</text
               >.
@@ -66,7 +66,7 @@
     >
       <button
         class="btn-1"
-        v-if="itemInfo.simplify_status == 'unfill'"
+        v-if="itemInfo.order_goods[0].delivery_status == 'unfill'"
         @click.stop="toBond"
       >
         缴纳保证金

unpackage/dist/dev/mp-weixin/pageD/logisticsProgress/logisticsProgress.wxss

@@ -46,13 +46,37 @@
 .page .logistics.data-v-9bf9d84e {
   background-color: #fff;
   border-radius: 16rpx;
-  padding: 0 20rpx;
+  padding: 20rpx 20rpx;
   position: relative;
   top: -20rpx;
-  padding-bottom: 20rpx;
 }
-.page .logistics .package.data-v-9bf9d84e {
-  margin-top: 20rpx;
+.page .logistics .package .package-title.data-v-9bf9d84e {
+  font-size: 24rpx;
+  color: #222222;
+}
+.page .logistics .package .package-list.data-v-9bf9d84e {
+  display: flex;
+}
+.page .logistics .package .package-list .package-content.data-v-9bf9d84e {
+  width: 172rpx;
+  height: 88rpx;
+  border-radius: 12rpx;
+  border: 2rpx solid #ff1515;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  margin-right: 20rpx;
+}
+.page .logistics .package .package-list .package-content .package-img.data-v-9bf9d84e {
+  width: 36rpx;
+  height: 36rpx;
+}
+.page .logistics .package .package-list .package-content .title-first.data-v-9bf9d84e {
+  font-size: 26rpx;
+  font-weight: 600;
+}
+.page .logistics .package .package-list .package-content .title-last.data-v-9bf9d84e {
+  font-size: 20rpx;
 }
 .page .logistics ._detail-1.data-v-9bf9d84e {
   display: flex;