6.14提交代码，拉取代码

manifest.json

@@ -45,6 +45,7 @@
 			/* SDK配置 */
 			"sdkConfigs": {}
 		}
+		
 	},
 	/* 快应用特有相关 */
 	"quickapp": {},

pageC/mineFollow/mineFollow.vue

@@ -205,7 +205,7 @@
 					font-size: 28rpx;
 					font-weight: 600;
 					margin-bottom: 12rpx;
-					min-height: 78rpx;
+					// min-height: 78rpx;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					display: -webkit-box;

pageC/orderForm/component/orderInofrmation.vue

@@ -155,6 +155,7 @@
 				color: #222;
 				width: 168rpx;
 				height: 68rpx;
+				line-height: 68rpx;
 				margin-right: 20rpx;
 				border: 2rpx solid #979797;
 			}
@@ -167,6 +168,7 @@
 				color: #f83224;
 				width: 168rpx;
 				height: 68rpx;
+				line-height: 68rpx;
 				border: 2rpx solid #f83224;
 			}
 		}

pageD/commodityManage/commodityManage.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view class="top-tab-search">
+		<!-- 顶部搜索加tab栏部分，点击批量打折是隐藏该部分 -->
+		<view class="top-tab-search" v-if="!batch">
 			<view class="search">
 				<u--input placeholder="搜索商品名称" shape="circle" prefixIcon="search"
 					prefixIconStyle="font-size: 22px;color: #909399"></u--input>
@@ -23,34 +24,69 @@
 				</view>
 			</view>
 		</view>
+		<!-- 顶部搜索加tab栏部分，点击批量打折是隐藏该部分 -->
 
+
+		<!-- 内容 -->
 		<view class="page">
-			<GoodsInformation productAndCommodity="commodity" :status="status" @toDetail="toDetail" />
+			<view class="list">
+				<view class="radio" v-if="batch">
+					<radio @click="value=!value" :checked='value' style="transform:scale(0.7)" color="#f83224"
+						activeBackgroundColor="#f83224" backgroundColor="#f83224"></radio>
+				</view>
+				<GoodsInformation :batch="batch" productAndCommodity="commodity"
+					@openDiscountsPopup="openDiscountsPopup" :status="status" @toDetail="toDetail" />
+			</view>
 		</view>
-		<view class="footer">
-			<view class="batch">
+		<view class="footer" v-if="!batch">
+			<view class="batch" @click="batchDiscount">
 				批量打折
 			</view>
 			<button class="btn-1">上架平台商品</button>
 		</view>
-		
+		<view class="footer" v-else>
+			<view class="batch" @click="batchDiscount">
+				<radio @click="value=!value" :checked='value' style="transform:scale(0.7)" color="#f83224"
+					activeBackgroundColor="#f83224" backgroundColor="#f83224"></radio>
+				全选
+			</view>
+			<button class="btn" @click="wantDiscount">我要打折</button>
+		</view>
+		<!-- 筛选弹窗 -->
 		<ScreenPopup :show="show" @close="close" :follow='follow' />
+		<!-- 筛选弹窗 -->
+
+		<!-- 打折弹窗 -->
+		<DiscountsPopup :show="discountsShow" :goodsInformation="goodsInformation" @close="closeDiscountsPopup" />
+		<!-- 打折弹窗 -->
+
+		<!-- 批量打折 -->
+		<BatchDiscountPopup :show="batchPopup" @close = 'closeDiscountsPopup' />
 	</view>
 </template>
 
 <script>
 	import GoodsInformation from '../components/goodsInformation.vue'
 	import ScreenPopup from './component/screenPopup.vue'
