更改退款金额

pageC/myPackage/component/packageCard.vue

@@ -55,7 +55,7 @@
             itemInfo.status == 'group_unpaid' ||
             itemInfo.status == 'domestic_received'
           "
-          @click.stop="freeze"
+          @click.stop="$emit('freeze', itemInfo)"
         >
           {{ itemInfo.is_frozen == 0 ? "冻结" : "恢复" }}
         </button>
@@ -123,17 +123,6 @@ export default {
     return {};
   },
   methods: {
-    //冻结
-    freeze() {
-      uni.$u.http
-        .post(`/api/express-order/froze/${this.itemInfo.id}`)
-        .then((res) => {
-          uni.showToast({
-            title: this.itemInfo.is_frozen == 0 ? "已冻结" : "已恢复",
-            icon: "none",
-          });
-        });
-    },
     toPayment() {
       uni.navigateTo({
         url: `/pageD/paymentOrder/paymentOrder?money=${this.itemInfo.gap_price}&weight=${this.itemInfo.actual_weight}&packageType=${this.itemInfo.goods[0].type_text}&num=${this.itemInfo.goods[0].number}&orderid=${this.itemInfo.id}&type=${this.itemInfo.type}`,

pageC/myPackage/myPackage.vue

@@ -51,7 +51,11 @@
         {{ i18n.orderWeight }}{{ weights }}kg
       </view>
       <view v-for="item in orderList" :key="item.orderStatus">
-        <PackageCard :itemInfo="item" @toInformation="toInformation" />
+        <PackageCard
+          :itemInfo="item"
+          @toInformation="toInformation"
+          @freeze="freeze"
+        />
       </view>
     </view>
   </view>
@@ -72,6 +76,7 @@ export default {
       statusNum: {},
       page: 1,
       orderList: [],
+      limit: 10,
     };
   },
   computed: {
@@ -112,7 +117,7 @@ export default {
     getPackageList(value) {
       uni.$u.http
         .get(
-          `/api/express-order?container_id=${this.containerId}&status_collection=${this.follow}&order_no=${this.orderId}&page=${this.page}&limit=10`
+          `/api/express-order?container_id=${this.containerId}&status_collection=${this.follow}&order_no=${this.orderId}&page=${this.page}&limit=${this.limit}`
         )
         .then((res) => {
           if (value == 1) {
@@ -128,6 +133,21 @@ export default {
           this.total = res.total;
         });
     },
+
+    //冻结
+    freeze(itemInfo) {
+      uni.$u.http
+        .post(`/api/express-order/froze/${itemInfo.id}`)
+        .then((res) => {
+          this.limit = this.page * this.limit;
+          this.page = 1;
+          this.getPackageList(1);
+          uni.showToast({
+            title: itemInfo.is_frozen == 0 ? "已冻结" : "已恢复",
+            icon: "none",
+          });
+        });
+    },
   },
 
   onReachBottom() {

pageC/orderForm/component/refundCard.vue

@@ -32,7 +32,7 @@
       >
     </view>
     <view class="commodity-information" v-for="item in itemInfo.order_goods">
-      <view class="commodity-1">
+      <view class="commodity-1" v-if="item.refund">
         <image class="commodity-img" :src="item.sku_item.image" mode=""></image>
         <view class="information-right">
           <view class="commodity-2">
@@ -51,13 +51,26 @@
               align-items: center;
             "
           >
-            <view class="commodity-price">
+            <view
+              class="commodity-price"
+              v-if="item.refund.actual_refund_price"
+            >
               <text style="color: #222; font-size: 26rpx">退款</text>
               <text style="font-size: 20rpx">￥</text>
-              <text>{{ item.amount.split(".")[0] }}</text
+              <text>{{ item.refund.actual_refund_price.split(".")[0] }}</text
               >.
               <text style="font-size: 20rpx">{{
-                item.amount.split(".")[1]
+                item.refund.actual_refund_price.split(".")[1]
+              }}</text>
+            </view>
+
+            <view class="commodity-price" v-else>
+              <text style="color: #222; font-size: 26rpx">退款</text>
+              <text style="font-size: 20rpx">￥</text>
+              <text>{{ item.refund.refund_price.split(".")[0] }}</text
+              >.
+              <text style="font-size: 20rpx">{{
+                item.refund.refund_price.split(".")[1]
               }}</text>
             </view>
             <view class="btn-list">

pageC/orderForm/orderForm.vue

@@ -175,7 +175,7 @@ export default {
     //查看物流进度
     toLogistics(value) {
       uni.navigateTo({
-        url: "/pageD/logisticsProgress/logisticsProgress",
+        url: `/pageD/logisticsProgress/logisticsProgress?package=${value.order_goods.length}`,
       });
     },
 

pageD/logisticsProgress/logisticsProgress.vue

@@ -1,202 +1,217 @@
 <template>
-	<view class="page">
-		<view class="top-detail">
-			<view class="title">
-				发往仓库
-			</view>
-			<image class="arrow" src="../../static/mine/339.png" mode=""></image>
-			<view class="title">
-				仓库打包
-			</view>
-			<image class="arrow" src="../../static/mine/340.png" mode=""></image>
-			<view class="title">
-				洛杉矶
-			</view>
-		</view>
-		<view class="logistics">
-			<view class="warehouse-packaging" v-if="warehouse.length>0">
-
-				<Progress :logisticsList="warehouse" />
-
-			</view>
-			<view class="_detail-1">
-				<text>已于11月24日送至平台仓库</text>
-				<u-icon @click="putItAway" name="arrow-up" color="#666666" size="18" v-if="isShow"></u-icon>
-				<u-icon @click="putItAway" name="arrow-down" color="#666666" size="18" v-else></u-icon>
-			</view>
-			<view class="logistics-detail" v-if="isShow">
-				<view class="">
-					{{"顺丰快递"+"&nbsp;"+"|"+"&nbsp"+"订单号："}}
-					<text>JDV21093105892</text>
-				</view>
-				<view class="phone">
-					<text @click="cope('JDV21093105892')">复制</text>
-					{{"&nbsp;"+"|"+"&nbsp"}}
-					<text @click="makeCall">打电话</text>
-				</view>
-			</view>
-			<view class="logistics-information" v-if="isShow">
-				<Progress :logisticsList="logisticsList" />
-			</view>
-		</view>
-	</view>
+  <view class="page">
+    <view class="top-detail">
+      <view class="title"> 发往仓库 </view>
+      <image class="arrow" src="../../static/mine/339.png" mode=""></image>
+      <view class="title"> 仓库打包 </view>
+      <image class="arrow" src="../../static/mine/340.png" mode=""></image>
+      <view class="title"> 洛杉矶 </view>
+    </view>
+    <view class="logistics">
+      <view class="package" v-if="packageNum > 1">
+        <view class="package-title">您的订单已被分成多个包裹发出：</view>
+        <view></view>
+      </view>
+
+      <view class="warehouse-packaging" v-if="warehouse.length > 0">
+        <Progress :logisticsList="warehouse" />
+      </view>
+      <view class="_detail-1">
+        <text>已于11月24日送至平台仓库</text>
+        <u-icon
+          @click="putItAway"
+          name="arrow-up"
+          color="#666666"
+          size="18"
+          v-if="isShow"
+        ></u-icon>
+        <u-icon
+          @click="putItAway"
+          name="arrow-down"
+          color="#666666"
+          size="18"
+          v-else
+        ></u-icon>
+      </view>
+      <view class="logistics-detail" v-if="isShow">
+        <view class="">
+          {{ "顺丰快递" + "&nbsp;" + "|" + "&nbsp" + "订单号：" }}
+          <text>JDV21093105892</text>
+        </view>
+        <view class="phone">
+          <text @click="cope('JDV21093105892')">复制</text>
+          {{ "&nbsp;" + "|" + "&nbsp" }}
+          <text @click="makeCall">打电话</text>
+        </view>
+      </view>
+      <view class="logistics-information" v-if="isShow">
+        <Progress :logisticsList="logisticsList" />
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import Progress from './component/progress.vue'
-	export default {
-		components: {
-			Progress
-		},
-		data() {
-			return {
-				logisticsList: [{
-						title: "已签收",
-						time: "10:11",
-						status: false,
-						does: "您的快件已暂存至浦口东方万汇城北区2号楼超市店菜鸟驿站，请凭取件码及时领取。"
-					}, {
-						title: "派送中",
-						time: "10:11",
-						status: false,
-						does: "临沂市配送员【叶景瑞】 187626516732 正为您派送，感谢您的耐心等待"
-					}, {
-						title: "",
-						time: "10:11",
-						status: false,
-						does: "临沂市配送员【叶景瑞】 187626516732 正为您派送，感谢您的耐心等待"
-					},
-					{
-
-						title: "运输中",
-						time: "10:11",
-						status: false,
-						does: "快递离开******"
-					}
-				],
-				warehouse: [{
-						title: "打包称重",
-						time: "10:11",
-						status: true,
-						imageUrl: true,
-						does: "商品已打包称重，待用户付款"
-					},
-					{
-
-						title: "商品入库",
-						time: "10:11",
-						status: false,
-						imageUrl: false,
-						does: "商品已进入转入仓库，正在排队等待打包"
-					}
-				],
-				isShow:true
-			}
-		},
-		computed: {},
-		methods: {
-
-			cope(str) {
-				uni.setClipboardData({
-					data: str,
-					success() {
-						uni.showToast({
-							title: "复制成功",
-							icon: "none"
-						})
-					}
-				})
-			},
-			makeCall() {
-				uni.authorize({
-					scope: 'scope.makePhoneCall',
-					success: () => {
-						uni.makePhoneCall({
-							phoneNumber: '手机号码',
-							success: () => {
-								console.log('拨打电话成功！');
-							},
-							fail: () => {
-								console.error('拨打电话失败！');
-							}
-						});
-					},
-					fail: () => {
-						console.error('授权失败，请允许拨打电话权限！');
-					}
-				});
-			},
-			putItAway(){
-				this.isShow = !this.isShow
-			}
-		},
-		created() {
-			uni.setNavigationBarTitle({
-				title: "物流进度"
-			})
-		}
-	}
+import Progress from "./component/progress.vue";
+export default {
+  components: {
+    Progress,
+  },
+  data() {
+    return {
+      logisticsList: [
+        {
+          title: "已签收",
+          time: "10:11",
+          status: false,
+          does: "您的快件已暂存至浦口东方万汇城北区2号楼超市店菜鸟驿站，请凭取件码及时领取。",
+        },
+        {
+          title: "派送中",
+          time: "10:11",
+          status: false,
+          does: "临沂市配送员【叶景瑞】 187626516732 正为您派送，感谢您的耐心等待",
+        },
+        {
+          title: "",
+          time: "10:11",
+          status: false,
+          does: "临沂市配送员【叶景瑞】 187626516732 正为您派送，感谢您的耐心等待",
+        },
+        {
+          title: "运输中",
+          time: "10:11",
+          status: false,
+          does: "快递离开******",
+        },
+      ],
+      warehouse: [
+        {
+          title: "打包称重",
+          time: "10:11",
+          status: true,
+          imageUrl: true,
+          does: "商品已打包称重，待用户付款",
+        },
+        {
+          title: "商品入库",
+          time: "10:11",
+          status: false,
+          imageUrl: false,
+          does: "商品已进入转入仓库，正在排队等待打包",
+        },
+      ],
+      isShow: true,
+      packageNum: 0, //包裹个数
+    };
+  },
+  onLoad(options) {
+    this.packageNum = options.package;
+  },
+  computed: {},
+  methods: {
+    cope(str) {
+      uni.setClipboardData({
+        data: str,
+        success() {
+          uni.showToast({
+            title: "复制成功",
+            icon: "none",
+          });
+        },
+      });
+    },
+    makeCall() {
+      uni.authorize({
+        scope: "scope.makePhoneCall",
+        success: () => {
+          uni.makePhoneCall({
+            phoneNumber: "手机号码",
+            success: () => {
+              console.log("拨打电话成功！");
+            },
+            fail: () => {
+              console.error("拨打电话失败！");
+            },
+          });
+        },
+        fail: () => {
+          console.error("授权失败，请允许拨打电话权限！");
+        },
+      });
+    },
+    putItAway() {
+      this.isShow = !this.isShow;
+    },
+  },
+  created() {
+    uni.setNavigationBarTitle({
+      title: "物流进度",
+    });
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.page {
-		padding: 20rpx 24rpx;
-		.top-detail {
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			height: 144rpx;
-			background: linear-gradient(180deg, #F6E1DE 0%, #EFEFEF 100%);
-			border-radius: 16rpx 16rpx 0 0;
-
-			.title {
-				color: rgba(34, 34, 34, .6);
-				font-size: 32rpx;
-			}
-
-			.arrow {
-				width: 98rpx;
-				height: 8rpx;
-			}
-		}
-
-		.logistics {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 20rpx;
-			position: relative;
-			top: -20rpx;
-			padding-bottom: 20rpx;
-
-			._detail-1 {
-				display: flex;
-				justify-content: space-between;
-				font-size: 28rpx;
-				color: #666;
-				align-items: center;
-				border-top: 2rpx solid rgba(151, 151, 151, .1);
-				padding-top: 28rpx;
-			}
-
-			.logistics-detail {
-				display: flex;
-				justify-content: space-between;
-				font-size: 26rpx;
-				color: #333;
-				height: 104rpx;
-				align-items: center;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-
-			}
-
-			.logistics-information {
-				padding: 20rpx 0;
-
-				.information {
-					position: relative;
-				}
-			}
-
-		}
-	}
-</style>
+.page {
+  padding: 20rpx 24rpx;
+  .top-detail {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    height: 144rpx;
+    background: linear-gradient(180deg, #f6e1de 0%, #efefef 100%);
+    border-radius: 16rpx 16rpx 0 0;
+
+    .title {
+      color: rgba(34, 34, 34, 0.6);
+      font-size: 32rpx;
+    }
+
+    .arrow {
+      width: 98rpx;
+      height: 8rpx;
+    }
+  }
+
+  .logistics {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 20rpx;
+    position: relative;
+    top: -20rpx;
+    padding-bottom: 20rpx;
+    .package {
+      margin-top: 20rpx;
+    }
+
+    ._detail-1 {
+      display: flex;
+      justify-content: space-between;
+      font-size: 28rpx;
+      color: #666;
+      align-items: center;
+      border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+      padding-top: 28rpx;
+    }
+
+    .logistics-detail {
+      display: flex;
+      justify-content: space-between;
+      font-size: 26rpx;
+      color: #333;
+      height: 104rpx;
+      align-items: center;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    }
+
+    .logistics-information {
+      padding: 20rpx 0;
+
+      .information {
+        position: relative;
+      }
+    }
+  }
+}
+</style>

pageD/newBulitOrder/component/commodity.vue

@@ -17,17 +17,18 @@
             <text style="font-size: 34rpx">{{ item.sku_item.price }}</text>
           </view>
           <view class="stepping">
-            <u-icon
+            <text>x</text>
+            <!-- <u-icon
               name="minus"
               size="12"
               @click="$emit('changeGoodsNum', 'reduce')"
-            ></u-icon>
+            ></u-icon> -->
             <text>{{ goodsValue }}</text>
-            <u-icon
+            <!-- <u-icon
               name="plus"
               size="12"
               @click="$emit('changeGoodsNum', 'increase')"
-            ></u-icon>
+            ></u-icon> -->
           </view>
         </view>
       </view>
@@ -117,12 +118,12 @@ export default {
       }
       .stepping {
         display: flex;
-        width: 140rpx;
+        width: 50rpx;
         height: 40rpx;
         justify-content: space-around;
         align-items: center;
-        font-size: 20rpx;
-        border: 2rpx solid rgba(151, 151, 151, 0.4);
+        font-size: 30rpx;
+        // border: 2rpx solid rgba(151, 151, 151, 0.4);
         border-radius: 20rpx;
       }
     }

pageD/orderInformation/orderInformation.vue

@@ -140,11 +140,9 @@
       <view
         class="order"
         v-if="
-          orderInformation.status == 'overseas_undelivered' ||
-          orderInformation.status == 'overseas_delivered' ||
-          orderInformation.status == 'domestic_delivered' ||
-          orderInformation.status == 'finished' ||
-          orderInformation.status == 'domestic_undelivered'
+          orderInformation.status != 'domestic_undelivered' &&
+          orderInformation.status != 'domestic_delivered' &&
+          orderInformation.status != 'domestic_received'
         "
       >
         <text class="_label-1">付款时间</text>

unpackage/dist/dev/mp-weixin/pageB/search.wxml

@@ -1 +1 @@
-<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex  data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>
+<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>

unpackage/dist/dev/mp-weixin/pageC/myPackage/myPackage.wxml

@@ -1 +1 @@
-<view class="data-v-6893e48c"><view class="top-search data-v-6893e48c"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6893e48c" bind:__l="__l"></u--input><view class="top-tab data-v-6893e48c"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-6893e48c"><view class="prompt data-v-6893e48c"><image class="prompt-icon data-v-6893e48c" src="../../static/mine/336.png" mode></image>{{''+i18n.orderWeight+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-6893e48c"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-6893e48c" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-6893e48c"><view class="top-search data-v-6893e48c"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6893e48c" bind:__l="__l"></u--input><view class="top-tab data-v-6893e48c"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-6893e48c"><view class="prompt data-v-6893e48c"><image class="prompt-icon data-v-6893e48c" src="../../static/mine/336.png" mode></image>{{''+i18n.orderWeight+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-6893e48c"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-6893e48c" bind:__l="__l"></package-card></view></block></view></view>

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

@@ -32,7 +32,7 @@
   justify-content: space-around;
   align-items: center;
   height: 144rpx;
-  background: linear-gradient(180deg, #F6E1DE 0%, #EFEFEF 100%);
+  background: linear-gradient(180deg, #f6e1de 0%, #efefef 100%);
   border-radius: 16rpx 16rpx 0 0;
 }
 .page .top-detail .title.data-v-9bf9d84e {
@@ -51,6 +51,9 @@
   top: -20rpx;
   padding-bottom: 20rpx;
 }
+.page .logistics .package.data-v-9bf9d84e {
+  margin-top: 20rpx;
+}
 .page .logistics ._detail-1.data-v-9bf9d84e {
   display: flex;
   justify-content: space-between;

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.json

@@ -1,6 +1,4 @@
 {
   "component": true,
-  "usingComponents": {
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.wxml

@@ -1 +1 @@
-<view class="list data-v-4ed8fbfe"><view class="merchant data-v-4ed8fbfe"><image class="merchant-img data-v-4ed8fbfe" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-4ed8fbfe">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-4ed8fbfe"><image class="detail-img data-v-4ed8fbfe" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-4ed8fbfe"><view class="data-v-4ed8fbfe"><text class="toptitle data-v-4ed8fbfe">{{item.goods.name_cn}}</text><view class="weight data-v-4ed8fbfe">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-4ed8fbfe"><view class="money data-v-4ed8fbfe"><text class="data-v-4ed8fbfe">¥</text><text style="font-size:34rpx;" class="data-v-4ed8fbfe">{{item.sku_item.price}}</text></view><view class="stepping data-v-4ed8fbfe"><u-icon vue-id="{{'e771f670-1-'+__i0__}}" name="minus" size="12" data-event-opts="{{[['^click',[['$emit',['changeGoodsNum','reduce']]]]]}}" bind:click="__e" class="data-v-4ed8fbfe" bind:__l="__l"></u-icon><text class="data-v-4ed8fbfe">{{goodsValue}}</text><u-icon vue-id="{{'e771f670-2-'+__i0__}}" name="plus" size="12" data-event-opts="{{[['^click',[['$emit',['changeGoodsNum','increase']]]]]}}" bind:click="__e" class="data-v-4ed8fbfe" bind:__l="__l"></u-icon></view></view></view></view></block></view>
+<view class="list data-v-4ed8fbfe"><view class="merchant data-v-4ed8fbfe"><image class="merchant-img data-v-4ed8fbfe" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-4ed8fbfe">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-4ed8fbfe"><image class="detail-img data-v-4ed8fbfe" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-4ed8fbfe"><view class="data-v-4ed8fbfe"><text class="toptitle data-v-4ed8fbfe">{{item.goods.name_cn}}</text><view class="weight data-v-4ed8fbfe">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-4ed8fbfe"><view class="money data-v-4ed8fbfe"><text class="data-v-4ed8fbfe">¥</text><text style="font-size:34rpx;" class="data-v-4ed8fbfe">{{item.sku_item.price}}</text></view><view class="stepping data-v-4ed8fbfe"><text class="data-v-4ed8fbfe">x</text><text class="data-v-4ed8fbfe">{{goodsValue}}</text></view></view></view></view></block></view>

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.wxss

@@ -89,12 +89,11 @@
 }
 .list .detail .detail-right .stepping.data-v-4ed8fbfe {
   display: flex;
-  width: 140rpx;
+  width: 50rpx;
   height: 40rpx;
   justify-content: space-around;
   align-items: center;
-  font-size: 20rpx;
-  border: 2rpx solid rgba(151, 151, 151, 0.4);
+  font-size: 30rpx;
   border-radius: 20rpx;
 }
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -21,7 +21,24 @@
   "libVersion": "3.4.3",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
-  "condition": {},
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
+  },
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }