修改包裹支付

manifest.json

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

pageC/accountSetup/accountSetup.vue

@@ -1,213 +1,271 @@
 <template>
-	<view class="page">
-		<view class="set-top">
-			<view class="information" @click="toNextPage('/pageC/personalInformation/personalInformation')">
-				<view class="information-lift">
-					<image src="http://pic.imeitou.com/uploads/allimg/240522/10-240522162434-50.jpg" class="header-img"
-						mode=""></image>
-					<view class="name"> 张三 </view>
-				</view>
-				<image class="right-icon" src="../../static/mine/325.png" mode=""></image>
-			</view>
-			<view class="address" @click="toNextPage('/pageC/addressManagement/addressManagement')">
-				<view class="address-manage">
-					{{ i18n.address }}
-				</view>
-				<view class="text-right">
-					<text>{{ i18n.addAndEdit }}</text>
-					<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-				</view>
-			</view>
-		</view>
-
-		<view class="set-center">
-			<view class="security" @click="toNextPage('/pageC/accountSecurity/accountSecurity')">
-				<text>{{ i18n.account }}</text>
-				<view class="text-right">
-					<text>{{ i18n.password }}</text>
-					<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-				</view>
-			</view>
-			<view class="switch" @click="toNextPage('/pageC/switchLanguage/switchLanguage')">
-				<text>{{ i18n.switch }}</text>
-				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-			</view>
-		</view>
-
-		<view class="set-bottom">
-			<view class="text-1">
-				<text>{{ i18n.user }}</text>
-				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-			</view>
-			<view class="text-1" @click="toNextPage('/pageC/privacyPolicy/privacyPolicy')">
-				<text>{{ i18n.privacy }}</text>
-				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-			</view>
-			<view class="text-1">
-				<text>{{ i18n.platform }}</text>
-				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-			</view>
-			<view class="text-2">
-				<text>{{ i18n.merchant }}</text>
-				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
-			</view>
-		</view>
-
-		<button class="layout" @click="layout">{{ i18n.layout }}</button>
-	</view>
+  <view class="page">
+    <view class="set-top">
+      <view
+        class="information"
+        @click="toNextPage('/pageC/personalInformation/personalInformation')"
+      >
+        <view class="information-lift">
+          <image :src="userInfo.avatar" class="header-img" mode=""></image>
+          <view class="name"> {{ userInfo.nickname }} </view>
+        </view>
+        <image
+          class="right-icon"
+          src="../../static/mine/325.png"
+          mode=""
+        ></image>
+      </view>
+      <view
+        class="address"
+        @click="
+          toNextPage('/pageC/addressManagement/addressManagement?type=setup')
+        "
+      >
+        <view class="address-manage">
+          {{ i18n.address }}
+        </view>
+        <view class="text-right">
+          <text>{{ i18n.addAndEdit }}</text>
+          <image
+            src="../../static/mine/325.png"
+            class="right-icon"
+            mode=""
+          ></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="set-center">
+      <view
+        class="security"
+        @click="toNextPage('/pageC/accountSecurity/accountSecurity')"
+      >
+        <text>{{ i18n.account }}</text>
+        <view class="text-right">
+          <text>{{ i18n.password }}</text>
+          <image
+            src="../../static/mine/325.png"
+            class="right-icon"
+            mode=""
+          ></image>
+        </view>
+      </view>
+      <view
+        class="switch"
+        @click="toNextPage('/pageC/switchLanguage/switchLanguage')"
+      >
+        <text>{{ i18n.switch }}</text>
+        <image
+          src="../../static/mine/325.png"
+          class="right-icon"
+          mode=""
+        ></image>
+      </view>
+    </view>
+
+    <view class="set-bottom">
+      <view class="text-1">
+        <text>{{ i18n.user }}</text>
+        <image
+          src="../../static/mine/325.png"
+          class="right-icon"
+          mode=""
+        ></image>
+      </view>
+      <view
+        class="text-1"
+        @click="toNextPage('/pageC/privacyPolicy/privacyPolicy')"
+      >
+        <text>{{ i18n.privacy }}</text>
+        <image
+          src="../../static/mine/325.png"
+          class="right-icon"
+          mode=""
+        ></image>
+      </view>
+      <view class="text-1">
+        <text>{{ i18n.platform }}</text>
+        <image
+          src="../../static/mine/325.png"
+          class="right-icon"
+          mode=""
+        ></image>
+      </view>
+      <view class="text-2">
+        <text>{{ i18n.merchant }}</text>
+        <image
+          src="../../static/mine/325.png"
+          class="right-icon"
+          mode=""
+        ></image>
+      </view>
+    </view>
+
+    <button class="layout" @click="layout">{{ i18n.layout }}</button>
+  </view>
 </template>
 
 <script>