+	import DiscountsPopup from './component/discountsPopup.vue'
+	import BatchDiscountPopup from './component/batchDiscountPopup.vue'
 	export default {
 		components: {
 			GoodsInformation,
-			ScreenPopup
+			ScreenPopup,
+			DiscountsPopup,
+			BatchDiscountPopup
 		},
 		data() {
 			return {
 				follow: 1,
 				status: "1",
-				show:false
+				show: false,
+				discountsShow: false,
+				goodsInformation: {},
+				batch: false,
+				value: false,
+				batchPopup:false
 			}
 		},
 		computed: {
@@ -59,15 +95,42 @@
 			},
 		},
 		methods: {
+			//切换横向tab栏
 			tabSwitch(num) {
 				this.follow = num
 			},
-			openPopup(){
+			//打开筛选弹窗
+			openPopup() {
 				this.show = true
 			},
+			//关闭筛选弹窗
 			close(num) {
-					this.show = false
-					this.follow = num
+				this.show = false
+				this.follow = num
+				
+			},
+			//批量打折
+			batchDiscount() {
+				this.batch = !this.batch;
+
+				uni.setNavigationBarTitle({
+					title: "批量打折"
+				})
+			},
+			//打开我要打折窗口
+			wantDiscount(){
+				this.batchPopup = true
+			},
+			
+			//关闭折扣弹窗
+			closeDiscountsPopup() {
+				this.discountsShow = false
+				this.batchPopup = false
+			},
+			//打开折扣弹窗
+			openDiscountsPopup(value) {
+				this.goodsInformation = value
+				this.discountsShow = true
 			},
 			toDetail() {
 				uni.navigateTo({
@@ -77,7 +140,7 @@
 		},
 		mounted() {
 			uni.setNavigationBarTitle({
-				title: "我的供应链商品"
+				title: "商品管理"
 			})
 		}
 	}
@@ -88,22 +151,26 @@
 		background-color: #fff;
 		padding: 10rpx 24rpx;
 		z-index: 20174;
-		.search{
+
+		.search {
 			display: flex;
 			align-items: center;
-			.screen{
+
+			.screen {
 				display: flex;
 				align-items: center;
 				font-size: 26rpx;
 				color: #333;
 				margin-left: 20rpx;
-				.screen-icon{
+
+				.screen-icon {
 					width: 24rpx;
 					height: 24rpx;
 					margin-left: 5rpx;
 				}
 			}
 		}
+
 		.top-tab {
 			margin-top: 10rpx;
 			padding: 0 20rpx;
@@ -142,6 +209,18 @@
 
 	.page {
 		padding: 20rpx 24rpx;
+		background-color: #fff;
+		height: 85vh;
+
+		.list {
+			display: flex;
+			flex-wrap: nowrap;
+			align-items: center;
+
+			.radio {
+				margin-right: 20rpx;
+			}
+		}
 	}
 
 	.footer {
@@ -153,11 +232,15 @@
 		background-color: #fff;
 		width: 93%;
 		padding: 16rpx 24rpx 70rpx 24rpx;
-		.batch{
+
+		.batch {
 			color: #333;
 			font-size: 28rpx;
 			margin-right: 50rpx;
+			display: flex;
+			align-items: center;
 		}
+
 		.btn-1 {
 			width: 236rpx;
 			height: 76rpx;
@@ -169,6 +252,7 @@
 			margin: 0;
 			font-size: 30rpx;
 		}
+
 		.btn {
 			width: 236rpx;
 			height: 76rpx;

pageD/commodityManage/component/batchDiscountPopup.vue

@@ -0,0 +1,130 @@
+<template>
+	<u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
+		<view class="content">
+			<view class="goods-information">
+				我要打折
+			</view>
+			<view class="discount">
+				<view class="">
+					折扣
+				</view>
+				<u--input inputAlign="right" placeholder="打8折请输入80" border="none" type="number" v-model="value"
+					@change="change" maxlength="2"></u--input>
+				<view style="margin-left: 10rpx;">
+					%
+				</view>
+			</view>
+			<view class="text-list" v-if=" JSON.stringify(goodsInformation)!='{}'&&value">
+				<view class="_text-1">
+					<text>折扣价</text>
+					<text>￥{{discountPrice}}</text>
+				</view>
+				<view class="_text-1">
+					<text>优惠</text>
+					<text style="color: #f83224;">-￥{{preferential}}</text>
+				</view>
+			</view>
+			<button class="btn">确定</button>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				typeof: Boolean,
+				default: false
+			},
+			goodsInformation: {
+				typeof: Object,
+				default: {}
+			}
+		},
+		data() {
+			return {
+				value: "",
+				discountPrice: 0,
+				preferential: 0
+			}
+		},
+		methods: {
+			close() {
+				this.$emit('close')
+			},
+			change(e) {
+				console.log(e)
+				this.discountPrice = this.goodsInformation.price * (this.value * 0.01)
+				this.preferential = this.goodsInformation.price - this.discountPrice
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		padding: 30rpx 24rpx;
+
+		.goods-information {
+			display: flex;
+			justify-content: center;
+			font-weight: 600;
+
+			 .goods-img {
+				width: 104rpx;
+				height: 104rpx;
+				border-radius: 10rpx;
+				margin-right: 20rpx;
+			}
+
+			.goods-right {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-around;
+
+				.title {
+					font-size: 28rpx;
+					color: #333;
+				}
+
+				.price {
+					font-size: 28rpx;
+					opacity: 0.8;
+					color: #333;
+				}
+			}
+		}
+
+		.discount {
+			display: flex;
+			padding: 36rpx;
+			border-radius: 10rpx;
+			border: 2rpx solid #f83224;
+			margin-top: 56rpx;
+			font-size: 30rpx;
+			color: #222;
+			align-items: center;
+			font-weight: 600;
+		}
+
+		.text-list {
+			border-top: 2rpx solid rgba(151, 151, 151, .1);
+			margin-top: 40rpx;
+
+			._text-1 {
+				display: flex;
+				justify-content: space-between;
+				height: 100rpx;
+				align-items: center;
+				font-size: 28rpx;
+			}
+		}
+
+		.btn {
+			background-color: #f83224;
+			border-radius: 44rpx;
+			color: #fff;
+			margin-top: 100rpx;
+		}
+	}
+</style>

pageD/commodityManage/component/discountsPopup.vue

@@ -0,0 +1,137 @@
+<template>
+	<u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
+		<view class="content">
+			<view class="goods-information">
+				<image class="goods-img" :src="goodsInformation.url" mode=""></image>
+				<view class="goods-right">
+					<view class="title">
+						{{goodsInformation.title}}
+					</view>
+					<view class="price">
+						￥{{goodsInformation.price}}
+					</view>
+				</view>
+			</view>
+			<view class="discount">
+				<view class="">
+					折扣
+				</view>
+				<u--input inputAlign="right" placeholder="打8折请输入80" border="none" type="number" v-model="value"
+					@change="change" maxlength="2"></u--input>
+				<view style="margin-left: 10rpx;">
+					%
+				</view>
+			</view>
+			<view class="text-list" v-if="value">
+				<view class="_text-1">
+					<text>折扣价</text>
+					<text>￥{{discountPrice}}</text>
+				</view>
+				<view class="_text-1">
+					<text>优惠</text>
+					<text style="color: #f83224;">-￥{{preferential}}</text>
+				</view>
+			</view>
+			<button class="btn">确定</button>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				typeof: Boolean,
+				default: false
+			},
+			goodsInformation: {
+				typeof: Object,
+				default: {}
+			}
+		},
+		data() {
+			return {
+				value: "",
+				discountPrice: 0,
+				preferential: 0
+			}
+		},
+		methods: {
+			close() {
+				this.$emit('close')
+			},
+			change(e) {
+				console.log(e)
+				this.discountPrice = this.goodsInformation.price * (this.value * 0.01)
+				this.preferential = this.goodsInformation.price - this.discountPrice
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		padding: 30rpx 24rpx;
+
+		.goods-information {
+			display: flex;
+			justify-content: flex-start;
+
+			.goods-img {
+				width: 104rpx;
+				height: 104rpx;
+				border-radius: 10rpx;
+				margin-right: 20rpx;
+			}
+
+			.goods-right {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-around;
+
+				.title {
+					font-size: 28rpx;
+					color: #333;
+				}
+
+				.price {
+					font-size: 28rpx;
+					opacity: 0.8;
+					color: #333;
+				}
+			}
+		}
+
+		.discount {
+			display: flex;
+			padding: 36rpx;
+			border-radius: 10rpx;
+			border: 2rpx solid #f83224;
+			margin-top: 56rpx;
+			font-size: 30rpx;
+			color: #222;
+			align-items: center;
+			font-weight: 600;
+		}
+
+		.text-list {
+			border-top: 2rpx solid rgba(151, 151, 151, .1);
+			margin-top: 40rpx;
+
+			._text-1 {
+				display: flex;
+				justify-content: space-between;
+				height: 100rpx;
+				align-items: center;
+				font-size: 28rpx;
+			}
+		}
+
+		.btn {
+			background-color: #f83224;
+			border-radius: 44rpx;
+			color: #fff;
+			margin-top: 30rpx;
+		}
+	}
+</style>

pageD/components/goodsInformation.vue

@@ -17,12 +17,20 @@
 			</view>
 			<view class="content-right">
 				<view class="goods-title">
-					La Chapelle Sport拉夏贝尔高级感收…
+					<view class="_label" v-if="!productAndCommodity">
+						供应商
+					</view>
+					<view class="title">
+						La Chapelle Sport拉夏贝尔高级感收…
+					</view>
 				</view>
-				<view class="inventory">
+				<view class="inventory" v-if="productAndCommodity">
 					<text>库存：</text>
 					<text>222</text>
 				</view>
+				<view class="inventory" v-else>
+					咖啡伴侣｜小巧便携｜膳食纤维
+				</view>
 
 				<view class="commodity-price">
 					<text style="font-size: 20rpx;">￥</text>
@@ -31,15 +39,15 @@
 				</view>
 			</view>
 		</view>
-		<view class="btn-list" v-if="productAndCommodity=='product'">
+		<view class="btn-list" v-if="!batch&&productAndCommodity=='product'">
 			<button class="btn-1" v-if="status == 1">下架商品</button>
 			<button class="btn-1" v-if="status == 2">查看详情</button>
 			<button class="btn-2" v-if="status == 3">重新提交</button>
 			<button class="btn-1" v-if="status == 4">编辑</button>
 			<button class="btn-1" v-if="status == 4">上架商品</button>
 		</view>
-		<view class="btn-list" v-else>
-			<button class="btn-1" v-if="status == 1">我要打折</button>
+		<view class="btn-list" v-if="!batch&&productAndCommodity == 'commodity'">
+			<button class="btn-1" v-if="status == 1" @click.stop="$emit('openDiscountsPopup',obj)">我要打折</button>
 			<button class="btn-1" v-if="status == 1">下架</button>
 			<button class="btn-1" v-if="status == 4">删除</button>
 			<button class="btn-1" v-if="status == 4">商家</button>
@@ -55,28 +63,40 @@
 				typeof: String,
 				default: ""
 			},
-			productAndCommodity:{
+			productAndCommodity: {
 				typeof: String,
-				default:""
+				default: ""
+			},
+			batch: {
+				typeof: Boolean,
+				default: false
 			}
 		},
 		data() {
-			return {}
+			return {
+				obj: {
+					url: 'https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif',
+					title: "La Chapelle Sport拉夏贝尔高…",
+					price: "75.00"
+				}
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.detail {
-		padding: 24rpx 20rpx;
 		background-color: #fff;
 		border-radius: 16rpx;
+		margin: 10rpx 0;
+		width: 96%;
 
 		.content {
 			display: flex;
 			position: relative;
 			flex-shrink: 0;
 			justify-content: flex-start;
+
 			.content-img {
 				width: 164rpx;
 				height: 164rpx;
@@ -117,6 +137,30 @@
 					text-overflow: ellipsis;
 					white-space: nowrap;
 					word-break: break-word;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+
+					.title {
+						width: 75%;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						word-break: break-word;
+					}
+
+					._label {
+						color: #fff;
+						background-color: #FFB111;
+						width: 72rpx;
+						height: 32rpx;
+						text-align: center;
+						line-height: 32rpx;
+						height: 32rpx;
+						border-radius: 4rpx;
+						font-size: 20rpx;
+						margin-right: 10rpx;
+					}
 				}
 
 				.inventory {

pageD/platformProducts/platformProducts.vue

@@ -0,0 +1,42 @@
+<template>
+	<view class="page">
+		<u--input style="background: #f4f4f4;" placeholder="搜索商品名称" shape="circle" prefixIcon="search"
+			prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+		<view class="content-list">
+			<GoodsInformation status="1"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	import GoodsInformation from '../components/goodsInformation.vue'
+	export default {
+		components:{
+			GoodsInformation,
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "平台商品库"
+			});
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		background-color: #fff;
+		padding: 20rpx 24rpx;
+
+		::v-deep .u-input {
+			background-color: #f4f4f4;
+		}
+	}
+</style>

pageD/settleIn/settleIn.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="page">
+		<view class="content">
+			<u--form labelPosition="left" :model="model1" ref="uForm" labelWidth='100'>
+				<u-form-item label="姓名" prop="userInfo.name" borderBottom ref="item1">
+					<u--input inputAlign="right" v-model="model1.userInfo.name" placeholder="请输入真实姓名"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item label="身份证号" prop="userInfo.name" borderBottom ref="item1">
+					<u--input inputAlign="right" v-model="model1.userInfo.name" type="idcard" placeholder="请输入您的身份证"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item label="银行卡号" prop="userInfo.name" borderBottom ref="item1">
+					<u--input inputAlign="right" v-model="model1.userInfo.name" type='number' placeholder="请输入您的银行卡号"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item label="手机号" prop="userInfo.name" borderBottom ref="item1">
+					<u--input inputAlign="right" v-model="model1.userInfo.name" type='number' placeholder="请输入手机号"
+						border="none"></u--input>
+				</u-form-item>
+				<u-form-item label="验证码" prop="userInfo.name" borderBottom ref="item1">
+					<view style="display: flex;align-items: center;">
+						<u--input inputAlign="right" v-model="model1.userInfo.name" placeholder="请输入短信验证码"
+							border="none"></u--input>
+						<view style="color: #f83224;font-weight: 600; margin-left: 50rpx;">
+							获取验证码
+						</view>
+					</view>
+				</u-form-item>
+			</u--form>
+		</view>
+		
+		<view class="bottom-1">
+			 <u-radio-group
+			    v-model="radiovalue1"
+			    placement="column"
+			    @change="groupChange"
+			  >
+			    <u-radio
+			      name="name"
+			      @change="radioChange"
+				  activeColor="red"
+			    >
+			    </u-radio>
+			  </u-radio-group>
+			 我已阅读并同意<text style="color: #f83224;">《用户服务协议》</text>和 <text style="color: #f83224;">《隐私政策》</text>
+		</view>
+		<button class="btn">开始人脸识别验证</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				model1: {
+					userInfo: {
+						name: "",
+					}
+				},
+				
+				radiovalue1:""
+			}
+		},
+		methods: {
+			radioChange(){
+				console.log(11)
+				this.value = !this.value
+			},
+			groupChange(e){
+				console.log(e)
+			}
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "团长入驻"
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+
+		.content {
+			padding: 0 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+		}
+		.bottom-1{
+			font-size: 20rpx;
+			margin-top: 68rpx;
+			color: #555;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			width: 70%;
+			.radio{
+				width: 24rpx;
+				height: 24rpx;
+			}
+		}
+		.btn{
+			color: #fff;
+			background-color: #f83224;
+			border-radius: 44rpx;
+			margin-top: 28rpx;
+			height: 88rpx;
+			font-size: 32rpx;
+		}
+	}
+</style>

pages.json

@@ -513,6 +513,20 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "platformProducts/platformProducts",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "settleIn/settleIn",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]
@@ -526,8 +540,7 @@
 	},
 	"uniIdRouter": {},
 	"tabBar": {
-
-		"color": "#333333",
+		"color": "#222",
 		"selectedColor": "#F83224",
 		// "list": [
 		// 	{

pages/mine/component/personalFunction.vue

@@ -3,7 +3,7 @@
 	<view class="team">
 		<text class="team-title">个人功能</text>
 		<view class="function-team">
-			<view class="icon-center">
+			<view class="icon-center" @click="toSetleIn">
 				<image class="form-icon" src="../../../static/mine/322.png" mode=""></image>
 				<view class="characters">成为团长</view>
 			</view>
@@ -11,8 +11,8 @@
 				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
 				<view class="characters">联系客服</view>
 			</view>
-			<view class="icon-center">
-				<image class="form-icon" src="../../../static/mine/321.png" mode="" @click="toSetup"></image>
+			<view class="icon-center" @click="toSetup">
+				<image class="form-icon" src="../../../static/mine/321.png" mode="" ></image>
 				<view class="characters">账号设置</view>
 			</view>
 		</view>
@@ -32,6 +32,11 @@
 				uni.navigateTo({
 					url:"/pageC/accountSetup/accountSetup"
 				})
+			},
+			toSetleIn(){
+				uni.navigateTo({
+					url:"/pageD/settleIn/settleIn"
+				})
 			}
 		}
 	}

pages/mine/component/teamFunction.vue

@@ -3,7 +3,7 @@
 	<view class="team">
 		<text class="team-title">{{i18n.leaderunction}}</text>
 		<view class="function-team">
-			<view class="icon-center">
+			<view class="icon-center" @click="toNextPage('/pageD/platformProducts/platformProducts')">
 				<image class="form-icon" src="../../../static/mine/319.png" mode=""></image>
 				<view class="characters">{{i18n.platform}}</view>
 			</view>
@@ -31,8 +31,8 @@
 				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
 				<view class="characters">{{i18n.pontact}}</view>
 			</view>
-			<view class="icon-center">
-				<image class="form-icon" src="../../../static/mine/321.png" mode="" @click="toNextPage('/pageC/accountSetup/accountSetup')"></image>
+			<view class="icon-center"  @click="toNextPage('/pageC/accountSetup/accountSetup')">
+				<image class="form-icon" src="../../../static/mine/321.png" mode=""></image>
 				<view class="characters">{{i18n.accountSettings}}</view>
 			</view>
 		</view>

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

@@ -82,7 +82,9 @@
         "index",
         "supplyChainGoods/supplyChainGoods",
         "productDetails/productDetails",
-        "commodityManage/commodityManage"
+        "commodityManage/commodityManage",
+        "platformProducts/platformProducts",
+        "settleIn/settleIn"
       ]
     }
   ],
@@ -93,7 +95,7 @@
     "backgroundColor": "#222"
   },
   "tabBar": {
-    "color": "#333333",
+    "color": "#222",
     "selectedColor": "#F83224",
     "custom": true,
     "list": [

unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/kj-tabbar/kj-tabbar"],{
 
-/***/ 700:
+/***/ 716:
 /*!************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/components/kj-tabbar/kj-tabbar.vue ***!
   \************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _kj_tabbar_vue_vue_type_template_id_4fc1e144___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./kj-tabbar.vue?vue&type=template&id=4fc1e144& */ 701);
-/* harmony import */ var _kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./kj-tabbar.vue?vue&type=script&lang=js& */ 703);
+/* harmony import */ var _kj_tabbar_vue_vue_type_template_id_4fc1e144___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./kj-tabbar.vue?vue&type=template&id=4fc1e144& */ 717);
+/* harmony import */ var _kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./kj-tabbar.vue?vue&type=script&lang=js& */ 719);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -39,7 +39,7 @@ component.options.__file = "components/kj-tabbar/kj-tabbar.vue"
 
 /***/ }),
 
