解决冲突

components/kj-flow/kj-flow.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="u-flex u-row-between">
 			<view class="" style="width: 28px;height: 28px;"></view>
-			<view class="title">跨境物流</view>
+			<view class="title">{{i18n.flow}}</view>
 			<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
 		</view>
 		<view class="u-flex" style="margin-top: 56rpx;">
@@ -10,8 +10,20 @@
 				<view v-for="(item,idx) in transportList" :key="idx" @click="changea(item,idx)"
 					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;"
 					:style="{background:idx==leftchange? '':'#F7F7F7'}">
-					<view class="ititle" :style="{fontWeight:idx==leftchange?'600':''}">{{item.name}}</view>
-					<view class="itime" v-if="idx==leftchange&&containerList.length>0">预计到货时间 </view>
+					<view class="ititle" v-if="language =='zh-CN'" :style="{fontWeight:idx==leftchange?'600':''}">
+						{{item.name_cn}}
+					</view>
+					<view class="ititle" v-if="language =='en-US'" :style="{fontWeight:idx==leftchange?'600':''}">
+						{{item.name_en}}
+					</view>
+					<view class="ititle" v-if="language =='es-ES'" :style="{fontWeight:idx==leftchange?'600':''}">
+						{{item.name_es}}
+					</view>
+					<view class="ititle" v-if="language =='it-IT'" :style="{fontWeight:idx==leftchange?'600':''}">
+						{{item.name_ita}}
+					</view>
+					<view class="itime" v-if="idx==leftchange&&containerList.length>0">{{i18n.Estimatedtimeofarrival}}
+					</view>
 					<view class="itime" v-if="idx==leftchange&&containerList.length>0">{{estimated_arrived_date}}</view>
 				</view>
 			</scroll-view>
@@ -20,9 +32,15 @@
 					style="display: flex;flex-direction: column;align-items: center;justify-content: center;padding: 20rpx 0 16rpx;"
 					class="iitem">
 					<view class="ititle u-flex u-row-between" style="width: 100%;">
-						<view class="ititle">发柜时间 {{item.begin_date}}</view>
-						<view style="font-size: 24rpx;
-color: #666666;">{{item.name}}</view>
+						<view class="ititle">{{i18n.Shipmentdate}}: {{item.begin_date}}</view>
+						<view v-if="language =='zh-CN'" style="font-size: 24rpx;
+color: #666666;">{{item.name_cn}}</view>
+						<view v-if="language =='en-US'" style="font-size: 24rpx;
+color: #666666;">{{item.name_en}}</view>
+						<view v-if="language =='es-ES'" style="font-size: 24rpx;
+color: #666666;">{{item.name_es}}</view>
+						<view v-if="language =='it-IT'" style="font-size: 24rpx;
+color: #666666;">{{item.name_ita}}</view>
 					</view>
 					<view class="u-flex u-row-between" style="margin-top: 16rpx;width: 100%;">
 						<view class="price">
@@ -53,7 +71,7 @@ color: #666666;">{{item.name}}</view>
 			},
 			goodstype: {
 				typeof: '',
-				default:"normal"
+				default: "normal"
 			}
 		},
 		name: "kj-flow",
@@ -67,9 +85,18 @@ color: #666666;">{{item.name}}</view>
 				leftname: '',
 				rightname: '',
 				dateid: '',
-				unit_price:''
+				unit_price: '',
+				language: 'zh-CN',
 			};
 		},
+		created() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+		},
+		onLoad() {
+
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')
@@ -89,7 +116,20 @@ color: #666666;">{{item.name}}</view>
 					this.estimated_arrived_date = res[0].estimated_arrived_date
 					this.dateid = res[0].id
 					this.rightname = res[0].name
-					this.unit_price= res[0].unit_price
+					if (this.language == 'en-US') {
+						this.rightname = res[0].name_en
+					}
+					if (this.language == 'es-ES') {
+						this.rightname = res[0].name_es
+					}
+					if (this.language == 'it-IT') {
+						this.rightname = res[0].name_ita
+					}
+
+					if (this.language == 'zh-CN') {
+						this.rightname = res[0].name_cn
+					}
+					this.unit_price = res[0].unit_price
 				}).catch(() => {
 
 				})
