修改头像

commont/messages.js

@@ -310,7 +310,7 @@ export default {
 			grouping: '立即拼团',
 			Selected: '已选',
 			Buynow: '立即购买',
-
+			closeaccount:'确定要注销账号吗?'
 		},
 	},
 	//英语
@@ -617,7 +617,7 @@ export default {
 			grouping: 'Join Group Now',
 			Selected: 'Selected',
 			Buynow: 'Buy Now',
-
+			closeaccount:'Are you sure you want to close your account?'
 		},
 	},
 	// 西班牙
@@ -905,8 +905,8 @@ export default {
 
 			Please: 'Por favor, introduzca el nombre del artículo',
 			Filling: 'Rellene el artículo de envío con precisión para que podamos recomendarle productos más adecuados',
-			Note: 'Nota: El peso y el volumen reales se determinan por el mensajero. El peso puede aumentar después del empaque, y si el artículo tiene un peso pequeño pero un volumen grande, se cobrará según el peso volumétrico'
-
+			Note: 'Nota: El peso y el volumen reales se determinan por el mensajero. El peso puede aumentar después del empaque, y si el artículo tiene un peso pequeño pero un volumen grande, se cobrará según el peso volumétrico',
+			closeaccount:'Seguro que desea cerrar su cuenta?'
 		},
 	},
 	//意大利
@@ -1210,6 +1210,7 @@ export default {
 			grouping: 'Unisciti al gruppo immediatamente',
 			Selected: 'Selezionato',
 			Buynow: 'Acquista ora',
+			closeaccount:'E’ sicuro di voler cancellare il numero di conto?'
 		},
 	},
 };

pageA/order.vue

@@ -320,7 +320,7 @@
 		},
 		methods: {
 			todetail(id) {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: '/pageA/productdetails?id=' + id
 				})
 			},
@@ -383,7 +383,7 @@
 							that.transport()
 						}
 					}
