冲突

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

@@ -41,7 +41,9 @@
 						发简历
 					</view>
 				</view> -->
-				<view class="more-item u-flex-col u-col-center" @click="toalbum">
+				<view class="more-item u-flex-col u-col-center"
+					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
+					@click="toalbum">
 					<view class="item-img u-flex u-row-center">
 						<image src="/static/imagess/more2.png" mode=""></image>
 					</view>
@@ -49,7 +51,9 @@
 						相册
 					</view>
 				</view>
-				<view class="more-item u-flex-col u-col-center" @click="tocapture">
+				<view class="more-item u-flex-col u-col-center"
+					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
+					@click="tocapture">
 					<view class="item-img u-flex u-row-center">
 						<image src="/static/imagess/more3.png" mode=""></image>
 					</view>
@@ -57,7 +61,9 @@
 						拍摄
 					</view>
 				</view>
-				<view class="more-item u-flex-col u-col-center" @click="isjianpan = false;showtype = 0">
+				<view class="more-item u-flex-col u-col-center"
+					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
+					@click="isjianpan = false;showtype = 0">
 					<view class="item-img u-flex u-row-center">
 						<image src="/static/imagess/more4.png" mode=""></image>
 					</view>
@@ -65,6 +71,16 @@
 						语音
 					</view>
 				</view>
+				<view class="more-item u-flex-col u-col-center"
+					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
+					@click="show = true">
+					<view class="item-img u-flex u-row-center">
+						<image src="/static/imagess/more4.png" mode=""></image>
+					</view>
+					<view class="item-text">
+						我的订单
+					</view>
+				</view>
 			</view>
 			<scroll-view v-if="showtype == 3" scroll-y="true" class="emoji-scroll">
 				<view class="empji-box u-flex u-flex-wrap">
@@ -72,6 +88,32 @@
 				</view>
 			</scroll-view>
 			<view class="safe-area-inset-bottom"></view>
+			<u-popup :round="10" :show="show" @close="close">
+				<view class="" style="padding: 20rpx;">
+					<view class="" style="text-align: center;font-size: 36rpx;margin-bottom: 10rpx;">我的订单</view>
+					<scroll-view @scrolltolower='lower' scroll-y="true" style="height: 50vh;">
+						<view v-for="(item,idx) in orderList" :key="idx">
+							<view class="chatfu"
+								style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
+								<view class="">订单编号：{{item.order.order_no}}</view>
+								<view class=""
+									style=" border: 2rpx solid red;color: red; font-size: 26rpx;height: 30rpx;line-height: 30rpx;text-align: center;border-radius: 30rpx;padding: 5rpx 10rpx;"
+									@click="sendorder(item)">发送</view>
+							</view>
+							<view class="u-flex " v-for="(child,index) in item.order_goods" :key="index"
+								style="margin-top: 10rpx;">
+								<image :src="child.goods_image" style="width: 152rpx;height: 152rpx;" mode="">
+								</image>
+								<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+									<view class="chattitle">{{child.goods_name}}</view>
+									<text class="catmoney">￥{{child.amount}}</text>
+								</view>
+							</view>
+							<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+						</view>
+					</scroll-view>
+				</view>
+			</u-popup>
 		</view>
 	</view>
 </template>
@@ -118,13 +160,49 @@
 				duration: 60000, //录音最大值ms 60000/1分钟
 				tempFilePath: '', //音频路径
 				playStatus: 0, //录音播放状态 0:未播放 1:正在播放