@@ -107,13 +147,38 @@ color: #666666;">{{item.name}}</view>
 			changea(item, index) {
 				this.leftchange = index
 				this.container(item.id)
-				this.leftname = item.name
+				if (this.language == 'en-US') {
+					this.leftname = item.name_en
+				}
+				if (this.language == 'es-ES') {
+					this.leftname = item.name_es
+				}
+				if (this.language == 'it-IT') {
+					this.leftname = item.name_ita
+				}
+
+				if (this.language == 'zh-CN') {
+					this.leftname = item.name_cn
+				}
+
 			},
 			//右边切换
 			change(item, idx) {
 				this.rightchange = idx
 				this.dateid = item.id
-				this.rightname = item.name
+				if (this.language == 'en-US') {
+					this.rightname = item.name_en
+				}
+				if (this.language == 'es-ES') {
+					this.rightname = item.name_es
+				}
+				if (this.language == 'it-IT') {
+					this.rightname = item.name_ita
+				}
+
+				if (this.language == 'zh-CN') {
+					this.rightname = item.name_cn
+				}
 				this.unit_price = item.unit_price
 			},
 			close() {
@@ -127,7 +192,7 @@ color: #666666;">{{item.name}}</view>
 						dateid: this.dateid,
 						rightname: this.rightname,
 						leftname: this.leftname,
-						unit_price:this.unit_price
+						unit_price: this.unit_price
 					})
 				}
 

pageA/chat/chat.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="chat-pages">
-		<u-navbar :border="false" >
+		<u-navbar :border="false">
 			<view class="u-nav-slot" slot="left" style="display: flex;">
 				<u-icon name="arrow-left" @click="return1()" size="20"></u-icon>
 				<image src="@/static/images/index/dianhua.png" mode=""
-					style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
+					style="width: 40rpx;height: 40rpx;margin-left: 22rpx;" @click="callphone"></image>
 			</view>
 			<view class=" u-flex-col u-row-center" slot="center">
 				<text class="title">{{user_other.merchant_name}}</text>
@@ -134,7 +134,8 @@
 		</view>
 		<view class="" style="height: 55rpx;"></view>
 		<!-- <kj-chat></kj-chat> -->
-		<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other' @success="getdata"></kj-chat>
+		<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
+			@success="getdata"></kj-chat>
 	</view>
 </template>
 
