diff --git a/mallplusui-uniapp-app/.hbuilderx/launch.json b/mallplusui-uniapp-app/.hbuilderx/launch.json
new file mode 100644
index 0000000..582561b
--- /dev/null
+++ b/mallplusui-uniapp-app/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/mallplusui-uniapp-app/App.vue b/mallplusui-uniapp-app/App.vue
index 8c9547a..8651545 100644
--- a/mallplusui-uniapp-app/App.vue
+++ b/mallplusui-uniapp-app/App.vue
@@ -418,6 +418,9 @@
 	video {
 		box-sizing: border-box;
 	}
+	 html,body,#app{
+	    height: 100%;
+	  }
 	/* 骨架屏替代方案 */
 	.Skeleton {
 		background: #f3f3f3;
diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index 31f2988..e13126f 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -77,6 +77,8 @@ export default {
 		memberTagList: 'single/user/memberTag/list', // 商户列表
 		addStoreComment: 'single/store/addStoreComment', // 商户addStoreComment
 		memberBlanceLogList: 'single/user/memberBlanceLog/list',
+		mesList: 'sys/message/list',// GET 参数为空，获取用户消息通知列表，（需要先判断用户是已经登录状态）
+		mesInfo: 'sys/message/info',//  GET  参数为 id:消息ID，获取消息详情 
 	},
 	build: {
 		getBuildNoticeByPage: 'single/build/getBuildNoticeByPage', // 所有社区和房间
diff --git a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
index 5b3fb74..064b2f4 100644
--- a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
+++ b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
@@ -56,10 +56,10 @@
 		},
 		methods: {
 			async acceptCoupon(item) {
-				this.types =!this.types
-					uni.showLoading({
-						title: '请稍后'
-					});
+				this.types = !this.types
+				uni.showLoading({
+					title: '请稍后'
+				});
 
 				let params = {
 					couponId: item.id
@@ -68,11 +68,17 @@
 				console.log(data);
 				if (data) {
 					this.$api.msg(data);
+					this.clickSubMethod(item)
+
 				}
 				uni.hideLoading();
 
 			},
-			async useCoupon(item){
+			clickSubMethod(vel) {
+				console.log('clickSubMethod')
+				this.$emit('callParentMethod', JSON.stringify(vel))
+			},
+			async useCoupon(item) {
 				uni.showLoading({
 					title: '请稍后'
 				});
diff --git a/mallplusui-uniapp-app/pages.json b/mallplusui-uniapp-app/pages.json
index 1a5b1f2..395e6b8 100644
--- a/mallplusui-uniapp-app/pages.json
+++ b/mallplusui-uniapp-app/pages.json
@@ -38,6 +38,21 @@
 					}
 				}
 			}
+		}, {
+			"path": "pages/index/messageList",
+			"style": {
+				// "enablePullDownRefresh": true,
+				"navigationBarTitleText": "消息列表"
+
+			}
+		}, 
+		{
+			"path": "pages/index/messageDetail",
+			"style": {
+				// "enablePullDownRefresh": true,
+				"navigationBarTitleText": "消息详情"
+		
+			}
 		}, {
 			"path": "pages/search/search",
 			"style": {
@@ -60,7 +75,7 @@
 					}
 				}
 			}
-		}, 	{
+		}, {
 			"path": "pages/index/lease",
 			"style": {
 				"navigationBarTitleText": "农机租赁"
@@ -813,10 +828,10 @@
 				"text": "分类"
 			},
 			{
-				"pagePath": "pages/index/nearbyBusiness",
-				"iconPath": "static/fujin.png",
-				"selectedIconPath": "static/fujin_.png",
-				"text": "附近商家"
+				"pagePath": "pages/index/messageList",
+				"iconPath": "static/tab-message_.png",
+				"selectedIconPath": "static/tab-message.png",
+				"text": "消息"
 			},
 			{
 				"pagePath": "pages/cart/cart",
@@ -828,7 +843,7 @@
 				"pagePath": "pages/index/user",
 				"iconPath": "static/tab-my.png",
 				"selectedIconPath": "static/tab-my-current.png",
-				"text": "我的"
+				"text": "我的云链"
 			}
 		]
 	},
diff --git a/mallplusui-uniapp-app/pages/category/category.vue b/mallplusui-uniapp-app/pages/category/category.vue
index 2056265..1e9c453 100644
--- a/mallplusui-uniapp-app/pages/category/category.vue
+++ b/mallplusui-uniapp-app/pages/category/category.vue
@@ -1,12 +1,17 @@
 <template>
 	<view class="content" style="display: flex;flex-direction: column;">
 		<!-- #ifdef MP-WEIXIN -->
-		<view style="width: 100%;position: fixed;top: 0;z-index: 99;background: #FFFFFF;" :style="{'height':statusBarHeight+'px' }"></view>
-		<view class="getPosition" style="height: 90upx;position: fixed;z-index: 99;width: 100%" :style="{'top':statusBarHeight+'px' }">
+		<view style="width: 100%;position: fixed;top: 0;z-index: 99;background: #FFFFFF;"
+			:style="{'height':statusBarHeight+'px' }"></view>
+		<view class="getPosition" style="height: 90upx;position: fixed;z-index: 99;width: 100%"
+			:style="{'top':statusBarHeight+'px' }">
 			<text>分类</text>
 		</view>
-		<view class="" @click="search()" style="background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;" :style="[{'margin-top': statusBarHeight+45+'px'}]">
-			<input class="" type="text" value="" placeholder="输入关键字搜索" style="font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;" />
+		<view class="" @click="search()"
+			style="background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;"
+			:style="[{'margin-top': statusBarHeight+45+'px'}]">
+			<input class="" type="text" value="" placeholder="输入关键字搜索"
+				style="font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;" />
 		</view>
 		<!-- 占位 -->
 		<!-- <view class="" :style="[{'height': statusBarHeight+45+'px'}]"></view> -->
@@ -17,19 +22,21 @@
 				<input type="text" value="" placeholder="输入关键字搜索" class="input" style="font-size: 28upx;text-align: center;"/>
 			</view>
 		</view> -->
-		<view class="" :style="{height: height + 'px'}" style="display: flex;flex-direction: row;">
+		<view class="" style="display: flex;flex-direction: row;height: 100%;">
 			<scroll-view scroll-y class="left-aside">
-				<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{ active: item.id === currentId }" @click="tabtap(item)">{{ item.name }}</view>
+				<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{ active: item.id === currentId }"
+					@click="tabtap(item)">{{ item.name }}</view>
 			</scroll-view>
-			<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop">
+			<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll"
+				:scroll-top="tabScrollTop">
 				<view v-for="item in slist" :key="item.id" class="s-list" :id="'main-' + item.id">
 					<text class="s-item">{{ item.name }}</text>