-	import AllRight from "../mineComponent/allRight/allRight.vue";
-	export default {
-		components: {
-			AllRight,
-		},
-		computed: {
-			i18n() {
-				return this.$t("index");
-			},
-		},
-		onShow() {
-			uni.setNavigationBarTitle({
-				title: this.i18n.setup,
-			});
-		},
-		data() {
-			return {};
-		},
-		methods: {
-			//退出登录
-			layout() {
-				uni.clearStorage()
-				uni.navigateTo({
-					url: "/pages/login/login",
-				});
-
-			},
-			toNextPage(url) {
-				uni.navigateTo({
-					url: url,
-				});
-			},
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: this.i18n.setup,
-			});
-		},
-		created() {},
-	};
+import AllRight from "../mineComponent/allRight/allRight.vue";
+export default {
+  components: {
+    AllRight,
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  onShow() {
+    uni.setNavigationBarTitle({
+      title: this.i18n.setup,
+    });
+  },
+  data() {
+    return {
+      userInfo: {},
+    };
+  },
+  methods: {
+    //退出登录
+    layout() {
+      uni.clearStorage();
+      uni.navigateTo({
+        url: "/pages/login/login",
+      });
+    },
+    toNextPage(url) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+    getUserInfo() {
+      uni.getStorage({
+        key: "user_info",
+        success: ({ data }) => {
+          this.userInfo = data;
+        },
+      });
+    },
+  },
+  mounted() {
+    this.getUserInfo();
+    uni.setNavigationBarTitle({
+      title: this.i18n.setup,
+    });
+  },
+  created() {},
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-
-		.set-top {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 20rpx;
-
-			.information {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				width: 100%;
-				height: 176rpx;
-
-				.information-lift {
-					display: flex;
-					align-items: center;
-
-					.header-img {
-						border-radius: 50%;
-						height: 116rpx;
-						width: 116rpx;
-						margin-right: 20rpx;
-					}
-
-					.name {
-						font-size: 36rpx;
-					}
-				}
-			}
-
-			.address {
-				display: flex;
-				justify-content: space-between;
-				height: 106rpx;
-				align-items: center;
-				border-top: 2rpx solid rgba(151, 151, 151, 0.2);
-			}
-		}
-
-		.set-center {
-			margin-top: 20rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 20rpx;
-
-			.security {
-				display: flex;
-				height: 102rpx;
-				border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
-				justify-content: space-between;
-				align-items: center;
-			}
-
-			.switch {
-				display: flex;
-				justify-content: space-between;
-				height: 104rpx;
-				align-items: center;
-			}
-		}
-
-		.set-bottom {
-			border-radius: 16rpx;
-			padding: 0 20rpx;
-			background-color: #fff;
-			margin-top: 20rpx;
-
-			.text-1 {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 102rpx;
-				border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
-			}
-
-			.text-2 {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 102rpx;
-			}
-		}
-
-		.layout {
-			border-radius: 16rpx;
-			background-color: #fff;
-			color: #f83224;
-			font-size: 32rpx;
-			height: 92rpx;
-			margin-top: 20rpx;
-		}
-
-		.right-icon {
-			width: 32rpx;
-			height: 32rpx;
-		}
-
-		.text-right {
-			display: flex;
-			align-items: center;
-
-			text {
-				font-size: 30rpx;
-				color: rgba(34, 34, 34, 0.5);
-			}
-		}
-	}
-</style>
+.page {
+  padding: 20rpx 24rpx;
+
+  .set-top {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 20rpx;
+
+    .information {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      width: 100%;
+      height: 176rpx;
+
+      .information-lift {
+        display: flex;
+        align-items: center;
+
+        .header-img {
+          border-radius: 50%;
+          height: 116rpx;
+          width: 116rpx;
+          margin-right: 20rpx;
+        }
+
+        .name {
+          font-size: 36rpx;
+        }
+      }
+    }
+
+    .address {
+      display: flex;
+      justify-content: space-between;
+      height: 106rpx;
+      align-items: center;
+      border-top: 2rpx solid rgba(151, 151, 151, 0.2);
+    }
+  }
+
+  .set-center {
+    margin-top: 20rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 20rpx;
+
+    .security {
+      display: flex;
+      height: 102rpx;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+      justify-content: space-between;
+      align-items: center;
+    }
+
+    .switch {
+      display: flex;
+      justify-content: space-between;
+      height: 104rpx;
+      align-items: center;
+    }
+  }
+
+  .set-bottom {
+    border-radius: 16rpx;
+    padding: 0 20rpx;
+    background-color: #fff;
+    margin-top: 20rpx;
+
+    .text-1 {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 102rpx;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+    }
+
+    .text-2 {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 102rpx;
+    }
+  }
+
+  .layout {
+    border-radius: 16rpx;
+    background-color: #fff;
+    color: #f83224;
+    font-size: 32rpx;
+    height: 92rpx;
+    margin-top: 20rpx;
+  }
+
+  .right-icon {
+    width: 32rpx;
+    height: 32rpx;
+  }
+
+  .text-right {
+    display: flex;
+    align-items: center;
+
+    text {
+      font-size: 30rpx;
+      color: rgba(34, 34, 34, 0.5);
+    }
+  }
+}
+</style>

pageC/addEditAddress/addEditAddress.vue

@@ -181,7 +181,9 @@ export default {
           .put(`/api/address/${this.addressId}`, { ...obj, ...this.cityPid })
           .then((res) => {
             console.log(res);
-            this.$router.back();
+            uni.navigateBack({
+              delta: 1,
+            });
           })
           .catch(() => {});
       } else {
@@ -189,7 +191,9 @@ export default {
           .post(`/api/address`, { ...obj, ...this.cityPid })
           .then((res) => {
             console.log(res);
-            this.$router.back();
+            uni.navigateBack({
+              delta: 1,
+            });
           })
           .catch(() => {});
       }

pageC/addEditAddress/component/selectCity.vue

@@ -6,7 +6,6 @@
       @close="$emit('close')"
       :round="10"
       :closeable="true"
-      @open="open"
     >
       <view
         style="
@@ -123,7 +122,7 @@ export default {
       title: "picker-view",
       marketList: [],
       distinguishList: [],
-      value: [],
+      value: [0, 0, 0],
       result: [],
       indicatorStyle: "height: 50px;",
       maskTopStyle: "",
@@ -131,20 +130,22 @@ export default {
       economize: {},
       market: {},
       distinguish: {},
+      isValue: true,
     };
   },
   mounted() {
-    // this.getCityList();
+    this.getCityList();
   },
   methods: {
-    open() {
-      console.log(111);
-      this.getCityList();
-    },
+    // open() {
+    //   this.getCityList();
+    // },
     //当选中的城市发生变化时调用
     bindChange(e) {
+      this.isValue = false;
       const val = e.detail.value;
       this.value = val;
+      console.log(val);
       this.marketList = this.cityList[val[0]].children;
       this.distinguishList = this.marketList[val[1] || 0].children;
       this.economize = this.cityList[val[0]];
@@ -156,13 +157,22 @@ export default {
       uni.$u.http.get(`/api/area/tree?pid=${this.countryId}`).then((res) => {
         this.cityList = res;
         if (this.countryId == "100000") {
-          this.marketList = res[0].children;
-          this.distinguishList = this.marketList[0].children;
+          this.marketList = res[this.value[1]].children;
+          this.distinguishList = this.marketList[this.value[2]].children;
         }
       });
     },
     //提交选中的城市
     submit() {
+      console.log(this.economize);
+      if (this.isValue) {
+        console.log(this.value);
+        this.marketList = this.cityList[this.value[0]].children;
+        this.distinguishList = this.marketList[this.value[1] || 0].children;
+        this.economize = this.cityList[this.value[0]];
+        this.market = this.marketList[this.value[1] || 0];
+        this.distinguish = this.distinguishList[this.value[2] || 0];
+      }
       const obj = {
         ...this.economize,
         children: {

pageC/addressManagement/addressManagement.vue

@@ -1,202 +1,220 @@
 <template>
-	<view>
-		<view class="top-tab">
-			<view :class="{ select: manage == 1 }" @click="switchTab(1)">
-				{{ i18n.inland }}
-			</view>
-			<view :class="{ select: manage == 0 }" @click="switchTab(0)">
-				{{ i18n.international }}
-			</view>
-		</view>
-		<view class="content" v-if="addressList.length != 0">
-			<addressVue @deleteAddress="deleteAddress" @setDefault="setDefault" @toDetail="toDetail"
-				@goBack="goBack(item)" v-for="item in addressList" :itemInfo="item" :key="item.id" />
-		</view>
-		<view class="empty" v-else> 空空如也~ </view>
-		<view class="footer" v-if="manage == 1">
-			<button class="wx">{{ i18n.wx }}</button>
-			<button class="add" @click="toAddRess('/pageC/addEditAddress/addEditAddress')">
-				{{ i18n.add }}
-			</button>
-		</view>
-		<view class="footer" v-else>
-			<button class="add-international" @click="toAddRess('/pageC/internationalAddress/internationalAddress')">
-				{{ i18n.add }}
-			</button>
-		</view>
-	</view>
+  <view>
+    <view class="top-tab">
+      <view :class="{ select: manage == 1 }" @click="switchTab(1)">
+        {{ i18n.inland }}
+      </view>
+      <view :class="{ select: manage == 0 }" @click="switchTab(0)">
+        {{ i18n.international }}
+      </view>
+    </view>
+    <view class="content" v-if="addressList.length != 0">
+      <addressVue
+        @deleteAddress="deleteAddress"
+        @setDefault="setDefault"
+        @toDetail="toDetail"
+        @goBack="goBack(item)"
+        v-for="item in addressList"
+        :itemInfo="item"
+        :key="item.id"
+      />
+    </view>
+    <view class="empty" v-else> 空空如也~ </view>
+    <view class="footer" v-if="manage == 1">
+      <button class="wx">{{ i18n.wx }}</button>
+      <button
+        class="add"
+        @click="toAddRess('/pageC/addEditAddress/addEditAddress')"
+      >
+        {{ i18n.add }}
+      </button>
+    </view>
+    <view class="footer" v-else>
+      <button
+        class="add-international"
+        @click="toAddRess('/pageC/internationalAddress/internationalAddress')"
+      >
+        {{ i18n.add }}
+      </button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import addressVue from "./component/address.vue";
-	export default {
-		components: {
-			addressVue,
-		},
-		data() {
-			return {
-				manage: 1,
-				addressList: [],
-			};
-		},
-		onLoad(options) {
-			this.manage = options.tabs
-		},
-		computed: {
-			i18n() {
-				return this.$t("index");
-			},
-		},
-		methods: {
-			goBack(item) {
-				const eventChannel = this.getOpenerEventChannel()
-				eventChannel.emit('getadd',item)
-				uni.$emit("isRefresh", this.index);
-				uni.navigateBack({
-					delta: 1,
-				});
-			},
+import addressVue from "./component/address.vue";
+export default {
+  components: {
+    addressVue,
+  },
+  data() {
+    return {
+      manage: 1,
+      addressList: [],
+      type: "", //判断在哪个页面进来
+    };
+  },
+  onLoad(options) {
+    console.log(options);
+    this.manage = options.tabs;
+    this.type = options.type;
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    goBack(item) {
+      //从账号设置进入该页面，则不允许返回上一页面
+      if (this.type == "setup") return;
+      const eventChannel = this.getOpenerEventChannel();
+      eventChannel.emit("getadd", item);
+      uni.$emit("isRefresh", this.index);
+      uni.navigateBack({
+        delta: 1,
+      });
+    },
 
-			switchTab(num) {
-				this.manage = num;
-				this.getAddressList(num);
-			},
-			//设置默认地址
-			setDefault(value) {
-				uni.$u.http
-					.post(`/api/address/default/${value.id}`)
-					.then((res) => {
-						this.getAddressList(this.manage);
-					})
-					.catch(() => {});
-			},
-			//跳转地址详情页
-			toDetail(id) {
-				if (this.manage) {
-					uni.navigateTo({
-						url: `/pageC/addEditAddress/addEditAddress?id=${id}`,
-					});
-				} else {
-					uni.navigateTo({
-						url: `/pageC/internationalAddress/internationalAddress?id=${id}`,
-					});
-				}
-			},
-			//删除地址
-			deleteAddress(value) {
-				uni.$u.http.delete(`/api/address/${value.id}`).then((res) => {
-					this.getAddressList(this.manage);
-				});
-			},
-			toAddRess(url) {
-				uni.navigateTo({
-					url,
-				});
-			},
-			getAddressList(num) {
-				uni.$u.http
-					.get(
-						`/api/address?is_page=0&page=1&limit=10&is_domestic=${num}&is_default=`
-					)
-					.then((res) => {
-						this.addressList = res;
-					});
-			},
-		},
-		onShow() {
-			this.getAddressList(this.manage);
-		},
-		mounted() {
-			// this.getAddressList(1);
-			uni.setNavigationBarTitle({
-				title: this.i18n.address,
-			});
-		},
-	};
+    switchTab(num) {
+      this.manage = num;
+      this.getAddressList(num);
+    },
+    //设置默认地址
+    setDefault(value) {
+      uni.$u.http
+        .post(`/api/address/default/${value.id}`)
+        .then((res) => {
+          this.getAddressList(this.manage);
+        })
+        .catch(() => {});
+    },
+    //跳转地址详情页
+    toDetail(id) {
+      if (this.manage) {
+        uni.navigateTo({
+          url: `/pageC/addEditAddress/addEditAddress?id=${id}`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pageC/internationalAddress/internationalAddress?id=${id}`,
+        });
+      }
+    },
+    //删除地址
+    deleteAddress(value) {
+      uni.$u.http.delete(`/api/address/${value.id}`).then((res) => {
+        this.getAddressList(this.manage);
+      });
+    },
+    toAddRess(url) {
+      uni.navigateTo({
+        url,
+      });
+    },
+    getAddressList(num) {
+      uni.$u.http
+        .get(
+          `/api/address?is_page=0&page=1&limit=10&is_domestic=${num}&is_default=`
+        )
+        .then((res) => {
+          this.addressList = res;
+        });
+    },
+  },
+  onShow() {
+    this.getAddressList(this.manage);
+  },
+  mounted() {
+    // this.getAddressList(1);
+    uni.setNavigationBarTitle({
+      title: this.i18n.address,
+    });
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.top-tab {
-		display: flex;
-		font-size: 32rpx;
-		color: rgba(34, 34, 34, 0.8);
-		justify-content: space-around;
-		background-color: #fff;
-		height: 80rpx;
-		align-items: center;
+.top-tab {
+  display: flex;
+  font-size: 32rpx;
+  color: rgba(34, 34, 34, 0.8);
+  justify-content: space-around;
+  background-color: #fff;
+  height: 80rpx;
+  align-items: center;
 
-		.select {
-			position: relative;
-			font-weight: 600;
-		}
+  .select {
+    position: relative;
+    font-weight: 600;
+  }
 
-		.select::before {
-			content: "";
-			display: block;
-			width: 50%;
-			height: 4rpx;
-			background-color: #f83224;
-			position: absolute;
-			bottom: -20rpx;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-	}
+  .select::before {
+    content: "";
+    display: block;
+    width: 50%;
+    height: 4rpx;
+    background-color: #f83224;
+    position: absolute;
+    bottom: -20rpx;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
 
-	.content {
-		padding: 20rpx 24rpx;
-		padding-bottom: 200rpx;
-	}
+.content {
+  padding: 20rpx 24rpx;
+  padding-bottom: 200rpx;
+}
 
-	.empty {
-		font-size: 28rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: rgba(51, 51, 51, 0.7);
-		margin-top: 200rpx;
-	}
+.empty {
+  font-size: 28rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: rgba(51, 51, 51, 0.7);
+  margin-top: 200rpx;
+}
 
-	.footer {
-		position: fixed;
-		bottom: 0;
-		background-color: #fff;
-		display: flex;
-		justify-content: space-around;
-		width: 750rpx;
-		padding: 20rpx 0 66rpx;
+.footer {
+  position: fixed;
+  bottom: 0;
+  background-color: #fff;
+  display: flex;
+  justify-content: space-around;
+  width: 750rpx;
+  padding: 20rpx 0 66rpx;
 
-		.wx {
-			width: 338rpx;
-			background-color: #fff;
-			border-radius: 40rpx;
-			height: 80rpx;
-			font-size: 32rpx;
-			color: #222;
-			padding: 0;
-			margin: 0;
-			border: 2rpx solid #979797;
-		}
+  .wx {
+    width: 338rpx;
+    background-color: #fff;
+    border-radius: 40rpx;
+    height: 80rpx;
+    font-size: 32rpx;
+    color: #222;
+    padding: 0;
+    margin: 0;
+    border: 2rpx solid #979797;
+  }
 
-		.add {
-			width: 338rpx;
-			background-color: #f83224;
-			border-radius: 40rpx;
-			height: 80rpx;
-			font-size: 32rpx;
-			color: #fff;
-			padding: 0;
-			margin: 0;
-		}
+  .add {
+    width: 338rpx;
+    background-color: #f83224;
+    border-radius: 40rpx;
+    height: 80rpx;
+    font-size: 32rpx;
+    color: #fff;
+    padding: 0;
+    margin: 0;
+  }
 
-		.add-international {
-			width: 702rpx;
-			background-color: #f83224;
-			border-radius: 40rpx;
-			height: 80rpx;
-			font-size: 32rpx;
-			color: #fff;
-			margin: 0 auto;
-		}
-	}
-</style>
+  .add-international {
+    width: 702rpx;
+    background-color: #f83224;
+    border-radius: 40rpx;
+    height: 80rpx;
+    font-size: 32rpx;
+    color: #fff;
+    margin: 0 auto;
+  }
+}
+</style>

pageC/internationalAddress/internationalAddress.vue

@@ -280,11 +280,15 @@ export default {
       };
       if (this.addressId) {
         uni.$u.http.put(`/api/address/${this.addressId}`, obj).then((res) => {
-          this.$router.back();
+          uni.navigateBack({
+            delta: 1,
+          });
         });
       } else {
         uni.$u.http.post(`/api/address`, obj).then((res) => {
-          this.$router.back();
+          uni.navigateBack({
+            delta: 1,
+          });
         });
       }
     },

pageC/myPackage/component/packageCard.vue

@@ -60,7 +60,8 @@
           v-show="
             itemInfo.status == 'domestic_delivered' ||
             itemInfo.status == 'overseas_undelivered' ||
-            itemInfo.status == 'overseas_delivered'
+            itemInfo.status == 'overseas_delivered' ||
+            itemInfo.status == 'packaging'
           "
           @click.stop="$emit('toInformation', itemInfo)"
         >
@@ -131,7 +132,7 @@ export default {
     },
     toPayment() {
       uni.navigateTo({
-        url: `/pageD/paymentOrder/paymentOrder?money=${this.itemInfo.actual_price}&weight=${this.itemInfo.actual_weight}&type=${this.itemInfo.goods[0].type_text}&num=${this.itemInfo.goods[0].number}&orderid=${this.itemInfo.id}`,
+        url: `/pageD/paymentOrder/paymentOrder?money=${this.itemInfo.estimated_price}&weight=${this.itemInfo.actual_weight}&packageType=${this.itemInfo.goods[0].type_text}&num=${this.itemInfo.goods[0].number}&orderid=${this.itemInfo.id}&type=${this.itemInfo.type}`,
       });
     },
     toSending() {

pageC/myPackage/myPackage.vue

@@ -84,6 +84,7 @@ export default {
   },
   onShow() {
     this.getPackageList(1);
+    this.getNum();
   },
   methods: {
     tabSwitch(num) {
@@ -136,7 +137,6 @@ export default {
   },
   created() {
     // this.getPackageList(1);
-    this.getNum();
     uni.setNavigationBarTitle({
       title: this.i18n.myPackage,
     });

pageC/orderForm/component/refundCard.vue

@@ -70,7 +70,11 @@
               >
                 售后详情
               </button>
-              <button class="status-2" v-if="item.refund.status == 2">
+              <button
+                class="status-2"
+                v-if="item.refund.status == 2"
+                @click="$emit('unreviewAfter', item)"
+              >
                 继续申请
               </button>
             </view>

pageC/orderForm/orderForm.vue

@@ -2,8 +2,22 @@
   <view>
     <u-navbar @leftClick="rightClick" bgColor="#f4f4f4" :autoBack="true">
       <view class="tab" slot="center">
-        <view style="width: 600rpx">
-          <input type="text" placeholder="搜索我的订单" class="inp" />
+        <view
+          style="
+            width: 450rpx;
+            margin-right: 150rpx;
+            background-color: #fff;
+            border-radius: 50rpx;
+          "
+        >
+          <u--input
+            placeholder="搜索我的订单"
+            border="surround"
+            shape="circle"
+            v-model="keywords"
+            @change="searchOrder"
+            class="inp"
+          ></u--input>
         </view>
       </view>
     </u-navbar>
@@ -76,6 +90,7 @@
             :itemInfo="item"
             :refundDetail="refundDetail"
             @toRefundDetail="toRefundDetail"
+            @unreviewAfter="unreviewAfter"
           />
         </view>
       </view>
@@ -107,6 +122,7 @@ export default {
       agreeShow: false,
       title: "",
       cancellation: {},
+      keywords: "", //搜索关键字
     };
   },
   computed: {
@@ -189,6 +205,13 @@ export default {
       }
     },
 
+    //搜索
+    searchOrder(e) {
+      this.keywords = e;
+      console.log(e);
+      this.getOrderList(1);
+    },
+
     //取消订单
     cancellationOrder(item) {
       this.agreeShow = true;
@@ -209,7 +232,7 @@ export default {
     getOrderList(value) {
       uni.$u.http
         .get(
-          `/api/order/order_list?status=${this.follow}&page=${this.page}&limit=10`
+          `/api/order/order_list?status=${this.follow}&page=${this.page}&limit=10&keywords=${this.keywords}`
         )
         .then((res) => {
           //确定是触底还是点击tab栏

pageC/refundDetail/component/refundSuccessful.vue

@@ -4,8 +4,13 @@
       <view class=""> 退款成功 </view>
       <view class="commodity-price">
         <text style="font-size: 20rpx">￥</text>
-        <text>133</text>.
-        <text style="font-size: 20rpx">22</text>
+        <text>{{
+          refundDetail.goods[0].refund.refund_price.split(".")[0]
+        }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          refundDetail.goods[0].refund.refund_price.split(".")[1]
+        }}</text>
       </view>
     </view>
     <view class="time"> 2023年12月4号 18:23 </view>
@@ -14,8 +19,13 @@
       <view class=""> 退款余额 </view>
       <view class="commodity-price">
         <text style="font-size: 20rpx">￥</text>
-        <text>133</text>.
-        <text style="font-size: 20rpx">22</text>
+        <text>{{
+          refundDetail.goods[0].refund.refund_price.split(".")[0]
+        }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          refundDetail.goods[0].refund.refund_price.split(".")[1]
+        }}</text>
       </view>
     </view>
 

pageC/refundDetail/component/refusalToRefund.vue

@@ -1,12 +1,21 @@
 <template>
   <view>
-    <view class="top-direction">
+    <view class="top-direction" v-if="refundDetail.goods[0].refund.status == 2">
       <view class="direction-frist">
         <view class=""> 卖家拒绝了您的退款申请 </view>
       </view>
       <view class="time"> {{ refundDetail.goods[0].refund.reason }} </view>
       <view class="time"> 2023-12-08 12:45 </view>
     </view>
+    <view class="top-direction" v-else>
+      <view class="direction-frist">
+        <view class=""> 已申请平台介入 </view>
+      </view>
+      <view class="time">
+        {{ refundDetail.goods[0].refund.reason || "" }}
+      </view>
+      <view class="time"> 2023-12-08 12:45 </view>
+    </view>
     <!-- <view class="direction-frist1">
       <view class=""> 退款成功 </view>
       <view class="commodity-price">

pageC/refundDetail/refundDetail.vue

@@ -12,7 +12,10 @@
     />
 
     <RefusalToRefund
-      v-if="refundDetail.goods[0].refund.status == 3"
+      v-if="
+        refundDetail.goods[0].refund.status == 2 ||
+        refundDetail.goods[0].refund.status == 3
+      "
       :refundDetail="refundDetail"
     />
 

pageD/homepage/component/goodsCard.vue

@@ -1,85 +1,90 @@
 <template>
-	<view class="card" @click="$emit('toDetail')">
-		<image class="goods-img"
-			src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226275/13/1657/110111/6547bda8F6d14df48/a73646abeaea625a.jpg.avif"
-			mode=""></image>
-		<view class="describe">
-			布兰德软罐头猫咪主食包0内脏 混合口味 实发400…
-		</view>
-		<view class="price-sale">
-			<view class="price">
-					<text style="font-size: 20rpx;">￥</text>
-					<text>133</text>.
-					<text style="font-size: 20rpx;">22</text>
-			</view>
-			<view class="sale">
-				销量 500+
-			</view>
-		</view>
-		<view class="evaluate">
-			<view style="margin-right: 12rpx;">
-				500+评价
-			</view>
-			<view>
-				95%好评
-			</view>
-		</view>
-	</view>
+  <view class="card" @click="$emit('toDetail', itemInfo)">
+    <image class="goods-img" :src="itemInfo.goods.image" mode=""></image>
+    <view class="describe">
+      {{ itemInfo.goods.name_cn }}
+    </view>
+    <view class="price-sale">
+      <view class="price">
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ itemInfo.goods.price.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          itemInfo.goods.price.split(".")[1]
+        }}</text>
+      </view>
+      <view class="sale"> 销量 {{ itemInfo.goods.sale_num }} </view>
+    </view>
+    <view class="evaluate">
+      <view style="margin-right: 12rpx">
+        {{ itemInfo.goods.comment_num }}评价
+      </view>
+      <view> {{ itemInfo.goods.comment_good_rapporto }}%好评 </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {}
-		}
-	}
+export default {
+  props: {
+    itemInfo: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.card {
-		width: 324rpx;
-		margin-bottom: 20rpx;
-		.goods-img {
-			width: 324rpx;
-			height: 324rpx;
-			border-radius: 16rpx;
-		}
+.card {
+  width: 324rpx;
+  margin-bottom: 20rpx;
+  .goods-img {
+    width: 324rpx;
+    height: 324rpx;
+    border-radius: 16rpx;
+  }
 
-		.describe {
-			font-size: 28rpx;
-			color: #333;
-			font-weight: 600;
-			width: 100%;
-			white-space: normal;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			-webkit-box-orient: vertical;
-			margin-top: 20rpx;
-		}
-		.price-sale{
-			display: flex;
-			margin-top: 16rpx;
-			align-items: flex-end;
-			.price{
-				color: #f83224;
-				font-weight: 600;
-			}
-			.sale{
-				font-size: 20rpx;
-				color: #333;
-				opacity: .8;
-				margin-bottom: 4rpx;
-				margin-left: 10rpx;
-			}
-		}
-		.evaluate{
-			display: flex;
-			align-items: center;
-			font-size: 24rpx;
-			color: #777;
-			margin-top: 16rpx;
-		}
-	}
-</style>
+  .describe {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 600;
+    width: 100%;
+    white-space: normal;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    margin-top: 20rpx;
+  }
+  .price-sale {
+    display: flex;
+    margin-top: 16rpx;
+    align-items: flex-end;
+    .price {
+      color: #f83224;
+      font-weight: 600;
+    }
+    .sale {
+      font-size: 20rpx;
+      color: #333;
+      opacity: 0.8;
+      margin-bottom: 4rpx;
+      margin-left: 10rpx;
+    }
+  }
+  .evaluate {
+    display: flex;
+    align-items: center;
+    font-size: 24rpx;
+    color: #777;
+    margin-top: 16rpx;
+  }
+}
+</style>

pageD/homepage/homepage.vue

@@ -5,12 +5,7 @@
     <!-- 页面渐变色背景 -->
     <view class="content">
       <view class="top-information">
-        <image
-          class="user-header"
-          src="https://q3.itc.cn/q_70/images03/20240519/1b4e7565b46241b68288ae482412a866.jpeg"
-          mode=""
-        >
-        </image>
+        <image class="user-header" :src="userInfo.image" mode=""> </image>
         <view class="btn-list">
           <button class="btn-1">
             <u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
@@ -19,7 +14,7 @@
             <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
           </button>
         </view>
-        <view class="name"> 小萌优选🔥（每天0元秒杀） </view>
+        <view class="name"> {{ userInfo.merchant_name }} </view>
 
         <view class="score">
           <u-rate
@@ -29,20 +24,22 @@
             :gutter="1"
             inactiveColor="#ffacab"
             activeColor="#FF1515"
-            v-model="value"
+            v-model="userInfo.score"
             :size="12"
           ></u-rate>
-          <text class="num">{{ value }}</text>
+          <text class="num">{{ userInfo.score }}</text>
         </view>
         <view class="sale">
           <view class="">
-            销售量 <text space="nbsp">{{ "&nbsp;" }} 2354w+</text>
+            销售量
+            <text space="nbsp">{{ "&nbsp;" }} {{ userInfo.sales_num }}</text>
           </view>
           <text space="nbsp" class="shu"
             >{{ "&nbsp;&nbsp;" }} | {{ "&nbsp;&nbsp;" }}</text
           >
           <view class="">
-            评价总数 <text space="nbsp">{{ "&nbsp;" }} 4w+</text>
+            评价总数
+            <text space="nbsp">{{ "&nbsp;" }} {{ userInfo.comment_num }}</text>
           </view>
         </view>
       </view>
@@ -86,10 +83,12 @@
           </view>
         </view>
         <view class="goods">
-          <GoodsCard @toDetail="toDetail" />
-          <GoodsCard @toDetail="toDetail" />
-          <GoodsCard @toDetail="toDetail" />
-          <GoodsCard @toDetail="toDetail" />
+          <GoodsCard
+            v-for="item in goodsList"
+            :key="item.id"
+            :itemInfo="item"
+            @toDetail="toDetail"
+          />
         </view>
       </view>
     </view>
@@ -107,11 +106,16 @@ export default {
       value: 4,
       selectTab: 0,
       iconUp: 0,
-      isShow: true,
+      isShow: true, //是否可关注
+      userId: "",
+      userInfo: {}, //用户信息
+      goodsList: [],
     };
   },
   onLoad(option) {
+    console.log(option);
     this.isShow = JSON.parse(option.page);
+    this.userId = option.merchant_id;
   },
   methods: {
     switchTab(num) {
@@ -137,24 +141,27 @@ export default {
       }
     },
     toDetail(item) {
+      console.log(item);
+      // return;
       uni.navigateTo({
-        url: "/pageA/productdetails",
+        url: `/pageA/productdetails?id=${item.id}`,
       });
     },
+
     getCommodityList(status = "") {
-      let userId;
-      uni.getStorage({
-        key: "user_info",
-        success: ({ data }) => {
-          console.log(data);
-          userId = data.merchant.id;
-        },
-      });
+      //获取用户信息
+      uni.$u.http
+        .get(`/api/merchant/info?merchant_id=${this.userId}`)
+        .then((res) => {
+          this.userInfo = res;
+        });
+
+      //获取店铺商品
       uni.$u.http
         .post(`/api/goods/merchant_goods`, {
           page: 1,
           limit: 10,
-          merchant_id: userId,
+          merchant_id: this.userId,
           status: status,
           keywords: this.keywords,
           source: this.source,
@@ -241,7 +248,7 @@ export default {
       }
 
       .score {
-        width: 148rpx;
+        width: 30%;
         height: 28rpx;
         background-color: rgba(255, 27, 0, 0.1);
         display: flex;

pageD/orderInformation/orderInformation.vue

@@ -329,7 +329,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "商品已寄往平台，正在运输中";
-          this.orderTitle = "待平台收货";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "unpaid") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -337,7 +337,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "商品已打包称重，等待用户付款";
-          this.orderTitle = "待付款";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "overseas_undelivered") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -345,7 +345,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "等待平台发货";
-          this.orderTitle = "待发货";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "overseas_delivered") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -353,7 +353,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "商品已发出，很快将发货至您的手中";
-          this.orderTitle = "已发货";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderStauts == 4) {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -373,7 +373,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "订单签收，交易已完成";
-          this.orderTitle = "已完成";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "domestic_received") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -381,7 +381,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "等待中转称重发出";
-          this.orderTitle = "中转已签收";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "closed") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -389,7 +389,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "订单关闭";
-          this.orderTitle = "订单已关闭";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "refunded") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -397,7 +397,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "订单已退款";
-          this.orderTitle = "已退款";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "refunding") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -405,7 +405,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "订单正在申请退款";
-          this.orderTitle = "退款中";
+          this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "domestic_undelivered") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
@@ -413,7 +413,7 @@ export default {
             backgroundColor: "#f4f4f4",
           });
           this.orderDetail = "商品等待发货中";
-          this.orderTitle = "国内待发货";
+          this.orderTitle = this.orderInformation.status_text;
         }
       });
     },

pageD/paymentOrder/paymentOrder.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="page">
     <view class="_top">
-      <view class="select">
+      <view class="select" v-if="payType == 'customer'">
         <uni-section title="本地数据" type="line">
           <uni-data-select
             v-model="value"
@@ -22,7 +22,7 @@
       </view>
       <view class="type-num">
         <text>包裹类型</text>
-        <text>{{ goodsDetail.type }}</text>
+        <text>{{ goodsDetail.packageType }}</text>
       </view>
       <view class="type-num">
         <text>包裹数量</text>
@@ -136,7 +136,7 @@ export default {
       payType: "balance",
       goodsDetail: {},
       exchangeList: [], //汇率列表
-      value: "",
+      value: 0,
       balance: "",
       balance1: 0,
     };
@@ -144,6 +144,9 @@ export default {
   onLoad(options) {
     this.goodsDetail = options;
     this.money = options.money;
+    if (this.goodsDetail.type == "group_package") {
+      this.goodsDetail.type = "group_pack_order";
+    }
   },
   methods: {
     switchType(str) {
@@ -201,83 +204,85 @@ export default {
           });
           this.exchangeList = this.exchangeList.reverse();
           this.value = this.exchangeList[0].value;
+          console.log(this.value);
         })
         .catch(() => {});
     },
     //支付
     payment() {
-      //   if (this.type == "") {
-      uni.$u.http
-        .post("/api/order/payment", {
-          order_id: this.goodsDetail.orderid,
-          pay_type: this.payType,
-          customer_currency: "RMB",
-        })
-        .then((res) => {
-          console.log(res);
-          if (this.payType == "wechat") {
-            uni.requestPayment({
-              provider: "wxpay",
-              timeStamp: String(res.timeStamp),
-              nonceStr: res.nonceStr,
-              package: res.package,
-              signType: res.signType,
-              paySign: res.paySign,
-              success: function (res) {
-                this.$u.toast("支付成功");
-                console.log("success:" + JSON.stringify(res));
-                setTimeout(() => {}, 800);
-              },
-              fail: function (err) {
-                console.log("fail:" + JSON.stringify(err));
-              },
-            });
-          }
-        })
-        .catch(() => {});
-      //   } else {
-      //     uni.$u.http
-      //       .post("/api/pay", {
-      //         order_id: this.orderid,
-      //         pay_type: this.pay_type,
-      //         type: this.type,
-      //         exchange_rate_id: this.exchange_rate_id,
-      //       })
-      //       .then((res) => {
-      //         if (this.pay_type == "wechat") {
-      //           uni.requestPayment({
-      //             provider: "wxpay",
-      //             timeStamp: String(res.timeStamp),
-      //             nonceStr: res.nonceStr,
-      //             package: res.package,
-      //             signType: res.signType,
-      //             paySign: res.paySign,
-      //             success: function (res) {
-      //               console.log("success:" + JSON.stringify(res));
-      //               setTimeout(() => {
-      //                 uni.switchTab({
-      //                   url: "/pages/express/express",
-      //                 });
-      //               }, 800);
-      //             },
-      //             fail: function (err) {
-      //               console.log("fail:" + JSON.stringify(err));
-      //             },
-      //           });
-      //         } else {
-      //           this.$u.toast("支付成功");
-      //           setTimeout(() => {
-      //             uni.switchTab({
-      //               url: "/pages/express/express",
-      //             });
-      //           }, 800);
-      //         }
-      //         // uni.navigateTo({
-      //         // 	url: 'confirm'
-      //         // })
-      //       })
-      //       .catch(() => {});
-      //   }
+      if (this.goodsDetail.type == "") {
+        uni.$u.http
+          .post("/api/order/payment", {
+            order_id: this.goodsDetail.orderid,
+            pay_type: this.payType,
+            customer_currency: "RMB",
+          })
+          .then((res) => {
+            console.log(res);
+            if (this.payType == "wechat") {
+              uni.requestPayment({
+                provider: "wxpay",
+                timeStamp: String(res.timeStamp),
+                nonceStr: res.nonceStr,
+                package: res.package,
+                signType: res.signType,
+                paySign: res.paySign,
+                success: function (res) {
+                  this.$u.toast("支付成功");
+                  console.log("success:" + JSON.stringify(res));
+                  setTimeout(() => {}, 800);
+                },
+                fail: function (err) {
+                  console.log("fail:" + JSON.stringify(err));
+                },
+              });
+            }
+          })
+          .catch(() => {});
+      } else {
+        uni.$u.http
+          .post("/api/pay", {
+            order_id: this.goodsDetail.orderid,
+            pay_type: this.payType,
+            type: this.goodsDetail.type,
+            // exchange_rate_id: this.exchange_rate_id,
+          })
+          .then((res) => {
+            if (this.payType == "wechat") {
+              debugger;
+              uni.requestPayment({
+                provider: "wxpay",
+                timeStamp: String(res.timeStamp),
+                nonceStr: res.nonceStr,
+                package: res.package,
+                signType: res.signType,
+                paySign: res.paySign,
+                success: function (res) {
+                  console.log("success:" + JSON.stringify(res));
+                  setTimeout(() => {
+                    uni.navigateBack({
+                      delta: 1,
+                    });
+                  }, 800);
+                },
+                fail: function (err) {
+                  console.log("fail:" + JSON.stringify(err));
+                },
+              });
+            } else {
+              this.$u.toast("支付成功");
+              setTimeout(() => {
+                uni.navigateBack({
+                  delta: 1,
+                });
+              }, 800);
+            }
+            // uni.navigateTo({
+            // 	url: 'confirm'
+            // })
+          })
+          .catch(() => {});
+      }
     },
   },
   created() {

pageD/settleIn/settleIn.vue

@@ -112,6 +112,31 @@ export default {
     },
     submit() {
       delete this.model1.code;
+      if (!this.model1.name) {
+        uni.showToast({
+          title: "请填写姓名",
+          icon: "none",
+        });
+        return;
+      } else if (!this.model1.idcard) {
+        uni.showToast({
+          title: "请填写身份证号",
+          icon: "none",
+        });
+        return;
+      } else if (!this.model1.phone) {
+        uni.showToast({
+          title: "请填写手机号",
+          icon: "none",
+        });
+        return;
+      } else if (!this.model1.card_number) {
+        uni.showToast({
+          title: "请填写银行卡号",
+          icon: "none",
+        });
+        return;
+      }
       uni.$u.http.post("/api/merchant/apply", this.model1).then((res) => {
         console.log(res);
       });

pages/mine/component/teamFunction.vue

@@ -1,108 +1,159 @@
 <template>
-	<!-- 团长功能 -->
-	<view class="team">
-		<text class="team-title">{{i18n.leaderunction}}</text>
-		<view class="function-team">
-			<view class="icon-center" @click="toNextPage('/pageD/platformProducts/platformProducts')">
-				<image class="form-icon" src="../../../static/mine/319.png" mode=""></image>
-				<view class="characters">{{i18n.platform}}</view>
-			</view>
-			<view class="icon-center" @click="toNextPage('/pageD/commodityManage/commodityManage')">
-				<image class="form-icon" src='../../../static/mine/318.png' mode=""></image>
-				<view class="characters">{{i18n.productManagement}}</view>
-			</view>
-			<view class="icon-center" @click="toNextPage('/pageD/orderFormManage/orderFormManage')">
-				<image class="form-icon" src="../../../static/mine/315.png" mode=""></image>
-				<view class="characters">{{i18n.orderManagement}}</view>
-			</view>
-			<view class="icon-center" @click="toNextPage('/pageD/afterSalesManage/afterSalesManage')">
-				<image class="form-icon" src="../../../static/mine/320.png" mode=""></image>
-				<view class="characters">{{i18n.afterSales}}</view>
-			</view>
-			<view class="icon-center" @click="toNextPage('/pageD/supplyChainGoods/supplyChainGoods')">
-				<image class="form-icon" src="../../../static/mine/316.png" mode=""></image>
-				<view class="characters">{{i18n.supplyChain}}</view>
-			</view>
-			<view class="icon-center">
-				<image class="form-icon" style="padding: 0 15px;" src="../../../static/mine/pc.png" mode=""></image>
-				<view class="characters">{{i18n.PCEnd}}</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 class="icon-center"  @click="toNextPage('/pageC/accountSetup/accountSetup')">
-				<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.leaderunction }}</text>
+    <view class="function-team">
+      <view
+        class="icon-center"
+        @click="toNextPage('/pageD/platformProducts/platformProducts')"
+      >
+        <image
+          class="form-icon"
+          src="../../../static/mine/319.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.platform }}</view>
+      </view>
+      <view
+        class="icon-center"
+        @click="toNextPage('/pageD/commodityManage/commodityManage')"
+      >
+        <image
+          class="form-icon"
+          src="../../../static/mine/318.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.productManagement }}</view>
+      </view>
+      <view
+        class="icon-center"
+        @click="toNextPage('/pageD/orderFormManage/orderFormManage')"
+      >
+        <image
+          class="form-icon"
+          src="../../../static/mine/315.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.orderManagement }}</view>
+      </view>
+      <view
+        class="icon-center"
+        @click="toNextPage('/pageD/afterSalesManage/afterSalesManage')"
+      >
+        <image
+          class="form-icon"
+          src="../../../static/mine/320.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.afterSales }}</view>
+      </view>
+      <view
+        class="icon-center"
+        @click="toNextPage('/pageD/supplyChainGoods/supplyChainGoods')"
+      >
+        <image
+          class="form-icon"
+          src="../../../static/mine/316.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.supplyChain }}</view>
+      </view>
+      <view
+        class="icon-center"
+        @click="toNextPage('/pageD/resultFeedback/resultFeedback')"
+      >
+        <image
+          class="form-icon"
+          style="padding: 0 15px"
+          src="../../../static/mine/pc.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.PCEnd }}</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
+        class="icon-center"
+        @click="toNextPage('/pageC/accountSetup/accountSetup')"
+      >
+        <image
+          class="form-icon"
+          src="../../../static/mine/321.png"
+          mode=""
+        ></image>
+        <view class="characters">{{ i18n.accountSettings }}</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				
-			}
-		},
-		computed:{
-			i18n(){
-				return this.$t("index")
-			},
-		},
-		methods:{
-			toNextPage(url){
-				uni.navigateTo({
-					url:url
-				})
-			},
-			
-		}
-	}
+export default {
+  data() {
+    return {};
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    toNextPage(url) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.team{
-		width: 100%;
-		background-color: #fff;
-		border-radius: 10px;
-		margin-top: 10px;
-		padding-top: 14px;
-		padding-bottom: 20px;
-		.team-title{
-			color: #222;
-			font-size: 14px;
-			font-weight: 600;
-			display: block;
-			margin-left: 10px;
-		}
-		.function-team{
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-around;
-			align-items: center;
-			.icon-center{
-				width: 18%;
-				margin-top: 18px;
-				display: flex;
-				flex-wrap: wrap;
-				padding: 0 10px;
-				justify-content: center;
-				flex-direction: column;
-				align-items: center;
-			}
-			.form-icon{
-				width: 24px;
-				height: 24px;
-			}
-			
-			.characters{
-				color: #202020;
-				font-size: 12px;
-				text-align: center;
-				margin-top: 10px;
-			}
-		}
-	}
-</style>
+.team {
+  width: 100%;
+  background-color: #fff;
+  border-radius: 10px;
+  margin-top: 10px;
+  padding-top: 14px;
+  padding-bottom: 20px;
+  .team-title {
+    color: #222;
+    font-size: 14px;
+    font-weight: 600;
+    display: block;
+    margin-left: 10px;
+  }
+  .function-team {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    align-items: center;
+    .icon-center {
+      width: 18%;
+      margin-top: 18px;
+      display: flex;
+      flex-wrap: wrap;
+      padding: 0 10px;
+      justify-content: center;
+      flex-direction: column;
+      align-items: center;
+    }
+    .form-icon {
+      width: 24px;
+      height: 24px;
+    }
+
+    .characters {
+      color: #202020;
+      font-size: 12px;
+      text-align: center;
+      margin-top: 10px;
+    }
+  }
+}
+</style>

pages/mine/mine.vue

@@ -58,10 +58,13 @@ export default {
       userInformation: {},
     };
   },
+  onShow() {
+    this.getUserInfo();
+  },
   methods: {
     toHome() {
       uni.navigateTo({
-        url: "/pageD/homepage/homepage?page=false",
+        url: `/pageD/homepage/homepage?page=false&merchant_id=${this.userInformation.merchant.id}`,
       });
     },
     getUserInfo() {
@@ -80,7 +83,6 @@ export default {
       frontColor: "#ffffff",
       backgroundColor: "#f4f4f4",
     });
-    this.getUserInfo();
   },
 };
 </script>

unpackage/dist/build/mp-weixin/pageA/balance.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"0148":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u},"2a70":function(e,n,t){"use strict";t.r(n);var u=t("0148"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},5536:function(e,n,t){"use strict";t.r(n);var u=t("cdee"),a=t("2a70");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);var c,f=t("f0c5"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},5605:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var a=u(t("5536"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},cdee:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var a=function(){var e=this,n=e.$createElement;e._self._c},r=[]}},[["5605","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"038d":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}}}},"2ecb":function(e,n,t){"use strict";t.r(n);var u=t("038d"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},4470:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},7055:function(e,n,t){"use strict";t.r(n);var u=t("4470"),a=t("2ecb");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=i.exports},c9be:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("7055"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["c9be","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/confirm.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{6491:function(n,t,e){"use strict";e.r(t);var u=e("92df"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a},"6e3d":function(n,t,e){"use strict";e.r(t);var u=e("a8c7"),a=e("6491");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("7474");var i,r=e("f0c5"),f=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,"25e811c0",null,!1,u["a"],i);t["default"]=f.exports},7474:function(n,t,e){"use strict";var u=e("ac60"),a=e.n(u);a.a},"8a38":function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("6e3d"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"92df":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.switchTab({url:"/pages/mine/mine"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};t.default=e}).call(this,e("543d")["default"])},a8c7:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var a=function(){var n=this,t=n.$createElement;n._self._c},c=[]},ac60:function(n,t,e){}},[["8a38","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,t,e){"use strict";e.r(t);var u=e("ea50"),c=e("53f3");for(var i in c)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(i);e("fcd2");var a=e("828b"),f=Object(a["a"])(c["default"],u["b"],u["c"],!1,null,"25e811c0",null,!1,u["a"],void 0);t["default"]=f.exports},"29cd":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.switchTab({url:"/pages/mine/mine"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};t.default=e}).call(this,e("df3c")["default"])},"4f77":function(n,t,e){},"53f3":function(n,t,e){"use strict";e.r(t);var u=e("29cd"),c=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=c.a},ea50:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},c=[]},fcd2:function(n,t,e){"use strict";var u=e("4f77"),c=e.n(u);c.a},fdd5:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var c=u(e("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(c.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/index.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"0387":function(e,t,n){"use strict";var a=n("b61b"),r=n.n(a);r.a},"73d5":function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){return a}));var r=function(){var e=this,t=e.$createElement;e._self._c},c=[]},b00b:function(e,t,n){"use strict";n.r(t);var a=n("73d5"),r=n("e3c0");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("0387");var o,u=n("f0c5"),i=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],o);t["default"]=i.exports},b61b:function(e,t,n){},cde8:function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("f93b");a(n("66fd"));var r=a(n("b00b"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},e3c0:function(e,t,n){"use strict";n.r(t);var a=n("f05a"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f05a:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a}},[["cde8","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/index"],{"9c25":function(e,t,n){},"9f3f":function(e,t,n){"use strict";n.r(t);var a=n("f6eb"),r=n("e35d");for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);n("a165");var o=n("828b"),u=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=u.exports},a165:function(e,t,n){"use strict";var a=n("9c25"),r=n.n(a);r.a},a412:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{code:"",characters:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}},methods:{generateRandomCode:function(){for(var e="",t=0;t<4;t++){var n=Math.floor(Math.random()*this.characters.length);e+=this.characters[n]}this.code=e,console.log(this.code)},generateCode:function(){this.generateRandomCode()}},mounted:function(){this.generateCode()}};t.default=a},ca23:function(e,t,n){"use strict";(function(e,t){var a=n("47a9");n("abeb");a(n("3240"));var r=a(n("9f3f"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(r.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},e35d:function(e,t,n){"use strict";n.r(t);var a=n("a412"),r=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=r.a},f6eb:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},r=[]}},[["ca23","common/runtime","common/vendor"]]]);

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
-.payment.data-v-5dcbc573{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-5dcbc573{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-5dcbc573{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-5dcbc573{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-5dcbc573{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-5dcbc573{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-5dcbc573{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-5dcbc573{position:relative}.back .topbox .state.data-v-5dcbc573{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-5dcbc573{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-5dcbc573{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-55906226{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-55906226{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-55906226{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-55906226{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-55906226{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-55906226{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-55906226{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-55906226{position:relative}.back .topbox .state.data-v-55906226{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-55906226{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-55906226{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
->>>>>>> 3aae73a792e3fefab7103cbdce52cc9f366debc5
+.payment.data-v-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-2cf4bd4e{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-2cf4bd4e{position:relative}.back .topbox .state.data-v-2cf4bd4e{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-2cf4bd4e{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-2cf4bd4e{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

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

@@ -9,6 +9,10 @@
     "uni-rate": "/uni_modules/uni-rate/components/uni-rate/uni-rate",
     "u-parse": "/uview-ui/components/u-parse/u-parse",
     "u-popup": "/uview-ui/components/u-popup/u-popup",
-    "u-number-box": "/uview-ui/components/u-number-box/u-number-box"
+    "u-number-box": "/uview-ui/components/u-number-box/u-number-box",
+    "l-painter": "/uni_modules/lime-painter/components/l-painter/l-painter",
+    "l-painter-image": "/uni_modules/lime-painter/components/l-painter-image/l-painter-image",
+    "l-painter-text": "/uni_modules/lime-painter/components/l-painter-text/l-painter-text",
+    "l-painter-qrcode": "/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode"
   }
 }

unpackage/dist/build/mp-weixin/pageA/service/service.js

@@ -1 +1 @@
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/service/service"],{"277f":function(n,e,t){"use strict";t.r(e);var u=t("3fe9"),c=t("c5ad");for(var a in c)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(a);t("c8a7");var r,o=t("f0c5"),i=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],r);e["default"]=i.exports},"2bce":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{retu:function(){n.navigateBack()}}};e.default=t}).call(this,t("543d")["default"])},"3fe9":function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return u}));var u={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))},uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"01eb"))}},c=function(){var n=this,e=n.$createElement;n._self._c},a=[]},ad23:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("f93b");u(t("66fd"));var c=u(t("277f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},c5ad:function(n,e,t){"use strict";t.r(e);var u=t("2bce"),c=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);e["default"]=c.a},c8a7:function(n,e,t){"use strict";var u=t("df3c"),c=t.n(u);c.a},df3c:function(n,e,t){}},[["ad23","common/runtime","common/vendor"]]]);
+require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/service/service"],{1750:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{retu:function(){n.navigateBack()}}};e.default=t}).call(this,t("df3c")["default"])},"2ad7":function(n,e,t){},"3b72":function(n,e,t){"use strict";t.r(e);var u=t("6fdd"),a=t("cc53");for(var c in a)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(c);t("9473");var r=t("828b"),i=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);e["default"]=i.exports},"6fdd":function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var u={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))},uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"b73a"))}},a=function(){var n=this.$createElement;this._self._c},c=[]},9473:function(n,e,t){"use strict";var u=t("2ad7"),a=t.n(u);a.a},"99ba":function(n,e,t){"use strict";(function(n,e){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("3b72"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},cc53:function(n,e,t){"use strict";t.r(e);var u=t("1750"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=a.a}},[["99ba","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/Senderinfor.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/Senderinfor"],{"233a":function(n,e,t){},2365:function(n,e,t){"use strict";t.r(e);var o=t("9b26"),u=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=u.a},"4b35":function(n,e,t){"use strict";(function(n,e){var o=t("4ea4");t("f93b");o(t("66fd"));var u=o(t("5172"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},5172:function(n,e,t){"use strict";t.r(e);var o=t("7a38"),u=t("2365");for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("faca");var i,r=t("f0c5"),a=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],i);e["default"]=a.exports},"7a38":function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return o}));var o={uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"01eb"))},uCheckboxGroup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(t.bind(null,"72c8"))},uCheckbox:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox/u-checkbox")]).then(t.bind(null,"d2b4"))}},u=function(){var n=this,e=n.$createElement;n._self._c},c=[]},"9b26":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{checkboxValue1:[],name:1}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){n.setNavigationBarTitle({title:this.i18n.goods})},methods:{checkboxChange:function(n){console.log("change",n)}}};e.default=t}).call(this,t("543d")["default"])},faca:function(n,e,t){"use strict";var o=t("233a"),u=t.n(o);u.a}},[["4b35","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/Senderinfor"],{3160:function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return o}));var o={uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"b73a"))},uCheckboxGroup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(t.bind(null,"c952"))},uCheckbox:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox/u-checkbox")]).then(t.bind(null,"5fa3"))}},u=function(){var n=this.$createElement;this._self._c},c=[]},"3f1dd":function(n,e,t){"use strict";t.r(e);var o=t("ef2d"),u=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=u.a},"791e":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var u=o(t("acf1"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},"8f3e":function(n,e,t){"use strict";var o=t("94a0"),u=t.n(o);u.a},"94a0":function(n,e,t){},acf1:function(n,e,t){"use strict";t.r(e);var o=t("3160"),u=t("3f1dd");for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("8f3e");var i=t("828b"),r=Object(i["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],void 0);e["default"]=r.exports},ef2d:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{checkboxValue1:[],name:1}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){n.setNavigationBarTitle({title:this.i18n.goods})},methods:{checkboxChange:function(n){console.log("change",n)}}};e.default=t}).call(this,t("df3c")["default"])}},[["791e","common/runtime","common/vendor"]]]);

unpackage/dist/build/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/build/mp-weixin/pageB/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{"37ba":function(e,n,t){"use strict";t.r(n);var u=t("c91e"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},"6f72":function(e,n,t){"use strict";t.r(n);var u=t("72bd"),r=t("37ba");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);var c,f=t("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},"72bd":function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},a=[]},"748e":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var r=u(t("6f72"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},c91e:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u}},[["748e","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{1260:function(n,t,e){"use strict";e.r(t);var u=e("23f4"),a=e("8646");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);var c=e("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=f.exports},"23f4":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},3201:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}}}},5459:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var a=u(e("1260"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},8646:function(n,t,e){"use strict";e.r(t);var u=e("3201"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a}},[["5459","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/orderinfo.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{2756:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"43ce":function(n,e,t){},8079:function(n,e,t){"use strict";t.r(e);var r=t("2756"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("dca2");var i,a=t("f0c5"),c=Object(a["a"])(o["default"],r["b"],r["c"],!1,null,"fa7c2f78",null,!1,r["a"],i);e["default"]=c.exports},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("543d")["default"])},dca2:function(n,e,t){"use strict";var r=t("43ce"),o=t.n(r);o.a},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"25fa":function(n,e,t){"use strict";t.r(e);var o=t("ec86"),r=t("a9d5");for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);t("84ee");var u=t("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"fa7c2f78",null,!1,o["a"],void 0);e["default"]=a.exports},"84ee":function(n,e,t){"use strict";var o=t("b1b6"),r=t.n(o);r.a},"8b5a":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("df3c")["default"])},"8d8c":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var r=o(t("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(r.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},a9d5:function(n,e,t){"use strict";t.r(e);var o=t("8b5a"),r=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=r.a},b1b6:function(n,e,t){},ec86:function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return o}));var o={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))}},r=function(){var n=this.$createElement;this._self._c},i=[]}},[["8d8c","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/parcel.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"42cf":function(t,n,e){"use strict";var i=e("55bd"),a=e.n(i);a.a},4539:function(t,n,e){"use strict";e.r(n);var i=e("46b3"),a=e("4b1a");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("42cf");var o,u=e("f0c5"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],o);n["default"]=r.exports},"46b3":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"4b1a":function(t,n,e){"use strict";e.r(n);var i=e("c4b0"),a=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"]=a.a},"55bd":function(t,n,e){},c4b0:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("543d")["default"])},f791:function(t,n,e){"use strict";(function(t,n){var i=e("4ea4");e("f93b");i(e("66fd"));var a=i(e("4539"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
->>>>>>> 3aae73a792e3fefab7103cbdce52cc9f366debc5
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/recipientinfo.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/recipientinfo"],{"2a7a":function(n,e,t){"use strict";var c=t("6a64"),o=t.n(c);o.a},"6a64":function(n,e,t){},"7ae6":function(n,e,t){"use strict";t.r(e);var c=t("9871"),o=t("fb21");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("2a7a");var a,i=t("f0c5"),r=Object(i["a"])(o["default"],c["b"],c["c"],!1,null,null,null,!1,c["a"],a);e["default"]=r.exports},"95e3":function(n,e,t){"use strict";(function(n,e){var c=t("4ea4");t("f93b");c(t("66fd"));var o=c(t("7ae6"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},9871:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return c}));var c={uCheckboxGroup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(t.bind(null,"72c8"))},uCheckbox:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox/u-checkbox")]).then(t.bind(null,"d2b4"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},cca0:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{checkboxValue1:[],name:1}},methods:{checkboxChange:function(n){console.log("change",n)},tocitychange:function(){n.navigateTo({url:"/pageB/citychange"})}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){n.setNavigationBarTitle({title:this.i18n.goods})}};e.default=t}).call(this,t("543d")["default"])},fb21:function(n,e,t){"use strict";t.r(e);var c=t("cca0"),o=t.n(c);for(var u in c)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(u);e["default"]=o.a}},[["95e3","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/recipientinfo"],{"05dd":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var u=o(t("922f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},"0b75":function(n,e,t){},"152e":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{checkboxValue1:[],name:1}},methods:{checkboxChange:function(n){console.log("change",n)},tocitychange:function(){n.navigateTo({url:"/pageB/citychange"})}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){n.setNavigationBarTitle({title:this.i18n.goods})}};e.default=t}).call(this,t("df3c")["default"])},"1a98":function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return o}));var o={uCheckboxGroup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(t.bind(null,"c952"))},uCheckbox:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-checkbox/u-checkbox")]).then(t.bind(null,"5fa3"))}},u=function(){var n=this.$createElement;this._self._c},c=[]},2543:function(n,e,t){"use strict";t.r(e);var o=t("152e"),u=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=u.a},"30b8":function(n,e,t){"use strict";var o=t("0b75"),u=t.n(o);u.a},"922f":function(n,e,t){"use strict";t.r(e);var o=t("1a98"),u=t("2543");for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("30b8");var i=t("828b"),a=Object(i["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],void 0);e["default"]=a.exports}},[["05dd","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"2b77":function(n,t,c){"use strict";c.r(t);var e=c("8416"),a=c.n(e);for(var u in e)["default"].indexOf(u)<0&&function(n){c.d(t,n,(function(){return e[n]}))}(u);t["default"]=a.a},"52c0":function(n,t,c){"use strict";var e;c.d(t,"b",(function(){return a})),c.d(t,"c",(function(){return u})),c.d(t,"a",(function(){return e}));var a=function(){var n=this,t=n.$createElement;n._self._c},u=[]},8416:function(n,t,c){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},methods:{}};t.default=e},aa81:function(n,t,c){"use strict";(function(n,t){var e=c("4ea4");c("f93b");e(c("66fd"));var a=e(c("c805"));n.__webpack_require_UNI_MP_PLUGIN__=c,t(a.default)}).call(this,c("bc2e")["default"],c("543d")["createPage"])},acd26:function(n,t,c){"use strict";var e=c("c508"),a=c.n(e);a.a},c508:function(n,t,c){},c805:function(n,t,c){"use strict";c.r(t);var e=c("52c0"),a=c("2b77");for(var u in a)["default"].indexOf(u)<0&&function(n){c.d(t,n,(function(){return a[n]}))}(u);c("acd26");var r,o=c("f0c5"),f=Object(o["a"])(a["default"],e["b"],e["c"],!1,null,"014c97c9",null,!1,e["a"],r);t["default"]=f.exports}},[["aa81","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"44fd":function(n,t,e){"use strict";e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var c=function(){var n=this.$createElement;this._self._c},a=[]},"4d1a":function(n,t,e){"use strict";e.r(t);var c=e("44fd"),a=e("9d78");for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);e("dbbc");var r=e("828b"),o=Object(r["a"])(a["default"],c["b"],c["c"],!1,null,"014c97c9",null,!1,c["a"],void 0);t["default"]=o.exports},8483:function(n,t,e){},"9d78":function(n,t,e){"use strict";e.r(t);var c=e("ece0"),a=e.n(c);for(var u in c)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(u);t["default"]=a.a},dbbc:function(n,t,e){"use strict";var c=e("8483"),a=e.n(c);a.a},ebe6:function(n,t,e){"use strict";(function(n,t){var c=e("47a9");e("abeb");c(e("3240"));var a=c(e("4d1a"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},ece0:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}},methods:{}}}},[["ebe6","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/accountSecurity/accountSecurity.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/accountSecurity"],{"034c":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},a={data:function(){return{}},components:{textRight:c},computed:{i18n:function(){return this.$t("index")}},methods:{toCancellation:function(){t.navigateTo({url:"/pageC/accountCancellation/accountCancellation"})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.account})}};n.default=a}).call(this,e("543d")["default"])},"05c1":function(t,n,e){"use strict";var c;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return c}));var a=function(){var t=this,n=t.$createElement;t._self._c},u=[]},"8b1a":function(t,n,e){"use strict";(function(t,n){var c=e("4ea4");e("f93b");c(e("66fd"));var a=c(e("92a1"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"92a1":function(t,n,e){"use strict";e.r(n);var c=e("05c1"),a=e("b252");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("f0a5");var i,o=e("f0c5"),r=Object(o["a"])(a["default"],c["b"],c["c"],!1,null,"3ab100ca",null,!1,c["a"],i);n["default"]=r.exports},"994a":function(t,n,e){},b252:function(t,n,e){"use strict";e.r(n);var c=e("034c"),a=e.n(c);for(var u in c)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(u);n["default"]=a.a},f0a5:function(t,n,e){"use strict";var c=e("994a"),a=e.n(c);a.a}},[["8b1a","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/accountSecurity"],{"0f4a":function(t,n,e){},"13eb":function(t,n,e){"use strict";e.r(n);var c=e("58a4"),a=e.n(c);for(var u in c)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(u);n["default"]=a.a},"41d8":function(t,n,e){"use strict";(function(t,n){var c=e("47a9");e("abeb");c(e("3240"));var a=c(e("cc4c"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},"58a4":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var c={data:function(){return{}},components:{textRight:function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("b162"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},methods:{toCancellation:function(){t.navigateTo({url:"/pageC/accountCancellation/accountCancellation"})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.account})}};n.default=c}).call(this,e("df3c")["default"])},6358:function(t,n,e){"use strict";var c=e("0f4a"),a=e.n(c);a.a},"6a32":function(t,n,e){"use strict";e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var c=function(){var t=this.$createElement;this._self._c},a=[]},cc4c:function(t,n,e){"use strict";e.r(n);var c=e("6a32"),a=e("13eb");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("6358");var i=e("828b"),o=Object(i["a"])(a["default"],c["b"],c["c"],!1,null,"3ab100ca",null,!1,c["a"],void 0);n["default"]=o.exports}},[["41d8","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/accountSecurity/component/textRight.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{"1fb2":function(t,n,e){"use strict";e.r(n);var u=e("9577"),c=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=c.a},"44b1":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return u}));var c=function(){var t=this,n=t.$createElement;t._self._c},r=[]},"773c":function(t,n,e){"use strict";var u=e("c0a5"),c=e.n(u);c.a},9577:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}},props:{texts:{typeof:String,default:""}}};n.default=u},ac58:function(t,n,e){"use strict";e.r(n);var u=e("44b1"),c=e("1fb2");for(var r in c)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(r);e("773c");var a,f=e("f0c5"),i=Object(f["a"])(c["default"],u["b"],u["c"],!1,null,"098f0a2c",null,!1,u["a"],a);n["default"]=i.exports},c0a5:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{"068f":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}},props:{texts:{typeof:String,default:""}}};n.default=u},"0bff":function(t,n,e){"use strict";var u=e("5373"),f=e.n(u);f.a},"1be4":function(t,n,e){"use strict";e.r(n);var u=e("068f"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=f.a},5373:function(t,n,e){},9565:function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){}));var u=function(){var t=this.$createElement;this._self._c},f=[]},b162:function(t,n,e){"use strict";e.r(n);var u=e("9565"),f=e("1be4");for(var r in f)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return f[t]}))}(r);e("0bff");var a=e("828b"),c=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"098f0a2c",null,!1,u["a"],void 0);n["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/accountSecurity/component/textRight-create-component',
     {
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("ac58"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("b162"))
         })
     },
     [['pageC/accountSecurity/component/textRight-create-component']]

unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{2059:function(t,n,e){},"58a5":function(t,n,e){"use strict";e.r(n);var a=e("e7dd"),u=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=u.a},"61c5":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var u=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"67dc":function(t,n,e){"use strict";e.r(n);var a=e("61c5"),u=e("58a5");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("ea63");var o,c=e("f0c5"),r=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"d50eb15e",null,!1,a["a"],o);n["default"]=r.exports},"9e36":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var u=a(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},u={components:{AllRight:a},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=u}).call(this,e("543d")["default"])},ea63:function(t,n,e){"use strict";var a=e("2059"),u=e.n(a);u.a}},[["9e36","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"48ae":function(t,n,e){"use strict";var i=e("d515"),u=e.n(i);u.a},"8edf":function(t,n,e){"use strict";e.r(n);var i=e("f57d"),u=e("9825");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("48ae");var o=e("828b"),c=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"d50eb15e",null,!1,i["a"],void 0);n["default"]=c.exports},9443:function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var u=i(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var i=e("d786"),u=e.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);n["default"]=u.a},d515:function(t,n,e){},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])},f57d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},u=[]}},[["9443","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/addressManagement/component/address.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{"0efd":function(e,n,t){"use strict";var u=t("2608"),r=t.n(u);r.a},"129f":function(e,n,t){"use strict";t.r(n);var u=t("ee05"),r=t("be73");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);t("0efd");var f,c=t("f0c5"),i=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"2d6103bc",null,!1,u["a"],f);n["default"]=i.exports},2608:function(e,n,t){},6240:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};n.default=u},be73:function(e,n,t){"use strict";t.r(n);var u=t("6240"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},ee05:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement;e._self._c},a=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{"0e5d":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};t.default=u},4402:function(n,t,e){"use strict";var u=e("5af0"),a=e.n(u);a.a},"5af0":function(n,t,e){},6780:function(n,t,e){"use strict";e.r(t);var u=e("0e5d"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a},"884b":function(n,t,e){"use strict";e.r(t);var u=e("cf54"),a=e("6780");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("4402");var c=e("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"2d6103bc",null,!1,u["a"],void 0);t["default"]=f.exports},cf54:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/addressManagement/component/address-create-component',
     {
         'pageC/addressManagement/component/address-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("129f"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("884b"))
         })
     },
     [['pageC/addressManagement/component/address-create-component']]

unpackage/dist/build/mp-weixin/pageC/applicationRefund/component/reasonPopup.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/applicationRefund/component/reasonPopup"],{"07f8":function(n,e,o){"use strict";o.r(e);var u=o("b4df"),t=o("4e66");for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return t[n]}))}(i);o("e2ae");var r,a=o("f0c5"),c=Object(a["a"])(t["default"],u["b"],u["c"],!1,null,"2f747a63",null,!1,u["a"],r);e["default"]=c.exports},"1c8c":function(n,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(n){console.log(this.value),this.$emit("close",n)}}};e.default=u},"4e66":function(n,e,o){"use strict";o.r(e);var u=o("1c8c"),t=o.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return u[n]}))}(i);e["default"]=t.a},"78c8":function(n,e,o){},b4df:function(n,e,o){"use strict";o.d(e,"b",(function(){return t})),o.d(e,"c",(function(){return i})),o.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-popup/u-popup")]).then(o.bind(null,"2f21"))},uRadioGroup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio-group/u-radio-group")]).then(o.bind(null,"fdad"))},uRadio:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio/u-radio")]).then(o.bind(null,"d94c"))}},t=function(){var n=this,e=n.$createElement;n._self._c},i=[]},e2ae:function(n,e,o){"use strict";var u=o("78c8"),t=o.n(u);t.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/applicationRefund/component/reasonPopup"],{8006:function(n,e,o){"use strict";o.r(e);var u=o("b63b"),t=o("f2b2");for(var i in t)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return t[n]}))}(i);o("a893");var a=o("828b"),r=Object(a["a"])(t["default"],u["b"],u["c"],!1,null,"2f747a63",null,!1,u["a"],void 0);e["default"]=r.exports},a893:function(n,e,o){"use strict";var u=o("d3ae"),t=o.n(u);t.a},b63b:function(n,e,o){"use strict";o.d(e,"b",(function(){return t})),o.d(e,"c",(function(){return i})),o.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-popup/u-popup")]).then(o.bind(null,"f1b1"))},uRadioGroup:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio-group/u-radio-group")]).then(o.bind(null,"02ee"))},uRadio:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-radio/u-radio")]).then(o.bind(null,"634f"))}},t=function(){var n=this.$createElement;this._self._c},i=[]},d3ae:function(n,e,o){},f2b2:function(n,e,o){"use strict";o.r(e);var u=o("f2ba"),t=o.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){o.d(e,n,(function(){return u[n]}))}(i);e["default"]=t.a},f2ba:function(n,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(n){console.log(this.value),this.$emit("close",n)}}};e.default=u}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/applicationRefund/component/reasonPopup-create-component',
     {
         'pageC/applicationRefund/component/reasonPopup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("07f8"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("8006"))
         })
     },
     [['pageC/applicationRefund/component/reasonPopup-create-component']]

unpackage/dist/build/mp-weixin/pageC/editName/editName.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/editName/editName"],{"21a7":function(t,n,e){"use strict";var u=e("eb4c"),a=e.n(u);a.a},"733d":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{name:"张三"}},computed:{i18n:function(){return this.$t("index")}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.editNextname})},methods:{}};n.default=e}).call(this,e("543d")["default"])},"9b00":function(t,n,e){"use strict";(function(t,n){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("b3bd"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},b3bd:function(t,n,e){"use strict";e.r(n);var u=e("fffa"),a=e("f7eb");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("21a7");var r,c=e("f0c5"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"67faa01a",null,!1,u["a"],r);n["default"]=f.exports},eb4c:function(t,n,e){},f7eb:function(t,n,e){"use strict";e.r(n);var u=e("733d"),a=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);n["default"]=a.a},fffa:function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return u}));var u={"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"bead"))}},a=function(){var t=this,n=t.$createElement,e=(t._self._c,t.name.length);t.$mp.data=Object.assign({},{$root:{g0:e}})},i=[]}},[["9b00","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/editName/editName"],{"29a9":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{name:"张三"}},computed:{i18n:function(){return this.$t("index")}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.editNextname})},methods:{}};n.default=e}).call(this,e("df3c")["default"])},3802:function(t,n,e){"use strict";e.r(n);var a=e("aa74"),u=e("cfa0");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("ad2e");var r=e("828b"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"67faa01a",null,!1,a["a"],void 0);n["default"]=c.exports},"39bf":function(t,n,e){"use strict";(function(t,n){var a=e("47a9");e("abeb");a(e("3240"));var u=a(e("3802"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},aa74:function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var a={"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"7780"))}},u=function(){var t=this.$createElement,n=(this._self._c,this.name.length);this.$mp.data=Object.assign({},{$root:{g0:n}})},i=[]},ad2e:function(t,n,e){"use strict";var a=e("b520"),u=e.n(a);u.a},b520:function(t,n,e){},cfa0:function(t,n,e){"use strict";e.r(n);var a=e("29a9"),u=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=u.a}},[["39bf","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"14a5":function(n,t,e){"use strict";var u=e("d339"),r=e.n(u);r.a},4017:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},a=[]},7538:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},methods:{}};t.default=u},b458:function(n,t,e){"use strict";e.r(t);var u=e("4017"),r=e("bc26");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("14a5");var c,f=e("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);t["default"]=i.exports},bc26:function(n,t,e){"use strict";e.r(t);var u=e("7538"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a},d339:function(n,t,e){},f263:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var r=u(e("b458"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f263","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"0b8d":function(n,e,t){},"7b02":function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},"8eeb":function(n,e,t){"use strict";t.r(e);var u=t("fa53"),a=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"]=a.a},"93f1":function(n,e,t){"use strict";var u=t("0b8d"),a=t.n(u);a.a},"9ab3":function(n,e,t){"use strict";t.r(e);var u=t("7b02"),a=t("8eeb");for(var r in a)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(r);t("93f1");var c=t("828b"),f=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);e["default"]=f.exports},d58c:function(n,e,t){"use strict";(function(n,e){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("9ab3"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},fa53:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{}},methods:{}}}},[["d58c","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{"05b2":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var c=function(){var n=this,t=n.$createElement;n._self._c},r=[]},6188:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},created:function(){}};t.default=u},abcd:function(n,t,e){"use strict";e.r(t);var u=e("05b2"),c=e("f9cd");for(var r in c)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(r);var a,f=e("f0c5"),i=Object(f["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],a);t["default"]=i.exports},cbb2:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var c=u(e("abcd"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(c.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},f9cd:function(n,t,e){"use strict";e.r(t);var u=e("6188"),c=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=c.a}},[["cbb2","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{"48bd":function(e,n,t){"use strict";t.r(n);var u=t("eae9"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},"86af":function(e,n,t){"use strict";t.r(n);var u=t("c17c"),a=t("48bd");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);var r=t("828b"),f=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=f.exports},c17c:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},eae9:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}},created:function(){}}},f268:function(e,n,t){"use strict";(function(e,n){var u=t("47a9");t("abeb");u(t("3240"));var a=u(t("86af"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["f268","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/mineComponent/agreePopup.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/agreePopup"],{"4ff4":function(n,e,t){"use strict";t.r(e);var u=t("a728"),o=t("cd67");for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);t("d9a6");var r,f=t("f0c5"),c=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"1ac27535",null,!1,u["a"],r);e["default"]=c.exports},a728:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))}},o=function(){var n=this,e=n.$createElement;n._self._c},a=[]},b454:function(n,e,t){},cd67:function(n,e,t){"use strict";t.r(e);var u=t("f1ba"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);e["default"]=o.a},d9a6:function(n,e,t){"use strict";var u=t("b454"),o=t.n(u);o.a},f1ba:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/agreePopup"],{2545:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return f})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))}},o=function(){var n=this.$createElement;this._self._c},f=[]},5251:function(n,e,t){"use strict";t.r(e);var u=t("2545"),o=t("dff4");for(var f in o)["default"].indexOf(f)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(f);t("67ef");var r=t("828b"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"1ac27535",null,!1,u["a"],void 0);e["default"]=a.exports},"67ef":function(n,e,t){"use strict";var u=t("7fa0"),o=t.n(u);o.a},"7fa0":function(n,e,t){},c2e4:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u},dff4:function(n,e,t){"use strict";t.r(e);var u=t("c2e4"),o=t.n(u);for(var f in u)["default"].indexOf(f)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(f);e["default"]=o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/agreePopup-create-component',
     {
         'pageC/mineComponent/agreePopup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("4ff4"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("5251"))
         })
     },
     [['pageC/mineComponent/agreePopup-create-component']]

unpackage/dist/build/mp-weixin/pageC/mineComponent/allRight/allRight.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{3353:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};t.default=a},"6d22":function(n,t,e){"use strict";var a=e("8d3d"),u=e.n(a);u.a},"8d3d":function(n,t,e){},"9a4f":function(n,t,e){"use strict";e.r(t);var a=e("3353"),u=e.n(a);for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);t["default"]=u.a},c602:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return a}));var u=function(){var n=this,t=n.$createElement;n._self._c},r=[]},edae:function(n,t,e){"use strict";e.r(t);var a=e("c602"),u=e("9a4f");for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);e("6d22");var f,i=e("f0c5"),c=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],f);t["default"]=c.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{"2c60":function(t,n,e){"use strict";e.r(n);var a=e("7d7c"),u=e("356b");for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(r);e("e6e5");var i=e("828b"),c=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);n["default"]=c.exports},"356b":function(t,n,e){"use strict";e.r(n);var a=e("472b"),u=e.n(a);for(var r in a)["default"].indexOf(r)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(r);n["default"]=u.a},"472b":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};n.default=a},"7d7c":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var a=function(){var t=this.$createElement;this._self._c},u=[]},ac32:function(t,n,e){},e6e5:function(t,n,e){"use strict";var a=e("ac32"),u=e.n(a);u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/allRight/allRight-create-component',
     {
         'pageC/mineComponent/allRight/allRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("edae"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("2c60"))
         })
     },
     [['pageC/mineComponent/allRight/allRight-create-component']]

unpackage/dist/build/mp-weixin/pageC/mineComponent/moneyDetail/index.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{"415f":function(n,e,t){"use strict";t.r(e);var u=t("ecdc"),a=t("e797");for(var r in a)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(r);t("ab94");var c,o=t("f0c5"),f=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);e["default"]=f.exports},ab94:function(n,e,t){"use strict";var u=t("da8b"),a=t.n(u);a.a},d506:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};e.default=u},da8b:function(n,e,t){},e797:function(n,e,t){"use strict";t.r(e);var u=t("d506"),a=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"]=a.a},ecdc:function(n,e,t){"use strict";var u;t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var a=function(){var n=this,e=n.$createElement;n._self._c},r=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{"1b50":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},"36db":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};t.default=u},"584a":function(n,t,e){"use strict";var u=e("b397"),a=e.n(u);a.a},"6a28":function(n,t,e){"use strict";e.r(t);var u=e("36db"),a=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);t["default"]=a.a},b397:function(n,t,e){},fcf2:function(n,t,e){"use strict";e.r(t);var u=e("1b50"),a=e("6a28");for(var o in a)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(o);e("584a");var i=e("828b"),f=Object(i["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=f.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/moneyDetail/index-create-component',
     {
         'pageC/mineComponent/moneyDetail/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("415f"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("fcf2"))
         })
     },
     [['pageC/mineComponent/moneyDetail/index-create-component']]