冲突

pageA/productdetails.vue

@@ -50,7 +50,8 @@
 						<text class="money">{{
 							 goodinfo.discount_price.slice(-3)
             }}</text>
-						<text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text>
+						<!-- <text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price }}</text> -->
+						<text class="right" v-if="goodinfo.is_discount == 0">¥{{ goodinfo.price * value }}</text>
 					</view>
 					<view class="bottom">
 						<view class="u-flex" style="column-gap:16rpx">
@@ -316,7 +317,7 @@
 						{{ item.name }}
 					</view>
 					<view class="u-flex" style=" flex-wrap: wrap">
-						<view style="margin-right: 18rpx;" class=""
+						<view style="margin-right: 18rpx;margin-bottom: 18rpx;" class=""
 							:class="selectArr[index] == child ? 'acttab' : 'tabs'" v-for="(child, idx) in item.values"
 							:key="idx" @click="actabs(index, child, item)">
 							{{ child }}
@@ -905,6 +906,9 @@
 					console.log(this.selectArr.join(","));
 					if (ite.item == this.selectArr.join(",")) {
 						this.sku_info = ite;
+						this.goodinfo.discount_price = ((Number(this.sku_info.discount_price * 100) *
+							Number(this.value * 100)) / 10000).toFixed(2)
+						this.goodinfo.price = this.sku_info.price
 					}
 				});
 				console.log(this.sku_info);
