8.15

components/kj-chat/kj-chat.vue

@@ -249,8 +249,6 @@
 					to: this.to, // 接收消息对象（用户id）
 					chatType: 'singleChat', // 设置为单聊
 					ext: {
-						// shopname:this.user_other.merchant_name,
-						// image:this.user_other.image,
 						user_other: this.user_other,
 						user:this.user
 					},

components/kj-flow/kj-flow.vue

@@ -84,6 +84,10 @@ color: #666666;">{{item.name_ita}}</view>
 			typeida: {
 				type: String,
 				default: ''
+			},
+			language:{
+				type:'String',
+				default:'zh-CN'
 			}
 		},
 		name: "kj-flow",
@@ -98,25 +102,24 @@ color: #666666;">{{item.name_ita}}</view>
 				rightname: '',
 				dateid: '',
 				unit_price: '',
-				language: 'zh-CN',
+				// language: 'zh-CN',
 				typeid: ''
 			};
 		},
 		created() {
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
+			
 			this.transport()
 		},
-		onLoad() {
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
+		mounted() {
+			// if (uni.getStorageSync('language') != '') {
+			// 	this.language = uni.getStorageSync('language')
+			// 	console.log('222222',this.language);
+			// }
 		},
 		computed: {
 			i18n() {
 				return this.$t('index')
-			}
+			},
 		},
 		methods: {
 			//货柜列表
@@ -243,7 +246,7 @@ color: #666666;">{{item.name_ita}}</view>
 		font-size: 24rpx;
 		color: #F83224;
 		line-height: 28rpx;
-		text-align: right;
+		text-align: left;
 		font-style: normal;
 	}
 
@@ -296,7 +299,7 @@ color: #666666;">{{item.name_ita}}</view>
 		font-size: 28rpx;
 		color: #222222;
 		line-height: 40rpx;
-		text-align: right;
+		text-align: left;
 		font-style: normal;
 	}
 

components/kj-tabbar/kj-tabbar.vue

@@ -166,6 +166,7 @@
 								this.selegoods = this.selegoods.concat(items);
 								this.stringcheck = this.stringcheck.concat(items.cart.id);
 								this.skuitemid = this.skuitemid.concat(items.cart.sku_item_id);
+								
 								console.log('333333333', this.selegoods);
 							}
 						});
@@ -189,7 +190,7 @@
 								"&goodsWeight=" +
 								this.goodsWeight +
 								"&stringcheck=" +
-								this.stringcheck.toString() + '&volume=' + this.volume
+								this.stringcheck.toString() + '&volume=' + this.volume +'&cartid=' + this.checkboxValue1.toString()
 						});
 					});
 				}

pageA/chat/chat.vue

@@ -27,22 +27,14 @@
 						{{item.msg}}
 					</view>
 				</view>
-				<view style="max-width: 80%;" v-if="item.type == 'audio'">
-					<view class="chat-text hflex acenter" style="background: #D3E5FB;max-width: 550rpx;"
-						@click="playaudio(item.url)">
-						<image src="static/yuyin-left.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
-						<text :style="'padding-right: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
-					</view>
-				</view>
-				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
-					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
 					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
 					<view class="u-flex ">
 						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
 						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
 							<view class="chattitle">{{item.ext.order.name}}</view>
-							<text class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+							<text
+								class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
 						</view>
 					</view>
 					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
@@ -55,28 +47,21 @@
 						{{item.msg}}
 					</view>
 				</view>
-				<view style="max-width: 80%;" v-if="item.type == 'audio'">
-					<view class="chat-text hflex acenter jend" style="background: #D3E5FB;max-width: 550rpx;"
-						@click="playaudio(item.url)">
-						<text :style="'padding-left: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
-						<image src="static/yuyin-right.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
-					</view>
-				</view>
-				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
-					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
 					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
 					<view class="u-flex ">
 						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
 						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
 							<view class="chattitle">{{item.ext.order.name}}</view>
-							<text class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+							<text
+								class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
 						</view>
 					</view>
 					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
 					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
-				<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
+				<image v-if="item.from == '13523652365'" src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
+				<image v-else-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 			</view>
 		</view>
 		<view class="" style="height: 55rpx;"></view>
@@ -275,7 +260,7 @@
 </script>
 
 <style lang="scss">
