diff --git a/docs/2.11 汇融云链.zip b/docs/2.11 汇融云链.zip
new file mode 100644
index 0000000..84f8df4
Binary files /dev/null and b/docs/2.11 汇融云链.zip differ
diff --git a/docs/xiugai/20230211/20230211.txt b/docs/xiugai/20230211/20230211.txt
new file mode 100644
index 0000000..884d114
--- /dev/null
+++ b/docs/xiugai/20230211/20230211.txt
@@ -0,0 +1,31 @@
+1.团购已经添加商品但不能在“拼团特价”里显示
+2.优惠券不能使用
+3.“精选标签”和“卖家中心”里面的功能没有调整
+4.点击“卖家中心”一直在请稍候的状态
+5.“物业管理”里“小区列表”没有添加功能，编辑信息时不能保存字段，同时地图不能选点，增加一个上传图片功能如产品图片。
+6.“农村社区”里的“社区列表”改为“农村社区列表”，列表显示村名、地址、电话，去掉均价。上面去掉“楼房”搜索项。
+7.“社区主页”变更为村名，“社区活动”变更为“社区公告”，去掉“费用管理”，“社区服务”改为“限时抢购”，“社区拍卖”改为“农机租赁”，农机租赁可先做成文章形式的，以发布信息方式体现。下方放“社区团购”、“社区特供”分别对应首页的“拼团特价”、“区域商品”、“积分兑换”。
+
+3.“精选标签”和“卖家中心”里面的功能没有调整 （郭兴）
+ 应该怎么调整？
+
+4.点击“精选标签”一直在请稍候的状态 （郭兴）
+这三个接口需要调整 
+orderStatic: 'home/orderStatic', // 订单统计
+  goodsStatic: 'home/goodsStatic', // 商品统计
+  userStatic: 'home/userStatic', //会员统计
+  bannerList: 'sms/SmsHomeAdvertise/list', // 首页banner
+
+6.“农村社区”里的“社区列表”改为“农村社区列表”，（完成）
+
+列表显示村名、地址、电话，去掉均价。 列表显示字段 需要接口调整
+ communityList: 'single/build/communityList', // 所有社区和房间
+   nearCommunityList: 'single/build/near/communityList', // 周边社区
+   
+上面去掉“楼房”搜索项。 （完成）  
+   
+7.“社区主页”变更为村名，“社区活动”变更为“社区公告”，去掉“费用管理”，“社区服务”改为“限时抢购”，“社区拍卖”改为“农机租赁”，（完成）
+
+农机租赁可先做成文章形式的，以发布信息方式体现。（不理解需求）
+
+下方放“社区团购”、“社区特供”分别对应首页的“拼团特价”、“区域商品”、“积分兑换”。（不理解需求，俩个对应三个？？）
\ No newline at end of file
diff --git a/mallplus-admin/src/main/resources/application-dev.properties b/mallplus-admin/src/main/resources/application-dev.properties
index bdb823b..14ea2d7 100644
--- a/mallplus-admin/src/main/resources/application-dev.properties
+++ b/mallplus-admin/src/main/resources/application-dev.properties
@@ -18,9 +18,11 @@ spring.redis.pool.min-idle=0
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=0
 #===redis end===
-spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=root
+#spring.datasource.password=root
+spring.datasource.password=1LAiGz$t1*Iw
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.druid.initialSize=5
diff --git a/mallplus-admin/src/main/resources/application.properties b/mallplus-admin/src/main/resources/application.properties
index 8ca6073..0288546 100644
--- a/mallplus-admin/src/main/resources/application.properties
+++ b/mallplus-admin/src/main/resources/application.properties
@@ -20,9 +20,7 @@ aliyun.oss.bucketName=yxt-sc
 aliyun.oss.policy.expire=300
 aliyun.oss.maxSize=10
 #aliyun.oss.callback=http://39.104.100.138:8085/aliyun/oss/callback
-
-
-
+aliyun.oss.callback=https://mall.yyundong.com/adminapi/aliyun/oss/callback
 aliyun.oss.dir.prefix=
 #===OSS end===
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
index 8a05ec9..ec8ce51 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
@@ -26,6 +26,6 @@ public class ConstansValue {
 
     public static final String sampleSubjectList = "id, category_id, title, pic, product_count, recommend_status, create_time, collect_count, read_count, comment_count, album_pics, description, show_status,  forward_count, category_name, area_id, school_id, member_id, area_name, school_name, reward, member_name, video_src, type";
 
-    public static final String sampleCommunityList = "id, company_id, name, pic, price,wuyecompany,wuyefei,latitude,longitude,create_time ";
+    public static final String sampleCommunityList = "id, company_id, name, pic, price, details,wuyecompany,wuyefei,latitude,longitude,create_time ";
 
 }
diff --git a/mallplus-portal/src/main/resources/application-dev.properties b/mallplus-portal/src/main/resources/application-dev.properties
index 78330ac..8f0662b 100644
--- a/mallplus-portal/src/main/resources/application-dev.properties
+++ b/mallplus-portal/src/main/resources/application-dev.properties
@@ -1,7 +1,8 @@
-#spring.datasource.url=jdbc:mysql://39.104.142.92:3306/mallplus?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=1LAiGz$t1*Iw
+#spring.datasource.password=root
 #spring.datasource.url=jdbc:mysql://39.104.142.92:3306/mallplus?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
 #spring.datasource.username=root
 #spring.datasource.password=123456
diff --git a/mallplus-portal/src/main/resources/application.properties b/mallplus-portal/src/main/resources/application.properties
index 12f1b66..9fb3004 100644
--- a/mallplus-portal/src/main/resources/application.properties
+++ b/mallplus-portal/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 spring.jackson.time-zone=GMT+8
 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
 spring.profiles.active=test
+#spring.profiles.active=dev
 #===server start===
 server.port=8083
 #===server end===
diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index bbfaaaa..31f2988 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -1,10 +1,10 @@
 import store from '../store/index';
 export default {
 	// qq 237524947 wx15d4269d3210863d
-	//BASEURI: 'http://localhost:8083/api/',
-	BASEURI: 'http://127.0.0.1:8083/api/',
-	ADMINURI: 'http://127.0.0.1:8085/',
-	ESURI: 'http://127.0.0.1:8081/',
+	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+	// BASEURI: 'http://www.yyundong.com:8083/api/',
+	ADMINURI: 'http://mall.yyundong.com/adminapi/',
+	ESURI: 'http://www.yyundong.com:8081/',
 	h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId  暂时测试用
 	source: 1, //1 weixinApplet 2 h5Source 3 pcSource 4 android 5ios
 	es: {
@@ -52,8 +52,8 @@ export default {
 		shopDetail: 'single/store/shopDetail', // 门店详情
 		storeClassList: 'single/store/storeClass/list', // 商户内部分类
 		storeCommentList: 'single/store/storeComment/list', // 商户评论
-        noticeList: 'single/home/notice/list',
-        noticeDetail: 'single/home/notice/detail',
+		noticeList: 'single/home/notice/list',
+		noticeDetail: 'single/home/notice/detail',
 	},
 	member: {
 		applyMember: 'single/user/applyMember', // 会员升级等级
@@ -74,9 +74,9 @@ export default {
 		storeDetail1: 'single/store/detail1', // 商户详情 带用户
 		store: 'single/store/home', // 商户主页
 		storeList: 'single/store/store/list', // 商户列表
-        memberTagList: 'single/user/memberTag/list', // 商户列表
-        addStoreComment: 'single/store/addStoreComment', // 商户addStoreComment
-        memberBlanceLogList:  'single/user/memberBlanceLog/list',
+		memberTagList: 'single/user/memberTag/list', // 商户列表
+		addStoreComment: 'single/store/addStoreComment', // 商户addStoreComment
+		memberBlanceLogList: 'single/user/memberBlanceLog/list',
 	},
 	build: {
 		getBuildNoticeByPage: 'single/build/getBuildNoticeByPage', // 所有社区和房间
@@ -93,7 +93,7 @@ export default {
 
 	},
 	goods: {
-	    tagGoodsList: 'single/pms/tag/goods', // 查询标签商品
+		tagGoodsList: 'single/pms/tag/goods', // 查询标签商品
 		goodsPromoto: 'single/sms/detail', // 单个商品的优惠详情
 		secskillDetail: 'single/pms/secskill/detail', // 查询秒杀商品详情信息
 		groupGoodsDetail: 'single/pms/goodsGroup/detail', // 查询拼团商品详情信息
@@ -258,6 +258,7 @@ export default {
 
 		let token = uni.getStorageSync('token') || '';
 		let fullurl = this.BASEURI + endpoint;
+			console.log("fullurl",fullurl);
 		var contentType = 'application/x-www-form-urlencoded';
 
 		data.authorization = token;
@@ -272,11 +273,6 @@ export default {
 				// 'authorization1': Authorization || ''
 			},
 		});
-		console.log('fullurl,',fullurl)
-		console.log('data,',data)
-		console.log('token,',token)
-		console.log('error,',error)
-		console.log('res,',res)
 		if (load) {
 			uni.hideLoading();
 		}
@@ -311,9 +307,10 @@ export default {
 		console.log(fullurl);
 		console.log(res.data.data);
 		if (res.data.code == 200) {
+			console.log("===>>>");
 			return res.data.data;
 		} else {
-
+			console.log(">>>>>=");
 			if (res.data) {
 				if (!res.data.msg) {
 					res.data.msg = res.data.data;
diff --git a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
index 9cd147d..5b3fb74 100644
--- a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
+++ b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
@@ -1,93 +1,190 @@
 <template>
-    <view class="coupon-item">
+	<view class="coupon-item">
 		<view class="coupon-money">
-			<view class="nick" ></view>
+			<view class="nick">{{item.name}}</view>
 			<view class="layof" :style="{color:theme}">￥{{item.amount}}</view>
 			<view class="end_time">{{item.endTime | formatCreateTime}}前使用</view>
-			<view >
-				 <view class="demand">满{{ item.minPoint }} 减 {{ item.amount }}</view>
+			<view>
+				<view class="demand">满{{ item.minPoint }} 减 {{ item.amount }}</view>
 			</view>
 		</view>
-		<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}" @click="acceptCoupon(item)" >立即领取</view>
-		<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}" :url='item.url' @click="acceptCoupon(item)">立即使用</navigator>
-    </view>
+		<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}"
+			@click="acceptCoupon(item)">立即领取</view>
+		<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}"
+			:url='item.url' @click="useCoupon(item)">立即使用</navigator>
+	</view>
 </template>
 
 <script>
-import Api from '@/common/api';
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import { formatDate } from '@/common/date';
+	import Api from '@/common/api';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import {
+		formatDate
+	} from '@/common/date';
 
-export default {
-	components:{
+	export default {
+		components: {
 
-	},
-	data() {
-		return {
-
-		}
-	},
-	props:{
-		item:{
-			type: Object
 		},
-		types:{
-			type: String,
-			default: ''
+		data() {
+			return {
+				types: false
+			}
 		},
-		theme:{
-			type: String,
-			default: '#ff9000'
+		props: {
+			item: {
+				type: Object
+			},
+			theme: {
+				type: String,
+				default: '#ff9000'
+			},
+			solid: {
+				type: String,
+				default: '#ffffff'
+			},
+			color: {
+				type: String,
+				default: '#ff9000'
+			},
 		},
-		solid:{
-			type: String,
-			default: '#ffffff'
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+			},
 		},
-		color:{
-			type: String,
-			default: '#ff9000'
-		},
-	},
-	filters: {
-                  formatCreateTime(time) {
-                    let date = new Date(time);
-                    return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
-                  },
-                },
-	methods: {
-        async acceptCoupon(item){
-		       uni.showLoading({
-        				title: '请稍后'
-        			});
+		methods: {
+			async acceptCoupon(item) {
+				this.types =!this.types
+					uni.showLoading({
+						title: '请稍后'
+					});
 
-        			let params = { couponId: item.id };
-        			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
-                        console.log(data);
-        			if (data) {
-        				this.$api.msg(data);
-        			}
-        			uni.hideLoading();
+				let params = {
+					couponId: item.id
+				};
+				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+				}
+				uni.hideLoading();
 
-		},
+			},
+			async useCoupon(item){
+				uni.showLoading({
+					title: '请稍后'
+				});
+			}
+		}
 	}
-}
 </script>
 
 <style lang='scss'>
-.coupon-item {
-	width:100%; height:auto; display:table; border-radius:10upx; padding:0 20upx; margin-top:22upx; border:1px solid #eeeeee; position:relative;
-	.coupon-money {
-		width:465upx; height:auto; display:table; float:left; padding:26upx 0; border-style:none dotted none none; border-color:#eeeeee;
+	.coupon-item {
+		width: 100%;
+		height: auto;
+		display: table;
+		border-radius: 10upx;
+		padding: 0 20upx;
+		margin-top: 22upx;
+		border: 1px solid #eeeeee;
+		position: relative;
+
+		.coupon-money {
+			width: 465upx;
+			height: auto;
+			display: table;
+			float: left;
+			padding: 26upx 0;
+			border-style: none dotted none none;
+			border-color: #eeeeee;
+
+			.nick {
+				width: 100%;
+				height: 50upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+
+			.tit {
+				width: 100%;
+				height: 50upx;
+				line-height: 50upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
 
-		.nick { width:100%; height:50upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; }
-		.tit { width:100%; height:50upx; line-height:50upx; font-size:$font-sm; color:$font-color-999; }
-		.demand { width:100%; height:30upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; }
+			.demand {
+				width: 100%;
+				height: 30upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+
+			.layof {
+				width: 100%;
+				height: 48upx;
+				line-height: 30upx;
+				font-size: 44upx;
+				color: #ff9000;
+				font-weight: bold;
+			}
+
+			.end_time {
+				width: 100%;
+				height: 30upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+		}
+
+		.get-btn {
+			width: 146upx;
+			height: 52upx;
+			line-height: 50upx;
+			position: absolute;
+			top: 50%;
+			right: 26upx;
+			margin-top: -26upx;
+			text-align: center;
+			border-radius: 60upx;
+			color: #ff9000;
+			border: 1px solid #ff9000;
+			font-size: $font-sm;
+			float: right;
+		}
+	}
+
+	.coupon-item:after {
+		width: 40upx;
+		height: 20upx;
+		position: absolute;
+		left: 460upx;
+		top: -1px;
+		border-radius: 0 0 40upx 40upx;
+		content: "";
+		display: block;
+		background: $bgcolor_white;
+		border: 1px solid #eeeeee;
+		border-top: 0px;
+	}
 
-		.layof { width:100%; height:48upx; line-height:30upx; font-size:44upx; color:#ff9000; font-weight:bold; }
-		.end_time { width:100%; height:30upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; }
+	.coupon-item:before {
+		width: 40upx;
+		height: 20upx;
+		position: absolute;
+		left: 460upx;
+		bottom: -1px;
+		border-radius: 40upx 40upx 0 0;
+		content: "";
+		display: block;
+		background: $bgcolor_white;
+		border: 1px solid #eeeeee;
+		border-bottom: 0px;
 	}
-	.get-btn { width:146upx; height:52upx; line-height:50upx; position:absolute; top:50%; right:26upx; margin-top:-26upx; text-align:center; border-radius:60upx; color:#ff9000; border:1px solid #ff9000; font-size:$font-sm; float:right; }
-}
-.coupon-item:after { width:40upx; height:20upx; position:absolute; left:460upx; top:-1px; border-radius:0 0 40upx 40upx; content:""; display:block; background:$bgcolor_white; border:1px solid #eeeeee; border-top:0px; }
-.coupon-item:before { width:40upx; height:20upx; position:absolute; left:460upx; bottom:-1px; border-radius:40upx 40upx 0 0; content:""; display:block; background:$bgcolor_white; border:1px solid #eeeeee; border-bottom:0px; }
 </style>
diff --git a/mallplusui-uniapp-app/components/likes/likes.vue b/mallplusui-uniapp-app/components/likes/likes.vue
new file mode 100644
index 0000000..3b35e05
--- /dev/null
+++ b/mallplusui-uniapp-app/components/likes/likes.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="icons" @click.stop="likeTab">
+		<uni-icons size="20" color="#f07373" :type="like?'heart-filled':'heart'" ></uni-icons>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			item:{
+				type:Object,
+				default(){
+					return {}
+				}
+			},
+			types:{
+				type:String,
+				default:''
+			}
+		},
+		watch:{
+			item(newVal){
+				this.like = this.item.is_like
+			}
+		},
+		created() {
+			this.like = this.item.is_like
+		},
+		data() {
+			return {
+				like:false
+			};
+		},
+		methods:{
+			likeTab(){
+				this.like = !this.like;
+				this.updateLikes();
+			},
+			updateLikes(){
+				uni.showLoading(); 
+				this.$api.update_likes({
+					user_id:'5f3d11c03d11c60001141e5f',
+					article_id:this.item._id
+				}).then(res=>{
+					uni.hideLoading();
+					console.log(res);
+					uni.showToast({
+						title:this.like?"收藏成功":"取消收藏",
+						icon:'none'
+					})
+					uni.$emit('update_article',this.types)
+				}).catch(()=>{
+					uni.hideLoading();
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.icons {
+		position: absolute;
+		right: 0;
+		top: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 20px;
+		height: 20px;
+	}
+</style>
diff --git a/mallplusui-uniapp-app/components/mall-copyright/mallplusCopyright.vue b/mallplusui-uniapp-app/components/mall-copyright/mallplusCopyright.vue
index 0d8f5f9..667d793 100644
--- a/mallplusui-uniapp-app/components/mall-copyright/mallplusCopyright.vue
+++ b/mallplusui-uniapp-app/components/mall-copyright/mallplusCopyright.vue
@@ -21,6 +21,10 @@ export default {
 
 <style>
 .cpr{
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	justify-self: center;
 	text-align: center;
 	font-size: 24upx;
 	margin: 20upx 0;
diff --git a/mallplusui-uniapp-app/config/baseUrl.js b/mallplusui-uniapp-app/config/baseUrl.js
index ebb8503..45a2dda 100644
--- a/mallplusui-uniapp-app/config/baseUrl.js
+++ b/mallplusui-uniapp-app/config/baseUrl.js
@@ -5,13 +5,13 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://localhost:7001/";
 	// socketUrl = "ws://localhost:8001/";
 	// baseUrl = "http://26077a35f5.wicp.vip:43609/";
-	baseUrl = "http://192.168.3.108:8083/";
-	socketUrl = "ws://192.168.3.108:8083/";
+	baseUrl = "http://www.yyundong.com:8083/";
+	socketUrl = "ws://8192.168.43.195:8083/";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	baseUrl = "http://192.168.3.108:8083/";
+	baseUrl = "http://www.yyundong.com:8083/";
 	// baseUrl = "http://192.168.43.195:8083/";
-	socketUrl = "ws://192.168.3.108:8083/";
+	socketUrl = "ws://192.168.43.195:8083/";
 }
 const courtConfig = {
 	//微信公众号APPID
diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json
index 68f6fa8..aab77fc 100644
--- a/mallplusui-uniapp-app/manifest.json
+++ b/mallplusui-uniapp-app/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "宇运动商城",
-    "appid" : "__UNI__0802E33",
+    "name" : "汇融云链",
+    "appid" : "__UNI__FB2C9C4",
     "description" : "",
     "versionName" : "4.0.0.0",
     "versionCode" : 4000,
@@ -55,7 +55,9 @@
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ]
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {
                 "oauth" : {
                     "weixin" : {
diff --git a/mallplusui-uniapp-app/pages.json b/mallplusui-uniapp-app/pages.json
index 24c2677..4be3ec2 100644
--- a/mallplusui-uniapp-app/pages.json
+++ b/mallplusui-uniapp-app/pages.json
@@ -2,10 +2,11 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
+				"enablePullDownRefresh": true,
 				// #ifdef MP
-				"navigationBarTitleText": "mallcloud商城",
+				"navigationBarTitleText": "汇融云链",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
+
 				// #endif
 				"app-plus": {
 					"titleNView": {
@@ -13,7 +14,7 @@
 						"searchInput": {
 							"backgroundColor": "rgba(231, 231, 231,.7)",
 							"borderRadius": "16px",
-							"placeholder": "请输入地址 如：大钟寺",
+							"placeholder": "请输入要查询的信息",
 							"disabled": true,
 							"placeholderColor": "#606266"
 						},
@@ -59,7 +60,17 @@
 					}
 				}
 			}
-		},  {
+		}, 	{
+			"path": "pages/index/lease",
+			"style": {
+				"navigationBarTitleText": "农机租赁"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
+			}
+		}, {
 			"path": "pages/order/orderDetail",
 			"style": {
 				"navigationBarTitleText": "详情展示",
@@ -80,7 +91,7 @@
 				}
 			}
 		},
-		 {
+		{
 			"path": "pages/set/set",
 			"style": {
 				"navigationBarTitleText": "设置"
@@ -96,13 +107,13 @@
 			"path": "pages/index/nearbyBusiness",
 			"style": {
 				"navigationBarTitleText": "附近商家"
-				// #ifdef MP-WEIXIN
-			,
+					// #ifdef MP-WEIXIN
+					,
 				"navigationStyle": "custom"
 				// #endif
 			}
 		},
-		 {
+		{
 			"path": "pages/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车"
@@ -178,12 +189,12 @@
 			"style": {
 				"navigationBarTitleText": "我的订单",
 				"enablePullDownRefresh": true,
-				"onReachBottomDistance":126 ,//距离底部多远时触发 单位px
+				"onReachBottomDistance": 126, //距离底部多远时触发 单位px
 				"app-plus": {
 					"bounce": "none"
 				}
 			}
-		},{
+		}, {
 			"path": "pages/order/createOrder",
 			"style": {
 				"navigationBarTitleText": "创建订单"
@@ -209,7 +220,7 @@
 			"style": {
 				"navigationBarTitleText": "支付成功"
 			}
-		},  {
+		}, {
 			"path": "pages/category/category",
 			"style": {
 				"navigationBarTitleText": "分类",
@@ -231,7 +242,7 @@
 					"bounce": "none"
 				}
 			}
-		}, 
+		},
 		{
 			"path": "pages/order/payment/index",
 			"style": {
@@ -249,7 +260,7 @@
 			"style": {
 				"navigationBarTitleText": "支付结果"
 			}
-		},   {
+		}, {
 			"path": "pages/integral/home/home",
 			"style": {
 				"navigationBarTitleText": "我的积分"
@@ -266,11 +277,9 @@
 			}
 		}
 	],
-	"subPackages": [
-		{
+	"subPackages": [{
 			"root": "pagesC",
-			"pages": [
-				{
+			"pages": [{
 					"path": "store/list",
 					"style": {
 						"enablePullDownRefresh": true,
@@ -291,7 +300,7 @@
 						"navigationBarTitleText": "商户入驻"
 
 					}
-				},  {
+				}, {
 					"path": "store/businessDetails",
 					"style": {
 						"navigationBarTitleText": "店铺详情展示",
@@ -345,12 +354,13 @@
 				{
 					"path": "seller/index",
 					"style": {
-						"navigationBarTitleText": "卖家中心",
-						"app-plus": {
-							"titleNView": {
-								"type": "transparent"
-							}
-						}
+						"navigationBarTitleText": "卖家中心"
+						// "navigationStyle": "custom"
+						// "app-plus": {
+						// 	"titleNView": {
+						// 		"type": "transparent"
+						// 	}
+						// }
 					}
 				},
 				{
@@ -449,8 +459,7 @@
 		},
 		{
 			"root": "pagesA",
-			"pages": [
-				{
+			"pages": [{
 					"path": "product/categoryAttr",
 					"style": {
 						"navigationBarTitleText": "类型商品",
@@ -475,12 +484,12 @@
 				{
 					"path": "product/tag",
 					"style": {
-						"navigationBarTitleText": "精选标签",
-						"app-plus": {
-							"titleNView": {
-								"type": "transparent"
-							}
-						}
+						"navigationBarTitleText": "精选标签"
+						// "app-plus": {
+						// 	"titleNView": {
+						// 		"type": "transparent"
+						// 	}
+						// }
 					}
 				},
 				{
@@ -570,12 +579,12 @@
 						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "商品列表"
 					}
-				}, 
-				
-				
+				},
+
+
 				{
-				    "path" : "build/repairOrder/repairOrder",
-				    "style" : {
+					"path": "build/repairOrder/repairOrder",
+					"style": {
 						"navigationBarTitleText": "维修录单"
 					}
 				},
@@ -597,7 +606,7 @@
 				}, {
 					"path": "build/communityList",
 					"style": {
-						"navigationBarTitleText": "社区列表"
+						"navigationBarTitleText": "农村社区列表"
 					}
 				},
 				{
@@ -663,15 +672,15 @@
 					"path": "user/inviteList",
 					"style": {
 						"navigationBarTitleText": "邀请好友"
-					
+
 					}
 				}, {
 					"path": "user/inviteMoney",
 					"style": {
 						"navigationBarTitleText": "邀请好友佣金"
-						
+
 					}
-				},{
+				}, {
 					"path": "user/balance",
 					"style": {
 						"navigationBarTitleText": "我的钱包"
@@ -724,13 +733,13 @@
 							"bounce": "none"
 						}
 					}
-				},{
+				}, {
 					"path": "user/profile",
 					"style": {
 						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "个人信息"
 					}
-				},{
+				}, {
 					"path": "user/applyMember",
 					"style": {
 						"navigationBarTitleText": "升级会员",
@@ -740,12 +749,12 @@
 							}
 						}
 					}
-				},{
+				}, {
 					"path": "notice/notice",
 					"style": {
 						"navigationBarTitleText": "通知"
 					}
-				},{
+				}, {
 					"path": "notice/subjectList",
 					"style": {
 						"navigationBarTitleText": "秒杀列表",
@@ -802,12 +811,12 @@
 				"selectedIconPath": "static/tab-cate-current.png",
 				"text": "分类"
 			},
-			 {
-			 	"pagePath": "pages/index/nearbyBusiness",
-			 	"iconPath": "static/fujin.png",
-			 	"selectedIconPath": "static/fujin_.png",
-			 	"text": "附近商家"
-			 },
+			{
+				"pagePath": "pages/index/nearbyBusiness",
+				"iconPath": "static/fujin.png",
+				"selectedIconPath": "static/fujin_.png",
+				"text": "附近商家"
+			},
 			{
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tab-cart.png",
diff --git a/mallplusui-uniapp-app/pages/cart/cart.vue b/mallplusui-uniapp-app/pages/cart/cart.vue
index dfe0497..d04cad2 100644
--- a/mallplusui-uniapp-app/pages/cart/cart.vue
+++ b/mallplusui-uniapp-app/pages/cart/cart.vue
@@ -8,7 +8,8 @@
 			<image src="/static/emptyCart.jpg" mode="aspectFit"></image>
 			<view v-if="hasLogin" class="empty-tips">
 				空空如也
-				<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛></navigator>
+				<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛>
+				</navigator>
 			</view>
 			<view v-else class="empty-tips">
 				空空如也
@@ -21,21 +22,18 @@
 				<block v-for="(item, index) in cartList" :key="item.id">
 					<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
 						<view class="image-wrapper">
-							<image
-								:src="item.productPic"
-								class="loaded"
-								mode="aspectFill"
-								lazy-load
-								@load="onImageLoad('cartList', index)"
-								@error="onImageError('cartList', index)"
-							></image>
-							<view class="yticon icon-xuanzhong2 checkbox" :class="{ checked: item.checked === '1' || item.checked }" @click="check('item', index)"></view>
+							<image :src="item.productPic" class="loaded" mode="aspectFill" lazy-load
+								@load="onImageLoad('cartList', index)" @error="onImageError('cartList', index)"></image>
+							<view class="yticon icon-xuanzhong2 checkbox"
+								:class="{ checked: item.checked === '1' || item.checked }"
+								@click="check('item', index)"></view>
 						</view>
 						<view class="item-right">
 							<text class="clamp title">{{ item.productName }}</text>
 							<text class="attr">{{ item.productAttr }}</text>
 							<text class="price">¥{{ item.price }}</text>
-							<uni-number-box class="step" :min="1" :value="item.quantity" :isMin="item.quantity === 1" :index="index" @eventChange="numberChange"></uni-number-box>
+							<uni-number-box class="step" :min="1" :value="item.quantity" :isMin="item.quantity === 1"
+								:index="index" @eventChange="numberChange"></uni-number-box>
 						</view>
 						<text class="del-btn yticon icon-fork" @click="deleteCartItem(index)"></text>
 					</view>
@@ -45,7 +43,8 @@
 			<!-- 底部菜单栏 -->
 			<view class="action-section">
 				<view class="checkbox">
-					<image :src="allChecked ? '/static/selected.png' : '/static/select.png'" mode="aspectFit" @click="check('all')"></image>
+					<image :src="allChecked ? '/static/selected.png' : '/static/select.png'" mode="aspectFit"
+						@click="check('all')"></image>
 					<view class="clear-btn" :class="{ show: allChecked }" @click="clearCart">清空</view>
 				</view>
 				<view class="total-box">
@@ -60,360 +59,391 @@
 			</view>
 
 		</view>
-<mallplusCopyright></mallplusCopyright>
 	</view>
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import { mapState } from 'vuex';
-import uniNumberBox from '@/components/uni-number-box.vue';
-import navBar from '@/components/zhouWei-navBar';
-export default {
-	components: {
-		uniNumberBox,
-		navBar,
-       	mallplusCopyright
-	},
-	data() {
-		return {
-			total: 0, //总价格
-			allChecked: false, //全选状态  true|false
-			empty: false, //空白页现实  true|false
-			promoteAmount: 0,
-			cartList: [],
-
-			statusBarHeight: ''
-		};
-	},
-
-	async onShow() {
-		if (this.hasLogin) {
-			this.loadData();
-		}
-	},
-	async onLoad() {
-		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-	},
-	watch: {
-		//显示空白页
-		cartList(e) {
-			let empty = e.length === 0 ? true : false;
-			if (this.empty !== empty) {
-				this.empty = empty;
-			}
-		}
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
-	},
-	methods: {
-		//请求数据
-		async loadData() {
-			let params = {};
-			let list = await Api.apiCall('get', Api.order.cartList, params);
-			// let list = await this.$api.json('cartList');
-			let cartList = list.cartItemList.map(item => {
-				item.checked = '1';
-				return item;
-			});
-			this.cartList = cartList;
-			this.promoteAmount = list.promoteAmount;
-			this.calcTotal(); //计算总价
-		},
-		//监听image加载完成
-		onImageLoad(key, index) {
-			this.$set(this[key][index], 'loaded', 'loaded');
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import {
+		mapState
+	} from 'vuex';
+	import uniNumberBox from '@/components/uni-number-box.vue';
+	import navBar from '@/components/zhouWei-navBar';
+	export default {
+		components: {
+			uniNumberBox,
+			navBar,
+			mallplusCopyright
 		},
-		//监听image加载失败
-		onImageError(key, index) {
-			this[key][index].image = '/static/errorImage.jpg';
-		},
-		navToLogin() {
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
+		data() {
+			return {
+				total: 0, //总价格
+				allChecked: false, //全选状态  true|false
+				empty: false, //空白页现实  true|false
+				promoteAmount: 0,
+				cartList: [],
+
+				statusBarHeight: ''
+			};
 		},
-		//选中状态处理
-		check(type, index) {
-			if (type === 'item') {
-				this.cartList[index].checked = !this.cartList[index].checked;
-			} else {
-				const checked = !this.allChecked;
-				const list = this.cartList;
-				list.forEach(item => {
-					item.checked = checked;
-				});
-				this.allChecked = checked;
+
+		async onShow() {
+			if (this.hasLogin) {
+				this.loadData();
 			}
-			this.calcTotal(type);
 		},
-		//数量
-		numberChange(data) {
-			this.cartList[data.index].quantity = data.number;
-			let params = { id: this.cartList[data.index].id, quantity: data.number };
-			data = Api.apiCall('get', Api.order.updateQuantity, params);
-			this.calcTotal();
+		async onLoad() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 		},
-		//删除
-		deleteCartItem(index) {
-			var that = this;
-			uni.showModal({
-				title: '提示',
-				content: '确定将此商品移出购物车吗',
-				success: res => {
-					if(res.confirm){
-						let list = that.cartList;
-						let row = list[index];
-						let id = row.id;
-						let params = { cart_id_list: id };
-						Api.apiCall('post', Api.order.deleteCart, params);
-						that.cartList.splice(index, 1);
-						that.calcTotal();
-						uni.hideLoading();
-					}
-				},
-			});
-		},
-		//清空
-		clearCart() {
-			var that = this;
-			uni.showModal({
-				title: '提示',
-				content: '确定将购物车清空吗',
-				success: res => {
-					if(res.confirm){
-						let params = {};
-						Api.apiCall('post', Api.order.clearCart, params);
-						this.cartList = [];
-					}
+		watch: {
+			//显示空白页
+			cartList(e) {
+				let empty = e.length === 0 ? true : false;
+				if (this.empty !== empty) {
+					this.empty = empty;
 				}
-			});
-		},
-		//计算总价
-		calcTotal() {
-			let list = this.cartList;
-			if (list.length === 0) {
-				this.empty = true;
-				return;
 			}
-			let total = 0;
-			let checked = true;
-			list.forEach(item => {
-				if (item.checked === true || item.checked === '1') {
-					total += item.price * item.quantity;
-				} else if (checked === true) {
-					checked = false;
-				}
-			});
-			total = total - this.promoteAmount;
-			this.allChecked = checked;
-			this.total = Number(total.toFixed(2));
 		},
-		//创建订单
-		createOrder() {
-			let list = this.cartList;
-			var ids = '';
-			list.forEach(item => {
-				if (item.checked === true || item.checked === '1') {
-					ids = item.id + ',' + ids;
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+			//请求数据
+			async loadData() {
+				let params = {};
+				let list = await Api.apiCall('get', Api.order.cartList, params);
+				// let list = await this.$api.json('cartList');
+				let cartList = list.cartItemList.map(item => {
+					item.checked = '1';
+					return item;
+				});
+				this.cartList = cartList;
+				this.promoteAmount = list.promoteAmount;
+				this.calcTotal(); //计算总价
+			},
+			//监听image加载完成
+			onImageLoad(key, index) {
+				this.$set(this[key][index], 'loaded', 'loaded');
+			},
+			//监听image加载失败
+			onImageError(key, index) {
+				this[key][index].image = '/static/errorImage.jpg';
+			},
+			navToLogin() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
+			},
+			//选中状态处理
+			check(type, index) {
+				if (type === 'item') {
+					this.cartList[index].checked = !this.cartList[index].checked;
+				} else {
+					const checked = !this.allChecked;
+					const list = this.cartList;
+					list.forEach(item => {
+						item.checked = checked;
+					});
+					this.allChecked = checked;
 				}
-			});
-			let cartIds = ids.substr(0, ids.length - 1);
-			let dataJson ={};
+				this.calcTotal(type);
+			},
+			//数量
+			numberChange(data) {
+				this.cartList[data.index].quantity = data.number;
+				let params = {
+					id: this.cartList[data.index].id,
+					quantity: data.number
+				};
+				data = Api.apiCall('get', Api.order.updateQuantity, params);
+				this.calcTotal();
+			},
+			//删除
+			deleteCartItem(index) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定将此商品移出购物车吗',
+					success: res => {
+						if (res.confirm) {
+							let list = that.cartList;
+							let row = list[index];
+							let id = row.id;
+							let params = {
+								cart_id_list: id
+							};
+							Api.apiCall('post', Api.order.deleteCart, params);
+							that.cartList.splice(index, 1);
+							that.calcTotal();
+							uni.hideLoading();
+						}
+					},
+				});
+			},
+			//清空
+			clearCart() {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定将购物车清空吗',
+					success: res => {
+						if (res.confirm) {
+							let params = {};
+							Api.apiCall('post', Api.order.clearCart, params);
+							this.cartList = [];
+						}
+					}
+				});
+			},
+			//计算总价
+			calcTotal() {
+				let list = this.cartList;
+				if (list.length === 0) {
+					this.empty = true;
+					return;
+				}
+				let total = 0;
+				let checked = true;
+				list.forEach(item => {
+					if (item.checked === true || item.checked === '1') {
+						total += item.price * item.quantity;
+					} else if (checked === true) {
+						checked = false;
+					}
+				});
+				total = total - this.promoteAmount;
+				this.allChecked = checked;
+				this.total = Number(total.toFixed(2));
+			},
+			//创建订单
+			createOrder() {
+				let list = this.cartList;
+				var ids = '';
+				list.forEach(item => {
+					if (item.checked === true || item.checked === '1') {
+						ids = item.id + ',' + ids;
+					}
+				});
+				let cartIds = ids.substr(0, ids.length - 1);
+				let dataJson = {};
 
-                                                                    			dataJson.type=2;
-                                                                    			dataJson.cartIds=cartIds;
-                                                                    			let url='/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson)
+				dataJson.type = 2;
+				dataJson.cartIds = cartIds;
+				let url = '/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson)
 
-                                                        				uni.navigateTo({
-                                                        					url: url
-                                                        				});
+				uni.navigateTo({
+					url: url
+				});
 
 
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.container {
-	padding-bottom: 134upx;
-	/* 空白页 */
-	.empty {
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		padding-bottom: 100upx;
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		align-items: center;
-		background: #fff;
-		image {
-			width: 240upx;
-			height: 160upx;
-			margin-bottom: 30upx;
-		}
-		.empty-tips {
+	.container {
+		padding-bottom: 134upx;
+
+		/* 空白页 */
+		.empty {
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100vh;
+			padding-bottom: 100upx;
 			display: flex;
-			font-size: $font-sm + 2upx;
-			color: $font-color-disabled;
-			.navigator {
-				color: $uni-color-primary;
-				margin-left: 16upx;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			background: #fff;
+
+			image {
+				width: 240upx;
+				height: 160upx;
+				margin-bottom: 30upx;
+			}
+
+			.empty-tips {
+				display: flex;
+				font-size: $font-sm + 2upx;
+				color: $font-color-disabled;
+
+				.navigator {
+					color: $uni-color-primary;
+					margin-left: 16upx;
+				}
 			}
 		}
 	}
-}
-/* 购物车列表项 */
-.cart-item {
-	display: flex;
-	position: relative;
-	padding: 30upx 40upx;
-	.image-wrapper {
-		width: 230upx;
-		height: 230upx;
-		flex-shrink: 0;
-		position: relative;
-		image {
-			border-radius: 8upx;
-		}
-	}
-	.checkbox {
-		position: absolute;
-		left: -16upx;
-		top: -16upx;
-		z-index: 8;
-		font-size: 44upx;
-		line-height: 1;
-		padding: 4upx;
-		color: $font-color-disabled;
-		background: #fff;
-		border-radius: 50px;
-	}
-	.item-right {
+
+	/* 购物车列表项 */
+	.cart-item {
 		display: flex;
-		flex-direction: column;
-		flex: 1;
-		overflow: hidden;
 		position: relative;
-		padding-left: 30upx;
-		.title,
-		.price {
-			font-size: $font-base + 2upx;
-			color: $font-color-dark;
-			height: 40upx;
-			line-height: 40upx;
-		}
-		.attr {
-			font-size: $font-sm + 2upx;
-			color: $font-color-light;
-			height: 50upx;
-			line-height: 50upx;
+		padding: 30upx 40upx;
+
+		.image-wrapper {
+			width: 230upx;
+			height: 230upx;
+			flex-shrink: 0;
+			position: relative;
+
+			image {
+				border-radius: 8upx;
+			}
 		}
-		.price {
-			height: 50upx;
-			line-height: 50upx;
+
+		.checkbox {
+			position: absolute;
+			left: -16upx;
+			top: -16upx;
+			z-index: 8;
+			font-size: 44upx;
+			line-height: 1;
+			padding: 4upx;
+			color: $font-color-disabled;
+			background: #fff;
+			border-radius: 50px;
 		}
-	}
-	.del-btn {
-		padding: 4upx 10upx;
-		font-size: 34upx;
-		height: 50upx;
-		color: $font-color-light;
-	}
-}
-/* 底部栏 */
-.action-section {
-	/* #ifdef H5 */
-	margin-bottom: 100upx;
-	/* #endif */
-	position: fixed;
-	left: 30upx;
-	bottom: 30upx;
-	z-index: 95;
-	display: flex;
-	align-items: center;
-	width: 690upx;
-	height: 100upx;
-	padding: 0 30upx;
-	background: rgba(255, 255, 255, 0.9);
-	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
-	border-radius: 16upx;
-	.checkbox {
-		height: 52upx;
-		position: relative;
-		image {
-			width: 52upx;
-			height: 100%;
+
+		.item-right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			overflow: hidden;
 			position: relative;
-			z-index: 5;
+			padding-left: 30upx;
+
+			.title,
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				height: 40upx;
+				line-height: 40upx;
+			}
+
+			.attr {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				height: 50upx;
+				line-height: 50upx;
+			}
+
+			.price {
+				height: 50upx;
+				line-height: 50upx;
+			}
 		}
-	}
-	.clear-btn {
-		position: absolute;
-		left: 26upx;
-		top: 0;
-		z-index: 4;
-		width: 0;
-		height: 52upx;
-		line-height: 52upx;
-		padding-left: 38upx;
-		font-size: $font-base;
-		color: #fff;
-		background: $font-color-disabled;
-		border-radius: 0 50px 50px 0;
-		opacity: 0;
-		transition: 0.2s;
-		&.show {
-			opacity: 1;
-			width: 120upx;
+
+		.del-btn {
+			padding: 4upx 10upx;
+			font-size: 34upx;
+			height: 50upx;
+			color: $font-color-light;
 		}
 	}
-	.total-box {
-		flex: 1;
+
+	/* 底部栏 */
+	.action-section {
+		/* #ifdef H5 */
+		margin-bottom: 100upx;
+		/* #endif */
+		position: fixed;
+		left: 30upx;
+		bottom: 30upx;
+		z-index: 95;
 		display: flex;
-		flex-direction: column;
-		text-align: right;
-		padding-right: 40upx;
-		.price {
-			font-size: $font-lg;
-			color: $font-color-dark;
+		align-items: center;
+		width: 690upx;
+		height: 100upx;
+		padding: 0 30upx;
+		background: rgba(255, 255, 255, 0.9);
+		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+		border-radius: 16upx;
+
+		.checkbox {
+			height: 52upx;
+			position: relative;
+
+			image {
+				width: 52upx;
+				height: 100%;
+				position: relative;
+				z-index: 5;
+			}
 		}
-		.coupon {
-			font-size: $font-sm;
-			color: $font-color-light;
-			text {
+
+		.clear-btn {
+			position: absolute;
+			left: 26upx;
+			top: 0;
+			z-index: 4;
+			width: 0;
+			height: 52upx;
+			line-height: 52upx;
+			padding-left: 38upx;
+			font-size: $font-base;
+			color: #fff;
+			background: $font-color-disabled;
+			border-radius: 0 50px 50px 0;
+			opacity: 0;
+			transition: 0.2s;
+
+			&.show {
+				opacity: 1;
+				width: 120upx;
+			}
+		}
+
+		.total-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			text-align: right;
+			padding-right: 40upx;
+
+			.price {
+				font-size: $font-lg;
 				color: $font-color-dark;
 			}
+
+			.coupon {
+				font-size: $font-sm;
+				color: $font-color-light;
+
+				text {
+					color: $font-color-dark;
+				}
+			}
+		}
+
+		.confirm-btn {
+			padding: 0 38upx;
+			margin: 0;
+			border-radius: 100px;
+			height: 76upx;
+			line-height: 76upx;
+			font-size: $font-base + 2upx;
+			background: $uni-color-primary;
+			box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72);
 		}
 	}
-	.confirm-btn {
-		padding: 0 38upx;
-		margin: 0;
-		border-radius: 100px;
-		height: 76upx;
-		line-height: 76upx;
-		font-size: $font-base + 2upx;
-		background: $uni-color-primary;
-		box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72);
+
+	/* 复选框选中状态 */
+	.action-section .checkbox.checked,
+	.cart-item .checkbox.checked {
+		color: $uni-color-primary;
+	}
+
+	.getPosition {
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #fff;
 	}
-}
-/* 复选框选中状态 */
-.action-section .checkbox.checked,
-.cart-item .checkbox.checked {
-	color: $uni-color-primary;
-}
-.getPosition {
-	height: 100upx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 32upx;
-	background-color: #fff;
-}
 </style>
diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue
index 92bd39c..cf03802 100644
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@@ -2,8 +2,9 @@
 	<view class="container">
 		<!-- 小程序头部兼容 -->
 		<!-- #ifdef MP -->
-		<nav-bar>mallcloud商城</nav-bar>
-		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true" placeholder="输入关键字搜索" /></view>
+		<nav-bar>汇融云链</nav-bar>
+		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true"
+				placeholder="输入关键字搜索" /></view>
 		<!-- #endif -->
 
 		<!-- 头部轮播 -->
@@ -18,7 +19,8 @@
 				<!-- 背景色区域 -->
 				<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
 				<swiper class="carousel" circular @change="swiperChange">
-					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToTabPage(item.url)">
+					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+						@click="navToTabPage(item.url)">
 						<image :src="item.pic" />
 					</swiper-item>
 				</swiper>
@@ -32,54 +34,56 @@
 			<!-- 分类 -->
 			<view class="cate-section">
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupActivityList')">
-					<image src="/static/temp/c3.png"></image>
-					<text>套餐商品</text>
+					<image src="/static/temp//antFill-gift.png"></image>
+					<text>惠农套餐</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
-					<image src="/static/temp/c5.png"></image>
-					<text>拼团活动</text>
+					<image src="/static/temp/fasfausers.png"></image>
+					<text>拼团特价</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/giftList')">
-					<image src="/static/temp/c6.png"></image>
-					<text>积分商城</text>
+					<image src="/static/temp/fabfa-dropbox.png"></image>
+					<text>税分兑换</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
-					<image src="/static/temp/c7.png"></image>
-					<text>限时秒杀</text>
+					<image src="/static/temp/fasfa-history.png"></image>
+					<text>限时抢购</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
-					<image src="/static/temp/c8.png"></image>
-					<text>社区商城</text>
+					<image src="/static/temp/antFill-home.png"></image>
+					<text>农村社区</text>
 				</view>
 			</view>
 			<view class="cate-section">
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
-					<image src="/static/temp/c3.png"></image>
+					<image src="/static/temp/fasfa-sitemap.png"></image>
 					<text>分销商品</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isVip=1')">
-					<image src="/static/temp/c5.png"></image>
+					<image src="/static/temp/fasfa-archive.png"></image>
 					<text>会员商品</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('/pages/category/areaGoods')">
-					<image src="/static/temp/c6.png"></image>
+					<image src="/static/temp/fasfa-truck.png"></image>
 					<text>区域商品</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesC/seller/index')">
-					<image src="/static/temp/c7.png"></image>
-					<text>卖家中心</text>
-				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/tag')">
-					<image src="/static/temp/c8.png"></image>
+					<image src="/static/temp/fasfa-shopping.png"></image>
 					<text>精选标签</text>
 				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesC/seller/index')">
+					<image src="/static/temp/fasfa-street.png"></image>
+					<text>卖家中心</text>
+				</view>
 			</view>
 
 			<!-- 秒杀楼层 https://s.click.taobao.com/Wds7c1w -->
-			<view class="seckill-section m-t" v-if="homeFlashPromotion.flashSessionInfoList && homeFlashPromotion.flashSessionInfoList.length > 0">
+			<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;">
-						<image class="s-img" src="/static/temp/secskill-img.jpg" mode="widthFix" @click="navToDetailPageL('https://s.click.taobao.com/Wds7c1w')"></image>
+						<image class="s-img" src="/static/temp/secskill-img.jpg" mode="widthFix"
+							@click="navToDetailPageL('https://s.click.taobao.com/Wds7c1w')"></image>
 						<text class="tip" style="margin-left: 20upx;">{{ homeFlashPromotion.flashName }}</text>
 						<view class="s-header" style="width:35%;margin-left: 20upx;">
 							<text class="tip">{{ homeFlashPromotion.startTime || '18:00' }}</text>
@@ -89,10 +93,12 @@
 					</view>
 					<text class="yticon icon-you" @click="navToTabPage('/pages/index/secskill')"></text>
 				</view>
-				<view v-if="item2.productList && item2.productList.length > 0" v-for="(item2, index2) in homeFlashPromotion.flashSessionInfoList" :key="index2">
+				<view v-if="item2.productList && item2.productList.length > 0"
+					v-for="(item2, index2) in homeFlashPromotion.flashSessionInfoList" :key="index2">
 					<scroll-view class="floor-list" scroll-x>
 						<view class="scoll-wrapper">
-							<view v-for="(item, index) in item2.productList" :key="index" class="floor-item" @click="navToSkillDetailPage(item)">
+							<view v-for="(item, index) in item2.productList" :key="index" class="floor-item"
+								@click="navToSkillDetailPage(item)">
 								<image :src="item.productImg" mode="aspectFill"></image>
 								<text class="title clamp">{{ item.productName }}</text>
 								<text class="price">￥{{ item.flashPromotionPrice }}</text>
@@ -104,15 +110,16 @@
 			<view class="f-header m-t" @click="navToTabPage('../../pagesC/store/storeList')">
 				<image src="/static/temp/nav1.png"></image>
 				<view class="tit-box">
-					<text class="tit">精品店铺</text>
+					<text class="tit">农店推荐</text>
 					<text class="tit2">Guess You Like It</text>
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
 			<view class="cate-section">
-				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in storeList" :key="index">
+				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in storeList"
+					:key="index">
 					<image v-if="item1.logo" :src="item1.logo"></image>
-					<image  v-else src="/static/missing-face.png"></image>
+					<image v-else src="/static/missing-face.png"></image>
 					<text>{{ item1.name |formatLongText }}</text>
 				</view>
 			</view>
@@ -121,7 +128,8 @@
 			<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#ff0000"></coupon>
 
 			<!-- 团购楼层 -->
-			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')" v-if="groupHotGoodsList.length > 0">
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')"
+				v-if="groupHotGoodsList.length > 0">
 				<image src="/static/temp/h1.png"></image>
 				<view class="tit-box">
 					<text class="tit">精品团购</text>
@@ -129,9 +137,10 @@
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
-			<view class="group-section">
+			<view class="group-section" v-if="groupHotGoodsList.length > 0">
 				<swiper class="g-swiper" :duration="500">
-					<swiper-item class="g-swiper-item" v-for="(item, index) in groupHotGoodsList" :key="index" v-if="index % 2 === 0" @click="navToGroupDetailPage(item)">
+					<swiper-item class="g-swiper-item" v-for="(item, index) in groupHotGoodsList" :key="index"
+						v-if="index % 2 === 0" @click="navToGroupDetailPage(item)">
 						<view class="g-item left">
 							<image :src="item.goods.pic" mode="aspectFill"></image>
 							<view class="t-box">
@@ -141,7 +150,8 @@
 									<text class="m-price">￥{{ item.goods.price }}</text>
 								</view>
 								<view class="pro-box">
-									<view class="progress-box"><progress percent="72" activeColor="#fa436a" active stroke-width="6" /></view>
+									<view class="progress-box"><progress percent="72" activeColor="#fa436a" active
+											stroke-width="6" /></view>
 									<text>{{ item.maxPeople }}人成团</text>
 								</view>
 							</view>
@@ -160,10 +170,13 @@
 				<text class="yticon icon-you"></text>
 			</view>
 			<view class="hot-floor" v-if="item1.goodsList.length > 0" v-for="(item1, index) in cat_list" :key="index">
-				<view class="floor-img-box"><image class="floor-img" :src="item1.pic" mode="scaleToFill"></image></view>
+				<view class="floor-img-box">
+					<image class="floor-img" :src="item1.pic" mode="scaleToFill"></image>
+				</view>
 				<scroll-view class="floor-list" scroll-x>
 					<view class="scoll-wrapper">
-						<view v-for="(item, index) in item1.goodsList" :key="index" class="floor-item" @click="navToDetailPage(item)">
+						<view v-for="(item, index) in item1.goodsList" :key="index" class="floor-item"
+							@click="navToDetailPage(item)">
 							<image :src="item.pic" mode="aspectFill"></image>
 							<text class="title clamp">{{ item.name }}</text>
 							<text class="price">￥{{ item.price }}</text>
@@ -176,8 +189,9 @@
 				</scroll-view>
 			</view>
 
-<!-- 新品推荐 -->
-			<view v-if='homeNewProductList && homeNewProductList.length>0' class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+			<!-- 新品推荐 -->
+			<view v-if='homeNewProductList && homeNewProductList.length>0' class="f-header m-t"
+				@click="navToTabPage('../../pagesA/product/list')">
 				<image src="/static/temp/h1.png"></image>
 				<view class="tit-box">
 					<text class="tit">新品推荐</text>
@@ -187,8 +201,11 @@
 			</view>
 
 			<view class="guess-section">
-				<view v-for="(item, index) in homeNewProductList" :key="index" class="guess-item" @click="navToDetailPage1(item)">
-					<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<view v-for="(item, index) in homeNewProductList" :key="index" class="guess-item"
+					@click="navToDetailPage1(item)">
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
 					<text class="title clamp">{{ item.productName }}</text>
 					<text class="price">￥{{ item.price }}</text>
 
@@ -196,24 +213,28 @@
 
 			</view>
 			<!-- 人气推荐 -->
-            			<view v-if='homeRecommendProductList && homeRecommendProductList.length>0' class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
-            				<image src="/static/temp/h1.png"></image>
-            				<view class="tit-box">
-            					<text class="tit">人气推荐</text>
-            					<text class="tit2">Guess You Like It</text>
-            				</view>
-            				<text class="yticon icon-you"></text>
-            			</view>
-
-            			<view class="guess-section">
-            				<view v-for="(item, index) in homeRecommendProductList" :key="index" class="guess-item" @click="navToDetailPage1(item)">
-            					<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
-            					<text class="title clamp">{{ item.name }}</text>
-            					<text class="price">￥{{ item.price }}</text>
-
-            				</view>
-            				
-            			</view>
+			<view v-if='homeRecommendProductList && homeRecommendProductList.length>0' class="f-header m-t"
+				@click="navToTabPage('../../pagesA/product/list')">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">人气推荐</text>
+					<text class="tit2">Guess You Like It</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="guess-section">
+				<view v-for="(item, index) in homeRecommendProductList" :key="index" class="guess-item"
+					@click="navToDetailPage1(item)">
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<text class="title clamp">{{ item.name }}</text>
+					<text class="price">￥{{ item.price }}</text>
+
+				</view>
+
+			</view>
 			<!-- 新品上市 -->
 			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
 				<image src="/static/temp/h1.png"></image>
@@ -225,376 +246,399 @@
 			</view>
 
 			<view class="guess-section">
-				<view v-for="(item, index) in newProductList" :key="index" class="guess-item" @click="navToDetailPage(item)">
-					<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<view v-for="(item, index) in newProductList" :key="index" class="guess-item"
+					@click="navToDetailPage(item)">
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
 					<text class="title clamp">{{ item.name }}</text>
 					<text class="price">￥{{ item.price }}</text>
 					<text>【{{ item.storeName }}】</text>
 				</view>
 				<uni-load-more :status="loadingType"></uni-load-more>
 			</view>
-			<mallplusCopyright></mallplusCopyright>
+			<!-- <mallplusCopyright></mallplusCopyright> -->
 		</view>
 	</view>
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import coupon from '@/components/coolc-coupon/coolc-coupon';
-
-import { formatDate } from '@/common/date';
-import { mapState } from 'vuex';
-import navBar from '@/components/zhouWei-navBar';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-export default {
-	components: {
-		coupon,
-		mallplusCopyright,
-		uniLoadMore,
-		navBar
-	},
-	data() {
-		return {
-			keyword: '',
-			pageNum: 1,
-			loadingType: 'more', //加载更多状态
-			titleNViewBackground: '',
-			swiperCurrent: 0,
-			swiperLength: 0,
-			homeNewProductList: [],
-            homeRecommendProductList: [],
-			carouselList: [],
-			hotProductList: [],
-			brandList: [], // 推荐品牌
-			homeFlashPromotion: [], // 当前秒杀场次
-			subjectList: [], //推荐专题
-			cat_list: [],
-			groupHotGoodsList: [],
-			couponList: [],
-			storeList: [],
-			newProductList: []
-		};
-	},
-
-	//加载更多
-	onReachBottom() {
-		this.pageNum = this.pageNum + 1;
-
-		this.getNewProductList();
-	},
-	onPullDownRefresh() {
-		this.pageNum = this.pageNum + 1;
-		this.getNewProductList('refresh');
-
-		this.loadData();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 2000);
-	},
-	onShareAppMessage() {},
-	onLoad(ops) {
-		let isWeiXin = this.$common.isWeiXinBrowser();
-		this.getNewProductList('refresh');
-		if (ops.invitecode) {
-			this.$db.set('invitecode', ops.invitecode);
-		}
-		this.loadData();
-		this.sysInfoMethod();
-	},
-filters: {
-                    		  formatCreateTime(time) {
-                                     let date = new Date(time);
-                                     return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
-                                   },
-                                  formatNull(value) {
-                                    if(value===undefined||value===null||value===''){
-                                      return '暂无';
-                                    }else{
-                                      return value;
-                                    }
-                                  },
-                                  formatLongText(value) {
-                                    if(value===undefined||value===null||value===''){
-                                      return '暂无';
-                                    }else if(value.length>4){
-                                      return value.substr(0, 4) + '...';
-                                    }else{
-                                      return value;
-                                    }
-                                  },
-                                  formatPayType(value) {
-                                    if (value === 2) {
-                                      return '支付宝';
-                                    } else if (value === 1) {
-                                      return '微信小程序';
-                                    } else  if (value === 3){
-                                      return '余额支付';
-                                    } else  if (value === 5){
-                                               return '积分兑换';
-                                             }
-                                  },
-                                  },
-	methods: {
-	async sysInfoMethod() {
-    				let params = {};
-    				let list = this.$db.get('sysInfo')
-    				if(!list){
-    				 list = await Api.apiCall('get', Api.index.sysInfo, params);
-                        				this.$db.set('sysInfo', list)
-    				}
-
-    			},
-		getCode() {
-			var code = this.$common.getQueryString('code');
-			code && this.getOpenId(code);
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+	import {
+		formatDate
+	} from '@/common/date';
+	import {
+		mapState
+	} from 'vuex';
+	import navBar from '@/components/zhouWei-navBar';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+		components: {
+			coupon,
+			mallplusCopyright,
+			uniLoadMore,
+			navBar
 		},
-		async getOpenId(code) {
-			console.log(code);
-			let params = {
-				code: code,
-				scope: 2,
-				state: this.state
+		data() {
+			return {
+				keyword: '',
+				pageNum: 1,
+				loadingType: 'more', //加载更多状态
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				swiperLength: 0,
+				homeNewProductList: [],
+				homeRecommendProductList: [],
+				carouselList: [],
+				hotProductList: [],
+				brandList: [], // 推荐品牌
+				homeFlashPromotion: [], // 当前秒杀场次
+				subjectList: [], //推荐专题
+				cat_list: [],
+				groupHotGoodsList: [],
+				couponList: [],
+				storeList: [],
+				newProductList: []
 			};
-			//模拟接口
-			let res = await Api.apiCall('get', Api.order.authCodeToOpenid, params);
-			console.log(res);
-			if (res) {
-				this.login(data);
-				console.log(data);
-				this.$db.set('userInfos', data.userInfo);
-				this.$db.set('token', data.tokenHead + data.token);
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
+		},
+
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+
+			this.getNewProductList();
+		},
+		onPullDownRefresh() {
+			console.log("onPullDownRefresh")
+			this.pageNum = this.pageNum + 1;
+			this.getNewProductList('refresh');
 
-				//this.openid = res.data
-				//  this.toPayHandler('wechatpay')
-			} else {
-				this.$common.errorToShow(res);
+			this.loadData();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
+		},
+		onShareAppMessage() {},
+		onLoad(ops) {
+			
+			let isWeiXin = this.$common.isWeiXinBrowser();
+			this.getNewProductList('refresh');
+			if (ops.invitecode) {
+				this.$db.set('invitecode', ops.invitecode);
 			}
+			this.loadData();
+			this.sysInfoMethod();
 		},
-		checkWXJSBridge(data) {
-			let that = this;
-			let interval = setInterval(() => {
-				if (typeof window.WeixinJSBridge != 'undefined') {
-					clearTimeout(interval);
-					that.onBridgeReady(data);
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+			},
+			formatNull(value) {
+				if (value === undefined || value === null || value === '') {
+					return '暂无';
+				} else {
+					return value;
 				}
-			}, 200);
-		},
-		onBridgeReady(data) {
-			var _this = this;
-			window.WeixinJSBridge.invoke(
-				'getBrandWCPayRequest',
-				{
-					appId: data.appid, // 公众号名称，由商户传入
-					timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
-					nonceStr: data.nonceStr, // 随机串
-					package: data.package,
-					signType: data.signType, // 微信签名方式：
-					paySign: data.paySign // 微信签名
-				},
-				function(res) {
-					if (res.err_msg === 'get_brand_wcpay_request:ok') {
-						_this.$common.successToShow('支付成功');
-					} else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
-						_this.$common.errorToShow('取消支付');
-					} else {
-						_this.$common.errorToShow('支付失败');
-					}
-					setTimeout(() => {
-						_this.$common.redirectTo('/pages/order/payment/result?id=' + data.id);
-					}, 1000);
+			},
+			formatLongText(value) {
+				if (value === undefined || value === null || value === '') {
+					return '暂无';
+				} else if (value.length > 4) {
+					return value.substr(0, 4) + '...';
+				} else {
+					return value;
 				}
-			);
+			},
+			formatPayType(value) {
+				if (value === 2) {
+					return '支付宝';
+				} else if (value === 1) {
+					return '微信小程序';
+				} else if (value === 3) {
+					return '余额支付';
+				} else if (value === 5) {
+					return '积分兑换';
+				}
+			},
 		},
+		methods: {
+			async sysInfoMethod() {
+				let params = {};
+				let list = this.$db.get('sysInfo')
+				if (!list) {
+					list = await Api.apiCall('get', Api.index.sysInfo, params);
+					this.$db.set('sysInfo', list)
+				}
 
-		/**
-		 *
-		 * 加载首页数据
-		 */
-		async loadData() {
-			this.getBanner();
-			this.getHotGoodsList();
-			//this.getFlashPromotion();
-			this.getCouponList();
-			this.getStoreList();
-			this.homeNewProduct();
-			this.homeRecommendProduct();
-		},
+			},
+			getCode() {
+				var code = this.$common.getQueryString('code');
+				code && this.getOpenId(code);
+			},
+			async getOpenId(code) {
+				console.log(code);
+				let params = {
+					code: code,
+					scope: 2,
+					state: this.state
+				};
+				//模拟接口
+				let res = await Api.apiCall('get', Api.order.authCodeToOpenid, params);
+				console.log(res);
+				if (res) {
+					this.login(data);
+					console.log(data);
+					this.$db.set('userInfos', data.userInfo);
+					this.$db.set('token', data.tokenHead + data.token);
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
 
-        /**
-		 * 获取新品推荐
-		 */
-		async homeNewProduct() {
-			let params = {};
-			let groupHotGoodsList = await Api.apiCall('get', Api.index.homeNewProduct, params);
-			console.log(groupHotGoodsList)
-			if(groupHotGoodsList){
-			this.homeNewProductList = groupHotGoodsList.records;
-			}
+					//this.openid = res.data
+					//  this.toPayHandler('wechatpay')
+				} else {
+					this.$common.errorToShow(res);
+				}
+			},
+			checkWXJSBridge(data) {
+				let that = this;
+				let interval = setInterval(() => {
+					if (typeof window.WeixinJSBridge != 'undefined') {
+						clearTimeout(interval);
+						that.onBridgeReady(data);
+					}
+				}, 200);
+			},
+			onBridgeReady(data) {
+				var _this = this;
+				window.WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						appId: data.appid, // 公众号名称，由商户传入
+						timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
+						nonceStr: data.nonceStr, // 随机串
+						package: data.package,
+						signType: data.signType, // 微信签名方式：
+						paySign: data.paySign // 微信签名
+					},
+					function(res) {
+						if (res.err_msg === 'get_brand_wcpay_request:ok') {
+							_this.$common.successToShow('支付成功');
+						} else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
+							_this.$common.errorToShow('取消支付');
+						} else {
+							_this.$common.errorToShow('支付失败');
+						}
+						setTimeout(() => {
+							_this.$common.redirectTo('/pages/order/payment/result?id=' + data.id);
+						}, 1000);
+					}
+				);
+			},
 
+			/**
+			 *
+			 * 加载首页数据
+			 */
+			async loadData() {
+				this.getBanner();
+				this.getHotGoodsList();
+				//this.getFlashPromotion();
+				this.getCouponList();
+				this.getStoreList();
+				this.homeNewProduct();
+				this.homeRecommendProduct();
+			},
 
-		},
-		/**
-		 * 获取人气推荐
-		 */
-		async homeRecommendProduct() {
-			let params = {};
-			let groupHotGoodsList = await Api.apiCall('get', Api.index.homeRecommendProduct, params);
-			this.homeRecommendProductList = groupHotGoodsList.records;
-		},
-		/**
-		 * 获取轮播图
-		 */
-		async getBanner() {
-			let params = { storeId: 0 };
-			console.log(uni.getSystemInfoSync().platform);
-			switch (uni.getSystemInfoSync().platform) {
-				case 'android':
-					params.type = 2;
-					break;
-				case 'ios':
-					params.type = 3;
-					break;
-				default:
-					params.type = 5;
-					break;
-			}
-			let data = await Api.apiCall('get', Api.index.bannerList, params);
-			if (data) {
-				this.carouselList = data || [];
-				this.swiperLength = this.carouselList.length;
-				this.titleNViewBackground = 'rgb(203, 87, 60)';
-			}
-		},
-		/**
-		 * 获取轮播图
-		 */
-		async getCouponList() {
-			let params = { pageSize: 3 };
-			let data = await Api.apiCall('get', Api.index.selectNotRecive, params);
-			if (data) {
-				this.couponList = data || [];
-			}
-		},
-		/**
-		 * 获取新品上市信息
-		 */
-		async getNewProductList(type = 'add', loading) {
-			//没有更多直接返回
-			if (type === 'add') {
-				if (this.loadingType === 'nomore') {
-					return;
+			/**
+			 * 获取新品推荐
+			 */
+			async homeNewProduct() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.index.homeNewProduct, params);
+				console.log(groupHotGoodsList)
+				if (groupHotGoodsList) {
+					this.homeNewProductList = groupHotGoodsList.records;
 				}
-				this.loadingType = 'loading';
-			} else {
-				this.loadingType = 'more';
-			}
-			let params = { pageNum: this.pageNum };
-			let list = await Api.apiCall('get', Api.goods.goodsList, params);
 
-			let goodsList = list.records;
 
-			if (type === 'refresh') {
-				this.newProductList = [];
-			}
+			},
+			/**
+			 * 获取人气推荐
+			 */
+			async homeRecommendProduct() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.index.homeRecommendProduct, params);
+				this.homeRecommendProductList = groupHotGoodsList.records;
+			},
+			/**
+			 * 获取轮播图
+			 */
+			async getBanner() {
+				let params = {
+					storeId: 1
+				};
+				console.log(uni.getSystemInfoSync().platform);
+				switch (uni.getSystemInfoSync().platform) {
+					case 'android':
+						params.type = 2;
+						break;
+					case 'ios':
+						params.type = 3;
+						break;
+					default:
+						params.type = 5;
+						break;
+				}
+				let data = await Api.apiCall('get', Api.index.bannerList, params);
+				console.log("1111111", data)
+				if (data) {
+						console.log("122》》》》》》》》》》》》》》》》》》》》", data)
+					this.carouselList = data || [];
+					this.swiperLength = this.carouselList.length;
+					this.titleNViewBackground = 'rgb(203, 87, 60)';
+				}
+			},
+			/**
+			 * 获取轮播图
+			 */
+			async getCouponList() {
+				let params = {
+					pageSize: 3
+				};
+				let data = await Api.apiCall('get', Api.index.selectNotRecive, params);
+				if (data) {
+					console.log("优惠券")
+					console.log("优惠券",data)
+					this.couponList = data || [];
+				}
+			},
+			/**
+			 * 获取新品上市信息
+			 */
+			async getNewProductList(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params = {
+					pageNum: this.pageNum
+				};
+				let list = await Api.apiCall('get', Api.goods.goodsList, params);
 
-			this.newProductList = this.newProductList.concat(goodsList);
+				let goodsList = list.records;
 
-			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
-			this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
-			if (type === 'refresh') {
-				if (loading == 1) {
-					uni.hideLoading();
-				} else {
-					uni.stopPullDownRefresh();
+				if (type === 'refresh') {
+					this.newProductList = [];
 				}
-			}
-		},
-		/**
-		 * 获取团购信息
-		 */
-		async getStoreList() {
-			let params = { pageSize: 5, isBoutique: 1,sort:2 };
-			let groupHotGoodsList = await Api.apiCall('get', Api.member.storeList, params);
-			this.storeList = groupHotGoodsList.records;
-		},
-		/**
-		 * 获取团购信息
-		 */
-		async getHotGoodsList() {
-			let params = {};
-			let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
-			this.groupHotGoodsList = groupHotGoodsList;
-		},
 
-		/**
-		 * 获取秒杀列表信息
-		 */
-		async getFlashPromotion() {
-			let params = {};
-			let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
-			if (data) {
-				let homeFlashPromotion = data;
-				if (homeFlashPromotion.length > 0) {
-					this.homeFlashPromotion = homeFlashPromotion[0];
+				this.newProductList = this.newProductList.concat(goodsList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
 				}
-			}
-		},
+			},
+			/**
+			 * 获取团购信息
+			 */
+			async getStoreList() {
+				let params = {
+					pageSize: 5,
+					isBoutique: 1,
+					sort: 2
+				};
+				let groupHotGoodsList = await Api.apiCall('get', Api.member.storeList, params);
+				this.storeList = groupHotGoodsList.records;
+			},
+			/**
+			 * 获取团购信息
+			 */
+			async getHotGoodsList() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+				this.groupHotGoodsList = groupHotGoodsList;
+			},
 
-		/**
-		 * 获取分类精选列表信息
-		 */
-		async getCatList() {
-			let params = {};
-			let data = await Api.apiCall('get', Api.goods.newProductList, params);
-			if (data) {
-				let cat_list = data;
-				this.cat_list = cat_list || [];
-			}
-		},
+			/**
+			 * 获取秒杀列表信息
+			 */
+			async getFlashPromotion() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
+				if (data) {
+					let homeFlashPromotion = data;
+					if (homeFlashPromotion.length > 0) {
+						this.homeFlashPromotion = homeFlashPromotion[0];
+					}
+				}
+			},
 
-		/**
-		 * 请求静态数据只是为了代码不那么乱
-		 * 分次请求未作整合
-		 */
-		async loadData2() {
-			this.logining = true;
-			let params = {};
-			let data = await Api.apiCall('get', Api.index.home, params);
-			let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
-			this.groupHotGoodsList = groupHotGoodsList;
-			this.logining = false;
-
-			if (data) {
-				this.carouselList = data.advertiseList || [];
-				this.swiperLength = this.carouselList.length;
-				this.titleNViewBackground = 'rgb(203, 87, 60)';
-				let brandList = data.brandList;
-				this.brandList = brandList || [];
-				let cat_list = data.cat_list;
-				this.cat_list = cat_list || [];
-				let homeFlashPromotion = data.homeFlashPromotion;
-				this.homeFlashPromotion = homeFlashPromotion || [];
-
-				let data1 = await Api.apiCall('get', Api.index.home1, params);
-				let newProductList = data1.newProductList;
-				this.newProductList = newProductList || [];
-
-				let hotProductList = data1.hotProductList;
-				this.hotProductList = hotProductList || [];
-
-				this.couponList = data1.couponList || [];
-				this.orderList = this.couponList.filter(item => {
-					item.createTime = this.dateFormat(item.createTime);
-					return item;
-				});
-			}
-			var userInfo = this.$db.get('userInfos');
-			if (userInfo) {
-				/*uni.getLocation({
+			/**
+			 * 获取分类精选列表信息
+			 */
+			async getCatList() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.goods.newProductList, params);
+				if (data) {
+					let cat_list = data;
+					this.cat_list = cat_list || [];
+				}
+			},
+
+			/**
+			 * 请求静态数据只是为了代码不那么乱
+			 * 分次请求未作整合
+			 */
+			async loadData2() {
+				this.logining = true;
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.home, params);
+				let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+				this.groupHotGoodsList = groupHotGoodsList;
+				this.logining = false;
+				console.log("22222", data)
+				if (data) {
+					console.log("》》》》》》》》》》》》》》》》》》》》", data)
+					this.carouselList = data.advertiseList || [];
+					this.swiperLength = this.carouselList.length;
+					this.titleNViewBackground = 'rgb(203, 87, 60)';
+					let brandList = data.brandList;
+					this.brandList = brandList || [];
+					let cat_list = data.cat_list;
+					this.cat_list = cat_list || [];
+					let homeFlashPromotion = data.homeFlashPromotion;
+					this.homeFlashPromotion = homeFlashPromotion || [];
+
+					let data1 = await Api.apiCall('get', Api.index.home1, params);
+					let newProductList = data1.newProductList;
+					this.newProductList = newProductList || [];
+
+					let hotProductList = data1.hotProductList;
+					this.hotProductList = hotProductList || [];
+
+					this.couponList = data1.couponList || [];
+					this.orderList = this.couponList.filter(item => {
+						item.createTime = this.dateFormat(item.createTime);
+						return item;
+					});
+				}
+				var userInfo = this.$db.get('userInfos');
+				if (userInfo) {
+					/*uni.getLocation({
 					type: 'wgs84',
 					success: function(res) {
 						console.log(res);
@@ -604,559 +648,652 @@ filters: {
 					}
 				});
 */
-			}
-		},
-		dateFormat(time) {
-			if (time == null || time === '') {
-				return 'N/A';
-			}
-			let date = new Date(time);
-			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-		},
-		//轮播图切换修改背景色
-		swiperChange(e) {
-			const index = e.detail.current;
-			this.swiperCurrent = index;
-			this.titleNViewBackground = this.carouselList[index].background;
-		},
-		navToTabPage(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		navToTabPageStore(item) {
-		//url: `../../pagesC/store/store?id=${id}`
-			// url: `../../pagesC/store/businessDetails?id=${id}`
-			let id = item;
-			uni.navigateTo({
-				url: `../../pagesC/store/businessDetails?id=${id}`
-			});
-		},
-		//详情页
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `../../pagesA/product/product?id=${id}`
-			});
-		},
-		//详情页
-        		navToDetailPage1(item) {
-        			//测试数据没有写id，用title代替
-        			let id = item.productId;
-        			uni.navigateTo({
-        				url: `../../pagesA/product/product?id=${id}`
-        			});
-        		},
-		//详情页
-		navToDetailPageL(url) {
-			window.location.href = url;
-		},
-		//详情页
-		navToCouponDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `../../pagesA/product/product?id=${id}`
-			});
-		},
-		async acceptCoupon(item) {
-			uni.showLoading({
-				title: '请稍后'
-			});
+				}
+			},
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			navToTabPage(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			navToTabPageStore(item) {
+				//url: `../../pagesC/store/store?id=${id}`
+				// url: `../../pagesC/store/businessDetails?id=${id}`
+				let id = item;
+				uni.navigateTo({
+					url: `../../pagesC/store/businessDetails?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPage1(item) {
+				//测试数据没有写id，用title代替
+				let id = item.productId;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPageL(url) {
+				window.location.href = url;
+			},
+			//详情页
+			navToCouponDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+			async acceptCoupon(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
 
-			let params = { couponId: item.id };
-			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
-			console.log(data);
-			if (data) {
-				this.$api.msg(data);
-			}
-			uni.hideLoading();
-		},
-		navToSkillDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
+				let params = {
+					couponId: item.id
+				};
+				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+				}
+				uni.hideLoading();
+			},
+			navToSkillDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
 
-			uni.navigateTo({
-				url: `../../pagesA/product/secskillDetail?id=${id}`
-			});
-		},
+				uni.navigateTo({
+					url: `../../pagesA/product/secskillDetail?id=${id}`
+				});
+			},
 
-		navToGroupDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.goodsId;
-			let groupId = item.groupId;
-			uni.navigateTo({
-				url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
-			});
-		},
-		navToList() {
-			uni.navigateTo({
-				url: `../../pagesA/product/list`
-			});
+			navToGroupDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.goodsId;
+				let groupId = item.groupId;
+				uni.navigateTo({
+					url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
+				});
+			},
+			navToList() {
+				uni.navigateTo({
+					url: `../../pagesA/product/list`
+				});
+			},
+			search() {
+				uni.navigateTo({
+					url: '/pages/search/search'
+				});
+			}
 		},
-		search() {
+
+		// 标题栏input搜索框点击
+		onNavigationBarSearchInputClicked: async function(e) {
 			uni.navigateTo({
 				url: '/pages/search/search'
 			});
+		},
+		//点击导航栏 buttons 时触发
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.$api.msg('点击了扫描');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '../../pagesU/notice/notice'
+				});
+			}
 		}
-	},
-
-	// 标题栏input搜索框点击
-	onNavigationBarSearchInputClicked: async function(e) {
-		uni.navigateTo({
-			url: '/pages/search/search'
-		});
-	},
-	//点击导航栏 buttons 时触发
-	onNavigationBarButtonTap(e) {
-		const index = e.index;
-		if (index === 0) {
-			this.$api.msg('点击了扫描');
-		} else if (index === 1) {
-			// #ifdef APP-PLUS
-			const pages = getCurrentPages();
-			const page = pages[pages.length - 1];
-			const currentWebview = page.$getAppWebview();
-			currentWebview.hideTitleNViewButtonRedDot({
-				index
-			});
-			// #endif
-			uni.navigateTo({
-				url: '../../pagesU/notice/notice'
-			});
-		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.MP-search {
-	background: #ffffff;
-	height: 80upx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: fixed;
-	width: 100%;
-	z-index: 999;
-}
-.MP-search-input {
-	font-size: 28upx;
-	background: #f5f5f5;
-	height: 60upx;
-	width: 90%;
-	border-radius: 50upx;
-	text-align: center;
-}
-.mp-search-box {
-	position: absolute;
-	left: 0;
-	top: 30upx;
-	z-index: 9999;
-	width: 100%;
-	padding: 0 80upx;
-	.ser-input {
-		flex: 1;
+	.MP-search {
+		background: #ffffff;
+		height: 80upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		width: 100%;
+		z-index: 999;
+	}
+
+	.MP-search-input {
+		font-size: 28upx;
+		background: #f5f5f5;
 		height: 60upx;
-		line-height: 60upx;
+		width: 90%;
+		border-radius: 50upx;
 		text-align: center;
-		font-size: 28upx;
-		color: $font-color-base;
-		border-radius: 20px;
-		background: rgba(255, 255, 255, 0.6);
 	}
-}
-page {
-	.cate-section {
-		position: relative;
-		z-index: 5;
-		border-radius: 16upx 16upx 0 0;
-		margin-top: -20upx;
+
+	.mp-search-box {
+		position: absolute;
+		left: 0;
+		top: 30upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0 80upx;
+
+		.ser-input {
+			flex: 1;
+			height: 60upx;
+			line-height: 60upx;
+			text-align: center;
+			font-size: 28upx;
+			color: $font-color-base;
+			border-radius: 20px;
+			background: rgba(255, 255, 255, 0.6);
+		}
 	}
-	.carousel-section {
-		padding: 0;
-		.titleNview-placing {
-			padding-top: 0;
-			height: 0;
+
+	page {
+		.cate-section {
+			position: relative;
+			z-index: 5;
+			border-radius: 16upx 16upx 0 0;
+			margin-top: -20upx;
 		}
-		.carousel {
-			.carousel-item {
-				padding: 0;
+
+		.carousel-section {
+			padding: 0;
+
+			.titleNview-placing {
+				padding-top: 0;
+				height: 0;
+			}
+
+			.carousel {
+				.carousel-item {
+					padding: 0;
+				}
+			}
+
+			.swiper-dots {
+				left: 45upx;
+				bottom: 40upx;
 			}
-		}
-		.swiper-dots {
-			left: 45upx;
-			bottom: 40upx;
 		}
 	}
-}
-
-page {
-	background: #f5f5f5;
-}
-.m-t {
-	margin-top: 20upx;
-}
-/* 头部 轮播图 */
-.carousel-section {
-	position: relative;
-	padding-top: 10px;
-
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		padding-top: 44px;
-		box-sizing: content-box;
+
+	page {
+		background: #f5f5f5;
 	}
 
-	.titleNview-background {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 426upx;
-		transition: 0.4s;
+	.m-t {
+		margin-top: 20upx;
 	}
-}
-.carousel {
-	width: 100%;
-	height: 350upx;
 
-	.carousel-item {
-		width: 100%;
-		height: 100%;
-		padding: 0 28upx;
-		overflow: hidden;
+	/* 头部 轮播图 */
+	.carousel-section {
+		position: relative;
+		padding-top: 10px;
+
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			padding-top: 44px;
+			box-sizing: content-box;
+		}
+
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426upx;
+			transition: 0.4s;
+		}
 	}
 
-	image {
+	.carousel {
 		width: 100%;
-		height: 100%;
-		border-radius: 10upx;
-	}
-}
-.swiper-dots {
-	display: flex;
-	position: absolute;
-	left: 60upx;
-	bottom: 15upx;
-	width: 72upx;
-	height: 36upx;
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
-	background-size: 100% 100%;
-
-	.num {
-		width: 36upx;
-		height: 36upx;
-		border-radius: 50px;
-		font-size: 24upx;
-		color: #fff;
-		text-align: center;
-		line-height: 36upx;
+		height: 350upx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10upx;
+		}
 	}
 
-	.sign {
+	.swiper-dots {
+		display: flex;
 		position: absolute;
-		top: 0;
-		left: 50%;
-		line-height: 36upx;
-		font-size: 12upx;
-		color: #fff;
-		transform: translateX(-50%);
+		left: 60upx;
+		bottom: 15upx;
+		width: 72upx;
+		height: 36upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+		background-size: 100% 100%;
+
+		.num {
+			width: 36upx;
+			height: 36upx;
+			border-radius: 50px;
+			font-size: 24upx;
+			color: #fff;
+			text-align: center;
+			line-height: 36upx;
+		}
+
+		.sign {
+			position: absolute;
+			top: 0;
+			left: 50%;
+			line-height: 36upx;
+			font-size: 12upx;
+			color: #fff;
+			transform: translateX(-50%);
+		}
 	}
-}
-/* 分类 */
-.cate-section {
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	flex-wrap: wrap;
-	padding: 30upx 22upx;
-	background: #fff;
-	.cate-item {
+
+	/* 分类 */
+	.cate-section {
 		display: flex;
-		flex-direction: column;
+		justify-content: space-around;
 		align-items: center;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-	}
-	/* 原图标颜色太深,不想改图了,所以加了透明度 */
-	image {
-		width: 88upx;
-		height: 88upx;
-		margin-bottom: 14upx;
-		border-radius: 50%;
-		opacity: 0.7;
-		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		flex-wrap: wrap;
+		padding: 30upx 22upx;
+		background: #fff;
+
+		.cate-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+		}
+
+		/* 原图标颜色太深,不想改图了,所以加了透明度 */
+		image {
+			width: 88upx;
+			height: 88upx;
+			margin-bottom: 14upx;
+			border-radius: 50%;
+			opacity: 0.7;
+			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		}
 	}
-}
-.ad-1 {
-	width: 100%;
-	height: 210upx;
-	padding: 10upx 0;
-	background: #fff;
-	image {
+
+	.ad-1 {
 		width: 100%;
-		height: 100%;
+		height: 210upx;
+		padding: 10upx 0;
+		background: #fff;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 0upx 20upx 20upx;
+		background: #fff;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			line-height: 1;
+
+			.s-img {
+				width: 140upx;
+				height: 30upx;
+			}
+
+			.tip {
+				font-size: $font-base;
+				color: $font-color-light;
+				// margin: 0 20upx 0 40upx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40upx;
+				height: 36upx;
+				text-align: center;
+				line-height: 36upx;
+				margin-right: 14upx;
+				font-size: $font-sm + 2upx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.icon-you {
+				font-size: $font-lg;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 150upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 150upx;
+				height: 150upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
 	}
-}
-/* 秒杀专区 */
-.seckill-section {
-	padding: 0upx 20upx 20upx;
-	background: #fff;
-	.s-header {
+
+	.f-header {
 		display: flex;
 		align-items: center;
-		height: 90upx;
-		line-height: 1;
-		.s-img {
-			width: 140upx;
-			height: 30upx;
+		height: 140upx;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		image {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			margin-right: 20upx;
 		}
-		.tip {
-			font-size: $font-base;
-			color: $font-color-light;
-			// margin: 0 20upx 0 40upx;
+
+		.tit-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
 		}
-		.timer {
-			display: inline-block;
-			width: 40upx;
-			height: 36upx;
-			text-align: center;
-			line-height: 36upx;
-			margin-right: 14upx;
-			font-size: $font-sm + 2upx;
-			color: #fff;
-			border-radius: 2px;
-			background: rgba(0, 0, 0, 0.8);
+
+		.tit {
+			font-size: $font-lg + 2upx;
+			color: #font-color-dark;
+			line-height: 1.3;
+		}
+
+		.tit2 {
+			font-size: $font-sm;
+			color: $font-color-light;
 		}
+
 		.icon-you {
-			font-size: $font-lg;
+			font-size: $font-lg + 2upx;
 			color: $font-color-light;
-			flex: 1;
-			text-align: right;
 		}
 	}
-	.floor-list {
-		white-space: nowrap;
-	}
-	.scoll-wrapper {
-		display: flex;
-		align-items: flex-start;
-	}
-	.floor-item {
-		width: 150upx;
-		margin-right: 20upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		line-height: 1.8;
+
+	/* 团购楼层 */
+	.group-section {
+		background: #fff;
+
+		.g-swiper {
+			height: 650upx;
+			padding-bottom: 20upx;
+		}
+
+		.g-swiper-item {
+			width: 100%;
+			padding: 0 20upx;
+			display: flex;
+		}
+
 		image {
-			width: 150upx;
-			height: 150upx;
-			border-radius: 6upx;
+			width: 100%;
+			height: 460upx;
+			border-radius: 4px;
+		}
+
+		.g-item {
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+		}
+
+		.left {
+			flex: 1.2;
+
+			// margin-right: 24upx;
+			.t-box {
+				padding-top: 20upx;
+			}
+		}
+
+		.right {
+			flex: 0.8;
+			flex-direction: column-reverse;
+
+			.t-box {
+				padding-bottom: 20upx;
+			}
+		}
+
+		.t-box {
+			height: 160upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1.6;
 		}
+
 		.price {
 			color: $uni-color-primary;
 		}
-	}
-}
-
-.f-header {
-	display: flex;
-	align-items: center;
-	height: 140upx;
-	padding: 0upx 20upx;
-	background: #fff;
-	image {
-		flex-shrink: 0;
-		width: 80upx;
-		height: 80upx;
-		margin-right: 20upx;
-	}
-	.tit-box {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-	}
-	.tit {
-		font-size: $font-lg + 2upx;
-		color: #font-color-dark;
-		line-height: 1.3;
-	}
-	.tit2 {
-		font-size: $font-sm;
-		color: $font-color-light;
-	}
-	.icon-you {
-		font-size: $font-lg + 2upx;
-		color: $font-color-light;
-	}
-}
-/* 团购楼层 */
-.group-section {
-	background: #fff;
-	.g-swiper {
-		height: 650upx;
-		padding-bottom: 20upx;
-	}
-	.g-swiper-item {
-		width: 100%;
-		padding: 0 20upx;
-		display: flex;
-	}
-	image {
-		width: 100%;
-		height: 460upx;
-		border-radius: 4px;
-	}
-	.g-item {
-		display: flex;
-		flex-direction: column;
-		overflow: hidden;
-	}
-	.left {
-		flex: 1.2;
-		// margin-right: 24upx;
-		.t-box {
-			padding-top: 20upx;
+
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
 		}
-	}
-	.right {
-		flex: 0.8;
-		flex-direction: column-reverse;
-		.t-box {
-			padding-bottom: 20upx;
+
+		.pro-box {
+			display: flex;
+			align-items: center;
+			margin-top: 10upx;
+			font-size: $font-sm;
+			color: $font-base;
+			padding-right: 10upx;
+		}
+
+		.progress-box {
+			flex: 1;
+			border-radius: 10px;
+			overflow: hidden;
+			margin-right: 8upx;
 		}
 	}
-	.t-box {
-		height: 160upx;
-		font-size: $font-base + 2upx;
-		color: $font-color-dark;
-		line-height: 1.6;
-	}
-	.price {
-		color: $uni-color-primary;
-	}
-	.m-price {
-		font-size: $font-sm + 2upx;
-		text-decoration: line-through;
-		color: $font-color-light;
-		margin-left: 8upx;
-	}
-	.pro-box {
-		display: flex;
-		align-items: center;
-		margin-top: 10upx;
-		font-size: $font-sm;
-		color: $font-base;
-		padding-right: 10upx;
-	}
-	.progress-box {
-		flex: 1;
-		border-radius: 10px;
-		overflow: hidden;
-		margin-right: 8upx;
-	}
-}
-/* 分类推荐楼层 */
-.hot-floor {
-	width: 100%;
-	overflow: hidden;
-	margin-bottom: 20upx;
-	.floor-img-box {
+
+	/* 分类推荐楼层 */
+	.hot-floor {
 		width: 100%;
-		height: 320upx;
-		position: relative;
-		&:after {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 320upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.floor-img {
 			width: 100%;
 			height: 100%;
-			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 		}
-	}
-	.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 {
+
+		.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;
-		}
-		.price {
-			color: $uni-color-primary;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
 		}
 	}
-	.more {
+
+	/* 单条商品 */
+	.goods-box-single {
 		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;
+		padding: 20upx 0;
+
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
 		}
 	}
-}
-/* 单条商品 */
-.goods-box-single {
-	display: flex;
-	padding: 20upx 0;
-	.goods-img {
-		display: block;
-		width: 120upx;
-		height: 120upx;
-	}
-	.right {
-		flex: 1;
+
+	.price-box {
 		display: flex;
-		flex-direction: column;
-		padding: 0 30upx 0 24upx;
-		overflow: hidden;
-		.title {
-			font-size: $font-base + 2upx;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+
+		.num {
+			margin: 0 8upx;
 			color: $font-color-dark;
-			line-height: 1;
-		}
-		.attr-box {
-			font-size: $font-sm + 2upx;
-			color: $font-color-light;
-			padding: 10upx 12upx;
 		}
+
 		.price {
-			font-size: $font-base + 2upx;
+			font-size: $font-lg;
 			color: $font-color-dark;
+
 			&:before {
 				content: '￥';
 				font-size: $font-sm;
@@ -1164,138 +1301,129 @@ page {
 			}
 		}
 	}
-}
-
-.price-box {
-	display: flex;
-	justify-content: flex-end;
-	align-items: baseline;
-	padding: 20upx 30upx;
-	font-size: $font-sm + 2upx;
-	color: $font-color-light;
-	.num {
-		margin: 0 8upx;
-		color: $font-color-dark;
+
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
 	}
-	.price {
-		font-size: $font-lg;
+
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
 		color: $font-color-dark;
-		&:before {
-			content: '￥';
-			font-size: $font-sm;
-			margin: 0 2upx 0 8upx;
-		}
-	}
-}
-.action-box {
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	height: 100upx;
-	position: relative;
-	padding-right: 30upx;
-}
-.action-btn {
-	width: 160upx;
-	height: 60upx;
-	margin: 0;
-	margin-left: 24upx;
-	padding: 0;
-	text-align: center;
-	line-height: 60upx;
-	font-size: $font-sm + 2upx;
-	color: $font-color-dark;
-	background: #fff;
-	border-radius: 100px;
-	&:after {
+		background: #fff;
 		border-radius: 100px;
-	}
-	&.recom {
-		background: #fff9f9;
-		color: $base-color;
+
 		&:after {
-			border-color: #f7bcc8;
+			border-radius: 100px;
+		}
+
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+
+			&:after {
+				border-color: #f7bcc8;
+			}
 		}
 	}
-}
-
-/* 猜你喜欢 */
-.guess-section {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0 30upx;
-	background: #fff;
-	.guess-item {
+
+	/* 猜你喜欢 */
+	.guess-section {
 		display: flex;
-		flex-direction: column;
-		width: 48%;
-		padding-bottom: 40upx;
-		&:nth-child(2n + 1) {
-			margin-right: 4%;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
 		}
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 330upx;
-		border-radius: 3px;
-		overflow: hidden;
-		image {
+
+		.image-wrapper {
 			width: 100%;
-			height: 100%;
-			opacity: 1;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
 		}
-	}
-	.title {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		line-height: 80upx;
-	}
-	.price {
-		font-size: $font-lg;
-		color: $uni-color-primary;
-		line-height: 1;
-	}
-	.coupon_box {
-		width: 100%;
-		height: auto;
-		display: table;
-		padding: 6upx 26upx 26upx 26upx;
-	}
 
-	.other_type {
-		width: 100%;
-		height: 90upx;
-		padding-top: 50upx;
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+		}
 
-		.text {
+		.coupon_box {
 			width: 100%;
-			border-top: 1px solid #eeeeee;
-			display: block;
-			text-align: center;
-			position: relative;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
 		}
-		.text span {
-			width: 180upx;
-			height: 40upx;
-			line-height: 40upx;
-			color: #999999;
-			display: block;
-			background: #ffffff;
-			position: absolute;
-			left: 50%;
-			top: 50%;
-			margin-left: -90upx;
-			margin-top: -20upx;
-			font-size: $font-base;
+
+		.other_type {
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
+
+			.text span {
+				width: 180upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #999999;
+				display: block;
+				background: #ffffff;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				margin-left: -90upx;
+				margin-top: -20upx;
+				font-size: $font-base;
+			}
 		}
 	}
-}
-.getPosition {
-	height: 100upx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 32upx;
-	background-color: #fff;
-}
+
+	.getPosition {
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #fff;
+	}
 </style>
diff --git a/mallplusui-uniapp-app/pages/index/lease.vue b/mallplusui-uniapp-app/pages/index/lease.vue
new file mode 100644
index 0000000..45686de
--- /dev/null
+++ b/mallplusui-uniapp-app/pages/index/lease.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="home">
+		<view class="home-list">
+
+			<view v-for="(item,index) in tableList" :key="item._id" :item="item">
+				<view @click="open">
+					<!-- 基础卡片 -->
+					<view v-if="item.mode==='base'" class="listcard">
+						<view class="listcard-image">
+							<image :src="item.cover[0]" mode="aspectFill"></image>
+						</view>
+						<view class="listcard-content">
+							<view class="listcard-content_title">
+								<text>{{item.title}}</text>
+								<likes :types="types" :item="item"></likes>
+							</view>
+							<view class="listcard-content_des">
+								<view class="listcard-content_des-label">
+									<view class="listcard-content_des-label-item">{{item.classify}}</view>
+								</view>
+								<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 多图模式 -->
+					<view v-if="item.mode==='column'" class="listcard  mode-column">
+						<view class="listcard-content">
+							<view class="listcard-content_title">
+								<text>{{item.title}}</text>
+								<likes :types="types" :item="item"></likes>
+							</view>
+							<view class="listcard-image">
+								<view v-if="index<3" v-for="(item,index) in item.cover" :key="index"
+									class="listcard-image_item">
+									<image :src="item" mode="aspectFill"></image>
+								</view>
+							</view>
+							<view class="listcard-content_des">
+								<view class="listcard-content_des-label">
+									<view class="listcard-content_des-label-item">{{item.classify}}</view>
+								</view>
+								<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 大图模式 -->
+					<view v-if="item.mode==='image'" class="listcard  mode-image">
+						<view class="listcard-image">
+							<image :src="item.cover[0]" mode="aspectFill"></image>
+						</view>
+						<view class="listcard-content">
+							<view class="listcard-content_title">
+								<text>{{item.title}}</text>
+								<likes :types="types" :item="item"></likes>
+							</view>
+
+							<view class="listcard-content_des">
+								<view class="listcard-content_des-label">
+									<view class="listcard-content_des-label-item">{{item.classify}}</view>
+								</view>
+								<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				types:"",
+				tableList: [{
+						_id: 1,
+						title: "到速度奥昂是大宋到速度奥昂是大宋到速度奥昂是大宋",
+						mode: 'base',
+						cover: [
+							"https://ts1.cn.mm.bing.net/th/id/R-C.df4462fabf18edd07195679a5f8a37e5?rik=FnNvr9jWWjHCVQ&riu=http%3a%2f%2fseopic.699pic.com%2fphoto%2f50059%2f8720.jpg_wh1200.jpg&ehk=ofb4q76uCls2S07aIlc8%2bab3H5zwrmj%2bhqiZ%2fyw3Ghw%3d&risl=&pid=ImgRaw&r=0"
+						],
+						classify: 111,
+						browse_count: 111
+					},
+					{
+						_id: 2,
+						title: "啊实打实大苏打实打实打算大苏打",
+						mode: 'column',
+						cover: [
+							"https://pic3.zhimg.com/v2-58d652598269710fa67ec8d1c88d8f03_r.jpg?source=1940ef5c",
+							"https://pic3.zhimg.com/v2-58d652598269710fa67ec8d1c88d8f03_r.jpg?source=1940ef5c",
+							"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg",
+							"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg"
+						],
+						classify: 222,
+						browse_count: 222
+					},
+					{
+						_id: 3,
+						title: "都是否定的撒撒大撒反对的飒飒的撒范德萨",
+						mode: 'image',
+						cover: [
+							"https://ts1.cn.mm.bing.net/th?id=OIP-C.kJE5c2uL7he1BwdQb3-APAHaNK&w=187&h=333&c=8&rs=1&qlt=90&o=6&pid=3.1&rm=2"
+						],
+						classify: 333,
+						browse_count: 333
+					},
+				],
+			};
+		},
+		methods: {
+			open() {
+
+			}
+
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+		display: flex;
+	}
+
+	.home {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: hidden;
+
+		.home-list {
+			flex: 1;
+			box-sizing: border-box;
+		}
+	}
+	.listcard {
+		display: flex;
+		padding: 15px;
+		margin: 20px;
+		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: 80px;
+			height: 80px;
+			border-radius: 8px;
+			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 {
+				padding-right: 30px;
+				font-size: 14px;
+				color: #333;
+				font-weight: 400;
+				line-height: 1.2;
+				position: relative;
+	
+				text {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-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;
+					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 9345af9..5cfcfa2 100644
--- a/mallplusui-uniapp-app/pages/index/user.vue
+++ b/mallplusui-uniapp-app/pages/index/user.vue
@@ -32,7 +32,7 @@
 					<text class="yticon icon-iLinkapp-"></text>
 					{{ userDetailInfo.memberLevelName || '开通会员' }}
 				</view>
-				<text class="e-m">Mallplus</text>
+				<text class="e-m">汇融云链</text>
 				<text class="e-b">升级会员享受更多折扣 一测就上线</text>
 			</view>
 		</view>
@@ -144,7 +144,6 @@
 		<neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm">
 			<input v-model="inputContent" style="margin:20upx" placeholder="请输入..." />
 		</neil-modal>
-		<mallplusCopyright></mallplusCopyright>
 	</view>
 </template>
 <script>
diff --git a/mallplusui-uniapp-app/pages/order/createOrder.vue b/mallplusui-uniapp-app/pages/order/createOrder.vue
index 49ef187..818a963 100644
--- a/mallplusui-uniapp-app/pages/order/createOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createOrder.vue
@@ -121,7 +121,7 @@
                 <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.name }}</text>
+                            <text class="title">{{ item.coupon.name }}</text>
                             <text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text>
                         </view>
                         <view class="right">
@@ -270,7 +270,7 @@ import Api from '@/common/api';
             if (this.addressData) {
                 this.addressId = this.addressData.id;
             }
-
+				  console.log("优惠券",data.couponHistoryDetailList);
             this.couponList = data.couponHistoryDetailList;
             this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
 
@@ -696,8 +696,6 @@ import Api from '@/common/api';
 
         .mask-content {
             width: 100%;
-            min-height: 30vh;
-            max-height: 70vh;
             background: #f3f3f3;
             transform: translateY(100%);
             transition: 0.3s;
diff --git a/mallplusui-uniapp-app/pages/public/index.vue b/mallplusui-uniapp-app/pages/public/index.vue
index cd81bde..dd484bd 100644
--- a/mallplusui-uniapp-app/pages/public/index.vue
+++ b/mallplusui-uniapp-app/pages/public/index.vue
@@ -36,7 +36,7 @@
       <!-- #endif -->
 
     </view>
-<mallplusCopyright></mallplusCopyright>
+<!-- <mallplusCopyright></mallplusCopyright> -->
   </view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pages/public/login.vue b/mallplusui-uniapp-app/pages/public/login.vue
index 3b2fff1..3d3fbc6 100644
--- a/mallplusui-uniapp-app/pages/public/login.vue
+++ b/mallplusui-uniapp-app/pages/public/login.vue
@@ -1,273 +1,256 @@
 <template>
 	<view class="container">
 		<view class="left-bottom-sign"></view>
-		<view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view>
+		<!-- <view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view> -->
 		<view class="right-top-sign"></view>
 		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
-		<view class="wrapper">
-			<!-- #ifdef H5 -->
-			<view class="left-top-sign">{{ sysInfo.name }}LOGIN</view>
-			<view class="welcome">欢迎回来！{{ sysInfo.name }}</view>
-			<view class="input-content">
-				<view class="input-item">
-					<text class="tit">手机号码</text>
-					<input type="number" v-model="phone" placeholder="请输入手机号码" />
-				</view>
-				<view class="input-item">
-					<text class="tit">密码</text>
-					<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
+		<!-- <view class="left-top-sign">{{ sysInfo.name }}LOGIN</view> -->
+		<view class="welcome">欢迎回来！汇融云链</view>
+	
+	<view class="wrapper">
+		<!-- #ifdef H5 -->
+		<view class="input-content">
+			<view class="select_lay">
+			
+				<text class="select_lay_text" :class="{'select_lay_text1':selectKey===0}" @click="selectType(0)">免密登录</text>
+				<text class="select_lay_text" :class="{'select_lay_text1':selectKey===1}" @click="selectType(1)">账号登录</text>
+			
+			</view>
+			
+			<view class="input-item">
+				<text class="tit">手机号码</text>
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
+			</view>
+			<view class="input-item" v-if="show">
+				<text class="tit">密码</text>
+				<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
+			</view>
+			<view class="input-item" v-if="!show">
+				<text class="tit">验证码</text>
+				<view class="input-item-right">
+					<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin"
+						style="width: 70%;" />
+					<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
+					<view class="authTime" v-else>{{ auth_time }}秒</view>
 				</view>
 			</view>
-			<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+		</view>
+		<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+		<view class="login_bot">
 			<view class="forget-section" @click="toForget">忘记密码?</view>
-			<view class="forget-section" @click="toLoginCode">验证码登录</view>
-			<br/>
+	
 			<view class="register-section">
 				还没有账号?
 				<text @click="toRegist">马上注册</text>
 			</view>
-			<!-- #endif -->
-			<!-- #ifdef MP-WEIXIN -->
-			<button class="confirm-btn" open-type="getUserInfo" @getuserinfo="wxGetUserInfo" withCredentials="true" v-if="isGetPhone == false">微信登录</button>
-			<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="isGetPhone == true">获取手机号</button>
-			<!-- #endif -->
-
-			<!-- #ifdef APP-PLUS -->
-			<view class="left-top-sign">{{ sysInfo.name }}LOGIN</view>
-			<view class="welcome">欢迎回来！{{ sysInfo.name }}</view>
-			<view class="input-content">
-				<view class="input-item">
-					<text class="tit">手机号码</text>
-					<input type="number" v-model="phone" placeholder="请输入手机号码" />
-				</view>
-				<view class="input-item">
-					<text class="tit">密码</text>
-					<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
-				</view>
-			</view>
-			<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+		</view>
+		<br />
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<button class="confirm-btn" open-type="getUserInfo" @getuserinfo="wxGetUserInfo" withCredentials="true"
+			v-if="isGetPhone == false">微信登录</button>
+		<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
+			v-if="isGetPhone == true">获取手机号</button>
+		<!-- #endif -->
+	
+		<!-- #ifdef APP-PLUS -->
+		<view class="input-content">
+			<view class="select_lay">
+			
+				<text :class="{'select_lay_text1':selectKey===0}" @click="selectType(0)">免密登录</text>
+				<text class="select_lay_text" :class="{'select_lay_text1':selectKey===1}" @click="selectType(1)">账号登录</text>
 			
-			<!-- <button v-if="isWeiXin == 1" class="confirm-btn" @click="wechatH5Login" :disabled="logining">微信授权登录</button>  -->
+			</view>
 			
+			<view class="input-item">
+				<text class="tit">手机号码</text>
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
+			</view>
+			<view class="input-item" v-if="show">
+				<text class="tit">密码</text>
+				<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
+			</view>
+			<view class="input-item" v-if="!show">
+				<text class="tit">验证码</text>
+				<view class="input-item-right">
+					<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin"
+						style="width: 70%;" />
+					<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
+					<view class="authTime" v-else>{{ auth_time }}秒</view>
+				</view>
+			</view>
+		</view>
+		<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+	
+		<!-- <button v-if="isWeiXin == 1" class="confirm-btn" @click="wechatH5Login" :disabled="logining">微信授权登录</button>  -->
+		<view class="login_bot">
 			<view class="forget-section" @click="toForget">忘记密码?</view>
-			<view class="forget-section" @click="toLoginCode">验证码登录</view>
-			<br/><view class="register-section">
+	
+			<view class="register-section">
 				还没有账号?
 				<text @click="toRegist">马上注册</text>
 			</view>
-			
-			<!-- #endif -->
 		</view>
-		
-		<mallplusCopyright></mallplusCopyright>
+		<br />
+	
+		<!-- #endif -->
+	</view>
+
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
 <script>
-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
-	},
-	data() {
-		return {
-			phone: '',
-			password: '',
-			isWeiXin: 0,
-			sysInfo: '',
-			logining: false,
-			isGetPhone: false,
-			info: ''
-		};
-	},
-	onLoad() {
-		let isWeiXin = this.$common.isWeiXinBrowser();
-		if (isWeiXin) {
-			this.isWeiXin = 1;
-		}
-		this.sysInfo = this.$db.get('sysInfo');
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
-	},
-	methods: {
-		...mapMutations(['login']),
-		inputChange(e) {
-			const key = e.currentTarget.dataset.key;
-			this[key] = e.detail.value;
-		},
-		toForget() {
-			uni.navigateTo({
-				url: '../../pagesU/user/forget'
-			});
+	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
 		},
-		toLoginCode() {
-			uni.navigateTo({
-				url: '/pages/public/loginCode'
-			});
+		data() {
+			return {
+				show: false,
+				selectKey:0,
+				code: '',
+				coding: false,
+				auth_time: 60,
+				phone: '',
+				password: '',
+				isWeiXin: 0,
+				sysInfo: '',
+				logining: false,
+				isGetPhone: false,
+				info: ''
+			};
 		},
-		navBack() {
-			uni.switchTab({
-				url: '/pages/index/index'
-			});
-		},
-		toRegist() {
-			uni.navigateTo({
-				url: '/pages/public/reg'
-			});
-		},
-		wechatH5Login() {
-			const that = this;
-			let href = window.location.origin;
-			let page = that.$api.prePage();
-			let prePath = '/pages/index/index';
-			if (page) {
-				prePath = page.__page__.path;
+		onLoad() {
+			let isWeiXin = this.$common.isWeiXinBrowser();
+			if (isWeiXin) {
+				this.isWeiXin = 1;
 			}
-
-			window.location =
-				'https://open.weixin.qq.com/connect/oauth2/authorize?' +
-				'appid=' +
-				Api.h5Appid +
-				'&redirect_uri=' +
-				escape(href) +
-				'&response_type=code&scope=snsapi_userinfo&state=mallplus#wechat_redirect';
+			this.sysInfo = this.$db.get('sysInfo');
 		},
-		wxGetUserInfo: function(res) {
-			if (!res.detail.iv) {
-				uni.showToast({
-					title: '您取消了授权,登录失败',
-					icon: 'none'
-				});
-				return false;
-			}
-			// this.login(res.detail.rawData);
-			const that = this;
-			let datas = '';
-			let errmsg = '';
-			uni.login({
-				provider: 'weixin',
-				success: function(loginRes) {
-
-					var params = {
-                    						code: loginRes.code,
-                    						userInfo: res.detail.rawData,
-                    						cloudID: res.detail.cloudID,
-                    						encrypted_data: res.detail.encryptedData,
-                    						iv: res.detail.iv,
-                    						source: 2,
-                    						signature: res.detail.signature
-                    					};
-                    					that.loginByWeixinNoPhone(params);
-				}
-			});
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
 		},
-		loginByWeixinNoPhone(datas) {
-        			var that = this;
-        			wx.request({
-        				url: Api.BASEURI + Api.index.appletLogin_by_weixin,
-        				method: 'post',
-        				data: datas,
-        				success: function(res) {
-        					uni.showToast({
-                                    							title: '登录成功'
-                                    						});
-                                    						that.login(res.data.data);
-                                    						that.$db.set('token', res.data.data.tokenHead + res.data.data.token);
-                                    						that.$db.set('userInfos', res.data.data.userInfo);
-
-                                    						setTimeout(function() {
-                                    							uni.switchTab({
-                                    								url: '/pages/index/index'
-                                    							});
-                                    						}, 1000);
-        				}
-        			});
-        		},
-		/**
-		 * 微信登录
-		 */
-		wxGetUserInfo1: function(res) {
-			let ress = res;
-			console.log('-----getUserInfo-----', ress);
-			if (!ress.detail.iv) {
-				uni.showToast({
-					title: '您取消了授权,登录失败',
-					icon: 'none'
+		methods: {
+			...mapMutations(['login']),
+			selectType(index){
+				this.selectKey=index
+				this.show = !this.show
+				
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			toForget() {
+				uni.navigateTo({
+					url: '../../pagesU/user/forget'
 				});
-				return false;
-			}
+			},
+			// 获取验证码
+			async getCode() {
+				var myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+				if (!myreg.test(this.phone)) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号码'
+					});
+					return false;
+				}
+				//设置倒计时秒
+				this.auth_time = 60;
+				this.coding = true;
+				var auth_timetimer = setInterval(() => {
+					this.auth_time--;
+					if (this.auth_time < 0) {
+						this.coding = false;
+						clearInterval(auth_timetimer);
+					}
+				}, 1000);
+				//获取验证码
+				let params = {
+					phone: this.phone
+				};
+				let data = await Api.apiCall('post', Api.index.sendCodes, params);
+				if (data) {
 
-			const that = this;
-			let datas = '';
-			uni.login({
-				provider: 'weixin',
-				success: function(loginRes) {
-					console.log('=====login=====', loginRes);
-					var params = {
-						code: loginRes.code,
-						userInfo: ress.detail.rawData,
-						cloudID: ress.detail.cloudID,
-						encrypted_data: ress.detail.encryptedData,
-						iv: ress.detail.iv,
-						source: 2,
-						signature: ress.detail.signature
-					};
-					that.getAppletOpenId(params);
 				}
-			});
-		},
-		/**
-		 * 获取openid
-		 */
-		getAppletOpenId(params) {
-			var that = this;
-			wx.request({
-				url: Api.BASEURI + Api.index.getAppletOpenId,
-				data: params,
-				method: 'post',
-				success: function(info) {
-					// openid seession_key 存入缓存
-					that.$db.set('openId', info.data.data.openid);
-					that.$db.set('session_key', info.data.data.session_key);
-
-					that.info = {
-						openid: info.data.data.openid,
-						code: params.code,
-						userInfo: params.userInfo,
-						cloudID: params.cloudID,
-						encrypted_data: params.encryptedData,
-						iv: params.iv,
-						source: 2,
-						signature: params.signature
-					};
-					that.loginByWeixin(that.info);
-				},
-				fail: function(e) {
-					console.log(e);
+			},
+			toLoginCode() {
+				uni.navigateTo({
+					url: '/pages/public/loginCode'
+				});
+			},
+			navBack() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
+			toRegist() {
+				uni.navigateTo({
+					url: '/pages/public/reg'
+				});
+			},
+			wechatH5Login() {
+				const that = this;
+				let href = window.location.origin;
+				let page = that.$api.prePage();
+				let prePath = '/pages/index/index';
+				if (page) {
+					prePath = page.__page__.path;
 				}
-			});
-		},
-		loginByWeixin(datas) {
-			var that = this;
-			wx.request({
-				url: Api.BASEURI + Api.index.appletLogin_by_weixin,
-				method: 'post',
-				data: datas,
-				success: function(res) {
-					console.log('--loginByWeixin--', res);
-					if (res.data.code == 500) {
-						if (res.data.data == '登录失败 请先绑定手机号') {
-							uni.showToast({
-								title: res.data.data,
-								icon: 'none'
-							});
-							that.isGetPhone = true;
-						}
-					} else {
+
+				window.location =
+					'https://open.weixin.qq.com/connect/oauth2/authorize?' +
+					'appid=' +
+					Api.h5Appid +
+					'&redirect_uri=' +
+					escape(href) +
+					'&response_type=code&scope=snsapi_userinfo&state=mallplus#wechat_redirect';
+			},
+			wxGetUserInfo: function(res) {
+				if (!res.detail.iv) {
+					uni.showToast({
+						title: '您取消了授权,登录失败',
+						icon: 'none'
+					});
+					return false;
+				}
+				// this.login(res.detail.rawData);
+				const that = this;
+				let datas = '';
+				let errmsg = '';
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+
+						var params = {
+							code: loginRes.code,
+							userInfo: res.detail.rawData,
+							cloudID: res.detail.cloudID,
+							encrypted_data: res.detail.encryptedData,
+							iv: res.detail.iv,
+							source: 2,
+							signature: res.detail.signature
+						};
+						that.loginByWeixinNoPhone(params);
+					}
+				});
+			},
+			loginByWeixinNoPhone(datas) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.appletLogin_by_weixin,
+					method: 'post',
+					data: datas,
+					success: function(res) {
 						uni.showToast({
 							title: '登录成功'
 						});
@@ -281,325 +264,554 @@ export default {
 							});
 						}, 1000);
 					}
+				});
+			},
+			/**
+			 * 微信登录
+			 */
+			wxGetUserInfo1: function(res) {
+				let ress = res;
+				console.log('-----getUserInfo-----', ress);
+				if (!ress.detail.iv) {
+					uni.showToast({
+						title: '您取消了授权,登录失败',
+						icon: 'none'
+					});
+					return false;
 				}
-			});
-		},
-		/**
-		 * 微信获取手机号
-		 */
-		getPhoneNumber(params) {
-			var that = this;
-			wx.request({
-				url: Api.BASEURI + Api.index.getWxPhone,
-				method: 'post',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					openid: uni.getStorageSync('openId'),
-					keyStr: uni.getStorageSync('session_key'),
-					ivStr: params.detail.iv,
-					encDataStr: params.detail.encryptedData
-				},
-				success: function(res) {
-					console.log('--getPhoneNumber--', res);
-					if (res.data.code == 200) {
-						uni.setStorageSync('phone', res.data.data);
-						that.info['phone'] = res.data.data;
-						that.loginByWeixin(that.info);
+
+				const that = this;
+				let datas = '';
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						console.log('=====login=====', loginRes);
+						var params = {
+							code: loginRes.code,
+							userInfo: ress.detail.rawData,
+							cloudID: ress.detail.cloudID,
+							encrypted_data: ress.detail.encryptedData,
+							iv: ress.detail.iv,
+							source: 2,
+							signature: ress.detail.signature
+						};
+						that.getAppletOpenId(params);
 					}
-				}
-			});
-		},
+				});
+			},
+			/**
+			 * 获取openid
+			 */
+			getAppletOpenId(params) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.getAppletOpenId,
+					data: params,
+					method: 'post',
+					success: function(info) {
+						// openid seession_key 存入缓存
+						that.$db.set('openId', info.data.data.openid);
+						that.$db.set('session_key', info.data.data.session_key);
 
-		appLogin() {
-			uni.getProvider({
-				service: 'oauth',
-				success: function(res) {
-					console.log(res.provider);
-					//支持微信、qq和微博等
-					if (~res.provider.indexOf('weixin')) {
-						uni.login({
-							provider: 'weixin',
-							success: function(loginRes) {
-								console.log('-------获取openid(unionid)-----');
-								console.log(JSON.stringify(loginRes));
-								// 获取用户信息
-								uni.getUserInfo({
-									provider: 'weixin',
-									success: function(info) {
-										console.log('-------获取微信用户所有-----');
-										console.log(JSON.stringify(info.userInfo));
-										let logparams1 = { logs: JSON.stringify(info.userInfo) };
-										Api.apiCall('get', Api.index.logs, logparams1);
-										// 与服务器交互将数据提交到服务端数据库
-										uni.request({
-											url: Api.BASEURI + Api.index.appLogin,
-											method: 'POST',
-											header: { 'content-type': 'application/x-www-form-urlencoded' },
-											data: {
-												sex: info.userInfo.gender,
-												city: info.userInfo.country + '-' + info.userInfo.province + '-' + info.userInfo.city,
-												source: 1,
-												openid: info.userInfo.openId,
-												unionid: info.userInfo.openId,
-												nickname: info.userInfo.nickName,
-												headimgurl: info.userInfo.avatarUrl
-											},
-											success: res => {
-												console.log(JSON.stringify(res));
-
-												// 登录成功 记录会员信息到本地
-												if (res) {
-													uni.setStorageSync('userInfo', res.data.userInfo);
-													uni.setStorageSync('token', res.data.tokenHead + res.data.token);
-													uni.switchTab({
-														url: '/pages/index/index'
-													});
-												} else {
-													uni.showToast({ title: res.data });
-												}
-											},
-											fail: e => {
-												console.log(JSON.stringify(e));
-											}
-										});
-										let logparams = { logs: JSON.stringify(info.userInfo) };
-										Api.apiCall('get', Api.index.logs, logparams);
-									}
+						that.info = {
+							openid: info.data.data.openid,
+							code: params.code,
+							userInfo: params.userInfo,
+							cloudID: params.cloudID,
+							encrypted_data: params.encryptedData,
+							iv: params.iv,
+							source: 2,
+							signature: params.signature
+						};
+						that.loginByWeixin(that.info);
+					},
+					fail: function(e) {
+						console.log(e);
+					}
+				});
+			},
+			loginByWeixin(datas) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.appletLogin_by_weixin,
+					method: 'post',
+					data: datas,
+					success: function(res) {
+						console.log('--loginByWeixin--', res);
+						if (res.data.code == 500) {
+							if (res.data.data == '登录失败 请先绑定手机号') {
+								uni.showToast({
+									title: res.data.data,
+									icon: 'none'
 								});
+								that.isGetPhone = true;
 							}
-						});
+						} else {
+							uni.showToast({
+								title: '登录成功'
+							});
+							that.login(res.data.data);
+							that.$db.set('token', res.data.data.tokenHead + res.data.data.token);
+							that.$db.set('userInfos', res.data.data.userInfo);
+
+							setTimeout(function() {
+								uni.switchTab({
+									url: '/pages/index/index'
+								});
+							}, 1000);
+						}
 					}
-				}
-			});
-		},
-		async toLogin() {
-			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;
-			}
-			this.logining = false;
-			let params = { phone: this.phone, password: this.password };
-			let data = await Api.apiCall('post', Api.index.login, params);
-			//this.logining = false;
-			if (data) {
-				console.log(data);
-				that.login(data);
-				uni.setStorageSync('userInfos', data.userInfo);
-				uni.setStorageSync('token', data.tokenHead + data.token);
-				console.log(uni.getStorageSync('token'));
-				uni.switchTab({
-					url: '/pages/index/user'
 				});
-			}
-		},
-		getuserinfoh5appwx() {
-			var that = this;
-			uni.login({
-				success: res => {
-					// res 对象格式
-
-					uni.getUserInfo({
-						success: info => {
-							// 与服务器交互将数据提交到服务端数据库
-							uni.request({
-								url: Api.BASEURI + Api.index.appLogin,
-								method: 'POST',
-								header: { 'content-type': 'application/x-www-form-urlencoded' },
-								data: {
-									sex: info.userInfo.gender,
-									city: info.userInfo.country + '-' + info.userInfo.province + '-' + info.userInfo.city,
-
-									source: 1,
-									unionid: info.userInfo.openId,
-									openid: info.userInfo.openId,
-									nickname: info.userInfo.nickName,
-									headimgurl: info.userInfo.avatarUrl
-								},
-								success: res => {
-									console.log(JSON.stringify(res.data.data));
-									// 登录成功 记录会员信息到本地
-									if (res) {
-										console.log(res);
-										that.login(res.data.data);
-										uni.setStorageSync('userInfos', res.data.data.userInfo);
-										uni.setStorageSync('token', res.data.data.tokenHead + res.data.data.token);
-
-										uni.switchTab({
-											url: '/pages/index/index'
-										});
-									} else {
-										uni.showToast({ title: res.data });
-									}
-								},
-								fail: e => {
-									console.log(JSON.stringify(e));
+			},
+			/**
+			 * 微信获取手机号
+			 */
+			getPhoneNumber(params) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.getWxPhone,
+					method: 'post',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						openid: uni.getStorageSync('openId'),
+						keyStr: uni.getStorageSync('session_key'),
+						ivStr: params.detail.iv,
+						encDataStr: params.detail.encryptedData
+					},
+					success: function(res) {
+						console.log('--getPhoneNumber--', res);
+						if (res.data.code == 200) {
+							uni.setStorageSync('phone', res.data.data);
+							that.info['phone'] = res.data.data;
+							that.loginByWeixin(that.info);
+						}
+					}
+				});
+			},
+
+			appLogin() {
+				uni.getProvider({
+					service: 'oauth',
+					success: function(res) {
+						console.log(res.provider);
+						//支持微信、qq和微博等
+						if (~res.provider.indexOf('weixin')) {
+							uni.login({
+								provider: 'weixin',
+								success: function(loginRes) {
+									console.log('-------获取openid(unionid)-----');
+									console.log(JSON.stringify(loginRes));
+									// 获取用户信息
+									uni.getUserInfo({
+										provider: 'weixin',
+										success: function(info) {
+											console.log('-------获取微信用户所有-----');
+											console.log(JSON.stringify(info.userInfo));
+											let logparams1 = {
+												logs: JSON.stringify(info.userInfo)
+											};
+											Api.apiCall('get', Api.index.logs,
+												logparams1);
+											// 与服务器交互将数据提交到服务端数据库
+											uni.request({
+												url: Api.BASEURI + Api.index
+													.appLogin,
+												method: 'POST',
+												header: {
+													'content-type': 'application/x-www-form-urlencoded'
+												},
+												data: {
+													sex: info.userInfo.gender,
+													city: info.userInfo
+														.country + '-' + info
+														.userInfo.province +
+														'-' + info.userInfo
+														.city,
+													source: 1,
+													openid: info.userInfo
+														.openId,
+													unionid: info.userInfo
+														.openId,
+													nickname: info.userInfo
+														.nickName,
+													headimgurl: info.userInfo
+														.avatarUrl
+												},
+												success: res => {
+													console.log(JSON
+														.stringify(res)
+													);
+
+													// 登录成功 记录会员信息到本地
+													if (res) {
+														uni.setStorageSync(
+															'userInfo',
+															res.data
+															.userInfo);
+														uni.setStorageSync(
+															'token',
+															res.data
+															.tokenHead +
+															res.data
+															.token);
+														uni.switchTab({
+															url: '/pages/index/index'
+														});
+													} else {
+														uni.showToast({
+															title: res
+																.data
+														});
+													}
+												},
+												fail: e => {
+													console.log(JSON
+														.stringify(e));
+												}
+											});
+											let logparams = {
+												logs: JSON.stringify(info.userInfo)
+											};
+											Api.apiCall('get', Api.index.logs,
+												logparams);
+										}
+									});
 								}
 							});
-						},
-						fail: () => {
-							uni.showToast({ title: '微信登录授权失败' });
 						}
+					}
+				});
+			},
+			async toLogin() {
+				var that = this;
+				let phoneReg = /^1[1-9][0-9]\d{8}$/;
+				
+				if(that.selectKey==0){
+					// 免密登录
+					uni.showToast({
+						icon: 'none',
+						title: '暂不支持此登录方式'
 					});
-				},
-				fail: () => {
-					uni.showToast({ title: '微信登录授权失败' });
-					uni.hideLoading();
+					return;
+				}else{
+					// 账号登录
+					
+					try {
+						if (this.phone == '') {
+							throw '请填写手机号';
+						}
+						if (!phoneReg.test(this.phone)) {
+							throw '手机号格式有误';
+						}
+						if (this.password == '') {
+							throw '请填写密码';
+						}
+					} catch (err) {
+						this.$api.msg(err);
+						return;
+					}
+					console.log("1111111111");
+					this.logining = false;
+					let params = {
+						phone: this.phone,
+						password: this.password
+					};
+					let data = await Api.apiCall('post', Api.index.login, params);
+					//this.logining = false;
+					console.log("1111111111");
+					if (data) {
+						console.log(data);
+						that.login(data);
+						uni.setStorageSync('userInfos', data.userInfo);
+						uni.setStorageSync('token', data.tokenHead + data.token);
+						// uni.setStorageSync('adminToken', data.tokenHead + data.token);
+						console.log(uni.getStorageSync('token'));
+						uni.switchTab({
+							url: '/pages/index/user'
+						});
+					}
 				}
-			});
+			
+			},
+			getuserinfoh5appwx() {
+				var that = this;
+				uni.login({
+					success: res => {
+						// res 对象格式
+
+						uni.getUserInfo({
+							success: info => {
+								// 与服务器交互将数据提交到服务端数据库
+								uni.request({
+									url: Api.BASEURI + Api.index.appLogin,
+									method: 'POST',
+									header: {
+										'content-type': 'application/x-www-form-urlencoded'
+									},
+									data: {
+										sex: info.userInfo.gender,
+										city: info.userInfo.country + '-' + info.userInfo
+											.province + '-' + info.userInfo.city,
+
+										source: 1,
+										unionid: info.userInfo.openId,
+										openid: info.userInfo.openId,
+										nickname: info.userInfo.nickName,
+										headimgurl: info.userInfo.avatarUrl
+									},
+									success: res => {
+										console.log(JSON.stringify(res.data.data));
+										// 登录成功 记录会员信息到本地
+										if (res) {
+											console.log(res);
+											that.login(res.data.data);
+											uni.setStorageSync('userInfos', res.data
+												.data.userInfo);
+											uni.setStorageSync('token', res.data.data
+												.tokenHead + res.data.data.token);
+
+											uni.switchTab({
+												url: '/pages/index/index'
+											});
+										} else {
+											uni.showToast({
+												title: res.data
+											});
+										}
+									},
+									fail: e => {
+										console.log(JSON.stringify(e));
+									}
+								});
+							},
+							fail: () => {
+								uni.showToast({
+									title: '微信登录授权失败'
+								});
+							}
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							title: '微信登录授权失败'
+						});
+						uni.hideLoading();
+					}
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: #fff;
-}
-.container {
-	padding-top: 115px;
-	position: relative;
-	width: 100vw;
-	height: 100vh;
-	overflow: hidden;
-	background: #fff;
-}
-.wrapper {
-	position: relative;
-	z-index: 90;
-	background: #fff;
-	padding-bottom: 40upx;
-}
-.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: 100vh;
+		overflow: hidden;
+		background: #fff;
 	}
-	&:after {
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #fff;
+		padding-bottom: 40upx;
+	}
+
+	.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 {
+		margin-top: 150px;
+		position: relative;
+		left: 50upx;
+		top: -90upx;
+		font-size: 46upx;
+		color: #555;
+		text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
+	}
+
+	.select_lay {
+		display: flex;
+		margin-top: -65upx;
+		margin-bottom: 15upx;
+		align-items: center;
+
+		.select_lay_text {
+			margin-left: 30upx;
+		}
+
+		.select_lay_text1 {
+			font-size: 30upx;
+			color: #4395FF;
+		}
+
+		.select_lay_text2 {
+			font-size: 28upx;
+			color: #000;
+		}
+	}
+
+	.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%;
+		}
+
+		.input-item-right {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			width: 100%;
+			justify-content: space-between;
+		}
+
+		.codeText {
+			font-size: 28upx;
+			width: 25%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fa436a;
+		}
+
+		.authTime {
+			font-size: 28upx;
+			width: 25%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fa436a;
+		}
 	}
-}
-
-.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: 50upx;
-	width: 100%;
-	font-size: $font-sm + 2upx;
-	color: $font-color-base;
-	text-align: center;
-	text {
+
+	.login_bot {
+		display: flex;
+		margin-top: 15upx;
+		margin-left: 70upx;
+		margin-right: 70upx;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.forget-section {
+		font-size: $font-sm + 2upx;
 		color: $font-color-spec;
-		margin-left: 10upx;
+		text-align: center;
+	}
+
+	.register-section {
+		bottom: 50upx;
+		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/public/loginCode.vue b/mallplusui-uniapp-app/pages/public/loginCode.vue
index 41e82eb..05562a8 100644
--- a/mallplusui-uniapp-app/pages/public/loginCode.vue
+++ b/mallplusui-uniapp-app/pages/public/loginCode.vue
@@ -28,7 +28,7 @@
 			还没有账号?
 			<text @click="toRegist">马上注册</text>
 		</view>
-<mallplusCopyright></mallplusCopyright>
+<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pages/public/reg.vue b/mallplusui-uniapp-app/pages/public/reg.vue
index eb6c5fb..7eaf664 100644
--- a/mallplusui-uniapp-app/pages/public/reg.vue
+++ b/mallplusui-uniapp-app/pages/public/reg.vue
@@ -33,7 +33,7 @@
 			已经有账号?
 			<text @click="toRegist">马上登录</text>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 
 </template>
diff --git a/mallplusui-uniapp-app/pages/set/set.vue b/mallplusui-uniapp-app/pages/set/set.vue
index 8736a15..9ff541e 100644
--- a/mallplusui-uniapp-app/pages/set/set.vue
+++ b/mallplusui-uniapp-app/pages/set/set.vue
@@ -31,7 +31,7 @@
 			<text class="cell-more yticon icon-you"></text>
 		</view>
 		<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesA/build/community.vue b/mallplusui-uniapp-app/pagesA/build/community.vue
index 3c65335..1edc5d0 100644
--- a/mallplusui-uniapp-app/pagesA/build/community.vue
+++ b/mallplusui-uniapp-app/pagesA/build/community.vue
@@ -2,7 +2,8 @@
 	<view class="container">
 		<!-- 小程序头部兼容 -->
 		<!-- #ifdef MP -->
-		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true" placeholder="输入关键字搜索" /></view>
+		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true"
+				placeholder="输入关键字搜索" /></view>
 		<!-- #endif -->
 
 		<!-- 头部轮播 -->
@@ -17,7 +18,8 @@
 				<!-- 背景色区域 -->
 				<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
 				<swiper class="carousel" circular @change="swiperChange">
-					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPageL(item.url)">
+					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+						@click="navToDetailPageL(item.url)">
 						<image :src="item.pic" />
 					</swiper-item>
 				</swiper>
@@ -32,25 +34,23 @@
 			<view class="cate-section">
 				<view class="cate-item" @click="navToTabPage('../../pagesA/build/notice')">
 					<image src="/static/temp/c3.png"></image>
-					<text>社区活动</text>
+					<text>社区公告</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/build/repairOrder/repairOrder')">
-					<image src="/static/temp/c5.png"></image>
-					<text>费用管理</text>
-				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/build/groupList')">
-					<image src="/static/temp/c6.png"></image>
+				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
+					<image src="/static/temp/c7.png"></image>
 					<text>社区团购</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
 					<image src="/static/temp/c7.png"></image>
-					<text>社区服务</text>
+					<text>社区特供</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/paiMaiList')">
+				<!-- <view class="cate-item" @click="navToTabPage('../../pagesA/product/paiMaiList')"> -->
+				<view class="cate-item" @click="navToTabPage('/pages/index/lease')">
 					<image src="/static/temp/c8.png"></image>
-					<text>社区拍卖</text>
+					<text>农机租赁</text>
 				</view>
 			</view>
+
 			<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/communityList?geohash='+geohash)">
 				<image src="/static/temp/nav1.png"></image>
 				<view class="tit-box">
@@ -59,25 +59,39 @@
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
-			<view class="cate-section">
-				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in communityList" :key="index">
+			<!-- <view class="cate-section">
+				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in communityList"
+					:key="index">
 					<image :src="item1.pic"></image>
 					<text>{{ item1.name }}</text>
 				</view>
-			</view>
+			</view> -->
 
 			<!-- 新品上市 -->
 			<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/floorList')">
 				<image src="/static/temp/h1.png"></image>
 				<view class="tit-box">
-					<text class="tit">房屋列表</text>
+					<text class="tit">社区团购</text>
+					<text class="tit2">Guess You Like It</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/floorList')">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">社区特供</text>
 					<text class="tit2">Guess You Like It</text>
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
-			<view class="goods-list-vertical">
-				<view v-for="(item, index) in newProductList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)">
-					<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view>
+
+			<!-- 	<view class="goods-list-vertical">
+				<view v-for="(item, index) in newProductList" :key="index" class="goods-item-vertical"
+					@click="navToDetailPage(item)">
+					<view class="image-wrapper-vertical">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
 					<view class="goods-list-right">
 						<view class="goods-right-top">
 							<text class="">{{ item.name }}</text>
@@ -88,681 +102,790 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import coupon from '@/components/coolc-coupon/coolc-coupon';
-
-import { formatDate } from '@/common/date';
-import { mapState } from 'vuex';
-import navBar from '@/components/zhouWei-navBar';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-export default {
-	components: {
-		coupon,
-
-		uniLoadMore,
-		navBar
-	},
-	data() {
-		return {
-			keyword: '',
-			pageNum: 1,
-			loadingType: 'more', //加载更多状态
-			titleNViewBackground: '',
-			swiperCurrent: 0,
-			communityId: 0,
-			swiperLength: 0,
-			carouselList: [],
-			hotProductList: [],
-			brandList: [], // 推荐品牌
-			homeFlashPromotion: [], // 当前秒杀场次
-			subjectList: [], //推荐专题
-			floorList: [],
-			geohash:'',
-			communityList: [],
-			communityList1: [],
-			groupHotGoodsList: [],
-			couponList: [],
-			newProductList: []
-		};
-	},
-	//加载更多
-	onReachBottom() {
-		this.pageNum = this.pageNum + 1;
-
-		this.getNewProductList();
-	},
-	onPullDownRefresh() {
-		this.pageNum = this.pageNum + 1;
-		this.getNewProductList('refresh');
-
-		this.loadData();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 2000);
-	},
-
-	onShareAppMessage() {},
-	async onLoad(ops) {
-		if (ops.communityId && ops.communityId != undefined) {
-			this.communityId = ops.communityId;
-		} else {
-			this.communityId = 0;
-		}
-		this.getNewProductList('refresh');
-		this.loadData();
-		//this.nearCommunity();
-	},
-
-	methods: {
-		/**
-		 *
-		 * 加载首页数据
-		 */
-		async loadData() {
-			let params = { communityId: this.communityId };
-			let data = await Api.apiCall('get', Api.build.home, params);
-			if (data) {
-				this.carouselList = data.advertiseList || [];
-				this.swiperLength = this.carouselList.length;
-				this.titleNViewBackground = 'rgb(203, 87, 60)';
-				this.communityList = data.communityList || [];
-				this.community = data.community || [];
-				console.log(this.community)
-				console.log(this.community.latitude)
-				if(this.community.latitude){
-					this.geohash=this.community.latitude+','+ this.community.longitude;
-				}
-			}
-			//this.loadData2();
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+	import {
+		formatDate
+	} from '@/common/date';
+	import {
+		mapState
+	} from 'vuex';
+	import navBar from '@/components/zhouWei-navBar';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+		components: {
+			coupon,
+
+			uniLoadMore,
+			navBar
+		},
+		data() {
+			return {
+				keyword: '',
+				pageNum: 1,
+				loadingType: 'more', //加载更多状态
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				communityId: 0,
+				swiperLength: 0,
+				carouselList: [],
+				hotProductList: [],
+				brandList: [], // 推荐品牌
+				homeFlashPromotion: [], // 当前秒杀场次
+				subjectList: [], //推荐专题
+				floorList: [],
+				geohash: '',
+				communityList: [],
+				communityList1: [],
+				groupHotGoodsList: [],
+				couponList: [],
+				newProductList: []
+			};
 		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
 
-		/**
-		 * 获取轮播图
-		 */
-		async nearCommunity() {
-			if(this.community.latitude){
-			let params = params = { geohash: this.community.latitude+','+ this.community.longitude, pageSize: 10,distance:40 };
-			let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
-			if (data) {
-				this.communityList = data || [];
-			}
-			}
+			this.getNewProductList();
 		},
-		/**
-		 * 获取轮播图
-		 */
-		async getBanner() {
-			let params = {};
-			let data = await Api.apiCall('get', Api.index.bannerList, params);
-			if (data) {
-				this.carouselList = data || [];
-			}
+		onPullDownRefresh() {
+			this.pageNum = this.pageNum + 1;
+			this.getNewProductList('refresh');
+
+			this.loadData();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
 		},
 
-		/**
-		 * 获取新品上市信息
-		 */
-		async getNewProductList(type = 'add', loading) {
-			//没有更多直接返回
-			if (type === 'add') {
-				if (this.loadingType === 'nomore') {
-					return;
-				}
-				this.loadingType = 'loading';
+		onShareAppMessage() {},
+		async onLoad(ops) {
+			console.log(ops)
+			if (ops.communityId && ops.communityId != undefined) {
+				this.communityId = ops.communityId;
 			} else {
-				this.loadingType = 'more';
+				this.communityId = 0;
 			}
-			let params = { pageNum: this.pageNum, communityId: this.communityId };
-			let list = await Api.apiCall('get', Api.build.floorList, params);
 
-			let goodsList = list.records;
+			uni.setNavigationBarTitle({
+				title: ops.name
+			});
+			this.getNewProductList('refresh');
+			this.loadData();
+			//this.nearCommunity();
+		},
 
-			if (type === 'refresh') {
-				this.newProductList = [];
-			}
+		methods: {
+			/**
+			 *
+			 * 加载首页数据
+			 */
+			async loadData() {
+				let params = {
+					communityId: this.communityId
+				};
+				let data = await Api.apiCall('get', Api.build.home, params);
+				if (data) {
+					this.carouselList = data.advertiseList || [];
+					this.swiperLength = this.carouselList.length;
+					this.titleNViewBackground = 'rgb(203, 87, 60)';
+					this.communityList = data.communityList || [];
+					this.community = data.community || [];
+					console.log(this.community)
+					console.log(this.community.latitude)
+					if (this.community.latitude) {
+						this.geohash = this.community.latitude + ',' + this.community.longitude;
+					}
+				}
+				//this.loadData2();
+			},
 
-			this.newProductList = this.newProductList.concat(goodsList);
+			/**
+			 * 获取轮播图
+			 */
+			async nearCommunity() {
+				if (this.community.latitude) {
+					let params = params = {
+						geohash: this.community.latitude + ',' + this.community.longitude,
+						pageSize: 10,
+						distance: 40
+					};
+					let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
+					if (data) {
+						this.communityList = data || [];
+					}
+				}
+			},
+			/**
+			 * 获取轮播图
+			 */
+			async getBanner() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.bannerList, params);
+				if (data) {
+					this.carouselList = data || [];
+				}
+			},
 
-			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
-			this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
-			if (type === 'refresh') {
-				if (loading == 1) {
-					uni.hideLoading();
+			/**
+			 * 获取新品上市信息
+			 */
+			async getNewProductList(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
 				} else {
-					uni.stopPullDownRefresh();
+					this.loadingType = 'more';
 				}
-			}
-		},
+				let params = {
+					pageNum: this.pageNum,
+					communityId: this.communityId
+				};
+				let list = await Api.apiCall('get', Api.build.floorList, params);
 
-		/**
-		 * 获取团购信息
-		 */
-		async getHotGoodsList() {
-			let params = {};
-			let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
-			this.groupHotGoodsList = groupHotGoodsList;
-		},
+				let goodsList = list.records;
 
-		/**
-		 * 获取秒杀列表信息
-		 */
-		async getFlashPromotion() {
-			let params = {};
-			let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
-			if (data) {
-				let homeFlashPromotion = data;
-				if (homeFlashPromotion.length > 0) {
-					this.homeFlashPromotion = homeFlashPromotion[0];
+				if (type === 'refresh') {
+					this.newProductList = [];
 				}
-			}
-		},
 
-		/**
-		 * 获取分类精选列表信息
-		 */
-		async getCatList() {
-			let params = {};
-			let data = await Api.apiCall('get', Api.goods.newProductList, params);
-			if (data) {
-				let cat_list = data;
-				this.cat_list = cat_list || [];
-			}
-		},
+				this.newProductList = this.newProductList.concat(goodsList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
 
-		dateFormat(time) {
-			if (time == null || time === '') {
-				return 'N/A';
+			/**
+			 * 获取团购信息
+			 */
+			async getHotGoodsList() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+				this.groupHotGoodsList = groupHotGoodsList;
+			},
+
+			/**
+			 * 获取秒杀列表信息
+			 */
+			async getFlashPromotion() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
+				if (data) {
+					let homeFlashPromotion = data;
+					if (homeFlashPromotion.length > 0) {
+						this.homeFlashPromotion = homeFlashPromotion[0];
+					}
+				}
+			},
+
+			/**
+			 * 获取分类精选列表信息
+			 */
+			async getCatList() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.goods.newProductList, params);
+				if (data) {
+					let cat_list = data;
+					this.cat_list = cat_list || [];
+				}
+			},
+
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			navToTabPageStore(item) {
+				let id = item;
+				uni.navigateTo({
+					url: `../../pagesA/build/community?communityId=${id}`
+				});
+			},
+			navToTabPage(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+
+			search() {
+				uni.navigateTo({
+					url: '/pages/search/search'
+				});
 			}
-			let date = new Date(time);
-			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-		},
-		//轮播图切换修改背景色
-		swiperChange(e) {
-			const index = e.detail.current;
-			this.swiperCurrent = index;
-			this.titleNViewBackground = this.carouselList[index].background;
-		},
-		navToTabPageStore(item) {
-			let id = item;
-			uni.navigateTo({
-				url: `../../pagesA/build/community?communityId=${id}`
-			});
-		},
-		navToTabPage(url) {
-			uni.navigateTo({
-				url: url
-			});
 		},
 
-		search() {
+		// 标题栏input搜索框点击
+		onNavigationBarSearchInputClicked: async function(e) {
 			uni.navigateTo({
 				url: '/pages/search/search'
 			});
+		},
+		//点击导航栏 buttons 时触发
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.$api.msg('点击了扫描');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '../../pagesU/notice/notice'
+				});
+			}
 		}
-	},
-
-	// 标题栏input搜索框点击
-	onNavigationBarSearchInputClicked: async function(e) {
-		uni.navigateTo({
-			url: '/pages/search/search'
-		});
-	},
-	//点击导航栏 buttons 时触发
-	onNavigationBarButtonTap(e) {
-		const index = e.index;
-		if (index === 0) {
-			this.$api.msg('点击了扫描');
-		} else if (index === 1) {
-			// #ifdef APP-PLUS
-			const pages = getCurrentPages();
-			const page = pages[pages.length - 1];
-			const currentWebview = page.$getAppWebview();
-			currentWebview.hideTitleNViewButtonRedDot({
-				index
-			});
-			// #endif
-			uni.navigateTo({
-				url: '../../pagesU/notice/notice'
-			});
-		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.MP-search {
-	background: #ffffff;
-	height: 80upx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: fixed;
-	width: 100%;
-	z-index: 999;
-}
-.MP-search-input {
-	font-size: 28upx;
-	background: #f5f5f5;
-	height: 60upx;
-	width: 90%;
-	border-radius: 50upx;
-	text-align: center;
-}
-.mp-search-box {
-	position: absolute;
-	left: 0;
-	top: 30upx;
-	z-index: 9999;
-	width: 100%;
-	padding: 0 80upx;
-	.ser-input {
-		flex: 1;
+	.MP-search {
+		background: #ffffff;
+		height: 80upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		width: 100%;
+		z-index: 999;
+	}
+
+	.MP-search-input {
+		font-size: 28upx;
+		background: #f5f5f5;
 		height: 60upx;
-		line-height: 60upx;
+		width: 90%;
+		border-radius: 50upx;
 		text-align: center;
-		font-size: 28upx;
-		color: $font-color-base;
-		border-radius: 20px;
-		background: rgba(255, 255, 255, 0.6);
 	}
-}
-page {
-	.cate-section {
-		position: relative;
-		z-index: 5;
-		border-radius: 16upx 16upx 0 0;
-		margin-top: -20upx;
+
+	.mp-search-box {
+		position: absolute;
+		left: 0;
+		top: 30upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0 80upx;
+
+		.ser-input {
+			flex: 1;
+			height: 60upx;
+			line-height: 60upx;
+			text-align: center;
+			font-size: 28upx;
+			color: $font-color-base;
+			border-radius: 20px;
+			background: rgba(255, 255, 255, 0.6);
+		}
 	}
-	.carousel-section {
-		padding: 0;
-		.titleNview-placing {
-			padding-top: 0;
-			height: 0;
+
+	page {
+		.cate-section {
+			position: relative;
+			z-index: 5;
+			border-radius: 16upx 16upx 0 0;
+			margin-top: -20upx;
 		}
-		.carousel {
-			.carousel-item {
-				padding: 0;
+
+		.carousel-section {
+			padding: 0;
+
+			.titleNview-placing {
+				padding-top: 0;
+				height: 0;
+			}
+
+			.carousel {
+				.carousel-item {
+					padding: 0;
+				}
+			}
+
+			.swiper-dots {
+				left: 45upx;
+				bottom: 40upx;
 			}
-		}
-		.swiper-dots {
-			left: 45upx;
-			bottom: 40upx;
 		}
 	}
-}
-
-page {
-	background: #f5f5f5;
-}
-.m-t {
-	margin-top: 20upx;
-}
-/* 头部 轮播图 */
-.carousel-section {
-	position: relative;
-	padding-top: 10px;
-
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		padding-top: 44px;
-		box-sizing: content-box;
+
+	page {
+		background: #f5f5f5;
 	}
 
-	.titleNview-background {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 426upx;
-		transition: 0.4s;
+	.m-t {
+		margin-top: 20upx;
 	}
-}
-.carousel {
-	width: 100%;
-	height: 350upx;
 
-	.carousel-item {
-		width: 100%;
-		height: 100%;
-		padding: 0 28upx;
-		overflow: hidden;
+	/* 头部 轮播图 */
+	.carousel-section {
+		position: relative;
+		padding-top: 10px;
+
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			padding-top: 44px;
+			box-sizing: content-box;
+		}
+
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426upx;
+			transition: 0.4s;
+		}
 	}
 
-	image {
+	.carousel {
 		width: 100%;
-		height: 100%;
-		border-radius: 10upx;
-	}
-}
-.swiper-dots {
-	display: flex;
-	position: absolute;
-	left: 60upx;
-	bottom: 15upx;
-	width: 72upx;
-	height: 36upx;
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
-	background-size: 100% 100%;
-
-	.num {
-		width: 36upx;
-		height: 36upx;
-		border-radius: 50px;
-		font-size: 24upx;
-		color: #fff;
-		text-align: center;
-		line-height: 36upx;
+		height: 350upx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10upx;
+		}
 	}
 
-	.sign {
+	.swiper-dots {
+		display: flex;
 		position: absolute;
-		top: 0;
-		left: 50%;
-		line-height: 36upx;
-		font-size: 12upx;
-		color: #fff;
-		transform: translateX(-50%);
+		left: 60upx;
+		bottom: 15upx;
+		width: 72upx;
+		height: 36upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+		background-size: 100% 100%;
+
+		.num {
+			width: 36upx;
+			height: 36upx;
+			border-radius: 50px;
+			font-size: 24upx;
+			color: #fff;
+			text-align: center;
+			line-height: 36upx;
+		}
+
+		.sign {
+			position: absolute;
+			top: 0;
+			left: 50%;
+			line-height: 36upx;
+			font-size: 12upx;
+			color: #fff;
+			transform: translateX(-50%);
+		}
 	}
-}
-/* 分类 */
-.cate-section {
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	flex-wrap: wrap;
-	padding: 30upx 22upx;
-	background: #fff;
-	.cate-item {
+
+	/* 分类 */
+	.cate-section {
 		display: flex;
-		flex-direction: column;
+		justify-content: space-around;
 		align-items: center;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-	}
-	/* 原图标颜色太深,不想改图了,所以加了透明度 */
-	image {
-		width: 88upx;
-		height: 88upx;
-		margin-bottom: 14upx;
-		border-radius: 50%;
-		opacity: 0.7;
-		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		flex-wrap: wrap;
+		padding: 30upx 22upx;
+		background: #fff;
+
+		.cate-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+		}
+
+		/* 原图标颜色太深,不想改图了,所以加了透明度 */
+		image {
+			width: 88upx;
+			height: 88upx;
+			margin-bottom: 14upx;
+			border-radius: 50%;
+			opacity: 0.7;
+			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		}
 	}
-}
-.ad-1 {
-	width: 100%;
-	height: 210upx;
-	padding: 10upx 0;
-	background: #fff;
-	image {
+
+	.ad-1 {
 		width: 100%;
-		height: 100%;
+		height: 210upx;
+		padding: 10upx 0;
+		background: #fff;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 0upx 20upx 20upx;
+		background: #fff;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			line-height: 1;
+
+			.s-img {
+				width: 140upx;
+				height: 30upx;
+			}
+
+			.tip {
+				font-size: $font-base;
+				color: $font-color-light;
+				// margin: 0 20upx 0 40upx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40upx;
+				height: 36upx;
+				text-align: center;
+				line-height: 36upx;
+				margin-right: 14upx;
+				font-size: $font-sm + 2upx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.icon-you {
+				font-size: $font-lg;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 150upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 150upx;
+				height: 150upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
 	}
-}
-/* 秒杀专区 */
-.seckill-section {
-	padding: 0upx 20upx 20upx;
-	background: #fff;
-	.s-header {
+
+	.f-header {
 		display: flex;
 		align-items: center;
-		height: 90upx;
-		line-height: 1;
-		.s-img {
-			width: 140upx;
-			height: 30upx;
+		height: 140upx;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		image {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			margin-right: 20upx;
 		}
-		.tip {
-			font-size: $font-base;
-			color: $font-color-light;
-			// margin: 0 20upx 0 40upx;
+
+		.tit-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
 		}
-		.timer {
-			display: inline-block;
-			width: 40upx;
-			height: 36upx;
-			text-align: center;
-			line-height: 36upx;
-			margin-right: 14upx;
-			font-size: $font-sm + 2upx;
-			color: #fff;
-			border-radius: 2px;
-			background: rgba(0, 0, 0, 0.8);
+
+		.tit {
+			font-size: $font-lg + 2upx;
+			color: #font-color-dark;
+			line-height: 1.3;
+		}
+
+		.tit2 {
+			font-size: $font-sm;
+			color: $font-color-light;
 		}
+
 		.icon-you {
-			font-size: $font-lg;
+			font-size: $font-lg + 2upx;
 			color: $font-color-light;
-			flex: 1;
-			text-align: right;
 		}
 	}
-	.floor-list {
-		white-space: nowrap;
-	}
-	.scoll-wrapper {
-		display: flex;
-		align-items: flex-start;
-	}
-	.floor-item {
-		width: 150upx;
-		margin-right: 20upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		line-height: 1.8;
+
+	/* 团购楼层 */
+	.group-section {
+		background: #fff;
+
+		.g-swiper {
+			height: 650upx;
+			padding-bottom: 20upx;
+		}
+
+		.g-swiper-item {
+			width: 100%;
+			padding: 0 20upx;
+			display: flex;
+		}
+
 		image {
-			width: 150upx;
-			height: 150upx;
-			border-radius: 6upx;
+			width: 100%;
+			height: 460upx;
+			border-radius: 4px;
 		}
+
+		.g-item {
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+		}
+
+		.left {
+			flex: 1.2;
+
+			// margin-right: 24upx;
+			.t-box {
+				padding-top: 20upx;
+			}
+		}
+
+		.right {
+			flex: 0.8;
+			flex-direction: column-reverse;
+
+			.t-box {
+				padding-bottom: 20upx;
+			}
+		}
+
+		.t-box {
+			height: 160upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1.6;
+		}
+
 		.price {
 			color: $uni-color-primary;
 		}
-	}
-}
-
-.f-header {
-	display: flex;
-	align-items: center;
-	height: 140upx;
-	padding: 0upx 20upx;
-	background: #fff;
-	image {
-		flex-shrink: 0;
-		width: 80upx;
-		height: 80upx;
-		margin-right: 20upx;
-	}
-	.tit-box {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-	}
-	.tit {
-		font-size: $font-lg + 2upx;
-		color: #font-color-dark;
-		line-height: 1.3;
-	}
-	.tit2 {
-		font-size: $font-sm;
-		color: $font-color-light;
-	}
-	.icon-you {
-		font-size: $font-lg + 2upx;
-		color: $font-color-light;
-	}
-}
-/* 团购楼层 */
-.group-section {
-	background: #fff;
-	.g-swiper {
-		height: 650upx;
-		padding-bottom: 20upx;
-	}
-	.g-swiper-item {
-		width: 100%;
-		padding: 0 20upx;
-		display: flex;
-	}
-	image {
-		width: 100%;
-		height: 460upx;
-		border-radius: 4px;
-	}
-	.g-item {
-		display: flex;
-		flex-direction: column;
-		overflow: hidden;
-	}
-	.left {
-		flex: 1.2;
-		// margin-right: 24upx;
-		.t-box {
-			padding-top: 20upx;
+
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
 		}
-	}
-	.right {
-		flex: 0.8;
-		flex-direction: column-reverse;
-		.t-box {
-			padding-bottom: 20upx;
+
+		.pro-box {
+			display: flex;
+			align-items: center;
+			margin-top: 10upx;
+			font-size: $font-sm;
+			color: $font-base;
+			padding-right: 10upx;
+		}
+
+		.progress-box {
+			flex: 1;
+			border-radius: 10px;
+			overflow: hidden;
+			margin-right: 8upx;
 		}
 	}
-	.t-box {
-		height: 160upx;
-		font-size: $font-base + 2upx;
-		color: $font-color-dark;
-		line-height: 1.6;
-	}
-	.price {
-		color: $uni-color-primary;
-	}
-	.m-price {
-		font-size: $font-sm + 2upx;
-		text-decoration: line-through;
-		color: $font-color-light;
-		margin-left: 8upx;
-	}
-	.pro-box {
-		display: flex;
-		align-items: center;
-		margin-top: 10upx;
-		font-size: $font-sm;
-		color: $font-base;
-		padding-right: 10upx;
-	}
-	.progress-box {
-		flex: 1;
-		border-radius: 10px;
-		overflow: hidden;
-		margin-right: 8upx;
-	}
-}
-/* 分类推荐楼层 */
-.hot-floor {
-	width: 100%;
-	overflow: hidden;
-	margin-bottom: 20upx;
-	.floor-img-box {
+
+	/* 分类推荐楼层 */
+	.hot-floor {
 		width: 100%;
-		height: 320upx;
-		position: relative;
-		&:after {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 320upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.floor-img {
 			width: 100%;
 			height: 100%;
-			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 		}
-	}
-	.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 {
+
+		.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;
-		}
-		.price {
-			color: $uni-color-primary;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
 		}
 	}
-	.more {
+
+	/* 单条商品 */
+	.goods-box-single {
 		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;
+		padding: 20upx 0;
+
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
 		}
 	}
-}
-/* 单条商品 */
-.goods-box-single {
-	display: flex;
-	padding: 20upx 0;
-	.goods-img {
-		display: block;
-		width: 120upx;
-		height: 120upx;
-	}
-	.right {
-		flex: 1;
+
+	.price-box {
 		display: flex;
-		flex-direction: column;
-		padding: 0 30upx 0 24upx;
-		overflow: hidden;
-		.title {
-			font-size: $font-base + 2upx;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+
+		.num {
+			margin: 0 8upx;
 			color: $font-color-dark;
-			line-height: 1;
-		}
-		.attr-box {
-			font-size: $font-sm + 2upx;
-			color: $font-color-light;
-			padding: 10upx 12upx;
 		}
+
 		.price {
-			font-size: $font-base + 2upx;
+			font-size: $font-lg;
 			color: $font-color-dark;
+
 			&:before {
 				content: '￥';
 				font-size: $font-sm;
@@ -770,197 +893,199 @@ page {
 			}
 		}
 	}
-}
-
-.price-box {
-	display: flex;
-	justify-content: flex-end;
-	align-items: baseline;
-	padding: 20upx 30upx;
-	font-size: $font-sm + 2upx;
-	color: $font-color-light;
-	.num {
-		margin: 0 8upx;
-		color: $font-color-dark;
+
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
 	}
-	.price {
-		font-size: $font-lg;
+
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
 		color: $font-color-dark;
-		&:before {
-			content: '￥';
-			font-size: $font-sm;
-			margin: 0 2upx 0 8upx;
-		}
-	}
-}
-.action-box {
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	height: 100upx;
-	position: relative;
-	padding-right: 30upx;
-}
-.action-btn {
-	width: 160upx;
-	height: 60upx;
-	margin: 0;
-	margin-left: 24upx;
-	padding: 0;
-	text-align: center;
-	line-height: 60upx;
-	font-size: $font-sm + 2upx;
-	color: $font-color-dark;
-	background: #fff;
-	border-radius: 100px;
-	&:after {
+		background: #fff;
 		border-radius: 100px;
-	}
-	&.recom {
-		background: #fff9f9;
-		color: $base-color;
+
 		&:after {
-			border-color: #f7bcc8;
+			border-radius: 100px;
+		}
+
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+
+			&:after {
+				border-color: #f7bcc8;
+			}
 		}
 	}
-}
-
-/* 猜你喜欢 */
-.guess-section {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0 30upx;
-	background: #fff;
-	.guess-item {
+
+	/* 猜你喜欢 */
+	.guess-section {
 		display: flex;
-		flex-direction: column;
-		width: 48%;
-		padding-bottom: 40upx;
-		&:nth-child(2n + 1) {
-			margin-right: 4%;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
 		}
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 330upx;
-		border-radius: 3px;
-		overflow: hidden;
-		image {
+
+		.image-wrapper {
 			width: 100%;
-			height: 100%;
-			opacity: 1;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
 		}
-	}
-	.title {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		line-height: 80upx;
-	}
-	.price {
-		font-size: $font-lg;
-		color: $uni-color-primary;
-		line-height: 1;
-	}
-	.coupon_box {
-		width: 100%;
-		height: auto;
-		display: table;
-		padding: 6upx 26upx 26upx 26upx;
-	}
 
-	.other_type {
-		width: 100%;
-		height: 90upx;
-		padding-top: 50upx;
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+		}
 
-		.text {
+		.coupon_box {
 			width: 100%;
-			border-top: 1px solid #eeeeee;
-			display: block;
-			text-align: center;
-			position: relative;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
 		}
-		.text span {
-			width: 180upx;
-			height: 40upx;
-			line-height: 40upx;
-			color: #999999;
-			display: block;
-			background: #ffffff;
-			position: absolute;
-			left: 50%;
-			top: 50%;
-			margin-left: -90upx;
-			margin-top: -20upx;
-			font-size: $font-base;
+
+		.other_type {
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
+
+			.text span {
+				width: 180upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #999999;
+				display: block;
+				background: #ffffff;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				margin-left: -90upx;
+				margin-top: -20upx;
+				font-size: $font-base;
+			}
 		}
 	}
-}
-.getPosition {
-	height: 100upx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 32upx;
-	background-color: #fff;
-}
-.goods-list-vertical {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0upx 20upx;
-	background: #fff;
-	.goods-item-vertical {
+
+	.getPosition {
+		height: 100upx;
 		display: flex;
-		flex-direction: row;
-		height: 280upx;
-		align-items: center;
 		justify-content: center;
-		border-bottom: 1upx solid #eeeeee;
-		.image-wrapper-vertical {
-			width: 240upx;
-			height: 240upx;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #fff;
+	}
+
+	.goods-list-vertical {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		.goods-item-vertical {
 			display: flex;
+			flex-direction: row;
+			height: 280upx;
 			align-items: center;
 			justify-content: center;
-			margin-right: 10upx;
-			image {
+			border-bottom: 1upx solid #eeeeee;
+
+			.image-wrapper-vertical {
 				width: 240upx;
 				height: 240upx;
-			}
-		}
-		.goods-list-right {
-			width: 470upx;
-			.goods-right-top {
-				height: 200upx;
-				text {
-					font-size: 32upx;
-					text-overflow: -o-ellipsis-lastline;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
-			}
-			.goods-right-bottom {
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
-				.price {
-					font-size: $font-lg;
-					color: $uni-color-primary;
-					line-height: 1;
-					&:before {
-						content: '';
-						font-size: 26upx;
+				justify-content: center;
+				margin-right: 10upx;
+
+				image {
+					width: 240upx;
+					height: 240upx;
+				}
+			}
+
+			.goods-list-right {
+				width: 470upx;
+
+				.goods-right-top {
+					height: 200upx;
+
+					text {
+						font-size: 32upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
 					}
 				}
-				.sale {
-					color: $font-color-light;
-					font-size: 28upx;
+
+				.goods-right-bottom {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.price {
+						font-size: $font-lg;
+						color: $uni-color-primary;
+						line-height: 1;
+
+						&:before {
+							content: '';
+							font-size: 26upx;
+						}
+					}
+
+					.sale {
+						color: $font-color-light;
+						font-size: 28upx;
+					}
 				}
 			}
 		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pagesA/build/communityList.vue b/mallplusui-uniapp-app/pagesA/build/communityList.vue
index f8bcb95..2e1f01d 100644
--- a/mallplusui-uniapp-app/pagesA/build/communityList.vue
+++ b/mallplusui-uniapp-app/pagesA/build/communityList.vue
@@ -3,454 +3,512 @@
 		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
 			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
 
-			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+			<!-- <view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
 				<text>楼房</text>
 				<view class="p-box">
 					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
 					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
 				</view>
-			</view>
+			</view> -->
 			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
 		</view>
 		<!-- 列表显示 -->
-		<view class="goods-list-vertical" >
-			<view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)">
-				<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view>
+		<view class="goods-list-vertical">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical"
+				@click="navToDetailPage(item)">
+				<view class="image-wrapper-vertical">
+					<image :src="item.pic" mode="aspectFill"></image>
+				</view>
 				<view class="goods-list-right">
 					<view class="goods-right-top">
-						<text class="">{{ item.name }}</text>
+						<text class="text1">{{ item.name }}</text>
+						<text class="text2">地址:卡就哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到哦啊四到四的</text>
+						<text class="text2">电话:13623307393</text>
 					</view>
-					<view class="goods-right-bottom">
+					<!-- <view class="goods-right-bottom">
 						<text class="price">均价:{{ item.price }}</text>
 						<text class="sale" v-if="geohash">距离: {{item.distance.toFixed(4)}}</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
-		
+
 		<uni-load-more :status="loadingType"></uni-load-more>
-		
+
 
 	</view>
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-export default {
-	components: {
-		uniLoadMore
-	},
-	data() {
-		return {
-			cateMaskState: 0, //分类面板展开状态
-			headerPosition: 'fixed',
-			headerTop: '0px',
-			keyword: '',
-			loadingType: 'more', //加载更多状态
-			filterIndex: 0,
-			cateId: 0, //已选三级分类id
-			pageNum: 1,
-			cid: null,
-			geohash:'',
-			priceOrder: 0, //1 价格从低到高 2价格从高到低
-			cateList: [],
-			goodsList: []
-		};
-	},
-
-	onLoad(options) {
-		// #ifdef H5
-		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
-		// #endif
-		this.keyword = options.keyword;
-		this.cateId = options.sid;
-		//this.loadCateList(options.fid, options.sid);
-		if(options.geohash){
-			this.geohash=options.geohash;
-			this.nearCommunity(options.geohash);
-		}else{
-			console.log(options.geohash)
-			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();
-	},
-	methods: {
-		async nearCommunity(geohash) {
-			let params = params = { geohash: geohash, pageSize: 10,distance:240 };
-			let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
-			if (data) {
-				this.goodsList = data || [];
-			}
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+		components: {
+			uniLoadMore
 		},
-		//加载商品 ，带下拉刷新和上滑加载
-		async loadData(type = 'add', loading) {
-			//没有更多直接返回
-			if (type === 'add') {
-				if (this.loadingType === 'nomore') {
-					return;
-				}
-				this.loadingType = 'loading';
-			} else {
-				this.loadingType = 'more';
-			}
-			let params;
-			
-			if (this.keyword) {
-				params = { pageNum: this.pageNum, keyword: this.keyword };
+		data() {
+			return {
+				cateMaskState: 0, //分类面板展开状态
+				headerPosition: 'fixed',
+				headerTop: '0px',
+				keyword: '',
+				loadingType: 'more', //加载更多状态
+				filterIndex: 0,
+				cateId: 0, //已选三级分类id
+				pageNum: 1,
+				cid: null,
+				geohash: '',
+				priceOrder: 0, //1 价格从低到高 2价格从高到低
+				cateList: [],
+				goodsList: []
+			};
+		},
+
+		onLoad(options) {
+			// #ifdef H5
+			this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+			// #endif
+			this.keyword = options.keyword;
+			this.cateId = options.sid;
+			//this.loadCateList(options.fid, options.sid);
+			if (options.geohash) {
+				this.geohash = options.geohash;
+				this.nearCommunity(options.geohash);
 			} else {
-				params = { pageNum: this.pageNum };
+				console.log(options.geohash)
+				this.loadData();
 			}
 
-			let list = await Api.apiCall('get', Api.build.communityList, params);
-			let goodsList = list.records;
-			// let goodsList = await this.$api.json('goodsList');
-			if (type === 'refresh') {
-				this.goodsList = [];
-			}
-			//筛选，测试数据直接前端筛选了
-			if (this.filterIndex === 1) {
-				goodsList.sort((a, b) => b.sales - a.sales);
+		},
+
+		onPageScroll(e) {
+			//兼容iOS端下拉时顶部漂移
+			if (e.scrollTop >= 0) {
+				this.headerPosition = 'fixed';
+			} else {
+				this.headerPosition = 'absolute';
 			}
-			if (this.filterIndex === 2) {
-				goodsList.sort((a, b) => {
-					if (this.priceOrder == 1) {
-						return a.counts - b.counts;
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData('refresh');
+		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData();
+		},
+		methods: {
+			async nearCommunity(geohash) {
+				let params = params = {
+					geohash: geohash,
+					pageSize: 10,
+					distance: 240
+				};
+				let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
+				if (data) {
+					this.goodsList = data || [];
+				}
+			},
+			//加载商品 ，带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
 					}
-					return b.counts - a.counts;
-				});
-			}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params;
+
+				if (this.keyword) {
+					params = {
+						pageNum: this.pageNum,
+						keyword: this.keyword
+					};
+				} else {
+					params = {
+						pageNum: this.pageNum
+					};
+				}
+
+				let list = await Api.apiCall('get', Api.build.communityList, params);
+				let goodsList = list.records;
+				// let goodsList = await this.$api.json('goodsList');
+				if (type === 'refresh') {
+					this.goodsList = [];
+				}
+				//筛选，测试数据直接前端筛选了
+				if (this.filterIndex === 1) {
+					goodsList.sort((a, b) => b.sales - a.sales);
+				}
+				if (this.filterIndex === 2) {
+					goodsList.sort((a, b) => {
+						if (this.priceOrder == 1) {
+							return a.counts - b.counts;
+						}
+						return b.counts - a.counts;
+					});
+				}
 
-			this.goodsList = this.goodsList.concat(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();
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
+			//筛选点击
+			tabClick(index) {
+				this.pageNum = 1;
+				if (this.filterIndex === index && index !== 2) {
+					return;
+				}
+				this.filterIndex = index;
+				if (index === 2) {
+					this.priceOrder = this.priceOrder === 1 ? 2 : 1;
 				} else {
-					uni.stopPullDownRefresh();
+					this.priceOrder = 0;
 				}
-			}
-		},
-		//筛选点击
-		tabClick(index) {
-			this.pageNum = 1;
-			if (this.filterIndex === index && index !== 2) {
-				return;
-			}
-			this.filterIndex = index;
-			if (index === 2) {
-				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
-			} else {
-				this.priceOrder = 0;
-			}
-			uni.pageScrollTo({
-				duration: 300,
-				scrollTop: 0
-			});
-			this.loadData('refresh', 1);
+				uni.pageScrollTo({
+					duration: 300,
+					scrollTop: 0
+				});
+				this.loadData('refresh', 1);
 
-		},
-		//显示分类面板
-		toggleCateMask(type) {
-			let timer = type === 'show' ? 10 : 300;
-			let state = type === 'show' ? 1 : 0;
-			this.cateMaskState = 2;
-			setTimeout(() => {
-				this.cateMaskState = state;
-			}, timer);
-		},
-		//分类点击
-		changeCate(item) {
-			console.log(item.id);
-			this.pageNum = 1;
-			this.cateId = item.id;
-			this.toggleCateMask();
-			uni.pageScrollTo({
-				duration: 300,
-				scrollTop: 0
-			});
-			this.loadData('refresh', 1);
+			},
+			//显示分类面板
+			toggleCateMask(type) {
+				console.log("type", type);
+				let timer = type === 'show' ? 10 : 300;
+				let state = type === 'show' ? 1 : 0;
+				this.cateMaskState = 2;
+				setTimeout(() => {
+					this.cateMaskState = state;
+				}, timer);
+			},
+			//分类点击
+			changeCate(item) {
+				console.log(item.id);
+				this.pageNum = 1;
+				this.cateId = item.id;
+				this.toggleCateMask();
+				uni.pageScrollTo({
+					duration: 300,
+					scrollTop: 0
+				});
+				this.loadData('refresh', 1);
 
-		},
-		//详情
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `../../pagesA/build/community?communityId=${id}`
-			});
-		},
-		stopPrevent() {}
-	}
-};
+			},
+			//详情
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				let name = item.name;
+				uni.navigateTo({
+					url: `../../pagesA/build/community?communityId=${id}&name=${name}`
+				});
+			},
+			stopPrevent() {}
+		}
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	background: $page-color-base;
-}
-.content {
-	padding-top: 96upx;
-}
-
-.navbar {
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-	display: flex;
-	width: 100%;
-	height: 80upx;
-	background: #fff;
-	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 30upx;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 120upx;
-				height: 0;
-				border-bottom: 4upx solid $base-color;
-			}
-		}
+	page,
+	.content {
+		background: $page-color-base;
 	}
-	.p-box {
+
+	.content {
+		padding-top: 96upx;
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
 		display: flex;
-		flex-direction: column;
-		.yticon {
+		width: 100%;
+		height: 70upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+		z-index: 10;
+		padding-left: 20px;
+
+		.nav-item {
+			flex: 1;
 			display: flex;
 			align-items: center;
-			justify-content: center;
-			width: 30upx;
-			height: 14upx;
-			line-height: 1;
-			margin-left: 4upx;
-			font-size: 26upx;
-			color: #888;
-			&.active {
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
 				color: $base-color;
+				&:after {
+					content: '';
+					position: absolute;
+					left: 9%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
 			}
 		}
-		.xia {
-			transform: scaleY(-1);
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
 		}
-	}
-	.cate-item {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		width: 80upx;
-		position: relative;
-		font-size: 44upx;
-		&:after {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			border-left: 1px solid #ddd;
-			width: 0;
-			height: 36upx;
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
 		}
 	}
-}
-
-/* 分类 */
-.cate-mask {
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-	bottom: 0;
-	width: 100%;
-	background: rgba(0, 0, 0, 0);
-	z-index: 95;
-	transition: 0.3s;
-
-	.cate-content {
-		width: 630upx;
-		height: 100%;
-		background: #fff;
-		float: right;
-		transform: translateX(100%);
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
 		transition: 0.3s;
-	}
-	&.none {
-		display: none;
-	}
-	&.show {
-		background: rgba(0, 0, 0, 0.4);
 
 		.cate-content {
-			transform: translateX(0);
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: 0.3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, 0.4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
 		}
 	}
-}
-.cate-list {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-	.cate-item {
-		display: flex;
-		align-items: center;
-		height: 90upx;
-		padding-left: 30upx;
-		font-size: 28upx;
-		color: #555;
-		position: relative;
-	}
-	.two {
-		height: 64upx;
-		color: #303133;
-		font-size: 30upx;
-		background: #f8f8f8;
-	}
-	.active {
-		color: $base-color;
-	}
-}
-
-/* 商品列表 */
-.goods-list {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 20upx 20upx 0 20upx;
-	background: #fff;
-	.goods-item {
+
+	.cate-list {
 		display: flex;
 		flex-direction: column;
-		width: 48%;
-		padding-bottom: 40upx;
-		&:nth-child(2n + 1) {
-			margin-right: 4%;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
 		}
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 330upx;
-		border-radius: 3px;
-		overflow: hidden;
-		image {
-			width: 100%;
-			height: 100%;
-			opacity: 1;
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
 		}
-	}
-	.title {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		line-height: 80upx;
-	}
-	.price-box {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding-right: 10upx;
-		font-size: 24upx;
-		color: $font-color-light;
-	}
-	.price {
-		font-size: $font-lg;
-		color: $uni-color-primary;
-		line-height: 1;
-		&:before {
-			content: '';
-			font-size: 26upx;
+
+		.active {
+			color: $base-color;
 		}
 	}
-}
-.goods-list-vertical {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0upx 20upx;
-	background: #fff;
-	.goods-item-vertical {
+
+	/* 商品列表 */
+	.goods-list {
 		display: flex;
-		flex-direction: row;
-		height: 280upx;
-		align-items: center;
-		justify-content: center;
-		border-bottom: 1upx solid #eeeeee;
-		.image-wrapper-vertical {
-			width: 240upx;
-			height: 240upx;
+		flex-wrap: wrap;
+		padding: 20upx 20upx 0 20upx;
+		background: #fff;
+
+		.goods-item {
 			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin-right: 10upx;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
 			image {
-				width: 240upx;
-				height: 240upx;
+				width: 100%;
+				height: 100%;
+				opacity: 1;
 			}
 		}
-		.goods-list-right {
-			width: 470upx;
-			.goods-right-top {
-				height: 200upx;
-				text {
-					font-size: 32upx;
-					text-overflow: -o-ellipsis-lastline;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
+
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-right: 10upx;
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+
+			&:before {
+				content: '';
+				font-size: 26upx;
 			}
-			.goods-right-bottom {
+		}
+	}
+
+	.goods-list-vertical {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		.goods-item-vertical {
+			display: flex;
+			flex-direction: row;
+			height: 200upx;
+
+			.image-wrapper-vertical {
+				width: 200upx;
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
-				.price {
-					font-size: $font-lg;
-					color: $uni-color-primary;
-					line-height: 1;
-					&:before {
-						content: '';
-						font-size: 26upx;
+				justify-content: center;
+				margin-right: 10upx;
+
+				image {
+					width: 150upx;
+					height: 150upx;
+				}
+			}
+
+			.goods-list-right {
+				display: flex;
+				flex-direction: column;
+				width: 470upx;
+
+				.goods-right-top {
+					.text1 {
+						margin-top: 10px;
+						font-size: 32upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+					.text2{
+						margin-top: 10px;
+						color: #555;
+						font-size: 30upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
 					}
 				}
-				.sale {
-					color: $font-color-light;
-					font-size: 28upx;
+
+				.goods-right-bottom {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.price {
+						font-size: $font-lg;
+						color: $uni-color-primary;
+						line-height: 1;
+
+						&:before {
+							content: '';
+							font-size: 26upx;
+						}
+					}
+
+					.sale {
+						color: $font-color-light;
+						font-size: 28upx;
+					}
 				}
 			}
 		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pagesA/build/notice.vue b/mallplusui-uniapp-app/pagesA/build/notice.vue
index eae685c..3acc954 100644
--- a/mallplusui-uniapp-app/pagesA/build/notice.vue
+++ b/mallplusui-uniapp-app/pagesA/build/notice.vue
@@ -23,11 +23,19 @@ export default {
 		return {
 			pageNum: 1,
 
-			goodsList: []
+			goodsList: [
+				{
+					id:"25",
+					createTime :"2020-02-02",
+					title:"测试标签",
+					pic:"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg",
+					content:"爱上科技大厦送i的阿松i到速度奥昂是大宋i的"
+				}
+			]
 		};
 	},
 	onLoad() {
-		this.loadData();
+		// this.loadData();
 	},
 	onPageScroll(e) {
 		//兼容iOS端下拉时顶部漂移
diff --git a/mallplusui-uniapp-app/pagesA/product/giftList.vue b/mallplusui-uniapp-app/pagesA/product/giftList.vue
index c1de4c3..2c616d3 100644
--- a/mallplusui-uniapp-app/pagesA/product/giftList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/giftList.vue
@@ -36,7 +36,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue b/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
index 9ff269c..24e9680 100644
--- a/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<uni-load-more :status="loadingType"></uni-load-more>
-        <mallplusCopyright></mallplusCopyright>
+        <!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesA/product/groupList.vue b/mallplusui-uniapp-app/pagesA/product/groupList.vue
index c89c80b..e71e738 100644
--- a/mallplusui-uniapp-app/pagesA/product/groupList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/groupList.vue
@@ -36,7 +36,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesA/product/list.vue b/mallplusui-uniapp-app/pagesA/product/list.vue
index 8d78489..6909105 100644
--- a/mallplusui-uniapp-app/pagesA/product/list.vue
+++ b/mallplusui-uniapp-app/pagesA/product/list.vue
@@ -63,7 +63,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue b/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
index e425403..d9afddf 100644
--- a/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
@@ -36,7 +36,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesA/product/product.vue b/mallplusui-uniapp-app/pagesA/product/product.vue
index a7ba964..5e46963 100644
--- a/mallplusui-uniapp-app/pagesA/product/product.vue
+++ b/mallplusui-uniapp-app/pagesA/product/product.vue
@@ -500,6 +500,7 @@ export default {
 				uni.navigateTo({
 					url
 				});
+				return;
 			}
 			let userInfo = uni.getStorageSync('userInfo');
 			if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
diff --git a/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue b/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
index e4cca49..1ef8f7e 100644
--- a/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
+++ b/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
@@ -61,7 +61,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesC/seller/index.vue b/mallplusui-uniapp-app/pagesC/seller/index.vue
index d2c1860..19cb01b 100644
--- a/mallplusui-uniapp-app/pagesC/seller/index.vue
+++ b/mallplusui-uniapp-app/pagesC/seller/index.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<!-- 小程序头部兼容 -->
 		<!-- #ifdef MP -->
-				<view class="mp-search-box" @click="search()"><input class="ser-input" type="text" value="输入关键字搜索" /></view>
+		<view class="mp-search-box" @click="search()"><input class="ser-input" type="text" value="输入关键字搜索" /></view>
 		<!-- #endif -->
 
 		<!-- 头部轮播 -->
@@ -12,7 +12,8 @@
 			<!-- 背景色区域 -->
 			<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
 			<swiper class="carousel" circular @change="swiperChange">
-				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPageL(item.url)">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+					@click="navToDetailPageL(item.url)">
 					<image :src="item.pic" />
 				</swiper-item>
 			</swiper>
@@ -61,665 +62,738 @@
 				<uni-grid-item marker="badge" :text="orderData.yesOrderPay+''" type="primary">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=0')">昨日总额</text>
 				</uni-grid-item>
-				<uni-grid-item marker="badge" :text="orderStatusCount.status0+''" type="error" >
+				<uni-grid-item marker="badge" :text="orderStatusCount.status0+''" type="error">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=12')">待付款</text>
 				</uni-grid-item>
-				<uni-grid-item marker="badge" :text="orderStatusCount.status1+''" type="success" >
+				<uni-grid-item marker="badge" :text="orderStatusCount.status1+''" type="success">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=2')">待发货</text>
 				</uni-grid-item>
-				<uni-grid-item marker="badge" :text="orderStatusCount.status5+''" type="warning" >
+				<uni-grid-item marker="badge" :text="orderStatusCount.status5+''" type="warning">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=13')">申请退款</text>
 				</uni-grid-item>
-				<uni-grid-item marker="badge" :text="orderStatusCount.status14+''" type="warning" >
+				<uni-grid-item marker="badge" :text="orderStatusCount.status14+''" type="warning">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=15')">已关闭</text>
 				</uni-grid-item>
 			</uni-grid>
 
 		</view>
-		<view class="ad-1"><image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')" mode="scaleToFill"></image></view>
+		<view class="ad-1">
+			<image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')"
+				mode="scaleToFill"></image>
+		</view>
 
 		<view>
 			<uni-grid :column="3" :hor="35" :ver="-45">
-			<uni-grid-item marker="badge" :text="userData.nowCount+''" type="primary">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">今日新增会员</text>
-			</uni-grid-item>
-			<uni-grid-item marker="badge" :text="userData.yesUserCount+''" type="success">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">昨日新增会员</text>
-			</uni-grid-item>
-			<uni-grid-item marker="badge" :text="userData.qiUserCount+''" type="warning">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">当月新增会员</text>
-			</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.nowCount+''" type="primary">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">今日新增会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.yesUserCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">昨日新增会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.qiUserCount+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">当月新增会员</text>
+				</uni-grid-item>
 				<uni-grid-item marker="badge" :text="userData.mallCount+''" type="warning">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">男会员</text>
 				</uni-grid-item>
 				<uni-grid-item marker="badge" :text="userData.femallount+''" type="warning">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">女会员</text>
 				</uni-grid-item>
-			<uni-grid-item marker="badge" :text="userData.allCount+''" type="success">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">所有会员</text>
-			</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.allCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">所有会员</text>
+				</uni-grid-item>
 
 			</uni-grid>
 		</view>
-		<view class="ad-1"><image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')" mode="scaleToFill"></image></view>
+		<view class="ad-1">
+			<image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')"
+				mode="scaleToFill"></image>
+		</view>
 
 		<view>
 			<uni-grid :column="3" :hor="35" :ver="-45">
-			<uni-grid-item marker="badge" :text="goodsData.onCount+''" type="success">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=1')">在售商品</text>
-			</uni-grid-item>
-			<uni-grid-item marker="badge" :text="goodsData.offCount+''" type="warning">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=3')">仓库中</text>
-			</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.onCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=1')">在售商品</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.offCount+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=3')">仓库中</text>
+				</uni-grid-item>
 				<uni-grid-item marker="badge" :text="goodsData.noStock+''" type="warning">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=2')">已售馨</text>
 				</uni-grid-item>
-			<uni-grid-item marker="badge" :text="goodsData.nowCount+''" type="primary">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">今日新增商品</text>
-			</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.nowCount+''" type="primary">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">今日新增商品</text>
+				</uni-grid-item>
 				<uni-grid-item marker="badge" :text="goodsData.yesCount+''" type="success">
 					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=0')">昨日新增商品</text>
 				</uni-grid-item>
-			<uni-grid-item marker="badge" :text="goodsData.allCount+''" type="success">
-				<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=0')">所有商品</text>
-			</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.allCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=0')">所有商品</text>
+				</uni-grid-item>
 
 			</uni-grid>
 		</view>
-<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import coupon from '@/components/coolc-coupon/coolc-coupon';
-
-import { formatDate } from '@/common/date';
-import uniGrid from "@/components/uni-grid/uni-grid.vue"
-import uniGridItem from "@/components/uni-grid-item/uni-grid-item.vue"
-export default {
-components: {
-		mallplusCopyright,
-			coupon
-			,uniGrid,uniGridItem
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+	import {
+		formatDate
+	} from '@/common/date';
+	import uniGrid from "@/components/uni-grid/uni-grid.vue"
+	import uniGridItem from "@/components/uni-grid-item/uni-grid-item.vue"
+	export default {
+		components: {
+			mallplusCopyright,
+			coupon,
+			uniGrid,
+			uniGridItem
+		},
+		data() {
+			return {
+				keyword: '',
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				swiperLength: 0,
+				carouselList: [],
+				orderData: '',
+				goodsData: '',
+				userData: '',
+				orderStatusCount: ''
+			};
 		},
-	data() {
-		return {
-			keyword: '',
-			titleNViewBackground: '',
-			swiperCurrent: 0,
-			swiperLength: 0,
-			carouselList: [],
-			orderData: '',
-			goodsData: '',
-			userData: '',
-			orderStatusCount:''
-		};
-	},
-onShow: function() {
+		onShow: function() {
+			this.loadData();
+		},
+		onLoad(ops) {
 			this.loadData();
 		},
-	onLoad(ops) {
-		this.loadData();
-	},
-
-	methods: {
-		/**
-		 * 请求静态数据只是为了代码不那么乱
-		 * 分次请求未作整合
-		 */
-		async loadData() {
-
-let adminToken = uni.getStorageSync('adminToken') || '';
-console.log('adminToken:'+adminToken)
-if(!adminToken){
-uni.navigateTo({
-				url: '../../pagesC/seller/login'
-			});
-
-
-}
-			let params = {};
-			let orderResp = await Api.apiAdminCall('get', Api.admin.orderStatic, params,true);
-			this.orderData = orderResp;
-			this.orderStatusCount=orderResp.orderStatusCount
 
-			let goodsResp = await Api.apiAdminCall('get', Api.admin.goodsStatic, params);
-			this.goodsData = goodsResp;
+		methods: {
+			/**
+			 * 请求静态数据只是为了代码不那么乱
+			 * 分次请求未作整合
+			 */
+			async loadData() {
+
+				let adminToken = uni.getStorageSync('adminToken') || '';
+				console.log('adminToken:' + adminToken)
+				if (!adminToken) {
+					uni.navigateTo({
+						url: '../../pagesC/seller/login'
+					});
+					return
+				}
+				let params = {};
+				let orderResp = await Api.apiAdminCall('get', Api.admin.orderStatic, params, true);
+				this.orderData = orderResp;
+				this.orderStatusCount = orderResp.orderStatusCount
 
-			let userResp = await Api.apiAdminCall('get', Api.admin.userStatic, params);
-			this.userData = userResp;
+				let goodsResp = await Api.apiAdminCall('get', Api.admin.goodsStatic, params);
+				this.goodsData = goodsResp;
 
-			let data = await Api.apiAdminCall('get', Api.admin.bannerList, params);
-			this.carouselList = data.records || [];
-			this.swiperLength = this.carouselList.length;
-			this.titleNViewBackground = 'rgb(203, 87, 60)';
+				let userResp = await Api.apiAdminCall('get', Api.admin.userStatic, params);
+				this.userData = userResp;
 
+				let data = await Api.apiAdminCall('get', Api.admin.bannerList, params);
+				this.carouselList = data.records || [];
+				this.swiperLength = this.carouselList.length;
+				this.titleNViewBackground = 'rgb(203, 87, 60)';
 
 
-		},
-		dateFormat(time) {
-        			if (time == null || time === '') {
-        				return 'N/A';
-        			}
-        			let date = new Date(time);
-        			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-        		},
-		//轮播图切换修改背景色
-		swiperChange(e) {
-			const index = e.detail.current;
-			this.swiperCurrent = index;
-			this.titleNViewBackground = this.carouselList[index].background;
-		},
-		navToTabPage(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		//详情页
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `/pages/product/product?id=${id}`
-			});
-		},
-		//详情页
-        		navToDetailPageL(url) {
-        			window.location.href =url;
-        		},
-		//详情页
-        		navToCouponDetailPage(item) {
-        			//测试数据没有写id，用title代替
-        			let id = item.id;
-        			uni.navigateTo({
-        				url: `/pages/product/product?id=${id}`
-        			});
-        		},
-		async acceptCoupon(item){
-		       uni.showLoading({
-        				title: '请稍后'
-        			});
-
-        			let params = { couponId: item.id };
-        			let data = await Api.apiAdminCall('post', Api.admin.acceptCoupon, params);
-                        console.log(data);
-        			if (data) {
-        				this.$api.msg(data);
-        			}
-        			uni.hideLoading();
 
+			},
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			navToTabPage(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			//详情页
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `/pages/product/product?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPageL(url) {
+				window.location.href = url;
+			},
+			//详情页
+			navToCouponDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `/pages/product/product?id=${id}`
+				});
+			},
+			async acceptCoupon(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+
+				let params = {
+					couponId: item.id
+				};
+				let data = await Api.apiAdminCall('post', Api.admin.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+				}
+				uni.hideLoading();
+
+			},
+			navToSkillDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+
+				uni.navigateTo({
+					url: `/pages/product/secskillDetail?id=${id}`
+				});
+			},
+
+
+			navToGroupDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.goodsId;
+				let groupId = item.groupId;
+				uni.navigateTo({
+					url: `/pages/product/groupProduct?id=${id}&&groupId=&{groupId}`
+				});
+			},
+			navToList() {
+				uni.navigateTo({
+					url: `/pages/product/list`
+				});
+			}
 		},
-		navToSkillDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
 
+		search() {
 			uni.navigateTo({
-				url: `/pages/product/secskillDetail?id=${id}`
+				url: '/pages/search/search'
 			});
 		},
 
-
-		navToGroupDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.goodsId;
-			let groupId = item.groupId;
+		// 标题栏input搜索框点击
+		onNavigationBarSearchInputClicked: async function(e) {
 			uni.navigateTo({
-				url: `/pages/product/groupProduct?id=${id}&&groupId=&{groupId}`
+				url: '/pages/search/search'
 			});
 		},
-		navToList() {
-			uni.navigateTo({
-				url: `/pages/product/list`
-			});
-		}
-	},
-
-	search() {
-		uni.navigateTo({
-			url: '/pages/search/search'
-		});
-	},
-
-	// 标题栏input搜索框点击
-	onNavigationBarSearchInputClicked: async function(e) {
-		uni.navigateTo({
-			url: '/pages/search/search'
-		});
-	},
-	//点击导航栏 buttons 时触发
-	onNavigationBarButtonTap(e) {
-		const index = e.index;
-		if (index === 0) {
-			this.$api.msg('点击了扫描');
-		} else if (index === 1) {
-			// #ifdef APP-PLUS
-			const pages = getCurrentPages();
-			const page = pages[pages.length - 1];
-			const currentWebview = page.$getAppWebview();
-			currentWebview.hideTitleNViewButtonRedDot({
-				index
-			});
-			// #endif
-			uni.navigateTo({
-				url: '../../pagesU/notice/notice'
-			});
+		//点击导航栏 buttons 时触发
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.$api.msg('点击了扫描');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '../../pagesU/notice/notice'
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.mp-search-box {
-	position: absolute;
-	left: 0;
-	top: 30upx;
-	z-index: 9999;
-	width: 100%;
-	padding: 0 80upx;
-	.ser-input {
-		flex: 1;
-		height: 56upx;
-		line-height: 56upx;
-		text-align: center;
-		font-size: 28upx;
-		color: $font-color-base;
-		border-radius: 20px;
-		background: rgba(255, 255, 255, 0.6);
-	}
-}
-page {
-	.cate-section {
-		position: relative;
-		z-index: 5;
-		border-radius: 16upx 16upx 0 0;
-		margin-top: -20upx;
+	.mp-search-box {
+		position: absolute;
+		left: 0;
+		top: 30upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0 80upx;
+
+		.ser-input {
+			flex: 1;
+			height: 56upx;
+			line-height: 56upx;
+			text-align: center;
+			font-size: 28upx;
+			color: $font-color-base;
+			border-radius: 20px;
+			background: rgba(255, 255, 255, 0.6);
+		}
 	}
-	.carousel-section {
-		padding: 0;
-		.titleNview-placing {
-			padding-top: 0;
-			height: 0;
+
+	page {
+		.cate-section {
+			position: relative;
+			z-index: 5;
+			border-radius: 16upx 16upx 0 0;
+			margin-top: -20upx;
 		}
-		.carousel {
-			.carousel-item {
-				padding: 0;
+
+		.carousel-section {
+			padding: 0;
+
+			.titleNview-placing {
+				padding-top: 0;
+				height: 0;
+			}
+
+			.carousel {
+				.carousel-item {
+					padding: 0;
+				}
+			}
+
+			.swiper-dots {
+				left: 45upx;
+				bottom: 40upx;
 			}
-		}
-		.swiper-dots {
-			left: 45upx;
-			bottom: 40upx;
 		}
 	}
-}
-
-page {
-	background: #f5f5f5;
-}
-.m-t {
-	margin-top: 16upx;
-}
-/* 头部 轮播图 */
-.carousel-section {
-	position: relative;
-	padding-top: 10px;
-
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		padding-top: 44px;
-		box-sizing: content-box;
+
+	page {
+		background: #f5f5f5;
 	}
 
-	.titleNview-background {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 426upx;
-		transition: 0.4s;
+	.m-t {
+		margin-top: 16upx;
 	}
-}
-.carousel {
-	width: 100%;
-	height: 350upx;
 
-	.carousel-item {
-		width: 100%;
-		height: 100%;
-		padding: 0 28upx;
-		overflow: hidden;
+	/* 头部 轮播图 */
+	.carousel-section {
+		position: relative;
+		padding-top: 10px;
+
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			padding-top: 44px;
+			box-sizing: content-box;
+		}
+
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426upx;
+			transition: 0.4s;
+		}
 	}
 
-	image {
+	.carousel {
 		width: 100%;
-		height: 100%;
-		border-radius: 10upx;
-	}
-}
-.swiper-dots {
-	display: flex;
-	position: absolute;
-	left: 60upx;
-	bottom: 15upx;
-	width: 72upx;
-	height: 36upx;
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
-	background-size: 100% 100%;
-
-	.num {
-		width: 36upx;
-		height: 36upx;
-		border-radius: 50px;
-		font-size: 24upx;
-		color: #fff;
-		text-align: center;
-		line-height: 36upx;
+		height: 350upx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10upx;
+		}
 	}
 
-	.sign {
+	.swiper-dots {
+		display: flex;
 		position: absolute;
-		top: 0;
-		left: 50%;
-		line-height: 36upx;
-		font-size: 12upx;
-		color: #fff;
-		transform: translateX(-50%);
+		left: 60upx;
+		bottom: 15upx;
+		width: 72upx;
+		height: 36upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+		background-size: 100% 100%;
+
+		.num {
+			width: 36upx;
+			height: 36upx;
+			border-radius: 50px;
+			font-size: 24upx;
+			color: #fff;
+			text-align: center;
+			line-height: 36upx;
+		}
+
+		.sign {
+			position: absolute;
+			top: 0;
+			left: 50%;
+			line-height: 36upx;
+			font-size: 12upx;
+			color: #fff;
+			transform: translateX(-50%);
+		}
 	}
-}
-/* 分类 */
-.cate-section {
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	flex-wrap: wrap;
-	padding: 30upx 22upx;
-	background: #fff;
-	.cate-item {
+
+	/* 分类 */
+	.cate-section {
 		display: flex;
-		flex-direction: column;
+		justify-content: space-around;
 		align-items: center;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-	}
-	/* 原图标颜色太深,不想改图了,所以加了透明度 */
-	image {
-		width: 88upx;
-		height: 88upx;
-		margin-bottom: 14upx;
-		border-radius: 50%;
-		opacity: 0.7;
-		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		flex-wrap: wrap;
+		padding: 30upx 22upx;
+		background: #fff;
+
+		.cate-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+		}
+
+		/* 原图标颜色太深,不想改图了,所以加了透明度 */
+		image {
+			width: 88upx;
+			height: 88upx;
+			margin-bottom: 14upx;
+			border-radius: 50%;
+			opacity: 0.7;
+			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		}
 	}
-}
-.ad-1 {
-	width: 100%;
-	height: 210upx;
-	padding: 10upx 0;
-	background: #fff;
-	image {
+
+	.ad-1 {
 		width: 100%;
-		height: 100%;
+		height: 210upx;
+		padding: 10upx 0;
+		background: #fff;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 4upx 30upx 24upx;
+		background: #fff;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 92upx;
+			line-height: 1;
+
+			.s-img {
+				width: 140upx;
+				height: 30upx;
+			}
+
+			.tip {
+				font-size: $font-base;
+				color: $font-color-light;
+				margin: 0 20upx 0 40upx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40upx;
+				height: 36upx;
+				text-align: center;
+				line-height: 36upx;
+				margin-right: 14upx;
+				font-size: $font-sm + 2upx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.icon-you {
+				font-size: $font-lg;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 150upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 150upx;
+				height: 150upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
 	}
-}
-/* 秒杀专区 */
-.seckill-section {
-	padding: 4upx 30upx 24upx;
-	background: #fff;
-	.s-header {
+
+	.f-header {
 		display: flex;
 		align-items: center;
-		height: 92upx;
-		line-height: 1;
-		.s-img {
-			width: 140upx;
-			height: 30upx;
+		height: 140upx;
+		padding: 6upx 30upx 8upx;
+		background: #fff;
+
+		image {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			margin-right: 20upx;
 		}
-		.tip {
-			font-size: $font-base;
-			color: $font-color-light;
-			margin: 0 20upx 0 40upx;
+
+		.tit-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
 		}
-		.timer {
-			display: inline-block;
-			width: 40upx;
-			height: 36upx;
-			text-align: center;
-			line-height: 36upx;
-			margin-right: 14upx;
-			font-size: $font-sm + 2upx;
-			color: #fff;
-			border-radius: 2px;
-			background: rgba(0, 0, 0, 0.8);
+
+		.tit {
+			font-size: $font-lg + 2upx;
+			color: #font-color-dark;
+			line-height: 1.3;
+		}
+
+		.tit2 {
+			font-size: $font-sm;
+			color: $font-color-light;
 		}
+
 		.icon-you {
-			font-size: $font-lg;
+			font-size: $font-lg + 2upx;
 			color: $font-color-light;
-			flex: 1;
-			text-align: right;
 		}
 	}
-	.floor-list {
-		white-space: nowrap;
-	}
-	.scoll-wrapper {
-		display: flex;
-		align-items: flex-start;
-	}
-	.floor-item {
-		width: 150upx;
-		margin-right: 20upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		line-height: 1.8;
+
+	/* 团购楼层 */
+	.group-section {
+		background: #fff;
+
+		.g-swiper {
+			height: 650upx;
+			padding-bottom: 30upx;
+		}
+
+		.g-swiper-item {
+			width: 100%;
+			padding: 0 30upx;
+			display: flex;
+		}
+
 		image {
-			width: 150upx;
-			height: 150upx;
-			border-radius: 6upx;
+			width: 100%;
+			height: 460upx;
+			border-radius: 4px;
+		}
+
+		.g-item {
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+		}
+
+		.left {
+			flex: 1.2;
+			margin-right: 24upx;
+
+			.t-box {
+				padding-top: 20upx;
+			}
 		}
+
+		.right {
+			flex: 0.8;
+			flex-direction: column-reverse;
+
+			.t-box {
+				padding-bottom: 20upx;
+			}
+		}
+
+		.t-box {
+			height: 160upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1.6;
+		}
+
 		.price {
 			color: $uni-color-primary;
 		}
-	}
-}
-
-.f-header {
-	display: flex;
-	align-items: center;
-	height: 140upx;
-	padding: 6upx 30upx 8upx;
-	background: #fff;
-	image {
-		flex-shrink: 0;
-		width: 80upx;
-		height: 80upx;
-		margin-right: 20upx;
-	}
-	.tit-box {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-	}
-	.tit {
-		font-size: $font-lg + 2upx;
-		color: #font-color-dark;
-		line-height: 1.3;
-	}
-	.tit2 {
-		font-size: $font-sm;
-		color: $font-color-light;
-	}
-	.icon-you {
-		font-size: $font-lg + 2upx;
-		color: $font-color-light;
-	}
-}
-/* 团购楼层 */
-.group-section {
-	background: #fff;
-	.g-swiper {
-		height: 650upx;
-		padding-bottom: 30upx;
-	}
-	.g-swiper-item {
-		width: 100%;
-		padding: 0 30upx;
-		display: flex;
-	}
-	image {
-		width: 100%;
-		height: 460upx;
-		border-radius: 4px;
-	}
-	.g-item {
-		display: flex;
-		flex-direction: column;
-		overflow: hidden;
-	}
-	.left {
-		flex: 1.2;
-		margin-right: 24upx;
-		.t-box {
-			padding-top: 20upx;
+
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
 		}
-	}
-	.right {
-		flex: 0.8;
-		flex-direction: column-reverse;
-		.t-box {
-			padding-bottom: 20upx;
+
+		.pro-box {
+			display: flex;
+			align-items: center;
+			margin-top: 10upx;
+			font-size: $font-sm;
+			color: $font-base;
+			padding-right: 10upx;
+		}
+
+		.progress-box {
+			flex: 1;
+			border-radius: 10px;
+			overflow: hidden;
+			margin-right: 8upx;
 		}
 	}
-	.t-box {
-		height: 160upx;
-		font-size: $font-base + 2upx;
-		color: $font-color-dark;
-		line-height: 1.6;
-	}
-	.price {
-		color: $uni-color-primary;
-	}
-	.m-price {
-		font-size: $font-sm + 2upx;
-		text-decoration: line-through;
-		color: $font-color-light;
-		margin-left: 8upx;
-	}
-	.pro-box {
-		display: flex;
-		align-items: center;
-		margin-top: 10upx;
-		font-size: $font-sm;
-		color: $font-base;
-		padding-right: 10upx;
-	}
-	.progress-box {
-		flex: 1;
-		border-radius: 10px;
-		overflow: hidden;
-		margin-right: 8upx;
-	}
-}
-/* 分类推荐楼层 */
-.hot-floor {
-	width: 100%;
-	overflow: hidden;
-	margin-bottom: 20upx;
-	.floor-img-box {
+
+	/* 分类推荐楼层 */
+	.hot-floor {
 		width: 100%;
-		height: 320upx;
-		position: relative;
-		&:after {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 320upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.floor-img {
 			width: 100%;
 			height: 100%;
-			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 		}
-	}
-	.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;
+
+		.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;
 		}
-		.price {
-			color: $uni-color-primary;
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
 		}
-	}
-	.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;
+
+		.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;
+			}
 		}
 	}
-}
+
 	/* 单条商品 */
 	.goods-box-single {
 		display: flex;
 		padding: 20upx 0;
+
 		.goods-img {
 			display: block;
 			width: 120upx;
 			height: 120upx;
 		}
+
 		.right {
 			flex: 1;
 			display: flex;
 			flex-direction: column;
 			padding: 0 30upx 0 24upx;
 			overflow: hidden;
+
 			.title {
 				font-size: $font-base + 2upx;
 				color: $font-color-dark;
 				line-height: 1;
 			}
+
 			.attr-box {
 				font-size: $font-sm + 2upx;
 				color: $font-color-light;
 				padding: 10upx 12upx;
 			}
+
 			.price {
 				font-size: $font-base + 2upx;
 				color: $font-color-dark;
+
 				&:before {
 					content: '￥';
 					font-size: $font-sm;
@@ -736,13 +810,16 @@ page {
 		padding: 20upx 30upx;
 		font-size: $font-sm + 2upx;
 		color: $font-color-light;
+
 		.num {
 			margin: 0 8upx;
 			color: $font-color-dark;
 		}
+
 		.price {
 			font-size: $font-lg;
 			color: $font-color-dark;
+
 			&:before {
 				content: '￥';
 				font-size: $font-sm;
@@ -750,6 +827,7 @@ page {
 			}
 		}
 	}
+
 	.action-box {
 		display: flex;
 		justify-content: flex-end;
@@ -758,6 +836,7 @@ page {
 		position: relative;
 		padding-right: 30upx;
 	}
+
 	.action-btn {
 		width: 160upx;
 		height: 60upx;
@@ -770,12 +849,15 @@ page {
 		color: $font-color-dark;
 		background: #fff;
 		border-radius: 100px;
+
 		&:after {
 			border-radius: 100px;
 		}
+
 		&.recom {
 			background: #fff9f9;
 			color: $base-color;
+
 			&:after {
 				border-color: #f7bcc8;
 			}
@@ -783,51 +865,83 @@ page {
 	}
 
 
-/* 猜你喜欢 */
-.guess-section {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0 30upx;
-	background: #fff;
-	.guess-item {
+	/* 猜你喜欢 */
+	.guess-section {
 		display: flex;
-		flex-direction: column;
-		width: 48%;
-		padding-bottom: 40upx;
-		&:nth-child(2n + 1) {
-			margin-right: 4%;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
 		}
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 330upx;
-		border-radius: 3px;
-		overflow: hidden;
-		image {
+
+		.image-wrapper {
 			width: 100%;
-			height: 100%;
-			opacity: 1;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
 		}
-	}
-	.title {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		line-height: 80upx;
-	}
-	.price {
-		font-size: $font-lg;
-		color: $uni-color-primary;
-		line-height: 1;
-	}
-	.coupon_box {
-    	width:100%; height:auto; display:table; padding:6upx 26upx 26upx 26upx;
-    }
 
-    .other_type {
-    	width:100%; height:90upx; padding-top:50upx;
+		.coupon_box {
+			width: 100%;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
+		}
 
-    	.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; }
-    	.text span { width:180upx; height:40upx; line-height:40upx; color:#999999; display:block; background:#ffffff; position:absolute; left:50%; top:50%; margin-left:-90upx; margin-top:-20upx; font-size:$font-base; }
-    }
-}
+		.other_type {
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
+
+			.text span {
+				width: 180upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #999999;
+				display: block;
+				background: #ffffff;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				margin-left: -90upx;
+				margin-top: -20upx;
+				font-size: $font-base;
+			}
+		}
+	}
 </style>
diff --git a/mallplusui-uniapp-app/pagesC/seller/login.vue b/mallplusui-uniapp-app/pagesC/seller/login.vue
index 9003f41..66287f7 100644
--- a/mallplusui-uniapp-app/pagesC/seller/login.vue
+++ b/mallplusui-uniapp-app/pagesC/seller/login.vue
@@ -24,7 +24,7 @@
 			还没有账号?
 			<text @click="toRegist">马上注册</text>
 		</view>
-    <mallplusCopyright></mallplusCopyright>
+    <!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
diff --git a/mallplusui-uniapp-app/pagesU/address/addressManage.vue b/mallplusui-uniapp-app/pagesU/address/addressManage.vue
index 337b562..656781e 100644
--- a/mallplusui-uniapp-app/pagesU/address/addressManage.vue
+++ b/mallplusui-uniapp-app/pagesU/address/addressManage.vue
@@ -7,7 +7,7 @@
 		</view>
 		<view class="row b-b">
 			<text class="tit">手机号</text>
-			<input class="input" type="number" 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">
diff --git a/mallplusui-uniapp-app/static/logo.png b/mallplusui-uniapp-app/static/logo.png
new file mode 100644
index 0000000..4a1cf93
Binary files /dev/null and b/mallplusui-uniapp-app/static/logo.png differ
diff --git a/mallplusui-uniapp-app/static/temp/ad1.jpg b/mallplusui-uniapp-app/static/temp/ad1.jpg
index 4c9a933..d03fa35 100644
Binary files a/mallplusui-uniapp-app/static/temp/ad1.jpg and b/mallplusui-uniapp-app/static/temp/ad1.jpg differ
diff --git a/mallplusui-uniapp-app/static/temp/antFill-gift.png b/mallplusui-uniapp-app/static/temp/antFill-gift.png
new file mode 100644
index 0000000..dc0fde0
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/antFill-gift.png differ
diff --git a/mallplusui-uniapp-app/static/temp/antFill-home.png b/mallplusui-uniapp-app/static/temp/antFill-home.png
new file mode 100644
index 0000000..269907c
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/antFill-home.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fabfa-dropbox.png b/mallplusui-uniapp-app/static/temp/fabfa-dropbox.png
new file mode 100644
index 0000000..18ad1b2
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fabfa-dropbox.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfa-archive.png b/mallplusui-uniapp-app/static/temp/fasfa-archive.png
new file mode 100644
index 0000000..12fb8ce
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfa-archive.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfa-history.png b/mallplusui-uniapp-app/static/temp/fasfa-history.png
new file mode 100644
index 0000000..c59c677
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfa-history.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfa-shopping.png b/mallplusui-uniapp-app/static/temp/fasfa-shopping.png
new file mode 100644
index 0000000..f852f39
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfa-shopping.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfa-sitemap.png b/mallplusui-uniapp-app/static/temp/fasfa-sitemap.png
new file mode 100644
index 0000000..966a4ed
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfa-sitemap.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfa-street.png b/mallplusui-uniapp-app/static/temp/fasfa-street.png
new file mode 100644
index 0000000..f1f701c
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfa-street.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfa-truck.png b/mallplusui-uniapp-app/static/temp/fasfa-truck.png
new file mode 100644
index 0000000..82aea48
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfa-truck.png differ
diff --git a/mallplusui-uniapp-app/static/temp/fasfausers.png b/mallplusui-uniapp-app/static/temp/fasfausers.png
new file mode 100644
index 0000000..d04126c
Binary files /dev/null and b/mallplusui-uniapp-app/static/temp/fasfausers.png differ
diff --git a/mallplusui-web-admin/config/dev.env.js b/mallplusui-web-admin/config/dev.env.js
index 3e3c6dc..b64784f 100644
--- a/mallplusui-web-admin/config/dev.env.js
+++ b/mallplusui-web-admin/config/dev.env.js
@@ -3,6 +3,6 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: 'development',
-  BASE_API: 'http://127.0.0.1:8085'
+  NODE_ENV: '"development"',
+  BASE_API: '"http://127.0.0.1:8085"'
 })
diff --git a/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue b/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
index b714661..6766f10 100644
--- a/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
+++ b/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
@@ -8,8 +8,8 @@
       <el-form-item label="小区栋数：" prop="counts">
         <el-input v-model="community.counts"></el-input>
       </el-form-item>
-      <el-form-item label="小区地址：" prop="address">
-        <el-input v-model="community.address"></el-input>
+      <el-form-item label="小区地址：" prop="details">
+        <el-input v-model="community.details"></el-input>
       </el-form-item>
 
       <el-form-item label="地标：" prop="nearbyLandmarks">
@@ -19,6 +19,9 @@
       <el-form-item label="电话：" prop="phone">
         <el-input v-model="community.phone"></el-input>
       </el-form-item>
+      <el-form-item label="照片：" prop="pic">
+        <single-upload v-model="community.pic"></single-upload>
+      </el-form-item>
       <el-form-item label="地图：" prop="phone">
 
         <input v-model.number="center.lng" />
@@ -41,7 +44,7 @@
                   :copyright="[{id: 1, content: 'Copyright Message', bounds: {ne: {lng: 110, lat: 40}, sw:{lng: 0, lat: 0}}}, {id: 2, content: '<a>宇运动多租户商城</a>'}]">
           </bm-copyright>
           <bm-city-list anchor="BMAP_ANCHOR_TOP_LEFT" @changeAfter="changeAfters"></bm-city-list>
-
+    <bm-marker :position="center" :dragging="false" />
          <!-- <bm-local-search :keyword="keyword" :auto-viewport="true" :location="location"></bm-local-search>-->
         </baidu-map>
 
@@ -60,6 +63,7 @@
   import BmCityList from 'vue-baidu-map/components/controls/CityList';
   import BmCopyright from 'vue-baidu-map/components/controls/Copyright';
   import BmView from 'vue-baidu-map/components/map/MapView';
+	import BmMarker from 'vue-baidu-map/components/overlays/Marker'
   import {createCommunity, getCommunity, updateCommunity} from '@/api/build/community'
   import SingleUpload from '@/components/Upload/singleUpload'
   import {formatDate} from '@/utils/date';
@@ -68,7 +72,7 @@
   };
   export default {
     name: 'CommunityDetail',
-    components:{SingleUpload,BaiduMap,BmLocalSearch,BmCityList,BmView,BmCopyright},
+    components:{SingleUpload,BaiduMap,BmLocalSearch,BmCityList,BmView,BmCopyright,BmMarker},
     props: {
       isEdit: {
         type: Boolean,
@@ -108,6 +112,15 @@
       if (this.isEdit) {
         getCommunity(this.$route.query.id).then(response => {
           this.community = response.data;
+					if(this.community.latitude){
+						this.center.lat=this.community.latitude;
+					}
+					if(this.community.longitude){
+					  this.center.lng=this.community.longitude;
+					}
+					if(this.community.city){
+					  this.location=this.community.city;
+					}
         });
       }else{
         this.community = Object.assign({},defaultCommunity);