@@ -953,6 +957,8 @@
 				}
 			},
 			valChange(e) {
+				this.goodinfo.discount_price = ((Number(this.sku_info.discount_price * 100) *
+					Number(e.value * 100)) / 10000).toFixed(2)
 				return e.value;
 			},
 			navigateBack() {

pageA/shoptype.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import zhSlidingMenu from '@/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.vue'
+	import zhSlidingMenu from '@/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.vue'
 	export default {
 		components: {
 			zhSlidingMenu

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

@@ -1 +0,0 @@
-<view class="content data-v-5117ff12" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-5117ff12"><scroll-view class="cont_view menu-scroll-view data-v-5117ff12" 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-5117ff12" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-5117ff12">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-5117ff12" 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-5117ff12"><view class="menu_right_view data-v-5117ff12"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-5117ff12" id="{{'item'+index}}"><view class="menu_right_title data-v-5117ff12">{{item.$orig[keyName]}}</view><view class="data-v-5117ff12"><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 +0,0 @@
-.content.data-v-5117ff12{display:flex;flex-direction:column}.content .cont.data-v-5117ff12{flex:1;display:flex;overflow:hidden}.content .cont .cont_view.data-v-5117ff12{height:100%}.content .cont .cont_view .menu_item.data-v-5117ff12{position:relative;padding:24rpx 12rpx}.content .cont .cont_view .menu_item .menu_item_name.data-v-5117ff12{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-5117ff12{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-5117ff12{padding:24rpx}.menu_right_view .menu_right_item.data-v-5117ff12{margin-bottom:30rpx}.menu_right_view .menu_right_item.data-v-5117ff12:last-child{min-height:100vh}.menu_right_title.data-v-5117ff12{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/comment.wxml

@@ -1 +1 @@
-<view class="back data-v-16c7b8a7"><block wx:if="{{$root.g0>0}}"><view class="data-v-16c7b8a7"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-16c7b8a7"><view style="display:flex;justify-content:space-between;" class="data-v-16c7b8a7"><view class="u-flex data-v-16c7b8a7"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-16c7b8a7"></image><view class="data-v-16c7b8a7"><text class="name data-v-16c7b8a7">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-16c7b8a7" bind:__l="__l"></uni-rate></view></view><text class="day data-v-16c7b8a7">{{item.m0}}</text></view><view class="day data-v-16c7b8a7" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-16c7b8a7" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image}}"><view class="u-flex u-row-between data-v-16c7b8a7" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-16c7b8a7"></image></block></view></block></view></block></view></block><block wx:else><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-16c7b8a7">{{''+i18n.nodata+''}}</view></block></view>
+<view class="back data-v-2a6088c1"><block wx:if="{{$root.g0>0}}"><view class="data-v-2a6088c1"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-2a6088c1"><view style="display:flex;justify-content:space-between;" class="data-v-2a6088c1"><view class="u-flex data-v-2a6088c1"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-2a6088c1"></image><view class="data-v-2a6088c1"><text class="name data-v-2a6088c1">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-2a6088c1" bind:__l="__l"></uni-rate></view></view><text class="day data-v-2a6088c1">{{item.m0}}</text></view><view class="day data-v-2a6088c1" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-2a6088c1" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image||item.$orig.video}}"><view class="u-flex u-row-between data-v-2a6088c1" style="margin-top:22rpx;flex-wrap:wrap;"><video style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;" src="{{item.$orig.video}}" class="data-v-2a6088c1"></video><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-2a6088c1"></image></block></view></block></view></block></view></block><block wx:else><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-2a6088c1">{{''+i18n.nodata+''}}</view></block></view>

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

@@ -1 +1 @@
-.back.data-v-16c7b8a7{padding:20rpx;box-sizing:border-box}.back .box.data-v-16c7b8a7{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-16c7b8a7{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-16c7b8a7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-16c7b8a7{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}
+.back.data-v-2a6088c1{padding:20rpx;box-sizing:border-box}.back .box.data-v-2a6088c1{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-2a6088c1{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-2a6088c1{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-2a6088c1{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}

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

@@ -0,0 +1 @@
+<view class="content data-v-7dc13ffa" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-7dc13ffa"><scroll-view class="cont_view menu-scroll-view data-v-7dc13ffa" 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-7dc13ffa" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-7dc13ffa">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-7dc13ffa" 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-7dc13ffa"><view class="menu_right_view data-v-7dc13ffa"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-7dc13ffa" id="{{'item'+index}}"><view class="menu_right_title data-v-7dc13ffa">{{item.$orig[keyName]}}</view><view class="data-v-7dc13ffa"><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/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxss

@@ -0,0 +1 @@
+.content.data-v-7dc13ffa{display:flex;flex-direction:column}.content .cont.data-v-7dc13ffa{flex:1;display:flex;overflow:hidden}.content .cont .cont_view.data-v-7dc13ffa{height:100%}.content .cont .cont_view .menu_item.data-v-7dc13ffa{position:relative;padding:24rpx 12rpx}.content .cont .cont_view .menu_item .menu_item_name.data-v-7dc13ffa{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-7dc13ffa{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-7dc13ffa{padding:24rpx}.menu_right_view .menu_right_item.data-v-7dc13ffa{margin-bottom:30rpx}.menu_right_view .menu_right_item.data-v-7dc13ffa:last-child{min-height:100vh}.menu_right_title.data-v-7dc13ffa{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,5 @@
-.payment.data-v-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-72b6ab28{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-72b6ab28{position:relative}.back .topbox .state.data-v-72b6ab28{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-72b6ab28{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-72b6ab28{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+<<<<<<< HEAD
+.payment.data-v-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{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-72b6ab28{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-72b6ab28{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-72b6ab28{position:relative}.back .topbox .state.data-v-72b6ab28{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-72b6ab28{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-72b6ab28{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{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-07bdf112{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-07bdf112{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-07bdf112{position:relative}.back .topbox .state.data-v-07bdf112{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-07bdf112{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-07bdf112{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+>>>>>>> a3ea1f0745e55ee4b5b28fdb7055a5e9f8f0faf3

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

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

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

@@ -1 +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>
+<view class="goods data-v-44335539"><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-44335539" bindtap="__e"><image class="goods_item_img data-v-44335539" src="{{item.image}}" mode></image><block wx:if="{{language=='zh-CN'}}"><view class="goods_item_name data-v-44335539">{{''+item.name_cn+''}}</view></block><block wx:if="{{language=='en-US'}}"><view class="goods_item_name data-v-44335539">{{''+item.name_en+''}}</view></block><block wx:if="{{language=='es-ES'}}"><view class="goods_item_name data-v-44335539">{{''+item.name_es+''}}</view></block><block wx:if="{{language=='it-IT'}}"><view class="goods_item_name data-v-44335539">{{''+item.name_ita+''}}</view></block></view></block></view>

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

@@ -3,6 +3,6 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "shoptype-zh-sliding-menu-default": "/pageA/shoptype-zh-sliding-menu-default",
-    "zh-sliding-menu": "/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu"
+    "zh-sliding-menu": "/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu"
   }
 }

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

@@ -1 +1 @@
-<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>
+<view class="data-v-44335539"><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-44335539 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-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}
+.goods.data-v-44335539{display:flex;flex-wrap:wrap}.goods .goods_item.data-v-44335539{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-44335539{width:120rpx;height:120rpx}.goods .goods_item .goods_item_name.data-v-44335539{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/addEditAddress/addEditAddress.wxss

@@ -1 +1 @@
-.page.data-v-d75f5fd6{padding:20rpx 24rpx}.page .content.data-v-d75f5fd6{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-d75f5fd6{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-d75f5fd6{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-d75f5fd6{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-d75f5fd6{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-d75f5fd6{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-d75f5fd6{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-d75f5fd6{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-d75f5fd6{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-d75f5fd6{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}
+.add.data-v-0ecca1f8{width:702rpx;background:#fff;border-radius:16rpx;padding:24rpx;box-sizing:border-box;margin-bottom:20rpx}.add .addinfo.data-v-0ecca1f8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.add .name.data-v-0ecca1f8{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.add .phone.data-v-0ecca1f8{font-family:SFPro;font-weight:400;font-size:24rpx;color:#333;line-height:28rpx;text-align:left;font-style:normal;margin-left:16rpx}.history.data-v-0ecca1f8{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#333;line-height:42rpx;text-align:left;font-style:normal;margin:28rpx 0 24rpx}.page.data-v-0ecca1f8{padding:20rpx 24rpx}.page .content.data-v-0ecca1f8{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-0ecca1f8{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-0ecca1f8{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-0ecca1f8{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-0ecca1f8{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-0ecca1f8{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-0ecca1f8{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-0ecca1f8{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-0ecca1f8{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-0ecca1f8{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}

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

@@ -1 +1 @@
-<view class="data-v-3f5931b8"><view class="top-tab data-v-3f5931b8"><view data-event-opts="{{[['tap',[['switchTab',[1]]]]]}}" class="{{['data-v-3f5931b8',(manage==1)?'select':'']}}" bindtap="__e">{{''+i18n.inland+''}}</view><view data-event-opts="{{[['tap',[['switchTab',[0]]]]]}}" class="{{['data-v-3f5931b8',(manage==0)?'select':'']}}" bindtap="__e">{{''+i18n.international+''}}</view></view><block wx:if="{{$root.g0!=0}}"><view class="content data-v-3f5931b8"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><address-vue vue-id="{{'82512880-1-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^deleteAddress',[['deleteAddress']]],['^setDefault',[['setDefault']]],['^toDetail',[['toDetail']]],['^goBack',[['goBack',['$0'],[[['addressList','id',item.id]]]]]]]}}" bind:deleteAddress="__e" bind:setDefault="__e" bind:toDetail="__e" bind:goBack="__e" class="data-v-3f5931b8" bind:__l="__l"></address-vue></block></view></block><block wx:else><view class="empty data-v-3f5931b8">空空如也~</view></block><block wx:if="{{manage==1}}"><view class="footer data-v-3f5931b8"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/addEditAddress/addEditAddress']]]]]}}" class="add-international data-v-3f5931b8" bindtap="__e">{{''+i18n.add+''}}</button></view></block><block wx:else><view class="footer data-v-3f5931b8"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/internationalAddress/internationalAddress']]]]]}}" class="add-international data-v-3f5931b8" bindtap="__e">{{''+i18n.add+''}}</button></view></block></view>
+<view class="data-v-8dd1bef8"><view class="top-tab data-v-8dd1bef8"><view data-event-opts="{{[['tap',[['switchTab',[1]]]]]}}" class="{{['data-v-8dd1bef8',(manage==1)?'select':'']}}" bindtap="__e">{{''+i18n.inland+''}}</view><view data-event-opts="{{[['tap',[['switchTab',[0]]]]]}}" class="{{['data-v-8dd1bef8',(manage==0)?'select':'']}}" bindtap="__e">{{''+i18n.international+''}}</view></view><block wx:if="{{$root.g0!=0}}"><view class="content data-v-8dd1bef8"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><address-vue vue-id="{{'82512880-1-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^deleteAddress',[['deleteAddress']]],['^setDefault',[['setDefault']]],['^toDetail',[['toDetail']]],['^goBack',[['goBack',['$0'],[[['addressList','id',item.id]]]]]]]}}" bind:deleteAddress="__e" bind:setDefault="__e" bind:toDetail="__e" bind:goBack="__e" class="data-v-8dd1bef8" bind:__l="__l"></address-vue></block></view></block><block wx:else><view class="empty data-v-8dd1bef8">空空如也~</view></block><block wx:if="{{manage==1}}"><view class="footer data-v-8dd1bef8"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/addEditAddress/addEditAddress?ifadd=1']]]]]}}" class="add-international data-v-8dd1bef8" bindtap="__e">{{''+i18n.add+''}}</button></view></block><block wx:else><view class="footer data-v-8dd1bef8"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/internationalAddress/internationalAddress?']]]]]}}" class="add-international data-v-8dd1bef8" bindtap="__e">{{''+i18n.add+''}}</button></view></block></view>

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

@@ -1 +1 @@
-.top-tab.data-v-3f5931b8{display:flex;font-size:32rpx;color:rgba(34,34,34,.8);justify-content:space-around;background-color:#fff;height:80rpx;align-items:center}.top-tab .select.data-v-3f5931b8{position:relative;font-weight:600}.top-tab .select.data-v-3f5931b8::before{content:"";display:block;width:50%;height:4rpx;background-color:#f83224;position:absolute;bottom:-20rpx;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.content.data-v-3f5931b8{padding:20rpx 24rpx;padding-bottom:200rpx}.empty.data-v-3f5931b8{font-size:28rpx;display:flex;justify-content:center;align-items:center;color:rgba(51,51,51,.7);margin-top:200rpx}.footer.data-v-3f5931b8{position:fixed;bottom:0;background-color:#fff;display:flex;justify-content:space-around;width:750rpx;padding:20rpx 0 66rpx}.footer .wx.data-v-3f5931b8{width:338rpx;background-color:#fff;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#222;padding:0;margin:0;border:2rpx solid #979797}.footer .add.data-v-3f5931b8{width:338rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;padding:0;margin:0}.footer .add-international.data-v-3f5931b8{width:702rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;margin:0 auto}
+.top-tab.data-v-8dd1bef8{display:flex;font-size:32rpx;color:rgba(34,34,34,.8);justify-content:space-around;background-color:#fff;height:80rpx;align-items:center}.top-tab .select.data-v-8dd1bef8{position:relative;font-weight:600}.top-tab .select.data-v-8dd1bef8::before{content:"";display:block;width:50%;height:4rpx;background-color:#f83224;position:absolute;bottom:-20rpx;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.content.data-v-8dd1bef8{padding:20rpx 24rpx;padding-bottom:200rpx}.empty.data-v-8dd1bef8{font-size:28rpx;display:flex;justify-content:center;align-items:center;color:rgba(51,51,51,.7);margin-top:200rpx}.footer.data-v-8dd1bef8{position:fixed;bottom:0;background-color:#fff;display:flex;justify-content:space-around;width:750rpx;padding:20rpx 0 66rpx}.footer .wx.data-v-8dd1bef8{width:338rpx;background-color:#fff;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#222;padding:0;margin:0;border:2rpx solid #979797}.footer .add.data-v-8dd1bef8{width:338rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;padding:0;margin:0}.footer .add-international.data-v-8dd1bef8{width:702rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;margin:0 auto}

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

@@ -1 +1 @@
-<view class="data-v-da2b478a"><view class="top-search data-v-da2b478a"><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-da2b478a" bind:__l="__l"></u--input><view class="top-tab data-v-da2b478a"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-da2b478a',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-da2b478a',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-da2b478a',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-da2b478a',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-da2b478a"><view class="prompt data-v-da2b478a"><image class="prompt-icon data-v-da2b478a" src="../../static/mine/336.png" mode></image>{{'当前页面加载的订单总重量'+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-da2b478a"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-da2b478a" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-86b115f2"><view class="top-search data-v-86b115f2"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" 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-86b115f2" bind:__l="__l"></u--input><view class="top-tab data-v-86b115f2"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-86b115f2',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-86b115f2',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-86b115f2',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-86b115f2',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-86b115f2"><view class="prompt data-v-86b115f2"><image class="prompt-icon data-v-86b115f2" 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-86b115f2"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-86b115f2" bind:__l="__l"></package-card></view></block></view></view>

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

@@ -1 +1 @@
-.top-search.data-v-da2b478a{background-color:#fff;padding:20rpx 24rpx}.data-v-da2b478a .u-input{background-color:#f4f4f4}.top-tab.data-v-da2b478a{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-da2b478a{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-da2b478a{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-da2b478a::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-da2b478a{padding:20rpx 24rpx}.content .prompt.data-v-da2b478a{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-da2b478a{width:36rpx;height:36rpx;margin-right:20rpx}
+.top-search.data-v-86b115f2{background-color:#fff;padding:20rpx 24rpx}.data-v-86b115f2 .u-input{background-color:#f4f4f4}.top-tab.data-v-86b115f2{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-86b115f2{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-86b115f2{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-86b115f2::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-86b115f2{padding:20rpx 24rpx}.content .prompt.data-v-86b115f2{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-86b115f2{width:36rpx;height:36rpx;margin-right:20rpx}

unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{1257:function(t,n,e){"use strict";var r=e("a49a"),a=e.n(r);a.a},"467d":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},a49a:function(t,n,e){},aed1:function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var r=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),a=n.amount.split("."),u=n.amount.split(".");return{$orig:r,g0:a,g1:u}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},a=[]},efd1:function(t,n,e){"use strict";e.r(n);var r=e("aed1"),a=e("f4f4");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("1257");var o=e("828b"),f=Object(o["a"])(a["default"],r["b"],r["c"],!1,null,"97f7bda6",null,!1,r["a"],void 0);n["default"]=f.exports},f4f4:function(t,n,e){"use strict";e.r(n);var r=e("467d"),a=e.n(r);for(var u in r)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(u);n["default"]=a.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"4ce8":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return r}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),u=n.amount.split("."),c=n.amount.split(".");return{$orig:r,g0:u,g1:c}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},c=[]},"67f8":function(t,n,e){"use strict";e.r(n);var r=e("d77c"),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(c);n["default"]=u.a},c0c8:function(t,n,e){},d77c:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},e1ce:function(t,n,e){"use strict";e.r(n);var r=e("4ce8"),u=e("67f8");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("fc42");var o,f=e("f0c5"),a=Object(f["a"])(u["default"],r["b"],r["c"],!1,null,"97f7bda6",null,!1,r["a"],o);n["default"]=a.exports},fc42:function(t,n,e){"use strict";var r=e("c0c8"),u=e.n(r);u.a}}]);
+>>>>>>> a3ea1f0745e55ee4b5b28fdb7055a5e9f8f0faf3
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{"0ba5":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}},refuseImg:{typeof:Array,default:function(){return[]}}},data:function(){return{}}};n.default=r},"29e1":function(t,n,e){"use strict";e.r(n);var r=e("946e"),u=e("3439");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("750e");var f=e("828b"),o=Object(f["a"])(u["default"],r["b"],r["c"],!1,null,"5414d123",null,!1,r["a"],void 0);n["default"]=o.exports},3439:function(t,n,e){"use strict";e.r(n);var r=e("0ba5"),u=e.n(r);for(var a in r)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(a);n["default"]=u.a},"750e":function(t,n,e){"use strict";var r=e("d0ef"),u=e.n(r);u.a},"946e":function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var r=function(){var t=this.$createElement;this._self._c},u=[]},d0ef:function(t,n,e){}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{"2ec4":function(n,t,e){"use strict";e.r(t);var r=e("ee3f"),u=e("8177");for(var f in u)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(f);e("8ed4");var a,o=e("f0c5"),c=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"5414d123",null,!1,r["a"],a);t["default"]=c.exports},"5b13":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}},refuseImg:{typeof:Array,default:function(){return[]}}},data:function(){return{}}};t.default=r},8177:function(n,t,e){"use strict";e.r(t);var r=e("5b13"),u=e.n(r);for(var f in r)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(f);t["default"]=u.a},"8ed4":function(n,t,e){"use strict";var r=e("98ef"),u=e.n(r);u.a},"98ef":function(n,t,e){},ee3f:function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},f=[]}}]);
+>>>>>>> a3ea1f0745e55ee4b5b28fdb7055a5e9f8f0faf3
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/applicationInformation-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(n,t,e){"use strict";e.r(t);var r=e("263a"),u=e("58e4");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("948b");var a,o=e("f0c5"),f=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"59d7100c",null,!1,r["a"],a);t["default"]=f.exports},"263a":function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=[]},3589:function(n,t,e){},"58e4":function(n,t,e){"use strict";e.r(t);var r=e("694c"),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},"694c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={props:{goodsList:{typeof:Array,default:function(){return[]}}}};t.default=r},"948b":function(n,t,e){"use strict";var r=e("3589"),u=e.n(r);u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(n,e,t){"use strict";t.r(e);var u=t("3eb6"),o=t("58e4");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("46ce");var c,f=t("f0c5"),i=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"3158cb6c",null,!1,u["a"],c);e["default"]=i.exports},"10f5":function(n,e,t){},"3eb6":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"01eb"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"46ce":function(n,e,t){"use strict";var u=t("10f5"),o=t.n(u);o.a},"58e4":function(n,e,t){"use strict";t.r(e);var u=t("694c"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},"694c":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=u}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/commodity-create-component',
     {

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

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

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

@@ -1 +1 @@
-<view class="list data-v-59d7100c"><view class="merchant data-v-59d7100c"><image class="merchant-img data-v-59d7100c" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-59d7100c">{{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-59d7100c"><image class="detail-img data-v-59d7100c" src="{{item.sku_item.image}}" mode></image><view style="flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1;" class="data-v-59d7100c"><view class="data-v-59d7100c"><text class="toptitle data-v-59d7100c">{{item.goods.name_cn}}</text><view class="weight data-v-59d7100c">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-59d7100c"><view class="data-v-59d7100c"><text class="money data-v-59d7100c">¥</text><text class="money data-v-59d7100c" style="font-size:34rpx;">{{item.sku_item.price}}</text></view><view class="data-v-59d7100c">{{'x '+item.goods_num}}</view></view></view></view></block></view>
+<view class="list data-v-3158cb6c"><view class="merchant data-v-3158cb6c"><image class="merchant-img data-v-3158cb6c" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-3158cb6c">{{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-3158cb6c"><image class="detail-img data-v-3158cb6c" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-3158cb6c"><view class="data-v-3158cb6c"><text class="toptitle data-v-3158cb6c">{{item.goods.name_cn}}</text><view class="weight data-v-3158cb6c">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-3158cb6c"><view class="money data-v-3158cb6c"><text class="data-v-3158cb6c">¥</text><text style="font-size:34rpx;" class="data-v-3158cb6c">{{item.sku_item.price}}</text></view><view class="stepping data-v-3158cb6c"><u-icon vue-id="{{'e771f670-1-'+__i0__}}" name="minus" size="12" class="data-v-3158cb6c" bind:__l="__l"></u-icon><text class="data-v-3158cb6c">{{goodsValue}}</text><u-icon vue-id="{{'e771f670-2-'+__i0__}}" name="plus" size="12" class="data-v-3158cb6c" bind:__l="__l"></u-icon></view></view></view></view></block></view>

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

@@ -1 +1 @@
-.list.data-v-59d7100c{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-59d7100c{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-59d7100c{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-59d7100c{font-size:30rpx;color:#222}.list .detail.data-v-59d7100c{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-59d7100c{width:184rpx;height:184rpx;margin-right:24rpx}
+.list.data-v-3158cb6c{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-3158cb6c{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-3158cb6c{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-3158cb6c{font-size:30rpx;color:#222}.list .detail.data-v-3158cb6c{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-3158cb6c{width:184rpx;height:184rpx;margin-right:24rpx}.list .detail .detail-right.data-v-3158cb6c{flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1}.list .detail .detail-right .toptitle.data-v-3158cb6c{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;width:100%;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:1;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all;margin-bottom:16rpx}.list .detail .detail-right .weight.data-v-3158cb6c{font-family:PingFangSC,PingFang SC;font-size:24rpx;color:rgba(34,34,34,.6);line-height:34rpx}.list .detail .detail-right .money.data-v-3158cb6c{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.list .detail .detail-right .stepping.data-v-3158cb6c{display:flex;width:140rpx;height:40rpx;justify-content:space-around;align-items:center;font-size:20rpx;border:2rpx solid hsla(0,0%,59.2%,.4);border-radius:20rpx}

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

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(n,u,o){"use strict";o.r(u);var t=o("4b12"),e=o("a76f");for(var i in e)["default"].indexOf(i)<0&&function(n){o.d(u,n,(function(){return e[n]}))}(i);o("a551");var r,f=o("f0c5"),a=Object(f["a"])(e["default"],t["b"],t["c"],!1,null,"a2ab1d74",null,!1,t["a"],r);u["default"]=a.exports},"4b12":function(n,u,o){"use strict";var t;o.d(u,"b",(function(){return e})),o.d(u,"c",(function(){return i})),o.d(u,"a",(function(){return t}));var e=function(){var n=this,u=n.$createElement,o=(n._self._c,1==n.goodinfo.is_discount?Number(100*n.sku_info.price):null),t=1==n.goodinfo.is_discount?Number(100*n.value):null,e=1!=n.goodinfo.is_discount?Number(100*n.sku_info.discount_price):null,i=1!=n.goodinfo.is_discount?Number(100*n.value):null,r=Number(n.sku_info.weight),f=1==n.goodinfo.is_discount?Number(100*n.sku_info.price):null,a=1==n.goodinfo.is_discount?Number(100*n.value):null,c=1!=n.goodinfo.is_discount?Number(100*n.sku_info.discount_price):null,s=1!=n.goodinfo.is_discount?Number(100*n.value):null;n.$mp.data=Object.assign({},{$root:{m0:o,m1:t,m2:e,m3:i,m4:r,m5:f,m6:a,m7:c,m8:s}})},i=[]},"67aa":function(n,u,o){"use strict";Object.defineProperty(u,"__esModule",{value:!0}),u.default=void 0;var t={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},value:{typeof:Number,default:1}},computed:{i18n:function(){return this.$t("index")}}};u.default=t},a551:function(n,u,o){"use strict";var t=o("b142"),e=o.n(t);e.a},a76f:function(n,u,o){"use strict";o.r(u);var t=o("67aa"),e=o.n(t);for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(u,n,(function(){return t[n]}))}(i);u["default"]=e.a},b142:function(n,u,o){}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'pageD/newBulitOrder/component/goodsInformation-create-component',
+    {
+        'pageD/newBulitOrder/component/goodsInformation-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("0664"))
+        })
+    },
+    [['pageD/newBulitOrder/component/goodsInformation-create-component']]
+]);

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.json

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

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxml

@@ -0,0 +1 @@
+<view class="list data-v-a2ab1d74"><view class="abount data-v-a2ab1d74" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-a2ab1d74" style="margin-bottom:40rpx;"><view class="name data-v-a2ab1d74">{{i18n.Commodityamount}}</view><view class="money data-v-a2ab1d74">{{'¥'+(goodinfo.is_discount==1?$root.m0*$root.m1/10000:$root.m2*$root.m3/10000)+''}}</view></view><view class="u-flex u-row-between data-v-a2ab1d74"><view class="name data-v-a2ab1d74">{{i18n.Grosscommodityweight}}</view><view class="money data-v-a2ab1d74">{{$root.m4*value+"kg"}}</view></view><block wx:if="{{containname1}}"><view class="back u-flex data-v-a2ab1d74"><image style="width:32rpx;height:32rpx;" src="static/images/warning.png" mode class="data-v-a2ab1d74"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-a2ab1d74">{{i18n.buy+max_weight+"kg"+i18n.price+"¥"+unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-a2ab1d74" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-a2ab1d74">{{i18n.Costperkilogram}}</view><view class="money data-v-a2ab1d74">{{containname1?unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-a2ab1d74"><view class="name data-v-a2ab1d74">{{i18n.freight}}</view><view class="money data-v-a2ab1d74">{{containname1?sum:i18n.shippingmethod}}</view></view><view class="zong u-flex u-row-right data-v-a2ab1d74"><view class="data-v-a2ab1d74"><text class="small data-v-a2ab1d74">{{i18n.subtotal}}</text><text class="mon data-v-a2ab1d74">¥</text><text class="mon data-v-a2ab1d74" style="font-size:40rpx;">{{goodinfo.is_discount==1?$root.m5*$root.m6/10000:$root.m7*$root.m8/10000}}</text></view></view></view></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxss

@@ -0,0 +1 @@
+.list .abount.data-v-a2ab1d74{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-a2ab1d74{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-a2ab1d74{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-a2ab1d74{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-a2ab1d74{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-a2ab1d74{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-a2ab1d74{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/nextLogistics.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/nextLogistics.wxss

@@ -0,0 +1 @@
+.poptitle.data-v-51d2eff4{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-51d2eff4{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-51d2eff4{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-51d2eff4{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-51d2eff4{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-51d2eff4{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-51d2eff4{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-51d2eff4{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/recommendGoods.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/recommendGoods"],{"0eb8":function(t,n,e){},"1c78":function(t,n,e){"use strict";e.r(n);var i=e("5da7"),u=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=u.a},3013:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.swiptlist,(function(n,e){var i=t.__get_orig(n),u=0==n.is_discount?n.discount_price.slice(0,-3):null,c=0!=n.is_discount?n.price.slice(0,-3):null,r=0==n.is_discount?n.discount_price.slice(-3):null,o=0!=n.is_discount?n.price.slice(-3):null;return{$orig:i,g0:u,g1:c,g2:r,g3:o}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},c=[]},"5da7":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{swiptlist:{typeof:Array,default:function(){return[]}}},computed:{i18n:function(){return this.$t("index")}},methods:{todetail:function(n){t.reLaunch({url:"/pageA/productdetails?id="+n})}}};n.default=e}).call(this,e("543d")["default"])},8745:function(t,n,e){"use strict";e.r(n);var i=e("3013"),u=e("1c78");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("fed5");var r,o=e("f0c5"),a=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"0a78c2d6",null,!1,i["a"],r);n["default"]=a.exports},fed5:function(t,n,e){"use strict";var i=e("0eb8"),u=e.n(i);u.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'pageD/newBulitOrder/component/recommendGoods-create-component',
+    {
+        'pageD/newBulitOrder/component/recommendGoods-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("8745"))
+        })
+    },
+    [['pageD/newBulitOrder/component/recommendGoods-create-component']]
+]);

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/recommendGoods.json

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

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/recommendGoods.wxml

@@ -0,0 +1 @@
+<view class="list data-v-0a78c2d6"><view class="recommend data-v-0a78c2d6"><view class="top data-v-0a78c2d6"><image style="width:124rpx;height:30rpx;" src="../../../static/images/recommend.png" mode="scaleToFill" class="data-v-0a78c2d6"></image></view><view class="bottom data-v-0a78c2d6"><scroll-view class="u-flex data-v-0a78c2d6" style="column:gap 28rpx;display:flex;" scroll-x="{{true}}"><view class="u-flex data-v-0a78c2d6" style="column-gap:16rpx;"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['todetail',['$0'],[[['swiptlist','',idx,'id']]]]]]]}}" bindtap="__e" class="data-v-0a78c2d6"><image style="width:156rpx;height:156rpx;" src="{{item.$orig.image}}" mode class="data-v-0a78c2d6"></image><view class="title data-v-0a78c2d6">{{''+item.$orig.name_cn+''}}</view><block wx:if="{{language=='en-US'}}"><view class="title data-v-0a78c2d6">{{''+item.$orig.name_en+''}}</view></block><block wx:if="{{language=='es-ES'}}"><view class="title data-v-0a78c2d6">{{''+item.$orig.name_es+''}}</view></block><block wx:if="{{language=='it-IT'}}"><view class="title data-v-0a78c2d6">{{''+item.$orig.name_ita+''}}</view></block><view class="money data-v-0a78c2d6" style="color:#f83224;font-size:20rpx;"><text class="data-v-0a78c2d6">¥</text><text style="font-size:28rpx;" class="data-v-0a78c2d6">{{item.$orig.is_discount==0?item.g0:item.g1}}</text><text class="data-v-0a78c2d6">{{item.$orig.is_discount==0?item.g2:item.g3}}</text></view></view></block></view></scroll-view></view></view></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/recommendGoods.wxss

@@ -0,0 +1 @@
+.list .recommend.data-v-0a78c2d6{margin-top:20rpx}.list .recommend .title.data-v-0a78c2d6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#222;line-height:32rpx;text-align:left;font-style:normal;width:148rpx;height:64rpx;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all}.list .recommend .top.data-v-0a78c2d6{width:702rpx;height:64rpx;background:linear-gradient(180deg,#ffe7e3,#fff);border-radius:16rpx 16rpx 0 0;padding:24rpx 22rpx;box-sizing:border-box}.list .recommend .bottom.data-v-0a78c2d6{padding:0 20rpx 22rpx;box-sizing:border-box;background:#fff}.list .recommend .money.data-v-0a78c2d6{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/selectLogistics.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/selectLogistics"],{1973:function(n,e,t){},"63a6":function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"01eb"))}},a=function(){var n=this,e=n.$createElement;n._self._c},u=[]},8899:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={props:{logisticsShow:{typeof:Boolean,default:!1},containerList:{typeof:Array,default:function(){return[]}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{selectedIndex:0,transport_type_id:"",transportTypeName:""}},methods:{next:function(){console.log(this.transportTypeName)},change:function(n,e){this.transport_type_id=n.id,this.selectedIndex=e,this.transportTypeName=n.name_cn,"zh-CN"==this.language&&(this.transportTypeName=n.name_cn),"en-US"==this.language&&(this.transportTypeName=n.name_en),"es-ES"==this.language&&(this.transportTypeName=n.name_es),"it-IT"==this.language&&(this.transportTypeName=n.name_ita)}}};e.default=o},b717:function(n,e,t){"use strict";t.r(e);var o=t("8899"),a=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);e["default"]=a.a},bceb:function(n,e,t){"use strict";var o=t("1973"),a=t.n(o);a.a},dc77:function(n,e,t){"use strict";t.r(e);var o=t("63a6"),a=t("b717");for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);t("bceb");var i,r=t("f0c5"),c=Object(r["a"])(a["default"],o["b"],o["c"],!1,null,"1695356f",null,!1,o["a"],i);e["default"]=c.exports}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'pageD/newBulitOrder/component/selectLogistics-create-component',
+    {
+        'pageD/newBulitOrder/component/selectLogistics-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("dc77"))
+        })
+    },
+    [['pageD/newBulitOrder/component/selectLogistics-create-component']]
+]);

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/selectLogistics.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/selectLogistics.wxss

@@ -0,0 +1 @@
+.poptitle.data-v-1695356f{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.logname.data-v-1695356f{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:right;font-style:normal;overflow:hidden;width:220rpx;white-space:nowrap;text-overflow:ellipsis;text-align:center;word-break:break-all}.active.data-v-1695356f{width:218rpx;height:148rpx;background:rgba(247,50,36,.05);border-radius:8rpx;border:1rpx solid #f83224}.unactive.data-v-1695356f{width:218rpx;height:148rpx;border-radius:12rpx;border:1rpx solid #c3c3c3}.nextto.data-v-1695356f{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;margin-top:108rpx}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.json

@@ -2,6 +2,10 @@
   "navigationBarTitleText": "",
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "commodity": "/pageD/newBulitOrder/component/commodity"
+    "commodity": "/pageD/newBulitOrder/component/commodity",
+    "select-logistics": "/pageD/newBulitOrder/component/selectLogistics",
+    "next-logistics": "/pageD/newBulitOrder/component/nextLogistics",
+    "recommend-goods": "/pageD/newBulitOrder/component/recommendGoods",
+    "goods-information": "/pageD/newBulitOrder/component/goodsInformation"
   }
 }

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

@@ -1 +1 @@
-.page.data-v-54e1ff80{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box}.page .address.data-v-54e1ff80{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-54e1ff80{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-54e1ff80{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.page.data-v-408a0acc{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box}.page .address.data-v-408a0acc{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-408a0acc{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-408a0acc{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-408a0acc{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-408a0acc{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-408a0acc{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-408a0acc{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-408a0acc{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-408a0acc{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}

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

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/component/personalFunction"],{"6daf":function(t,n,e){"use strict";e.r(n);var u=e("8257"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);n["default"]=a.a},7525:function(t,n,e){"use strict";var u=e("f0c9"),a=e.n(u);a.a},8257:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{toSetup:function(){t.navigateTo({url:"/pageC/accountSetup/accountSetup"})},toSetleIn:function(){t.$u.http.post("/api/merchant/status").then((function(n){console.log(n),1==n.status||0==n.status||2==n.status?t.navigateTo({url:"/pageD/resultFeedback/resultFeedback"}):t.navigateTo({url:"/pageD/settleIn/settleIn"})}))}}};n.default=e}).call(this,e("df3c")["default"])},"8de0":function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var u=function(){var t=this.$createElement;this._self._c},a=[]},ae91:function(t,n,e){"use strict";e.r(n);var u=e("8de0"),a=e("6daf");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("7525");var o=e("828b"),i=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=i.exports},f0c9:function(t,n,e){}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/component/personalFunction"],{"02ab":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{tokefu:function(){t.navigateTo({url:"/pageA/service/service"})},toSetup:function(){t.navigateTo({url:"/pageC/accountSetup/accountSetup"})},toSetleIn:function(){t.$u.http.post("/api/merchant/status").then((function(n){console.log(n),1==n.status||0==n.status||2==n.status?t.navigateTo({url:"/pageD/resultFeedback/resultFeedback"}):t.navigateTo({url:"/pageD/settleIn/settleIn"})}))}}};n.default=e}).call(this,e("543d")["default"])},7909:function(t,n,e){"use strict";e.r(n);var u=e("02ab"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);n["default"]=a.a},"846a":function(t,n,e){},c28b:function(t,n,e){"use strict";var u=e("846a"),a=e.n(u);a.a},e347:function(t,n,e){"use strict";e.r(n);var u=e("f0ab"),a=e("7909");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("c28b");var o,r=e("f0c5"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],o);n["default"]=i.exports},f0ab:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return u}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]}}]);
+>>>>>>> a3ea1f0745e55ee4b5b28fdb7055a5e9f8f0faf3
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pages/mine/component/personalFunction-create-component',
     {

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

@@ -1 +1 @@
-<view class="team"><text class="team-title">{{i18n.thatPerson}}</text><view class="function-team"><view data-event-opts="{{[['tap',[['toSetleIn',['$event']]]]]}}" class="icon-center" bindtap="__e"><image class="form-icon" src="../../../static/mine/322.png" mode></image><view class="characters">{{i18n.become}}</view></view><view class="icon-center"><image class="form-icon" src="../../../static/mine/317.png" mode></image><view class="characters">{{i18n.pontact}}</view></view><view data-event-opts="{{[['tap',[['toSetup',['$event']]]]]}}" class="icon-center" bindtap="__e"><image class="form-icon" src="../../../static/mine/321.png" mode></image><view class="characters">{{i18n.accountSettings}}</view></view></view></view>
+<view class="team"><text class="team-title">{{i18n.thatPerson}}</text><view class="function-team"><view data-event-opts="{{[['tap',[['toSetleIn',['$event']]]]]}}" class="icon-center" bindtap="__e"><image class="form-icon" src="../../../static/mine/322.png" mode></image><view class="characters">{{i18n.become}}</view></view><view data-event-opts="{{[['tap',[['tokefu',['$event']]]]]}}" class="icon-center" bindtap="__e"><image class="form-icon" src="../../../static/mine/317.png" mode></image><view class="characters">{{i18n.pontact}}</view></view><view data-event-opts="{{[['tap',[['toSetup',['$event']]]]]}}" class="icon-center" bindtap="__e"><image class="form-icon" src="../../../static/mine/321.png" mode></image><view class="characters">{{i18n.accountSettings}}</view></view></view></view>

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

@@ -1 +0,0 @@
-<view class="content data-v-23f3a9a9" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-23f3a9a9"><scroll-view class="cont_view menu-scroll-view data-v-23f3a9a9" 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-23f3a9a9" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-23f3a9a9">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-23f3a9a9" 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-23f3a9a9"><view class="menu_right_view data-v-23f3a9a9"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-23f3a9a9" id="{{'item'+index}}"><view class="menu_right_title data-v-23f3a9a9">{{item.$orig[keyName]}}</view><view class="data-v-23f3a9a9"><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/dev/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.json → unpackage/dist/dev/mp-weixin/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.json

@@ -1,7 +1,7 @@
 {
+  "usingComponents": {},
+  "component": true,
   "componentGenerics": {
     "scoped-slots-default": true
-  },
-  "component": true,
-  "usingComponents": {}
+  }
 }

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

@@ -0,0 +1 @@
+<view class="content data-v-1c5a9dec" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-1c5a9dec"><scroll-view class="cont_view menu-scroll-view data-v-1c5a9dec" 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-1c5a9dec" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-1c5a9dec">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-1c5a9dec" 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-1c5a9dec"><view class="menu_right_view data-v-1c5a9dec"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-1c5a9dec" id="{{'item'+index}}"><view class="menu_right_title data-v-1c5a9dec">{{item.$orig[keyName]}}</view><view class="data-v-1c5a9dec"><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/dev/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxss → unpackage/dist/dev/mp-weixin/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxss

@@ -24,30 +24,30 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.content.data-v-23f3a9a9 {
+.content.data-v-1c5a9dec {
   display: flex;
   flex-direction: column;
 }
-.content .cont.data-v-23f3a9a9 {
+.content .cont.data-v-1c5a9dec {
   flex: 1;
   display: flex;
   overflow: hidden;
 }
-.content .cont .cont_view.data-v-23f3a9a9 {
+.content .cont .cont_view.data-v-1c5a9dec {
   height: 100%;
 }
-.content .cont .cont_view .menu_item.data-v-23f3a9a9 {
+.content .cont .cont_view .menu_item.data-v-1c5a9dec {
   position: relative;
   padding: 24rpx 12rpx;
 }
-.content .cont .cont_view .menu_item .menu_item_name.data-v-23f3a9a9 {
+.content .cont .cont_view .menu_item .menu_item_name.data-v-1c5a9dec {
   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-23f3a9a9 {
+.content .cont .cont_view .menu_item .y_teg.data-v-1c5a9dec {
   width: 6rpx;
   height: 40rpx;
   border-radius: 3rpx;
@@ -58,16 +58,16 @@
   -webkit-transform: translate(0, -50%);
           transform: translate(0, -50%);
 }
-.menu_right_view.data-v-23f3a9a9 {
+.menu_right_view.data-v-1c5a9dec {
   padding: 24rpx;
 }
-.menu_right_view .menu_right_item.data-v-23f3a9a9 {
+.menu_right_view .menu_right_item.data-v-1c5a9dec {
   margin-bottom: 30rpx;
 }
-.menu_right_view .menu_right_item.data-v-23f3a9a9:last-child {
+.menu_right_view .menu_right_item.data-v-1c5a9dec:last-child {
   min-height: 100vh;
 }
-.menu_right_title.data-v-23f3a9a9 {
+.menu_right_title.data-v-1c5a9dec {
   font-family: PingFangSC, PingFang SC;
   font-size: 28rpx;
   color: #222222;