-	.chatfu{
+	.chatfu {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 20rpx;
@@ -284,6 +269,7 @@
 		text-align: left;
 		font-style: normal;
 	}
+
 	.chattitle {
 		width: 314rpx;
 		height: 72rpx;
@@ -301,9 +287,10 @@
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
 		// white-space: pre-wrap;
-		
+
 	}
-	.catmoney{
+
+	.catmoney {
 		width: 104rpx;
 		height: 46rpx;
 		font-family: HarmonyOS_Sans_Medium;
@@ -454,7 +441,7 @@
 			left: 24rpx;
 			z-index: 10;
 			margin: 10px auto;
-			padding:  20rpx;
+			padding: 20rpx;
 
 			.goutong-time {
 				line-height: 80rpx;

pageA/chat/news.vue

@@ -7,7 +7,7 @@
 		</view>
 		<!-- 客服 -->
 		<view class="" v-for="(item,idx) in list" :key="idx">
-			<view v-if="user_no !='13523652365' && item.lastMessage.to == '13523652365'" class="kefu u-flex"
+			<view v-if="user_no !='13523652365' && item.conversationId == '13523652365'" class="kefu u-flex"
 				@click="tokefu">
 				<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
 				<view class="u-row-between"
@@ -28,9 +28,8 @@
 			</view>
 		</view>
 		<view class="box ">
-			<view style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx" @click="chat(item.lastMessage)">
-				<view class="u-flex " v-if="user_no == '13523652365'? item.lastMessage.to == '13523652365' :
-					item.lastMessage.to !='13523652365'">
+			<view style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx" @click="chat(item)">
+				<view class="u-flex " v-if="item.conversationId != '13523652365'">
 					<image :src=" item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
 					</image>
 					<view class="u-row-between"
@@ -97,15 +96,17 @@
 				})
 			},
 			chat(item) {
-				if (item.from == uni.getStorageSync('user_no')) {
+				if (item.lastMessage.from == uni.getStorageSync('user_no')) {
 					uni.navigateTo({
-						url: '/pageA/chat/chat?user_other_no=' + item.to + '&user_other=' + encodeURIComponent(JSON
-							.stringify(item.ext.user_other))
+						url: '/pageA/chat/chat?user_other_no=' + item.conversationId + '&user_other=' +
+							encodeURIComponent(JSON
+								.stringify(item.lastMessage.ext.user_other))
 					})
-				} else {
+				} else if (item.lastMessage.to == uni.getStorageSync('user_no')) {
 					uni.navigateTo({
-						url: '/pageA/chat/chat?user_other_no=' + item.from + '&user_other=' + encodeURIComponent(
-							JSON.stringify(item.ext.user))
+						url: '/pageA/chat/chat?user_other_no=' + item.conversationId + '&user_other=' +
+							encodeURIComponent(
+								JSON.stringify(item.lastMessage.ext.user))
 					})
 				}
 			}

pageA/order.vue

@@ -281,7 +281,8 @@
 				typea: '',
 				goodsPrice: '',
 				goodsWeight: '',
-				stringcheck: ''
+				stringcheck: '',
+				cartid:''
 			};
 		},
 		computed: {
@@ -298,6 +299,7 @@
 				this.goodsPrice = options.goodsPrice
 				this.goodsWeight = options.goodsWeight
 				this.stringcheck = options.stringcheck
+				this.cartid = options.cartid
 			} else if (options) {
 				this.value = options.value
 				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
@@ -385,6 +387,7 @@
 			},
 			//货柜列表
 			container() {
+				this.containlist = []
 				uni.$u.http.get('/api/container-base', {
 					params: {
 						is_page: 0,
@@ -392,10 +395,11 @@
 						transport_type_id: this.transport_type_id,
 						weight: this.typea == 'shop' ?
 							this.goodsWeight : Number(this.sku_info.weight) * this.value,
-						type: this.typea == 'shop' ? '' : this.goodinfo.cate == 0 ? 'normal' : 'special',
+						type: this.typea == 'shop' ? '' : (this.goodinfo.cate == 0 ? 'normal' : 'special'),
 						length: Number(this.goodinfo.length) * this.value, //		是	String	长
 						width: this.goodinfo.width, //		是	String	宽
 						height: this.goodinfo.height, //		是	String	高
+						cart_id:this.cartid
 					}
 				}).then((res) => {
 					res.forEach((item) => {

pageA/productdetails.vue

@@ -682,6 +682,7 @@
 				uni.navigateBack()
 			},
 			chat() {
+				let useinfo = uni.getStorageSync('user_info')
 				let that = this
 				let id = conn.getUniqueId(); // 生成本地消息id
 				let msg = new WebIM.message('txt', id); // 创建文本消息
@@ -696,8 +697,11 @@
 							"name": that.name_c,
 							'image': that.goodinfo.image,
 							'discount_price': that.goodinfo.discount_price,
-							'fu': that.fu
-						}
+							'fu': that.fu,
+							
+						},
+						'user_other':that.goodinfo.merchant,
+						'user':useinfo,
 					},
 					success: function(id, serverMsgId) {
 						uni.navigateTo({

pageA/service/service.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="chat-pages">
-		<u-navbar title="在线客服" :safeAreaInsetTop="true" :placeholder='true'>
+		<u-navbar title="在线客服" :safeAreaInsetTop="true" :placeholder='true' :fixed='true'>
 			<view class="u-nav-slot u-flex" slot="left">
 				<u-icon @click="return1" name="arrow-left" size="19"></u-icon>
 				<image src="../static/images/phone.png" style="width: 40rpx;height: 40rpx;margin-left: 44rpx;" mode="">
@@ -15,59 +15,25 @@
 				{{renderTime(item.time)}}
 			</view>
 			<view class="chat-item-box u-flex u-col-top acenter" v-if="item.from == user_other_no">
-				<image src="/pageA/static/images/kefu.png" class="user-img" mode=""></image>
+				<!-- <image :src="user_other.avatar" class="user-img" mode=""></image> -->
+				<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
 				<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
 					<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
 						{{item.msg}}
 					</view>
 				</view>
-				<view style="max-width: 80%;" v-if="item.type == 'audio'">
-					<view class="chat-text hflex acenter" style="background: #D3E5FB;max-width: 550rpx;"
-						@click="playaudio(item.url)">
-						<image src="static/yuyin-left.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
-						<text :style="'padding-right: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
-					</view>
-				</view>
-				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
-					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
-				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'cand'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header-top u-flex u-row-between">
-						<view class="header-left">
-							<view class="u-flex">
-								<text class="text1">{{item.ext.order.name}}</text>
-							</view>
-						</view>
-						<view class="header-right">
-							<image :src="item.ext.order.avatar" class="right-img" mode=""></image>
-							<image src="../static/images/nan.png" class="sex" mode=""
-								v-if="item.ext.order.sex == 'male'"></image>
-							<image src="../static/images/nv.png" class="sex" mode="" v-else></image>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
+					<view class="u-flex ">
+						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+							<view class="chattitle">{{item.ext.order.name}}</view>
+							<text
+								class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
 						</view>
 					</view>
-					<view class="goutong-time">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'pos'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'order'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'order')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
+					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
 			</view>
 			<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
@@ -76,53 +42,18 @@
 						{{item.msg}}
 					</view>
 				</view>
-				<view style="max-width: 80%;" v-if="item.type == 'audio'">
-					<view class="chat-text hflex acenter jend" style="background: #D3E5FB;max-width: 550rpx;"
-						@click="playaudio(item.url)">
-						<text :style="'padding-left: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
-						<image src="static/yuyin-right.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
-					</view>
-				</view>
-				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
-					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
-				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'cand'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header-top u-flex u-row-between">
-						<view class="header-left">
-							<view class="u-flex">
-								<text class="text1">{{item.ext.order.name}}</text>
-							</view>
-						</view>
-						<view class="header-right">
-							<image :src="item.ext.order.avatar" class="right-img" mode=""></image>
-							<image src="../static/images/nan.png" class="sex" mode=""
-								v-if="item.ext.order.sex == 'male'"></image>
-							<image src="../static/images/nv.png" class="sex" mode="" v-else></image>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
+					<view class="u-flex ">
+						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+							<view class="chattitle">{{item.ext.order.name}}</view>
+							<text
+								class="catmoney">￥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
 						</view>
 					</view>
-					<view class="goutong-time">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'pos'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
-				</view>
-				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'order'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'order')">
-					<view class="header1-top u-flex u-row-between">
-						<text>{{item.ext.order.title}}</text>
-						<text>{{item.ext.order.salary}}K</text>
-					</view>
-					<view class="goutong-time1">
-						{{renderTime(item.time)}} 发起沟通
-					</view>
+					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
 				<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 			</view>
@@ -321,6 +252,48 @@
 </script>
 
 <style lang="scss">
+	.chatfu {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #555555;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.chattitle {
+		width: 314rpx;
+		height: 72rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		-webkit-line-clamp: 2;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		// white-space: pre-wrap;
+
+	}
+
+	.catmoney {
+		width: 104rpx;
+		height: 46rpx;
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 26rpx;
+		color: #F83224;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		font-weight: 600;
+	}
+
 	.title {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
@@ -452,14 +425,15 @@
 		}
 
 		.chat-header {
-			width: 702rpx;
+			width: 540rpx;
+			// height: 264rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
 			position: sticky;
 			left: 24rpx;
-			z-index: 20;
+			z-index: 10;
 			margin: 10px auto;
-			padding: 0 20rpx;
+			padding: 20rpx;
 
 			.goutong-time {
 				line-height: 80rpx;

pageC/accountSetup/accountSetup.vue

@@ -1,92 +1,50 @@
 <template>
-  <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="
+	<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"
-        @click="toNextPage(`/pageD/userAgreement/userAgreement`)"
-      >
-        <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
+        ">
+				<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" @click="toNextPage(`/pageD/userAgreement/userAgreement`)">
+				<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"
         @click="toNextPage(`/pageD/platformProducts/platformProducts`)"
       >
@@ -97,184 +55,183 @@
           mode=""
         ></image>
       </view> -->
-      <view
-        class="text-2"
-        @click="toNextPage(`/pageD/joinPlatfrom/joinPlatfrom`)"
-      >
-        <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="text-2" @click="toNextPage(`/pageD/joinPlatfrom/joinPlatfrom`)">
+				<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 {
-      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() {},
-};
+	import {
+		conn
+	} from '../../utils/WebIM.js'
+	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",
+				});
+				conn.close();
+			},
+			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>

pages/express/express.vue

@@ -234,7 +234,7 @@
 		</view>
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow :goodstype="this.goodinfo.goodtype" ref="child" :province_id='province_id' @success='success'
+				<kj-flow :language="language" :goodstype="goodinfo.goodtype" ref="child" :province_id='province_id' @success='success'
 					@close='logshow=false' :leftchangea='leftchange' :rightchangea='rightchange'
 					:typeida='typeid'></kj-flow>
 			</view>

pages/login/login.vue

@@ -88,21 +88,21 @@
 																.easemob_username)
 															uni.setStorageSync('pwd', res
 																.easemob_password)
-															// var options = {
-															// 	user: res.easemob_username,
-															// 	pwd: res.easemob_password,
-															// 	appKey: conn.appkey,
-															// };
-															// conn.open(options);
-															conn.open({
+															var options = {
 																user: res.easemob_username,
 																pwd: res.easemob_password,
-																appKey: conn.appkey
-															}).then(() => {
-																console.log('res');
-															}).catch(reason => {
-																console.log('失败', reason);
-															})
+																appKey: conn.appkey,
+															};
+															conn.open(options);
+															// conn.open({
+															// 	user: res.easemob_username,
+															// 	pwd: res.easemob_password,
+															// 	appKey: conn.appkey
+															// }).then(() => {
+															// 	console.log('res');
+															// }).catch(reason => {
+															// 	console.log('失败', reason);
+															// })
 															uni.setStorageSync("token", res.token);
 															uni.setStorageSync("openid", res
 																.openid);

unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxss

@@ -1 +1 @@
-.iitem.data-v-34959586{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-34959586{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:right;font-style:normal}.right.data-v-34959586{flex:1;width:474rpx;height:642rpx}.bottom.data-v-34959586{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-34959586{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}.title.data-v-34959586{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-34959586{width:212rpx;height:642rpx}.ititle.data-v-34959586{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:right;font-style:normal}.itime.data-v-34959586{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}
+.iitem.data-v-ed69b0fa{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-ed69b0fa{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:right;font-style:normal}.right.data-v-ed69b0fa{flex:1;width:474rpx;height:642rpx}.bottom.data-v-ed69b0fa{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-ed69b0fa{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}.title.data-v-ed69b0fa{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-ed69b0fa{width:212rpx;height:642rpx}.ititle.data-v-ed69b0fa{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:right;font-style:normal}.itime.data-v-ed69b0fa{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}