冲突

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,6 +307,37 @@
 						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) {
@@ -251,14 +360,14 @@
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
 						setTimeout(() => {
-							_this.$emit('success', true)  
+							_this.$emit('success', true)
 						}, 800);
 					},
 					fail: function(e) {
-						console.log("发送消息失败",e);
+						console.log("发送消息失败", e);
 					}
 				});
-				console.log('msg',msg);
+				console.log('msg', msg);
 				conn.send(msg.body);
 				this.text = ''
 
@@ -409,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;

components/kj-express/kj-express.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 商城 -->
-	<scroll-view  class="" scroll-y='true' style="height: calc(100vh - 188rpx);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 src="../../static/images/index/back.png"

components/kj-index/kj-index.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 商城 -->
-	<scroll-view @scrolltolower='lower' class="" scroll-y='true' style="height: calc(100vh - 188rpx);">
+	<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;" >
 			<!-- 搜索 -->
@@ -219,8 +219,8 @@
 				</view>
 			</view>
 		</u-popup>
-		<view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view>
-		<kj-tabbar :value1=0></kj-tabbar>
+		<!-- <view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view> -->
+		<!-- <kj-tabbar :value1=0></kj-tabbar> -->
 	</scroll-view>
 </template>
 

pageA/chat/news.vue

@@ -160,6 +160,7 @@
 					pageSize: 50,
 					cursor: this.cursor
 				}).then((res) => {
+					console.log(res);
 					// this.list.concat(res.data.conversations)
 					if(this.cursor==''){
 						this.list = res.data.conversations

pageA/productdetails.vue

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

pageA/service/service.vue

@@ -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: {

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

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

pages/index/index.vue

@@ -25,19 +25,20 @@
 				</view>
 			</u-navbar>
 		</view>
-		<swiper style="min-height: 100vh;" class="index-swiper" :circular="false" :autoplay="false" :current="current" @change="swipertotabs" >
+		<swiper style="height: calc(100vh - 300rpx);" class="index-swiper" :circular="false" :autoplay="false" :current="current" @change="swipertotabs" >
 			<!-- 商城 -->
 			<swiper-item>
-				<scroll-view scroll-y="true" class="" >
+				<view >
 					<kj-express></kj-express>
-				</scroll-view>
+				</view>
 			</swiper-item>
 			<swiper-item>
-				<scroll-view scroll-y="true" class="" style="height: calc (100vh - 88rpx);">
+				<view  >
 					<kj-index></kj-index>
-				</scroll-view>
+				</view>
 			</swiper-item>
 		</swiper>
+		<view class="" style="height: 160rpx;" ></view>
 		<kj-tabbar :value1=0 ref="kjTabbar"></kj-tabbar>
 	</view>
 </template>
@@ -181,21 +182,21 @@
 			// 		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(() => {
-
-			// 	})
+			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
@@ -335,17 +336,17 @@
 			// 	})
 			// },
 			// //物流计算器
-			// counter() {
-			// 	uni.navigateTo({
-			// 		url: '/pageA/counter'
-			// 	})
-			// },
+			counter() {
+				uni.navigateTo({
+					url: '/pageA/counter'
+				})
+			},
 			// //消息
-			// tochat() {
-			// 	uni.navigateTo({
-			// 		url: '/pageA/chat/news'
-			// 	})
-			// },
+			tochat() {
+				uni.navigateTo({
+					url: '/pageA/chat/news'
+				})
+			},
 			// //商品分类
 			// shoptype() {
 			// 	uni.navigateTo({

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/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/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/project.config.json

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

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
 }