解决冲突

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "kjds",
-    "appid" : "__UNI__F715804",
+    "appid" : "__UNI__AF78173",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pageA/payorder.vue

@@ -199,7 +199,6 @@
 			},
 			confirm() {
 				// console.log(new Date().getTime());
-
 				if (this.type == "") {
 					uni.$u.http
 						.post("/api/order/payment", {
@@ -208,20 +207,20 @@
 							customer_currency: "RMB",
 						})
 						.then((res) => {
-							uni.navigateTo({
-								url: "confirm",
-							});
 							if (this.pay_type == "wechat") {
 								uni.requestPayment({
-									provider: "wxpay",
-									package: `prepay_id=${res.prepay_id}`,
-									// prepay_id: res.prepay_id,
-									signType: res.prepay_id,
-									paySign: res.prepay_id,
-									timeStamp: String(new Date().getTime()),
-									nonceStr: res.prepay_id,
+									provider: 'wxpay',
+									timeStamp: String(res.timeStamp),
+									nonceStr: res.nonceStr,
+									package: res.package,
+									signType: res.signType,
+									paySign: res.paySign,
 									success: (result) => {
-										console.log(result);
+										this.$u.toast('支付成功')
+										// console.log(result);
+										uni.navigateTo({
+											url: "confirm",
+										});
 									},
 									fail: (error) => {
 										console.log(error);
@@ -259,7 +258,7 @@
 										console.log('fail:' + JSON.stringify(err));
 									}
 								});
-							}else{
+							} else {
 								this.$u.toast('支付成功')
 								setTimeout(() => {
 									uni.switchTab({

unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxml

@@ -1 +1 @@
-<view class="content data-v-2e5c4676" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-2e5c4676"><scroll-view class="cont_view menu-scroll-view data-v-2e5c4676" style="{{$root.s0}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" scroll-top="{{scrollTop}}" scroll-into-view="{{itemId}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['swichMenu',[index]]]]]}}" class="menu_item data-v-2e5c4676" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-2e5c4676">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-2e5c4676" style="{{'background:'+(tegColor)+';'}}"></view></block></view></block></scroll-view><scroll-view style="{{$root.s2}}" scroll-top="{{scrollRightTop}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" data-event-opts="{{[['scroll',[['rightScroll',['$event']]]]]}}" bindscroll="__e" class="data-v-2e5c4676"><view class="menu_right_view data-v-2e5c4676"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-2e5c4676" id="{{'item'+index}}"><view class="menu_right_title data-v-2e5c4676">{{item.$orig[keyName]}}</view><view class="data-v-2e5c4676"><slot></slot><scoped-slots-default scroll_list="{{item.$orig[tabbarName]}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></view></view></block></view></scroll-view></view></view>
+<view class="content data-v-02584d21" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-02584d21"><scroll-view class="cont_view menu-scroll-view data-v-02584d21" style="{{$root.s0}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" scroll-top="{{scrollTop}}" scroll-into-view="{{itemId}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['swichMenu',[index]]]]]}}" class="menu_item data-v-02584d21" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-02584d21">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-02584d21" style="{{'background:'+(tegColor)+';'}}"></view></block></view></block></scroll-view><scroll-view style="{{$root.s2}}" scroll-top="{{scrollRightTop}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" data-event-opts="{{[['scroll',[['rightScroll',['$event']]]]]}}" bindscroll="__e" class="data-v-02584d21"><view class="menu_right_view data-v-02584d21"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-02584d21" id="{{'item'+index}}"><view class="menu_right_title data-v-02584d21">{{item.$orig[keyName]}}</view><view class="data-v-02584d21"><slot></slot><scoped-slots-default scroll_list="{{item.$orig[tabbarName]}}" language="{{language}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></view></view></block></view></scroll-view></view></view>

unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxss

@@ -1 +1 @@
-.content.data-v-2e5c4676{display:flex;flex-direction:column}.content .cont.data-v-2e5c4676{flex:1;display:flex;overflow:hidden}.content .cont .cont_view.data-v-2e5c4676{height:100%}.content .cont .cont_view .menu_item.data-v-2e5c4676{position:relative;padding:24rpx 12rpx}.content .cont .cont_view .menu_item .menu_item_name.data-v-2e5c4676{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;text-align:center}.content .cont .cont_view .menu_item .y_teg.data-v-2e5c4676{width:6rpx;height:40rpx;border-radius:3rpx;position:absolute;left:0;top:50%;z-index:99;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.menu_right_view.data-v-2e5c4676{padding:24rpx}.menu_right_view .menu_right_item.data-v-2e5c4676{margin-bottom:30rpx}.menu_right_view .menu_right_item.data-v-2e5c4676:last-child{min-height:100vh}.menu_right_title.data-v-2e5c4676{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;font-weight:700;font-size:28rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden}
+.content.data-v-02584d21{display:flex;flex-direction:column}.content .cont.data-v-02584d21{flex:1;display:flex;overflow:hidden}.content .cont .cont_view.data-v-02584d21{height:100%}.content .cont .cont_view .menu_item.data-v-02584d21{position:relative;padding:24rpx 12rpx}.content .cont .cont_view .menu_item .menu_item_name.data-v-02584d21{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;text-align:center}.content .cont .cont_view .menu_item .y_teg.data-v-02584d21{width:6rpx;height:40rpx;border-radius:3rpx;position:absolute;left:0;top:50%;z-index:99;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.menu_right_view.data-v-02584d21{padding:24rpx}.menu_right_view .menu_right_item.data-v-02584d21{margin-bottom:30rpx}.menu_right_view .menu_right_item.data-v-02584d21:last-child{min-height:100vh}.menu_right_title.data-v-02584d21{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;font-weight:700;font-size:28rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden}

unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-d06d430a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-d06d430a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-d06d430a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-d06d430a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-d06d430a{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-d06d430a{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-d06d430a{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-d06d430a{position:relative}.back .topbox .state.data-v-d06d430a{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-d06d430a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-d06d430a{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-58b0b8e1{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-58b0b8e1{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-58b0b8e1{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-58b0b8e1{position:relative}.back .topbox .state.data-v-58b0b8e1{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-58b0b8e1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-58b0b8e1{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

unpackage/dist/build/mp-weixin/pageA/shoplist.wxss

@@ -1 +1 @@
-.box.data-v-a42d7ec6{width:750rpx;min-height:1360rpx;background:#fff;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-a42d7ec6{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-a42d7ec6{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-a42d7ec6{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-a42d7ec6{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-a42d7ec6{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-a42d7ec6{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-a42d7ec6{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}
+.box.data-v-da1c1a66{width:750rpx;min-height:1360rpx;background:#fff;border-radius:28rpx 28rpx 0rpx 0rpx;padding:38rpx 20rpx 20rpx;box-sizing:border-box;margin-top:20rpx}.pop.data-v-da1c1a66{width:750rpx;background:#fff;padding:36rpx 32rpx;box-sizing:border-box}.pop .btn1.data-v-da1c1a66{width:702rpx;height:84rpx;background:rgba(248,50,36,.1);border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#f83224;line-height:84rpx;text-align:center;font-style:normal;border-radius:42rpx 0 0 42rpx}.pop .btn2.data-v-da1c1a66{width:702rpx;height:84rpx;background:#f83224;border-radius:42rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal;border-radius:0rpx 42rpx 42rpx 0}.pop .item.data-v-da1c1a66{width:206rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#131415;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx}.pop .acitem.data-v-da1c1a66{width:206rpx;height:64rpx;font-family:PingFangSC,PingFang SC;font-weight:400;border-radius:36rpx;font-size:24rpx;color:#f83224;line-height:64rpx;text-align:center;font-style:normal;margin-top:26rpx;background:rgba(248,50,36,.1);border:1rpx solid #f83224;box-sizing:border-box}.pop .title.data-v-da1c1a66{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:26rpx;color:#131415;line-height:36rpx;text-align:left;font-style:normal;margin-bottom:24rpx}.pop .input.data-v-da1c1a66{width:312rpx;height:64rpx;background:#f4f4f4;border-radius:36rpx}

unpackage/dist/build/mp-weixin/pageA/shoptype-zh-sliding-menu-default.js

@@ -0,0 +1,6 @@
+
+wx.createComponent({
+    generic:true,
+    props: {scroll_list:{type:null},language:{type:null}},
+    render: function(){}
+})

unpackage/dist/build/mp-weixin/pageA/shoptype-zh-sliding-menu-default.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "shoptype-zh-sliding-menu-default": "/pageA/shoptype-zh-sliding-menu-default",
+    "zh-sliding-menu": "/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu"
+  }
+}

unpackage/dist/build/mp-weixin/pageA/shoptype-zh-sliding-menu-default.wxml

@@ -0,0 +1 @@
+<view class="goods data-v-dc7ee894"><block wx:for="{{scroll_list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['clickGoods',['$0',index],[[['scroll_list','',index]]]]]]]}}" class="goods_item data-v-dc7ee894" bindtap="__e"><image class="goods_item_img data-v-dc7ee894" src="{{item.image}}" mode></image><block wx:if="{{language=='zh-CN'}}"><view class="goods_item_name data-v-dc7ee894">{{''+item.name_cn+''}}</view></block><block wx:if="{{language=='en-US'}}"><view class="goods_item_name data-v-dc7ee894">{{''+item.name_en+''}}</view></block><block wx:if="{{language=='es-ES'}}"><view class="goods_item_name data-v-dc7ee894">{{''+item.name_es+''}}</view></block><block wx:if="{{language=='it-IT'}}"><view class="goods_item_name data-v-dc7ee894">{{''+item.name_ita+''}}</view></block></view></block></view>

unpackage/dist/build/mp-weixin/pageA/shoptype-zh-sliding-menu-default.wxss

@@ -0,0 +1 @@
+@import "./shoptype.wxss"

unpackage/dist/build/mp-weixin/pageA/shoptype.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "商品分类",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "shoptype-zh-sliding-menu-default": "/pageA/shoptype-zh-sliding-menu-default",
     "zh-sliding-menu": "/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu"
   }
 }

unpackage/dist/build/mp-weixin/pageA/shoptype.wxml

@@ -1 +1 @@
-<view class="data-v-138917dd"><zh-sliding-menu scoped-slots-compiler="augmented" vue-id="4583fe6a-1" tabbar="{{list}}" scrollH="{{scrollH}}" data-ref="zhSlidingMenu" class="data-v-138917dd vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="goods data-v-138917dd" wx:if="{{$root.m0}}"><block wx:for="{{$root.m1['scroll_list']}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item})}}" class="goods_item data-v-138917dd" bindtap="__e"><image class="goods_item_img data-v-138917dd" src="{{item.image}}" mode></image><block wx:if="{{language=='zh-CN'}}"><view class="goods_item_name data-v-138917dd">{{''+item.name_cn+''}}</view></block><block wx:if="{{language=='en-US'}}"><view class="goods_item_name data-v-138917dd">{{''+item.name_en+''}}</view></block><block wx:if="{{language=='es-ES'}}"><view class="goods_item_name data-v-138917dd">{{''+item.name_es+''}}</view></block><block wx:if="{{language=='it-IT'}}"><view class="goods_item_name data-v-138917dd">{{''+item.name_ita+''}}</view></block></view></block></view></zh-sliding-menu></view>
+<view class="data-v-dc7ee894"><zh-sliding-menu generic:scoped-slots-default="shoptype-zh-sliding-menu-default" data-vue-generic="scoped" vue-id="4583fe6a-1" tabbar="{{list}}" scrollH="{{scrollH}}" data-ref="zhSlidingMenu" class="data-v-dc7ee894 vue-ref" bind:__l="__l" vue-slots="{{['default']}}"></zh-sliding-menu></view>

unpackage/dist/build/mp-weixin/pageA/shoptype.wxss

@@ -1 +1 @@
-.goods.data-v-138917dd{display:flex;flex-wrap:wrap}.goods .goods_item.data-v-138917dd{width:33.3%;display:flex;align-items:center;justify-content:center;flex-direction:column;margin-top:20rpx}.goods .goods_item .goods_item_img.data-v-138917dd{width:120rpx;height:120rpx}.goods .goods_item .goods_item_name.data-v-138917dd{color:#333;font-size:28rpx;font-weight:500rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;word-break:break-all;text-align:center}
+.goods.data-v-dc7ee894{display:flex;flex-wrap:wrap}.goods .goods_item.data-v-dc7ee894{width:33.3%;display:flex;align-items:center;justify-content:center;flex-direction:column;margin-top:20rpx}.goods .goods_item .goods_item_img.data-v-dc7ee894{width:120rpx;height:120rpx}.goods .goods_item .goods_item_name.data-v-dc7ee894{color:#333;font-size:28rpx;font-weight:500rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;word-break:break-all;text-align:center}

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

@@ -1 +1 @@
-<view class="data-v-761244c6"><view class="top-search data-v-761244c6"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-761244c6" bind:__l="__l"></u--input><view class="top-tab data-v-761244c6"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-761244c6',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-761244c6',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-761244c6',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-761244c6',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-761244c6"><block wx:if="{{weights>=300}}"><view class="prompt data-v-761244c6"><image class="prompt-icon data-v-761244c6" src="../../static/mine/336.png" mode></image>当前页面加载的订单总重量300kg</view></block><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-761244c6"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-761244c6" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-3df4161b"><view class="top-search data-v-3df4161b"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-3df4161b" bind:__l="__l"></u--input><view class="top-tab data-v-3df4161b"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-3df4161b',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-3df4161b',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-3df4161b',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-3df4161b',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-3df4161b"><block wx:if="{{weights>=300}}"><view class="prompt data-v-3df4161b"><image class="prompt-icon data-v-3df4161b" src="../../static/mine/336.png" mode></image>当前页面加载的订单总重量300kg</view></block><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-3df4161b"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-3df4161b" bind:__l="__l"></package-card></view></block></view></view>

unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxss

@@ -1 +1 @@
-.top-search.data-v-761244c6{background-color:#fff;padding:20rpx 24rpx}.data-v-761244c6 .u-input{background-color:#f4f4f4}.top-tab.data-v-761244c6{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-761244c6{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-761244c6{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-761244c6::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-761244c6{padding:20rpx 24rpx}.content .prompt.data-v-761244c6{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-761244c6{width:36rpx;height:36rpx;margin-right:20rpx}
+.top-search.data-v-3df4161b{background-color:#fff;padding:20rpx 24rpx}.data-v-3df4161b .u-input{background-color:#f4f4f4}.top-tab.data-v-3df4161b{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-3df4161b{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-3df4161b{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-3df4161b::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-3df4161b{padding:20rpx 24rpx}.content .prompt.data-v-3df4161b{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-3df4161b{width:36rpx;height:36rpx;margin-right:20rpx}

unpackage/dist/build/mp-weixin/pageD/commodityManage/commodityManage.wxss

@@ -1 +1 @@
-.top-tab-search.data-v-46eb30d0{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-46eb30d0{display:flex;align-items:center}.top-tab-search .search .screen.data-v-46eb30d0{display:flex;align-items:center;font-size:26rpx;color:#333;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-46eb30d0{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-46eb30d0{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-46eb30d0{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-46eb30d0{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-46eb30d0::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-46eb30d0{padding:20rpx 24rpx;background-color:#fff;margin-bottom:150rpx}.page .list.data-v-46eb30d0{display:flex;flex-wrap:nowrap;align-items:center}.page .list .radio.data-v-46eb30d0{margin-right:20rpx}.footer.data-v-46eb30d0{position:fixed;display:flex;align-items:center;justify-content:space-between;bottom:0;background-color:#fff;width:93%;padding:16rpx 24rpx 70rpx 24rpx}.footer .batch.data-v-46eb30d0{color:#333;font-size:28rpx;margin-right:50rpx;display:flex;align-items:center}.footer .btn-1.data-v-46eb30d0{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#fff;color:#f83224;border:2rpx solid #f83224;padding:0;margin:0;font-size:30rpx}.footer .btn.data-v-46eb30d0{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;font-size:30rpx}
+.top-tab-search.data-v-1994b9e4{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-1994b9e4{display:flex;align-items:center}.top-tab-search .search .screen.data-v-1994b9e4{display:flex;align-items:center;font-size:26rpx;color:#333;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-1994b9e4{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-1994b9e4{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-1994b9e4{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-1994b9e4{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-1994b9e4::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-1994b9e4{padding:20rpx 24rpx;background-color:#fff;margin-bottom:150rpx}.page .list.data-v-1994b9e4{display:flex;flex-wrap:nowrap;align-items:center}.page .list .radio.data-v-1994b9e4{margin-right:20rpx}.footer.data-v-1994b9e4{position:fixed;display:flex;align-items:center;justify-content:space-between;bottom:0;background-color:#fff;width:93%;padding:16rpx 24rpx 70rpx 24rpx}.footer .batch.data-v-1994b9e4{color:#333;font-size:28rpx;margin-right:50rpx;display:flex;align-items:center}.footer .btn-1.data-v-1994b9e4{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#fff;color:#f83224;border:2rpx solid #f83224;padding:0;margin:0;font-size:30rpx}.footer .btn.data-v-1994b9e4{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;font-size:30rpx}

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{4610:function(t,n,e){},"7a07":function(t,n,e){"use strict";e.r(n);var o=e("b713"),c=e("9516");for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("cbc5");var u,r=e("f0c5"),a=Object(r["a"])(c["default"],o["b"],o["c"],!1,null,"28086252",null,!1,o["a"],u);n["default"]=a.exports},9516:function(t,n,e){"use strict";e.r(n);var o=e("9bdc"),c=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=c.a},"9bdc":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}},computed:{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=o},b713:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var c=function(){var t=this,n=t.$createElement,e=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),o=t.itemInfo.goods.discount_price.split("."),c=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:e,g1:o,g2:c}})},i=[]},cbc5:function(t,n,e){"use strict";var o=e("4610"),c=e.n(o);c.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"0c88":function(t,n,e){},7480:function(t,n,e){"use strict";var o=e("0c88"),c=e.n(o);c.a},"7a07":function(t,n,e){"use strict";e.r(n);var o=e("dc1d"),c=e("9516");for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("7480");var u,r=e("f0c5"),a=Object(r["a"])(c["default"],o["b"],o["c"],!1,null,"34f73142",null,!1,o["a"],u);n["default"]=a.exports},9516:function(t,n,e){"use strict";e.r(n);var o=e("9bdc"),c=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=c.a},"9bdc":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}},computed:{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=o},dc1d:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var c=function(){var t=this,n=t.$createElement,e=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),o=t.itemInfo.goods.discount_price.split("."),c=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:e,g1:o,g2:c}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/goodsInformation-create-component',
     {

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-page.data-v-14ab8f0e{background-color:#fff!important;height:100vh}.login-btn.data-v-14ab8f0e{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-14ab8f0e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}
+page.data-v-94f87ba8{background-color:#fff!important;height:100vh}.login-btn.data-v-94f87ba8{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-94f87ba8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

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

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

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

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

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

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

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {

unpackage/dist/build/mp-weixin/uview-ui/components/u-overlay/u-overlay.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u-overlay/u-overlay"],{"06b3":function(n,t,e){"use strict";var u=e("fd89"),i=e.n(u);i.a},"5b7f":function(n,t,e){"use strict";e.r(t);var u=e("ce29"),i=e("d4fa");for(var o in i)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(o);e("06b3");var r,a=e("f0c5"),c=Object(a["a"])(i["default"],u["b"],u["c"],!1,null,"3d84a628",null,!1,u["a"],r);t["default"]=c.exports},"9fee":function(n,t,e){"use strict";(function(n){var u=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=u(e("7d50")),o={name:"u-overlay",mixins:[n.$u.mpMixin,n.$u.mixin,i.default],computed:{overlayStyle:function(){var t={position:"fixed",top:0,left:0,right:0,zIndex:this.zIndex,bottom:0,"background-color":"rgba(0, 0, 0, ".concat(this.opacity,")")};return n.$u.deepMerge(t,n.$u.addStyle(this.customStyle))}},methods:{clickHandler:function(){this.$emit("click")}}};t.default=o}).call(this,e("543d")["default"])},ce29:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return u}));var u={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c7141"))}},i=function(){var n=this,t=n.$createElement;n._self._c},o=[]},d4fa:function(n,t,e){"use strict";e.r(t);var u=e("9fee"),i=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);t["default"]=i.a},fd89:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u-overlay/u-overlay"],{"06b3":function(n,t,e){"use strict";var u=e("fd89"),i=e.n(u);i.a},"5b7f":function(n,t,e){"use strict";e.r(t);var u=e("ce29"),i=e("d4fa");for(var o in i)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(o);e("06b3");var r,a=e("f0c5"),c=Object(a["a"])(i["default"],u["b"],u["c"],!1,null,"3d84a628",null,!1,u["a"],r);t["default"]=c.exports},"9fee":function(n,t,e){"use strict";(function(n){var u=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=u(e("7d50")),o={name:"u-overlay",mixins:[n.$u.mpMixin,n.$u.mixin,i.default],computed:{overlayStyle:function(){var t={position:"fixed",top:0,left:0,right:0,zIndex:this.zIndex,bottom:0,"background-color":"rgba(0, 0, 0, ".concat(this.opacity,")")};return n.$u.deepMerge(t,n.$u.addStyle(this.customStyle))}},methods:{clickHandler:function(){this.$emit("click")}}};t.default=o}).call(this,e("543d")["default"])},ce29:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return u}));var u={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},i=function(){var n=this,t=n.$createElement;n._self._c},o=[]},d4fa:function(n,t,e){"use strict";e.r(t);var u=e("9fee"),i=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);t["default"]=i.a},fd89:function(n,t,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u-overlay/u-overlay-create-component',
     {