-/***/ 701:
+/***/ 717:
 /*!*******************************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/components/kj-tabbar/kj-tabbar.vue?vue&type=template&id=4fc1e144& ***!
   \*******************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "components/kj-tabbar/kj-tabbar.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_template_id_4fc1e144___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./kj-tabbar.vue?vue&type=template&id=4fc1e144& */ 702);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_template_id_4fc1e144___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./kj-tabbar.vue?vue&type=template&id=4fc1e144& */ 718);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_template_id_4fc1e144___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_template_id_4fc1e144___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 702:
+/***/ 718:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/components/kj-tabbar/kj-tabbar.vue?vue&type=template&id=4fc1e144& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -78,10 +78,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar/u-tabbar.vue */ 1061))
+      return Promise.all(/*! import() | uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar/u-tabbar.vue */ 1091))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 1069))
+      return Promise.all(/*! import() | uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 1099))
     },
   }
 } catch (e) {
@@ -114,7 +114,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 703:
+/***/ 719:
 /*!*************************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/components/kj-tabbar/kj-tabbar.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************/
@@ -123,14 +123,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./kj-tabbar.vue?vue&type=script&lang=js& */ 704);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./kj-tabbar.vue?vue&type=script&lang=js& */ 720);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_kj_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 704:
+/***/ 720:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/components/kj-tabbar/kj-tabbar.vue?vue&type=script&lang=js& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -144,7 +144,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _vuex = __webpack_require__(/*! vuex */ 705);
+var _vuex = __webpack_require__(/*! vuex */ 721);
 //
 //
 //