-				})
+				})   
 			},
 			//货柜列表
 			container() {
@@ -394,12 +394,14 @@
 						province_id: this.province_id,
 						transport_type_id: this.transport_type_id,
 						weight: this.typea == 'shop' ?
-							this.goodsWeight : Number(this.sku_info.weight) * this.value,
+							'': Number(this.sku_info.weight) * this.value,
 						type: this.typea == 'shop' ? '' : (this.goodinfo.cate == 0 ? 'normal' : 'special'),
-						length: Number(this.sku_info.length) * this.value, //		是	String	长
+						length: this.typea == 'shop' ?
+							'': Number(this.sku_info.length) * this.value, //		是	String	长
 						width: this.sku_info.width, //		是	String	宽
 						height: this.sku_info.height, //		是	String	高
 						cart_id: this.cartid
+						// cart_id: '147,148'
 					}
 				}).then((res) => {
 					res.forEach((item) => {

pageA/productdetails.vue

@@ -398,7 +398,8 @@
 						</image>
 						<view class="link">{{ i18n.Copylink }}</view>
 					</view> -->
-					<view class="u-row-center" style="display: flex;flex-direction: column;align-items: center;" @click="builder">
+					<view class="u-row-center" style="display: flex;flex-direction: column;align-items: center;"
+						@click="builder">
 						<image src="../static/images/index/image.png" style="width: 108rpx; height: 108rpx" mode="">
 						</image>
 						<view class="link">{{ i18n.Generatepicture }}</view>
@@ -698,10 +699,10 @@
 							'image': that.goodinfo.image,
 							'discount_price': that.goodinfo.discount_price,
 							'fu': that.fu,
-							
+
 						},
-						'user_other':that.goodinfo.merchant,
-						'user':useinfo,
+						'user_other': that.goodinfo.merchant,
+						'user': useinfo,
 					},
 					success: function(id, serverMsgId) {
 						uni.navigateTo({
@@ -826,8 +827,11 @@
 			//逛逛
 			goshop(id) {
 				uni.navigateTo({
-					url: "/pageD/homepage/homepage?merchant_id=" + id,
-				});
+					url: '/pageD/homepage/homepage?user_other=' + encodeURIComponent(JSON.stringify(
+							this.goodinfo
+							.merchant)) + '&user_other_no=' + this.goodinfo.merchant.member
+						.easemob_username + "&merchant_id=" + id + '&show=' + true
+				})
 			},
 			detail(id) {
 				uni.$u.http
@@ -871,7 +875,7 @@
 						if (this.language == 'it-IT') {
 							this.fu = this.content.name_ita
 						}
-						
+
 						if (this.language == 'zh-CN') {
 							this.fu = this.content.name_cn
 						}

pageB/ParcelExpress.vue

@@ -64,7 +64,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(0)">
+						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -92,7 +92,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(1)">
+						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>

pageB/account.vue

@@ -58,7 +58,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(0)">
+						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -85,7 +85,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(1)">
+						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>

pageC/accountCancellation/accountCancellation.vue

@@ -5,10 +5,13 @@
 
 		<view> 1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view>
 		<view> 2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view>
-		<button class="btn">注销账号</button>
+		<button @click="show = true" class="btn">注销账号</button>
 		<view class="cancellation">
 			注销后账户不可恢复，请谨慎操作
 		</view>
+		<u-modal :buttonReverse='true' :showCancelButton='true' @cancel='show = false' @confirm='logout'
+			:confirmText='i18n.enter' :cancelText='i18n.Cancel' :show="show" :title="i18n.accountCancellation" :content='i18n.closeaccount'
+			confirmColor='#606266' cancelColor='#2979ff'></u-modal>
 	</view>
 </template>
 
@@ -16,30 +19,42 @@
 	export default {
 		data() {
 			return {
-
+				show: false,
+				// title: '注销账号',
+				// content: '确定要注销账号吗？',
+				// confirmText: '确定',
+				// cancelText: '取消'
+			}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
 			}
 		},
 		methods: {
-
+			logout() {
+				this.show = false
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	
 	.page {
 		background-color: #fff;
 		height: 92.5vh;
 		padding: 54rpx 44rpx;
 		font-size: 30rpx;
 		color: rgba(34, 34, 34, .7);
-		.btn{
+
+		.btn {
 			background-color: #f83224;
 			border-radius: 44rpx;
 			color: #fff;
 			margin-top: 108rpx
 		}
-		.cancellation{
+
+		.cancellation {
 			font-size: 24rpx;
 			text-align: center;
 			margin-top: 32rpx;

pageC/accountSecurity/accountSecurity.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<view class="content-top">
+<!-- 		<view class="content-top">
 			<view class="first">
 				<text>{{i18n.editPassword}}</text>
 				<textRight :texts="i18n.setPassword" />
@@ -9,7 +9,7 @@
 				<text>{{i18n.editPhone}}</text>
 				<textRight texts="178****0000" />
 			</view>       
-		</view>
+		</view> -->
 		<view class="content-bottom">
 			<view class="first" @click="toCancellation">
 				<text>{{i18n.accountCancellation}}</text>

pageC/accountSetup/accountSetup.vue

@@ -23,9 +23,9 @@
 
 		<view class="set-center">
 			<view class="security" @click="toNextPage('/pageC/accountSecurity/accountSecurity')">
-				<text>{{ i18n.account }}</text>
+				<text>{{ i18n.accountCancellation }}</text>
 				<view class="text-right">
-					<text>{{ i18n.password }}</text>
+					<!-- <text>{{ i18n.password }}</text> -->
 					<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
 				</view>
 			</view>

pageC/addressManagement/addressManagement.vue

@@ -1,220 +1,211 @@
 <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-international"
-        @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-international" @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: [],
-      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,
-      });
-    },
+	import addressVue from "./component/address.vue";
+	export default {
+		components: {
+			addressVue,
+		},
+		data() {
+			return {
+				manage: 1,
+				addressList: [],
+				type: "", //判断在哪个页面进来
+			};
+		},
+		onLoad(options) {
+			console.log(options);
+			if (options.tabs) {
+				this.manage = options.tabs;
+			}
+			this.type = options.type;
 
-    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,
-    });
-  },
-};
+		},
+		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(this.manage);
+			// 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/personalInformation/personalInformation.vue

@@ -3,41 +3,79 @@
 		<view class="content">
 			<view class="header">
 				<text>{{i18n.headerImg}}</text>
-				<image class="header-img" src="http://pic.imeitou.com/uploads/allimg/240522/10-240522162434-50.jpg" mode=""></image>
+				<image @click="upimage" class="header-img"
+					:src="filePath" mode=""></image>
 			</view>
 			<view class="bottom-text" @click="toName">
 				<text>{{i18n.nickname}}</text>
 				<AllRight :name="nickname"></AllRight>
 			</view>
 		</view>
+		<view class="bottom" style="">
+			<view class="red" @click="update">保存</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	import AllRight from '../mineComponent/allRight/allRight.vue'
 	export default {
-		components:{
+		components: {
 			AllRight
 		},
 		data() {
 			return {
-				nickname:'张三'
+				nickname: '张三',
+				filePath: ''
 			};
 		},
-		computed:{
-			i18n(){
+		computed: {
+			i18n() {
 				return this.$t('index')
 			}
 		},
-		mounted(){
+		mounted() {
+			if(uni.getStorageSync('user_info')){
+				this.filePath = uni.getStorageSync('user_info').avatar
+			}
 			uni.setNavigationBarTitle({
-				title:this.i18n.information
+				title: this.i18n.information
 			})
 		},
-		methods:{
-			toName(){
+		methods: {
+			update(){
+				uni.$u.http.post('/api/member/update', {
+					lang: 'en',
+					avatar: this.filePath,
+					nickname: this.nickname
+				}).then((res) => {
+					console.log(res);
+					this.$u.toast('保存成功')
+				}).catch(() => {
+				
+				})
+			},
+			upimage() {
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://cbec.hdlkeji.com/api/upload/images', //仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							// formData: {
+							// 	'user': 'test'
+							// },
+							success: (uploadFileRes) => {
+								this.filePath = JSON.parse(uploadFileRes.data).data.filePath
+							}
+						});
+					}
+				});
+			},
+			toName() {
 				uni.navigateTo({
-					url:'/pageC/editName/editName'
+					url: '/pageC/editName/editName'
 				})
 			}
 		}
@@ -45,30 +83,60 @@
 </script>
 
 <style lang="scss" scoped>
-	.page{
+	.bottom {
+		width: 750rpx;
+		height: 166rpx;
+		background: #FFFFFF;
+		padding: 16rpx 32rpx 64rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		box-sizing: border-box;
+	}
+
+	.red {
+		width: 686rpx;
+		height: 88rpx;
+		background: #F83224;
+		box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+		border-radius: 44rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		line-height: 88rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.page {
 		padding: 20rpx 24rpx;
-		.content{
+
+		.content {
 			background-color: #fff;
 			border-radius: 16rpx;
 			padding: 0 20rpx;
-			.header{
+
+			.header {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				height: 176rpx;
 				border-bottom: 2rpx solid rgba(151, 151, 151, .2);
-				.header-img{
+
+				.header-img {
 					height: 116rpx;
 					width: 116rpx;
 					border-radius: 50%;
 				}
 			}
-			.bottom-text{
+
+			.bottom-text {
 				display: flex;
 				height: 116rpx;
-				justify-content: space-between; 
+				justify-content: space-between;
 				align-items: center;
 			}
 		}
 	}
-</style>
+</style>

pageD/homepage/homepage.vue

@@ -1,341 +1,318 @@
 <template>
-  <view class="page">
-    <!-- 页面渐变色背景 -->
-    <view class="shadow"> </view>
-    <!-- 页面渐变色背景 -->
-    <view class="content">
-      <view class="top-information">
-        <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>客服
-          </button>
-          <button
-            v-if="isShow != '1' && userInfo.is_interest == 1"
-            class="btn-1"
-            @click="followTeam(0)"
-          >
-            <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
-          </button>
-          <button
-            class="btn-1"
-            v-if="userInfo.is_interest == 0"
-            @click="followTeam(1)"
-          >
-            已关注
-          </button>
-        </view>
-        <view class="name"> {{ userInfo.merchant_name }} </view>
+	<view class="page">
+		<!-- 页面渐变色背景 -->
+		<view class="shadow"> </view>
+		<!-- 页面渐变色背景 -->
+		<view class="content">
+			<view class="top-information">
+				<image class="user-header" :src="userInfo.image" mode=""> </image>
+				<view class="btn-list">
+					<button class="btn-1" @click="tochat" v-if="show">
+						<u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
+					</button>
+					<button v-if="isShow != '1' && userInfo.is_interest == 1" class="btn-1" @click="followTeam(0)">
+						<u-icon color="#f83224" size="14" name="plus"></u-icon>关注
+					</button>
+					<button class="btn-1" v-if="userInfo.is_interest == 0" @click="followTeam(1)">
+						已关注
+					</button>
+				</view>
+				<view class="name"> {{ userInfo.merchant_name }} </view>
 
-        <view class="score">
-          <u-rate
-            count="5"
-            disabled
-            :allowHalf="true"
-            :gutter="1"
-            inactiveColor="#ffacab"
-            activeColor="#FF1515"
-            v-model="userInfo.score"
-            :size="12"
-          ></u-rate>
-          <text class="num">{{ userInfo.score }}</text>
-        </view>
-        <view class="sale">
-          <view class="">
-            销售量
-            <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;" }} {{ userInfo.comment_num }}</text>
-          </view>
-        </view>
-      </view>
+				<view class="score">
+					<u-rate count="5" disabled :allowHalf="true" :gutter="1" inactiveColor="#ffacab"
+						activeColor="#FF1515" v-model="userInfo.score" :size="12"></u-rate>
+					<text class="num">{{ userInfo.score }}</text>
+				</view>
+				<view class="sale">
+					<view class="">
+						销售量
+						<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;" }} {{ userInfo.comment_num }}</text>
+					</view>
+				</view>
+			</view>
 
-      <view class="goods-list">
-        <view class="tab-list">
-          <view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
-            默认
-          </view>
-          <view :class="{ tab: selectTab == 2 }" @click="switchTab(2)"
-            >新品</view
-          >
-          <view :class="{ tab: selectTab == 3 }" @click="switchTab(3)"
-            >销量</view
-          >
-          <view
-            class="price"
-            :class="{ tab: selectTab == 4 }"
-            @click="switchTab(4)"
-            >价格
-            <view
-              style="
+			<view class="goods-list">
+				<view class="tab-list">
+					<view :class="{ tab: selectTab == 1 }" @click="switchTab(1)">
+						默认
+					</view>
+					<view :class="{ tab: selectTab == 2 }" @click="switchTab(2)">新品</view>
+					<view :class="{ tab: selectTab == 3 }" @click="switchTab(3)">销量</view>
+					<view class="price" :class="{ tab: selectTab == 4 }" @click="switchTab(4)">价格
+						<view style="
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
                 margin-left: 6rpx;
                 margin-top: 4rpx;
-              "
-            >
-              <u-icon
-                name="arrow-up-fill"
-                size="6"
-                :color="iconUp == 1 ? '#f83224' : '#303133'"
-              ></u-icon
-              ><u-icon
-                :color="iconUp == 2 ? '#f83224' : '#303133'"
-                size="6"
-                name="arrow-down-fill"
-              ></u-icon>
-            </view>
-          </view>
-        </view>
-        <view class="goods">
-          <GoodsCard
-            v-for="item in goodsList"
-            :key="item.id"
-            :itemInfo="item"
-            @toDetail="toDetail"
-          />
-        </view>
-      </view>
-    </view>
-  </view>
+              ">
+							<u-icon name="arrow-up-fill" size="6"
+								:color="iconUp == 1 ? '#f83224' : '#303133'"></u-icon><u-icon
+								:color="iconUp == 2 ? '#f83224' : '#303133'" size="6" name="arrow-down-fill"></u-icon>
+						</view>
+					</view>
+				</view>
+				<view class="goods">
+					<GoodsCard v-for="item in goodsList" :key="item.id" :itemInfo="item" @toDetail="toDetail" />
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import GoodsCard from "./component/goodsCard.vue";
-export default {
-  components: {
-    GoodsCard,
-  },
-  data() {
-    return {
-      value: 4,
-      selectTab: 0,
-      iconUp: 0,
-      isShow: "2", //是否可关注
-      userId: "",
-      userInfo: {}, //用户信息
-      goodsList: [],
-    };
-  },
-  onLoad(option) {
-    if (option.page) {
-      this.isShow = option.page;
-    }
-    this.userId = option.merchant_id;
-  },
-  methods: {
-    switchTab(num) {
-      this.selectTab = num;
-      if (num == 4) {
-        // this.iconUp = this.iconUp == 0 ? 1:2
-        // if(this.iconUp == 2){
-        // 	this.iconUp =1
-        // }
-        switch (this.iconUp) {
-          case 1:
-            this.iconUp = 2;
-            break;
-          case 0:
-            this.iconUp = 1;
-            break;
-          case 2:
-            this.iconUp = 1;
-            break;
-        }
-      } else {
-        this.iconUp = 0;
-      }
-    },
-    toDetail(item) {
-      console.log(item);
-      // return;
-      uni.navigateTo({
-        url: `/pageA/productdetails?id=${item.id}`,
-      });
-    },
+	import GoodsCard from "./component/goodsCard.vue";
+	export default {
+		components: {
+			GoodsCard,
+		},
+		data() {
+			return {
+				value: 4,
+				selectTab: 0,
+				iconUp: 0,
+				isShow: "2", //是否可关注
+				userId: "",
+				userInfo: {}, //用户信息
+				goodsList: [],
+				user_other:{},
+				user_other_no:'',
+				show:''
+			};
+		},
+		onLoad(option) {
+			if (option.page) {
+				this.isShow = option.page;
+			}
+			if (option.user_other) {
+				this.user_other = JSON.parse(decodeURIComponent(option.user_other))
+			}
+			this.show = option.show
+			this.userId = option.merchant_id;
+			this.user_other_no = option.user_other_no
+		},
+		methods: {
+			tochat() {
+				uni.navigateTo({
+					url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(
+							this.user_other)) + '&user_other_no=' + this.user_other_no
+				})
+			},
+			switchTab(num) {
+				this.selectTab = num;
+				if (num == 4) {
+					// this.iconUp = this.iconUp == 0 ? 1:2
+					// if(this.iconUp == 2){
+					// 	this.iconUp =1
+					// }
+					switch (this.iconUp) {
+						case 1:
+							this.iconUp = 2;
+							break;
+						case 0:
+							this.iconUp = 1;
+							break;
+						case 2:
+							this.iconUp = 1;
+							break;
+					}
+				} else {
+					this.iconUp = 0;
+				}
+			},
+			toDetail(item) {
+				console.log(item);
+				// return;
+				uni.navigateTo({
+					url: `/pageA/productdetails?id=${item.id}`,
+				});
+			},
 
-    //关注 or 取消关注 店铺
-    followTeam(num) {
-      uni.$u.http
-        .post(`/api/interest/follow`, {
-          interest_type: 1,
-          interest_id: this.userInfo.id,
-        })
-        .then((res) => {
-          this.userInfo.is_interest = num;
-          uni.showToast({
-            title: !num ? "关注成功" : "取消关注",
-            icon: "none",
-          });
-        });
-    },
-    getCommodityList(status = "") {
-      //获取用户信息
-      uni.$u.http
-        .get(`/api/merchant/info?merchant_id=${this.userId}`)
-        .then((res) => {
-          this.userInfo = res;
-        });
+			//关注 or 取消关注 店铺
+			followTeam(num) {
+				uni.$u.http
+					.post(`/api/interest/follow`, {
+						interest_type: 1,
+						interest_id: this.userInfo.id,
+					})
+					.then((res) => {
+						this.userInfo.is_interest = num;
+						uni.showToast({
+							title: !num ? "关注成功" : "取消关注",
+							icon: "none",
+						});
+					});
+			},
+			getCommodityList(status = "") {
+				//获取用户信息
+				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: this.userId,
-          status: status,
-          keywords: this.keywords,
-          source: this.source,
-        })
-        .then((res) => {
-          this.goodsList = res.data;
-        });
-    },
-  },
-  mounted() {
-    this.getCommodityList();
-    //设置顶部导航栏颜色
-    uni.setNavigationBarColor({
-      frontColor: "#ffffff",
-      backgroundColor: "#f74639",
-    });
-  },
-};
+				//获取店铺商品
+				uni.$u.http
+					.post(`/api/goods/merchant_goods`, {
+						page: 1,
+						limit: 10,
+						merchant_id: this.userId,
+						status: status,
+						keywords: this.keywords,
+						source: this.source,
+					})
+					.then((res) => {
+						this.goodsList = res.data;
+					});
+			},
+		},
+		mounted() {
+			this.getCommodityList();
+			//设置顶部导航栏颜色
+			uni.setNavigationBarColor({
+				frontColor: "#ffffff",
+				backgroundColor: "#f74639",
+			});
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  .shadow {
-    position: absolute;
-    top: 0;
-    height: 300px;
-    width: 100%;
-    background: linear-gradient(#f74639, #f4f4f4);
-    z-index: -1;
-  }
+	.page {
+		.shadow {
+			position: absolute;
+			top: 0;
+			height: 300px;
+			width: 100%;
+			background: linear-gradient(#f74639, #f4f4f4);
+			z-index: -1;
+		}
 
-  .content {
-    padding: 20rpx 24rpx;
-    margin-top: 76rpx;
+		.content {
+			padding: 20rpx 24rpx;
+			margin-top: 76rpx;
 
-    .top-information {
-      position: relative;
-      border-radius: 20rpx;
-      background-color: #fff;
-      padding: 28rpx 24rpx;
+			.top-information {
+				position: relative;
+				border-radius: 20rpx;
+				background-color: #fff;
+				padding: 28rpx 24rpx;
 
-      ::v-deep .u-icon__icon {
-        color: #f83224 !important;
-      }
+				::v-deep .u-icon__icon {
+					color: #f83224 !important;
+				}
 
-      .user-header {
-        width: 164rpx;
-        height: 164rpx;
-        border-radius: 50%;
-        border: 2rpx solid #fff;
-        position: absolute;
-        top: -80rpx;
-        left: 28rpx;
-      }
+				.user-header {
+					width: 164rpx;
+					height: 164rpx;
+					border-radius: 50%;
+					border: 2rpx solid #fff;
+					position: absolute;
+					top: -80rpx;
+					left: 28rpx;
+				}
 
-      .btn-list {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
+				.btn-list {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					height: 100rpx;
 
-        .btn-1 {
-          border: 2rpx solid #f83224;
-          background-color: #fff;
-          color: #f83224;
-          padding: 0;
-          margin: 0;
-          display: flex;
-          justify-content: space-around;
-          align-items: center;
-          height: 52rpx;
-          border-radius: 24rpx;
-          line-height: 52rpx;
-          font-size: 26rpx;
-          padding: 0 28rpx;
-          margin-left: 20rpx;
-        }
-      }
+					.btn-1 {
+						border: 2rpx solid #f83224;
+						background-color: #fff;
+						color: #f83224;
+						padding: 0;
+						margin: 0;
+						display: flex;
+						justify-content: space-around;
+						align-items: center;
+						height: 52rpx;
+						border-radius: 24rpx;
+						line-height: 52rpx;
+						font-size: 26rpx;
+						padding: 0 28rpx;
+						margin-left: 20rpx;
+					}
+				}
 
-      .name {
-        margin-top: 28rpx;
-        font-weight: 600;
-        font-size: 32rpx;
-        color: #333333;
-      }
+				.name {
+					margin-top: 28rpx;
+					font-weight: 600;
+					font-size: 32rpx;
+					color: #333333;
+				}
 
-      .score {
-        width: 30%;
-        height: 28rpx;
-        background-color: rgba(255, 27, 0, 0.1);
-        display: flex;
-        border-radius: 12rpx;
-        margin-top: 16rpx;
-        justify-content: space-around;
+				.score {
+					width: 30%;
+					height: 28rpx;
+					background-color: rgba(255, 27, 0, 0.1);
+					display: flex;
+					border-radius: 12rpx;
+					margin-top: 16rpx;
+					justify-content: space-around;
 
-        .num {
-          font-size: 22rpx;
-          color: #ff1515;
-          font-weight: 600;
-        }
-      }
+					.num {
+						font-size: 22rpx;
+						color: #ff1515;
+						font-weight: 600;
+					}
+				}
 
-      .sale {
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: #777;
-        margin-top: 20rpx;
+				.sale {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: #777;
+					margin-top: 20rpx;
 
-        .shu {
-          font-size: 16rpx;
-          color: #979797;
-          opacity: 0.2;
-        }
-      }
-    }
-  }
+					.shu {
+						font-size: 16rpx;
+						color: #979797;
+						opacity: 0.2;
+					}
+				}
+			}
+		}
 
-  .goods-list {
-    border-radius: 20rpx;
-    background-color: #fff;
-    padding: 0 20rpx;
-    margin-top: 20rpx;
+		.goods-list {
+			border-radius: 20rpx;
+			background-color: #fff;
+			padding: 0 20rpx;
+			margin-top: 20rpx;
 
-    .tab-list {
-      height: 96rpx;
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      font-size: 26rpx;
-      color: #333333;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-      margin-bottom: 20rpx;
-      .tab {
-        color: #000;
-        font-weight: 600;
-      }
+			.tab-list {
+				height: 96rpx;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				font-size: 26rpx;
+				color: #333333;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+				margin-bottom: 20rpx;
 
-      .price {
-        display: flex;
-        align-items: center;
-      }
-    }
-    .goods {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-    }
-  }
-}
-</style>
+				.tab {
+					color: #000;
+					font-weight: 600;
+				}
+
+				.price {
+					display: flex;
+					align-items: center;
+				}
+			}
+
+			.goods {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+			}
+		}
+	}
+</style>

pages/express/express.vue

@@ -44,7 +44,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(0)">
+						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -71,7 +71,7 @@
 							</view>
 							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
 						</view>
-						<view class="u-flex" @click.stop="addbook(1)">
+						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -409,7 +409,7 @@
 			addbook(index) {
 				var that = this
 				uni.navigateTo({
-					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					url: "/pageC/addressManagement/addressManagement?tabs=" + index,
 					events: {
 						getadd(res) {
 							if (index == 0) {

pages/mine/component/mallOrderForm.vue

@@ -79,12 +79,13 @@ export default {
 
 <style lang="scss">
 .mall {
-  height: 100px;
+  // height: 100px;
   width: 100%;
   background-color: #fff;
   border-radius: 10px;
-  padding-top: 14px;
+  padding: 14px 0 ;
   margin-top: 10px;
+  box-sizing: border-box;
   .mall-top {
     display: flex;
     justify-content: space-between;
@@ -107,15 +108,18 @@ export default {
   }
   .order-form {
     display: flex;
-    justify-content: space-around;
+    justify-content: space-between;  
     margin-top: 18px;
+	padding: 0 30rpx;
+	box-sizing: border-box;
     .icon-center {
-      width: 15%;
+      // width: 15%;
       display: flex;
       flex-wrap: wrap;
       justify-content: center;
       flex-direction: column;
       align-items: center;
+	  flex: 1;
     }
     .form-icon {
       width: 24px;
@@ -125,6 +129,7 @@ export default {
       color: #202020;
       font-size: 12px;
       margin-top: 10px;
+	  text-align: center;
     }
   }
 }

pages/mine/component/personalFunction.vue

@@ -68,12 +68,12 @@ export default {
 
 <style lang="scss">
 .team {
-  height: 110px;
+  // height: 110px;
   width: 100%;
   background-color: #fff;
   border-radius: 10px;
   margin-top: 10px;
-  padding-top: 14px;
+  padding:14px 0;
   .team-title {
     color: #222;
     font-size: 14px;
@@ -104,6 +104,7 @@ export default {
       color: #202020;
       font-size: 12px;
       margin-top: 10px;
+	  text-align: center;
     }
   }
 }

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

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

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

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

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/component/mallOrderForm"],{"0912":function(n,t,e){"use strict";e.r(t);var r=e("1db3"),u=e("f25f");for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);e("9d80");var f,c=e("f0c5"),a=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],f);t["default"]=a.exports},"1db3":function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},o=[]},"9d80":function(n,t,e){"use strict";var r=e("f692"),u=e.n(r);u.a},c603: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:{toOrderFrom:function(t){n.navigateTo({url:"/pageC/orderForm/orderForm?followId=".concat(t)})}}};t.default=e}).call(this,e("543d")["default"])},f25f:function(n,t,e){"use strict";e.r(t);var r=e("c603"),u=e.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(o);t["default"]=u.a},f692:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/component/mallOrderForm"],{"0912":function(n,t,e){"use strict";e.r(t);var r=e("d29c"),u=e("f25f");for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);e("9d80");var c,f=e("f0c5"),a=Object(f["a"])(u["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],c);t["default"]=a.exports},"9d80":function(n,t,e){"use strict";var r=e("f692"),u=e.n(r);u.a},c603: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:{toOrderFrom:function(t){n.navigateTo({url:"/pageC/orderForm/orderForm?followId=".concat(t)})}}};t.default=e}).call(this,e("543d")["default"])},d29c:function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},o=[]},f25f:function(n,t,e){"use strict";e.r(t);var r=e("c603"),u=e.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(o);t["default"]=u.a},f692:function(n,t,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pages/mine/component/mallOrderForm-create-component',
     {

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

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

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

@@ -1 +1 @@
-.mall{height:100px;width:100%;background-color:#fff;border-radius:10px;padding-top:14px;margin-top:10px}.mall .mall-top{display:flex;justify-content:space-between;margin:0 10px}.mall .mall-top .mall-title{font-size:14px;color:#222;font-weight:600}.mall .mall-top .all{color:#333;font-size:12px;display:flex;align-items:center}.mall .mall-top .all .right{width:10px;height:10px}.mall .order-form{display:flex;justify-content:space-around;margin-top:18px}.mall .order-form .icon-center{width:15%;display:flex;flex-wrap:wrap;justify-content:center;flex-direction:column;align-items:center}.mall .order-form .form-icon{width:24px;height:22px}.mall .order-form .characters{color:#202020;font-size:12px;margin-top:10px}
+.mall{width:100%;background-color:#fff;border-radius:10px;padding:14px 0;margin-top:10px;box-sizing:border-box}.mall .mall-top{display:flex;justify-content:space-between;margin:0 10px}.mall .mall-top .mall-title{font-size:14px;color:#222;font-weight:600}.mall .mall-top .all{color:#333;font-size:12px;display:flex;align-items:center}.mall .mall-top .all .right{width:10px;height:10px}.mall .order-form{display:flex;justify-content:space-between;margin-top:18px;padding:0 30rpx;box-sizing:border-box}.mall .order-form .icon-center{display:flex;flex-wrap:wrap;justify-content:center;flex-direction:column;align-items:center;flex:1}.mall .order-form .form-icon{width:24px;height:22px}.mall .order-form .characters{color:#202020;font-size:12px;margin-top:10px;text-align:center}

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

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

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

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

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

@@ -1 +1 @@
-.team{height:110px;width:100%;background-color:#fff;border-radius:10px;margin-top:10px;padding-top:14px}.team .team-title{color:#222;font-size:14px;font-weight:600;display:block;margin-left:10px}.team .function-team{display:flex;flex-wrap:wrap;align-items:center}.team .function-team .icon-center{width:18%;margin-top:18px;display:flex;flex-wrap:wrap;padding:0 10px;justify-content:center;flex-direction:column;align-items:center}.team .function-team .form-icon{width:24px;height:24px}.team .function-team .characters{color:#202020;font-size:12px;margin-top:10px}
+.team{width:100%;background-color:#fff;border-radius:10px;margin-top:10px;padding:14px 0}.team .team-title{color:#222;font-size:14px;font-weight:600;display:block;margin-left:10px}.team .function-team{display:flex;flex-wrap:wrap;align-items:center}.team .function-team .icon-center{width:18%;margin-top:18px;display:flex;flex-wrap:wrap;padding:0 10px;justify-content:center;flex-direction:column;align-items:center}.team .function-team .form-icon{width:24px;height:24px}.team .function-team .characters{color:#202020;font-size:12px;margin-top:10px;text-align:center}

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

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

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

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

unpackage/dist/dev/mp-weixin/pageC/accountCancellation/accountCancellation.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-modal": "/uview-ui/components/u-modal/u-modal"
+  }
 }

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

@@ -1 +1 @@
-<view class="page data-v-506bddf8"><view style="margin-bottom:40rpx;" class="data-v-506bddf8">在注销账户前，请您进行以下风险确认:</view><view class="data-v-506bddf8">1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view><view class="data-v-506bddf8">2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view><button class="btn data-v-506bddf8">注销账号</button><view class="cancellation data-v-506bddf8">注销后账户不可恢复，请谨慎操作</view></view>
+<view class="page data-v-506bddf8"><view style="margin-bottom:40rpx;" class="data-v-506bddf8">在注销账户前，请您进行以下风险确认:</view><view class="data-v-506bddf8">1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view><view class="data-v-506bddf8">2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view><button data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="btn data-v-506bddf8" bindtap="__e">注销账号</button><view class="cancellation data-v-506bddf8">注销后账户不可恢复，请谨慎操作</view><u-modal vue-id="85df3be4-1" buttonReverse="{{true}}" showCancelButton="{{true}}" confirmText="{{i18n.enter}}" cancelText="{{i18n.Cancel}}" show="{{show}}" title="{{i18n.accountCancellation}}" content="{{i18n.closeaccount}}" confirmColor="#606266" cancelColor="#2979ff" data-event-opts="{{[['^cancel',[['e1']]],['^confirm',[['logout']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-506bddf8" bind:__l="__l"></u-modal></view>

unpackage/dist/dev/mp-weixin/pageC/accountSecurity/accountSecurity.wxml

@@ -1 +1 @@
-<view class="page data-v-cc18101c"><view class="content-top data-v-cc18101c"><view class="first data-v-cc18101c"><text class="data-v-cc18101c">{{i18n.editPassword}}</text><text-right vue-id="b6e8f158-1" texts="{{i18n.setPassword}}" class="data-v-cc18101c" bind:__l="__l"></text-right></view><view class="first data-v-cc18101c"><text class="data-v-cc18101c">{{i18n.editPhone}}</text><text-right vue-id="b6e8f158-2" texts="178****0000" class="data-v-cc18101c" bind:__l="__l"></text-right></view></view><view class="content-bottom data-v-cc18101c"><view data-event-opts="{{[['tap',[['toCancellation',['$event']]]]]}}" class="first data-v-cc18101c" bindtap="__e"><text class="data-v-cc18101c">{{i18n.accountCancellation}}</text><text-right vue-id="b6e8f158-3" texts="{{i18n.cancellation}}" class="data-v-cc18101c" bind:__l="__l"></text-right></view></view></view>
+<view class="page data-v-cc18101c"><view class="content-bottom data-v-cc18101c"><view data-event-opts="{{[['tap',[['toCancellation',['$event']]]]]}}" class="first data-v-cc18101c" bindtap="__e"><text class="data-v-cc18101c">{{i18n.accountCancellation}}</text><text-right vue-id="b6e8f158-1" texts="{{i18n.cancellation}}" class="data-v-cc18101c" bind:__l="__l"></text-right></view></view></view>

unpackage/dist/dev/mp-weixin/pageC/personalInformation/personalInformation.wxml

@@ -1 +1 @@
-<view class="page data-v-9ef45c20"><view class="content data-v-9ef45c20"><view class="header data-v-9ef45c20"><text class="data-v-9ef45c20">{{i18n.headerImg}}</text><image class="header-img data-v-9ef45c20" src="http://pic.imeitou.com/uploads/allimg/240522/10-240522162434-50.jpg" mode></image></view><view data-event-opts="{{[['tap',[['toName',['$event']]]]]}}" class="bottom-text data-v-9ef45c20" bindtap="__e"><text class="data-v-9ef45c20">{{i18n.nickname}}</text><all-right vue-id="6034ed16-1" name="{{nickname}}" class="data-v-9ef45c20" bind:__l="__l"></all-right></view></view></view>
+<view class="page data-v-9ef45c20"><view class="content data-v-9ef45c20"><view class="header data-v-9ef45c20"><text class="data-v-9ef45c20">{{i18n.headerImg}}</text><image class="header-img data-v-9ef45c20" src="{{filePath}}" mode data-event-opts="{{[['tap',[['upimage',['$event']]]]]}}" bindtap="__e"></image></view><view data-event-opts="{{[['tap',[['toName',['$event']]]]]}}" class="bottom-text data-v-9ef45c20" bindtap="__e"><text class="data-v-9ef45c20">{{i18n.nickname}}</text><all-right vue-id="6034ed16-1" name="{{nickname}}" class="data-v-9ef45c20" bind:__l="__l"></all-right></view></view><view class="bottom data-v-9ef45c20"><view data-event-opts="{{[['tap',[['update',['$event']]]]]}}" class="red data-v-9ef45c20" bindtap="__e">保存</view></view></view>

unpackage/dist/dev/mp-weixin/pageC/personalInformation/personalInformation.wxss

@@ -24,6 +24,30 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.bottom.data-v-9ef45c20 {
+  width: 750rpx;
+  height: 166rpx;
+  background: #FFFFFF;
+  padding: 16rpx 32rpx 64rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  box-sizing: border-box;
+}
+.red.data-v-9ef45c20 {
+  width: 686rpx;
+  height: 88rpx;
+  background: #F83224;
+  box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+  border-radius: 44rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  line-height: 88rpx;
+  text-align: center;
+  font-style: normal;
+}
 .page.data-v-9ef45c20 {
   padding: 20rpx 24rpx;
 }

unpackage/dist/dev/mp-weixin/pageD/homepage/homepage.wxss

@@ -58,6 +58,7 @@
   display: flex;
   align-items: center;
   justify-content: flex-end;
+  height: 100rpx;
 }
 .page .content .top-information .btn-list .btn-1.data-v-7eb24152 {
   border: 2rpx solid #f83224;

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

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

unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.wxss

@@ -25,12 +25,12 @@
 /* 透明度 */
 /* 文章场景相关 */
 .mall {
-  height: 100px;
   width: 100%;
   background-color: #fff;
   border-radius: 10px;
-  padding-top: 14px;
+  padding: 14px 0;
   margin-top: 10px;
+  box-sizing: border-box;
 }
 .mall .mall-top {
   display: flex;
@@ -54,16 +54,18 @@
 }
 .mall .order-form {
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   margin-top: 18px;
+  padding: 0 30rpx;
+  box-sizing: border-box;
 }
 .mall .order-form .icon-center {
-  width: 15%;
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
   flex-direction: column;
   align-items: center;
+  flex: 1;
 }
 .mall .order-form .form-icon {
   width: 24px;
@@ -73,5 +75,6 @@
   color: #202020;
   font-size: 12px;
   margin-top: 10px;
+  text-align: center;
 }
 

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

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

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

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

unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.wxss

@@ -25,12 +25,11 @@
 /* 透明度 */
 /* 文章场景相关 */
 .team {
-  height: 110px;
   width: 100%;
   background-color: #fff;
   border-radius: 10px;
   margin-top: 10px;
-  padding-top: 14px;
+  padding: 14px 0;
 }
 .team .team-title {
   color: #222;
@@ -62,5 +61,6 @@
   color: #202020;
   font-size: 12px;
   margin-top: 10px;
+  text-align: center;
 }
 

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

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