+				show: false,
+				page: 1,
+				follow: '',
+				orderList: [],
+				keywords: '',
+				last_page: '',
 			}
 		},
 		created() {
-
+			this.getOrderList()
 		},
 
 		methods: {
+			lower() {
+				if (this.page < this.last_page) {
+					this.page++
+					this.getOrderList()
+				} else {
+					this.$u.toast(this.i18n.Nofurtherdata)
+				}
+			},
+			getOrderList(value) {
+				uni.$u.http
+					.get(
+						`/api/order/order_list?status=${this.follow}&page=${this.page}&limit=10&keywords=${this.keywords}`
+					)
+					.then((res) => {
+						//确定是触底还是点击tab栏
+						if (value) {
+							this.orderList = res.data;
+						} else {
+							if (this.orderList.length == 0) {
+								this.orderList = res.data;
+							} else {
+								this.orderList = this.orderList.concat(res.data);
+							}
+						}
+						this.last_page = res.last_page
+					});
+			},
+			close() {
+				this.show = false
+			},
 			longpressBtn() {
 				console.log(recorderManager);
 				console.log('长按说话');
@@ -229,18 +307,49 @@
 						console.log("Fail", e);
 					});
 			},
+			sendorder(item) {
+				let _this = this
+				let useinfo = uni.getStorageSync("user_info");
+				let that = this;
+				let id = conn.getUniqueId(); // 生成本地消息id
+				let msg = new WebIM.message("txt", id); // 创建文本消息
+				msg.set({
+					type: "txt",
+					msg: '订单消息',
+					to: '13523652365',
+					chatType: "singleChat",
+					ext: {
+						type: "orderinfo",
+						order: {
+							info:item
+						},
+						// user_other: that.goodinfo.merchant,
+						user: useinfo,
+					},
+					success: function(id, serverMsgId) {
+						setTimeout(() => {
+							_this.$emit('success', true)
+						}, 800);
+					},
+					fail: function(e) {
+						console.log("发送消息失败");
+					},
+				});
+				this.show = false
+				conn.send(msg.body);
+			},
 			send() {
 				let _this = this
 				if (this.text == '' || this.text == null) {
 					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', // 设置为单聊
@@ -255,11 +364,32 @@
 						}, 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
@@ -388,6 +518,58 @@
 </script>
 
 <style lang="scss">
+	.chatfu {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #555555;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.chattitle {
+		width: 314rpx;
+		height: 72rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		-webkit-line-clamp: 2;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		// white-space: pre-wrap;
+
+	}
+
+	.catmoney {
+		width: 104rpx;
+		height: 46rpx;
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 26rpx;
+		color: #F83224;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		font-weight: 600;
+	}
+
+	.title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #222222;
+		line-height: 50rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.send {
 		font-size: 26rpx;
 		color: #fff;

pages/express/express.vue → components/kj-express/kj-express.vue

@@ -1,6 +1,10 @@
 <template>
   <!-- 商城 -->
-  <view class="" style="padding: 0 24rpx">
+  <scroll-view
+    class=""
+    scroll-y="true"
+    style="height: calc(100vh - 300rpx); padding: 0 24rpx"
+  >
     <view style="position: relative; padding-bottom: 20rpx">
       <!-- 自定义导航栏 -->
       <image
@@ -16,55 +20,6 @@
         mode=""
       >
       </image>
-      <u-navbar
-        bgColor="rgba(255, 215,215, 1)"
-        :placeholder="true"
-        :safeAreaInsetTop="true"
-      >
-        <view class="u-nav-slot" slot="left" style="display: flex">
-          <view
-            class=""
-            style="width: 40rpx; height: 40rpx; position: relative"
-          >
-            <u-badge
-              :absolute="true"
-              :offset="[0, -8]"
-              :type="type"
-              max="99"
-              :value="unReadCount"
-            ></u-badge>
-            <image
-              @click="tochat"
-              src="../../static/images/index/xiaoxi.png"
-              mode=""
-              style="width: 40rpx; height: 40rpx"
-            >
-            </image>
-          </view>
-          <image
-            @click="counter"
-            src="../../static/images/index/compile.png"
-            mode=""
-            style="width: 40rpx; height: 40rpx; margin-left: 22rpx"
-          ></image>
-          <image
-            src="../../static/images/index/dianhua.png"
-            mode=""
-            style="width: 40rpx; height: 40rpx; margin-left: 22rpx"
-            @click="callphone"
-          ></image>
-        </view>
-        <view class="u-nav-slot" slot="center" style="width: 320rpx">
-          <u-subsection
-            bgColor="rgba(248, 50, 36, 0.1)"
-            activeColor="#F83224"
-            inactiveColor="#222"
-            :list="list"
-            :current="current"
-            @change="sectionChange"
-          ></u-subsection>
-        </view>
-      </u-navbar>
       <!-- 地址 -->
       <view class="address">
         <view class="left u-flex" style="display: flex">
@@ -140,6 +95,7 @@
               mode=""
             ></image>
             <!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
+            <!-- </image> -->
           </view>
           <view
             class="u-row-between left"
@@ -342,7 +298,10 @@
         </view>
       </view>
       <!-- 拼包 -->
-      <view class="u-flex u-row-between" style="margin-top: 32rpx">
+      <view
+        class="u-flex u-row-between"
+        style="margin-top: 32rpx; width: 702rpx"
+      >
         <view class="u-flex">
           <text class="hai">{{ i18n.parceling }}</text>
           <image
@@ -475,9 +434,8 @@
       </view>
     </u-popup>
     <!-- <u-button @click="show = true">打开</u-button> -->
-    <view class="" style="height: 160rpx"></view>
-    <kj-tabbar :value1="0"></kj-tabbar>
-  </view>
+    <!-- <view class="" style="height: 160rpx;"></view> -->
+  </scroll-view>
 </template>
 
 <script>
@@ -511,15 +469,15 @@ export default {
       unReadCount: 0,
     };
   },
-  onLoad(options) {
+  created(options) {
     this.list = [this.i18n.border, this.i18n.shop];
-    if (options.current) {
-      this.current = options.current;
-    }
+    // if (options.current) {
+    // 	this.current = options.current
+    // }
     this.topadd = {}; //新建寄件人
     this.bottomadd = {}; //新建收件人
   },
-  onShow() {
+  mounted() {
     this.list[0] = this.i18n.border;
     this.list[1] = this.i18n.shop;
     // uni.setNavigationBarTitle({

components/kj-index/kj-index.vue

@@ -0,0 +1,786 @@
+<template>
+	<!-- 商城 -->
+	<scroll-view @scrolltolower='lower' class="" scroll-y='true'style="height: calc(100vh - 300rpx);">
+		<!-- <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,17 @@
 			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/service/service.vue

@@ -46,6 +46,23 @@
 					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
 					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
+					<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
+						<view class="chatfu"
+							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
+							<view class="">订单编号：{{item.ext.order.info.order.order_no}}</view>
+						</view>
+						<view class="u-flex " v-for="(child,index) in item.ext.order.info.order_goods" :key="index"
+							style="margin-top: 10rpx;">
+							<image :src="child.goods_image" style="width: 152rpx;height: 152rpx;" mode="">
+							</image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{child.goods_name}}</view>
+								<text class="catmoney">￥{{child.amount}}</text>
+							</view>
+						</view>
+				</view>
 			</view>
 			<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
 				<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
@@ -66,6 +83,23 @@
 					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
 					<view class="chatfu">{{item.ext.order.fu}}</view>
 				</view>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
+					<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
+						<view class="chatfu"
+							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
+							<view class="">订单编号：{{item.ext.order.info.order.order_no}}</view>
+						</view>
+						<view class="u-flex " v-for="(child,index) in item.ext.order.info.order_goods" :key="index"
+							style="margin-top: 10rpx;">
+							<image :src="child.goods_image" style="width: 152rpx;height: 152rpx;" mode="">
+							</image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{child.goods_name}}</view>
+								<text class="catmoney">￥{{child.amount}}</text>
+							</view>
+						</view>
+				</view>
 				<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 			</view>
 		</view>
@@ -128,6 +162,12 @@
 			}
 		},
 		methods: {
+			//跳转订单详情
+			toDetail(id) {
+			  uni.navigateTo({
+			    url: `/pageC/orderFormDetail/orderFormDetail?orderId=${id}`,
+			  });
+			},
 			callphone() {
 				uni.$u.http.get('/api/config', {
 					params: {
@@ -212,11 +252,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.json

@@ -20,14 +20,6 @@
       }
     },
     {
-      "path": "pages/express/express",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    },
-    {
       "path": "pages/shopping/shopping",
       "style": {
         "navigationBarTitleText": "",
@@ -689,9 +681,6 @@
 
     "list": [
       {
-        "pagePath": "pages/express/express"
-      },
-      {
         "pagePath": "pages/index/index"
       },
       {

pages/index/index.vue

@@ -1,804 +1,374 @@
 <template>
-  <!-- 商城 -->
-  <view class="">
-    <!-- <view class="index-navbar"> -->
-    <view style="position: relative">
-      <!-- 自定义导航栏 -->
-      <image
-        src="../../static/images/index/back.png"
-        style="
-          width: 750rpx;
-          height: 1200rpx;
-          position: absolute;
-          top: 0;
-          z-index: -1;
-        "
-        mode=""
-      ></image>
-      <u-navbar
-        bgColor="rgba(255, 215,215, 1)"
-        :placeholder="true"
-        :fixed="true"
-      >
-        <view class="u-nav-slot" slot="left" style="display: flex">
-          <view
-            class=""
-            style="width: 40rpx; height: 40rpx; position: relative"
-          >
-            <u-badge
-              :absolute="true"
-              :offset="[0, -8]"
-              :type="type"
-              max="99"
-              :value="unReadCount"
-            ></u-badge>
-            <image
-              @click="tochat"
-              src="../../static/images/index/xiaoxi.png"
-              mode=""
-              style="width: 40rpx; height: 40rpx"
-            >
-            </image>
-          </view>
-          <image
-            @click="counter"
-            src="../../static/images/index/compile.png"
-            mode=""
-            style="width: 40rpx; height: 40rpx; margin-left: 22rpx"
-          ></image>
-          <image
-            src="../../static/images/index/dianhua.png"
-            mode=""
-            style="width: 40rpx; height: 40rpx; margin-left: 22rpx"
-            @click="callphone"
-          ></image>
-        </view>
-        <view class="u-nav-slot" slot="center" style="width: 320rpx">
-          <u-subsection
-            bgColor="rgba(248, 50, 36, 0.1)"
-            activeColor="#F83224"
-            inactiveColor="#222"
-            :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>
-    <kj-tabbar :value1="0" ref="kjTabbar"></kj-tabbar>
-  </view>
+	<!-- 商城 -->
+	<view class="">
+		<!-- <view class="index-navbar"> -->
+		<view style="position: relative;">
+			<!-- 自定义导航栏 -->
+			<image src="../../static/images/index/back.png"
+				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;" mode=""></image>
+			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :fixed='true'>
+				<view class="u-nav-slot" slot="left" style="display: flex;">
+					<view class="" style="width: 40rpx;height:40rpx;position: relative;">
+						<u-badge :absolute='true' :offset="[0,-8]" :type="type" max="99" :value="unReadCount"></u-badge>
+						<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
+							style="width: 40rpx;height: 40rpx;">
+						</image>
+					</view>
+					<image @click="counter" src="../../static/images/index/compile.png" mode=""
+						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
+					<image src="../../static/images/index/dianhua.png" mode=""
+						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;" @click="callphone"></image>
+				</view>
+				<view class="u-nav-slot" slot="center" style="width: 320rpx;">
+					<u-subsection bgColor='rgba(248, 50, 36, 0.1)' activeColor='#F83224' inactiveColor='#222'
+						:list="list" :current="current" @change="sectionChange"></u-subsection>
+				</view>
+			</u-navbar>
+		</view>
+		<swiper style="height: calc(100vh - 300rpx);" class="index-swiper" :circular="false" :autoplay="false" :current="current" @change="swipertotabs" >
+			<!-- 商城 -->
+			<swiper-item>
+				<view >
+					<kj-express></kj-express>
+				</view>
+			</swiper-item>
+			<swiper-item>
+				<view  >
+					<kj-index></kj-index>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="" style="height: 160rpx;" ></view>
+		<kj-tabbar :value1=0 ref="kjTabbar"></kj-tabbar>
+	</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);
-    }
-  },
-  onLoad(options) {
-    // this.seater()
-    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.$refs.kjTabbar.getNumber();
-  },
-  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",
-      });
-    },
-    //分段器切换
-    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,
-      });
-    },
-  },
-};
+	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)
+			// }
+		},
+		onLoad(options) {
+			// this.seater()
+			// 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.$refs.kjTabbar.getNumber();
+		},
+		methods: {
+			//左右切换
+			swipertotabs(e){
+				this.current = e.detail.current
+			},
+			//分段器切换
+			sectionChange(index) {
+				this.current = index;
+				// 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
+			// 	})
+			// }
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-page {
-  background-color: rgba(0, 0, 0, 0);
-}
+	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/app.json

@@ -2,7 +2,6 @@
   "pages": [
     "pages/index/index",
     "pages/mine/mine",
-    "pages/express/express",
     "pages/shopping/shopping",
     "pages/cart/cart",
     "pages/login/login",
@@ -122,9 +121,6 @@
     "custom": true,
     "list": [
       {
-        "pagePath": "pages/express/express"
-      },
-      {
         "pagePath": "pages/index/index"
       },
       {

unpackage/dist/build/mp-weixin/components/kj-express/kj-express.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-badge": "/uview-ui/components/u-badge/u-badge",
+    "u-line-progress": "/uview-ui/components/u-line-progress/u-line-progress",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "kj-flow": "/components/kj-flow/kj-flow"
+  }
+}

unpackage/dist/build/mp-weixin/components/kj-index/kj-index.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
+    "u-swiper": "/uview-ui/components/u-swiper/u-swiper",
+    "u-popup": "/uview-ui/components/u-popup/u-popup"
+  }
+}

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

@@ -1 +1 @@
-.all.data-v-79bc6473{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-79bc6473{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-79bc6473{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-79bc6473{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-79bc6473{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-79bc6473{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-79bc6473{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.all.data-v-fc57284a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-fc57284a{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-fc57284a{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-fc57284a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-fc57284a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-fc57284a{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-fc57284a{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}

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

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

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

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

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

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

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

@@ -1 +1 @@
-.title.data-v-2f747a63{text-align:center;font-size:36rpx;color:#222;font-weight:500;margin-top:20rpx}.radio-list.data-v-2f747a63{padding:0 28rpx;margin-top:40rpx}.radio.data-v-2f747a63{margin-bottom:48rpx}
+.title.data-v-2e1aed73{text-align:center;font-size:36rpx;color:#222;font-weight:500;margin-top:20rpx}.radio-list.data-v-2e1aed73{padding:0 28rpx;margin-top:40rpx}.radio.data-v-2e1aed73{margin-bottom:48rpx}

unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},i={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=i},4090:function(n,t,e){"use strict";var o=e("897b"),i=e.n(o);i.a},"897b":function(n,t,e){},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),i=e.n(o);for(var r in o)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(r);t["default"]=i.a},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("c0ff"),i=e("9b65");for(var r in i)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(r);e("4090");var u,c=e("f0c5"),f=Object(c["a"])(i["default"],o["b"],o["c"],!1,null,"09eff53c",null,!1,o["a"],u);t["default"]=f.exports},c0ff:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},i=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),i=t.sku_item?t.discount_price.split("."):null,r=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:i,g1:r}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,i=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:i}})},r=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"2af1":function(n,t,e){"use strict";var o=e("b89f"),r=e.n(o);r.a},"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},r={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{show:!1}},methods:{more:function(){this.show=!this.show}}};t.default=r},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=r.a},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("f5f1"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("2af1");var u,c=e("f0c5"),f=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"17e058e7",null,!1,o["a"],u);t["default"]=f.exports},b89f:function(n,t,e){},f5f1:function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),r=t.sku_item?t.discount_price.split("."):null,i=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/orderInofrmation-create-component',
     {

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

@@ -1 +1 @@
-<view class="page data-v-0b10d31d"><view class="btn-list data-v-0b10d31d"><view class="language data-v-0b10d31d" data-lang="zh-CN" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">简体中文</text><block wx:if="{{languageSelect=='zh-CN'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-0b10d31d" data-lang="en-US" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">English</text><block wx:if="{{languageSelect=='en-US'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-0b10d31d" data-lang="es-ES" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">Español</text><block wx:if="{{languageSelect=='es-ES'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-0b10d31d" data-lang="it-IT" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">Italiano</text><block wx:if="{{languageSelect=='it-IT'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view></view></view>
+<view class="page data-v-023c99cc"><view class="btn-list data-v-023c99cc"><view class="language data-v-023c99cc" data-lang="zh-CN" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-023c99cc">简体中文</text><block wx:if="{{languageSelect=='zh-CN'}}"><image class="selected data-v-023c99cc" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-023c99cc" data-lang="en-US" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-023c99cc">English</text><block wx:if="{{languageSelect=='en-US'}}"><image class="selected data-v-023c99cc" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-023c99cc" data-lang="es-ES" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-023c99cc">Español</text><block wx:if="{{languageSelect=='es-ES'}}"><image class="selected data-v-023c99cc" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-023c99cc" data-lang="it-IT" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-023c99cc">Italiano</text><block wx:if="{{languageSelect=='it-IT'}}"><image class="selected data-v-023c99cc" src="../../static/mine/326.png" mode></image></block></view></view></view>

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

@@ -1 +1 @@
-.page.data-v-0b10d31d{padding:20rpx 24rpx}.page .btn-list.data-v-0b10d31d{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-0b10d31d{display:flex;align-items:center;justify-content:space-between;height:110rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .btn-list .language .selected.data-v-0b10d31d{width:36rpx;height:36rpx}
+.page.data-v-023c99cc{padding:20rpx 24rpx}.page .btn-list.data-v-023c99cc{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-023c99cc{display:flex;align-items:center;justify-content:space-between;height:110rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .btn-list .language .selected.data-v-023c99cc{width:36rpx;height:36rpx}

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/express/express.json

@@ -1,14 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {
-    "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
-    "u-badge": "/uview-ui/components/u-badge/u-badge",
-    "u-subsection": "/uview-ui/components/u-subsection/u-subsection",
-    "u-line-progress": "/uview-ui/components/u-line-progress/u-line-progress",
-    "u-popup": "/uview-ui/components/u-popup/u-popup",
-    "kj-flow": "/components/kj-flow/kj-flow",
-    "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
-  }
-}

unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -5,10 +5,8 @@
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
     "u-badge": "/uview-ui/components/u-badge/u-badge",
     "u-subsection": "/uview-ui/components/u-subsection/u-subsection",
-    "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
-    "u-swiper": "/uview-ui/components/u-swiper/u-swiper",
-    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "kj-express": "/components/kj-express/kj-express",
+    "kj-index": "/components/kj-index/kj-index",
     "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
   }
 }

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/pages/shopping/shopping.wxss

@@ -1 +1 @@
-.content.data-v-b34e55ce{width:750rpx;min-height:calc(100vh - 40rpx);background:linear-gradient(180deg,#fdfcfb,#f4f4f4);border-radius:30rpx 30rpx 0rpx 0rpx;margin-top:32rpx;padding:32rpx;box-sizing:border-box}.content .item.data-v-b34e55ce{width:340rpx;background:#fff;border-radius:16rpx}.content .item .title.data-v-b34e55ce{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal;display:block;width:100%;height:70rpx;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all}.content .item .tabsa.data-v-b34e55ce{margin-top:10rpx;border-radius:4rpx;border:1rpx solid #ed0909;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#ed0909;text-align:center;font-style:normal;display:inline;padding:0 4rpx;box-sizing:border-box}.content .item .num.data-v-b34e55ce{font-family:SFPro;font-weight:400;font-size:20rpx;color:#555;line-height:24rpx;text-align:left;font-style:normal;margin-top:16rpx}.content .item .money.data-v-b34e55ce{font-family:HarmonyOS_Sans_Medium;font-size:20rpx;color:#f83224;line-height:26rpx;text-align:left;font-style:normal}.back.data-v-b34e55ce{position:absolute;top:0;left:0;width:750rpx;height:800rpx;background:#fe2e2e}.input.data-v-b34e55ce{width:702rpx;height:68rpx;background:#fff;border-radius:34rpx;margin-left:24rpx;box-sizing:border-box;padding:0 8rpx 0 24rpx}.input .search.data-v-b34e55ce{width:100rpx;height:56rpx;background:#f83224;border-radius:28rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#fff;line-height:56rpx;text-align:center;font-style:normal}
+.content.data-v-2ddedf8d{width:750rpx;min-height:calc(100vh - 40rpx);background:linear-gradient(180deg,#fdfcfb,#f4f4f4);border-radius:30rpx 30rpx 0rpx 0rpx;margin-top:32rpx;padding:32rpx;box-sizing:border-box}.content .item.data-v-2ddedf8d{width:340rpx;background:#fff;border-radius:16rpx}.content .item .title.data-v-2ddedf8d{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal;display:block;width:100%;height:70rpx;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all}.content .item .tabsa.data-v-2ddedf8d{margin-top:10rpx;border-radius:4rpx;border:1rpx solid #ed0909;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#ed0909;text-align:center;font-style:normal;display:inline;padding:0 4rpx;box-sizing:border-box}.content .item .num.data-v-2ddedf8d{font-family:SFPro;font-weight:400;font-size:20rpx;color:#555;line-height:24rpx;text-align:left;font-style:normal;margin-top:16rpx}.content .item .money.data-v-2ddedf8d{font-family:HarmonyOS_Sans_Medium;font-size:20rpx;color:#f83224;line-height:26rpx;text-align:left;font-style:normal}.back.data-v-2ddedf8d{position:absolute;top:0;left:0;width:750rpx;height:800rpx;background:#fe2e2e}.input.data-v-2ddedf8d{width:702rpx;height:68rpx;background:#fff;border-radius:34rpx;margin-left:24rpx;box-sizing:border-box;padding:0 8rpx 0 24rpx}.input .search.data-v-2ddedf8d{width:100rpx;height:56rpx;background:#f83224;border-radius:28rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#fff;line-height:56rpx;text-align:center;font-style:normal}

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

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

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

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

unpackage/dist/dev/mp-weixin/app.json

@@ -2,7 +2,6 @@
   "pages": [
     "pages/index/index",
     "pages/mine/mine",
-    "pages/express/express",
     "pages/shopping/shopping",
     "pages/cart/cart",
     "pages/login/login",
@@ -122,9 +121,6 @@
     "custom": true,
     "list": [
       {
-        "pagePath": "pages/express/express"
-      },
-      {
         "pagePath": "pages/index/index"
       },
       {

unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.json

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

unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.wxss

@@ -24,6 +24,52 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.chatfu {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #555555;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+}
+.chattitle {
+  width: 314rpx;
+  height: 72rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #222222;
+  line-height: 36rpx;
+  text-align: left;
+  font-style: normal;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+.catmoney {
+  width: 104rpx;
+  height: 46rpx;
+  font-family: HarmonyOS_Sans_Medium;
+  font-size: 26rpx;
+  color: #F83224;
+  line-height: 36rpx;
+  text-align: left;
+  font-style: normal;
+  font-weight: 600;
+}
+.title {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 36rpx;
+  color: #222222;
+  line-height: 50rpx;
+  text-align: left;
+  font-style: normal;
+}
 .send {
   font-size: 26rpx;
   color: #fff;