冲突

App.vue

@@ -1,18 +1,22 @@
 <script>
-import { conn } from "./utils/WebIM";
-import { initEid } from "./mp_ecard_sdk/main";
-// import {
-// 	index
-// } from "@/units/inquire.js"
-export default {
-  onLaunch: function () {
-    initEid();
+	import {
+		conn
+	} from "./utils/WebIM";
+	import {
+		initEid
+	} from "./mp_ecard_sdk/main";
+	// import {
+	// 	index
+	// } from "@/units/inquire.js"
+	export default {
+		onLaunch: function() {
+			initEid();
 
-    // console.log('App Launch')
-    setTimeout(() => {
-      if (uni.getStorageSync("token")) {
-        this.HXlogin();
-        /* if (uni.getStorageSync("company_id") == 0) {
+			// console.log('App Launch')
+			setTimeout(() => {
+				if (uni.getStorageSync("token")) {
+					this.HXlogin();
+					/* if (uni.getStorageSync("company_id") == 0) {
 						if (getCurrentPages()[0].route != 'pages/login/login') {
 							uni.reLaunch({
 								url: "/pages/login/login"
@@ -29,53 +33,54 @@ export default {
 							}
 						})
 					} */
-      } else {
-        // if (getCurrentPages()[0].route != 'pages/login/login') {
-        // 	uni.reLaunch({
-        // 		url: "/pages/login/login"
-        // 	})
-        // }
-      }
-    }, 800);
-  },
-  onShow: function () {
-    // console.log('App Show')
-  },
-  onHide: function () {
-    // console.log('App Hide')
-  },
-  methods: {
-    HXlogin() {
-      if (uni.getStorageSync("user_no") && uni.getStorageSync("pwd")) {
-        var user_no = uni.getStorageSync("user_no");
-        var pwd = uni.getStorageSync("pwd");
-        conn
-          .open({
-            user: user_no,
-            pwd: pwd,
-            appKey: conn.appkey,
-          })
-          .then(() => {
-            console.log("res");
-          })
-          .catch((reason) => {
-            console.log("失败", reason);
-          });
-      }
-    },
-  },
-};
+				} else {
+					// if (getCurrentPages()[0].route != 'pages/login/login') {
+					// 	uni.reLaunch({
+					// 		url: "/pages/login/login"
+					// 	})
+					// }
+				}
+			}, 800);
+		},
+		onShow: function() {
+			// console.log('App Show')
+		},
+		onHide: function() {
+			// console.log('App Hide')
+		},
+		methods: {
+			HXlogin() {
+				// logger.enableAll();
+				if (uni.getStorageSync("user_no") && uni.getStorageSync("pwd")) {
+					var user_no = uni.getStorageSync("user_no");
+					var pwd = uni.getStorageSync("pwd");
+					conn
+						.open({
+							user: user_no,
+							pwd: pwd,
+							appKey: conn.appkey,
+						})
+						.then(() => {
+							console.log("res");
+						})
+						.catch((reason) => {
+							console.log("失败", reason);
+						});
+				}
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-page {
-  background-color: #f4f4f4;
-}
+	page {
+		background-color: #f4f4f4;
+	}
 
-.uni-bar {
-  background-color: #f4f4f4;
-}
+	.uni-bar {
+		background-color: #f4f4f4;
+	}
 
-/*每个页面公共css */
-@import "@/uview-ui/index.scss";
-</style>
+	/*每个页面公共css */
+	@import "@/uview-ui/index.scss";
+</style>

components/kj-chat/kj-chat.vue

@@ -235,12 +235,12 @@
 					this.$u.toast('发送消息不能为空')
 					return
 				}
-
 				let id = conn.getUniqueId(); // 生成本地消息id
 
 				let msg = new WebIM.message('txt', id); // 创建文本消息
-				console.log(this.user_other);
+				// console.log('msg',msg);
 				msg.set({
+					type: "txt",
 					msg: this.text, // 消息内容
 					to: this.to, // 接收消息对象（用户id）
 					chatType: 'singleChat', // 设置为单聊
@@ -251,15 +251,36 @@
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
 						setTimeout(() => {
-							_this.$emit('success', true)
+							_this.$emit('success', true)  
 						}, 800);
 					},
 					fail: function(e) {
-						console.log("发送消息失败");
+						console.log("发送消息失败",e);
 					}
 				});
+				console.log('msg',msg);
 				conn.send(msg.body);
 				this.text = ''