@@ -165,7 +166,7 @@
 		},
 		onLoad(options) {
 			this.user = options.user_info
-			if(options.user_other){
+			if (options.user_other) {
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
 			}
 			// this.statusheight = uni.getSystemInfoSync().statusBarHeight,
@@ -186,6 +187,19 @@
 			this.getdata()
 		},
 		methods: {
+			callphone() {
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'basic'
+					}
+				}).then((res) => {
+					console.log(res);
+
+					uni.makePhoneCall({
+						phoneNumber: res.service_mobile
+					})
+				}).catch(() => {})
+			},
 			previewimg(url) {
 				let urls = []
 				urls.push(url)
@@ -312,7 +326,7 @@
 </script>
 
 <style lang="scss">
-	.title{
+	.title {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
 		font-size: 36rpx;
@@ -321,6 +335,7 @@
 		text-align: left;
 		font-style: normal;
 	}
+
 	.jend {
 		justify-content: flex-end;
 	}

pageA/payorder.vue

@@ -280,7 +280,7 @@ export default {
     confirm() {
       // console.log(new Date().getTime());
       if (this.type == "") {
-        uni.$u.http
+        uni.$u.http  
           .post("/api/order/payment", {
             order_id: this.orderid,
             pay_type: this.pay_type,

pageA/productdetails.vue

@@ -95,7 +95,7 @@
 							<u-icon name="arrow-right" size="16"></u-icon>
 						</view>
 					</view>
-					<view class="top u-flex u-row-between" style="margin-top: 36rpx" @click="serve = true">
+					<view class="top u-flex u-row-between" style="margin-top: 36rpx" @click="openfu">
 						<view class="u-flex">
 							<view class="change">{{ i18n.service }}</view>
 							<view v-if="language == 'zh-CN'" class="" style="margin-left: 20rpx">{{content.name_cn}}
@@ -279,7 +279,7 @@
 					<view class="" style="margin-left: 20rpx">
 						<view class="">
 							<text class="read">¥</text>
-							<text class="read" style="font-size: 40rpx" v-if="goodinfo.is_discount == 0">{{
+							<text class="read" style="font-size: 40rpx;font-weight: 600;" v-if="goodinfo.is_discount == 0">{{
                   (Number(sku_info.discount_price * 100) *
                     Number(value * 100)) /
                     10000 ||
@@ -288,7 +288,7 @@
                     10000
                 }}</text>
 							<!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
-							<text class="read" style="font-size: 40rpx" v-if="goodinfo.is_discount == 1">{{
+							<text class="read" style="font-size: 40rpx;font-weight: 600;" v-if="goodinfo.is_discount == 1">{{
                   (Number(sku_info.price * 100) * Number(value * 100)) /
                     10000 ||
                   (Number(goodinfo.price * 100) * Number(value * 100)) / 10000
@@ -341,7 +341,7 @@
 					<image src="../static/images/index/serve.png" style="width: 138rpx; height: 34rpx" mode=""></image>
 					<text class="info"> 售前售后 安心无忧购物 </text>
 				</view>
-				<view class="" style="position: absolute; top: 48rpx; right: 24rpx" @click="serve = false">
+				<view class="" style="position: absolute; top: 48rpx; right: 24rpx" @click="close()">
 					<u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
 				</view>
 				<view class="contenta">
@@ -358,7 +358,7 @@
 						<u-parse :content="content.content_ita"></u-parse>
 					</view>
 				</view>
-				<view class="button" @click="serve = false">
+				<view class="button" @click="close()">
 					{{ i18n.know }}
 				</view>
 			</view>
@@ -495,6 +495,9 @@
 			this.guarantee()
 		},
 		methods: {
+			openfu(){
+				this.serve = true
+			},
 			returnindex() {
 				uni.switchTab({
 					url:'/pages/index/index'
@@ -512,6 +515,7 @@
 			close() {
 				this.show = false
 				this.share = false
+				this.serve = false
 			},
 			//评论页面
 			tocomment() {

pageB/ParcelExpress.vue

@@ -98,12 +98,12 @@
 						<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 v-if="JSON.stringify(goodinfo)==='{}'" class="u-flex" @click.stop='goods'>
 						<text class="change">{{i18n.selection}}</text>
 						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
 							mode=""></image>
 					</view>
-					<view v-else class="goodname" @click='goods'>
+					<view v-else class="goodname" @click.stop='goods'>
 						{{goodinfo.goodname}},{{goodinfo.weight}}kg
 					</view>
 				</view>
@@ -112,8 +112,10 @@
 			<view class="next  u-flex-between" style="display: flex;">
 				<view class="" style="flex: 1;">
 					<view class="sum">
-						<text>{{i18n.Estimatedprice}}</text>
-						<text style="color: rgba(248, 50, 36, 1);">¥ {{sum?sum:'--'}}</text>
+						<text style="font-size: 24rpx;margin-right: 12rpx;">{{i18n.Estimatedprice}}</text>
+						<text style="color: rgba(248, 50, 36, 1);font-size: 26rpx;">¥ </text>
+						<text style="color: rgba(248, 50, 36, 1);font-size: 36rpx;font-weight: 600;">
+							{{sum?sum:'--'}}</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
 						<u-checkbox-group shape='circle' v-model="checkboxValue1" placement="column"
@@ -122,13 +124,25 @@
 							</u-checkbox>
 						</u-checkbox-group>
 						<text>{{i18n.readandagree}}</text>
-						<text style="color: rgba(248, 50, 36, 1);">《{{i18n.International}}》</text>
+						<text style="color: rgba(248, 50, 36, 1);"
+							@click="internationalshowa">《{{i18n.International}}》</text>
 					</view>
 				</view>
 				<view class="tonext " style="" @click="next">
 					{{i18n.next}}
 				</view>
 			</view>
+			<u-popup :show="internationalshow" :round="20" @close="close()" :closeable='true'>
+				<view style="
+			  padding: 48rpx 24rpx;
+			  box-sizing: border-box;
+			  position: relative;
+			  border-radius: 20rpx 20rpx 0 0;
+			">
+					<view class="" style="text-align: center;font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx;">{{contenttitle}}</view>
+					<u-parse :content="content"></u-parse>
+				</view>
+			</u-popup>
 		</view>
 	</view>
 </template>
@@ -144,11 +158,18 @@
 				bottomadd: {},
 				province_id: '',
 				goodinfo: {}, //物品信息
-				sum: ''
+				sum: '',
+				internationalshow: false,
+				content: '',
+				contenttitle: '',
+				language: "zh-CN",
 			}
 		},
 		onLoad(options) {
 			this.expressinfo = JSON.parse(decodeURIComponent(options.expressinfo));
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
 		},
 		computed: {
 			i18n() {
@@ -156,6 +177,39 @@
 			}
 		},
 		methods: {
+			close() {
+				this.internationalshow = false
+			},
+			internationalshowa() {
+				this.internationalshow = true
+				this.international()
+			},
+			//国际快递服务协议
+			international() {
+				uni.$u.http.get('/api/agreement', {
+					params: {
+						code: 'international_express_service'
+					}
+				}).then((res) => {
+					console.log(res);
+					if (this.language == 'zh-CN') {
+						this.content = res.content_cn
+						this.contenttitle = res.name_cn
+					}
+					if (this.language == 'en-US') {
+						this.content = res.content_en
+						this.contenttitle = res.name_en
+					}
+					if (this.language == 'es-ES') {
+						this.content = res.content_es
+						this.contenttitle = res.content_ita
+					}
+					if (this.language == 'it-IT') {
+						this.content = res.content_cn
+						this.contenttitle = res.name_ita
+					}
+				}).catch(() => {})
+			},
 			//改变地址
 			changeadd() {
 				var a = {}
@@ -191,6 +245,14 @@
 			},
 			//物品信息
 			goods() {
+				if(JSON.stringify(this.topadd)=="{}"){
+					this.$u.toast('请填写寄件地址')
+					return 
+				}
+				if(JSON.stringify(this.bottomadd)=="{}"){
+					this.$u.toast('请填写收件地址')
+					return 
+				}
 				var that = this
 				uni.navigateTo({
 					url: '/pageB/goods',
@@ -230,7 +292,7 @@
 					this.$u.toast('请填写物品信息')
 					return
 				}
-				if (this.checkboxValue1.length==0) {
+				if (this.checkboxValue1.length == 0) {
 					this.$u.toast('请勾选协议')
 					return
 				}

pages/express/express.vue

@@ -14,7 +14,7 @@
 					<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;"></image>
+						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;" @click="callphone"></image>
 				</view>
 				<view class="u-nav-slot" slot="center" style="width: 226rpx;">
 					<u-subsection bgColor='rgba(248, 50, 36, 0.1)' activeColor='#F83224' inactiveColor='#222'
@@ -281,6 +281,22 @@
 			}
 		},
 		methods: {
+			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', {
@@ -303,7 +319,7 @@
 							'&leftname=' + this
 							.leftname + "&rightname=" + this.rightname + "&container_id=" + this
 							.container_id +
-							"&unit_price=" + this.unit_price+'&all=' + res
+							"&unit_price=" + this.unit_price + '&all=' + res
 					})
 				}).catch(() => {
 

pages/index/index.vue

@@ -14,7 +14,7 @@
 					<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;"></image>
+						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;" @click="callphone"></image>
 				</view>
 				<view class="u-nav-slot" slot="center" style="width: 226rpx;">
 					<u-subsection bgColor='rgba(248, 50, 36, 0.1)' activeColor='#F83224' inactiveColor='#222'
@@ -278,6 +278,9 @@
 			}
 			//商品推荐
 			this.recommend()
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 
 		},
 		onShow() {
@@ -290,11 +293,24 @@
 			this.pack()
 			//海外包邮
 			this.shipp()
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
 		},
 		methods: {
+			callphone() {
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'basic'
+					}
+				}).then((res) => {
+					console.log(res);
+			
+					uni.makePhoneCall({
+						phoneNumber: res.service_mobile
+					})
+				}).catch(() => {
+			
+				})
+			
+			},
 			advert() {
 				console.log(this.url);
 				uni.navigateTo({

pages/shopping/shopping.vue

@@ -14,10 +14,10 @@
 		<view class="input u-flex u-row-between" style="margin-top: 16rpx;">
 			<view class="u-flex">
 				<image src="../../static/shopping/search.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
-				<input v-model="keyword" type="text" placeholder="请输入商品名称搜索"
+				<input v-model="keyword" type="text" :placeholder="i18n.Searchcon"
 					style="width: 500rpx;margin-left: 14rpx;" />
 			</view>
-			<view class="search" @click="search">搜索</view>
+			<view class="search" @click="search">{{i18n.search}}</view>
 		</view>
 		<view class="content">
 			<view class="">
@@ -108,6 +108,11 @@
 				last_page: ''
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		onShow() {
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')

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

@@ -1 +1 @@
-.iitem.data-v-413f2ee0{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-413f2ee0{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:right;font-style:normal}.right.data-v-413f2ee0{flex:1;width:474rpx;height:642rpx}.bottom.data-v-413f2ee0{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-413f2ee0{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-413f2ee0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-413f2ee0{width:212rpx;height:642rpx}.ititle.data-v-413f2ee0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:right;font-style:normal}.itime.data-v-413f2ee0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:right;font-style:normal}
+.iitem.data-v-76e11df2{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-76e11df2{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:right;font-style:normal}.right.data-v-76e11df2{flex:1;width:474rpx;height:642rpx}.bottom.data-v-76e11df2{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-76e11df2{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-76e11df2{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-76e11df2{width:212rpx;height:642rpx}.ititle.data-v-76e11df2{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:right;font-style:normal}.itime.data-v-76e11df2{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:right;font-style:normal}

unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-038bfac0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-038bfac0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-038bfac0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-038bfac0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-038bfac0{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-038bfac0{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-038bfac0{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-038bfac0{position:relative}.back .topbox .state.data-v-038bfac0{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-038bfac0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-038bfac0{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-212d0d0a{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-212d0d0a{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-212d0d0a{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-212d0d0a{position:relative}.back .topbox .state.data-v-212d0d0a{width:128rpx;background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-212d0d0a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-212d0d0a{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

unpackage/dist/build/mp-weixin/pageB/ParcelExpress.json

@@ -6,6 +6,8 @@
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
-    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
+    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
   }
 }

unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/myPackage/component/packageCard"],{"0983":function(t,n,e){"use strict";e.r(n);var i=e("93b3"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a},2769:function(t,n,e){},"63e4":function(t,n,e){"use strict";e.r(n);var i=e("6ac9"),a=e("0983");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("9c83");var r,u=e("f0c5"),c=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"77e02b36",null,!1,i["a"],r);n["default"]=c.exports},"6ac9":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement,e=(t._self._c,"unpaid"==t.itemInfo.status?t.itemInfo.actual_price.split("."):null),i="unpaid"==t.itemInfo.status?t.itemInfo.actual_price.split("."):null,a=Number(t.itemInfo.actual_weight);t.$mp.data=Object.assign({},{$root:{g0:e,g1:i,m0:a}})},o=[]},"93b3":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{itemInfo:{typeof:Object,default:{}}},computed:{orderDetail:function(){return 0==this.itemInfo.orderStatus?"待平台收货":1==this.itemInfo.orderStatus?"待付款":2==this.itemInfo.orderStatus?"待发货":3==this.itemInfo.orderStatus?"拼包中":4==this.itemInfo.orderStatus?"待寄件":void 0}},data:function(){return{}},methods:{freeze:function(){var n=this;t.$u.http.post("/api/express-order/froze/".concat(this.itemInfo.id)).then((function(e){t.showToast({title:0==n.itemInfo.is_frozen?"已冻结":"已恢复",icon:"none"})}))},toPayment:function(){t.navigateTo({url:"/pageD/paymentOrder/paymentOrder"})},toSending:function(){t.navigateTo({url:"/pageD/sending/sending"})}}};n.default=e}).call(this,e("543d")["default"])},"9c83":function(t,n,e){"use strict";var i=e("2769"),a=e.n(i);a.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/myPackage/component/packageCard"],{"0983":function(t,e,n){"use strict";n.r(e);var a=n("93b3"),i=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=i.a},"63e4":function(t,e,n){"use strict";n.r(e);var a=n("d4a4"),i=n("0983");for(var o in i)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(o);n("e42a");var r,u=n("f0c5"),f=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"ff60fc78",null,!1,a["a"],r);e["default"]=f.exports},"93b3":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={props:{itemInfo:{typeof:Object,default:{}}},computed:{orderDetail:function(){return 0==this.itemInfo.orderStatus?"待平台收货":1==this.itemInfo.orderStatus?"待付款":2==this.itemInfo.orderStatus?"待发货":3==this.itemInfo.orderStatus?"拼包中":4==this.itemInfo.orderStatus?"待寄件":void 0}},data:function(){return{}},methods:{freeze:function(){var e=this;t.$u.http.post("/api/express-order/froze/".concat(this.itemInfo.id)).then((function(n){t.showToast({title:0==e.itemInfo.is_frozen?"已冻结":"已恢复",icon:"none"})}))},toPayment:function(){t.navigateTo({url:"/pageD/paymentOrder/paymentOrder"})},toSending:function(){t.navigateTo({url:"/pageD/sending/sending"})}}};e.default=n}).call(this,n("543d")["default"])},be28:function(t,e,n){},d4a4:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,n=(t._self._c,"unpaid"==t.itemInfo.status?t.itemInfo.actual_price.split("."):null),a="unpaid"==t.itemInfo.status?t.itemInfo.actual_price.split("."):null,i=Number(t.itemInfo.actual_weight);t.$mp.data=Object.assign({},{$root:{g0:n,g1:a,m0:i}})},o=[]},e42a:function(t,e,n){"use strict";var a=n("be28"),i=n.n(a);i.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/myPackage/component/packageCard-create-component',
     {

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

@@ -1 +1 @@
-<view class="data-v-5fa64fdc"><view class="top-search data-v-5fa64fdc"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-5fa64fdc" bind:__l="__l"></u--input><view class="top-tab data-v-5fa64fdc"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-5fa64fdc',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-5fa64fdc',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-5fa64fdc',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-5fa64fdc',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-5fa64fdc"><block wx:if="{{weights>=300}}"><view class="prompt data-v-5fa64fdc"><image class="prompt-icon data-v-5fa64fdc" src="../../static/mine/336.png" mode></image>当前页面加载的订单总重量300kg</view></block><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-5fa64fdc"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-5fa64fdc" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-4cb10bb6"><view class="top-search data-v-4cb10bb6"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-4cb10bb6" bind:__l="__l"></u--input><view class="top-tab data-v-4cb10bb6"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-4cb10bb6',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-4cb10bb6"><block wx:if="{{weights>=300}}"><view class="prompt data-v-4cb10bb6"><image class="prompt-icon data-v-4cb10bb6" src="../../static/mine/336.png" mode></image>当前页面加载的订单总重量300kg</view></block><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-4cb10bb6"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-4cb10bb6" bind:__l="__l"></package-card></view></block></view></view>

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

@@ -1 +1 @@
-.top-search.data-v-5fa64fdc{background-color:#fff;padding:20rpx 24rpx}.data-v-5fa64fdc .u-input{background-color:#f4f4f4}.top-tab.data-v-5fa64fdc{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-5fa64fdc{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-5fa64fdc{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-5fa64fdc::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-5fa64fdc{padding:20rpx 24rpx}.content .prompt.data-v-5fa64fdc{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-5fa64fdc{width:36rpx;height:36rpx;margin-right:20rpx}
+.top-search.data-v-4cb10bb6{background-color:#fff;padding:20rpx 24rpx}.data-v-4cb10bb6 .u-input{background-color:#f4f4f4}.top-tab.data-v-4cb10bb6{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-4cb10bb6{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-4cb10bb6{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-4cb10bb6::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-4cb10bb6{padding:20rpx 24rpx}.content .prompt.data-v-4cb10bb6{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-4cb10bb6{width:36rpx;height:36rpx;margin-right:20rpx}

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

@@ -1 +1 @@
-<view class="page data-v-cb3ab692"><view class="tab-1 data-v-cb3ab692" slot="center"><u--input style="background-color:#f4f4f4;" vue-id="3172a31f-1" placeholder="搜索订单号/手机号/商品/姓名" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" class="data-v-cb3ab692" bind:__l="__l"></u--input><view class="top-tab data-v-cb3ab692"><view data-event-opts="{{[['tap',[['tabSwitch',['']]]]]}}" class="{{['tab','data-v-cb3ab692',(follow=='')?'commodity':'']}}" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['tabSwitch',['unreview']]]]]}}" class="{{['tab','data-v-cb3ab692',(follow=='unreview')?'commodity':'']}}" bindtap="__e">待审核</view><view data-event-opts="{{[['tap',[['tabSwitch',['unfill']]]]]}}" class="{{['tab','data-v-cb3ab692',(follow=='unfill')?'commodity':'']}}" bindtap="__e">待缴纳保证金</view><view data-event-opts="{{[['tap',[['tabSwitch',['merdelivered']]]]]}}" class="{{['tab','data-v-cb3ab692',(follow=='merdelivered')?'commodity':'']}}" bindtap="__e">待团长发货</view><view data-event-opts="{{[['tap',[['tabSwitch',['undelivered']]]]]}}" class="{{['tab','data-v-cb3ab692',(follow=='undelivered')?'commodity':'']}}" bindtap="__e">待总部发货</view><view data-event-opts="{{[['tap',[['tabSwitch',['delivered']]]]]}}" class="{{['tab','data-v-cb3ab692',(follow=='delivered')?'commodity':'']}}" bindtap="__e">已发货</view></view></view><view class="center data-v-cb3ab692"><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="status"><view class="data-v-cb3ab692"><detail-card vue-id="{{'3172a31f-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-cb3ab692" bind:__l="__l"></detail-card></view></block></view></view>
+<view class="page data-v-1109faaa"><view class="tab-1 data-v-1109faaa" slot="center"><u--input style="background-color:#f4f4f4;" vue-id="3172a31f-1" placeholder="搜索订单号/手机号/商品/姓名" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" class="data-v-1109faaa" bind:__l="__l"></u--input><view class="top-tab data-v-1109faaa"><view data-event-opts="{{[['tap',[['tabSwitch',['']]]]]}}" class="{{['tab','data-v-1109faaa',(follow=='')?'commodity':'']}}" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['tabSwitch',['unreview']]]]]}}" class="{{['tab','data-v-1109faaa',(follow=='unreview')?'commodity':'']}}" bindtap="__e">待审核</view><view data-event-opts="{{[['tap',[['tabSwitch',['unfill']]]]]}}" class="{{['tab','data-v-1109faaa',(follow=='unfill')?'commodity':'']}}" bindtap="__e">待缴纳保证金</view><view data-event-opts="{{[['tap',[['tabSwitch',['merdelivered']]]]]}}" class="{{['tab','data-v-1109faaa',(follow=='merdelivered')?'commodity':'']}}" bindtap="__e">待团长发货</view><view data-event-opts="{{[['tap',[['tabSwitch',['undelivered']]]]]}}" class="{{['tab','data-v-1109faaa',(follow=='undelivered')?'commodity':'']}}" bindtap="__e">待总部发货</view><view data-event-opts="{{[['tap',[['tabSwitch',['delivered']]]]]}}" class="{{['tab','data-v-1109faaa',(follow=='delivered')?'commodity':'']}}" bindtap="__e">已发货</view></view></view><view class="center data-v-1109faaa"><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="status"><view class="data-v-1109faaa"><detail-card vue-id="{{'3172a31f-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-1109faaa" bind:__l="__l"></detail-card></view></block></view></view>

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

@@ -1 +1 @@
-.page .tab-1.data-v-cb3ab692{padding:0 24rpx;background-color:#fff}.page .tab-1.data-v-cb3ab692  .u-input{background-color:#f4f4f4}.page .tab-1 .top-tab.data-v-cb3ab692{margin-top:20rpx;display:flex;justify-content:space-between;overflow-y:auto;padding-bottom:10rpx}.page .tab-1 .top-tab .tab.data-v-cb3ab692{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.page .tab-1 .top-tab .commodity.data-v-cb3ab692{position:relative;font-weight:600;font-size:32rpx}.page .tab-1 .top-tab .commodity.data-v-cb3ab692::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.page .center.data-v-cb3ab692{padding:20rpx 24rpx}
+.page .tab-1.data-v-1109faaa{padding:0 24rpx;background-color:#fff}.page .tab-1.data-v-1109faaa  .u-input{background-color:#f4f4f4}.page .tab-1 .top-tab.data-v-1109faaa{margin-top:20rpx;display:flex;justify-content:space-between;overflow-y:auto;padding-bottom:10rpx}.page .tab-1 .top-tab .tab.data-v-1109faaa{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.page .tab-1 .top-tab .commodity.data-v-1109faaa{position:relative;font-weight:600;font-size:32rpx}.page .tab-1 .top-tab .commodity.data-v-1109faaa::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.page .center.data-v-1109faaa{padding:20rpx 24rpx}

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

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "",
   "usingComponents": {
-    "u--input": "/uview-ui/components/u--input/u--input"
+    "u--input": "/uview-ui/components/u--input/u--input",
+    "select-express": "/pageD/components/selectExpress"
   }
 }

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

@@ -1 +1 @@
-.page.data-v-af2b69b6{padding:20rpx 24rpx;position:relative}.page .address.data-v-af2b69b6{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .address .address-top.data-v-af2b69b6{height:96rpx;line-height:96rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .address .address-top .top_left_text.data-v-af2b69b6{font-size:28rpx;color:#222;font-weight:600}.page .address .address-top .top_right_text.data-v-af2b69b6{font-size:24rpx;color:#f83224}.page .address .address-content.data-v-af2b69b6{display:flex;align-items:center;padding:22rpx 0 32rpx}.page .address .address-content .address-icon.data-v-af2b69b6{width:28rpx;height:28rpx;margin-right:24rpx}.page .address .address-content .warehouse-phone.data-v-af2b69b6{display:flex;align-items:center;margin-bottom:14rpx}.page .address .address-content .warehouse-phone .warehouse-name.data-v-af2b69b6{font-size:30rpx;font-weight:600;color:#222}.page .address .address-content .warehouse-phone .phone.data-v-af2b69b6{color:#555;font-size:24rpx}.page .address .address-content .detail.data-v-af2b69b6{font-size:26rpx;color:#777}.page .express.data-v-af2b69b6{border-radius:16rpx;background-color:#fff;padding:0 20rpx;margin-top:20rpx}.page .express ._input-1.data-v-af2b69b6{display:flex;align-items:center;height:100rpx}.page .express ._input-1 ._label.data-v-af2b69b6{font-size:28rpx;color:#222;margin-right:32rpx}.page .express ._input-2.data-v-af2b69b6{border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .footer.data-v-af2b69b6{position:fixed;bottom:0;left:0;width:95%;background-color:#fff;height:126rpx;justify-content:center;padding:20rpx}.page .footer .btn-2.data-v-af2b69b6{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-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)}

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-.content.data-v-032c4f96{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-032c4f96{width:340rpx;background:#fff;border-radius:16rpx}.content .item .title.data-v-032c4f96{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-032c4f96{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-032c4f96{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-032c4f96{font-family:HarmonyOS_Sans_Medium;font-size:20rpx;color:#f83224;line-height:26rpx;text-align:left;font-style:normal}.back.data-v-032c4f96{position:absolute;top:0;left:0;width:750rpx;height:800rpx;background:#fe2e2e}.input.data-v-032c4f96{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-032c4f96{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-38c4b4b3{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-38c4b4b3{width:340rpx;background:#fff;border-radius:16rpx}.content .item .title.data-v-38c4b4b3{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-38c4b4b3{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-38c4b4b3{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-38c4b4b3{font-family:HarmonyOS_Sans_Medium;font-size:20rpx;color:#f83224;line-height:26rpx;text-align:left;font-style:normal}.back.data-v-38c4b4b3{position:absolute;top:0;left:0;width:750rpx;height:800rpx;background:#fe2e2e}.input.data-v-38c4b4b3{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-38c4b4b3{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.private.config.json

@@ -1,7 +0,0 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "kjds",
-  "setting": {
-    "compileHotReLoad": true
-  }
-}

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

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