-										<view class="t-list" > 
-											<view  v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
-												<image :src="titem.pic" @click="navToDetailPage(titem)"></image>
-												<text @click="navToDetailPage(titem)">{{titem.name}}</text>
-											</view>
-										</view>
+					<view class="t-list">
+						<view v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
+							<image :src="titem.pic" @click="navToDetailPage(titem)"></image>
+							<text  @click="navToDetailPage(titem)">{{titem.name}}</text>
+						</view>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -39,200 +46,217 @@
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-export default {
-    components: {
-		mallplusCopyright
-	},
-	data() {
-		return {
-			sizeCalcState: false,
-			tabScrollTop: 0,
-			currentId: 1,
-			flist: [],
-			slist: [],
-			tlist: [],
-
-			height: '',
-			statusBarHeight: '',
-		};
-	},
-	onLoad() {
-		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
-		this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight+80)
-
-		this.loadData();
-	},
-	methods: {
-		async loadData() {
-			
-			let list = this.$db.get('categoryList' )
-			if(!list){
-            			 let params = {};
-                                         list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
-                                         this.$db.set('categoryList', list)
-            			}
-
-			if(list){
-				list.forEach(item => {
-				
-					if (item.level==0) {
-						this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
-					} else if (item.level==1) {
-						this.slist.push(item); //没有价格的是2级分类
-					} else {
-						this.tlist.push(item); //3级分类
-					}
-				});
-			}
-			
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	export default {
+		components: {
+			mallplusCopyright
 		},
-		//一级分类点击
-		tabtap(item) {
-			if (!this.sizeCalcState) {
-				this.calcSize();
-			}
+		data() {
+			return {
+				sizeCalcState: false,
+				tabScrollTop: 0,
+				currentId: 1,
+				flist: [],
+				slist: [],
+				tlist: [],
 
-			this.currentId = item.id;
-			console.log(item.id);
-			let index = this.slist.findIndex(sitem => sitem.pid === item.id);
-			if(index>=0){
-			 this.tabScrollTop = this.slist[index].top;
-			}
-
-		},
-		//右侧栏滚动
-		asideScroll(e) {
-			if (!this.sizeCalcState) {
-				this.calcSize();
-			}
-			let scrollTop = e.detail.scrollTop;
-			let tabs = this.slist.filter(item => item.top <= scrollTop).reverse();
-			if (tabs.length > 0) {
-				this.currentId = tabs[0].pid;
-			}
-		},
-		//计算右侧栏每个tab的高度等信息
-		calcSize() {
-			let h = 0;
-			this.slist.forEach(item => {
-				let view = uni.createSelectorQuery().select('#main-' + item.id);
-				view.fields(
-					{
-						size: true
-					},
-					data => {
-						item.top = h;
-						h += data.height;
-						item.bottom = h;
-					}
-				).exec();
-			});
-			this.sizeCalcState = true;
+				height: '',
+				statusBarHeight: '',
+			};
 		},
-		navToList(sid) {
-			uni.navigateTo({
-				url: `../../pagesA/product/list?sid=${sid}`
-			});
+		onLoad() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+			this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight + 80)
+			console.log("height", this.height);
+			this.loadData();
 		},
-		//详情页
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `../../pagesA/product/product?id=${id}`
-			});
-		},
-	}
-};
+		methods: {
+			async loadData() {
+
+				let list = this.$db.get('categoryList')
+				if (!list) {
+					let params = {};
+					list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
+					this.$db.set('categoryList', list)
+				}
+
+				if (list) {
+					list.forEach(item => {
+
+						if (item.level == 0) {
+							this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
+						} else if (item.level == 1) {
+							this.slist.push(item); //没有价格的是2级分类
+						} else {
+							this.tlist.push(item); //3级分类
+						}
+					});
+				}
+
+			},
+			//一级分类点击
+			tabtap(item) {
+				if (!this.sizeCalcState) {
+					this.calcSize();
+				}
+
+				this.currentId = item.id;
+				console.log(item.id);
+				let index = this.slist.findIndex(sitem => sitem.pid === item.id);
+				if (index >= 0) {
+					this.tabScrollTop = this.slist[index].top;
+				}
+
+			},
+			//右侧栏滚动
+			asideScroll(e) {
+				if (!this.sizeCalcState) {
+					this.calcSize();
+				}
+				let scrollTop = e.detail.scrollTop;
+				let tabs = this.slist.filter(item => item.top <= scrollTop).reverse();
+				if (tabs.length > 0) {
+					this.currentId = tabs[0].pid;
+				}
+			},
+			//计算右侧栏每个tab的高度等信息
+			calcSize() {
+				let h = 0;
+				this.slist.forEach(item => {
+					let view = uni.createSelectorQuery().select('#main-' + item.id);
+					view.fields({
+							size: true
+						},
+						data => {
+							item.top = h;
+							h += data.height;
+							item.bottom = h;
+						}
+					).exec();
+				});
+				this.sizeCalcState = true;
+			},
+			navToList(sid) {
+				uni.navigateTo({
+					url: `../../pagesA/product/list?sid=${sid}`
+				});
+			},
+			//详情页
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+		}
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	height: 100%;
-	background-color: #f8f8f8;
-}
-
-.content {
-	display: flex;
-}
-.left-aside {
-	flex-shrink: 0;
-	width: 200upx;
-	height: 100%;
-	background-color: #fff;
-}
-.f-item {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 100%;
-	height: 100upx;
-	font-size: 28upx;
-	color: $font-color-base;
-	position: relative;
-	&.active {
-		color: $base-color;
-		background: #f8f8f8;
-		&:before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			height: 36upx;
-			width: 8upx;
-			background-color: $base-color;
-			border-radius: 0 4px 4px 0;
-			opacity: 0.8;
+	page,
+	.content {
+		height: 100%;
+		background-color: #f8f8f8;
+	}
+
+	.content {
+		display: flex;
+	}
+
+	.left-aside {
+		flex-shrink: 0;
+		width: 200upx;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.f-item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100upx;
+		font-size: 28upx;
+		color: $font-color-base;
+		position: relative;
+
+		&.active {
+			color: $base-color;
+			background: #f8f8f8;
+
+			&:before {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				height: 36upx;
+				width: 8upx;
+				background-color: $base-color;
+				border-radius: 0 4px 4px 0;
+				opacity: 0.8;
+			}
 		}
 	}
-}
-
-.right-aside {
-	flex: 1;
-	overflow: hidden;
-	padding-left: 20upx;
-}
-.s-item {
-	display: flex;
-	align-items: center;
-	height: 70upx;
-	padding-top: 8upx;
-	font-size: 28upx;
-	color: $font-color-dark;
-}
-.t-list {
-	display: flex;
-	flex-wrap: wrap;
-	width: 100%;
-	background: #fff;
-	padding-top: 12upx;
-	&:after {
-		content: '';
-		flex: 99;
-		height: 0;
+
+	.right-aside {
+		flex: 1;
+		overflow: hidden;
+		padding-left: 20upx;
 	}
-}
-.t-item {
-	flex-shrink: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-	width: 176upx;
-	font-size: 26upx;
-	color: #666;
-	padding-bottom: 20upx;
-
-	image {
-		width: 140upx;
-		height: 140upx;
+
+	.s-item {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		padding-top: 8upx;
+		font-size: 28upx;
+		color: $font-color-dark;
 	}
-}
-.getPosition{
+
+	.t-list {
+		display: flex;
+		flex-wrap: wrap;
+		width: 100%;
+		background: #fff;
+		padding-top: 12upx;
+
+		&:after {
+			content: '';
+			flex: 99;
+			height: 0;
+		}
+	}
+
+	.t-item {
+		flex-shrink: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		width: 176upx;
+		font-size: 26upx;
+		color: #666;
+		padding-bottom: 20upx;
+
+		image {
+			width: 130upx;
+			height: 130upx;
+		}
+		text{
+			padding-left: 5px;
+			padding-right: 5px;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+		}
+	}
+
+	.getPosition {
 		height: 100upx;
 		display: flex;
 		justify-content: center;
diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue
index 3e85e0a..1d9d12b 100644
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@@ -28,10 +28,10 @@
 				<image src="/static/shwz_icon.png"></image>
 				<text>生活物资</text>
 			</view>
-			<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
+			<!-- <view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
 				<image src="/static/temp/fabfa-dropbox.png"></image>
 				<text>拼团特价</text>
-			</view>
+			</view> -->
 			<view class="cate-item" @click="navToTabPage('/pagesU/notice/subjectList')">
 				<image src="/static/njfw_icon.png"></image>
 				<text>农机服务</text>
@@ -65,7 +65,7 @@
 			</view> -->
 
 		<!-- 秒杀楼层 https://s.click.taobao.com/Wds7c1w -->
-		<view class="seckill-section m-t"
+		<!-- <view class="seckill-section m-t"
 			v-if="homeFlashPromotion.flashSessionInfoList && homeFlashPromotion.flashSessionInfoList.length > 0">
 			<view class="s-header">
 				<view class="" style="width: 80%;display: flex;flex-direction: row;align-items: center;">
@@ -93,7 +93,7 @@
 					</view>
 				</scroll-view>
 			</view>
-		</view>
+		</view> -->
 		<!-- <view class="f-header m-t" @click="navToTabPage('../../pagesC/store/storeList')">
 				<image src="/static/temp/nav1.png"></image>
 				<view class="tit-box">
@@ -112,9 +112,10 @@
 			</view> -->
 
 		<!-- 优惠券  https://s.click.taobao.com/OPh3c1w -->
-		<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#ff0000"></coupon>
+		<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#ff0000" ref="SubComponent"
+			@callParentMethod="callParentMethod"></coupon>
 
-		<!-- 团购楼层 -->
+		<!-- 	团购楼层
 		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')"
 			v-if="groupHotGoodsList.length > 0">
 			<image src="/static/temp/h1.png"></image>
@@ -144,10 +145,10 @@
 					</view>
 				</swiper-item>
 			</swiper>
-		</view>
+		</view> -->
 
 		<!-- 分类推荐楼层 -->
-		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')" v-if="false">
+		<!-- 	<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')" v-if="false">
 			<image src="/static/temp/h1.png"></image>
 			<view class="tit-box">
 				<text class="tit">分类精选</text>
@@ -172,7 +173,7 @@
 					</view>
 				</view>
 			</scroll-view>
-		</view>
+		</view> -->
 
 		<!-- 新品推荐 -->
 		<view v-if='homeNewProductList && homeNewProductList.length>0' class="f-header m-t"
@@ -193,7 +194,7 @@
 				<text class="title clamp">{{ item.productName }}</text>
 				<view>
 					<text class="price">惠农价￥{{ item.price }}</text>
-					<!-- <text class="m-price"> 县区商超价￥{{ item.price }}</text> -->
+					<text class="m-price">市场价￥{{ item.originalPrice }}</text>
 				</view>
 
 
@@ -219,17 +220,19 @@
 				<text class="title clamp">{{ item.productName }}</text>
 				<view>
 					<text class="price">惠农价￥{{ item.price }}</text>
-					<!-- <text class="m-price">县区商超价￥{{ item.price }}</text> -->
+					<text class="m-price">市场价￥{{ item.originalPrice }}</text>
 				</view>
 
 			</view>
 
 		</view>
 		<!-- 新品上市 -->
-		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+
+		<!-- <view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')"> -->
+		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
 			<image src="/static/temp/h1.png"></image>
 			<view class="tit-box">
-				<text class="tit">新品上市</text>
+				<text class="tit">商品列表</text>
 			</view>
 			<text class="yticon icon-you"></text>
 		</view>
@@ -241,11 +244,14 @@
 					<image :src="item.pic" mode="aspectFill"></image>
 				</view>
 				<text class="title clamp">{{ item.name }}</text>
-				<!-- <text class="label">【{{ item.storeName }}】</text> -->
-				<text class="price">惠农价￥{{ item.price }}</text>
+				<view>
+					<text class="price">惠农价￥{{ item.price }}</text>
+					<text class="m-price">市场价￥{{ item.originalPrice }}</text>
+				</view>
 			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
+
 		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
 		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
@@ -355,6 +361,20 @@
 			},
 		},
 		methods: {
+			clickParentMethod() {
+				console.log('clickParentMethod')
+				this.$refs.SubComponent.callSubMethod()
+			},
+			callParentMethod(val) {
+				console.log('callParentMethod: ' + val)
+				// 默认去遍历list集合，将集合中的每个元素传入到function的item里，
+				var index = this.couponList.findIndex(function(item) {
+					return item.id == val.id;
+				})
+				this.couponList.splice(index, 1);
+
+			},
+
 			async sysInfoMethod() {
 				let params = {};
 				let list = this.$db.get('sysInfo')
@@ -435,10 +455,10 @@
 			async loadData() {
 
 				this.getBanner();
-				this.getHotGoodsList();
+				// this.getHotGoodsList();
 				//this.getFlashPromotion();
 				this.getCouponList();
-				this.getStoreList();
+				// this.getStoreList();
 				this.homeNewProduct();
 				this.homeRecommendProduct();
 
@@ -532,9 +552,16 @@
 				} else {
 					this.loadingType = 'more';
 				}
+				// let params = {
+				// 	pageNum: this.pageNum
+				// };
 				let params = {
-					pageNum: this.pageNum
-				};
+					pageNum: this.pageNum,
+					productCategoryId: "",
+					type: 1,
+					productAttributeCategoryId: ""
+				};;
+
 				let list = await Api.apiCall('get', Api.goods.goodsList, params);
 
 				let goodsList = list.records;
@@ -1038,10 +1065,9 @@
 			}
 
 			.m-price {
-				font-size: $font-sm + 2upx;
-				text-decoration: line-through;
+				font-size: $font-sm;
 				color: $font-color-light;
-				margin-left: 8upx;
+				margin-left: 10upx;
 			}
 		}
 	}
@@ -1140,10 +1166,9 @@
 		}
 
 		.m-price {
-			font-size: $font-sm + 2upx;
-			text-decoration: line-through;
+			font-size: $font-sm;
 			color: $font-color-light;
-			margin-left: 8upx;
+			margin-left: 10upx;
 		}
 
 		.pro-box {
@@ -1207,16 +1232,15 @@
 		}
 
 		.price {
-			font-size: 18px;
+			font-size: 16px;
 			color: $uni-color-primary;
 			line-height: 1;
 		}
 
 		.m-price {
-			font-size: $font-sm + 2upx;
-			text-decoration: line-through;
+			font-size: $font-sm;
 			color: $font-color-light;
-			margin-left: 8upx;
+			margin-left: 10upx;
 		}
 
 		.coupon_box {
diff --git a/mallplusui-uniapp-app/pages/index/messageDetail.vue b/mallplusui-uniapp-app/pages/index/messageDetail.vue
new file mode 100644
index 0000000..f732bd4
--- /dev/null
+++ b/mallplusui-uniapp-app/pages/index/messageDetail.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="container">
+		<view class="introduce-section">
+			<text class="title">{{ info.params }}</text>
+		
+			<view class="bot-row">
+				<text>{{ info.code }}</text>
+				<text>{{ info.ctime | formatCreateTime  }}</text>
+			</view>
+		</view>
+		
+		<view class="c-list">
+			<text >{{ info.content }}</text>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import Api from '@/common/api';
+	import {
+		formatDate
+	} from '@/common/date';
+
+	export default {
+		data() {
+			return {
+				info: {
+
+				}
+			};
+		},
+
+		async onLoad() {
+
+			// 别问我啥意思。这是官方文档提供的
+			this.page = this.getOpenerEventChannel();
+			// 你可以在这里直接接受，这里不是$on
+			this.page.on('sendTestValue', (data) => {
+				// 这是data 就是上个页面传递的对象了
+				console.log("消息", data)
+				this.info = data.info
+			})
+
+
+		},
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'MM-dd')
+			},
+		},
+		methods: {
+
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: $page-color-base;
+	}
+
+	/* 标题简介 */
+	.introduce-section {
+		background: #fff;
+		padding: 20upx 30upx;
+
+		.title {
+			font-size: 32upx;
+			color: $font-color-dark;
+			height: 50upx;
+			line-height: 50upx;
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			text {
+				flex: 1;
+			}
+		}
+	}
+
+	.c-list {
+		display: flex;
+		margin-top: 10px;
+		height: 850px;
+		padding: 10rpx;
+		background-color: #fff;
+
+	}
+</style>
diff --git a/mallplusui-uniapp-app/pages/index/messageList.vue b/mallplusui-uniapp-app/pages/index/messageList.vue
new file mode 100644
index 0000000..3abdd51
--- /dev/null
+++ b/mallplusui-uniapp-app/pages/index/messageList.vue
@@ -0,0 +1,296 @@
+<template>
+	<view class="content">
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item">
+				<view class="listcard" @click="navToDetailPage(item)">
+					<view class="listcard-image">
+						<image :src="item.code=='交易物流'?pic1:pic2" mode="aspectFill"></image>
+					</view>
+					<view class="listcard-content">
+						<view class="listcard-content_title">
+							<text>{{item.code}}</text>
+							<text class="text2">{{item.ctime | formatCreateTime }}</text>
+						</view>
+						<text class="listcard-content_title_text">{{item.params}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
+	</view>
+
+</template>
+
+<script>
+	import Api from '@/common/api';
+	import {
+		formatDate
+	} from '@/common/date';
+
+	export default {
+		data() {
+			return {
+				pageNum: 1,
+				pic2: "https://desk-fd.zol-img.com.cn/t_s960x600c5/g1/M0B/03/06/ChMljl402K6IOTZbAARWayFg6S4AAQJPwFhuRIABFaD752.jpg",
+				pic1: "https://ts1.cn.mm.bing.net/th/id/R-C.2ce48cd4a70b48403a56e9ea8c710355?rik=tU9CL%2fR0TMLEYA&riu=http%3a%2f%2fwww.kutoo8.com%2fupload%2fimage%2f63051471%2f4_1920x1080.jpg&ehk=wZm6BwD%2b8TIDXmqxTntxftDP8IzjD8g3hhI6bEwdb54%3d&risl=&pid=ImgRaw&r=0",
+				goodsList: [
+					// {
+					// 	title: "交易物流",
+					// 	pic: "https://desk-fd.zol-img.com.cn/t_s960x600c5/g1/M0B/03/06/ChMljl402K6IOTZbAARWayFg6S4AAQJPwFhuRIABFaD752.jpg",
+					// 	createTime: "02-12",
+					// 	content: "您的订单商品已经到取货点，请在7日内取出。",
+					// },
+					// {
+					// 	title: "云链助手",
+					// 	pic: "https://ts1.cn.mm.bing.net/th/id/R-C.2ce48cd4a70b48403a56e9ea8c710355?rik=tU9CL%2fR0TMLEYA&riu=http%3a%2f%2fwww.kutoo8.com%2fupload%2fimage%2f63051471%2f4_1920x1080.jpg&ehk=wZm6BwD%2b8TIDXmqxTntxftDP8IzjD8g3hhI6bEwdb54%3d&risl=&pid=ImgRaw&r=0",
+					// 	createTime: "01-10",
+					// 	content: "春天已经至，已到施肥时间。",
+					// }
+				]
+			};
+		},
+
+		onLoad(options) {
+			// #ifdef H5
+			this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+			// #endif
+
+			// this.loadData();
+		},
+		onShow() {
+			this.loadData();
+		},
+		onPageScroll(e) {
+			//兼容iOS端下拉时顶部漂移
+			// if (e.scrollTop >= 0) {
+			// 	this.headerPosition = 'fixed';
+			// } else {
+			// 	this.headerPosition = 'absolute';
+			// }
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData('refresh');
+		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData();
+		},
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'MM-dd')
+			},
+		},
+		methods: {
+			//加载商品 ，带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params = {};
+
+
+				let list = await Api.apiCall('get', Api.member.mesList, params);
+				console.log("消息列表", list)
+				this.goodsList = list;
+				// let goodsList = await this.$api.json('goodsList');
+				// if (type === 'refresh') {
+				// 	this.goodsList = [];
+				// }
+
+				// this.goodsList = this.goodsList.concat(goodsList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
+			//详情
+			navToDetailPage(item) {
+				console.log("消息>>>>", item)
+				//测试数据没有写id，用title代替
+				// let id = item.id;
+				uni.navigateTo({
+					url: '/pages/index/messageDetail',
+					// 版本2.8.9+ 支持
+					success: (res) => {
+						// 和上面其实没差什么,但是这种方式是可以的 这里不是$emit
+						res.eventChannel.emit('sendTestValue', {
+							info: item
+						})
+					}
+				});
+			},
+			stopPrevent() {}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: $page-color-base;
+	}
+
+	.listcard {
+		display: flex;
+		align-items: center;
+		padding: 10px;
+		margin: 15px;
+		border-radius: 5px;
+		box-shadow: 0 0 5px 1px rgba($color:#000000, $alpha:0.1);
+		box-sizing: border-box;
+
+		.listcard-image {
+			flex-shrink: 0;
+			width: 50px;
+			height: 50px;
+			border-radius: 5px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+		}
+
+		.listcard-content {
+			display: flex;
+			flex-direction: column;
+			padding-left: 10px;
+			width: 100%;
+			justify-content: space-between;
+
+			.listcard-content_title {
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+				font-size: 14px;
+				color: #333;
+				font-weight: 400;
+				line-height: 1.2;
+				position: relative;
+
+				text {
+					font-size: 22px;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					-webkit-box-orient: vertical;
+				}
+
+				.text2 {
+					color: #999;
+					font-size: 18px;
+				}
+
+			}
+
+			.listcard-content_title_text {
+				margin-top: 5px;
+				font-size: 18px;
+				color: #999;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+			}
+
+			.listcard-content_des {
+				display: flex;
+				justify-content: space-between;
+				font-size: 12px;
+
+				.listcard-content_des-label {
+					display: flex;
+
+					.listcard-content_des-label-item {
+						padding: 0 5px;
+						margin-right: 5px;
+						border-radius: 15px;
+						color: #f00;
+						border: 1px #f00 solid;
+					}
+				}
+
+				.listcard-content_des-browe {
+					color: #999;
+					font-size: 15px;
+					line-height: 1.5;
+				}
+			}
+		}
+
+		&.mode-column {
+			.list-content {
+				width: 100%;
+				padding-left: 0;
+			}
+
+			.listcard-image {
+				display: flex;
+				margin-top: 10px;
+				width: 100%;
+				height: 80px;
+
+				.listcard-image_item {
+					margin-left: 10px;
+					width: 100%;
+					border-radius: 5px;
+					overflow: hidden;
+
+					&:first-child {
+						margin-left: 0;
+					}
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+
+				}
+			}
+
+			.listcard-content_des {
+				margin-top: 10px;
+			}
+		}
+
+		&.mode-image {
+			flex-direction: column;
+
+			.listcard-image {
+				width: 100%;
+				height: 100px;
+			}
+
+			.listcard-content {
+				padding-left: 0;
+				margin-top: 10px;
+
+				.listcard-content_des {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app/pages/index/user.vue b/mallplusui-uniapp-app/pages/index/user.vue
index b1709b6..6035b96 100644
--- a/mallplusui-uniapp-app/pages/index/user.vue
+++ b/mallplusui-uniapp-app/pages/index/user.vue
@@ -100,7 +100,7 @@
 				<!--<list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="邀请好友赢10万大礼"></list-cell>
 				<list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="晒单" tips="晒单抢红包"></list-cell>-->
 				<list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @eventClick="navTo('../../pagesU/user/collect')"></list-cell>
-				<list-cell
+				<!-- <list-cell
 					icon="icon-share cgtt"
 					iconColor="#0e68d7"
 					v-if="!userDetailInfo.storeId"
@@ -128,7 +128,7 @@
 					v-if="userDetailInfo.roomNums"
 					title="社区主页"
 					@eventClick="navTo('../../pagesA/build/community')"
-				></list-cell>
+				></list-cell> -->
 				<!-- <list-cell
 					icon="icon-pinglun-copy"
 					iconColor="#0e68d7"
diff --git a/mallplusui-uniapp-app/pages/order/createOrder.vue b/mallplusui-uniapp-app/pages/order/createOrder.vue
index 818a963..7b5b3a8 100644
--- a/mallplusui-uniapp-app/pages/order/createOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createOrder.vue
@@ -1,870 +1,969 @@
 <template>
-    <view>
-        <!-- 地址 -->
-        <navigator url="../../pagesU/address/address?source=1" class="address-section">
-            <view class="order-content">
-                <text class="yticon icon-shouhuodizhi"></text>
-                <view class="cen" v-if="addressData">
-                    <view class="top">
-                        <text class="name">{{ addressData.name }}</text>
-                        <text class="mobile">{{ addressData.phoneNumber }}</text>
-                    </view>
-                    <text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
-                </view>
+	<view>
+		<!-- 地址 -->
+		<navigator url="../../pagesU/address/address?source=1" class="address-section">
+			<view class="order-content">
+				<text class="yticon icon-shouhuodizhi"></text>
+				<view class="cen" v-if="addressData">
+					<view class="top">
+						<text class="name">{{ addressData.name }}</text>
+						<text class="mobile">{{ addressData.phoneNumber }}</text>
+					</view>
+					<text
+						class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
+				</view>
 				<view class="cen" v-else>
 					<text>请设置收货地址</text>
-				   <!-- <view class="top">
+					<!-- <view class="top">
 				        <text class="name">{{ addressData.name }}</text>
 				        <text class="mobile">{{ addressData.phoneNumber }}</text>
 				    </view>
 				    <text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text> -->
 				</view>
-                <text class="yticon icon-you"></text>
-            </view>
-
-            <image
-                    class="a-bg"
-                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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"
-            ></image>
-        </navigator>
-
-        <view class="goods-section">
-            <view class="g-header b-b">
-                <text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text>
-            </view>
-            <!-- 商品列表 -->
-            <view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index">
-                <image :src="item.productPic"></image>
-                <view class="right">
-                    <text class="title clamp">{{ item.productName }}</text>
-                    <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
-                    <view class="price-box">
-                        <text class="price">￥{{ item.price }}</text>
-                        <text class="number">x {{ item.quantity }}</text>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="hot-floor" v-if="item1.giftsList && item1.giftsList.length > 0" v-for="(item1, index1) in basicGiftsList" :key="index1">
-            <view class="floor-img-box"> <text class="name">{{ item1.name }}</text></view>
-
-            <scroll-view class="floor-list" scroll-x>
-                <view class="scoll-wrapper">
-                    <view v-for="(item, index) in item1.giftsList" :key="index" class="floor-item" >
-                        <image :src="item.pic" mode="aspectFill"></image>
-                        <text class="title clamp">{{ item.name }}</text>
-                        <text class="price" v-if="item.rule">￥{{ item.price }}</text>
-                    </view>
-                </view>
-            </scroll-view>
-        </view>
-        <!-- 优惠明细 -->
-        <view class="yt-list">
-            <view class="yt-list-cell b-b" v-if="couponList.length > 0" @click="toggleMask('show')">
-                <view class="cell-icon">券</view>
-                <text class="cell-tit clamp">优惠券</text>
-                <text class="cell-tip active">选择优惠券</text>
-                <text class="cell-more wanjia wanjia-gengduo-d"></text>
-            </view>
-            <view class="yt-list-cell b-b" v-if="coupon">
-                <text class="cell-tit clamp">商家促销</text>
-                <view class="cell-tip hb" v-if="coupon.minPoint">满{{coupon.minPoint}}减{{coupon.amount}}</view>
-                <text class="cell-tip disabled"  v-if="!coupon">暂无可用优惠</text>
-            </view>
-        </view>
-        <!-- 金额明细 -->
-        <view class="yt-list">
-            <view class="yt-list-cell b-b">
-                <text class="cell-tit clamp">商品金额</text>
-                <text class="cell-tip">￥{{ calcAmount.totalAmount }}</text>
-            </view>
-            <view class="yt-list-cell b-b" v-if="groupActivity">
-                <text class="cell-tit clamp">活动金额</text>
-                <text class="cell-tip">￥{{ groupActivity.price }}</text>
-            </view>
-            <view class="yt-list-cell b-b" v-if="calcAmount.promotionAmount>0">
-                <text class="cell-tit clamp">优惠金额</text>
-                <text class="cell-tip red">-￥{{ calcAmount.promotionAmount }}</text>
-            </view>
-             <view class="yt-list-cell b-b" v-if="coupon.amount>0">
-                            <text class="cell-tit clamp">优惠券抵扣</text>
-                            <text class="cell-tip red">-￥{{ coupon.amount }}</text>
-                        </view>
-                        <!-- <view class="yt-list-cell b-b" v-if="memberIntegration>0">
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<image class="a-bg"
+				src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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">
+			</image>
+		</navigator>
+
+		<view class="goods-section">
+			<view class="g-header b-b">
+				<text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text>
+			</view>
+			<!-- 商品列表 -->
+			<view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index">
+				<image :src="item.productPic"></image>
+				<view class="right">
+					<text class="title clamp">{{ item.productName }}</text>
+					<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
+					<view class="price-box">
+						<text class="price">￥{{ item.price }}</text>
+						<text class="number">x {{ item.quantity }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="hot-floor" v-if="item1.giftsList && item1.giftsList.length > 0"
+			v-for="(item1, index1) in basicGiftsList" :key="index1">
+			<view class="floor-img-box"> <text class="name">{{ item1.name }}</text></view>
+
+			<scroll-view class="floor-list" scroll-x>
+				<view class="scoll-wrapper">
+					<view v-for="(item, index) in item1.giftsList" :key="index" class="floor-item">
+						<image :src="item.pic" mode="aspectFill"></image>
+						<text class="title clamp">{{ item.name }}</text>
+						<text class="price" v-if="item.rule">￥{{ item.price }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 优惠明细 -->
+		<view class="yt-list">
+			<view class="yt-list-cell b-b" v-if="couponList.length > 0" @click="toggleMask('show')">
+				<view class="cell-icon">券</view>
+				<text class="cell-tit clamp">优惠券</text>
+				<text class="cell-tip active">选择优惠券</text>
+				<text class="cell-more wanjia wanjia-gengduo-d"></text>
+			</view>
+			<view class="yt-list-cell b-b" v-if="coupon">
+				<text class="cell-tit clamp">商家促销</text>
+				<view class="cell-tip hb" v-if="coupon.minPoint">满{{coupon.minPoint}}减{{coupon.amount}}</view>
+				<text class="cell-tip disabled" v-if="!coupon">暂无可用优惠</text>
+			</view>
+		</view>
+		<!-- 金额明细 -->
+		<view class="yt-list">
+			<view class="yt-list-cell b-b">
+				<text class="cell-tit clamp">商品金额</text>
+				<text class="cell-tip">￥{{ calcAmount.totalAmount }}</text>
+			</view>
+			<view class="yt-list-cell b-b" v-if="groupActivity">
+				<text class="cell-tit clamp">活动金额</text>
+				<text class="cell-tip">￥{{ groupActivity.price }}</text>
+			</view>
+			<view class="yt-list-cell b-b" v-if="calcAmount.promotionAmount>0">
+				<text class="cell-tit clamp">优惠金额</text>
+				<text class="cell-tip red">-￥{{ calcAmount.promotionAmount }}</text>
+			</view>
+			<view class="yt-list-cell b-b" v-if="coupon.amount>0">
+				<text class="cell-tit clamp">优惠券抵扣</text>
+				<text class="cell-tip red">-￥{{ coupon.amount }}</text>
+			</view>
+			<!-- <view class="yt-list-cell b-b" v-if="memberIntegration>0">
                                                     <text class="cell-tit clamp">积分抵扣</text>
                                                     <text class="cell-tip red">-￥{{ memberIntegration }}</text>
                                                 </view>-->
-            <view class="yt-list-cell b-b">
-                <text class="cell-tit clamp">运费</text>
-                <text class="cell-tip">{{calcAmount.freightAmount}}</text>
-            </view>
-            <view class="yt-list-cell desc-cell">
-                <text class="cell-tit clamp">备注</text>
-                <input class="desc" type="text" v-model="desc" placeholder="请填写备注信息" placeholder-class="placeholder" />
-            </view>
-        </view>
-
-        <!-- 底部 -->
-        <view class="footer">
-            <view class="price-content">
-                <text>实付款</text>
-                <text class="price-tip">￥</text>
-                <text class="price">{{ calcAmount.payAmount-coupon.amount }}</text>
-            </view>
-            <text class="submit" @click="submit">提交订单</text>
-        </view>
-
-        <!-- 优惠券面板 -->
-        <view class="mask" :class="maskState === 0 ? 'none' : maskState === 1 ? 'show' : ''" @click="toggleMask">
-            <view class="mask-content" @click.stop.prevent="stopPrevent">
-                <!-- 优惠券页面，仿mt -->
-                <view class="coupon-item" v-if="couponList.length > 0" v-for="(item, index) in couponList" :key="index">
-                    <view class="con" @click="selectCoupon(item)">
-                        <view class="left">
-                            <text class="title">{{ item.coupon.name }}</text>
-                            <text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text>
-                        </view>
-                        <view class="right">
-                            <text class="price">{{ item.coupon.amount }}</text>
-                            <text>满{{item.coupon.minPoint}}可用</text>
-                        </view>
-
-                        <view class="circle l"></view>
-                        <view class="circle r"></view>
-                    </view>
-                    <text class="tips">限新用户使用</text>
-                </view>
-            </view>
-        </view>
-
-    </view>
+			<view class="yt-list-cell b-b">
+				<text class="cell-tit clamp">运费</text>
+				<text class="cell-tip">{{calcAmount.freightAmount}}</text>
+			</view>
+			<view class="yt-list-cell desc-cell">
+				<text class="cell-tit clamp">备注</text>
+				<input class="desc" type="text" v-model="desc" placeholder="请填写备注信息" placeholder-class="placeholder" />
+			</view>
+		</view>
+
+		<!-- 底部 -->
+		<view class="footer">
+			<view class="price-content">
+				<text>实付款</text>
+				<text class="price-tip">￥</text>
+				<text class="price">{{ calcAmount.payAmount-coupon.amount }}</text>
+			</view>
+			<text class="submit" @click="submit">提交订单</text>
+		</view>
+
+		<!-- 优惠券面板 -->
+		<view class="mask" :class="maskState === 0 ? 'none' : maskState === 1 ? 'show' : ''" @click="toggleMask">
+			<view class="mask-content" @click.stop.prevent="stopPrevent">
+				<!-- 优惠券页面，仿mt -->
+				<view class="coupon-item" v-if="couponList.length > 0" v-for="(item, index) in couponList" :key="index">
+					<view class="con" @click="selectCoupon(item)">
+						<view class="left">
+							<text class="title">{{ item.coupon.name }}</text>
+							<text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text>
+						</view>
+						<view class="right">
+							<text class="price">{{ item.coupon.amount }}</text>
+							<text>满{{item.coupon.minPoint}}可用</text>
+						</view>
+
+						<view class="circle l"></view>
+						<view class="circle r"></view>
+					</view>
+					<text class="tips">限新用户使用</text>
+				</view>
+			</view>
+		</view>
+
+	</view>
 </template>
 
 <script>
-    import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-    import { mapState } from 'vuex';
-    	import { formatDate } from '@/common/date';
-
-    export default {
-    components: {
-    		mallplusCopyright
-    	},
-        data() {
-            return {
-                maskState: 0, //优惠券面板显示状态
-                desc: '', //备注
-                payType: 1, //1微信 2支付宝
-                type: 1,
-                groupType: '',
-               /* memberIntegration:0, */
-                groupActivityId:'',
-                basicGiftsVar:'',
-                skillId:0,
-                goodsId: 0,
-                skuId:0,
-                mgId: 0,
-                cartId: '',
-                cartIds: '',
-                addressId: '',
-                couponId: '',
-                memberCouponId:'',
-                coupon:{
-                    amount:0,
-                    coupon:{
-                        amount:0
-                    }
-                },
-                groupActivity:null,
-                memberReceiveAddressList: [],
-                basicGiftsList:[],
-                cartPromotionItemList: [],
-                calcAmount: {
-                    totalAmount: 0,
-                    freightAmount: 0,
-                    promotionAmount: 0,
-                    payAmount: 0
-                },
-                couponList: [],
-                addressData: {
-                    name: null,
-                    phoneNumber: '',
-                    detailAddress: '',
-                    region: ''
-                }
-            };
-        },
-        async onLoad(opt) {
-            let option = JSON.parse(opt.dataJson);
-            console.log(option)
-            this.skuId = option.skuId==undefined?'':option.skuId;
-             this.goodsId = option.goodsId;
-
-            let data;
-            this.type = option.type;
-            if (option.groupActivityId) { // 团购
-                let params = { groupId: option.groupActivityId };
-                data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params);
-                this.groupActivityId=option.groupActivityId;
-                this.groupActivity=data.groupActivity;
-                this.type = 1;
-            }else{
-                if (option.groupType) { // 拼团
-                    this.groupType = option.groupType;
-                    this.goodsId = option.id;
-                    this.mgId = option.mgid;
-
-                    this.groupId = option.groupId;
-                    if (this.skuId) {
-                        let params = { orderType:2, groupId: option.groupId, goodsId: option.id, skuId: this.skuId };
-                        data = await Api.apiCall('post', Api.order.addGroup, params);
-                    } else {
-                        let params = { orderType:2, groupId: option.groupId, goodsId: option.id };
-                        data = await Api.apiCall('post', Api.order.addGroup, params);
-                    }
-                } else {
-                    if (option.type == 1) { // 详情
-                        this.cartId = option.id;
-                        let params = { goodsId: option.goodsId,skuId: this.skuId, type: option.type };
-                        data = await Api.apiCall('get', Api.order.preOrder, params);
-                    } else if (option.type == 2) { // 购物车
-                        let params = { cartIds: option.cartIds, type: option.type };
-                        data = await Api.apiCall('get', Api.order.preOrder, params);
-                        this.cartIds = option.cartIds;
-                    }else if (option.type == 6) { // 秒杀
-                        let params = { skillId: option.skillId, type: option.type };
-                        data = await Api.apiCall('get', Api.order.preOrder, params);
-                        this.skillId = option.skillId;
-                    }
-                }
-
-            }
-           /* if (!data || !data.cartPromotionItemList){
-                uni.switchTab({
-                    url: '/pages/index/index'
-                });
-            } */
-          /*  this.memberIntegration=data.memberIntegration; */
-            /* this.basicGiftsList = data.basicGiftsList; */
-
-            if (this.basicGiftsList) {
-                let basicGiftsVar ='';
-                let basicGiftsVar1 ='';
-                this.basicGiftsList.forEach(item => {
-                    basicGiftsVar1=basicGiftsVar1+item.id+':';
-                    console.log('1='+item.giftsList);
-                    if (item.giftsList ) {
-                        item.giftsList.forEach(item1 => {
-                            basicGiftsVar1 = basicGiftsVar1 + item1.id + ',';
-                        });
-                    }
-                    basicGiftsVar=basicGiftsVar+basicGiftsVar1.substr(0, basicGiftsVar1.length - 1)+'@';
-                    basicGiftsVar1='';
-                });
-                this.basicGiftsVar=basicGiftsVar.substr(0, basicGiftsVar.length - 1);
-                console.log(this.basicGiftsVar);
-            }
-            /* this.cartPromotionItemList = data.cartPromotionItemList; */
-            this.calcAmount = data.calcAmount;
-            this.addressData = data.address;
-            if (this.addressData) {
-                this.addressId = this.addressData.id;
-            }
-				  console.log("优惠券",data.couponHistoryDetailList);
-            this.couponList = data.couponHistoryDetailList;
-            this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
-
-        },
-        computed: {
-            ...mapState(['hasLogin', 'userInfo'])
-        },
-        filters: {
-                      formatCreateTime(time) {
-                        let date = new Date(time);
-                        return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
-                      },
-                    },
-        methods: {
-        getSource(){
-                  let source =Api.source;
-                 return source;
-        },
-            selectCoupon(item){
-                this.coupon=item.coupon;
-                this.couponId= item.couponId;
-                this.memberCouponId=item.id;
-                console.log(this.coupon);
-                this.toggleMask();
-            },
-            //显示优惠券面板
-            toggleMask(type) {
-                let timer = type === 'show' ? 10 : 300;
-                let state = type === 'show' ? 1 : 0;
-                this.maskState = 2;
-                setTimeout(() => {
-                    this.maskState = state;
-                }, timer);
-            },
-            numberChange(data) {
-                this.number = data.number;
-            },
-            changePayType(type) {
-                this.payType = type;
-            },
-            async submit() {
-                console.log('dubmit')
-                let data;
-                if (!this.addressId) {
-                    this.$api.msg('请选择收货地址');
-                    return;
-                }
-                let params = {};
-
-                // 拼团
-                if (this.groupType) {
-                    if (!this.mgId) {
-                        this.mgId = 1;
-                    }
-
-                     params = {
-                        mgId: this.mgId,
-                        groupType: this.groupType,
-                        type: 1,
-                        orderType:2,
-                          skuId: this.skuId,
-                        goodsId: this.goodsId,
-                        groupId: this.groupId,
-                        addressId: this.addressId,
-                        couponId: this.couponId,
-                        memberCouponId: this.memberCouponId,
-                        content: this.desc
-                    };
-                     params.source = this.getSource();
-                    data = await Api.apiCall('post', Api.order.acceptGroup, params);
-                } else {
-                    // detail
-                    if (this.type == 1) {
-                         params = {basicGiftsVar:this.basicGiftsVar,orderType:1, type: 1, goodsId: this.goodsId,skuId: this.skuId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc };
-                        if (this.groupActivityId) {
-                            params = {groupActivityId:this.groupActivityId,orderType:3, type: 1, goodsId: this.goodsId,skuId: this.skuId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc };
-                        }
-                        params.source = this.getSource();
-                        data = await Api.apiCall('post', Api.order.bookOrder, params);
-                    }
-                    // 购物车
-                    if (this.type == 2) {
-                         params = {orderType:1, type: 2, cartIds: this.cartIds, addressId: this.addressId, couponId: this.couponId, content: this.desc };
-                        params.source = this.getSource();
-                        data = await Api.apiCall('post', Api.order.bookOrder, params);
-                    }
-
-                    // 秒杀
-                    if (this.type == 6) {
-                         params = { type: 6, skillId: this.skillId, addressId: this.addressId, couponId: this.couponId, content: this.desc ,orderType:6};
-                        params.source = this.getSource();
-                        data = await Api.apiCall('post', Api.order.bookOrder, params);
-                    }
-                }
-
-                if (data && data.order) {
-                    let id = data.order.id;
-                   // let url = `/pages/money/pay?id=${id}`;
-                    let url = '/pages/order/payment/index?order_id=' + data.order.id + '&type=1' ;
-
-                    uni.navigateTo({
-                        url: url
-                    });
-                } else {
-                    this.$api.msg(data);
-                }
-            },
-            stopPrevent() {}
-        }
-    };
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import {
+		mapState
+	} from 'vuex';
+	import {
+		formatDate
+	} from '@/common/date';
+
+	export default {
+		components: {
+			mallplusCopyright
+		},
+		data() {
+			return {
+				maskState: 0, //优惠券面板显示状态
+				desc: '', //备注
+				payType: 1, //1微信 2支付宝
+				type: 1,
+				groupType: '',
+				/* memberIntegration:0, */
+				groupActivityId: '',
+				basicGiftsVar: '',
+				skillId: 0,
+				goodsId: 0,
+				skuId: 0,
+				mgId: 0,
+				cartId: '',
+				cartIds: '',
+				addressId: '',
+				couponId: '',
+				memberCouponId: '',
+				coupon: {
+					amount: 0,
+					coupon: {
+						amount: 0
+					}
+				},
+				groupActivity: null,
+				memberReceiveAddressList: [],
+				basicGiftsList: [],
+				cartPromotionItemList: [],
+				calcAmount: {
+					totalAmount: 0,
+					freightAmount: 0,
+					promotionAmount: 0,
+					payAmount: 0
+				},
+				couponList: [],
+				addressData: {
+					name: null,
+					phoneNumber: '',
+					detailAddress: '',
+					region: ''
+				}
+			};
+		},
+		async onLoad(opt) {
+			let option = JSON.parse(opt.dataJson);
+			console.log(option)
+			this.skuId = option.skuId == undefined ? '' : option.skuId;
+			this.goodsId = option.goodsId;
+
+			let data;
+			this.type = option.type;
+			if (option.groupActivityId) { // 团购
+				let params = {
+					groupId: option.groupActivityId
+				};
+				data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params);
+				this.groupActivityId = option.groupActivityId;
+				this.groupActivity = data.groupActivity;
+				this.type = 1;
+			} else {
+				if (option.groupType) { // 拼团
+					this.groupType = option.groupType;
+					this.goodsId = option.id;
+					this.mgId = option.mgid;
+
+					this.groupId = option.groupId;
+					if (this.skuId) {
+						let params = {
+							orderType: 2,
+							groupId: option.groupId,
+							goodsId: option.id,
+							skuId: this.skuId
+						};
+						data = await Api.apiCall('post', Api.order.addGroup, params);
+					} else {
+						let params = {
+							orderType: 2,
+							groupId: option.groupId,
+							goodsId: option.id
+						};
+						data = await Api.apiCall('post', Api.order.addGroup, params);
+					}
+				} else {
+					if (option.type == 1) { // 详情
+						this.cartId = option.id;
+						let params = {
+							goodsId: option.goodsId,
+							skuId: this.skuId,
+							type: option.type
+						};
+						data = await Api.apiCall('get', Api.order.preOrder, params);
+					} else if (option.type == 2) { // 购物车
+						let params = {
+							cartIds: option.cartIds,
+							type: option.type
+						};
+						data = await Api.apiCall('get', Api.order.preOrder, params);
+						this.cartIds = option.cartIds;
+					} else if (option.type == 6) { // 秒杀
+						let params = {
+							skillId: option.skillId,
+							type: option.type
+						};
+						data = await Api.apiCall('get', Api.order.preOrder, params);
+						this.skillId = option.skillId;
+					}
+				}
+
+			}
+			/* if (!data || !data.cartPromotionItemList){
+			     uni.switchTab({
+			         url: '/pages/index/index'
+			     });
+			 } */
+			/*  this.memberIntegration=data.memberIntegration; */
+			/* this.basicGiftsList = data.basicGiftsList; */
+
+			if (this.basicGiftsList) {
+				let basicGiftsVar = '';
+				let basicGiftsVar1 = '';
+				this.basicGiftsList.forEach(item => {
+					basicGiftsVar1 = basicGiftsVar1 + item.id + ':';
+					console.log('1=' + item.giftsList);
+					if (item.giftsList) {
+						item.giftsList.forEach(item1 => {
+							basicGiftsVar1 = basicGiftsVar1 + item1.id + ',';
+						});
+					}
+					basicGiftsVar = basicGiftsVar + basicGiftsVar1.substr(0, basicGiftsVar1.length - 1) + '@';
+					basicGiftsVar1 = '';
+				});
+				this.basicGiftsVar = basicGiftsVar.substr(0, basicGiftsVar.length - 1);
+				console.log(this.basicGiftsVar);
+			}
+			/* this.cartPromotionItemList = data.cartPromotionItemList; */
+			this.calcAmount = data.calcAmount;
+			this.addressData = data.address;
+			if (this.addressData) {
+				this.addressId = this.addressData.id;
+			}
+			console.log("优惠券", data.couponHistoryDetailList);
+			this.couponList = data.couponHistoryDetailList;
+			this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
+
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+			},
+		},
+		methods: {
+			getSource() {
+				let source = Api.source;
+				return source;
+			},
+			selectCoupon(item) {
+				this.coupon = item.coupon;
+				this.couponId = item.couponId;
+				this.memberCouponId = item.id;
+				console.log(this.coupon);
+				this.toggleMask();
+			},
+			//显示优惠券面板
+			toggleMask(type) {
+				let timer = type === 'show' ? 10 : 300;
+				let state = type === 'show' ? 1 : 0;
+				this.maskState = 2;
+				setTimeout(() => {
+					this.maskState = state;
+				}, timer);
+			},
+			numberChange(data) {
+				this.number = data.number;
+			},
+			changePayType(type) {
+				this.payType = type;
+			},
+			async submit() {
+				console.log('dubmit')
+				let data;
+				if (!this.addressId) {
+					this.$api.msg('请选择收货地址');
+					return;
+				}
+				let params = {};
+
+				// 拼团
+				if (this.groupType) {
+					if (!this.mgId) {
+						this.mgId = 1;
+					}
+
+					params = {
+						mgId: this.mgId,
+						groupType: this.groupType,
+						type: 1,
+						orderType: 2,
+						skuId: this.skuId,
+						goodsId: this.goodsId,
+						groupId: this.groupId,
+						addressId: this.addressId,
+						couponId: this.couponId,
+						memberCouponId: this.memberCouponId,
+						content: this.desc
+					};
+					params.source = this.getSource();
+					data = await Api.apiCall('post', Api.order.acceptGroup, params);
+				} else {
+					// detail
+					if (this.type == 1) {
+						params = {
+							basicGiftsVar: this.basicGiftsVar,
+							orderType: 1,
+							type: 1,
+							goodsId: this.goodsId,
+							skuId: this.skuId,
+							addressId: this.addressId,
+							couponId: this.couponId,
+							memberCouponId: this.memberCouponId,
+							content: this.desc
+						};
+						if (this.groupActivityId) {
+							params = {
+								groupActivityId: this.groupActivityId,
+								orderType: 3,
+								type: 1,
+								goodsId: this.goodsId,
+								skuId: this.skuId,
+								addressId: this.addressId,
+								couponId: this.couponId,
+								memberCouponId: this.memberCouponId,
+								content: this.desc
+							};
+						}
+						params.source = this.getSource();
+						data = await Api.apiCall('post', Api.order.bookOrder, params);
+					}
+					// 购物车
+					if (this.type == 2) {
+						params = {
+							orderType: 1,
+							type: 2,
+							cartIds: this.cartIds,
+							addressId: this.addressId,
+							couponId: this.couponId,
+							content: this.desc
+						};
+						params.source = this.getSource();
+						data = await Api.apiCall('post', Api.order.bookOrder, params);
+					}
+
+					// 秒杀
+					if (this.type == 6) {
+						params = {
+							type: 6,
+							skillId: this.skillId,
+							addressId: this.addressId,
+							couponId: this.couponId,
+							content: this.desc,
+							orderType: 6
+						};
+						params.source = this.getSource();
+						data = await Api.apiCall('post', Api.order.bookOrder, params);
+					}
+				}
+
+				if (data && data.order) {
+					let id = data.order.id;
+					// let url = `/pages/money/pay?id=${id}`;
+					let url = '/pages/order/payment/index?order_id=' + data.order.id + '&type=1';
+
+					uni.navigateTo({
+						url: url
+					});
+				} else {
+					this.$api.msg(data);
+				}
+			},
+			stopPrevent() {}
+		}
+	};
 </script>
 
 <style lang="scss">
-    page {
-        background: $page-color-base;
-        padding-bottom: 100upx;
-    }
-
-    .address-section {
-        padding: 30upx 0;
-        background: #fff;
-        position: relative;
-
-        .order-content {
-            display: flex;
-            align-items: center;
-        }
-
-        .icon-shouhuodizhi {
-            flex-shrink: 0;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 90upx;
-            color: #888;
-            font-size: 44upx;
-        }
-
-        .cen {
-            display: flex;
-            flex-direction: column;
-            flex: 1;
-            font-size: 28upx;
-            color: $font-color-dark;
-        }
-
-        .name {
-            font-size: 34upx;
-            margin-right: 24upx;
-        }
-
-        .address {
-            margin-top: 16upx;
-            margin-right: 20upx;
-            color: $font-color-light;
-        }
-
-        .icon-you {
-            font-size: 32upx;
-            color: $font-color-light;
-            margin-right: 30upx;
-        }
-
-        .a-bg {
-            position: absolute;
-            left: 0;
-            bottom: 0;
-            display: block;
-            width: 100%;
-            height: 5upx;
-        }
-    }
-
-    .goods-section {
-        margin-top: 16upx;
-        background: #fff;
-        padding-bottom: 1px;
-
-        .g-header {
-            display: flex;
-            align-items: center;
-            height: 84upx;
-            padding: 0 30upx;
-            position: relative;
-        }
-
-        .logo {
-            display: block;
-            width: 50upx;
-            height: 50upx;
-            border-radius: 100px;
-        }
-
-        .name {
-            font-size: 30upx;
-            color: $font-color-base;
-            margin-left: 24upx;
-        }
-
-        .g-item {
-            display: flex;
-            margin: 20upx 30upx;
-
-            image {
-                flex-shrink: 0;
-                display: block;
-                width: 140upx;
-                height: 140upx;
-                border-radius: 4upx;
-            }
-
-            .right {
-                flex: 1;
-                padding-left: 24upx;
-                overflow: hidden;
-            }
-
-            .title {
-                font-size: 30upx;
-                color: $font-color-dark;
-            }
-
-            .spec {
-                font-size: 26upx;
-                color: $font-color-light;
-            }
-
-            .price-box {
-                display: flex;
-                align-items: center;
-                font-size: 32upx;
-                color: $font-color-dark;
-                padding-top: 10upx;
-
-                .price {
-                    margin-bottom: 4upx;
-                }
-                .number {
-                    font-size: 26upx;
-                    color: $font-color-base;
-                    margin-left: 20upx;
-                }
-            }
-
-            .step-box {
-                position: relative;
-            }
-        }
-    }
-    .yt-list {
-        margin-top: 16upx;
-        background: #fff;
-    }
-
-    .yt-list-cell {
-        display: flex;
-        align-items: center;
-        padding: 10upx 30upx 10upx 40upx;
-        line-height: 70upx;
-        position: relative;
-
-        &.cell-hover {
-            background: #fafafa;
-        }
-
-        &.b-b:after {
-            left: 30upx;
-        }
-
-        .cell-icon {
-            height: 32upx;
-            width: 32upx;
-            font-size: 22upx;
-            color: #fff;
-            text-align: center;
-            line-height: 32upx;
-            background: #f85e52;
-            border-radius: 4upx;
-            margin-right: 12upx;
-
-            &.hb {
-                background: #ffaa0e;
-            }
-
-            &.lpk {
-                background: #3ab54a;
-            }
-        }
-
-        .cell-more {
-            align-self: center;
-            font-size: 24upx;
-            color: $font-color-light;
-            margin-left: 8upx;
-            margin-right: -10upx;
-        }
-
-        .cell-tit {
-            flex: 1;
-            font-size: 26upx;
-            color: $font-color-light;
-            margin-right: 10upx;
-        }
-
-        .cell-tip {
-            font-size: 26upx;
-            color: $font-color-dark;
-
-            &.disabled {
-                color: $font-color-light;
-            }
-
-            &.active {
-                color: $base-color;
-            }
-            &.red {
-                color: $base-color;
-            }
-        }
-
-        &.desc-cell {
-            .cell-tit {
-                max-width: 90upx;
-            }
-        }
-
-        .desc {
-            flex: 1;
-            font-size: $font-base;
-            color: $font-color-dark;
-        }
-    }
-
-    /* 支付列表 */
-    .pay-list {
-        padding-left: 40upx;
-        margin-top: 16upx;
-        background: #fff;
-        .pay-item {
-            display: flex;
-            align-items: center;
-            padding-right: 20upx;
-            line-height: 1;
-            height: 110upx;
-            position: relative;
-        }
-        .icon-weixinzhifu {
-            width: 80upx;
-            font-size: 40upx;
-            color: #6bcc03;
-        }
-        .icon-alipay {
-            width: 80upx;
-            font-size: 40upx;
-            color: #06b4fd;
-        }
-        .icon-xuanzhong2 {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 60upx;
-            height: 60upx;
-            font-size: 40upx;
-            color: $base-color;
-        }
-        .tit {
-            font-size: 32upx;
-            color: $font-color-dark;
-            flex: 1;
-        }
-    }
-
-    .footer {
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        z-index: 995;
-        display: flex;
-        align-items: center;
-        width: 100%;
-        height: 90upx;
-        justify-content: space-between;
-        font-size: 30upx;
-        background-color: #fff;
-        z-index: 998;
-        color: $font-color-base;
-        box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
-        .price-content {
-            padding-left: 30upx;
-        }
-        .price-tip {
-            color: $base-color;
-            margin-left: 8upx;
-        }
-        .price {
-            font-size: 36upx;
-            color: $base-color;
-        }
-        .submit {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 280upx;
-            height: 100%;
-            color: #fff;
-            font-size: 32upx;
-            background-color: $base-color;
-        }
-    }
-
-    /* 优惠券面板 */
-    .mask {
-        display: flex;
-        align-items: flex-end;
-        position: fixed;
-        left: 0;
-        top: var(--window-top);
-        bottom: 0;
-        width: 100%;
-        background: rgba(0, 0, 0, 0);
-        z-index: 9995;
-        transition: 0.3s;
-
-        .mask-content {
-            width: 100%;
-            background: #f3f3f3;
-            transform: translateY(100%);
-            transition: 0.3s;
-            overflow-y: scroll;
-        }
-        &.none {
-            display: none;
-        }
-        &.show {
-            background: rgba(0, 0, 0, 0.4);
-
-            .mask-content {
-                transform: translateY(0);
-            }
-        }
-    }
-
-    /* 优惠券列表 */
-    .coupon-item {
-        display: flex;
-        flex-direction: column;
-        margin: 20upx 24upx;
-        background: #fff;
-        .con {
-            display: flex;
-            align-items: center;
-            position: relative;
-            height: 120upx;
-            padding: 0 30upx;
-            &:after {
-                position: absolute;
-                left: 0;
-                bottom: 0;
-                content: '';
-                width: 100%;
-                height: 0;
-                border-bottom: 1px dashed #f3f3f3;
-                transform: scaleY(50%);
-            }
-        }
-        .left {
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            flex: 1;
-            overflow: hidden;
-            height: 100upx;
-        }
-        .title {
-            font-size: 32upx;
-            color: $font-color-dark;
-            margin-bottom: 10upx;
-        }
-        .time {
-            font-size: 24upx;
-            color: $font-color-light;
-        }
-        .right {
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            font-size: 26upx;
-            color: $font-color-base;
-            height: 100upx;
-        }
-        .price {
-            font-size: 44upx;
-            color: $base-color;
-            &:before {
-                content: '￥';
-                font-size: 34upx;
-            }
-        }
-        .tips {
-            font-size: 24upx;
-            color: $font-color-light;
-            line-height: 60upx;
-            padding-left: 30upx;
-        }
-        .circle {
-            position: absolute;
-            left: -6upx;
-            bottom: -10upx;
-            z-index: 10;
-            width: 20upx;
-            height: 20upx;
-            background: #f3f3f3;
-            border-radius: 100px;
-            &.r {
-                left: auto;
-                right: -6upx;
-            }
-        }
-    }
-    /* 分类推荐楼层 */
-    .hot-floor {
-        width: 100%;
-        overflow: hidden;
-        margin-bottom: 20upx;
-        .floor-img-box {
-            width: 100%;
-            height: 220upx;
-            position: relative;
-            display: flex;
-            &:after {
-                padding: 10 30upx;
-                content: '';
-                position: absolute;
-                width: 100%;
-                height: 100%;
-                background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
-            }
-        }
-        .name {
-            font-size: 30upx;
-            color: $font-color-base;
-            margin-left: 24upx;
-        }
-        .floor-img {
-            width: 100%;
-            height: 100%;
-        }
-        .floor-list {
-            white-space: nowrap;
-            padding: 20upx;
-            padding-right: 50upx;
-            border-radius: 6upx;
-            margin-top: -140upx;
-            margin-left: 30upx;
-            background: #fff;
-            box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
-            position: relative;
-            z-index: 1;
-        }
-        .scoll-wrapper {
-            display: flex;
-            align-items: flex-start;
-        }
-        .floor-item {
-            width: 180upx;
-            margin-right: 20upx;
-            font-size: $font-sm + 2upx;
-            color: $font-color-dark;
-            line-height: 1.8;
-            image {
-                width: 180upx;
-                height: 180upx;
-                border-radius: 6upx;
-            }
-            .price {
-                color: $uni-color-primary;
-            }
-        }
-        .more {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-direction: column;
-            flex-shrink: 0;
-            width: 180upx;
-            height: 180upx;
-            border-radius: 6upx;
-            background: #f3f3f3;
-            font-size: $font-base;
-            color: $font-color-light;
-            text:first-child {
-                margin-bottom: 4upx;
-            }
-        }
-    }
+	page {
+		background: $page-color-base;
+		padding-bottom: 100upx;
+	}
+
+	.address-section {
+		padding: 30upx 0;
+		background: #fff;
+		position: relative;
+
+		.order-content {
+			display: flex;
+			align-items: center;
+		}
+
+		.icon-shouhuodizhi {
+			flex-shrink: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 90upx;
+			color: #888;
+			font-size: 44upx;
+		}
+
+		.cen {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			font-size: 28upx;
+			color: $font-color-dark;
+		}
+
+		.name {
+			font-size: 34upx;
+			margin-right: 24upx;
+		}
+
+		.address {
+			margin-top: 16upx;
+			margin-right: 20upx;
+			color: $font-color-light;
+		}
+
+		.icon-you {
+			font-size: 32upx;
+			color: $font-color-light;
+			margin-right: 30upx;
+		}
+
+		.a-bg {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			display: block;
+			width: 100%;
+			height: 5upx;
+		}
+	}
+
+	.goods-section {
+		margin-top: 16upx;
+		background: #fff;
+		padding-bottom: 1px;
+
+		.g-header {
+			display: flex;
+			align-items: center;
+			height: 84upx;
+			padding: 0 30upx;
+			position: relative;
+		}
+
+		.logo {
+			display: block;
+			width: 50upx;
+			height: 50upx;
+			border-radius: 100px;
+		}
+
+		.name {
+			font-size: 30upx;
+			color: $font-color-base;
+			margin-left: 24upx;
+		}
+
+		.g-item {
+			display: flex;
+			margin: 20upx 30upx;
+
+			image {
+				flex-shrink: 0;
+				display: block;
+				width: 140upx;
+				height: 140upx;
+				border-radius: 4upx;
+			}
+
+			.right {
+				flex: 1;
+				padding-left: 24upx;
+				overflow: hidden;
+			}
+
+			.title {
+				font-size: 30upx;
+				color: $font-color-dark;
+			}
+
+			.spec {
+				font-size: 26upx;
+				color: $font-color-light;
+			}
+
+			.price-box {
+				display: flex;
+				align-items: center;
+				font-size: 32upx;
+				color: $font-color-dark;
+				padding-top: 10upx;
+
+				.price {
+					margin-bottom: 4upx;
+				}
+
+				.number {
+					font-size: 26upx;
+					color: $font-color-base;
+					margin-left: 20upx;
+				}
+			}
+
+			.step-box {
+				position: relative;
+			}
+		}
+	}
+
+	.yt-list {
+		margin-top: 16upx;
+		background: #fff;
+	}
+
+	.yt-list-cell {
+		display: flex;
+		align-items: center;
+		padding: 10upx 30upx 10upx 40upx;
+		line-height: 70upx;
+		position: relative;
+
+		&.cell-hover {
+			background: #fafafa;
+		}
+
+		&.b-b:after {
+			left: 30upx;
+		}
+
+		.cell-icon {
+			height: 32upx;
+			width: 32upx;
+			font-size: 22upx;
+			color: #fff;
+			text-align: center;
+			line-height: 32upx;
+			background: #f85e52;
+			border-radius: 4upx;
+			margin-right: 12upx;
+
+			&.hb {
+				background: #ffaa0e;
+			}
+
+			&.lpk {
+				background: #3ab54a;
+			}
+		}
+
+		.cell-more {
+			align-self: center;
+			font-size: 24upx;
+			color: $font-color-light;
+			margin-left: 8upx;
+			margin-right: -10upx;
+		}
+
+		.cell-tit {
+			flex: 1;
+			font-size: 26upx;
+			color: $font-color-light;
+			margin-right: 10upx;
+		}
+
+		.cell-tip {
+			font-size: 26upx;
+			color: $font-color-dark;
+
+			&.disabled {
+				color: $font-color-light;
+			}
+
+			&.active {
+				color: $base-color;
+			}
+
+			&.red {
+				color: $base-color;
+			}
+		}
+
+		&.desc-cell {
+			.cell-tit {
+				max-width: 90upx;
+			}
+		}
+
+		.desc {
+			flex: 1;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+	}
+
+	/* 支付列表 */
+	.pay-list {
+		padding-left: 40upx;
+		margin-top: 16upx;
+		background: #fff;
+
+		.pay-item {
+			display: flex;
+			align-items: center;
+			padding-right: 20upx;
+			line-height: 1;
+			height: 110upx;
+			position: relative;
+		}
+
+		.icon-weixinzhifu {
+			width: 80upx;
+			font-size: 40upx;
+			color: #6bcc03;
+		}
+
+		.icon-alipay {
+			width: 80upx;
+			font-size: 40upx;
+			color: #06b4fd;
+		}
+
+		.icon-xuanzhong2 {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 60upx;
+			height: 60upx;
+			font-size: 40upx;
+			color: $base-color;
+		}
+
+		.tit {
+			font-size: 32upx;
+			color: $font-color-dark;
+			flex: 1;
+		}
+	}
+
+	.footer {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 995;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 90upx;
+		justify-content: space-between;
+		font-size: 30upx;
+		background-color: #fff;
+		z-index: 998;
+		color: $font-color-base;
+		box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
+
+		.price-content {
+			padding-left: 30upx;
+		}
+
+		.price-tip {
+			color: $base-color;
+			margin-left: 8upx;
+		}
+
+		.price {
+			font-size: 36upx;
+			color: $base-color;
+		}
+
+		.submit {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 280upx;
+			height: 100%;
+			color: #fff;
+			font-size: 32upx;
+			background-color: $base-color;
+		}
+	}
+
+	/* 优惠券面板 */
+	.mask {
+		display: flex;
+		align-items: flex-end;
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 9995;
+		transition: 0.3s;
+
+		.mask-content {
+			width: 100%;
+			min-height: 30vh;
+			max-height: 70vh;
+			background: #f3f3f3;
+			transform: translateY(100%);
+			transition: 0.3s;
+			overflow-y: scroll;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, 0.4);
+
+			.mask-content {
+				transform: translateY(0);
+			}
+		}
+	}
+
+	/* 优惠券列表 */
+	.coupon-item {
+		display: flex;
+		flex-direction: column;
+		margin: 20upx 24upx;
+		background: #fff;
+
+		.con {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 120upx;
+			padding: 0 30upx;
+
+			&:after {
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				content: '';
+				width: 100%;
+				height: 0;
+				border-bottom: 1px dashed #f3f3f3;
+				transform: scaleY(50%);
+			}
+		}
+
+		.left {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			flex: 1;
+			overflow: hidden;
+			height: 100upx;
+		}
+
+		.title {
+			font-size: 32upx;
+			color: $font-color-dark;
+			margin-bottom: 10upx;
+		}
+
+		.time {
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+
+		.right {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			font-size: 26upx;
+			color: $font-color-base;
+			height: 100upx;
+		}
+
+		.price {
+			font-size: 44upx;
+			color: $base-color;
+
+			&:before {
+				content: '￥';
+				font-size: 34upx;
+			}
+		}
+
+		.tips {
+			font-size: 24upx;
+			color: $font-color-light;
+			line-height: 60upx;
+			padding-left: 30upx;
+		}
+
+		.circle {
+			position: absolute;
+			left: -6upx;
+			bottom: -10upx;
+			z-index: 10;
+			width: 20upx;
+			height: 20upx;
+			background: #f3f3f3;
+			border-radius: 100px;
+
+			&.r {
+				left: auto;
+				right: -6upx;
+			}
+		}
+	}
+
+	/* 分类推荐楼层 */
+	.hot-floor {
+		width: 100%;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 220upx;
+			position: relative;
+			display: flex;
+
+			&:after {
+				padding: 10 30upx;
+				content: '';
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.name {
+			font-size: 30upx;
+			color: $font-color-base;
+			margin-left: 24upx;
+		}
+
+		.floor-img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.floor-list {
+			white-space: nowrap;
+			padding: 20upx;
+			padding-right: 50upx;
+			border-radius: 6upx;
+			margin-top: -140upx;
+			margin-left: 30upx;
+			background: #fff;
+			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+			position: relative;
+			z-index: 1;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 180upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 180upx;
+				height: 180upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+
+		.more {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex-shrink: 0;
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
+		}
+	}
 </style>
diff --git a/mallplusui-uniapp-app/pages/public/login.vue b/mallplusui-uniapp-app/pages/public/login.vue
index 3d3fbc6..540e545 100644
--- a/mallplusui-uniapp-app/pages/public/login.vue
+++ b/mallplusui-uniapp-app/pages/public/login.vue
@@ -523,7 +523,9 @@
 					console.log("1111111111");
 					if (data) {
 						console.log(data);
+						console.log("22222222222");
 						that.login(data);
+						console.log("33333333333333");
 						uni.setStorageSync('userInfos', data.userInfo);
 						uni.setStorageSync('token', data.tokenHead + data.token);
 						// uni.setStorageSync('adminToken', data.tokenHead + data.token);
diff --git a/mallplusui-uniapp-app/pages/public/reg.vue b/mallplusui-uniapp-app/pages/public/reg.vue
index 7eaf664..f552a6a 100644
--- a/mallplusui-uniapp-app/pages/public/reg.vue
+++ b/mallplusui-uniapp-app/pages/public/reg.vue
@@ -10,7 +10,7 @@
 			<view class="input-content">
 				<view class="input-item">
 					<text class="tit">手机号码</text>
-					<input type="number" v-model="phone" placeholder="请输入手机号码" />
+					<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
 				</view>
 				<view class="input-item">
 					<text class="tit">密码</text>
@@ -21,9 +21,9 @@
 					<input type="password" placeholder="请输入确认密码" v-model="confimpassword" @confirm="reg" />
 				</view>
 				<view class="input-item">
-                					<text class="tit">邀请码</text>
-                					<input type="number" v-model="invitecode" placeholder="请输入邀请码" />
-               </view>
+					<text class="tit">邀请码</text>
+					<input type="number" v-model="invitecode" placeholder="请输入邀请码" />
+				</view>
 			</view>
 			<button class="confirm-btn" @click="reg" :disabled="logining">注册</button>
 
@@ -39,218 +39,279 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex';
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-
-
-export default {
-components: {
-		mallplusCopyright
-	},
-	data() {
-		return {
-		invitecode:'',
-			phone: '',
-			password: '',
-			confimpassword: '',
-			logining: false
-		};
-	},
-	onLoad() {},
-	methods: {
-
-		inputChange(e) {
-			const key = e.currentTarget.dataset.key;
-			this[key] = e.detail.value;
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import store from '@/store/index';
+
+	export default {
+		components: {
+			mallplusCopyright
 		},
-		navBack() {
-			uni.switchTab({
-				url: '/pages/index/index'
-			});
+		data() {
+			return {
+				invitecode: '',
+				phone: '',
+				password: '',
+				confimpassword: '',
+				logining: false
+			};
 		},
-		toForget(){
-        				uni.navigateTo({
-        						url: '../../pagesU/user/forget'
-        				})
-        			},
-		toRegist() {
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
+		onLoad() {},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
 		},
-		async reg() {
-			let phoneReg = /^1[1-9][0-9]\d{8}$/;
-			try {
-				if (this.phone == '') {
-					throw '请填写手机号';
-				}
-				if (!phoneReg.test(this.phone)) {
-					throw '手机号格式有误';
+		methods: {
+			...mapMutations(['login']),
+
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
+			toForget() {
+				uni.navigateTo({
+					url: '../../pagesU/user/forget'
+				})
+			},
+			toRegist() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
+			},
+			async reg() {
+				var that = this;
+				let phoneReg = /^1[1-9][0-9]\d{8}$/;
+				try {
+					if (this.phone == '') {
+						throw '请填写手机号';
+					}
+					if (!phoneReg.test(this.phone)) {
+						throw '手机号格式有误';
+					}
+					if (this.password == '') {
+						throw '请填写密码';
+					}
+				} catch (err) {
+					this.$api.msg(err);
+					return;
 				}
-				if (this.password == '') {
-					throw '请填写密码';
+
+				let params;
+				//有推荐码的话，带上
+				var invitecode = this.$db.get('invitecode')
+				if (invitecode) {
+					data.invitecode = invitecode
+					params = {
+						phone: this.phone,
+						password: this.password,
+						confimpassword: this.confimpassword,
+						source: 3,
+						invitecode: invitecode
+					};
+				} else {
+					params = {
+						phone: this.phone,
+						password: this.password,
+						confimpassword: this.confimpassword,
+						source: 3,
+						invitecode: this.invitecode
+					};
 				}
-			} catch (err) {
-				this.$api.msg(err);
-				return;
-			}
+				let data = await Api.apiCall('post', Api.index.simpleReg, params);
 
-			let params ;
-			//有推荐码的话，带上
-			var invitecode = this.$db.get('invitecode')
-			if (invitecode) {
-				data.invitecode = invitecode
-				params = { phone: this.phone, password: this.password, confimpassword: this.confimpassword ,source:3,invitecode:invitecode};
-			}else {
-				params = { phone: this.phone, password: this.password, confimpassword: this.confimpassword ,source:3,invitecode:this.invitecode};
-			}
-			let data = await Api.apiCall('post', Api.index.simpleReg, params);
 
+				// uni.navigateTo({
+				// 	url: '/pages/public/login'
+				// });
+
+				// 注册成功 直接默认登录
 
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
+				let params2 = {
+					phone: this.phone,
+					password: this.password
+				};
+				let data2 = await Api.apiCall('post', Api.index.login, params2);
+				//this.logining = false;
+				console.log("1111111111");
+				if (data2) {
+					console.log(data2);
+					that.login(data2);
+					uni.setStorageSync('userInfos', data2.userInfo);
+					uni.setStorageSync('token', data2.tokenHead + data2.token);
+					// uni.setStorageSync('adminToken', data.tokenHead + data.token);
+					console.log(uni.getStorageSync('token'));
+					uni.navigateBack({
+						delta: 2
+					});
+
+				}
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: #fff;
-}
-.container {
-	padding-top: 115px;
-	position: relative;
-	width: 100vw;
-	height: 120vh;
-	overflow: hidden;
-	background: #fff;
-}
-.wrapper {
-	position: relative;
-	z-index: 90;
-	background: #fff;
-	padding-bottom: 30upx;
-}
-.back-btn {
-	position: absolute;
-	left: 40upx;
-	z-index: 9999;
-	padding-top: var(--status-bar-height);
-	top: 40upx;
-	font-size: 40upx;
-	color: $font-color-dark;
-}
-.left-top-sign {
-	font-size: 120upx;
-	color: $page-color-base;
-	position: relative;
-	left: -16upx;
-}
-.right-top-sign {
-	position: absolute;
-	top: 80upx;
-	right: -30upx;
-	z-index: 95;
-	&:before,
-	&:after {
-		display: block;
-		content: '';
-		width: 400upx;
-		height: 80upx;
-		background: #b4f3e2;
+	page {
+		background: #fff;
 	}
-	&:before {
-		transform: rotate(50deg);
-		border-radius: 0 50px 0 0;
+
+	.container {
+		padding-top: 115px;
+		position: relative;
+		width: 100vw;
+		height: 120vh;
+		overflow: hidden;
+		background: #fff;
+	}
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #fff;
+		padding-bottom: 30upx;
 	}
-	&:after {
+
+	.back-btn {
 		position: absolute;
-		right: -198upx;
-		top: 0;
-		transform: rotate(-50deg);
-		border-radius: 50px 0 0 0;
-		/* background: pink; */
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: $font-color-dark;
 	}
-}
-.left-bottom-sign {
-	position: absolute;
-	left: -270upx;
-	bottom: -320upx;
-	border: 100upx solid #d0d1fd;
-	border-radius: 50%;
-	padding: 180upx;
-}
-.welcome {
-	position: relative;
-	left: 50upx;
-	top: -90upx;
-	font-size: 46upx;
-	color: #555;
-	text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
-}
-.input-content {
-	padding: 0 60upx;
-}
-.input-item {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-	justify-content: center;
-	padding: 0 30upx;
-	background: $page-color-light;
-	height: 120upx;
-	border-radius: 4px;
-	margin-bottom: 50upx;
-	&:last-child {
-		margin-bottom: 0;
+
+	.left-top-sign {
+		font-size: 120upx;
+		color: $page-color-base;
+		position: relative;
+		left: -16upx;
 	}
-	.tit {
-		height: 50upx;
-		line-height: 56upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-base;
+
+	.right-top-sign {
+		position: absolute;
+		top: 80upx;
+		right: -30upx;
+		z-index: 95;
+
+		&:before,
+		&:after {
+			display: block;
+			content: '';
+			width: 400upx;
+			height: 80upx;
+			background: #b4f3e2;
+		}
+
+		&:before {
+			transform: rotate(50deg);
+			border-radius: 0 50px 0 0;
+		}
+
+		&:after {
+			position: absolute;
+			right: -198upx;
+			top: 0;
+			transform: rotate(-50deg);
+			border-radius: 50px 0 0 0;
+			/* background: pink; */
+		}
 	}
-	input {
-		height: 60upx;
-		font-size: $font-base + 2upx;
-		color: $font-color-dark;
-		width: 100%;
+
+	.left-bottom-sign {
+		position: absolute;
+		left: -270upx;
+		bottom: -320upx;
+		border: 100upx solid #d0d1fd;
+		border-radius: 50%;
+		padding: 180upx;
+	}
+
+	.welcome {
+		position: relative;
+		left: 50upx;
+		top: -90upx;
+		font-size: 46upx;
+		color: #555;
+		text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
+	}
+
+	.input-content {
+		padding: 0 60upx;
+	}
+
+	.input-item {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: center;
+		padding: 0 30upx;
+		background: $page-color-light;
+		height: 120upx;
+		border-radius: 4px;
+		margin-bottom: 50upx;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+
+		.tit {
+			height: 50upx;
+			line-height: 56upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+		}
+
+		input {
+			height: 60upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			width: 100%;
+		}
 	}
-}
-
-.confirm-btn {
-	width: 630upx;
-	height: 76upx;
-	line-height: 76upx;
-	border-radius: 50px;
-	margin-top: 70upx;
-	background: $uni-color-primary;
-	color: #fff;
-	font-size: $font-lg;
-	&:after {
-		border-radius: 100px;
+
+	.confirm-btn {
+		width: 630upx;
+		height: 76upx;
+		line-height: 76upx;
+		border-radius: 50px;
+		margin-top: 70upx;
+		background: $uni-color-primary;
+		color: #fff;
+		font-size: $font-lg;
+
+		&:after {
+			border-radius: 100px;
+		}
 	}
-}
-.forget-section {
-	font-size: $font-sm + 2upx;
-	color: $font-color-spec;
-	text-align: center;
-	margin-top: 40upx;
-}
-.register-section {
-	position: absolute;
-	left: 0;
-	bottom: 40upx;
-	width: 100%;
-	font-size: $font-sm + 2upx;
-	color: $font-color-base;
-	text-align: center;
-	text {
+
+	.forget-section {
+		font-size: $font-sm + 2upx;
 		color: $font-color-spec;
-		margin-left: 10upx;
+		text-align: center;
+		margin-top: 40upx;
+	}
+
+	.register-section {
+		position: absolute;
+		left: 0;
+		bottom: 40upx;
+		width: 100%;
+		font-size: $font-sm + 2upx;
+		color: $font-color-base;
+		text-align: center;
+
+		text {
+			color: $font-color-spec;
+			margin-left: 10upx;
+		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pages/set/set.vue b/mallplusui-uniapp-app/pages/set/set.vue
index 9ff541e..d3d2af5 100644
--- a/mallplusui-uniapp-app/pages/set/set.vue
+++ b/mallplusui-uniapp-app/pages/set/set.vue
@@ -21,10 +21,10 @@
 			<text class="cell-tit">清除缓存</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view>
-		<view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
+		<!-- <view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
 			<text class="cell-tit">关于{{ sysInfo.name }}</text>
 			<text class="cell-more yticon icon-you"></text>
-		</view>
+		</view> -->
 		<view class="list-cell" @click="updateApp()">
 			<text class="cell-tit">检查更新</text>
 			<!-- <text class="cell-tip">当前版本 {{sysInfo.version}}</text> -->
diff --git a/mallplusui-uniapp-app/pagesA/product/list.vue b/mallplusui-uniapp-app/pagesA/product/list.vue
index 63b83a8..5ddc2ca 100644
--- a/mallplusui-uniapp-app/pagesA/product/list.vue
+++ b/mallplusui-uniapp-app/pagesA/product/list.vue
@@ -21,7 +21,7 @@
 				<text class="title clamp">{{ item.name }}</text>
 				<view class="price-box" >
 					<text class="price">{{ item.price }}</text>
-					<!-- <text>佣金 ¥{{ item.fenxiaoPrice }}</text> -->
+					<text class="price2">市场价 ¥{{ item.originalPrice }}</text>
 				</view>
 				<!-- <view class="price-box" v-if="item.isVip == 1">
 					<text class="price">会员价{{ item.vipPrice }}</text>
@@ -465,6 +465,10 @@ page,
 			font-size: 26upx;
 		}
 	}
+	.price2{
+		font-size: $font-sm ;
+		color: $font-color-light;
+	}
 }
 .goods-list-vertical {
 	display: flex;
diff --git a/mallplusui-uniapp-app/pagesA/product/product.vue b/mallplusui-uniapp-app/pagesA/product/product.vue
index 72870da..5aad7af 100644
--- a/mallplusui-uniapp-app/pagesA/product/product.vue
+++ b/mallplusui-uniapp-app/pagesA/product/product.vue
@@ -13,10 +13,10 @@
 			<view class="price-box">
 				<!-- <text class="price-tip">惠农价</text> -->
 				<text class="price" v-if="goods.vipPrice && goods.vipPrice > 0">惠农价¥{{ (goods.price * goods.memberRate) / 10 }}</text>
-				<text class="price" v-else-if="!goods.vipPrice">惠农价¥{{ goods.price }}</text>
-				<text class="m-price" v-if="!goods.vipPrice">县区商超价{{ goods.originalPrice }}</text>
+				<text class="price" v-else-if="!goods.vipPrice">惠农价¥{{ goods.originalPrice }}</text>
+				<text class="m-price" v-if="!goods.vipPrice">市场价¥{{ goods.price }}</text>
 				<text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">¥{{ goods.price }}</text>
-				<text class="price">优惠¥{{ (goods.originalPrice- goods.price) | formatNumber}}</text>
+				<text class="price">优惠¥{{ (goods.price - goods.originalPrice) | formatNumber}}</text>
 				<text class="coupon-tip" v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text>
 			</view>
 			<view class="bot-row">
@@ -656,7 +656,6 @@ page {
 	.m-price {
 		margin: 0 12upx;
 		color: $font-color-light;
-		text-decoration: line-through;
 	}
 	.coupon-tip {
 		align-items: center;
diff --git a/mallplusui-uniapp-app/pagesU/address/addressManage.vue b/mallplusui-uniapp-app/pagesU/address/addressManage.vue
index 656781e..69492d2 100644
--- a/mallplusui-uniapp-app/pagesU/address/addressManage.vue
+++ b/mallplusui-uniapp-app/pagesU/address/addressManage.vue
@@ -3,31 +3,34 @@
 
 		<view class="row b-b">
 			<text class="tit">联系人</text>
-			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名" placeholder-class="placeholder" />
+			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名"
+				placeholder-class="placeholder" />
 		</view>
 		<view class="row b-b">
 			<text class="tit">手机号</text>
-			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码" placeholder-class="placeholder" />
+			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码"
+				placeholder-class="placeholder" />
 		</view>
-
+		
 		<view class="row b-b">
-			<text class="tit">城市</text>
-			<input placeholder="请选择城市" disabled="true" :value="addressData.province + ' ' + addressData.city + ' ' + addressData.region" @click="lotusAddressData.visible = true" class="input">
-				<lotus-address v-on:choseVal="choseValue" :lotusAddressData="lotusAddressData"></lotus-address>
-			</input>
-			<text class="yticon icon-shouhuodizhi"></text>
+			<text class="tit">所在地</text>
+			<view class="input" >
+				<uni-data-select   v-model="value" :localdata="range" @change="change"></uni-data-select>
+			</view>
+			
 		</view>
-		<view class="row b-b">
-		<text class="tit">地图:</text>
+		<!-- <view class="row b-b">
+			<text class="tit">地图:</text>
 
 
-        				<input class="input" @click="openMap()" type="text" value="" v-model="mapAddressName" placeholder="在地图上搜索并选择地址" disabled="true" />
-        				<text class="yticon icon-shouhuodizhi"></text>
+			<input class="input" @click="openMap()" type="text" value="" v-model="mapAddressName"
+				placeholder="在地图上搜索并选择地址" disabled="true" />
+			<text class="yticon icon-shouhuodizhi"></text>
 
-        		</view>
+		</view> -->
 		<view class="row b-b">
-			<text class="tit">详细</text>
-			<input class="input" type="text" v-model="addressData.detailAddress" placeholder="街道、楼号、门牌" placeholder-class="placeholder" />
+			<text class="tit">取货点</text>
+			<text class="input">王宫村服务站</text>
 		</view>
 
 		<view class="row default-row">
@@ -39,12 +42,12 @@
 </template>
 
 <script>
-import Api from '@/common/api';
-import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue"
+	import Api from '@/common/api';
+	import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue"
 	export default {
 		data() {
 			return {
-			mapAddressName: '',
+				mapAddressName: '',
 				addressData: {
 					name: '',
 					phoneNumber: '',
@@ -55,17 +58,31 @@ import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAdd
 					defaultStatus: 0,
 					def: false
 				},
-				lotusAddressData:{
-					visible:false,
-					provinceName:'',
-					cityName:'',
-					townName:'',
+				lotusAddressData: {
+					visible: false,
+					provinceName: '',
+					cityName: '',
+					townName: '',
 				},
+				value: 0,
+				range: [{
+						value: '1',
+						text: '王宫村'
+					},
+					{
+						value: '2',
+						text: '土山村'
+					},
+					{
+						value: '3',
+						text: '马庄村'
+					}
+				]
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			let title = '新增收货地址';
-			if(option.type==='edit'){
+			if (option.type === 'edit') {
 				title = '编辑收货地址'
 				this.addressData = JSON.parse(option.data)
 			}
@@ -75,36 +92,42 @@ import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAdd
 			})
 		},
 		methods: {
-			switchChange(e){
-				this.addressData.defaultStatus = e.detail.value?1:0
+
+			change(res) {
+				console.log('res', res);
+			},
+
+			switchChange(e) {
+				this.addressData.defaultStatus = e.detail.value ? 1 : 0
 				this.addressData.def = e.detail.value
 			},
-        openMap() {
-			var _this = this;
-			uni.chooseLocation({
-
-				success: function(res) {
-					console.log('res', res);
-
-					_this.addressData.latitude = res.latitude;
-					_this.addressData.longitude = res.longitude;
-					_this.mapAddressName= res.address + res.name;
-					_this.addressData.detailAddress = res.address + res.name;
-					console.log('经度：' + res.longitude);
-					console.log('详细地址：' + res.address);
-					console.log('纬度：' + res.latitude);
-				}
-			});
 
-		},
-			choseValue(res){
-            //res数据源包括已选省市区与省市区code
-				this.lotusAddressData.visible = false;//visible为显示与关闭组件标识true显示false隐藏
-				if(res.isChose){
+			openMap() {
+				var _this = this;
+				uni.chooseLocation({
+
+					success: function(res) {
+						console.log('res', res);
+
+						_this.addressData.latitude = res.latitude;
+						_this.addressData.longitude = res.longitude;
+						_this.mapAddressName = res.address + res.name;
+						_this.addressData.detailAddress = res.address + res.name;
+						console.log('经度：' + res.longitude);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+					}
+				});
+
+			},
+			choseValue(res) {
+				//res数据源包括已选省市区与省市区code
+				this.lotusAddressData.visible = false; //visible为显示与关闭组件标识true显示false隐藏
+				if (res.isChose) {
 					console.log(res)
-					this.lotusAddressData.provinceName = res.provice;//省
-					this.lotusAddressData.cityName = res.city;//市
-					this.lotusAddressData.townName = res.town;//区
+					this.lotusAddressData.provinceName = res.provice; //省
+					this.lotusAddressData.cityName = res.city; //市
+					this.lotusAddressData.townName = res.town; //区
 
 					//赋值到addressData
 					this.addressData.province = res.provice
@@ -115,96 +138,102 @@ import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAdd
 			},
 
 			//提交
-			async confirm(){
+			async confirm() {
 				const that = this
 				let data = this.addressData;
-				if(!data.name){
+				if (!data.name) {
 					this.$api.msg('请填写收货人姓名');
 					return;
 				}
-				if(!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.phoneNumber)){
+				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.phoneNumber)) {
 					that.$api.msg('请输入正确的手机号码');
 					return
 				}
-				if (!data.province) {
-					that.$api.msg('请选择省市区');
-					return
-				}
-				if (!data.city) {
-					that.$api.msg('请选择二级城市')
-					return
-				}
-				if (!data.region) {
-					that.$api.msg('请选择三级区或县')
-					return
-				}
-				if(!data.detailAddress){
-					that.$api.msg('请输入详细地址');
-					return
-				}
+				// if (!data.province) {
+				// 	that.$api.msg('请选择省市区');
+				// 	return
+				// }
+				// if (!data.city) {
+				// 	that.$api.msg('请选择二级城市')
+				// 	return
+				// }
+				// if (!data.region) {
+				// 	that.$api.msg('请选择三级区或县')
+				// 	return
+				// }
+				// if (!data.detailAddress) {
+				// 	that.$api.msg('请输入详细地址');
+				// 	return
+				// }
 
 				let data1 = await Api.apiCall('post', Api.goods.addressSave, that.addressData);
 				if (data1) {
-                				this.$api.msg(`保存成功`);
-                				setTimeout(() => {
-                					uni.navigateBack({
-                						delta:1
-                					})
-
-                				}, 800);
-                			} else {
-                				this.$api.msg(`保存失败`);
-                			}
+					this.$api.msg(`保存成功`);
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1
+						})
+
+					}, 800);
+				} else {
+					this.$api.msg(`保存失败`);
+				}
 
 
 			},
 		},
-		components:{
-			"lotus-address":lotusAddress
+		components: {
+			"lotus-address": lotusAddress
 		},
 	}
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background: $page-color-base;
 		padding-top: 16upx;
 	}
 
-	.row{
+	.row {
 		display: flex;
 		align-items: center;
 		position: relative;
-		padding:0 30upx;
+		padding: 0 30upx;
 		height: 110upx;
 		background: #fff;
 
-		.tit{
+		.tit {
 			flex-shrink: 0;
 			width: 120upx;
 			font-size: 30upx;
 			color: $font-color-dark;
 		}
-		.input{
+
+		.input {
 			flex: 1;
 			font-size: 30upx;
 			color: $font-color-dark;
 		}
-		.icon-shouhuodizhi{
+
+		.icon-shouhuodizhi {
 			font-size: 36upx;
 			color: $font-color-light;
 		}
 	}
-	.default-row{
+
+	.default-row {
 		margin-top: 16upx;
-		.tit{
+
+		.tit {
 			flex: 1;
 		}
-		switch{
+
+		switch {
 			transform: translateX(16upx) scale(.9);
 		}
 	}
-	.add-btn{
+
+	.add-btn {
 		display: flex;
 		align-items: center;
 		justify-content: center;
diff --git a/mallplusui-uniapp-app/pagesU/address/addressManage_2023-02-20.vue b/mallplusui-uniapp-app/pagesU/address/addressManage_2023-02-20.vue
new file mode 100644
index 0000000..2da3638
--- /dev/null
+++ b/mallplusui-uniapp-app/pagesU/address/addressManage_2023-02-20.vue
@@ -0,0 +1,232 @@
+<template>
+	<view class="content">
+
+		<view class="row b-b">
+			<text class="tit">联系人</text>
+			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名"
+				placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">手机号</text>
+			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码"
+				placeholder-class="placeholder" />
+		</view>
+
+		<view class="row b-b">
+			<text class="tit">城市</text>
+			<input placeholder="请选择城市" disabled="true"
+				:value="addressData.province + ' ' + addressData.city + ' ' + addressData.region"
+				@click="lotusAddressData.visible = true" class="input">
+			<lotus-address v-on:choseVal="choseValue" :lotusAddressData="lotusAddressData"></lotus-address>
+			</input>
+			<text class="yticon icon-shouhuodizhi"></text>
+		</view>
+		<view class="row b-b">
+			<text class="tit">地图:</text>
+
+
+			<input class="input" @click="openMap()" type="text" value="" v-model="mapAddressName"
+				placeholder="在地图上搜索并选择地址" disabled="true" />
+			<text class="yticon icon-shouhuodizhi"></text>
+
+		</view>
+		<view class="row b-b">
+			<text class="tit">详细</text>
+			<input class="input" type="text" v-model="addressData.detailAddress" placeholder="街道、楼号、门牌"
+				placeholder-class="placeholder" />
+		</view>
+
+		<view class="row default-row">
+			<text class="tit">设为默认</text>
+			<switch :checked="addressData.defaultStatus" color="#fa436a" @change="switchChange" />
+		</view>
+		<button class="add-btn" @click="confirm">提交</button>
+	</view>
+</template>
+
+<script>
+	import Api from '@/common/api';
+	import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue"
+	export default {
+		data() {
+			return {
+				mapAddressName: '',
+				addressData: {
+					name: '',
+					phoneNumber: '',
+					province: '',
+					city: '',
+					region: '',
+					detailAddress: '',
+					defaultStatus: 0,
+					def: false
+				},
+				lotusAddressData: {
+					visible: false,
+					provinceName: '',
+					cityName: '',
+					townName: '',
+				},
+			}
+		},
+		onLoad(option) {
+			let title = '新增收货地址';
+			if (option.type === 'edit') {
+				title = '编辑收货地址'
+				this.addressData = JSON.parse(option.data)
+			}
+			this.manageType = option.type;
+			uni.setNavigationBarTitle({
+				title
+			})
+		},
+		methods: {
+			switchChange(e) {
+				this.addressData.defaultStatus = e.detail.value ? 1 : 0
+				this.addressData.def = e.detail.value
+			},
+			openMap() {
+				var _this = this;
+				uni.chooseLocation({
+
+					success: function(res) {
+						console.log('res', res);
+
+						_this.addressData.latitude = res.latitude;
+						_this.addressData.longitude = res.longitude;
+						_this.mapAddressName = res.address + res.name;
+						_this.addressData.detailAddress = res.address + res.name;
+						console.log('经度：' + res.longitude);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+					}
+				});
+
+			},
+			choseValue(res) {
+				//res数据源包括已选省市区与省市区code
+				this.lotusAddressData.visible = false; //visible为显示与关闭组件标识true显示false隐藏
+				if (res.isChose) {
+					console.log(res)
+					this.lotusAddressData.provinceName = res.provice; //省
+					this.lotusAddressData.cityName = res.city; //市
+					this.lotusAddressData.townName = res.town; //区
+
+					//赋值到addressData
+					this.addressData.province = res.provice
+					this.addressData.city = res.city
+					this.addressData.region = res.town
+
+				}
+			},
+
+			//提交
+			async confirm() {
+				const that = this
+				let data = this.addressData;
+				if (!data.name) {
+					this.$api.msg('请填写收货人姓名');
+					return;
+				}
+				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.phoneNumber)) {
+					that.$api.msg('请输入正确的手机号码');
+					return
+				}
+				if (!data.province) {
+					that.$api.msg('请选择省市区');
+					return
+				}
+				if (!data.city) {
+					that.$api.msg('请选择二级城市')
+					return
+				}
+				if (!data.region) {
+					that.$api.msg('请选择三级区或县')
+					return
+				}
+				if (!data.detailAddress) {
+					that.$api.msg('请输入详细地址');
+					return
+				}
+
+				let data1 = await Api.apiCall('post', Api.goods.addressSave, that.addressData);
+				if (data1) {
+					this.$api.msg(`保存成功`);
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1
+						})
+
+					}, 800);
+				} else {
+					this.$api.msg(`保存失败`);
+				}
+
+
+			},
+		},
+		components: {
+			"lotus-address": lotusAddress
+		},
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: $page-color-base;
+		padding-top: 16upx;
+	}
+
+	.row {
+		display: flex;
+		align-items: center;
+		position: relative;
+		padding: 0 30upx;
+		height: 110upx;
+		background: #fff;
+
+		.tit {
+			flex-shrink: 0;
+			width: 120upx;
+			font-size: 30upx;
+			color: $font-color-dark;
+		}
+
+		.input {
+			flex: 1;
+			font-size: 30upx;
+			color: $font-color-dark;
+		}
+
+		.icon-shouhuodizhi {
+			font-size: 36upx;
+			color: $font-color-light;
+		}
+	}
+
+	.default-row {
+		margin-top: 16upx;
+
+		.tit {
+			flex: 1;
+		}
+
+		switch {
+			transform: translateX(16upx) scale(.9);
+		}
+	}
+
+	.add-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 690upx;
+		height: 80upx;
+		margin: 60upx auto;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+</style>
diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
index f8c0a0a..bc5ce05 100644
--- a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
+++ b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
@@ -31,7 +31,7 @@
 	import {
 		formatDate
 	} from '@/common/date';
-	
+
 	export default {
 		data() {
 			return {
diff --git a/mallplusui-uniapp-app/static/logo.png b/mallplusui-uniapp-app/static/logo.png
index 027dde9..42b8b75 100644
Binary files a/mallplusui-uniapp-app/static/logo.png and b/mallplusui-uniapp-app/static/logo.png differ
diff --git a/mallplusui-uniapp-app/static/logo1.png b/mallplusui-uniapp-app/static/logo1.png
new file mode 100644
index 0000000..027dde9
Binary files /dev/null and b/mallplusui-uniapp-app/static/logo1.png differ
diff --git a/mallplusui-uniapp-app/static/logo2.png b/mallplusui-uniapp-app/static/logo2.png
index d072c74..98ce7ac 100644
Binary files a/mallplusui-uniapp-app/static/logo2.png and b/mallplusui-uniapp-app/static/logo2.png differ
diff --git a/mallplusui-uniapp-app/static/logo3.jpg b/mallplusui-uniapp-app/static/logo3.jpg
deleted file mode 100644
index 544d6ed..0000000
Binary files a/mallplusui-uniapp-app/static/logo3.jpg and /dev/null differ
diff --git a/mallplusui-uniapp-app/static/tab-message.png b/mallplusui-uniapp-app/static/tab-message.png
new file mode 100644
index 0000000..06a907e
Binary files /dev/null and b/mallplusui-uniapp-app/static/tab-message.png differ
diff --git a/mallplusui-uniapp-app/static/tab-message_.png b/mallplusui-uniapp-app/static/tab-message_.png
new file mode 100644
index 0000000..9bcd5b8
Binary files /dev/null and b/mallplusui-uniapp-app/static/tab-message_.png differ
diff --git a/mallplusui-uniapp-app/store/index.js b/mallplusui-uniapp-app/store/index.js
index 09ce84e..66a553c 100644
--- a/mallplusui-uniapp-app/store/index.js
+++ b/mallplusui-uniapp-app/store/index.js
@@ -6,14 +6,14 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		hasLogin: false,
-		userInfo:''
+		userInfo: ''
 	},
 	mutations: {
 		login(state, provider) {
-		console.log(provider);
-			if (provider && provider!=undefined){
-                state.hasLogin = true;
-				uni.setStorage({//缓存用户登陆状态
+			console.log(provider);
+			if (provider && provider != undefined) {
+				state.hasLogin = true;
+				uni.setStorage({ //缓存用户登陆状态
 					key: 'userInfo',
 					data: provider.userInfo
 				})
@@ -26,8 +26,8 @@ const store = new Vuex.Store({
 			state.hasLogin = false;
 			state.userInfo = '';
 			uni.removeStorage({
-                key: 'userInfo'
-            })
+				key: 'userInfo'
+			})
 		}
 	},
 	actions: {
diff --git a/mallplusui-uniapp-app/uni_modules/uni-data-select/changelog.md b/mallplusui-uniapp-app/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..dd87dbb
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,33 @@
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/mallplusui-uniapp-app/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/mallplusui-uniapp-app/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..131babe
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,502 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="current && clear && !disabled" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
+					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 25px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 25px;
+		// border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		// border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 25px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 25x;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 25px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 500px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 55px;
+		font-size: 25px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 25px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
diff --git a/mallplusui-uniapp-app/uni_modules/uni-data-select/package.json b/mallplusui-uniapp-app/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..e66999d
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.5",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-data-select/readme.md b/mallplusui-uniapp-app/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/changelog.md b/mallplusui-uniapp-app/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..8f03f1d
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,19 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..a4f14a5
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..f15d510
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..a255c6d
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..e5eff4d
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,399 @@
+<template>
+	<view class="uni-load-more" @click="onClick">
+		<!-- #ifdef APP-NVUE -->
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true"
+			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<svg width="24" height="24" viewBox="25 25 50 50"
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-H5">
+			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
+		</svg>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE || H5 -->
+		<view
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-MP">
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image :src="imgBase64" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<text v-if="showText" class="uni-load-more__text"
+			:style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
+	</view>
+</template>
+
+<script>
+	let platform
+	setTimeout(() => {
+		platform = uni.getSystemInfoSync().platform
+	}, 16)
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		emits: ['clickLoadMore'],
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '',
+						contentrefresh: '',
+						contentnomore: ''
+					}
+				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				webviewHide: false,
+				platform: platform,
+				imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZV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'
+			}
+		},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
+			contentdownText() {
+				return this.contentText.contentdown || t("uni-load-more.contentdown")
+			},
+			contentrefreshText() {
+				return this.contentText.contentrefresh || t("uni-load-more.contentrefresh")
+			},
+			contentnomoreText() {
+				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 14px;
+		margin-left: 8px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		// margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5 image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5 circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
+		animation: loading-android-MP-1 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(90deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-2 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-3 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/package.json b/mallplusui-uniapp-app/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..2fa6f04
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/uni_modules/uni-load-more/readme.md b/mallplusui-uniapp-app/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/changelog.md b/mallplusui-uniapp-app/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/index.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/package.json b/mallplusui-uniapp-app/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/readme.md b/mallplusui-uniapp-app/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/index.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_border.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_color.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_radius.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_space.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_styles.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_text.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_variables.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/styles/tools/functions.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/theme.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/mallplusui-uniapp-app/uni_modules/uni-scss/variables.scss b/mallplusui-uniapp-app/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/mallplusui-uniapp-app/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);