@@ -309,7 +309,7 @@ exports.default = _default;
     'components/kj-tabbar/kj-tabbar-create-component',
     {
         'components/kj-tabbar/kj-tabbar-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(700))
+            __webpack_require__('2')['createComponent'](__webpack_require__(716))
         })
     },
     [['components/kj-tabbar/kj-tabbar-create-component']]

unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 651))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
     },
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 757))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 773))
     },
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 765))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 781))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 771))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 787))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 783))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 799))
     },
     uNumberBox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 791))
+      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 807))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 667))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 683))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 700))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 651))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 659))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 675))
     },
     uBadge: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 734))
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 750))
     },
     uLineProgress: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 742))
+      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 758))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 692))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 708))
     },
     kjFlow: function () {
-      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 750))
+      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 766))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 700))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 651))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 659))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 675))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 667))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 683))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 676))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 692))
     },
     uSwiper: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 684))
+      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 700))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 692))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 708))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 700))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 757))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 773))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 783))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 799))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 700))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
     },
   }
 } catch (e) {
@@ -166,22 +166,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 706));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 722));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 713));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 729));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 720));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 736));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 727));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 743));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 651))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 676))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 692))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 700))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
     },
   }
 } catch (e) {

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

@@ -15,12 +15,11 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    },
-    "condition": false
+    }
   },
   "compileType": "miniprogram",
   "libVersion": "3.4.3",
-  "appid": "touristappid",
+  "appid": "wx717c239c464eebbd",
   "projectname": "wx",
   "condition": {
     "search": {