+
+				// let option = {
+				// 	// 消息类型。
+				// 	type: "txt",
+				// 	// 消息内容。
+				// 	msg: 'this.text',
+				// 	// 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+				// 	to: this.to,
+				// 	// 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`，默认为单聊。
+				// 	chatType: "singleChat",
+				// };
+				// // 创建文本消息。
+				// let msg = WebIM.message.create(option);
+				// // 调用 `send` 方法发送该文本消息。
+				// conn.send(msg).then((res) => {
+				// 	console.log("Send message success", res);
+				// }).catch((e) => {
+				// 	console.log("Send message fail", e);
+				// });
+
 			},
 			toalbum() {
 				let _this = this

components/kj-express/kj-express.vue

@@ -0,0 +1,949 @@
+<template>
+	<!-- 商城 -->
+	<scroll-view  class="" scroll-y='true' style="height: calc(100vh - 188rpx);padding: 0 24rpx;" >
+		<view style="position: relative;padding-bottom: 20rpx;">
+			<!-- 自定义导航栏 -->
+			<image src="../../static/images/index/back.png"
+				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
+			</image>
+			<!-- 地址 -->
+			<view class="address">
+				<view class="left u-flex" style="display: flex;">
+					<view class="u-row-between left" style="display: flex;flex-direction: column;">
+						<image src="../../static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
+						<image @click="changeadd" src="../../static/express/change.png"
+							style='width: 40rpx;;height:40rpx ;' mode="">
+						</image>
+					</view>
+					<view class=" u-row-between left"
+						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
+						<view v-if="JSON.stringify(topadd)=='{}'" class="u-row-between " style="" @click="send">
+							<view class="pople">{{i18n.sender}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
+						</view>
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{topadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(topadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
+						</view>
+						<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>
+					</view>
+				</view>
+				<view class="left u-flex"
+					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)">
+					<view class="u-row-between left" style="display: flex;flex-direction: column;">
+						<image src="../../static/express/shou.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
+						<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
+						</image>
+					</view>
+					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
+						<view v-if="JSON.stringify(bottomadd)=='{}'" class="u-row-between " style="" @click="recipirnt">
+							<view class="pople">{{i18n.recipient}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
+						</view>
+						<view v-else class="u-row-between " style="" @click="recipirnt">
+							<view class="">
+								<text class="topname">{{bottomadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(bottomadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
+						</view>
+						<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>
+					</view>
+				</view>
+				<!-- 物品信息 -->
+				<view class="info u-flex u-row-between">
+					<view class="u-flex">
+						<text class="wupin">{{i18n.item}}</text>
+						<view class="mast">{{i18n.required}}</view>
+					</view>
+					<view v-if="JSON.stringify(goodinfo)==='{}'" class="u-flex" @click='goods'>
+						<view class="change">{{i18n.selection}}</view>
+						<image src="../../static/express/next1.png"
+							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
+					</view>
+					<view v-else class="goodname" @click='goods'>
+						{{goodinfo.goodname}},{{goodinfo.weight}}kg
+					</view>
+				</view>
+				<!-- 跨境物流 -->
+				<view class="info u-flex u-row-between">
+					<view class="u-flex">
+						<text class="wupin">{{i18n.flow}}</text>
+					</view>
+					<view class="u-flex" @click="changewu">
+						<!-- <text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text> -->
+						<text class="change"
+							style="color: rgba(248, 50, 36, 1);">{{leftname?leftname+' |  '+rightname : i18n.selection}}</text>
+						<image v-if="leftname==''" src="../../static/express/next1.png"
+							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
+					</view>
+				</view>
+				<!-- 去寄件 -->
+				<view class="" style="margin-top: 34rpx;">
+					<view class="mail" @click="todev">
+						{{i18n.mail}}
+					</view>
+				</view>
+				<view class="bottom u-flex u-row-between">
+					<button
+						style="background-color: transparent;padding-left: 0 !important;padding-right: 0 !important;margin: 0 !important;"
+						open-type="share" class="u-flex">
+						<image src="../../static/express/share.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
+						<text class="friend">{{i18n.share}}</text>
+					</button>
+					<view class="friend">|</view>
+					<view class="u-flex" @click="counter">
+						<image src="/static/images/index/compile.png" style="width: 36rpx;height: 36rpx;" mode="">
+						</image>
+						<text class="friend">{{i18n.compute}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 我的包裹 -->
+			<view class="parcel">
+				<view class="u-flex u-row-between">
+					<view class="myparcel">
+						<text>{{i18n.mine}}</text>
+						<text style="color: rgba(248, 50, 36, 1);">{{i18n.parcel}}</text>
+					</view>
+					<view class="add u-flex">
+						<image src="../../static/express/add.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
+						<text class="addtext" @click="toparcel">{{i18n.addsign}}</text>
+					</view>
+				</view>
+				<view class="u-flex u-row-around" style="margin-top: 44rpx;">
+					<view class="flexc" @click="pack('to_transit')">
+						<view class="" style="position: relative;width: 68rpx;height: 68rpx;">
+							<u-badge :absolute='true' :offset="[0,-15]" :type="type" max="99"
+								:value="transit"></u-badge>
+							<image src="/static/express/address.png" style='width:68rpx;height:68rpx' mode="">
+							</image>
+						</view>
+						<text style='margin-top:16rpx' class="bao">{{i18n.deliver}}</text>
+					</view>
+					<view class="flexc" style="position: relative;" @click="pack('transit_receipt')">
+						<view class="" style="position: relative;width: 68rpx;height: 68rpx;">
+							<u-badge :absolute='true' :offset="[0,-15]" :type="type" max="99"
+								:value="receipt"></u-badge>
+							<image src="/static/express/sign.png" style='width:68rpx;height:68rpx' mode=""></image>
+						</view>
+						<text style='margin-top:16rpx' class="bao">{{i18n.Sign}}</text>
+					</view>
+					<view class="flexc" style="position: relative;" @click="pack('to_overseas')">
+						<view class="" style="position: relative;width: 68rpx;height: 68rpx;">
+							<u-badge :absolute='true' :offset="[0,-15]" :type="type" max="99"
+								:value="overseas"></u-badge>
+							<image src="../../static/express/send.png" style='width:68rpx;height:68rpx' mode=""></image>
+						</view>
+						<text style='margin-top:16rpx' class="bao">{{i18n.overseas}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 拼包 -->
+			<view class="u-flex u-row-between" style="margin-top: 32rpx;width: 702rpx;">
+				<view class="u-flex">
+					<text class="hai">{{i18n.parceling}}</text>
+					<image v-if="language =='zh-CN'" style="width: 180rpx;height: 32rpx;"
+						src="/static/express/label.png" mode=""></image>
+					<image v-if="language =='en-US'" style="width: 300rpx;height: 32rpx;"
+						src="/static/express/label1.png" mode=""></image>
+					<image v-if="language =='es-ES'" style="width: 334rpx;height: 32rpx;"
+						src="/static/express/label2.png" mode=""></image>
+					<image v-if="language =='it-IT'" style="width: 366rpx;height: 32rpx;"
+						src="/static/express/label3.png" mode=""></image>
+				</view>
+				<view class="u-flex">
+					<text class="more" @click="more">{{i18n.more}}</text>
+					<image src="../../static/express/next2.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+				</view>
+			</view>
+			<!-- 拼包数据 -->
+			<view class="label" v-for="(item,idx) in expressList" :key="idx">
+				<view class="" style="display: flex;">
+					<view class="left flexc">
+						<text class="bourn">{{i18n.destination}}</text>
+						<view class="addres">{{item.containerBase.country_name}}</view>
+						<view class="addres">{{item.containerBase.province_name}}</view>
+					</view>
+					<view class="" style="flex: 1;margin-left: 20rpx;">
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class='bigtitle' v-if="item.type=='normal'">{{i18n.Ordinary}}</text>
+								<text class='bigtitle' v-else>{{i18n.Special}}</text>
+								<text style="margin: 0 8rpx;">|</text>
+								<text v-if="language =='zh-CN'" class='bigtitle'>{{item.transportType.name_cn}}</text>
+								<text v-if="language =='en-US'" class='bigtitle'>{{item.transportType.name_en}}</text>
+								<text v-if="language =='es-ES'" class='bigtitle'>{{item.transportType.name_es}}</text>
+								<text v-if="language =='it-IT'" class='bigtitle'>{{item.transportType.name_ita}}</text>
+							</view>
+							<view class="mon">
+								<text class="timeb">{{i18n.price}}</text>
+								<text>￥</text>
+								<text v-if="item.price" style="font-size: 32rpx;">{{item.price.slice(0,-3)}}</text>
+								<text v-if="item.price">{{item.price.slice(-3)}}</text>
+							</view>
+						</view>
+						<view class="" style="margin-top: 34rpx;">
+							<u-line-progress activeColor='rgba(255, 21, 21, 1)' :percentage="item.progress" height="6"
+								:showText="false"></u-line-progress>
+						</view>
+						<view class="u-flex u-row-between" style="margin-top: 20rpx;">
+							<view class="u-flex">
+								<view class="">
+									<text class='timeb'>{{i18n.already}} </text>
+									<text class='timeb' style='color:rgba(255, 21, 21, 1)'>{{item.used_weight}}kg</text>
+								</view>
+								<text style="margin: 0 8rpx;">|</text>
+								<view class="">
+									<text class='timeb'>{{i18n.residue}} </text>
+									<text class='timeb'
+										style='color:rgba(255, 21, 21, 1)'>{{item.residual_weight}}kg</text>
+								</view>
+							</view>
+							<view class="">
+								<text class="timeb">{{i18n.plan}}{{item.progress}}%</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="u-flex u-row-between" style="margin-top: 32rpx;">
+					<text class="timea">{{i18n.start}}：{{item.begin_date}}/{{i18n.cut}}：{{item.end_date}}</text>
+					<view class="pinb" @click="toaccount(item)">{{i18n.goparceling}}</view>
+				</view>
+			</view>
+		</view>
+		<u-popup round='28' :show="logshow" @close="close">
+			<view class="pop">
+				<kj-flow :language="language" :goodstype="goodinfo.goodtype" ref="child" :province_id='province_id'
+					@success='success' @close='close()' :leftchangea='leftchange' :rightchangea='rightchange'
+					:typeida='typeid'></kj-flow>
+			</view>
+		</u-popup>
+		<!-- <u-button @click="show = true">打开</u-button> -->
+		<!-- <view class="" style="height: 160rpx;"></view> -->
+	</scroll-view>
+</template>
+
+<script>
+	import {
+		conn,
+	} from '@/utils/WebIM';
+	export default {
+		data() {
+			return {
+				//顶部分段器
+				list: [],
+				current: 0,
+				type: "error",
+				percentage: 50, //进度条
+				logshow: false, //物流选择
+				status_collection: '', //我的包裹选择值
+				transit: 0, //发往中转点
+				receipt: 0, //中转已签收
+				overseas: 0, //正发往海外
+				topadd: {}, //新建寄件人
+				bottomadd: {}, //新建收件人
+				province_id: '',
+				leftname: '',
+				rightname: '',
+				container_id: '', //货柜列表
+				language: 'zh-CN',
+				goodinfo: {}, //物品信息
+				unit_price: '',
+				expressList: [],
+				leftchange: '',
+				rightchange: '',
+				typeid: '',
+				unReadCount: 0
+			}
+		},
+		created(options) {
+			this.list = [this.i18n.border, this.i18n.shop]
+			// if (options.current) {
+			// 	this.current = options.current
+			// }
+			this.topadd = {} //新建寄件人
+			this.bottomadd = {} //新建收件人
+		},
+		mounted() {
+			this.list[0] = this.i18n.border
+			this.list[1] = this.i18n.shop
+			// uni.setNavigationBarTitle({
+			// 	title: this.i18n.setup
+			// })
+			this.express() //获取包裹数量
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+			this.getexpress()
+			this.getlist()
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		methods: {
+			getlist() {
+				this.unReadCount = 0
+				conn.getServerConversations({
+					pageSize: 50,
+					cursor: ''
+				}).then((res) => {
+					console.log(res);
+					res.data.conversations.forEach((item) => {
+						this.unReadCount += item.unReadCount
+					})
+				})
+			},
+			onShareAppMessage(res) {
+				if (res.from === 'button') { // 来自页面内分享按钮
+					console.log(res.target)
+				}
+				return {
+					title: this.i18n.border,
+					path: '/pages/express/express'
+				}
+			},
+			callphone() {
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'basic'
+					}
+				}).then((res) => {
+					console.log(res);
+
+					uni.makePhoneCall({
+						phoneNumber: res.service_mobile
+					})
+				}).catch(() => {
+
+				})
+			},
+			//价格计算
+			calculate() {
+				uni.$u.http.get('/api/express-order/calculate', {
+					params: {
+						container_id: this.container_id, // 是 String 货柜ID
+						weight: this.goodinfo.weight, //是 String 重量(kg)
+						length: this.goodinfo.length, //是 String 长(m)
+						width: this.goodinfo.width, //是 String 宽(m)
+						height: this.goodinfo.height, //是 String 高(m)
+						type: this.goodinfo.goodtype //是 String 商品类型: normal.普通商品,
+					}
+				}).then((res) => {
+					console.log(res);
+					uni.navigateTo({
+						url: "/pageB/delivery?goodinfo=" + encodeURIComponent(JSON.stringify(this
+								.goodinfo)) +
+							"&topadd=" + encodeURIComponent(JSON.stringify(
+								this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this
+								.bottomadd)) +
+							'&leftname=' + this
+							.leftname + "&rightname=" + this.rightname + "&container_id=" + this
+							.container_id +
+							"&unit_price=" + this.unit_price + '&all=' + res
+					})
+				}).catch(() => {
+
+				})
+			},
+			//拼包列表
+			getexpress() {
+				uni.$u.http.get('/api/express-group-package', {
+					params: {
+						is_page: 0,
+						page: 1,
+						limit: 3,
+						transport_type_id: "",
+						container_base_id: '',
+						type: '',
+					}
+				}).then((res) => {
+					this.expressList = res
+				}).catch(() => {
+
+				})
+			},
+			//跨境物流选择
+			success(msg) {
+				this.logshow = false
+				this.leftname = msg.leftname
+				this.container_id = msg.dateid
+				this.rightname = msg.rightname
+				this.unit_price = msg.unit_price
+				this.leftchange = msg.leftchange
+				this.rightchange = msg.rightchange
+				this.typeid = msg.typeid
+			},
+			//物流选择
+			changewu() {
+				var that = this
+				if (this.province_id) {
+					this.logshow = true
+					setTimeout(() => {
+						console.log('2222222', this.$refs.child);
+						that.$refs.child.transport();
+					}, 800)
+				} else {
+					this.$u.toast(this.i18n.selectcity)
+				}
+			},
+			//改变地址
+			changeadd() {
+				var a = {}
+				a = this.topadd
+				this.topadd = this.bottomadd
+				this.bottomadd = a
+				this.province_id = this.bottomadd.province_id
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+				}
+			},
+			//地址薄
+			addbook(index) {
+				var that = this
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?tabs=" + index,
+					events: {
+						getadd(res) {
+							if (index == 1) {
+								that.topadd = res
+								console.log('topadd', that.topadd);
+							} else {
+								that.bottomadd = res
+								console.log('bottom', that.bottomadd);
+								that.province_id = that.bottomadd.province_id
+							}
+						}
+					}
+				})
+			},
+			//我的包裹
+			express() {
+				uni.$u.http.get('/api/express-order/status-count', {}).then((res) => {
+					console.log(res);
+					this.overseas = res.to_overseas
+					this.receipt = res.transit_receipt
+					this.transit = res.to_transit
+				}).catch(() => {
+
+				})
+			},
+			todev() {
+				if (JSON.stringify(this.topadd) === '{}') {
+					this.$u.toast('请填写寄件人地址')
+				} else if (JSON.stringify(this.bottomadd) === '{}') {
+					this.$u.toast('请填写收件人地址')
+				} else if (JSON.stringify(this.goodinfo) === '{}') {
+					this.$u.toast('请填写物品信息')
+				} else if (this.leftname == '') {
+					this.$u.toast('请选择物流方式')
+				} else {
+					this.calculate()
+				}
+			},
+			count() {
+				uni.navigateTo({
+					url: '/pageB/account'
+				})
+			},
+			pack(index) {
+				uni.navigateTo({
+					// url: '/pageB/myPackage?index=' + index
+					url: "/pageC/myPackage/myPackage?type=" + index,
+				})
+			},
+			more() {
+				uni.navigateTo({
+					url: '/pageB/list/list'
+				})
+			},
+			//拼包快递
+			toaccount(info) {
+				uni.navigateTo({
+					url: '/pageB/ParcelExpress?expressinfo=' + encodeURIComponent(JSON.stringify(info)) +
+						'&type=' + 'pin'
+				})
+			},
+			//物流计算器
+			counter() {
+				uni.navigateTo({
+					url: '/pageA/counter'
+				})
+			},
+			//消息
+			tochat() {
+				uni.navigateTo({
+					url: '/pageA/chat/news'
+				})
+			},
+			//物品信息
+			goods() {
+				var that = this
+				if (JSON.stringify(this.goodinfo) == '{}') {
+					uni.navigateTo({
+						url: '/pageB/goods',
+						events: {
+							goodinfo: function(res) {
+								console.log('goodinfo', res);
+								that.goodinfo = res
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageB/goods?goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo)),
+						events: {
+							goodinfo: function(res) {
+								that.goodinfo = res
+								console.log(res);
+							}
+						}
+					})
+				}
+			},
+			//寄件人信息
+			send() {
+				var that = this
+				if (JSON.stringify(that.topadd) == '{}') {
+					uni.navigateTo({
+						url: '/pageC/addEditAddress/addEditAddress',
+						events: {
+							topadd: function(res) {
+								// console.log(res);
+								that.topadd = res
+							}
+						}
+					})
+				} else {
+					var that = this
+					uni.navigateTo({
+						url: '/pageC/addEditAddress/addEditAddress?id=' + that.topadd.id,
+						events: {
+							topadd: function(res) {
+								// console.log(res);
+								that.topadd = res
+							}
+						}
+					})
+				}
+			},
+			recipirnt() {
+				var that = this
+				if (JSON.stringify(that.bottomadd) == '{}') {
+					uni.navigateTo({
+						url: '/pageB/recipientinfo',
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res
+								that.province_id = res.province_id
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageB/recipientinfo?id=' + that.bottomadd.id,
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res
+								that.province_id = res.province_id
+							}
+						}
+					})
+				}
+			},
+			close() {
+				this.logshow = false
+			},
+			//分段器切换
+			sectionChange(index) {
+				this.current = index;
+				console.log(index);
+				if (this.current == 1) {
+					uni.switchTab({
+						url: '/pages/index/index?current=1'
+					})
+					this.current = 0
+				}
+			},
+			toparcel() {
+				uni.navigateTo({
+					url: '/pageB/parcel'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	button {
+		border: 0rpx solid rgba(0, 0, 0, 1) !important;
+	}
+
+	page {
+		background-color: rgba(0, 0, 0, 0)
+	}
+
+	.bao {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.goodname {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.topname {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #222222;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.topaddress {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #777777;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.pop {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #333333;
+		line-height: 50rpx;
+		text-align: left;
+		font-style: normal;
+		padding: 32rpx 28rpx 0 0;
+		box-sizing: border-box;
+	}
+
+	.mon {
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 20rpx;
+		color: #F83224;
+		line-height: 26rpx;
+		text-align: left;
+		font-style: normal;
+		font-weight: 600;
+	}
+
+	.bigtitle {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.timeb {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #666666;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.timea {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #555555;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.pinb {
+		width: 148rpx;
+		height: 64rpx;
+		background: #FF1515;
+		border-radius: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		line-height: 64rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.label {
+		margin-top: 20rpx;
+		width: 702rpx;
+		// height: 288rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 32rpx 20rpx;
+		box-sizing: border-box;
+
+		.left {
+			width: 144rpx;
+			height: 144rpx;
+			background: #F5F5F5;
+			border-radius: 8rpx;
+
+			.bourn {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #222222;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.addres {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+	.flexc {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.hai {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 32rpx;
+		color: #222222;
+		line-height: 44rpx;
+		text-align: left;
+		font-style: normal;
+		margin-right: 10rpx;
+	}
+
+	.more {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #F83224;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.parcel {
+		width: 702rpx;
+		// height: 260rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		margin-top: 20rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+
+		.myparcel {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #222222;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.add {
+			// width: 240rpx;
+			height: 48rpx;
+			background: rgba(248, 50, 36, 0.06);
+			border-radius: 24rpx;
+
+			.addtext {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 20rpx;
+				color: #000000;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+	.address {
+		width: 702rpx;
+		// height: 776rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 48rpx 24rpx 36rpx;
+		box-sizing: border-box;
+		margin-top: 38rpx;
+
+		.bottom {
+			padding: 0 76rpx;
+			box-sizing: border-box;
+			margin-top: 48rpx;
+
+			.friend {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #555555;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 12rpx;
+			}
+		}
+
+		.mail {
+			width: 646rpx;
+			height: 84rpx;
+			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: 84rpx;
+			text-align: center;
+			font-style: normal;
+		}
+
+		.info {
+			height: 100rpx;
+			border-bottom: 2rpx solid rgba(151, 151, 151, 0.08);
+
+
+
+			.wupin {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.change {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #666666;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.mast {
+				// width: 62rpx;
+				height: 30rpx;
+				border-radius: 16rpx;
+				border: 1rpx solid #F83224;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #FF1515;
+				line-height: 30rpx;
+				text-align: center;
+				font-style: normal;
+				margin-left: 12rpx;
+				padding: 0 4rpx;
+				box-sizing: border-box;
+			}
+		}
+
+		.left {
+			height: 128rpx;
+
+			.pople {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #222222;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.jiadd {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #777777;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.right {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 26rpx;
+				color: #222222;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 18rpx;
+			}
+		}
+	}
+
+	// ::v-deep .u-navbar__content.data-v-1194bf80 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
+
+	// ::v-deep .u-status-bar.data-v-13f16680 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
+
+	::v-deep .u-subsection--button.data-v-b14d3440 {
+		/* padding: 6rpx 34rpx !important; */
+		border-radius: 64rpx !important;
+	}
+
+	::v-deep .u-subsection--button__bar.data-v-b14d3440 {
+		border-radius: 32rpx !important;
+	}
+</style>

components/kj-index/kj-index.vue

@@ -0,0 +1,786 @@
+<template>
+	<!-- 商城 -->
+	<scroll-view @scrolltolower='lower' class="" scroll-y='true' style="height: calc(100vh - 188rpx);">
+		<!-- <view class="index-navbar"> -->
+		<view class="" style="margin-top: 30rpx;padding:0 24rpx;" >
+			<!-- 搜索 -->
+			<view class="search">
+				<view class="u-flex">
+					<u-icon name="search" size='32'></u-icon>
+					<input type="text" v-model="keyword" :placeholder="i18n.Searchcon" />
+				</view>
+				<view class="right" @click="search">
+					{{i18n.search}}
+				</view>
+			</view>
+			<!-- tabs -->
+			<view class="" style="display: flex;margin-top: 20rpx;align-items: center;justify-content: space-between;">
+				<u-tabs :list="list1" @change='changetab'></u-tabs>
+				<view class="border">
+				</view>
+				<view class="u-flex" style="margin-left: 24rpx;width: 100rpx;" @click="shoptype">
+					<image src="../../static/images/index/fenlei.png" style="width: 24rpx;height: 24rpx;;" mode="">
+					</image>
+					<text class="fenlei">{{i18n.sort}}</text>
+				</view>
+			</view>
+			<!-- 轮播图 -->
+			<view class="" style="margin-top: 20rpx;">
+				<u-swiper keyName="image" radius='10' :indicator='true' :list="banner"></u-swiper>
+			</view>
+		</view>
+		<view class="shopback">
+			<view class="u-flex u-row-between">
+				<!-- 百亿补贴 -->
+				<view class="bigbox" @click="subsidy(1)">
+					<view class="u-flex">
+						<image v-if="language=='zh-CN'" src="../../static/images/index/butie.png"
+							style="width: 104rpx;height: 26rpx;" mode="">
+						</image>
+						<image v-if="language =='en-US'" src="../../static/images/index/butie1.png"
+							style="width: 200rpx;height: 26rpx;" mode="">
+						</image>
+						<image v-if="language =='es-ES'" src="../../static/images/index/butie2.png"
+							style="width: 260rpx;height: 26rpx;" mode="">
+						</image>
+						<image v-if="language =='it-IT'" src="../../static/images/index/butie3.png"
+							style="width: 152rpx;height: 22rpx;" mode="">
+						</image>
+						<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
+					</view>
+					<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
+						<view v-for="(item,idx) in subsidylist" class="ssbox  " style="margin-top: 16rpx;">
+							<view class="" style="position: relative">
+								<image :src="item.image" style="width: 144rpx;height: 144rpx;" mode=""></image>
+								<view v-if="language=='zh-CN'" class="u-flex u-row-center"
+									style="position: absolute;bottom: 10rpx;width: 144rpx;">
+									<view class="u-flex">
+										<view class="tag u-flex" style="background: rgba(243, 93, 34, 1);">
+											<image src="../../static/images/index/down.png"
+												style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+												mode="">
+											</image>
+											<text>{{i18n.fill}}</text>
+											<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="money" style="text-align: center;">
+								￥{{item.discount_price}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 拼包好物 -->
+				<view class="">
+					<view class="smallbox" @click="subsidy(2)">
+						<view class="u-flex">
+							<image v-if="language=='zh-CN'" src="../../static/images/index/pinbao.png"
+								style="width: 164rpx;height: 26rpx;" mode=""></image>
+							<image v-if="language =='en-US'" src="../../static/images/index/pinbao1.png"
+								style="width: 200rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='es-ES'" src="../../static/images/index/pinbao2.png"
+								style="width: 126rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='it-IT'" src="../../static/images/index/pinbao3.png"
+								style="width: 126rpx;height: 26rpx;" mode="">
+							</image>
+							<view v-if="language=='zh-CN'" class="biaoqian" style="background: rgba(255, 148, 21, 1);">
+								{{i18n.lowest}}1元
+							</view>
+							<view v-else class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.lowest}}1RMB
+							</view>
+						</view>
+						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
+							<view v-for="(item,idx) in packlist" class="ssbox  " style="margin-top: 16rpx;">
+								<view class="" style="position: relative">
+									<image :src="item.image" style=";width: 144rpx;height: 144rpx;" mode=""></image>
+									<view class="u-flex u-row-center"
+										style="position: absolute;bottom: 10rpx;width: 144rpx;">
+										<view class="u-flex">
+											<!-- 												<image src="../../static/images/index/label.png"
+													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+													mode="">
+												</image> -->
+											<view v-if="item.is_discount==0" class="tag u-flex"
+												style="background-color: rgba(251, 73, 70, 1);">
+												<image src="../../static/images/index/down.png"
+													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+													mode="">
+												</image>
+												<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="smallbox" @click="subsidy(3)">
+						<view class="u-flex">
+							<image v-if="language =='zh-CN'" src="../../static/images/index/postage.png"
+								style="width: 116rpx;height: 26rpx;" mode=""></image>
+							<image v-if="language =='en-US'" src="../../static/images/index/postage1.png"
+								style="width: 130rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='es-ES'" src="../../static/images/index/postage2.png"
+								style="width: 200rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='it-IT'" src="../../static/images/index/postage3.png"
+								style="width: 190rpx;height: 26rpx;" mode="">
+							</image>
+							<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
+						</view>
+						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
+							<view v-for="(item,idx) in shippList" class="ssbox  " style="margin-top: 8rpx;">
+								<view class="" style="position: relative">
+									<image :src="item.image" style="width: 124rpx;height: 124rpx;" mode=""></image>
+									<view class="shopname" v-if="language =='zh-CN'">
+										{{item.name_cn}}
+									</view>
+									<view class="shopname" v-if="language =='en-US'">
+										{{item.name_en}}
+									</view>
+									<view class="shopname" v-if="language =='es-ES'">
+										{{item.name_es}}
+									</view>
+									<view class="shopname" v-if="language =='it-IT'">
+										{{item.name_ita}}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="u-flex u-row-between" style="flex-wrap: wrap;">
+				<view class="bigbox" v-for="(item,index) in recomlist" style="position: relative;"
+					@click="todetail(item.id)">
+					<view v-if="item.is_discount==0 || item.mer_is_discount ==0 " class="discount">
+						{{i18n.discount}}
+					</view>
+					<image :src="item.image"
+						style="width: 340rpx;height: 340rpx;;margin-left: -20rpx;margin-top: -18rpx;" mode=""></image>
+					<view class="title" v-if="language =='zh-CN'">
+						{{item.name_cn}}
+					</view>
+					<view class="title" v-if="language =='en-US'">
+						{{item.name_en}}
+					</view>
+					<view class="title" v-if="language =='es-ES'">
+						{{item.name_es}}
+					</view>
+					<view class="title" v-if="language =='it-IT'">
+						{{item.name_ita}}
+					</view>
+					<view class="">
+						<text class="money">
+							¥{{item.discount_price}}
+						</text>
+						<text class="weight">
+							¥{{item.weight}}/kg
+						</text>
+					</view>
+					<view v-if="item.label_arr" class="u-flex"
+						style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
+						<!-- 					<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
+							style="border: 1rpx solid #E5BC78;color: #E5BC78;">
+							<text>{{child.name_cn}}</text>
+						</view> -->
+						<view v-for="(child,idx) in item.label_arr.slice(0,3)" :key="idx" class="taber"
+							style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
+							<text v-if="language =='zh-CN'">
+								{{child.name_cn}}
+							</text>
+							<text v-if="language =='en-US'">
+								{{child.name_en}}
+							</text>
+							<text v-if="language =='es-ES'">
+								{{child.name_es}}
+							</text>
+							<text v-if="language =='it-IT'">
+								{{child.name_ita}}
+							</text>
+						</view>
+						<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<u-popup :show="show" mode='center' :round='16' bgColor='transparent'>
+			<view style="position: relative;" @click="advert">
+				<image :src="configimage" style="width: 570rpx;height: 764rpx;border-radius: 16rpx;" mode=""></image>
+				<view class="" style="text-align: center;" @click.stop='show=false'>
+					<image src="../../static/images/index/close.png" mode="" style="width: 70rpx;height: 70rpx;">
+					</image>
+				</view>
+			</view>
+		</u-popup>
+		<view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view>
+		<kj-tabbar :value1=0></kj-tabbar>
+	</scroll-view>
+</template>
+
+<script>
+	import {
+		conn,
+	} from '@/utils/WebIM';
+	import {
+		recom
+	} from "../../network/shopApi.js";
+	export default {
+		data() {
+			return {
+				recomlist: [], //推荐列表
+				//顶部分段器
+				// list: [],
+				current: 1,
+				//tabs
+				list1: [{
+					name: '推荐',
+				}],
+				//轮播图
+				banner: [
+					'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+					'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+				],
+				show: true,
+				timer: '',
+				language: 'zh-CN',
+				subsidylist: [], //百万补贴
+				packlist: [], //拼包好物
+				shippList: [], //海外包邮
+				keyword: '',
+				page: 1,
+				index: 0,
+				parent_id: '',
+				last_page: '',
+				configimage: '',
+				url: '',
+				unReadCount: 0,
+				type: "error",
+			}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			},
+			list() {
+				var list = []
+				list = [this.i18n.border, this.i18n.shop]
+				return list
+			}
+		},
+		onReachBottom() {
+			if (this.page < this.last_page) {
+				if (this.current != 0) {
+					this.page++
+					this.goods(this.parent_id)
+				}
+			} else {
+				this.$u.toast(this.i18n.Nofurtherdata)
+			}
+		},
+		created(options) {
+			// this.seater()
+			//商品推荐
+			this.getlista()
+		},
+		mounted() {  
+			this.config()
+			// tabs列表
+			this.category()
+			//百万补贴
+			this.subsid()
+			//拼包好物
+			this.pack()
+			//海外包邮
+			this.shipp()
+			this.recommend()
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+			this.HXlogin()
+			this.bannerList()
+		},
+		methods: {
+			//下拉触底
+			lower(){
+				if (this.page < this.last_page) {
+					if (this.current != 0) {
+						this.page++
+						this.goods(this.parent_id)
+					}
+				} else {
+					this.$u.toast(this.i18n.Nofurtherdata)
+				}
+			},
+			//获取快递列表
+			getlista() {
+				uni.$u.http.get('/api/express-company', {}).then((res) => {
+					uni.setStorageSync('radiolist1', res)
+				}).catch(() => {
+
+				})
+			},
+			//获取轮播图
+			bannerList() {
+				uni.$u.http.get('/api/banner', {}).then((res) => {
+					this.banner = res.data
+				}).catch(() => {
+
+				})
+			},
+			HXlogin() {
+				if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
+					var user_no = uni.getStorageSync('user_no')
+					var pwd = uni.getStorageSync('pwd')
+					conn.open({
+						user: user_no,
+						pwd: pwd,
+						appKey: conn.appkey
+					}).then(() => {
+						console.log('res');
+						this.getlist()
+					}).catch(reason => {
+						console.log('失败', reason);
+					})
+
+				}
+			},
+			getlist() {
+				this.unReadCount = 0
+				conn.getServerConversations({
+					pageSize: 50,
+					cursor: ''
+				}).then((res) => {
+					console.log(res);
+					res.data.conversations.forEach((item) => {
+						this.unReadCount += item.unReadCount
+					})
+					console.log(this.unReadCount);
+				})
+			},
+			callphone() {
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'basic'
+					}
+				}).then((res) => {
+					console.log(res);
+					uni.makePhoneCall({
+						phoneNumber: res.service_mobile
+					})
+				}).catch(() => {
+
+				})
+
+			},
+			advert() {
+				uni.navigateTo({
+					url: this.url
+				})
+			},
+			//广告弹窗
+			config() {
+				uni.$u.http.get('api/config', {
+					params: {
+						module: 'advertising'
+					}
+				}).then((res) => {
+					console.log(res);
+					this.configimage = res.image
+					this.url = res.url
+				}).catch(() => {
+
+				})
+			},
+			//海外包邮接口
+			shipp() {
+				uni.$u.http.post('api/goods/shipping').then((res) => {
+					this.shippList = res.data.splice(0, 2)
+				}).catch(() => {
+
+				})
+			},
+			//拼包好物接口
+			pack() {
+				uni.$u.http.post('/api/goods/pack').then((res) => {
+					this.packlist = res.data.splice(0, 2)
+				}).catch(() => {
+
+				})
+			},
+			//百万补贴接口
+			subsid() {
+				uni.$u.http.post('/api/goods/subsidy').then((res) => {
+					console.log(res);
+					this.subsidylist = res.data.splice(0, 4)
+				}).catch(() => {
+
+				})
+			},
+			//标签切换
+			changetab(e) {
+				this.page = 1
+				this.last_page = 0
+				this.index = e.index
+				this.parent_id = e.id
+				if (this.index == 0) {
+					this.recommend()
+				} else {
+					this.recomlist = []
+					this.goods(this.parent_id)
+				}
+			},
+			search() {
+				if (this.index == 0) {
+					this.recommend()
+				} else {
+					this.recomlist = []
+					this.goods(this.parent_id)
+				}
+			},
+			//商品推荐
+			recommend() {
+				uni.$u.http.post('/api/goods/recommend', {
+					keyword: this.keyword
+				}).then((res) => {
+					this.recomlist = res
+				}).catch(() => {
+
+				})
+			},
+			//商品分类列表
+			category() {
+				uni.$u.http.get('/api/goods/category', {
+					params: {
+						parent_id: 0
+					}
+				}).then((res) => {
+					const categoryArr = res
+					this.list1 = [{
+						name: ''
+					}]
+					if (this.language == 'en-US') {
+						categoryArr.forEach(item => {
+							item.name = item.name_en
+						})
+						this.list1[0].name = 'recommend'
+					}
+					if (this.language == 'es-ES') {
+						categoryArr.forEach(item => {
+							item.name = item.name_es
+						})
+						this.list1[0].name = 'recomendación'
+					}
+					if (this.language == 'it-IT') {
+						categoryArr.forEach(item => {
+							item.name = item.name_ita
+						})
+						this.list1[0].name = 'raccomandata'
+					}
+
+					if (this.language == 'zh-CN') {
+						categoryArr.forEach(item => {
+							item.name = item.name_cn
+						})
+						this.list1[0].name = '推荐'
+					}
+					this.list1 = this.list1.concat(categoryArr)
+				}).catch(() => {
+
+				})
+			},
+			//商品列表
+			goods(id) {
+				uni.$u.http.get('/api/goods', {
+					params: {
+						parent_id: id,
+						limit: 10,
+						page: this.page,
+						keyword: this.keyword
+					}
+				}).then((res) => {
+					this.recomlist = this.recomlist.concat(res.data)
+					this.last_page = res.last_page
+				}).catch(() => {
+
+				})
+			},
+			//百万补贴跳转
+			subsidy(item) {
+				uni.navigateTo({
+					url: '/pageA/subsidy?show=' + item
+				})
+			},
+			//物流计算器
+			counter() {
+				uni.navigateTo({
+					url: '/pageA/counter'
+				})
+			},
+			//消息
+			tochat() {
+				uni.navigateTo({
+					url: '/pageA/chat/news'
+				})
+			},
+			//商品分类
+			shoptype() {
+				uni.navigateTo({
+					url: '/pageA/shoptype'
+				})
+			},
+			//分段器切换
+			sectionChange(index) {
+				this.current = index;
+				console.log(index);
+				if (this.current == 0) {
+					uni.switchTab({
+						url: '/pages/express/express?current=0'
+					})
+					this.current = 1
+				}
+			},
+			//详情
+			todetail(id) {
+				uni.navigateTo({
+					url: '/pageA/productdetails?id=' + id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: rgba(0, 0, 0, 0)
+	}
+
+	.discount {
+		
+		// width: 100rpx;
+		padding: 0 6rpx;
+		height: 36rpx;
+		background: #FF1515;
+		border-radius: 6rpx;
+		position: absolute;
+		left: 12rpx;
+		top: 12rpx;
+		z-index: 10;
+		font-family: OriyaMN;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		line-height: 36rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.index-navbar {
+		position: sticky;
+		top: 0;
+		left: 0;
+		width: 750rpx;
+		z-index: 100;
+	}
+
+	::v-deep .u-tabs {
+		width: 560rpx;
+	}
+
+	.taber {
+		border-radius: 4rpx;
+		padding: 4rpx 8rpx;
+		margin-bottom: 10rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 16rpx;
+		color: #D48700;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.title {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		// line-height: 30rpx;
+		// text-align: left;
+		// font-style: normal;
+		width: 300rpx;
+		// height: 70rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		-webkit-line-clamp: 1;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+	}
+
+	.weight {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #888888;
+		line-height: 24rpx;
+		text-align: left;
+		font-style: normal;
+		margin-left: 12rpx;
+	}
+
+	.shopname {
+		width: 124rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		white-space: nowrap;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #666666;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.money {
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 28rpx;
+		color: #F83224;
+		line-height: 38rpx;
+		text-align: right;
+		font-style: normal;
+	}
+
+	.biaoqian {
+		height: 28rpx;
+		border-radius: 6rpx;
+		padding: 6rpx;
+		margin-left: 8rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		line-height: 30rpx;
+		text-align: center;
+		overflow: hidden;
+	}
+
+	.tag {
+		// height: 28rpx;
+		border-radius: 14rpx 14rpx 14rpx 0rpx;
+		border: 1rpx solid #FFFFFF;
+		padding: 6rpx;
+		text-align: center;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		line-height: 28rpx;
+		text-align: center;
+		font-style: normal;
+		box-sizing: border-box;
+		// margin-left: -15rpx;
+	}
+
+	.bigbox {
+		width: 340rpx;
+		// height: 468rpx;
+		background: #FFFFFF;
+		border-radius: 12rpx;
+		border: 2rpx solid #FFFFFF;
+		margin-bottom: 22rpx;
+		padding: 18rpx 20rpx;
+		box-sizing: border-box;
+	}
+
+	.smallbox {
+		width: 340rpx;
+		height: 226rpx;
+		background: #FFFFFF;
+		border-radius: 12rpx;
+		border: 2rpx solid #FFFFFF;
+		margin-bottom: 22rpx;
+		padding: 18rpx 20rpx;
+		box-sizing: border-box;
+	}
+
+	.shopback {
+		width: 750rpx;
+		min-height: 1216rpx;
+		background: #F4F4F4;
+		border-radius: 28rpx 28rpx 0rpx 0rpx;
+		padding: 26rpx 24rpx;
+		box-sizing: border-box;
+
+	}
+
+	.fenlei {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: right;
+		font-style: normal;
+		margin-left: 8rpx;
+	}
+
+	.search {
+		width: 702rpx;
+		height: 68rpx;
+		background: #FFFFFF;
+		border-radius: 34rpx;
+		padding: 6rpx 6rpx 6rpx 36rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+
+
+		.right {
+			width: 100rpx;
+			height: 56rpx;
+			background: #ED0909;
+			border-radius: 28rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #FFFFFF;
+			line-height: 56rpx;
+			text-align: center;
+		}
+	}
+
+	.border {
+		width: 2rpx;
+		height: 24rpx;
+		border: 2rpx solid #979797;
+		opacity: 0.2;
+		background-color: #979797;
+	}
+
+	// ::v-deep .u-navbar__content.data-v-1194bf80 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
+
+	// ::v-deep .u-status-bar.data-v-13f16680 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
+
+	::v-deep .u-subsection--button.data-v-b14d3440 {
+		/* padding: 6rpx 34rpx !important; */
+		border-radius: 64rpx !important;
+	}
+
+	::v-deep .u-subsection--button__bar.data-v-b14d3440 {
+		border-radius: 32rpx !important;
+	}
+</style>

pageA/chat/chat.vue

@@ -240,7 +240,7 @@
 					to: this.user_other_no, // 接收消息对象的用户 ID。
 				};
 				let msg2 = new WebIM.message.create(option2);
-				conn.send(msg2);
+				// conn.send(msg2);
 				let options = {
 					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
 					targetId: this.user_other_no,

pageA/chat/news.vue

@@ -108,6 +108,7 @@
 	export default {
 		data() {
 			return {
+				cursor:'',
 				type: "error",
 				value: 1,
 				list: [],
@@ -120,6 +121,9 @@
 				}]
 			};
 		},
+		onReachBottom() {
+			this.getlist()
+		},
 		onLoad() {
 			this.user_no = uni.getStorageSync('user_no')
 			// this.getlist()
@@ -154,10 +158,16 @@
 			getlist() {
 				conn.getServerConversations({
 					pageSize: 50,
-					cursor: ''
+					cursor: this.cursor
 				}).then((res) => {
-					console.log(res);
-					this.list = res.data.conversations
+					// this.list.concat(res.data.conversations)
+					if(this.cursor==''){
+						this.list = res.data.conversations
+					}
+					if(this.cursor){
+						this.list.concat(res.data.conversations)
+					}
+					this.cursor = res.data.cursor
 				})
 			},
 			tokefu() {

pageA/productdetails.vue

@@ -665,6 +665,7 @@
 				let that = this;
 				let id = conn.getUniqueId(); // 生成本地消息id
 				let msg = new WebIM.message("txt", id); // 创建文本消息
+				console.log(' this.goodinfo.merchant.member.easemob_username', this.goodinfo.merchant.member.easemob_username);
 				msg.set({
 					type: "txt",
 					msg: this.i18n.merchandiseNews,

pageA/service/service.vue

@@ -212,11 +212,11 @@
 			getdata() {
 				let option2 = {
 					chatType: "singleChat", // 会话类型，设置为单聊。
-					type: "channel", // 消息类型。
+					type: "txt", // 消息类型。
 					to: this.user_other_no, // 接收消息对象的用户 ID。
 				};
 				let msg2 = new WebIM.message.create(option2);
-				conn.send(msg2);
+				// conn.send(msg2);
 				let options = {
 					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
 					targetId: this.user_other_no,

pages/index/index.vue

@@ -24,226 +24,20 @@
 						:list="list" :current="current" @change="sectionChange"></u-subsection>
 				</view>
 			</u-navbar>
-			<view class="" style="margin-top: 30rpx;padding:0 24rpx;">
-				<!-- 搜索 -->
-				<view class="search">
-					<view class="u-flex">
-						<u-icon name="search" size='32'></u-icon>
-						<input type="text" v-model="keyword" :placeholder="i18n.Searchcon" />
-					</view>
-					<view class="right" @click="search">
-						{{i18n.search}}
-					</view>
-				</view>
-				<!-- tabs -->
-				<view class=""
-					style="display: flex;margin-top: 20rpx;align-items: center;justify-content: space-between;">
-					<u-tabs :list="list1" @change='changetab'></u-tabs>
-					<view class="border">
-					</view>
-					<view class="u-flex" style="margin-left: 24rpx;width: 100rpx;" @click="shoptype">
-						<image src="../../static/images/index/fenlei.png" style="width: 24rpx;height: 24rpx;;" mode="">
-						</image>
-						<text class="fenlei">{{i18n.sort}}</text>
-					</view>
-				</view>
-				<!-- 轮播图 -->
-				<view class="" style="margin-top: 20rpx;">
-					<u-swiper radius='10' :indicator='true' :list="banner"></u-swiper>
-				</view>
-			</view>
-		</view>
-		<view class="shopback">
-			<view class="u-flex u-row-between">
-				<!-- 百亿补贴 -->
-				<view class="bigbox" @click="subsidy(1)">
-					<view class="u-flex">
-						<image v-if="language=='zh-CN'" src="../../static/images/index/butie.png"
-							style="width: 104rpx;height: 26rpx;" mode="">
-						</image>
-						<image v-if="language =='en-US'" src="../../static/images/index/butie1.png"
-							style="width: 200rpx;height: 26rpx;" mode="">
-						</image>
-						<image v-if="language =='es-ES'" src="../../static/images/index/butie2.png"
-							style="width: 260rpx;height: 26rpx;" mode="">
-						</image>
-						<image v-if="language =='it-IT'" src="../../static/images/index/butie3.png"
-							style="width: 152rpx;height: 22rpx;" mode="">
-						</image>
-						<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
-					</view>
-					<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-						<view v-for="(item,idx) in subsidylist" class="ssbox  " style="margin-top: 16rpx;">
-							<view class="" style="position: relative">
-								<image :src="item.image" style="width: 144rpx;height: 144rpx;" mode=""></image>
-								<view v-if="language=='zh-CN'" class="u-flex u-row-center"
-									style="position: absolute;bottom: 10rpx;width: 144rpx;">
-									<view class="u-flex">
-										<view class="tag u-flex" style="background: rgba(243, 93, 34, 1);">
-											<image src="../../static/images/index/down.png"
-												style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
-												mode="">
-											</image>
-											<text>{{i18n.fill}}</text>
-											<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="money" style="text-align: center;">
-								￥{{item.discount_price}}
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- 拼包好物 -->
-				<view class="">
-					<view class="smallbox" @click="subsidy(2)">
-						<view class="u-flex">
-							<image v-if="language=='zh-CN'" src="../../static/images/index/pinbao.png"
-								style="width: 164rpx;height: 26rpx;" mode=""></image>
-							<image v-if="language =='en-US'" src="../../static/images/index/pinbao1.png"
-								style="width: 200rpx;height: 26rpx;" mode="">
-							</image>
-							<image v-if="language =='es-ES'" src="../../static/images/index/pinbao2.png"
-								style="width: 126rpx;height: 26rpx;" mode="">
-							</image>
-							<image v-if="language =='it-IT'" src="../../static/images/index/pinbao3.png"
-								style="width: 126rpx;height: 26rpx;" mode="">
-							</image>
-							<view v-if="language=='zh-CN'" class="biaoqian" style="background: rgba(255, 148, 21, 1);">
-								{{i18n.lowest}}1元
-							</view>
-							<view v-else class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.lowest}}1RMB
-							</view>
-						</view>
-						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-							<view v-for="(item,idx) in packlist" class="ssbox  " style="margin-top: 16rpx;">
-								<view class="" style="position: relative">
-									<image :src="item.image" style=";width: 144rpx;height: 144rpx;" mode=""></image>
-									<view class="u-flex u-row-center"
-										style="position: absolute;bottom: 10rpx;width: 144rpx;">
-										<view class="u-flex">
-											<!-- 												<image src="../../static/images/index/label.png"
-													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
-													mode="">
-												</image> -->
-											<view v-if="item.is_discount==0" class="tag u-flex"
-												style="background-color: rgba(251, 73, 70, 1);">
-												<image src="../../static/images/index/down.png"
-													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
-													mode="">
-												</image>
-												<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="smallbox" @click="subsidy(3)">
-						<view class="u-flex">
-							<image v-if="language =='zh-CN'" src="../../static/images/index/postage.png"
-								style="width: 116rpx;height: 26rpx;" mode=""></image>
-							<image v-if="language =='en-US'" src="../../static/images/index/postage1.png"
-								style="width: 130rpx;height: 26rpx;" mode="">
-							</image>
-							<image v-if="language =='es-ES'" src="../../static/images/index/postage2.png"
-								style="width: 200rpx;height: 26rpx;" mode="">
-							</image>
-							<image v-if="language =='it-IT'" src="../../static/images/index/postage3.png"
-								style="width: 190rpx;height: 26rpx;" mode="">
-							</image>
-							<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
-						</view>
-						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-							<view v-for="(item,idx) in shippList" class="ssbox  " style="margin-top: 8rpx;">
-								<view class="" style="position: relative">
-									<image :src="item.image" style="width: 124rpx;height: 124rpx;" mode=""></image>
-									<view class="shopname" v-if="language =='zh-CN'">
-										{{item.name_cn}}
-									</view>
-									<view class="shopname" v-if="language =='en-US'">
-										{{item.name_en}}
-									</view>
-									<view class="shopname" v-if="language =='es-ES'">
-										{{item.name_es}}
-									</view>
-									<view class="shopname" v-if="language =='it-IT'">
-										{{item.name_ita}}
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="u-flex u-row-between" style="flex-wrap: wrap;">
-				<view class="bigbox" v-for="(item,index) in recomlist" style="position: relative;"
-					@click="todetail(item.id)">
-					<view v-if="item.is_discount==0 || item.mer_is_discount ==0 " class="discount">
-						{{i18n.discount}}
-					</view>
-					<image :src="item.image"
-						style="width: 340rpx;height: 340rpx;;margin-left: -20rpx;margin-top: -18rpx;" mode=""></image>
-					<view class="title" v-if="language =='zh-CN'">
-						{{item.name_cn}}
-					</view>
-					<view class="title" v-if="language =='en-US'">
-						{{item.name_en}}
-					</view>
-					<view class="title" v-if="language =='es-ES'">
-						{{item.name_es}}
-					</view>
-					<view class="title" v-if="language =='it-IT'">
-						{{item.name_ita}}
-					</view>
-					<view class="">
-						<text class="money">
-							¥{{item.discount_price}}
-						</text>
-						<text class="weight">
-							¥{{item.weight}}/kg
-						</text>
-					</view>
-					<view v-if="item.label_arr" class="u-flex"
-						style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
-						<!-- 					<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
-							style="border: 1rpx solid #E5BC78;color: #E5BC78;">
-							<text>{{child.name_cn}}</text>
-						</view> -->
-						<view v-for="(child,idx) in item.label_arr.slice(0,3)" :key="idx" class="taber"
-							style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
-							<text v-if="language =='zh-CN'">
-								{{child.name_cn}}
-							</text>
-							<text v-if="language =='en-US'">
-								{{child.name_en}}
-							</text>
-							<text v-if="language =='es-ES'">
-								{{child.name_es}}
-							</text>
-							<text v-if="language =='it-IT'">
-								{{child.name_ita}}
-							</text>
-						</view>
-						<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
-					</view>
-				</view>
-			</view>
 		</view>
-
-		<u-popup :show="show" mode='center' :round='16' bgColor='transparent'>
-			<view style="position: relative;" @click="advert">
-				<image :src="configimage" style="width: 570rpx;height: 764rpx;border-radius: 16rpx;" mode=""></image>
-				<view class="" style="text-align: center;" @click.stop='show=false'>
-					<image src="../../static/images/index/close.png" mode="" style="width: 70rpx;height: 70rpx;">
-					</image>
-				</view>
-			</view>
-		</u-popup>
-		<view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view>
+		<swiper style="min-height: 100vh;" class="index-swiper" :circular="false" :autoplay="false" :current="current" @change="swipertotabs" >
+			<!-- 商城 -->
+			<swiper-item>
+				<scroll-view scroll-y="true" class="" >
+					<kj-express></kj-express>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item>
+				<scroll-view scroll-y="true" class="" style="height: calc (100vh - 88rpx);">
+					<kj-index></kj-index>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
 		<kj-tabbar :value1=0></kj-tabbar>
 	</view>
 </template>
@@ -300,266 +94,270 @@
 			}
 		},
 		onReachBottom() {
-			if (this.page < this.last_page) {
-				if (this.current != 0) {
-					this.page++
-					this.goods(this.parent_id)
-				}
-			} else {
-				this.$u.toast(this.i18n.Nofurtherdata)
-			}
+			// if (this.page < this.last_page) {
+			// 	if (this.current != 0) {
+			// 		this.page++
+			// 		this.goods(this.parent_id)
+			// 	}
+			// } else {
+			// 	this.$u.toast(this.i18n.Nofurtherdata)
+			// }
 		},
 		onLoad(options) {
 			// this.seater()
-			if (options.current) {
-				this.current = options.current
-			}
-			//商品推荐
-			this.getlista()
+			// if (options.current) {
+			// 	this.current = options.current
+			// }
+			// //商品推荐
+			// this.getlista()
 		},
 		onShow() {
-			this.config()
-			// tabs列表
-			this.category()
-			//百万补贴
-			this.subsid()
-			//拼包好物
-			this.pack()
-			//海外包邮
-			this.shipp()
-			this.recommend()
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
-			this.HXlogin()
+			// this.config()
+			// // tabs列表
+			// this.category()
+			// //百万补贴
+			// this.subsid()
+			// //拼包好物
+			// this.pack()
+			// //海外包邮
+			// this.shipp()
+			// this.recommend()
+			// if (uni.getStorageSync('language') != '') {
+			// 	this.language = uni.getStorageSync('language')
+			// }
+			// this.HXlogin()
 		},
 		methods: {
-			//获取快递列表
-			getlista() {
-				uni.$u.http.get('/api/express-company', {}).then((res) => {
-					uni.setStorageSync('radiolist1', res)
-				}).catch(() => {
-
-				})
-			},
-			HXlogin() {
-				if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
-					var user_no = uni.getStorageSync('user_no')
-					var pwd = uni.getStorageSync('pwd')
-					conn.open({
-						user: user_no,
-						pwd: pwd,
-						appKey: conn.appkey
-					}).then(() => {
-						console.log('res');
-						this.getlist()
-					}).catch(reason => {
-						console.log('失败', reason);
-					})
-
-				}
-			},
-			getlist() {
-				this.unReadCount = 0
-				conn.getServerConversations({
-					pageSize: 50,
-					cursor: ''
-				}).then((res) => {
-					console.log(res);
-					res.data.conversations.forEach((item) => {
-						this.unReadCount += item.unReadCount
-					})
-					console.log(this.unReadCount);
-				})
-			},
-			callphone() {
-				uni.$u.http.get('/api/config', {
-					params: {
-						module: 'basic'
-					}
-				}).then((res) => {
-					console.log(res);
-					uni.makePhoneCall({
-						phoneNumber: res.service_mobile
-					})
-				}).catch(() => {
-
-				})
-
-			},
-			advert() {
-				uni.navigateTo({
-					url: this.url
-				})
-			},
-			//广告弹窗
-			config() {
-				uni.$u.http.get('api/config', {
-					params: {
-						module: 'advertising'
-					}
-				}).then((res) => {
-					console.log(res);
-					this.configimage = res.image
-					this.url = res.url
-				}).catch(() => {
-
-				})
-			},
-			//海外包邮接口
-			shipp() {
-				uni.$u.http.post('api/goods/shipping').then((res) => {
-					this.shippList = res.data.splice(0, 2)
-				}).catch(() => {
-
-				})
-			},
-			//拼包好物接口
-			pack() {
-				uni.$u.http.post('/api/goods/pack').then((res) => {
-					this.packlist = res.data.splice(0, 2)
-				}).catch(() => {
-
-				})
-			},
-			//百万补贴接口
-			subsid() {
-				uni.$u.http.post('/api/goods/subsidy').then((res) => {
-					console.log(res);
-					this.subsidylist = res.data.splice(0, 4)
-				}).catch(() => {
-
-				})
-			},
-			//标签切换
-			changetab(e) {
-				this.page = 1
-				this.last_page = 0
-				this.index = e.index
-				this.parent_id = e.id
-				if (this.index == 0) {
-					this.recommend()
-				} else {
-					this.recomlist = []
-					this.goods(this.parent_id)
-				}
-			},
-			search() {
-				if (this.index == 0) {
-					this.recommend()
-				} else {
-					this.recomlist = []
-					this.goods(this.parent_id)
-				}
-			},
-			//商品推荐
-			recommend() {
-				uni.$u.http.post('/api/goods/recommend', {
-					keyword: this.keyword
-				}).then((res) => {
-					this.recomlist = res
-				}).catch(() => {
-
-				})
-			},
-			//商品分类列表
-			category() {
-				uni.$u.http.get('/api/goods/category', {
-					params: {
-						parent_id: 0
-					}
-				}).then((res) => {
-					const categoryArr = res
-					this.list1 = [{
-						name: ''
-					}]
-					if (this.language == 'en-US') {
-						categoryArr.forEach(item => {
-							item.name = item.name_en
-						})
-						this.list1[0].name = 'recommend'
-					}
-					if (this.language == 'es-ES') {
-						categoryArr.forEach(item => {
-							item.name = item.name_es
-						})
-						this.list1[0].name = 'recomendación'
-					}
-					if (this.language == 'it-IT') {
-						categoryArr.forEach(item => {
-							item.name = item.name_ita
-						})
-						this.list1[0].name = 'raccomandata'
-					}
-
-					if (this.language == 'zh-CN') {
-						categoryArr.forEach(item => {
-							item.name = item.name_cn
-						})
-						this.list1[0].name = '推荐'
-					}
-					this.list1 = this.list1.concat(categoryArr)
-				}).catch(() => {
-
-				})
-			},
-			//商品列表
-			goods(id) {
-				uni.$u.http.get('/api/goods', {
-					params: {
-						parent_id: id,
-						limit: 10,
-						page: this.page,
-						keyword: this.keyword
-					}
-				}).then((res) => {
-					this.recomlist = this.recomlist.concat(res.data)
-					this.last_page = res.last_page
-				}).catch(() => {
-
-				})
-			},
-			//百万补贴跳转
-			subsidy(item) {
-				uni.navigateTo({
-					url: '/pageA/subsidy?show=' + item
-				})
-			},
-			//物流计算器
-			counter() {
-				uni.navigateTo({
-					url: '/pageA/counter'
-				})
-			},
-			//消息
-			tochat() {
-				uni.navigateTo({
-					url: '/pageA/chat/news'
-				})
-			},
-			//商品分类
-			shoptype() {
-				uni.navigateTo({
-					url: '/pageA/shoptype'
-				})
+			//左右切换
+			swipertotabs(e){
+				this.current = e.detail.current
 			},
 			//分段器切换
 			sectionChange(index) {
 				this.current = index;
-				console.log(index);
-				if (this.current == 0) {
-					uni.switchTab({
-						url: '/pages/express/express?current=0'
-					})
-					this.current = 1
-				}
+				// if (this.current == 0) {
+				// 	uni.switchTab({
+				// 		url: '/pages/express/express?current=0'
+				// 	})
+				// 	this.current = 1
+				// }
 			},
+			// //获取快递列表
+			// getlista() {
+			// 	uni.$u.http.get('/api/express-company', {}).then((res) => {
+			// 		uni.setStorageSync('radiolist1', res)
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// HXlogin() {
+			// 	if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
+			// 		var user_no = uni.getStorageSync('user_no')
+			// 		var pwd = uni.getStorageSync('pwd')
+			// 		conn.open({
+			// 			user: user_no,
+			// 			pwd: pwd,
+			// 			appKey: conn.appkey
+			// 		}).then(() => {
+			// 			console.log('res');
+			// 			this.getlist()
+			// 		}).catch(reason => {
+			// 			console.log('失败', reason);
+			// 		})
+
+			// 	}
+			// },
+			// getlist() {
+			// 	this.unReadCount = 0
+			// 	conn.getServerConversations({
+			// 		pageSize: 50,
+			// 		cursor: ''
+			// 	}).then((res) => {
+			// 		console.log(res);
+			// 		res.data.conversations.forEach((item) => {
+			// 			this.unReadCount += item.unReadCount
+			// 		})
+			// 		console.log(this.unReadCount);
+			// 	})
+			// },
+			// callphone() {
+			// 	uni.$u.http.get('/api/config', {
+			// 		params: {
+			// 			module: 'basic'
+			// 		}
+			// 	}).then((res) => {
+			// 		console.log(res);
+			// 		uni.makePhoneCall({
+			// 			phoneNumber: res.service_mobile
+			// 		})
+			// 	}).catch(() => {
+
+			// 	})
+
+			// },
+			// advert() {
+			// 	uni.navigateTo({
+			// 		url: this.url
+			// 	})
+			// },
+			// //广告弹窗
+			// config() {
+			// 	uni.$u.http.get('api/config', {
+			// 		params: {
+			// 			module: 'advertising'
+			// 		}
+			// 	}).then((res) => {
+			// 		console.log(res);
+			// 		this.configimage = res.image
+			// 		this.url = res.url
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //海外包邮接口
+			// shipp() {
+			// 	uni.$u.http.post('api/goods/shipping').then((res) => {
+			// 		this.shippList = res.data.splice(0, 2)
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //拼包好物接口
+			// pack() {
+			// 	uni.$u.http.post('/api/goods/pack').then((res) => {
+			// 		this.packlist = res.data.splice(0, 2)
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //百万补贴接口
+			// subsid() {
+			// 	uni.$u.http.post('/api/goods/subsidy').then((res) => {
+			// 		console.log(res);
+			// 		this.subsidylist = res.data.splice(0, 4)
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //标签切换
+			// changetab(e) {
+			// 	this.page = 1
+			// 	this.last_page = 0
+			// 	this.index = e.index
+			// 	this.parent_id = e.id
+			// 	if (this.index == 0) {
+			// 		this.recommend()
+			// 	} else {
+			// 		this.recomlist = []
+			// 		this.goods(this.parent_id)
+			// 	}
+			// },
+			// search() {
+			// 	if (this.index == 0) {
+			// 		this.recommend()
+			// 	} else {
+			// 		this.recomlist = []
+			// 		this.goods(this.parent_id)
+			// 	}
+			// },
+			// //商品推荐
+			// recommend() {
+			// 	uni.$u.http.post('/api/goods/recommend', {
+			// 		keyword: this.keyword
+			// 	}).then((res) => {
+			// 		this.recomlist = res
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //商品分类列表
+			// category() {
+			// 	uni.$u.http.get('/api/goods/category', {
+			// 		params: {
+			// 			parent_id: 0
+			// 		}
+			// 	}).then((res) => {
+			// 		const categoryArr = res
+			// 		this.list1 = [{
+			// 			name: ''
+			// 		}]
+			// 		if (this.language == 'en-US') {
+			// 			categoryArr.forEach(item => {
+			// 				item.name = item.name_en
+			// 			})
+			// 			this.list1[0].name = 'recommend'
+			// 		}
+			// 		if (this.language == 'es-ES') {
+			// 			categoryArr.forEach(item => {
+			// 				item.name = item.name_es
+			// 			})
+			// 			this.list1[0].name = 'recomendación'
+			// 		}
+			// 		if (this.language == 'it-IT') {
+			// 			categoryArr.forEach(item => {
+			// 				item.name = item.name_ita
+			// 			})
+			// 			this.list1[0].name = 'raccomandata'
+			// 		}
+
+			// 		if (this.language == 'zh-CN') {
+			// 			categoryArr.forEach(item => {
+			// 				item.name = item.name_cn
+			// 			})
+			// 			this.list1[0].name = '推荐'
+			// 		}
+			// 		this.list1 = this.list1.concat(categoryArr)
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //商品列表
+			// goods(id) {
+			// 	uni.$u.http.get('/api/goods', {
+			// 		params: {
+			// 			parent_id: id,
+			// 			limit: 10,
+			// 			page: this.page,
+			// 			keyword: this.keyword
+			// 		}
+			// 	}).then((res) => {
+			// 		this.recomlist = this.recomlist.concat(res.data)
+			// 		this.last_page = res.last_page
+			// 	}).catch(() => {
+
+			// 	})
+			// },
+			// //百万补贴跳转
+			// subsidy(item) {
+			// 	uni.navigateTo({
+			// 		url: '/pageA/subsidy?show=' + item
+			// 	})
+			// },
+			// //物流计算器
+			// counter() {
+			// 	uni.navigateTo({
+			// 		url: '/pageA/counter'
+			// 	})
+			// },
+			// //消息
+			// tochat() {
+			// 	uni.navigateTo({
+			// 		url: '/pageA/chat/news'
+			// 	})
+			// },
+			// //商品分类
+			// shoptype() {
+			// 	uni.navigateTo({
+			// 		url: '/pageA/shoptype'
+			// 	})
+			// },
+
 			//详情
-			todetail(id) {
-				uni.navigateTo({
-					url: '/pageA/productdetails?id=' + id
-				})
-			}
+			// todetail(id) {
+			// 	uni.navigateTo({
+			// 		url: '/pageA/productdetails?id=' + id
+			// 	})
+			// }
 		}
 	}
 </script>
@@ -568,6 +366,7 @@
 	page {
 		background-color: rgba(0, 0, 0, 0)
 	}
+	
 
 	.discount {
 		// width: 100rpx;

pages/login/login.vue

@@ -135,6 +135,7 @@
 											// 	appKey: conn.appkey,
 											// };
 											// conn.open(options);
+											console.log('conn1',conn);
 											conn.open({
 												user: res.easemob_username,
 												pwd: res.easemob_password,

unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{5393:function(n,e,t){"use strict";t.r(e);var u=t("9134"),o=t("9ee6");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("fb8b");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7709bcd4",null,!1,u["a"],a);e["default"]=f.exports},9134:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"9ee6":function(n,e,t){"use strict";t.r(e);var u=t("cf3f0"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},b34d:function(n,e,t){},cf3f0:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(n){n||(this.value2="")}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{value2:""}},methods:{close:function(){}}};e.default=u},fb8b:function(n,e,t){"use strict";var u=t("b34d"),o=t.n(u);o.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{5393:function(n,e,t){"use strict";t.r(e);var u=t("9134"),o=t("9ee6");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("fb8b");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7709bcd4",null,!1,u["a"],a);e["default"]=f.exports},9134:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"9ee6":function(n,e,t){"use strict";t.r(e);var u=t("cf3f"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},b34d:function(n,e,t){},cf3f:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(n){n||(this.value2="")}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{value2:""}},methods:{close:function(){}}};e.default=u},fb8b:function(n,e,t){"use strict";var u=t("b34d"),o=t.n(u);o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/resultFeedback/resultFeedback.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/resultFeedback/resultFeedback"],{"2a48d":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var u=a(e("f6a8"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"88a2":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{code:"111",information:{}}},methods:{cope:function(n){t.setClipboardData({data:n,success:function(){t.showToast({title:"复制成功",icon:"none"})}})},back:function(){t.switchTab({url:"/pages/index/index"})},resetSubmit:function(){t.navigateTo({url:"/pageD/settleIn/settleIn"})},getInfo:function(){var n=this;t.$u.http.post("/api/merchant/status").then((function(t){n.information=t}))}},created:function(){this.getInfo(),t.setNavigationBarTitle({title:"结果反馈"})}};n.default=e}).call(this,e("543d")["default"])},a3a1:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var u=function(){var t=this,n=t.$createElement;t._self._c},i=[]},a73a:function(t,n,e){},ed90:function(t,n,e){"use strict";var a=e("a73a"),u=e.n(a);u.a},f149:function(t,n,e){"use strict";e.r(n);var a=e("88a2"),u=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=u.a},f6a8:function(t,n,e){"use strict";e.r(n);var a=e("a3a1"),u=e("f149");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("ed90");var c,o=e("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,"53030af6",null,!1,a["a"],c);n["default"]=r.exports}},[["2a48d","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/resultFeedback/resultFeedback"],{"2a48d":function(t,n,e){"use strict";(function(t,n){var a=e("4ea4");e("f93b");a(e("66fd"));var i=a(e("f6a8"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(i.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"826c":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"8416c":function(t,n,e){},"88a2":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{code:"111",information:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{cope:function(n){t.setClipboardData({data:n,success:function(){t.showToast({title:this.i18n.replicatingSuccess,icon:"none"})}})},back:function(){t.switchTab({url:"/pages/index/index"})},resetSubmit:function(){t.navigateTo({url:"/pageD/settleIn/settleIn"})},getInfo:function(){var n=this;t.$u.http.post("/api/merchant/status").then((function(t){n.information=t}))}},created:function(){this.getInfo(),t.setNavigationBarTitle({title:this.i18n.resultFeedback})}};n.default=e}).call(this,e("543d")["default"])},"9b37":function(t,n,e){"use strict";var a=e("8416c"),i=e.n(a);i.a},f149:function(t,n,e){"use strict";e.r(n);var a=e("88a2"),i=e.n(a);for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);n["default"]=i.a},f6a8:function(t,n,e){"use strict";e.r(n);var a=e("826c"),i=e("f149");for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);e("9b37");var u,o=e("f0c5"),r=Object(o["a"])(i["default"],a["b"],a["c"],!1,null,"6814add8",null,!1,a["a"],u);n["default"]=r.exports}},[["2a48d","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageD/resultFeedback/resultFeedback.wxss

@@ -1 +1 @@
-.page.data-v-53030af6{background-color:#fff;width:100vw;height:100vh;display:flex;flex-direction:column;justify-content:flex-start;align-items:center}.page .content.data-v-53030af6{display:flex;flex-direction:column;justify-content:flex-start;align-items:center}.page .content .logo.data-v-53030af6{width:338rpx;height:298rpx;margin:68rpx auto}.page .content .wait.data-v-53030af6{font-size:36rpx;color:#222;font-weight:600}.page .content .review.data-v-53030af6{font-size:26rpx;color:rgba(34,34,34,.9);margin-top:14rpx}.page .content .refuse.data-v-53030af6{font-size:24rpx;color:rgba(34,34,34,.6);margin-top:14rpx}.page .content .prompt.data-v-53030af6{font-size:28rpx;color:#666;margin-top:14rpx;width:75%;text-align:center}.page .content .inp.data-v-53030af6{display:flex;align-items:center;justify-content:space-between;background-color:#f7f7f7;border-radius:8rpx;width:530rpx;height:68rpx;margin-top:60rpx;border:1rpx solid #c3c3c3;padding:0 10rpx}.page .content .inp .url.data-v-53030af6{width:80%;font-size:28rpx;color:#777;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.page .content .account.data-v-53030af6{display:flex;margin-top:36rpx;width:530rpx}.page .content .account ._label.data-v-53030af6{font-size:28rpx;color:#666}.page .content .account ._value.data-v-53030af6{font-size:28rpx;color:#f83224}.page .go-back.data-v-53030af6{background-color:#f83224;color:#fff;border:none;border-radius:44rpx;margin-top:90rpx;width:262rpx;height:88rpx;line-height:88rpx}
+.page.data-v-6814add8{background-color:#fff;width:100vw;height:100vh;display:flex;flex-direction:column;justify-content:flex-start;align-items:center}.page .content.data-v-6814add8{display:flex;flex-direction:column;justify-content:flex-start;align-items:center}.page .content .logo.data-v-6814add8{width:338rpx;height:298rpx;margin:68rpx auto}.page .content .wait.data-v-6814add8{font-size:36rpx;color:#222;font-weight:600}.page .content .review.data-v-6814add8{font-size:26rpx;color:rgba(34,34,34,.9);margin-top:14rpx}.page .content .refuse.data-v-6814add8{font-size:24rpx;color:rgba(34,34,34,.6);margin-top:14rpx}.page .content .prompt.data-v-6814add8{font-size:28rpx;color:#666;margin-top:14rpx;width:75%;text-align:center}.page .content .inp.data-v-6814add8{display:flex;align-items:center;justify-content:space-between;background-color:#f7f7f7;border-radius:8rpx;width:530rpx;height:68rpx;margin-top:60rpx;border:1rpx solid #c3c3c3;padding:0 10rpx}.page .content .inp .url.data-v-6814add8{width:80%;font-size:28rpx;color:#777;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.page .content .account.data-v-6814add8{display:flex;margin-top:36rpx;width:530rpx}.page .content .account ._label.data-v-6814add8{font-size:28rpx;color:#666}.page .content .account ._value.data-v-6814add8{font-size:28rpx;color:#f83224}.page .go-back.data-v-6814add8{background-color:#f83224;color:#fff;border:none;border-radius:44rpx;margin-top:90rpx;width:262rpx;height:88rpx;line-height:88rpx}

unpackage/dist/build/mp-weixin/pageD/sending/sending.wxss

@@ -1 +1 @@
-.page.data-v-95b2c3c2{padding:20rpx 24rpx;position:relative}.page .address.data-v-95b2c3c2{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .address .address-top.data-v-95b2c3c2{height:96rpx;line-height:96rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .address .address-top .top_left_text.data-v-95b2c3c2{font-size:28rpx;color:#222;font-weight:600}.page .address .address-top .top_right_text.data-v-95b2c3c2{font-size:24rpx;color:#f83224}.page .address .address-content.data-v-95b2c3c2{display:flex;align-items:center;padding:22rpx 0 32rpx}.page .address .address-content .address-icon.data-v-95b2c3c2{width:28rpx;height:28rpx;margin-right:24rpx}.page .address .address-content .warehouse-phone.data-v-95b2c3c2{display:flex;align-items:center;margin-bottom:14rpx}.page .address .address-content .warehouse-phone .warehouse-name.data-v-95b2c3c2{font-size:30rpx;font-weight:600;color:#222}.page .address .address-content .warehouse-phone .phone.data-v-95b2c3c2{color:#555;font-size:24rpx}.page .address .address-content .detail.data-v-95b2c3c2{font-size:26rpx;color:#777}.page .express.data-v-95b2c3c2{border-radius:16rpx;background-color:#fff;padding:0 20rpx;margin-top:20rpx;position:relative}.page .express ._input-1.data-v-95b2c3c2{display:flex;align-items:center;height:100rpx}.page .express ._input-1 ._label.data-v-95b2c3c2{font-size:28rpx;color:#222;margin-right:32rpx}.page .express ._input-2.data-v-95b2c3c2{border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .footer.data-v-95b2c3c2{position:fixed;bottom:0;left:0;width:95%;background-color:#fff;height:126rpx;justify-content:center;padding:20rpx}.page .footer .btn-2.data-v-95b2c3c2{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5)}
+.page.data-v-77bfb6a3{padding:20rpx 24rpx;position:relative}.page .address.data-v-77bfb6a3{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .address .address-top.data-v-77bfb6a3{height:96rpx;line-height:96rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .address .address-top .top_left_text.data-v-77bfb6a3{font-size:28rpx;color:#222;font-weight:600}.page .address .address-top .top_right_text.data-v-77bfb6a3{font-size:24rpx;color:#f83224}.page .address .address-content.data-v-77bfb6a3{display:flex;align-items:center;padding:22rpx 0 32rpx}.page .address .address-content .address-icon.data-v-77bfb6a3{width:28rpx;height:28rpx;margin-right:24rpx}.page .address .address-content .warehouse-phone.data-v-77bfb6a3{display:flex;align-items:center;margin-bottom:14rpx}.page .address .address-content .warehouse-phone .warehouse-name.data-v-77bfb6a3{font-size:30rpx;font-weight:600;color:#222}.page .address .address-content .warehouse-phone .phone.data-v-77bfb6a3{color:#555;font-size:24rpx}.page .address .address-content .detail.data-v-77bfb6a3{font-size:26rpx;color:#777}.page .express.data-v-77bfb6a3{border-radius:16rpx;background-color:#fff;padding:0 20rpx;margin-top:20rpx;position:relative}.page .express ._input-1.data-v-77bfb6a3{display:flex;align-items:center;height:100rpx}.page .express ._input-1 ._label.data-v-77bfb6a3{font-size:28rpx;color:#222;margin-right:32rpx}.page .express ._input-2.data-v-77bfb6a3{border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .footer.data-v-77bfb6a3{position:fixed;bottom:0;left:0;width:95%;background-color:#fff;height:126rpx;justify-content:center;padding:20rpx}.page .footer .btn-2.data-v-77bfb6a3{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5)}

unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxss

@@ -1 +1 @@
-.page.data-v-5518b0f4{padding:20rpx 24rpx}.page .content.data-v-5518b0f4{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-5518b0f4{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-5518b0f4{width:24rpx;height:24rpx}.page .btn.data-v-5518b0f4{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}
+.page.data-v-861c8118{padding:20rpx 24rpx}.page .content.data-v-861c8118{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-861c8118{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-861c8118{width:24rpx;height:24rpx}.page .btn.data-v-861c8118{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}

unpackage/dist/build/mp-weixin/pageD/supplyChainGoods/supplyChainGoods.wxml

@@ -1 +1 @@
-<view class="data-v-6d148af0"><view class="top-tab-search data-v-6d148af0"><u--input vue-id="7187bacf-1" placeholder="搜索商品名称" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{searchValue}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6d148af0" bind:__l="__l"></u--input><view class="tab data-v-6d148af0"><view class="top-tab data-v-6d148af0"><view data-event-opts="{{[['tap',[['tabSwitch',['null']]]]]}}" class="{{['tab','data-v-6d148af0',(follow=='null')?'commodity':'']}}" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['tabSwitch',['normal']]]]]}}" class="{{['tab','data-v-6d148af0',(follow=='normal')?'commodity':'']}}" bindtap="__e">已上架</view><view data-event-opts="{{[['tap',[['tabSwitch',[7]]]]]}}" class="{{['tab','data-v-6d148af0',(follow==7)?'commodity':'']}}" bindtap="__e">审核中</view><view data-event-opts="{{[['tap',[['tabSwitch',[2]]]]]}}" class="{{['tab','data-v-6d148af0',(follow==2)?'commodity':'']}}" bindtap="__e">审核失败</view><view data-event-opts="{{[['tap',[['tabSwitch',['down']]]]]}}" class="{{['tab','data-v-6d148af0',(follow=='down')?'commodity':'']}}" bindtap="__e">已下架</view></view></view></view><view class="page data-v-6d148af0"><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="data-v-6d148af0"><goods-information vue-id="{{'7187bacf-2-'+__i0__}}" productAndCommodity="product" status="{{status}}" itemInfo="{{item}}" data-event-opts="{{[['^toDetail',[['toDetail']]],['^goodsUpDown',[['goodsUpDown']]]]}}" bind:toDetail="__e" bind:goodsUpDown="__e" class="data-v-6d148af0" bind:__l="__l"></goods-information></view></block></view></view>
+<view class="data-v-14adcd20"><view class="top-tab-search data-v-14adcd20"><u--input vue-id="7187bacf-1" placeholder="{{i18n.searchGoods}}" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{searchValue}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-14adcd20" bind:__l="__l"></u--input><view class="tab data-v-14adcd20"><view class="top-tab data-v-14adcd20"><view data-event-opts="{{[['tap',[['tabSwitch',['null']]]]]}}" class="{{['tab','data-v-14adcd20',(follow=='null')?'commodity':'']}}" bindtap="__e">{{''+i18n.whole+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['normal']]]]]}}" class="{{['tab','data-v-14adcd20',(follow=='normal')?'commodity':'']}}" bindtap="__e">{{''+i18n.alreadyListed+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',[7]]]]]}}" class="{{['tab','data-v-14adcd20',(follow==7)?'commodity':'']}}" bindtap="__e">{{''+i18n.inReview+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',[2]]]]]}}" class="{{['tab','data-v-14adcd20',(follow==2)?'commodity':'']}}" bindtap="__e">{{''+i18n.auditFailed+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['down']]]]]}}" class="{{['tab','data-v-14adcd20',(follow=='down')?'commodity':'']}}" bindtap="__e">{{''+i18n.removed+''}}</view></view></view></view><view class="page data-v-14adcd20"><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="data-v-14adcd20"><goods-information vue-id="{{'7187bacf-2-'+__i0__}}" productAndCommodity="product" status="{{status}}" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toDetail',[['toDetail']]],['^goodsUpDown',[['goodsUpDown']]]]}}" bind:toDetail="__e" bind:goodsUpDown="__e" class="data-v-14adcd20" bind:__l="__l"></goods-information></view></block></view></view>

unpackage/dist/build/mp-weixin/pageD/supplyChainGoods/supplyChainGoods.wxss

@@ -1 +1 @@
-.top-tab-search.data-v-6d148af0{background-color:#fff;padding:10rpx 24rpx}.top-tab-search .top-tab.data-v-6d148af0{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-6d148af0{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-6d148af0{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-6d148af0::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-6d148af0{padding:20rpx 24rpx}.footer.data-v-6d148af0{position:fixed;bottom:0;background-color:#fff;width:100%;padding:16rpx 24rpx 70rpx 24rpx}.footer .btn.data-v-6d148af0{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx}
+.top-tab-search.data-v-14adcd20{background-color:#fff;padding:10rpx 24rpx}.top-tab-search .top-tab.data-v-14adcd20{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-14adcd20{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-14adcd20{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-14adcd20::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-14adcd20{padding:20rpx 24rpx}.footer.data-v-14adcd20{position:fixed;bottom:0;background-color:#fff;width:100%;padding:16rpx 24rpx 70rpx 24rpx}.footer .btn.data-v-14adcd20{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx}

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-page.data-v-12afe6ea{background-color:#fff!important;height:100vh}.login-btn.data-v-12afe6ea{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-12afe6ea{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}
+page.data-v-75fec470{background-color:#fff!important;height:100vh}.login-btn.data-v-75fec470{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-75fec470{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}

unpackage/dist/build/mp-weixin/project.config.json

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