功能完善

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.“社区主页”变更为村名，“社区活动”变更为“社区公告”，去掉“费用管理”，“社区服务”改为“限时抢购”，“社区拍卖”改为“农机租赁”，（完成）
+
+农机租赁可先做成文章形式的，以发布信息方式体现。（不理解需求）
+
+下方放“社区团购”、“社区特供”分别对应首页的“拼团特价”、“区域商品”、“积分兑换”。（不理解需求，俩个对应三个？？）

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

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===
 

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 ";
 
 }

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://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.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

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===

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://mall.yyundong.com/portalapi/api/',
-	BASEURI: 'http://127.0.0.1:8083/api/',
+	// BASEURI: 'http://www.yyundong.com:8083/api/',
-	ADMINURI: 'http://127.0.0.1:8085/',
+	ADMINURI: 'http://mall.yyundong.com/adminapi/',
-	ESURI: 'http://127.0.0.1:8081/',
+	ESURI: 'http://www.yyundong.com:8081/',
 	h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId  暂时测试用
 	source: 1, //1 weixinApplet 2 h5Source 3 pcSource 4 android 5ios
 	es: {
@@ -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;

mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue

@@ -1,22 +1,26 @@
 <template>
 	<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>
-		<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}" @click="acceptCoupon(item)" >立即领取</view>
+		<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}"
-		<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}" :url='item.url' @click="acceptCoupon(item)">立即使用</navigator>
+			@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 {
+		formatDate
+	} from '@/common/date';
 
 	export default {
 		components: {
@@ -24,17 +28,13 @@ export default {
 		},
 		data() {
 			return {
-
+				types: false
 			}
 		},
 		props: {
 			item: {
 				type: Object
 			},
-		types:{
-			type: String,
-			default: ''
-		},
 			theme: {
 				type: String,
 				default: '#ff9000'
@@ -56,11 +56,14 @@ export default {
 		},
 		methods: {
 			async acceptCoupon(item) {
+				this.types =!this.types
 					uni.showLoading({
 						title: '请稍后'
 					});
 
-        			let params = { couponId: item.id };
+				let params = {
+					couponId: item.id
+				};
 				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
 				console.log(data);
 				if (data) {
@@ -69,25 +72,119 @@ export default {
 				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;
+		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;
+			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;
+			}
+
+			.demand {
+				width: 100%;
+				height: 30upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
 
-		.nick { width:100%; height:50upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; }
+			.layof {
-		.tit { width:100%; height:50upx; line-height:50upx; font-size:$font-sm; color:$font-color-999; }
+				width: 100%;
-		.demand { width:100%; height:30upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; }
+				height: 48upx;
+				line-height: 30upx;
+				font-size: 44upx;
+				color: #ff9000;
+				font-weight: bold;
+			}
 
-		.layof { width:100%; height:48upx; line-height:30upx; font-size:44upx; color:#ff9000; font-weight:bold; }
+			.end_time {
-		.end_time { width:100%; height:30upx; line-height:30upx; font-size:$font-sm; color:$font-color-999; }
+				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; }
+
+		.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;
 	}
-.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>

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>

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;

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/";
+	baseUrl = "http://www.yyundong.com:8083/";
-	socketUrl = "ws://192.168.3.108: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

mallplusui-uniapp-app/manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "宇运动商城",
+    "name" : "汇融云链",
-    "appid" : "__UNI__0802E33",
+    "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" : {

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,6 +60,16 @@
 					}
 				}
 			}
+		}, 	{
+			"path": "pages/index/lease",
+			"style": {
+				"navigationBarTitleText": "农机租赁"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
+			}
 		}, {
 			"path": "pages/order/orderDetail",
 			"style": {
@@ -266,11 +277,9 @@
 			}
 		}
 	],
-	"subPackages": [
+	"subPackages": [{
-		{
 			"root": "pagesC",
-			"pages": [
+			"pages": [{
-				{
 					"path": "store/list",
 					"style": {
 						"enablePullDownRefresh": true,
@@ -345,12 +354,13 @@
 				{
 					"path": "seller/index",
 					"style": {
-						"navigationBarTitleText": "卖家中心",
+						"navigationBarTitleText": "卖家中心"
-						"app-plus": {
+						// "navigationStyle": "custom"
-							"titleNView": {
+						// "app-plus": {
-								"type": "transparent"
+						// 	"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": "精选标签",
+						"navigationBarTitleText": "精选标签"
-						"app-plus": {
+						// "app-plus": {
-							"titleNView": {
+						// 	"titleNView": {
-								"type": "transparent"
+						// 		"type": "transparent"
-							}
+						// 	}
-						}
+						// }
 					}
 				},
 				{
@@ -597,7 +606,7 @@
 				}, {
 					"path": "build/communityList",
 					"style": {
-						"navigationBarTitleText": "社区列表"
+						"navigationBarTitleText": "农村社区列表"
 					}
 				},
 				{

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
+							<image :src="item.productPic" class="loaded" mode="aspectFill" lazy-load
-								:src="item.productPic"
+								@load="onImageLoad('cartList', index)" @error="onImageError('cartList', index)"></image>
-								class="loaded"
+							<view class="yticon icon-xuanzhong2 checkbox"
-								mode="aspectFill"
+								:class="{ checked: item.checked === '1' || item.checked }"
-								lazy-load
+								@click="check('item', index)"></view>
-								@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,14 +59,15 @@
 			</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 {
+		mapState
+	} from 'vuex';
 	import uniNumberBox from '@/components/uni-number-box.vue';
 	import navBar from '@/components/zhouWei-navBar';
 	export default {
@@ -152,7 +152,10 @@ export default {
 			//数量
 			numberChange(data) {
 				this.cartList[data.index].quantity = data.number;
-			let params = { id: this.cartList[data.index].id, quantity: data.number };
+				let params = {
+					id: this.cartList[data.index].id,
+					quantity: data.number
+				};
 				data = Api.apiCall('get', Api.order.updateQuantity, params);
 				this.calcTotal();
 			},
@@ -167,7 +170,9 @@ export default {
 							let list = that.cartList;
 							let row = list[index];
 							let id = row.id;
-						let params = { cart_id_list: id };
+							let params = {
+								cart_id_list: id
+							};
 							Api.apiCall('post', Api.order.deleteCart, params);
 							that.cartList.splice(index, 1);
 							that.calcTotal();
@@ -240,6 +245,7 @@ export default {
 <style lang="scss">
 	.container {
 		padding-bottom: 134upx;
+
 		/* 空白页 */
 		.empty {
 			position: fixed;
@@ -253,15 +259,18 @@ export default {
 			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;
@@ -269,20 +278,24 @@ export default {
 			}
 		}
 	}
+
 	/* 购物车列表项 */
 	.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;
@@ -295,6 +308,7 @@ export default {
 			background: #fff;
 			border-radius: 50px;
 		}
+
 		.item-right {
 			display: flex;
 			flex-direction: column;
@@ -302,6 +316,7 @@ export default {
 			overflow: hidden;
 			position: relative;
 			padding-left: 30upx;
+
 			.title,
 			.price {
 				font-size: $font-base + 2upx;
@@ -309,17 +324,20 @@ export default {
 				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;
 			}
 		}
+
 		.del-btn {
 			padding: 4upx 10upx;
 			font-size: 34upx;
@@ -327,6 +345,7 @@ export default {
 			color: $font-color-light;
 		}
 	}
+
 	/* 底部栏 */
 	.action-section {
 		/* #ifdef H5 */
@@ -344,9 +363,11 @@ export default {
 		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%;
@@ -354,6 +375,7 @@ export default {
 				z-index: 5;
 			}
 		}
+
 		.clear-btn {
 			position: absolute;
 			left: 26upx;
@@ -369,29 +391,35 @@ export default {
 			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;
@@ -403,11 +431,13 @@ export default {
 			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;

mallplusui-uniapp-app/pages/index/index.vue

@@ -2,8 +2,9 @@
 	<view class="container">
 		<!-- 小程序头部兼容 -->
 		<!-- #ifdef MP -->
-		<nav-bar>mallcloud商城</nav-bar>
+		<nav-bar>汇融云链</nav-bar>
-		<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 -->
 
 		<!-- 头部轮播 -->
@@ -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>
+					<image src="/static/temp//antFill-gift.png"></image>
-					<text>套餐商品</text>
+					<text>惠农套餐</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
-					<image src="/static/temp/c5.png"></image>
+					<image src="/static/temp/fasfausers.png"></image>
-					<text>拼团活动</text>
+					<text>拼团特价</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/product/giftList')">
-					<image src="/static/temp/c6.png"></image>
+					<image src="/static/temp/fabfa-dropbox.png"></image>
-					<text>积分商城</text>
+					<text>税分兑换</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
-					<image src="/static/temp/c7.png"></image>
+					<image src="/static/temp/fasfa-history.png"></image>
-					<text>限时秒杀</text>
+					<text>限时抢购</text>
 				</view>
 				<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
-					<image src="/static/temp/c8.png"></image>
+					<image src="/static/temp/antFill-home.png"></image>
-					<text>社区商城</text>
+					<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,13 +110,14 @@
 			<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>
 					<text>{{ item1.name |formatLongText }}</text>
@@ -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>
@@ -177,7 +190,8 @@
 			</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 v-for="(item, index) in homeNewProductList" :key="index" class="guess-item"
-					<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+					@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,7 +213,8 @@
 
 			</view>
 			<!-- 人气推荐 -->
-            			<view v-if='homeRecommendProductList && homeRecommendProductList.length>0' class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+			<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>
@@ -206,8 +224,11 @@
 			</view>
 
 			<view class="guess-section">
-            				<view v-for="(item, index) in homeRecommendProductList" :key="index" class="guess-item" @click="navToDetailPage1(item)">
+				<view v-for="(item, index) in homeRecommendProductList" :key="index" class="guess-item"
-            					<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+					@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>
 
@@ -225,15 +246,18 @@
 			</view>
 
 			<view class="guess-section">
-				<view v-for="(item, index) in newProductList" :key="index" class="guess-item" @click="navToDetailPage(item)">
+				<view v-for="(item, index) in newProductList" :key="index" class="guess-item"
-					<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+					@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>
@@ -243,8 +267,12 @@ 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 {
-import { mapState } from 'vuex';
+		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 {
@@ -284,6 +312,7 @@ export default {
 			this.getNewProductList();
 		},
 		onPullDownRefresh() {
+			console.log("onPullDownRefresh")
 			this.pageNum = this.pageNum + 1;
 			this.getNewProductList('refresh');
 
@@ -294,6 +323,7 @@ export default {
 		},
 		onShareAppMessage() {},
 		onLoad(ops) {
+			
 			let isWeiXin = this.$common.isWeiXinBrowser();
 			this.getNewProductList('refresh');
 			if (ops.invitecode) {
@@ -386,8 +416,7 @@ filters: {
 			onBridgeReady(data) {
 				var _this = this;
 				window.WeixinJSBridge.invoke(
-				'getBrandWCPayRequest',
+					'getBrandWCPayRequest', {
-				{
 						appId: data.appid, // 公众号名称，由商户传入
 						timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
 						nonceStr: data.nonceStr, // 随机串
@@ -449,7 +478,9 @@ filters: {
 			 * 获取轮播图
 			 */
 			async getBanner() {
-			let params = { storeId: 0 };
+				let params = {
+					storeId: 1
+				};
 				console.log(uni.getSystemInfoSync().platform);
 				switch (uni.getSystemInfoSync().platform) {
 					case 'android':
@@ -463,7 +494,9 @@ filters: {
 						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)';
@@ -473,9 +506,13 @@ filters: {
 			 * 获取轮播图
 			 */
 			async getCouponList() {
-			let params = { pageSize: 3 };
+				let params = {
+					pageSize: 3
+				};
 				let data = await Api.apiCall('get', Api.index.selectNotRecive, params);
 				if (data) {
+					console.log("优惠券")
+					console.log("优惠券",data)
 					this.couponList = data || [];
 				}
 			},
@@ -492,7 +529,9 @@ filters: {
 				} else {
 					this.loadingType = 'more';
 				}
-			let params = { pageNum: this.pageNum };
+				let params = {
+					pageNum: this.pageNum
+				};
 				let list = await Api.apiCall('get', Api.goods.goodsList, params);
 
 				let goodsList = list.records;
@@ -517,7 +556,11 @@ filters: {
 			 * 获取团购信息
 			 */
 			async getStoreList() {
-			let params = { pageSize: 5, isBoutique: 1,sort:2 };
+				let params = {
+					pageSize: 5,
+					isBoutique: 1,
+					sort: 2
+				};
 				let groupHotGoodsList = await Api.apiCall('get', Api.member.storeList, params);
 				this.storeList = groupHotGoodsList.records;
 			},
@@ -567,8 +610,9 @@ filters: {
 				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)';
@@ -665,7 +709,9 @@ filters: {
 					title: '请稍后'
 				});
 
-			let params = { couponId: item.id };
+				let params = {
+					couponId: item.id
+				};
 				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
 				console.log(data);
 				if (data) {
@@ -741,6 +787,7 @@ filters: {
 		width: 100%;
 		z-index: 999;
 	}
+
 	.MP-search-input {
 		font-size: 28upx;
 		background: #f5f5f5;
@@ -749,6 +796,7 @@ filters: {
 		border-radius: 50upx;
 		text-align: center;
 	}
+
 	.mp-search-box {
 		position: absolute;
 		left: 0;
@@ -756,6 +804,7 @@ filters: {
 		z-index: 9999;
 		width: 100%;
 		padding: 0 80upx;
+
 		.ser-input {
 			flex: 1;
 			height: 60upx;
@@ -767,6 +816,7 @@ filters: {
 			background: rgba(255, 255, 255, 0.6);
 		}
 	}
+
 	page {
 		.cate-section {
 			position: relative;
@@ -774,17 +824,21 @@ page {
 			border-radius: 16upx 16upx 0 0;
 			margin-top: -20upx;
 		}
+
 		.carousel-section {
 			padding: 0;
+
 			.titleNview-placing {
 				padding-top: 0;
 				height: 0;
 			}
+
 			.carousel {
 				.carousel-item {
 					padding: 0;
 				}
 			}
+
 			.swiper-dots {
 				left: 45upx;
 				bottom: 40upx;
@@ -795,9 +849,11 @@ page {
 	page {
 		background: #f5f5f5;
 	}
+
 	.m-t {
 		margin-top: 20upx;
 	}
+
 	/* 头部 轮播图 */
 	.carousel-section {
 		position: relative;
@@ -818,6 +874,7 @@ page {
 			transition: 0.4s;
 		}
 	}
+
 	.carousel {
 		width: 100%;
 		height: 350upx;
@@ -835,6 +892,7 @@ page {
 			border-radius: 10upx;
 		}
 	}
+
 	.swiper-dots {
 		display: flex;
 		position: absolute;
@@ -865,6 +923,7 @@ page {
 			transform: translateX(-50%);
 		}
 	}
+
 	/* 分类 */
 	.cate-section {
 		display: flex;
@@ -873,6 +932,7 @@ page {
 		flex-wrap: wrap;
 		padding: 30upx 22upx;
 		background: #fff;
+
 		.cate-item {
 			display: flex;
 			flex-direction: column;
@@ -880,6 +940,7 @@ page {
 			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
 		}
+
 		/* 原图标颜色太深,不想改图了,所以加了透明度 */
 		image {
 			width: 88upx;
@@ -890,34 +951,41 @@ page {
 			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
 		}
 	}
+
 	.ad-1 {
 		width: 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;
@@ -930,6 +998,7 @@ page {
 				border-radius: 2px;
 				background: rgba(0, 0, 0, 0.8);
 			}
+
 			.icon-you {
 				font-size: $font-lg;
 				color: $font-color-light;
@@ -937,24 +1006,29 @@ page {
 				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;
 			}
@@ -967,82 +1041,100 @@ page {
 		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;
 			}
 		}
+
 		.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;
 		}
+
 		.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;
@@ -1051,6 +1143,7 @@ page {
 			color: $font-base;
 			padding-right: 10upx;
 		}
+
 		.progress-box {
 			flex: 1;
 			border-radius: 10px;
@@ -1058,15 +1151,18 @@ page {
 			margin-right: 8upx;
 		}
 	}
+
 	/* 分类推荐楼层 */
 	.hot-floor {
 		width: 100%;
 		overflow: hidden;
 		margin-bottom: 20upx;
+
 		.floor-img-box {
 			width: 100%;
 			height: 320upx;
 			position: relative;
+
 			&:after {
 				content: '';
 				position: absolute;
@@ -1077,10 +1173,12 @@ page {
 				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 			}
 		}
+
 		.floor-img {
 			width: 100%;
 			height: 100%;
 		}
+
 		.floor-list {
 			white-space: nowrap;
 			padding: 20upx;
@@ -1093,25 +1191,30 @@ page {
 			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;
@@ -1124,39 +1227,47 @@ page {
 			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;
@@ -1173,13 +1284,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;
@@ -1187,6 +1301,7 @@ page {
 			}
 		}
 	}
+
 	.action-box {
 		display: flex;
 		justify-content: flex-end;
@@ -1195,6 +1310,7 @@ page {
 		position: relative;
 		padding-right: 30upx;
 	}
+
 	.action-btn {
 		width: 160upx;
 		height: 60upx;
@@ -1207,12 +1323,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;
 			}
@@ -1225,36 +1344,43 @@ page {
 		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 {
 				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;
@@ -1274,6 +1400,7 @@ page {
 				text-align: center;
 				position: relative;
 			}
+
 			.text span {
 				width: 180upx;
 				height: 40upx;
@@ -1290,6 +1417,7 @@ page {
 			}
 		}
 	}
+
 	.getPosition {
 		height: 100upx;
 		display: flex;

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>

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>

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;

mallplusui-uniapp-app/pages/public/index.vue

@@ -36,7 +36,7 @@
       <!-- #endif -->
 
     </view>
-<mallplusCopyright></mallplusCopyright>
+<!-- <mallplusCopyright></mallplusCopyright> -->
   </view>
 </template>
 

mallplusui-uniapp-app/pages/public/login.vue

@@ -1,70 +1,110 @@
 <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="left-top-sign">{{ sysInfo.name }}LOGIN</view> -->
+		<view class="welcome">欢迎回来！汇融云链</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="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" placeholder="请输入手机号码" />
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
 			</view>
-				<view class="input-item">
+			<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>
+		<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>
+		</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="getUserInfo" @getuserinfo="wxGetUserInfo" withCredentials="true"
-			<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="isGetPhone == true">获取手机号</button>
+			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="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" placeholder="请输入手机号码" />
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
 			</view>
-				<view class="input-item">
+			<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>
+		</view>
+		<br />
 	
 		<!-- #endif -->
 	</view>
 
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 
 <script>
-import { mapMutations, mapState } from 'vuex';
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
 	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 	import Api from '@/common/api';
 	import store from '@/store/index';
@@ -74,6 +114,11 @@ export default {
 		},
 		data() {
 			return {
+				show: false,
+				selectKey:0,
+				code: '',
+				coding: false,
+				auth_time: 60,
 				phone: '',
 				password: '',
 				isWeiXin: 0,
@@ -95,6 +140,11 @@ export default {
 		},
 		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;
@@ -104,6 +154,35 @@ export default {
 					url: '../../pagesU/user/forget'
 				});
 			},
+			// 获取验证码
+			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) {
+
+				}
+			},
 			toLoginCode() {
 				uni.navigateTo({
 					url: '/pages/public/loginCode'
@@ -330,42 +409,73 @@ export default {
 										success: function(info) {
 											console.log('-------获取微信用户所有-----');
 											console.log(JSON.stringify(info.userInfo));
-										let logparams1 = { logs: JSON.stringify(info.userInfo) };
+											let logparams1 = {
-										Api.apiCall('get', Api.index.logs, logparams1);
+												logs: JSON.stringify(info.userInfo)
+											};
+											Api.apiCall('get', Api.index.logs,
+												logparams1);
 											// 与服务器交互将数据提交到服务端数据库
 											uni.request({
-											url: Api.BASEURI + Api.index.appLogin,
+												url: Api.BASEURI + Api.index
+													.appLogin,
 												method: 'POST',
-											header: { 'content-type': 'application/x-www-form-urlencoded' },
+												header: {
+													'content-type': 'application/x-www-form-urlencoded'
+												},
 												data: {
 													sex: info.userInfo.gender,
-												city: info.userInfo.country + '-' + info.userInfo.province + '-' + info.userInfo.city,
+													city: info.userInfo
+														.country + '-' + info
+														.userInfo.province +
+														'-' + info.userInfo
+														.city,
 													source: 1,
-												openid: info.userInfo.openId,
+													openid: info.userInfo
-												unionid: info.userInfo.openId,
+														.openId,
-												nickname: info.userInfo.nickName,
+													unionid: info.userInfo
-												headimgurl: info.userInfo.avatarUrl
+														.openId,
+													nickname: info.userInfo
+														.nickName,
+													headimgurl: info.userInfo
+														.avatarUrl
 												},
 												success: res => {
-												console.log(JSON.stringify(res));
+													console.log(JSON
+														.stringify(res)
+													);
 
 													// 登录成功 记录会员信息到本地
 													if (res) {
-													uni.setStorageSync('userInfo', res.data.userInfo);
+														uni.setStorageSync(
-													uni.setStorageSync('token', res.data.tokenHead + res.data.token);
+															'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 });
+														uni.showToast({
+															title: res
+																.data
+														});
 													}
 												},
 												fail: e => {
-												console.log(JSON.stringify(e));
+													console.log(JSON
+														.stringify(e));
 												}
 											});
-										let logparams = { logs: JSON.stringify(info.userInfo) };
+											let logparams = {
-										Api.apiCall('get', Api.index.logs, logparams);
+												logs: JSON.stringify(info.userInfo)
+											};
+											Api.apiCall('get', Api.index.logs,
+												logparams);
 										}
 									});
 								}
@@ -377,6 +487,17 @@ export default {
 			async toLogin() {
 				var that = this;
 				let phoneReg = /^1[1-9][0-9]\d{8}$/;
+				
+				if(that.selectKey==0){
+					// 免密登录
+					uni.showToast({
+						icon: 'none',
+						title: '暂不支持此登录方式'
+					});
+					return;
+				}else{
+					// 账号登录
+					
 					try {
 						if (this.phone == '') {
 							throw '请填写手机号';
@@ -391,20 +512,28 @@ export default {
 						this.$api.msg(err);
 						return;
 					}
+					console.log("1111111111");
 					this.logining = false;
-			let params = { phone: this.phone, password: this.password };
+					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;
@@ -418,10 +547,13 @@ export default {
 								uni.request({
 									url: Api.BASEURI + Api.index.appLogin,
 									method: 'POST',
-								header: { 'content-type': 'application/x-www-form-urlencoded' },
+									header: {
+										'content-type': 'application/x-www-form-urlencoded'
+									},
 									data: {
 										sex: info.userInfo.gender,
-									city: info.userInfo.country + '-' + info.userInfo.province + '-' + info.userInfo.city,
+										city: info.userInfo.country + '-' + info.userInfo
+											.province + '-' + info.userInfo.city,
 
 										source: 1,
 										unionid: info.userInfo.openId,
@@ -435,14 +567,18 @@ export default {
 										if (res) {
 											console.log(res);
 											that.login(res.data.data);
-										uni.setStorageSync('userInfos', res.data.data.userInfo);
+											uni.setStorageSync('userInfos', res.data
-										uni.setStorageSync('token', res.data.data.tokenHead + res.data.data.token);
+												.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 });
+											uni.showToast({
+												title: res.data
+											});
 										}
 									},
 									fail: e => {
@@ -451,12 +587,16 @@ export default {
 								});
 							},
 							fail: () => {
-							uni.showToast({ title: '微信登录授权失败' });
+								uni.showToast({
+									title: '微信登录授权失败'
+								});
 							}
 						});
 					},
 					fail: () => {
-					uni.showToast({ title: '微信登录授权失败' });
+						uni.showToast({
+							title: '微信登录授权失败'
+						});
 						uni.hideLoading();
 					}
 				});
@@ -469,6 +609,7 @@ export default {
 	page {
 		background: #fff;
 	}
+
 	.container {
 		padding-top: 115px;
 		position: relative;
@@ -477,12 +618,14 @@ page {
 		overflow: hidden;
 		background: #fff;
 	}
+
 	.wrapper {
 		position: relative;
 		z-index: 90;
 		background: #fff;
 		padding-bottom: 40upx;
 	}
+
 	.back-btn {
 		position: absolute;
 		left: 40upx;
@@ -492,17 +635,20 @@ page {
 		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;
@@ -511,10 +657,12 @@ page {
 			height: 80upx;
 			background: #b4f3e2;
 		}
+
 		&:before {
 			transform: rotate(50deg);
 			border-radius: 0 50px 0 0;
 		}
+
 		&:after {
 			position: absolute;
 			right: -198upx;
@@ -524,6 +672,7 @@ page {
 			/* background: pink; */
 		}
 	}
+
 	.left-bottom-sign {
 		position: absolute;
 		left: -270upx;
@@ -532,7 +681,9 @@ page {
 		border-radius: 50%;
 		padding: 180upx;
 	}
+
 	.welcome {
+		margin-top: 150px;
 		position: relative;
 		left: 50upx;
 		top: -90upx;
@@ -540,9 +691,32 @@ page {
 		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;
@@ -553,21 +727,50 @@ page {
 		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 {
@@ -579,24 +782,33 @@ page {
 		background: $uni-color-primary;
 		color: #fff;
 		font-size: $font-lg;
+
 		&:after {
 			border-radius: 100px;
 		}
 	}
+
+	.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;
 		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 {
 			color: $font-color-spec;
 			margin-left: 10upx;

mallplusui-uniapp-app/pages/public/loginCode.vue

@@ -28,7 +28,7 @@
 			还没有账号?
 			<text @click="toRegist">马上注册</text>
 		</view>
-<mallplusCopyright></mallplusCopyright>
+<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

mallplusui-uniapp-app/pages/public/reg.vue

@@ -33,7 +33,7 @@
 			已经有账号?
 			<text @click="toRegist">马上登录</text>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 
 </template>

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>
 

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')">
+				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
-					<image src="/static/temp/c5.png"></image>
+					<image src="/static/temp/c7.png"></image>
-					<text>费用管理</text>
-				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/build/groupList')">
-					<image src="/static/temp/c6.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-section">
-				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in communityList" :key="index">
+				<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="goods-list-vertical">
+
-				<view v-for="(item, index) in newProductList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)">
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/floorList')">
-					<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view>
+				<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-right">
 						<view class="goods-right-top">
 							<text class="">{{ item.name }}</text>
@@ -88,7 +102,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -98,8 +112,12 @@ 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 {
-import { mapState } from 'vuex';
+		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 {
@@ -150,11 +168,16 @@ export default {
 
 		onShareAppMessage() {},
 		async onLoad(ops) {
+			console.log(ops)
 			if (ops.communityId && ops.communityId != undefined) {
 				this.communityId = ops.communityId;
 			} else {
 				this.communityId = 0;
 			}
+
+			uni.setNavigationBarTitle({
+				title: ops.name
+			});
 			this.getNewProductList('refresh');
 			this.loadData();
 			//this.nearCommunity();
@@ -166,7 +189,9 @@ export default {
 			 * 加载首页数据
 			 */
 			async loadData() {
-			let params = { communityId: this.communityId };
+				let params = {
+					communityId: this.communityId
+				};
 				let data = await Api.apiCall('get', Api.build.home, params);
 				if (data) {
 					this.carouselList = data.advertiseList || [];
@@ -188,7 +213,11 @@ export default {
 			 */
 			async nearCommunity() {
 				if (this.community.latitude) {
-			let params = params = { geohash: this.community.latitude+','+ this.community.longitude, pageSize: 10,distance:40 };
+					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 || [];
@@ -219,7 +248,10 @@ export default {
 				} else {
 					this.loadingType = 'more';
 				}
-			let params = { pageNum: this.pageNum, communityId: this.communityId };
+				let params = {
+					pageNum: this.pageNum,
+					communityId: this.communityId
+				};
 				let list = await Api.apiCall('get', Api.build.floorList, params);
 
 				let goodsList = list.records;
@@ -347,6 +379,7 @@ export default {
 		width: 100%;
 		z-index: 999;
 	}
+
 	.MP-search-input {
 		font-size: 28upx;
 		background: #f5f5f5;
@@ -355,6 +388,7 @@ export default {
 		border-radius: 50upx;
 		text-align: center;
 	}
+
 	.mp-search-box {
 		position: absolute;
 		left: 0;
@@ -362,6 +396,7 @@ export default {
 		z-index: 9999;
 		width: 100%;
 		padding: 0 80upx;
+
 		.ser-input {
 			flex: 1;
 			height: 60upx;
@@ -373,6 +408,7 @@ export default {
 			background: rgba(255, 255, 255, 0.6);
 		}
 	}
+
 	page {
 		.cate-section {
 			position: relative;
@@ -380,17 +416,21 @@ page {
 			border-radius: 16upx 16upx 0 0;
 			margin-top: -20upx;
 		}
+
 		.carousel-section {
 			padding: 0;
+
 			.titleNview-placing {
 				padding-top: 0;
 				height: 0;
 			}
+
 			.carousel {
 				.carousel-item {
 					padding: 0;
 				}
 			}
+
 			.swiper-dots {
 				left: 45upx;
 				bottom: 40upx;
@@ -401,9 +441,11 @@ page {
 	page {
 		background: #f5f5f5;
 	}
+
 	.m-t {
 		margin-top: 20upx;
 	}
+
 	/* 头部 轮播图 */
 	.carousel-section {
 		position: relative;
@@ -424,6 +466,7 @@ page {
 			transition: 0.4s;
 		}
 	}
+
 	.carousel {
 		width: 100%;
 		height: 350upx;
@@ -441,6 +484,7 @@ page {
 			border-radius: 10upx;
 		}
 	}
+
 	.swiper-dots {
 		display: flex;
 		position: absolute;
@@ -471,6 +515,7 @@ page {
 			transform: translateX(-50%);
 		}
 	}
+
 	/* 分类 */
 	.cate-section {
 		display: flex;
@@ -479,6 +524,7 @@ page {
 		flex-wrap: wrap;
 		padding: 30upx 22upx;
 		background: #fff;
+
 		.cate-item {
 			display: flex;
 			flex-direction: column;
@@ -486,6 +532,7 @@ page {
 			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
 		}
+
 		/* 原图标颜色太深,不想改图了,所以加了透明度 */
 		image {
 			width: 88upx;
@@ -496,34 +543,41 @@ page {
 			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
 		}
 	}
+
 	.ad-1 {
 		width: 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;
@@ -536,6 +590,7 @@ page {
 				border-radius: 2px;
 				background: rgba(0, 0, 0, 0.8);
 			}
+
 			.icon-you {
 				font-size: $font-lg;
 				color: $font-color-light;
@@ -543,24 +598,29 @@ page {
 				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;
 			}
@@ -573,82 +633,100 @@ page {
 		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;
 			}
 		}
+
 		.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;
 		}
+
 		.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;
@@ -657,6 +735,7 @@ page {
 			color: $font-base;
 			padding-right: 10upx;
 		}
+
 		.progress-box {
 			flex: 1;
 			border-radius: 10px;
@@ -664,15 +743,18 @@ page {
 			margin-right: 8upx;
 		}
 	}
+
 	/* 分类推荐楼层 */
 	.hot-floor {
 		width: 100%;
 		overflow: hidden;
 		margin-bottom: 20upx;
+
 		.floor-img-box {
 			width: 100%;
 			height: 320upx;
 			position: relative;
+
 			&:after {
 				content: '';
 				position: absolute;
@@ -683,10 +765,12 @@ page {
 				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 			}
 		}
+
 		.floor-img {
 			width: 100%;
 			height: 100%;
 		}
+
 		.floor-list {
 			white-space: nowrap;
 			padding: 20upx;
@@ -699,25 +783,30 @@ page {
 			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;
@@ -730,39 +819,47 @@ page {
 			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;
@@ -779,13 +876,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;
@@ -793,6 +893,7 @@ page {
 			}
 		}
 	}
+
 	.action-box {
 		display: flex;
 		justify-content: flex-end;
@@ -801,6 +902,7 @@ page {
 		position: relative;
 		padding-right: 30upx;
 	}
+
 	.action-btn {
 		width: 160upx;
 		height: 60upx;
@@ -813,12 +915,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;
 			}
@@ -831,36 +936,43 @@ page {
 		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 {
 				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;
@@ -880,6 +992,7 @@ page {
 				text-align: center;
 				position: relative;
 			}
+
 			.text span {
 				width: 180upx;
 				height: 40upx;
@@ -896,6 +1009,7 @@ page {
 			}
 		}
 	}
+
 	.getPosition {
 		height: 100upx;
 		display: flex;
@@ -904,11 +1018,13 @@ page {
 		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;
@@ -916,6 +1032,7 @@ page {
 			align-items: center;
 			justify-content: center;
 			border-bottom: 1upx solid #eeeeee;
+
 			.image-wrapper-vertical {
 				width: 240upx;
 				height: 240upx;
@@ -923,15 +1040,19 @@ page {
 				align-items: center;
 				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;
@@ -942,19 +1063,23 @@ page {
 						-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;
 						}
 					}
+
 					.sale {
 						color: $font-color-light;
 						font-size: 28upx;

mallplusui-uniapp-app/pagesA/build/communityList.vue

@@ -3,27 +3,32 @@
 		<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 v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical"
-				<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view>
+				@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>
@@ -97,7 +102,11 @@ export default {
 		},
 		methods: {
 			async nearCommunity(geohash) {
-			let params = params = { geohash: geohash, pageSize: 10,distance:240 };
+				let params = params = {
+					geohash: geohash,
+					pageSize: 10,
+					distance: 240
+				};
 				let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
 				if (data) {
 					this.goodsList = data || [];
@@ -117,9 +126,14 @@ export default {
 				let params;
 
 				if (this.keyword) {
-				params = { pageNum: this.pageNum, keyword: this.keyword };
+					params = {
+						pageNum: this.pageNum,
+						keyword: this.keyword
+					};
 				} else {
-				params = { pageNum: this.pageNum };
+					params = {
+						pageNum: this.pageNum
+					};
 				}
 
 				let list = await Api.apiCall('get', Api.build.communityList, params);
@@ -174,6 +188,7 @@ export default {
 			},
 			//显示分类面板
 			toggleCateMask(type) {
+				console.log("type", type);
 				let timer = type === 'show' ? 10 : 300;
 				let state = type === 'show' ? 1 : 0;
 				this.cateMaskState = 2;
@@ -198,8 +213,9 @@ export default {
 			navToDetailPage(item) {
 				//测试数据没有写id，用title代替
 				let id = item.id;
+				let name = item.name;
 				uni.navigateTo({
-				url: `../../pagesA/build/community?communityId=${id}`
+					url: `../../pagesA/build/community?communityId=${id}&name=${name}`
 				});
 			},
 			stopPrevent() {}
@@ -212,6 +228,7 @@ page,
 	.content {
 		background: $page-color-base;
 	}
+
 	.content {
 		padding-top: 96upx;
 	}
@@ -222,25 +239,27 @@ page,
 		top: var(--window-top);
 		display: flex;
 		width: 100%;
-	height: 80upx;
+		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;
-		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%;
+					left: 9%;
 					bottom: 0;
 					transform: translateX(-50%);
 					width: 120upx;
@@ -249,9 +268,11 @@ page,
 				}
 			}
 		}
+
 		.p-box {
 			display: flex;
 			flex-direction: column;
+
 			.yticon {
 				display: flex;
 				align-items: center;
@@ -262,14 +283,17 @@ page,
 				margin-left: 4upx;
 				font-size: 26upx;
 				color: #888;
+
 				&.active {
 					color: $base-color;
 				}
 			}
+
 			.xia {
 				transform: scaleY(-1);
 			}
 		}
+
 		.cate-item {
 			display: flex;
 			justify-content: center;
@@ -278,6 +302,7 @@ page,
 			width: 80upx;
 			position: relative;
 			font-size: 44upx;
+
 			&:after {
 				content: '';
 				position: absolute;
@@ -310,9 +335,11 @@ page,
 			transform: translateX(100%);
 			transition: 0.3s;
 		}
+
 		&.none {
 			display: none;
 		}
+
 		&.show {
 			background: rgba(0, 0, 0, 0.4);
 
@@ -321,10 +348,12 @@ page,
 			}
 		}
 	}
+
 	.cate-list {
 		display: flex;
 		flex-direction: column;
 		height: 100%;
+
 		.cate-item {
 			display: flex;
 			align-items: center;
@@ -334,12 +363,14 @@ page,
 			color: #555;
 			position: relative;
 		}
+
 		.two {
 			height: 64upx;
 			color: #303133;
 			font-size: 30upx;
 			background: #f8f8f8;
 		}
+
 		.active {
 			color: $base-color;
 		}
@@ -351,31 +382,37 @@ page,
 		flex-wrap: wrap;
 		padding: 20upx 20upx 0 20upx;
 		background: #fff;
+
 		.goods-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 {
 				width: 100%;
 				height: 100%;
 				opacity: 1;
 			}
 		}
+
 		.title {
 			font-size: $font-lg;
 			color: $font-color-dark;
 			line-height: 80upx;
 		}
+
 		.price-box {
 			display: flex;
 			align-items: center;
@@ -384,67 +421,88 @@ page,
 			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-list-vertical {
 		display: flex;
 		flex-wrap: wrap;
 		padding: 0upx 20upx;
 		background: #fff;
+
 		.goods-item-vertical {
 			display: flex;
 			flex-direction: row;
-		height: 280upx;
+			height: 200upx;
-		align-items: center;
+
-		justify-content: center;
-		border-bottom: 1upx solid #eeeeee;
 			.image-wrapper-vertical {
-			width: 240upx;
+				width: 200upx;
-			height: 240upx;
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				margin-right: 10upx;
+
 				image {
-				width: 240upx;
+					width: 150upx;
-				height: 240upx;
+					height: 150upx;
 				}
 			}
+
 			.goods-list-right {
+				display: flex;
+				flex-direction: column;
 				width: 470upx;
+
 				.goods-right-top {
-				height: 200upx;
+					.text1 {
-				text {
+						margin-top: 10px;
 						font-size: 32upx;
 						text-overflow: -o-ellipsis-lastline;
 						overflow: hidden;
 						text-overflow: ellipsis;
 						display: -webkit-box;
-					-webkit-line-clamp: 2;
+						-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;
 					}
 				}
+
 				.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;

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端下拉时顶部漂移

mallplusui-uniapp-app/pagesA/product/giftList.vue

@@ -36,7 +36,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

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>
 

mallplusui-uniapp-app/pagesA/product/groupList.vue

@@ -36,7 +36,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

mallplusui-uniapp-app/pagesA/product/list.vue

@@ -63,7 +63,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

mallplusui-uniapp-app/pagesA/product/paiMaiList.vue

@@ -36,7 +36,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

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) {

mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue

@@ -61,7 +61,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

mallplusui-uniapp-app/pagesC/seller/index.vue

@@ -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>
@@ -76,7 +77,10 @@
 			</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">
@@ -101,7 +105,10 @@
 
 			</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">
@@ -126,7 +133,7 @@
 
 			</uni-grid>
 		</view>
-<mallplusCopyright></mallplusCopyright>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 
 </template>
@@ -136,14 +143,17 @@ 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 {
+		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
+			coupon,
-			,uniGrid,uniGridItem
+			uniGrid,
+			uniGridItem
 		},
 		data() {
 			return {
@@ -178,8 +188,7 @@ if(!adminToken){
 					uni.navigateTo({
 						url: '../../pagesC/seller/login'
 					});
-
+					return
-
 				}
 				let params = {};
 				let orderResp = await Api.apiAdminCall('get', Api.admin.orderStatic, params, true);
@@ -243,7 +252,9 @@ uni.navigateTo({
 					title: '请稍后'
 				});
 
-        			let params = { couponId: item.id };
+				let params = {
+					couponId: item.id
+				};
 				let data = await Api.apiAdminCall('post', Api.admin.acceptCoupon, params);
 				console.log(data);
 				if (data) {
@@ -319,6 +330,7 @@ uni.navigateTo({
 		z-index: 9999;
 		width: 100%;
 		padding: 0 80upx;
+
 		.ser-input {
 			flex: 1;
 			height: 56upx;
@@ -330,6 +342,7 @@ uni.navigateTo({
 			background: rgba(255, 255, 255, 0.6);
 		}
 	}
+
 	page {
 		.cate-section {
 			position: relative;
@@ -337,17 +350,21 @@ page {
 			border-radius: 16upx 16upx 0 0;
 			margin-top: -20upx;
 		}
+
 		.carousel-section {
 			padding: 0;
+
 			.titleNview-placing {
 				padding-top: 0;
 				height: 0;
 			}
+
 			.carousel {
 				.carousel-item {
 					padding: 0;
 				}
 			}
+
 			.swiper-dots {
 				left: 45upx;
 				bottom: 40upx;
@@ -358,9 +375,11 @@ page {
 	page {
 		background: #f5f5f5;
 	}
+
 	.m-t {
 		margin-top: 16upx;
 	}
+
 	/* 头部 轮播图 */
 	.carousel-section {
 		position: relative;
@@ -381,6 +400,7 @@ page {
 			transition: 0.4s;
 		}
 	}
+
 	.carousel {
 		width: 100%;
 		height: 350upx;
@@ -398,6 +418,7 @@ page {
 			border-radius: 10upx;
 		}
 	}
+
 	.swiper-dots {
 		display: flex;
 		position: absolute;
@@ -428,6 +449,7 @@ page {
 			transform: translateX(-50%);
 		}
 	}
+
 	/* 分类 */
 	.cate-section {
 		display: flex;
@@ -436,6 +458,7 @@ page {
 		flex-wrap: wrap;
 		padding: 30upx 22upx;
 		background: #fff;
+
 		.cate-item {
 			display: flex;
 			flex-direction: column;
@@ -443,6 +466,7 @@ page {
 			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
 		}
+
 		/* 原图标颜色太深,不想改图了,所以加了透明度 */
 		image {
 			width: 88upx;
@@ -453,34 +477,41 @@ page {
 			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
 		}
 	}
+
 	.ad-1 {
 		width: 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;
@@ -493,6 +524,7 @@ page {
 				border-radius: 2px;
 				background: rgba(0, 0, 0, 0.8);
 			}
+
 			.icon-you {
 				font-size: $font-lg;
 				color: $font-color-light;
@@ -500,24 +532,29 @@ page {
 				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;
 			}
@@ -530,82 +567,100 @@ page {
 		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;
 			}
 		}
+
 		.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;
 		}
+
 		.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;
@@ -614,6 +669,7 @@ page {
 			color: $font-base;
 			padding-right: 10upx;
 		}
+
 		.progress-box {
 			flex: 1;
 			border-radius: 10px;
@@ -621,15 +677,18 @@ page {
 			margin-right: 8upx;
 		}
 	}
+
 	/* 分类推荐楼层 */
 	.hot-floor {
 		width: 100%;
 		overflow: hidden;
 		margin-bottom: 20upx;
+
 		.floor-img-box {
 			width: 100%;
 			height: 320upx;
 			position: relative;
+
 			&:after {
 				content: '';
 				position: absolute;
@@ -640,10 +699,12 @@ page {
 				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 			}
 		}
+
 		.floor-img {
 			width: 100%;
 			height: 100%;
 		}
+
 		.floor-list {
 			white-space: nowrap;
 			padding: 20upx;
@@ -656,25 +717,30 @@ page {
 			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;
@@ -687,39 +753,47 @@ page {
 			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;
 			}
@@ -789,45 +871,77 @@ page {
 		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 {
 				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;
+			width: 100%;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
 		}
 
 		.other_type {
-    	width:100%; height:90upx; padding-top:50upx;
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
 
-    	.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; }
+			.text span {
-    	.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; }
+				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>

mallplusui-uniapp-app/pagesC/seller/login.vue

@@ -24,7 +24,7 @@
 			还没有账号?
 			<text @click="toRegist">马上注册</text>
 		</view>
-    <mallplusCopyright></mallplusCopyright>
+    <!-- <mallplusCopyright></mallplusCopyright> -->
 	</view>
 </template>
 

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">

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',
+  NODE_ENV: '"development"',
-  BASE_API: 'http://127.0.0.1:8085'
+  BASE_API: '"http://127.0.0.1:8085"'
 })

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-form-item label="小区地址：" prop="details">
-        <el-input v-model="community.address"></el-input>
+        <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);