支付跳转

components/kj-tabbar/kj-tabbar.vue

@@ -182,10 +182,8 @@
 								this.selegoods = this.selegoods.concat(items);
 								this.stringcheck = this.stringcheck.concat(items.cart.id);
 								this.skuitemid = this.skuitemid.concat(items.cart.sku_item_id);
-								if (items.is_shipping == 1) {
+								// if (items.is_shipping == 1 && item.goods.length>1) {
 									this.cartid = this.cartid.concat(items.cart.id);
-								}
-								console.log('333333333', this.selegoods);
 							}
 						});
 					});
@@ -209,7 +207,7 @@
 								this.goodsWeight +
 								"&stringcheck=" +
 								this.stringcheck.toString() + '&volume=' + this.volume + '&cartid=' + this
-								.cartid.toString()
+								.cartid.join(',')
 						});
 					});
 				}

pageA/order.vue

@@ -419,6 +419,7 @@
 				this.goodsWeight = options.goodsWeight;
 				this.stringcheck = options.stringcheck;
 				this.cartid = options.cartid;
+				console.log(this.cartid);
 			} else if (options) {
 				this.value = options.value;
 				this.sku_info = JSON.parse(decodeURIComponent(options.sku));

pageA/payorder.vue

@@ -525,6 +525,7 @@ export default {
         return;
       }
       if (this.type == "") {
+		  console.log(3333333333);
         uni.$u.http
           .post("/api/order/payment", {
             order_id: this.orderid,
@@ -532,7 +533,6 @@ export default {
             customer_currency: "RMB",
           })
           .then((res) => {
-            console.log(res);
             if (this.pay_type == "wechat") {
               uni.requestPayment({
                 provider: "wxpay",
@@ -542,10 +542,10 @@ export default {
                 signType: res.signType,
                 paySign: res.paySign,
                 success: function (res) {
-                  this.$u.toast(this.i18n.Paymentsuccess);
+                  // this.$u.toast(this.i18n.Paymentsuccess);
                   console.log("success:" + JSON.stringify(res));
                   setTimeout(() => {
-                    uni.navigateTo({
+                    uni.reLaunch({
                       url: "/pageA/confirm",
                     });
                   }, 800);
@@ -563,21 +563,12 @@ export default {
                 // },
               });
             } else {
-              this.$u.toast(this.i18n.Paymentsuccess);
               setTimeout(() => {
-                uni.navigateTo({
+                uni.reLaunch({
                   url: "/pageA/confirm",
                 });
               }, 800);
             }
-
-            uni.showToast({
-              title: this.i18n.Paymentsuccess,
-              icon: "none",
-            });
-            uni.navigateBack({
-              delta: 1,
-            });
           })
           .catch(() => {});
       } else {

pageC/switchLanguage/switchLanguage.vue

@@ -1,121 +1,106 @@
 <template>
-  <view class="page">
-    <view class="btn-list">
-      <view class="language" data-lang="zh-CN" @tap="langChange">
-        <text>简体中文</text>
-        <image
-          v-if="languageSelect == 'zh-CN'"
-          class="selected"
-          src="../../static/mine/326.png"
-          mode=""
-        ></image>
-      </view>
-      <view class="language" data-lang="en-US" @tap="langChange">
-        <text>English</text>
-        <image
-          v-if="languageSelect == 'en-US'"
-          class="selected"
-          src="../../static/mine/326.png"
-          mode=""
-        ></image>
-      </view>
-      <view class="language" data-lang="es-ES" @tap="langChange">
-        <text>Español</text>
-        <image
-          v-if="languageSelect == 'es-ES'"
-          class="selected"
-          src="../../static/mine/326.png"
-          mode=""
-        ></image>
-      </view>
-      <view class="language" data-lang="it-IT" @tap="langChange">
-        <text>Italiano</text>
-        <image
-          v-if="languageSelect == 'it-IT'"
-          class="selected"
-          src="../../static/mine/326.png"
-          mode=""
-        ></image>
-      </view>
-    </view>
-  </view>
+	<view class="page">
+		<view class="btn-list">
+			<view class="language" data-lang="zh-CN" @tap="langChange">
+				<text>简体中文</text>
+				<image v-if="languageSelect == 'zh-CN'" class="selected" src="../../static/mine/326.png" mode="">
+				</image>
+			</view>
+			<view class="language" data-lang="en-US" @tap="langChange">
+				<text>English</text>
+				<image v-if="languageSelect == 'en-US'" class="selected" src="../../static/mine/326.png" mode="">
+				</image>
+			</view>
+			<view class="language" data-lang="es-ES" @tap="langChange">
+				<text>Español</text>
+				<image v-if="languageSelect == 'es-ES'" class="selected" src="../../static/mine/326.png" mode="">
+				</image>
+			</view>
+			<view class="language" data-lang="it-IT" @tap="langChange">
+				<text>Italiano</text>
+				<image v-if="languageSelect == 'it-IT'" class="selected" src="../../static/mine/326.png" mode="">
+				</image>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      languageSelect: "",
-      language: "cn",
-    };
-  },
-
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  methods: {
-    update() {
-      uni.$u.http
-        .post("/api/member/update", {
-          lang: this.language,
-        })
-        .then((res) => {
-          this.$u.toast("切换成功");
-        })
-        .catch(() => {});
-    },
-    langChange(e) {
-      const { lang } = e.currentTarget.dataset;
-      uni.setStorageSync("language", lang);
-      this._i18n.locale = lang;
-      this.languageSelect = lang;
-      if (this.languageSelect == "zh-CN") {
-        this.language = "cn";
-      } else if (this.languageSelect == "en-US") {
-        this.language = "en";
-      } else if (this.languageSelect == "es-ES") {
-        this.language = "es";
-      } else if (this.languageSelect == "it-IT") {
-        this.language = "ita";
-      }
-      this.update();
-      uni.setNavigationBarTitle({
-        title: this.i18n.switchLanguage,
-      });
-    },
-  },
-  created() {
-    this.languageSelect = this._i18n.locale;
-    uni.setNavigationBarTitle({
-      title: this.i18n.switchLanguage,
-    });
-  },
-};
+	export default {
+		data() {
+			return {
+				languageSelect: "",
+				language: "cn",
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		methods: {
+			update() {
+				uni.$u.http
+					.post("/api/member/update", {
+						lang: this.language,
+					})
+					.then((res) => {
+						this.$u.toast("切换成功");
+					})
+					.catch(() => {});
+			},
+			langChange(e) {
+				const {
+					lang
+				} = e.currentTarget.dataset;
+				uni.setStorageSync("language", lang);
+				this._i18n.locale = lang;
+				this.languageSelect = lang;
+				if (this.languageSelect == "zh-CN") {
+					this.language = "cn";
+				} else if (this.languageSelect == "en-US") {
+					this.language = "en";
+				} else if (this.languageSelect == "es-ES") {
+					this.language = "es";
+				} else if (this.languageSelect == "it-IT") {
+					this.language = "ita";
+				}
+				this.update();
+				uni.setNavigationBarTitle({
+					title: this.i18n.switchLanguage,
+				});
+			},
+		},
+		created() {
+			this.languageSelect = this._i18n.locale;
+			uni.setNavigationBarTitle({
+				title: this.i18n.switchLanguage,
+			});
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.page {
-  padding: 20rpx 24rpx;
+	.page {
+		padding: 20rpx 24rpx;
 
-  .btn-list {
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 20rpx;
+		.btn-list {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 20rpx;
 
-    .language {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 110rpx;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+			.language {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				height: 110rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
 
-      .selected {
-        width: 36rpx;
-        height: 36rpx;
-      }
-    }
-  }
-}
-</style>
+				.selected {
+					width: 36rpx;
+					height: 36rpx;
+				}
+			}
+		}
+	}
+</style>

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

@@ -1 +1 @@
-<view class="page data-v-813ecc82"><view style="margin-bottom:40rpx;" class="data-v-813ecc82">{{name}}</view><u-parse vue-id="85df3be4-1" content="{{content}}" class="data-v-813ecc82" bind:__l="__l"></u-parse><button data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="btn data-v-813ecc82" bindtap="__e">注销账号</button><u-modal vue-id="85df3be4-2" buttonReverse="{{true}}" showCancelButton="{{true}}" confirmText="{{i18n.enter}}" cancelText="{{i18n.Cancel}}" show="{{show}}" title="{{i18n.accountCancellation}}" content="{{i18n.closeaccount}}" confirmColor="#606266" cancelColor="#2979ff" data-event-opts="{{[['^cancel',[['e1']]],['^confirm',[['logout']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-813ecc82" bind:__l="__l"></u-modal></view>
+<view class="page data-v-1f1866ee"><view style="margin-bottom:40rpx;" class="data-v-1f1866ee">{{name}}</view><u-parse vue-id="85df3be4-1" content="{{content}}" class="data-v-1f1866ee" bind:__l="__l"></u-parse><button data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="btn data-v-1f1866ee" bindtap="__e">{{i18n.closeaccount}}</button><u-modal vue-id="85df3be4-2" buttonReverse="{{true}}" showCancelButton="{{true}}" confirmText="{{i18n.enter}}" cancelText="{{i18n.Cancel}}" show="{{show}}" title="{{i18n.accountCancellation}}" content="{{i18n.closeaccount}}" confirmColor="#606266" cancelColor="#2979ff" data-event-opts="{{[['^cancel',[['e1']]],['^confirm',[['logout']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-1f1866ee" bind:__l="__l"></u-modal></view>

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

@@ -1 +1 @@
-.page.data-v-813ecc82{background-color:#fff;height:92.5vh;padding:54rpx 44rpx;font-size:30rpx;color:rgba(34,34,34,.7)}.page .btn.data-v-813ecc82{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:108rpx}.page .cancellation.data-v-813ecc82{font-size:24rpx;text-align:center;margin-top:32rpx}
+.page.data-v-1f1866ee{background-color:#fff;height:92.5vh;padding:54rpx 44rpx;font-size:30rpx;color:rgba(34,34,34,.7)}.page .btn.data-v-1f1866ee{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:108rpx}.page .cancellation.data-v-1f1866ee{font-size:24rpx;text-align:center;margin-top:32rpx}

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

@@ -1 +1 @@
-<view class="detail data-v-3084485f"><view class="tab data-v-3084485f"><text data-event-opts="{{[['tap',[['swcthTab',['']]]]]}}" class="{{['data-v-3084485f',(selected=='')?'selected':'']}}" bindtap="__e">全部</text><text data-event-opts="{{[['tap',[['swcthTab',['income']]]]]}}" class="{{['data-v-3084485f',(selected=='income')?'selected':'']}}" bindtap="__e">收入</text><text data-event-opts="{{[['tap',[['swcthTab',['consume']]]]]}}" class="{{['data-v-3084485f',(selected=='consume')?'selected':'']}}" bindtap="__e">支出</text></view><view class="content data-v-3084485f"><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'58fbb4d4-1-'+index}}" itemInfo="{{item}}" class="data-v-3084485f" bind:__l="__l"></money-detail></block></view></view>
+<view class="detail data-v-f33baf56"><view class="tab data-v-f33baf56"><text data-event-opts="{{[['tap',[['swcthTab',['']]]]]}}" class="{{['data-v-f33baf56',(selected=='')?'selected':'']}}" bindtap="__e">{{i18n.whole}}</text><text data-event-opts="{{[['tap',[['swcthTab',['income']]]]]}}" class="{{['data-v-f33baf56',(selected=='income')?'selected':'']}}" bindtap="__e">{{i18n.income}}</text><text data-event-opts="{{[['tap',[['swcthTab',['consume']]]]]}}" class="{{['data-v-f33baf56',(selected=='consume')?'selected':'']}}" bindtap="__e">{{i18n.expenditure}}</text></view><view class="content data-v-f33baf56"><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'58fbb4d4-1-'+index}}" itemInfo="{{item}}" class="data-v-f33baf56" bind:__l="__l"></money-detail></block></view></view>

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

@@ -1 +1 @@
-.detail.data-v-3084485f{width:100%;background-color:#fff}.detail .tab.data-v-3084485f{display:flex;justify-content:space-around;align-items:center;color:rgba(34,34,34,.6);border-bottom:1rpx solid rgba(0,0,0,.1);height:90rpx}.detail .selected.data-v-3084485f{color:#222;font-weight:600;position:relative}.detail .selected.data-v-3084485f::before{content:"";display:block;height:4rpx;background-color:#f83224;width:100%;position:absolute;bottom:-24rpx}.detail .content.data-v-3084485f{padding:0 32rpx}
+.detail.data-v-f33baf56{width:100%;background-color:#fff}.detail .tab.data-v-f33baf56{display:flex;justify-content:space-around;align-items:center;color:rgba(34,34,34,.6);border-bottom:1rpx solid rgba(0,0,0,.1);height:90rpx}.detail .selected.data-v-f33baf56{color:#222;font-weight:600;position:relative}.detail .selected.data-v-f33baf56::before{content:"";display:block;height:4rpx;background-color:#f83224;width:100%;position:absolute;bottom:-24rpx}.detail .content.data-v-f33baf56{padding:0 32rpx}

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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "保证金说明",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "u-parse": "/uview-ui/components/u-parse/u-parse"
   }

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

@@ -1 +1 @@
-<view class="page"><u-parse vue-id="eb6a3088-1" content="{{agreementContent.content_cn}}" bind:__l="__l"></u-parse></view>
+<view class="page"><u-parse vue-id="eb6a3088-1" content="{{agreementContent}}" bind:__l="__l"></u-parse></view>

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

@@ -1 +1 @@
-<view class="balance"><view class="shadow"></view><view class="mine-balance"><view class="title"><text>{{i18n.myDeposit+"(元)"}}</text><image class="mine-324" src="../../static/mine/324.png" mode data-event-opts="{{[['tap',[['toExplain',['$event']]]]]}}" bindtap="__e"></image></view><view class="money">{{''+userInformation.deposit+''}}</view><view class="btn-list"><button data-event-opts="{{[['tap',[['toWithdrawal',['$event']]]]]}}" class="withdrawal" bindtap="__e">{{''+i18n.withdrawal+''}}</button><button data-event-opts="{{[['tap',[['toRecharge',['$event']]]]]}}" class="recharge" bindtap="__e">{{''+i18n.recharge+''}}</button></view></view><view class="money-detail"><view class="money-title"><text style="font-weight:600;">{{i18n.depositDetails}}</text><all-right vue-id="174485ea-1" name="{{i18n.whole}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></all-right></view><view><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'174485ea-2-'+index}}" itemInfo="{{item}}" bind:__l="__l"></money-detail></block></view></view><view class="bottom-text">没有更多数据了</view></view>
+<view class="balance"><view class="shadow"></view><view class="mine-balance"><view class="title"><text>{{i18n.myDeposit+"(元)"}}</text><image class="mine-324" src="../../static/mine/324.png" mode data-event-opts="{{[['tap',[['toExplain',['$event']]]]]}}" bindtap="__e"></image></view><view class="money">{{''+userInformation.deposit+''}}</view><view class="btn-list"><button data-event-opts="{{[['tap',[['toWithdrawal',['$event']]]]]}}" class="withdrawal" bindtap="__e">{{''+i18n.withdrawal+''}}</button><button data-event-opts="{{[['tap',[['toRecharge',['$event']]]]]}}" class="recharge" bindtap="__e">{{''+i18n.recharge+''}}</button></view></view><view class="money-detail"><view class="money-title"><text style="font-weight:600;">{{i18n.depositDetails}}</text><all-right vue-id="174485ea-1" name="{{i18n.whole}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></all-right></view><view><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'174485ea-2-'+index}}" itemInfo="{{item}}" bind:__l="__l"></money-detail></block></view></view><view class="bottom-text">{{''+i18n.noMore+''}}</view></view>

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

@@ -1 +1 @@
-<view class="data-v-49e69dfe"><view class="top-search data-v-49e69dfe"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-49e69dfe" bind:__l="__l"></u--input><view class="top-tab data-v-49e69dfe"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-49e69dfe"><view class="prompt data-v-49e69dfe"><image class="prompt-icon data-v-49e69dfe" 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-49e69dfe"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-49e69dfe" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-74fb450d"><view class="top-search data-v-74fb450d"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-74fb450d" bind:__l="__l"></u--input><view class="top-tab data-v-74fb450d"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-74fb450d"><view class="prompt data-v-74fb450d"><image class="prompt-icon data-v-74fb450d" 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-74fb450d"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-74fb450d" bind:__l="__l"></package-card></view></block></view></view>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

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

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

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

@@ -9,6 +9,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageA/confirm",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

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-text/l-painter-text.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": {}
 }