冲突

pageA/order.vue

@@ -515,6 +515,30 @@
 					},
 				});
 			},
+			
+			//计算运费
+			calculate(){
+				uni.$u.http
+					.post("/api/order/calculate", {
+						address_id: this.addinfo.id, //3	是	String	地址ID
+						goods_id: this.goodinfo.id, //65	是	String	商品id
+						goods_num: this.value, //2	是	String	商品数量
+						sku_item_id: this.sku_info.id, //60	是	String	规格id
+						cart_ids: this.stringcheck, //8,9	是	String	购物车id
+						remark: "", //备注	是	String	备注
+						merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
+						container_id: this.containid, //1	是	String	货柜id
+						share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
+						belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+					})
+					.then((res) => {
+						this.sum = res.freight
+						if(this.sum==0){
+							this.unit_price  = 0
+						}
+					})
+					.catch(() => {});
+			}	,
 			//货柜列表
 			container() {
 				this.containlist = [];
@@ -558,11 +582,14 @@
 						if (this.goodinfo.is_shipping == 0) {
 							this.unit_price = 0;
 						} else {
-							this.unit_price = this.containlist[0].unit_price;
+							this.unit_price = this.containlist[0].unit_price;  
 						}
 						this.recommend_weight = this.containlist[0].recommend_weight;
 						this.weight_total = this.containlist[0].weight_total;
 						this.containid = this.containlist[0].id;
+						if(this.typea == "shop"){
+							this.calculate()
+						}
 						if (this.language == "zh-CN") {
 							this.containname = this.containlist[0].name_cn;
 						}

unpackage/dist/build/mp-weixin/pageC/recharge/recharge.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "充值",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "u--input": "/uview-ui/components/u--input/u--input",
     "all-right": "/pageC/mineComponent/allRight/allRight"

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

@@ -1 +1 @@
-.recharge.data-v-aa57c31e{height:100vh;background-color:#fff}.recharge .mine.data-v-aa57c31e{padding-top:63rpx;text-align:center;color:#222;font-size:28rpx;border-top:1px solid #ccc}.recharge .money.data-v-aa57c31e{font-size:84rpx;text-align:center;color:#222;font-weight:600;margin-top:28rpx;margin-bottom:20rpx}.recharge .to-withdrawal.data-v-aa57c31e{display:flex;justify-content:center}.recharge .select-money.data-v-aa57c31e{padding-top:42rpx;border-top:1px solid #ccc;margin:0 auto;margin-top:64rpx;width:94%}.recharge .select-money .title.data-v-aa57c31e{font-size:32rpx;color:#222;font-weight:500;margin-bottom:36rpx}.recharge .select-money .payment.data-v-aa57c31e{margin-top:46rpx}.recharge .select-money .payment .wx-pay.data-v-aa57c31e{height:100rpx;background-color:#f4f4f4;width:94%;display:flex;justify-content:space-between;align-items:center;padding:0 20rpx;font-size:32rpx}.recharge .select-money .payment .wx-pay .logo.data-v-aa57c31e{display:flex;align-items:center}.recharge .select-money .payment .wx-pay .wx-logo.data-v-aa57c31e{width:39rpx;height:34rpx;margin-right:18rpx}.recharge .select-money .recharge-btn.data-v-aa57c31e{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:150rpx}.recharge .select-money .select-recharge.data-v-aa57c31e{display:flex;justify-content:space-between;flex-wrap:wrap}.recharge .select-money .select-recharge .recharge-money.data-v-aa57c31e{width:210rpx;height:120rpx;border:1px solid #f83224;border-radius:16rpx;text-align:center;line-height:120rpx;font-size:40rpx;font-weight:600;margin-bottom:26rpx}.recharge .select-money .select-recharge .recharge-money text.data-v-aa57c31e{font-size:24rpx}.recharge .select-money .select-recharge .back-red.data-v-aa57c31e{background-color:#f83224;color:#fff}.data-v-aa57c31e .u-input{background-color:#f4f4f4;height:80rpx}
+.recharge.data-v-7efe9ad1{height:100vh;background-color:#fff}.recharge .mine.data-v-7efe9ad1{padding-top:63rpx;text-align:center;color:#222;font-size:28rpx;border-top:1px solid #ccc}.recharge .money.data-v-7efe9ad1{font-size:84rpx;text-align:center;color:#222;font-weight:600;margin-top:28rpx;margin-bottom:20rpx}.recharge .to-withdrawal.data-v-7efe9ad1{display:flex;justify-content:center}.recharge .select-money.data-v-7efe9ad1{padding-top:42rpx;border-top:1px solid #ccc;margin:0 auto;margin-top:64rpx;width:94%}.recharge .select-money .title.data-v-7efe9ad1{font-size:32rpx;color:#222;font-weight:500;margin-bottom:36rpx}.recharge .select-money .payment.data-v-7efe9ad1{margin-top:46rpx}.recharge .select-money .payment .wx-pay.data-v-7efe9ad1{height:100rpx;background-color:#f4f4f4;width:94%;display:flex;justify-content:space-between;align-items:center;padding:0 20rpx;font-size:32rpx}.recharge .select-money .payment .wx-pay .logo.data-v-7efe9ad1{display:flex;align-items:center}.recharge .select-money .payment .wx-pay .wx-logo.data-v-7efe9ad1{width:39rpx;height:34rpx;margin-right:18rpx}.recharge .select-money .recharge-btn.data-v-7efe9ad1{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:150rpx}.recharge .select-money .select-recharge.data-v-7efe9ad1{display:flex;justify-content:space-between;flex-wrap:wrap}.recharge .select-money .select-recharge .recharge-money.data-v-7efe9ad1{width:210rpx;height:120rpx;border:1px solid #f83224;border-radius:16rpx;text-align:center;line-height:120rpx;font-size:40rpx;font-weight:600;margin-bottom:26rpx}.recharge .select-money .select-recharge .recharge-money text.data-v-7efe9ad1{font-size:24rpx}.recharge .select-money .select-recharge .back-red.data-v-7efe9ad1{background-color:#f83224;color:#fff}.data-v-7efe9ad1 .u-input{background-color:#f4f4f4;height:80rpx}

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

@@ -1 +1 @@
-<view class="withdrawal data-v-06fc2dad"><view class="withdrawal-top data-v-06fc2dad"><view class="title data-v-06fc2dad">到账方式</view><view class="wx data-v-06fc2dad"><image class="wx-logo data-v-06fc2dad" src="../../static/mine/323.png" mode></image><text class="data-v-06fc2dad">微信余额</text></view></view><view class="content data-v-06fc2dad"><view class="money data-v-06fc2dad">提现金额</view><view class="inp data-v-06fc2dad"><text class="data-v-06fc2dad">￥</text><input type="number" data-event-opts="{{[['input',[['__set_model',['','money','$event',[]]]]]]}}" value="{{money}}" bindinput="__e" class="data-v-06fc2dad"/><text data-event-opts="{{[['tap',[['whole',['$event']]]]]}}" style="color:#f83224;" bindtap="__e" class="data-v-06fc2dad">全部提现</text></view><block wx:if="{{type=='balance'}}"><text class="all-money data-v-06fc2dad">{{"可提现金额￥"+userInformation.balance}}</text></block><block wx:else><text class="all-money data-v-06fc2dad">{{"可提现金额￥"+userInformation.deposit}}</text></block><button data-event-opts="{{[['tap',[['immediatelyWithdrawal',['$event']]]]]}}" class="immediately data-v-06fc2dad" bindtap="__e">立即提现</button><view data-event-opts="{{[['tap',[['toWithdrawalDetail',['$event']]]]]}}" class="detail data-v-06fc2dad" bindtap="__e">提现明细</view></view><u-toast vue-id="06ba9060-1" data-ref="uToast" class="data-v-06fc2dad vue-ref" bind:__l="__l"></u-toast></view>
+<view class="withdrawal data-v-4dc6d51b"><view class="withdrawal-top data-v-4dc6d51b"><view class="title data-v-4dc6d51b">{{''+i18n.paymentMethod+''}}</view><view class="wx data-v-4dc6d51b"><image class="wx-logo data-v-4dc6d51b" src="../../static/mine/323.png" mode></image><text class="data-v-4dc6d51b">{{i18n.weChatBalance}}</text></view></view><view class="content data-v-4dc6d51b"><view class="money data-v-4dc6d51b">{{''+i18n.withdrawalAmount+''}}</view><view class="inp data-v-4dc6d51b"><text class="data-v-4dc6d51b">￥</text><input type="number" data-event-opts="{{[['input',[['__set_model',['','money','$event',[]]]]]]}}" value="{{money}}" bindinput="__e" class="data-v-4dc6d51b"/><text data-event-opts="{{[['tap',[['whole',['$event']]]]]}}" style="color:#f83224;" bindtap="__e" class="data-v-4dc6d51b">{{i18n.withdrawAllFunds}}</text></view><block wx:if="{{type=='balance'}}"><text class="all-money data-v-4dc6d51b">{{i18n.moneyAmount+"￥"+userInformation.balance}}</text></block><block wx:else><text class="all-money data-v-4dc6d51b">{{i18n.moneyAmount+"￥"+userInformation.deposit}}</text></block><button data-event-opts="{{[['tap',[['immediatelyWithdrawal',['$event']]]]]}}" class="immediately data-v-4dc6d51b" bindtap="__e">{{''+i18n.withdrawImmediately+''}}</button><view data-event-opts="{{[['tap',[['toWithdrawalDetail',['$event']]]]]}}" class="detail data-v-4dc6d51b" bindtap="__e">{{''+i18n.withdrawalDetails+''}}</view></view><u-toast vue-id="06ba9060-1" data-ref="uToast" class="data-v-4dc6d51b vue-ref" bind:__l="__l"></u-toast></view>

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

@@ -1 +1 @@
-.withdrawal.data-v-06fc2dad{padding:20rpx 24rpx 0}.withdrawal .withdrawal-top.data-v-06fc2dad{display:flex;justify-content:space-between;align-items:center;height:104rpx;background-color:#fff;border-radius:16rpx;padding:0 24rpx}.withdrawal .withdrawal-top .title.data-v-06fc2dad{font-size:30rpx}.withdrawal .withdrawal-top .wx.data-v-06fc2dad{display:flex;align-items:center;height:50rpx}.withdrawal .withdrawal-top .wx .wx-logo.data-v-06fc2dad{width:40rpx;height:40rpx;margin-right:10rpx}.withdrawal .content.data-v-06fc2dad{background-color:#fff;border-radius:16rpx;margin-top:16rpx;padding:32rpx 24rpx 46rpx}.withdrawal .content .money.data-v-06fc2dad{font-size:30rpx}.withdrawal .content .inp.data-v-06fc2dad{display:flex;height:110rpx;align-items:center;justify-content:space-between;border-bottom:2rpx solid hsla(0,0%,59.2%,.3);margin-bottom:18rpx}.withdrawal .content .all-money.data-v-06fc2dad{font-size:24rpx;color:#555}.withdrawal .content .immediately.data-v-06fc2dad{box-shadow:0rpx 12rpx 28rpx -12rpx #f83224;border-radius:44rpx;background-color:#f83224;color:#fff;margin-top:60rpx;margin-bottom:60rpx}.withdrawal .content .detail.data-v-06fc2dad{text-align:center;font-size:26rpx;opacity:.6;color:#131415}
+.withdrawal.data-v-4dc6d51b{padding:20rpx 24rpx 0}.withdrawal .withdrawal-top.data-v-4dc6d51b{display:flex;justify-content:space-between;align-items:center;height:104rpx;background-color:#fff;border-radius:16rpx;padding:0 24rpx}.withdrawal .withdrawal-top .title.data-v-4dc6d51b{font-size:30rpx}.withdrawal .withdrawal-top .wx.data-v-4dc6d51b{display:flex;align-items:center;height:50rpx}.withdrawal .withdrawal-top .wx .wx-logo.data-v-4dc6d51b{width:40rpx;height:40rpx;margin-right:10rpx}.withdrawal .content.data-v-4dc6d51b{background-color:#fff;border-radius:16rpx;margin-top:16rpx;padding:32rpx 24rpx 46rpx}.withdrawal .content .money.data-v-4dc6d51b{font-size:30rpx}.withdrawal .content .inp.data-v-4dc6d51b{display:flex;height:110rpx;align-items:center;justify-content:space-between;border-bottom:2rpx solid hsla(0,0%,59.2%,.3);margin-bottom:18rpx}.withdrawal .content .all-money.data-v-4dc6d51b{font-size:24rpx;color:#555}.withdrawal .content .immediately.data-v-4dc6d51b{box-shadow:0rpx 12rpx 28rpx -12rpx #f83224;border-radius:44rpx;background-color:#f83224;color:#fff;margin-top:60rpx;margin-bottom:60rpx}.withdrawal .content .detail.data-v-4dc6d51b{text-align:center;font-size:26rpx;opacity:.6;color:#131415}

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

@@ -1 +1 @@
-.poptitle.data-v-ad404e52{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-ad404e52{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-ad404e52{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-ad404e52{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-ad404e52{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-ad404e52{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-ad404e52{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-ad404e52{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}
+.poptitle.data-v-37aea572{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-37aea572{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-37aea572{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-37aea572{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-37aea572{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-37aea572{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-37aea572{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-37aea572{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/newBulitOrder.wxss

@@ -1 +1 @@
-.page.data-v-0ec907c6{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-0ec907c6{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-0ec907c6{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-0ec907c6{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-0ec907c6{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-0ec907c6{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-0ec907c6{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-0ec907c6{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-0ec907c6{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-0ec907c6{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}
+.page.data-v-06f96b68{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-06f96b68{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-06f96b68{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-06f96b68{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-06f96b68{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-06f96b68{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-06f96b68{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-06f96b68{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-06f96b68{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-06f96b68{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/project.config.json

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

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

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

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

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