From e40ca500b4becd39cbb07f0779d80ac0c687d4f5 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 27 Feb 2023 18:10:06 +0800
Subject: [PATCH] =?UTF-8?q?2023-02-27=20=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mallplusui-uniapp-app/App.vue                 |    1 +
 .../uni-load-more/uni-load-more.vue           |  194 --
 mallplusui-uniapp-app/config/baseUrl.js       |    4 +-
 mallplusui-uniapp-app/manifest.json           |    6 +-
 mallplusui-uniapp-app/pages.json              |   28 +-
 mallplusui-uniapp-app/pages/index/index.vue   |   21 +-
 .../pages/index/nearbyBusiness.vue            |    2 +-
 mallplusui-uniapp-app/pages/index/user.vue    |    8 +-
 .../pages/integral/home/home.vue              |    2 +-
 mallplusui-uniapp-app/pages/order/order.vue   |    2 +-
 .../pages/order/orderDetail.vue               |    2 +-
 mallplusui-uniapp-app/pages/set/set.vue       |  235 +-
 .../pagesA/after_sale/list.vue                |    2 +-
 .../pagesA/build/community.vue                |    2 +-
 .../pagesA/build/communityList.vue            |    2 +-
 .../pagesA/build/floorList.vue                |    2 +-
 .../pagesA/build/groupList.vue                |    2 +-
 .../pagesA/product/discountList.vue           |    2 +-
 .../pagesA/product/giftList.vue               |    2 +-
 .../pagesA/product/groupActivityList.vue      |    2 +-
 .../pagesA/product/groupList.vue              |    2 +-
 mallplusui-uniapp-app/pagesA/product/list.vue |    2 +-
 .../pagesA/product/paiMaiList.vue             |    2 +-
 .../pagesA/product/product.vue                | 2123 +++++++++--------
 .../pagesA/product/tagGoodslist.vue           |    2 +-
 mallplusui-uniapp-app/pagesC/seller/goods.vue |    2 +-
 .../pagesC/seller/member.vue                  |    2 +-
 mallplusui-uniapp-app/pagesC/seller/order.vue |    2 +-
 .../pagesC/seller/orderDetail.vue             |    2 +-
 .../pagesC/store/businessDetails.vue          |    2 +-
 mallplusui-uniapp-app/pagesC/store/list.vue   |    2 +-
 .../pagesC/store/schoolList.vue               |    2 +-
 mallplusui-uniapp-app/pagesC/store/store.vue  |    2 +-
 .../pagesC/store/storeList.vue                |    2 +-
 .../pagesU/notice/subjectDetail.vue           |   10 +-
 .../pagesU/notice/subjectList.vue             |    7 +-
 .../pagesU/notice/subjectList_02_14.vue       |    2 +-
 mallplusui-uniapp-app/pagesU/user/collect.vue |  963 ++++----
 .../pagesU/user/inviteList.vue                |    2 +-
 .../pagesU/user/inviteMoney.vue               |    2 +-
 .../plugins/APPUpdate/index.js                |   15 +-
 .../plugins/request/request.js                |    7 +-
 42 files changed, 1869 insertions(+), 1809 deletions(-)
 delete mode 100644 mallplusui-uniapp-app/components/uni-load-more/uni-load-more.vue

diff --git a/mallplusui-uniapp-app/App.vue b/mallplusui-uniapp-app/App.vue
index 8651545..aa85bab 100644
--- a/mallplusui-uniapp-app/App.vue
+++ b/mallplusui-uniapp-app/App.vue
@@ -44,6 +44,7 @@
 			async sysInfoMethod() {
 				let params = {};
 				let list = await Api.apiCall('get', Api.index.sysInfo, params);
+				console.log('sysInfo>>>>>',sysInfo)
 				this.$db.set('sysInfo', list)
 			},
 			
diff --git a/mallplusui-uniapp-app/components/uni-load-more/uni-load-more.vue b/mallplusui-uniapp-app/components/uni-load-more/uni-load-more.vue
deleted file mode 100644
index 6c43365..0000000
--- a/mallplusui-uniapp-app/components/uni-load-more/uni-load-more.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-	<view class="uni-load-more">
-		<view class="uni-load-more__img" v-show="status === 'loading' && showIcon">
-			<view class="load1">
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-			</view>
-			<view class="load2">
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-			</view>
-			<view class="load3">
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-				<view :style="{background:color}"></view>
-			</view>
-		</view>
-		<text class="uni-load-more__text" :style="{color:color}">{{status === 'more' ? contentText.contentdown : (status === 'loading' ? contentText.contentrefresh : contentText.contentnomore)}}</text>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "uni-load-more",
-		props: {
-			status: {
-				//上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
-				type: String,
-				default: 'more'
-			},
-			showIcon: {
-				type: Boolean,
-				default: true
-			},
-			color: {
-				type: String,
-				default: "#777777"
-			},
-			contentText: {
-				type: Object,
-				default () {
-					return {
-						contentdown: "上拉显示更多",
-						contentrefresh: "正在加载...",
-						contentnomore: "没有更多数据了"
-					};
-				}
-			}
-		},
-		data() {
-			return {}
-		}
-	}
-</script>
-
-<style>
-	@charset "UTF-8";
-
-	.uni-load-more {
-		display: flex;
-		flex-direction: row;
-		height: 80upx;
-		align-items: center;
-		justify-content: center
-	}
-
-	.uni-load-more__text {
-		font-size: 28upx;
-		color: #999
-	}
-
-	.uni-load-more__img {
-		height: 24px;
-		width: 24px;
-		margin-right: 10px
-	}
-
-	.uni-load-more__img>view {
-		position: absolute
-	}
-
-	.uni-load-more__img>view view {
-		width: 6px;
-		height: 2px;
-		border-top-left-radius: 1px;
-		border-bottom-left-radius: 1px;
-		background: #999;
-		position: absolute;
-		opacity: .2;
-		transform-origin: 50%;
-		animation: load 1.56s ease infinite
-	}
-
-	.uni-load-more__img>view view:nth-child(1) {
-		transform: rotate(90deg);
-		top: 2px;
-		left: 9px
-	}
-
-	.uni-load-more__img>view view:nth-child(2) {
-		transform: rotate(180deg);
-		top: 11px;
-		right: 0
-	}
-
-	.uni-load-more__img>view view:nth-child(3) {
-		transform: rotate(270deg);
-		bottom: 2px;
-		left: 9px
-	}
-
-	.uni-load-more__img>view view:nth-child(4) {
-		top: 11px;
-		left: 0
-	}
-
-	.load1,
-	.load2,
-	.load3 {
-		height: 24px;
-		width: 24px
-	}
-
-	.load2 {
-		transform: rotate(30deg)
-	}
-
-	.load3 {
-		transform: rotate(60deg)
-	}
-
-	.load1 view:nth-child(1) {
-		animation-delay: 0s
-	}
-
-	.load2 view:nth-child(1) {
-		animation-delay: .13s
-	}
-
-	.load3 view:nth-child(1) {
-		animation-delay: .26s
-	}
-
-	.load1 view:nth-child(2) {
-		animation-delay: .39s
-	}
-
-	.load2 view:nth-child(2) {
-		animation-delay: .52s
-	}
-
-	.load3 view:nth-child(2) {
-		animation-delay: .65s
-	}
-
-	.load1 view:nth-child(3) {
-		animation-delay: .78s
-	}
-
-	.load2 view:nth-child(3) {
-		animation-delay: .91s
-	}
-
-	.load3 view:nth-child(3) {
-		animation-delay: 1.04s
-	}
-
-	.load1 view:nth-child(4) {
-		animation-delay: 1.17s
-	}
-
-	.load2 view:nth-child(4) {
-		animation-delay: 1.3s
-	}
-
-	.load3 view:nth-child(4) {
-		animation-delay: 1.43s
-	}
-
-	@-webkit-keyframes load {
-		0% {
-			opacity: 1
-		}
-
-		100% {
-			opacity: .2
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/config/baseUrl.js b/mallplusui-uniapp-app/config/baseUrl.js
index 45a2dda..daaa6ce 100644
--- a/mallplusui-uniapp-app/config/baseUrl.js
+++ b/mallplusui-uniapp-app/config/baseUrl.js
@@ -5,11 +5,11 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://localhost:7001/";
 	// socketUrl = "ws://localhost:8001/";
 	// baseUrl = "http://26077a35f5.wicp.vip:43609/";
-	baseUrl = "http://www.yyundong.com:8083/";
+	baseUrl = "http://mall.yyundong.com/portalapi/api/";
 	socketUrl = "ws://8192.168.43.195:8083/";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	baseUrl = "http://www.yyundong.com:8083/";
+	baseUrl = "http://mall.yyundong.com/portalapi/api/";
 	// baseUrl = "http://192.168.43.195:8083/";
 	socketUrl = "ws://192.168.43.195:8083/";
 }
diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json
index b503a51..c0c0db6 100644
--- a/mallplusui-uniapp-app/manifest.json
+++ b/mallplusui-uniapp-app/manifest.json
@@ -2,8 +2,8 @@
     "name" : "汇融云链",
     "appid" : "__UNI__FB2C9C4",
     "description" : "",
-    "versionName" : "4.0.0.0",
-    "versionCode" : 4000,
+    "versionName" : "1.0.0.2",
+    "versionCode" : 1002,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
@@ -148,7 +148,7 @@
         "permission" : {}
     },
     "h5" : {
-        "title" : "宇运动商城",
+        "title" : "汇融云链",
         "domain" : "https://www.yyundong.com:8088/h5",
         "router" : {
             "base" : ""
diff --git a/mallplusui-uniapp-app/pages.json b/mallplusui-uniapp-app/pages.json
index c5e229d..4473eb8 100644
--- a/mallplusui-uniapp-app/pages.json
+++ b/mallplusui-uniapp-app/pages.json
@@ -11,14 +11,14 @@
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent",
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入要查询的信息",
-							"disabled": true,
-							"placeholderColor": "#606266"
-						}
-						,
+						// "searchInput": {
+						// 	"backgroundColor": "rgba(231, 231, 231,.7)",
+						// 	"borderRadius": "16px",
+						// 	"placeholder": "请输入要查询的信息",
+						// 	"disabled": true,
+						// 	"placeholderColor": "#606266"
+						// }
+						// ,
 						"buttons": [{
 								"fontSrc": "/static/yticon.ttf",
 								"text": "",
@@ -171,7 +171,7 @@
 		}, {
 			"path": "pages/index/user",
 			"style": {
-				"navigationBarTitleText": "我的",
+				"navigationBarTitleText": "我的云链",
 				// #ifdef MP
 				"navigationStyle": "custom",
 				// #endif
@@ -182,7 +182,7 @@
 						"type": "transparent",
 						"buttons": [{
 								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue60f",
+								"text": "",
 								"fontSize": "24",
 								"color": "#303133",
 								"width": "46px",
@@ -190,11 +190,11 @@
 							},
 							{
 								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue744",
+								"text": "",
 								"fontSize": "28",
 								"color": "#303133",
-								"background": "rgba(0,0,0,0)",
-								"redDot": true
+								"background": "rgba(0,0,0,0)"
+								// "redDot": true
 							}
 						]
 					}
@@ -809,7 +809,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "宇运动商城",
+		"navigationBarTitleText": "汇融云链",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#f8f8f8"
 	},
diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue
index d396c71..dac2e91 100644
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@@ -268,7 +268,7 @@
 		mapState
 	} from 'vuex';
 	import navBar from '@/components/zhouWei-navBar';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 	export default {
 		components: {
 			coupon,
@@ -377,8 +377,8 @@
 					// 	console.log('val: ' + val)
 					// 	return item.id == val.id;
 					item => {
-						console.log('item_id: ' +JSON.parse(JSON.stringify(item)).id)
-						console.log('val_id: ' +JSON.parse(val).id)
+						console.log('item_id: ' + JSON.parse(JSON.stringify(item)).id)
+						console.log('val_id: ' + JSON.parse(val).id)
 						if (JSON.parse(JSON.stringify(item)).id == JSON.parse(val).id) {
 							return true
 						}
@@ -390,11 +390,14 @@
 
 			async sysInfoMethod() {
 				let params = {};
-				let list = this.$db.get('sysInfo')
-				if (!list) {
-					list = await Api.apiCall('get', Api.index.sysInfo, params);
-					this.$db.set('sysInfo', list)
-				}
+				// let list = this.$db.get('sysInfo')
+				console.log('sysInfo>>>>>1111111111111', 1111111111111111)
+				// if (!list) {
+
+				list = await Api.apiCall('get', Api.index.sysInfo, params);
+				console.log('sysInfo>>>>>2222222222', sysInfo)
+				this.$db.set('sysInfo', list)
+				// }
 
 			},
 			getCode() {
@@ -549,7 +552,7 @@
 				if (data) {
 					console.log("优惠券")
 					console.log("优惠券", data)
-						console.log("优惠券id",data[0].id)
+					console.log("优惠券id", data[0].id)
 					this.couponList = []
 					this.couponList = this.couponList.concat(data) || [];
 				}
diff --git a/mallplusui-uniapp-app/pages/index/nearbyBusiness.vue b/mallplusui-uniapp-app/pages/index/nearbyBusiness.vue
index c6abf5f..628c5a7 100644
--- a/mallplusui-uniapp-app/pages/index/nearbyBusiness.vue
+++ b/mallplusui-uniapp-app/pages/index/nearbyBusiness.vue
@@ -88,7 +88,7 @@
 </template>
 
 <script>
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import uniIcon from '@/components/uni-icon/uni-icon.vue';
 import eonfox from '@/components/eonfox/eonfox.js';
 import fns from '@/components/eonfox/fns.js';
diff --git a/mallplusui-uniapp-app/pages/index/user.vue b/mallplusui-uniapp-app/pages/index/user.vue
index beab176..c344d7f 100644
--- a/mallplusui-uniapp-app/pages/index/user.vue
+++ b/mallplusui-uniapp-app/pages/index/user.vue
@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			<!-- <view class="vip-card-box" @click="toNav('../../pagesU/user/applyMember')"> -->
-			<view class="vip-card-box" @click="upData()">
+			<!-- <view class="vip-card-box" @click="upData()">
 				<image class="card-bg" src="/static/vip-card-bg.png" mode=""></image>
 				<view class="b-btn">立即升级</view>
 				<view class="tit" v-if="userDetailInfo">
@@ -44,7 +44,7 @@
 				</view>
 				<text class="e-m">汇融云链</text>
 				<text class="e-b">升级会员享受更多折扣 一测就上线</text>
-			</view>
+			</view> -->
 		</view>
 
 		<view class="cover-container" :style="[
@@ -64,10 +64,10 @@
 					<text class="num">{{ couponList.length || 0 }}</text>
 					<text>优惠券</text>
 				</view>
-				<view class="tj-item" @click="toNav('/pages/integral/home/home')">
+				<!-- <view class="tj-item" @click="toNav('/pages/integral/home/home')">
 					<text class="num">{{ userDetailInfo.integration || 0 }}</text>
 					<text>积分</text>
-				</view>
+				</view> -->
 			</view>
 			<!-- 订单 -->
 			<view class="order-section">
diff --git a/mallplusui-uniapp-app/pages/integral/home/home.vue b/mallplusui-uniapp-app/pages/integral/home/home.vue
index 3c39b18..00299ae 100644
--- a/mallplusui-uniapp-app/pages/integral/home/home.vue
+++ b/mallplusui-uniapp-app/pages/integral/home/home.vue
@@ -47,7 +47,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 	export default {
 	components: {
 		mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pages/order/order.vue b/mallplusui-uniapp-app/pages/order/order.vue
index 99ff1e8..fd023e3 100644
--- a/mallplusui-uniapp-app/pages/order/order.vue
+++ b/mallplusui-uniapp-app/pages/order/order.vue
@@ -66,7 +66,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { formatDate } from '@/common/date';
 export default {
diff --git a/mallplusui-uniapp-app/pages/order/orderDetail.vue b/mallplusui-uniapp-app/pages/order/orderDetail.vue
index 59c9486..0852118 100644
--- a/mallplusui-uniapp-app/pages/order/orderDetail.vue
+++ b/mallplusui-uniapp-app/pages/order/orderDetail.vue
@@ -77,7 +77,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import Json from '@/Json';
 import { formatDate } from '@/common/date';
diff --git a/mallplusui-uniapp-app/pages/set/set.vue b/mallplusui-uniapp-app/pages/set/set.vue
index d3d2af5..7e15845 100644
--- a/mallplusui-uniapp-app/pages/set/set.vue
+++ b/mallplusui-uniapp-app/pages/set/set.vue
@@ -1,33 +1,35 @@
 <template>
 	<view class="container">
-		<view class="list-cell b-b m-t" @click="navTo('../../pagesU/user/profile')" hover-class="cell-hover" :hover-stay-time="50">
+		<view class="list-cell b-b m-t" @click="navTo('../../pagesU/user/profile')" hover-class="cell-hover"
+			:hover-stay-time="50">
 			<text class="cell-tit">个人资料</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view>
-		<view class="list-cell b-b" @click="navTo('../../pagesU/address/address')" hover-class="cell-hover" :hover-stay-time="50">
+		<view class="list-cell b-b" @click="navTo('../../pagesU/address/address')" hover-class="cell-hover"
+			:hover-stay-time="50">
 			<text class="cell-tit">收货地址</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view>
-		<view class="list-cell" @click="navTo('/pages/set/certification')" hover-class="cell-hover" :hover-stay-time="50">
+		<!-- <view class="list-cell" @click="navTo('/pages/set/certification')" hover-class="cell-hover" :hover-stay-time="50">
 			<text class="cell-tit">实名认证</text>
 			<text class="cell-more yticon icon-you"></text>
-		</view>
+		</view> -->
 
-		<view class="list-cell m-t">
+		<!-- 	<view class="list-cell m-t">
 			<text class="cell-tit">消息推送</text>
 			<switch checked color="#fa436a" @change="switchChange" />
 		</view>
 		<view class="list-cell m-t b-b" @click="navTo('清除缓存')" hover-class="cell-hover" :hover-stay-time="50">
 			<text class="cell-tit">清除缓存</text>
 			<text class="cell-more yticon icon-you"></text>
-		</view>
+		</view> -->
 		<!-- <view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
 			<text class="cell-tit">关于{{ sysInfo.name }}</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view> -->
 		<view class="list-cell" @click="updateApp()">
 			<text class="cell-tit">检查更新</text>
-			<!-- <text class="cell-tip">当前版本 {{sysInfo.version}}</text> -->
+			<text class="cell-tip">v {{version}}</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view>
 		<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>
@@ -36,114 +38,133 @@
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import { mapMutations } from 'vuex';
-import APPUpdate from '../../plugins/APPUpdate/index.js'
-
-export default {
-	components: {
-		mallplusCopyright
-	},
-	data() {
-		return {
-			sysInfo: '',
-			userInfo:{}
-		};
-	},
-	onLoad() {
-		this.sysInfo = this.$db.get('sysInfo');
-	},
-	methods: {
-		...mapMutations(['logout']),
-
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
-			this.$api.msg(`跳转到${url}`);
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import {
+		mapMutations
+	} from 'vuex';
+	import APPUpdate, {
+		getCurrentNo
+	} from '../../plugins/APPUpdate/index.js'
+
+	export default {
+		components: {
+			mallplusCopyright
 		},
-		//退出登录
-		toLogout() {
-			uni.showModal({
-				content: '确定要退出登录么',
-				success: e => {
-					if (e.confirm) {
-						this.logout();
-						this.$db.del('userInfos');
-						this.$db.del('token');
-						Api.apiCall('post', Api.index.logout, {});
-						setTimeout(() => {
-							uni.navigateBack();
-						}, 200);
-					}
-				}
-			});
+		data() {
+			return {
+				versionCode: "",
+				version: "",
+			};
 		},
-		//switch
-		switchChange(e) {
-			let statusTip = e.detail.value ? '打开' : '关闭';
-			this.$api.msg(`${statusTip}消息推送`);
+		onLoad() {
+			let that = this;
+			getCurrentNo(version => {
+				that.version = version.version
+				console.log("qqqq", that.version)
+			})
+
 		},
-		updateApp() {
-			// true 没有新版本的时候有提示，默认：false
-			APPUpdate(true);
+		methods: {
+			...mapMutations(['logout']),
+
+			navTo(url) {
+				uni.navigateTo({
+					url: url
+				});
+				// this.$api.msg(`跳转到${url}`);
+			},
+			//退出登录
+			toLogout() {
+				uni.showModal({
+					content: '确定要退出登录么',
+					success: e => {
+						if (e.confirm) {
+							this.logout();
+							this.$db.del('token');
+							Api.apiCall('post', Api.index.logout, {});
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 200);
+						}
+					}
+				});
+			},
+			//switch
+			switchChange(e) {
+				let statusTip = e.detail.value ? '打开' : '关闭';
+				this.$api.msg(`${statusTip}消息推送`);
+			},
+			updateApp() {
+				console.log("qqqq", 11111111111111111);
+				// true 没有新版本的时候有提示，默认：false
+				APPUpdate(true);
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-}
-.list-cell {
-	display: flex;
-	align-items: baseline;
-	padding: 20upx;
-	line-height: 60upx;
-	position: relative;
-	background: #fff;
-	justify-content: center;
-	&.log-out-btn {
-		margin-top: 40upx;
-		border-radius: 50upx;
-		width: 95%;
-		margin-left: 2.5%;
-		background: $uni-color-primary;
+	page {
+		background: $page-color-base;
+	}
+
+	.list-cell {
+		display: flex;
+		align-items: baseline;
+		padding: 20upx;
+		line-height: 60upx;
+		position: relative;
+		background: #fff;
+		justify-content: center;
+
+		&.log-out-btn {
+			margin-top: 40upx;
+			border-radius: 50upx;
+			width: 95%;
+			margin-left: 2.5%;
+			background: $uni-color-primary;
+
+			.cell-tit {
+				color: #ffffff;
+				text-align: center;
+				margin-right: 0;
+			}
+		}
+
+		&.cell-hover {
+			background: #fafafa;
+		}
+
+		&.b-b:after {
+			left: 30upx;
+		}
+
+		&.m-t {
+			margin-top: 16upx;
+		}
+
+		.cell-more {
+			align-self: baseline;
+			font-size: $font-lg;
+			color: $font-color-light;
+			margin-left: 10upx;
+		}
+
 		.cell-tit {
-			color: #ffffff;
-			text-align: center;
-			margin-right: 0;
+			flex: 1;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 10upx;
+		}
+
+		.cell-tip {
+			font-size: $font-base;
+			color: $font-color-light;
+		}
+
+		switch {
+			transform: translateX(16upx) scale(0.84);
 		}
 	}
-	&.cell-hover {
-		background: #fafafa;
-	}
-	&.b-b:after {
-		left: 30upx;
-	}
-	&.m-t {
-		margin-top: 16upx;
-	}
-	.cell-more {
-		align-self: baseline;
-		font-size: $font-lg;
-		color: $font-color-light;
-		margin-left: 10upx;
-	}
-	.cell-tit {
-		flex: 1;
-		font-size: $font-base + 2upx;
-		color: $font-color-dark;
-		margin-right: 10upx;
-	}
-	.cell-tip {
-		font-size: $font-base;
-		color: $font-color-light;
-	}
-	switch {
-		transform: translateX(16upx) scale(0.84);
-	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pagesA/after_sale/list.vue b/mallplusui-uniapp-app/pagesA/after_sale/list.vue
index 5e6dfa5..460d9a0 100644
--- a/mallplusui-uniapp-app/pagesA/after_sale/list.vue
+++ b/mallplusui-uniapp-app/pagesA/after_sale/list.vue
@@ -55,7 +55,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { formatDate } from '@/common/date';
 export default {
diff --git a/mallplusui-uniapp-app/pagesA/build/community.vue b/mallplusui-uniapp-app/pagesA/build/community.vue
index a95515d..5015ec6 100644
--- a/mallplusui-uniapp-app/pagesA/build/community.vue
+++ b/mallplusui-uniapp-app/pagesA/build/community.vue
@@ -117,7 +117,7 @@
 		mapState
 	} from 'vuex';
 	import navBar from '@/components/zhouWei-navBar';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 	export default {
 		components: {
 			coupon,
diff --git a/mallplusui-uniapp-app/pagesA/build/communityList.vue b/mallplusui-uniapp-app/pagesA/build/communityList.vue
index 0b65e86..d8ecba5 100644
--- a/mallplusui-uniapp-app/pagesA/build/communityList.vue
+++ b/mallplusui-uniapp-app/pagesA/build/communityList.vue
@@ -42,7 +42,7 @@
 <script>
 	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 	import Api from '@/common/api';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 	export default {
 		components: {
 			uniLoadMore
diff --git a/mallplusui-uniapp-app/pagesA/build/floorList.vue b/mallplusui-uniapp-app/pagesA/build/floorList.vue
index d4e227a..becd38a 100644
--- a/mallplusui-uniapp-app/pagesA/build/floorList.vue
+++ b/mallplusui-uniapp-app/pagesA/build/floorList.vue
@@ -31,7 +31,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		uniLoadMore
diff --git a/mallplusui-uniapp-app/pagesA/build/groupList.vue b/mallplusui-uniapp-app/pagesA/build/groupList.vue
index 4eee316..fae3b4b 100644
--- a/mallplusui-uniapp-app/pagesA/build/groupList.vue
+++ b/mallplusui-uniapp-app/pagesA/build/groupList.vue
@@ -42,7 +42,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		uniLoadMore
diff --git a/mallplusui-uniapp-app/pagesA/product/discountList.vue b/mallplusui-uniapp-app/pagesA/product/discountList.vue
index b552d5a..d4020ab 100644
--- a/mallplusui-uniapp-app/pagesA/product/discountList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/discountList.vue
@@ -42,7 +42,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		uniLoadMore
diff --git a/mallplusui-uniapp-app/pagesA/product/giftList.vue b/mallplusui-uniapp-app/pagesA/product/giftList.vue
index 2c616d3..3d908c1 100644
--- a/mallplusui-uniapp-app/pagesA/product/giftList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/giftList.vue
@@ -43,7 +43,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 	mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue b/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
index 24e9680..27fb631 100644
--- a/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
@@ -30,7 +30,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 	mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesA/product/groupList.vue b/mallplusui-uniapp-app/pagesA/product/groupList.vue
index 832da08..a2c825c 100644
--- a/mallplusui-uniapp-app/pagesA/product/groupList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/groupList.vue
@@ -43,7 +43,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 	mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesA/product/list.vue b/mallplusui-uniapp-app/pagesA/product/list.vue
index 16d763f..248e55c 100644
--- a/mallplusui-uniapp-app/pagesA/product/list.vue
+++ b/mallplusui-uniapp-app/pagesA/product/list.vue
@@ -70,7 +70,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue b/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
index d9afddf..2f07b72 100644
--- a/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
@@ -43,7 +43,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 	mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesA/product/product.vue b/mallplusui-uniapp-app/pagesA/product/product.vue
index 5aad7af..2468edc 100644
--- a/mallplusui-uniapp-app/pagesA/product/product.vue
+++ b/mallplusui-uniapp-app/pagesA/product/product.vue
@@ -3,7 +3,9 @@
 		<view class="carousel">
 			<swiper indicator-dots circular="true" duration="400">
 				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
-					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+					<view class="image-wrapper">
+						<image :src="item" class="loaded" mode="aspectFill"></image>
+					</view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -12,12 +14,14 @@
 			<text class="title">{{ goods.name }}</text>
 			<view class="price-box">
 				<!-- <text class="price-tip">惠农价</text> -->
-				<text class="price" v-if="goods.vipPrice && goods.vipPrice > 0">惠农价¥{{ (goods.price * goods.memberRate) / 10 }}</text>
-				<text class="price" v-else-if="!goods.vipPrice">惠农价¥{{ goods.originalPrice }}</text>
-				<text class="m-price" v-if="!goods.vipPrice">市场价¥{{ goods.price }}</text>
-				<text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">¥{{ goods.price }}</text>
+			<!-- 	<text class="price"
+					v-if="goods.vipPrice && goods.vipPrice > 0">惠农价¥{{ (goods.price * goods.memberRate) / 10 }}</text> -->
+				<text class="price" >惠农价¥{{ goods.originalPrice }}</text>
+				<text class="m-price" >市场价¥{{ goods.price }}</text>
+				<!-- <text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">市场价¥{{ goods.price }}</text> -->
 				<text class="price">优惠¥{{ (goods.price - goods.originalPrice) | formatNumber}}</text>
-				<text class="coupon-tip" v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text>
+			<!-- 	<text class="coupon-tip"
+					v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text> -->
 			</view>
 			<view class="bot-row">
 				<text>销量: {{ goods.sale }}</text>
@@ -25,7 +29,7 @@
 				<text>浏览量: {{ goods.hit }}</text>
 			</view>
 		</view>
-		<view class="share-section" @click="navToTabPageStore(goods.storeId)">
+		<!-- <view class="share-section" @click="navToTabPageStore(goods.storeId)">
 			<view class="share-icon">
 				<text class="yticon icon-xingxing"></text>
 				铺
@@ -39,7 +43,7 @@
 		</view>
 
 		<!--分享-->
-		<view class="share-section" @click="share">
+		<!-- <view class="share-section" @click="share">
 			<view class="share-icon">
 				<text class="yticon icon-xingxing"></text>
 				返
@@ -50,13 +54,14 @@
 				立即分享
 				<text class="yticon icon-you"></text>
 			</view>
-		</view>
+		</view> --> 
 
 		<view class="c-list">
 			<view class="c-row b-b" v-if="skuList && skuList.length > 0" @click="toggleSpec">
 				<text class="tit">规格</text>
 				<view class="con">
-					<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+					<text class="selected-text" v-for="(sItem, sIndex) in specSelected"
+						:key="sIndex">{{ sItem.name }}</text>
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
@@ -124,8 +129,8 @@
 			</view>
 
 			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(goods)">立即购买</button>
 				<button type="primary" class=" action-btn no-border add-cart-btn" @click="addCart(goods)">加入购物车</button>
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(goods)">立即购买</button>
 			</view>
 		</view>
 
@@ -161,21 +166,17 @@
 						<text class="stock">库存：{{ sku.stock }}件</text>
 						<view class="selected">
 							已选：
-							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+							<text class="selected-text" v-for="(sItem, sIndex) in specSelected"
+								:key="sIndex">{{ sItem.name }}</text>
 						</view>
 					</view>
 				</view>
 				<view v-for="(item, index) in specList" :key="index" class="attr-list">
 					<text>{{ item.name }}</text>
 					<view class="item-list">
-						<text
-							v-for="(childItem, childIndex) in specChildList"
-							v-if="childItem.pid === item.id"
-							:key="childIndex"
-							class="tit"
-							:class="{ selected: childItem.selected }"
-							@click="selectSpec(childIndex, childItem.pid)"
-						>
+						<text v-for="(childItem, childIndex) in specChildList" v-if="childItem.pid === item.id"
+							:key="childIndex" class="tit" :class="{ selected: childItem.selected }"
+							@click="selectSpec(childIndex, childItem.pid)">
 							{{ childItem.name }}
 						</text>
 					</view>
@@ -189,1098 +190,1242 @@
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import share from '@/components/share';
-import { mapState } from 'vuex';
-import { formatDate } from '@/common/date';
-
-export default {
-	components: {
-		share
-	},
-	data() {
-		return {
-			maskState: 0, //优惠券面板显示状态
-			specClass: 'none',
-			specSelected: [],
-			small: null,
-			sku: [],
-			detailData: [],
-			serviceList: [],
-			goods: [],
-			favorite: true,
-			shareList: [],
-			consultList: [],
-			couponList: [],
-			basicMarkingList: [],
-			basicGiftsList: [],
-			consultCount: {
-				all: 0,
-				bad: 0,
-				general: 0,
-				goods: 0
-			},
-			imgList: [
-				{
-					src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
-				},
-				{
-					src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import share from '@/components/share';
+	import {
+		mapState
+	} from 'vuex';
+	import {
+		formatDate
+	} from '@/common/date';
+
+	export default {
+		components: {
+			share
+		},
+		data() {
+			return {
+				maskState: 0, //优惠券面板显示状态
+				specClass: 'none',
+				specSelected: [],
+				small: null,
+				sku: [],
+				detailData: [],
+				serviceList: [],
+				goods: [],
+				favorite: true,
+				shareList: [],
+				consultList: [],
+				couponList: [],
+				basicMarkingList: [],
+				basicGiftsList: [],
+				consultCount: {
+					all: 0,
+					bad: 0,
+					general: 0,
+					goods: 0
 				},
-				{
-					src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
-				}
-			],
-			desc: '',
-			skuList: [],
-			specList: [],
-			specChildList: []
-		};
-	},
-	async onLoad(ops) {
-		//接收传值,id里面放的是标题，因为测试数据并没写id
-		let id = ops.id;
-		if (id) {
-			this.logining = true;
-			let params = { id: ops.id };
-			let data = await Api.apiCall('get', Api.goods.goodsDetail, params);
-			this.logining = false;
-
-			if (data) {
-				let detailData = data.goods;
-				let goods = detailData.goods;
-				this.goods = goods;
-				this.favorite = data.favorite;
-				this.typeGoodsList = detailData.typeGoodsList;
-				var subImages = goods.albumPics;
-				this.desc = goods.detailHtml;
-				this.small = subImages.split(',');
-				//await this.$api.json('detailData');
-				let shareList = await this.$api.json('shareList');
-				this.loaded = true;
-
-				var sers = goods.serviceIds;
-				if (sers && sers.indexOf('1') != -1) {
-					this.serviceList.push('无忧退货');
-				}
-				if (sers && sers.indexOf('2') != -1) {
-					this.serviceList.push('快速退款');
-				}
-				if (sers && sers.indexOf('3') != -1) {
-					this.serviceList.push('正品保证');
-				}
-				this.shareList = shareList;
-				this.specList = detailData.productAttributeValueList;
-				this.skuList = detailData.skuStockList;
-				if (this.specList) {
-					this.specList.forEach(item => {
-						let valuesA = item.value.split(',');
-						if (valuesA) {
-							for (let cItem of valuesA) {
-								let att = {};
-								att.pid = item.id;
-								att.name = cItem;
-								this.specChildList.push(att);
+				imgList: [{
+						src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
+					},
+					{
+						src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+					},
+					{
+						src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
+					}
+				],
+				desc: '',
+				skuList: [],
+				specList: [],
+				specChildList: []
+			};
+		},
+		async onLoad(ops) {
+			//接收传值,id里面放的是标题，因为测试数据并没写id
+			let id = ops.id;
+			if (id) {
+				this.logining = true;
+				let params = {
+					id: ops.id
+				};
+				let data = await Api.apiCall('get', Api.goods.goodsDetail, params);
+				this.logining = false;
+
+				if (data) {
+					let detailData = data.goods;
+					let goods = detailData.goods;
+					this.goods = goods;
+					this.favorite = data.favorite;
+					this.typeGoodsList = detailData.typeGoodsList;
+					var subImages = goods.albumPics;
+					this.desc = goods.detailHtml;
+					this.small = subImages.split(',');
+					//await this.$api.json('detailData');
+					let shareList = await this.$api.json('shareList');
+					this.loaded = true;
+
+					var sers = goods.serviceIds;
+					if (sers && sers.indexOf('1') != -1) {
+						this.serviceList.push('无忧退货');
+					}
+					if (sers && sers.indexOf('2') != -1) {
+						this.serviceList.push('快速退款');
+					}
+					if (sers && sers.indexOf('3') != -1) {
+						this.serviceList.push('正品保证');
+					}
+					this.shareList = shareList;
+					this.specList = detailData.productAttributeValueList;
+					this.skuList = detailData.skuStockList;
+					if (this.specList) {
+						this.specList.forEach(item => {
+							let valuesA = item.value.split(',');
+							if (valuesA) {
+								for (let cItem of valuesA) {
+									let att = {};
+									att.pid = item.id;
+									att.name = cItem;
+									this.specChildList.push(att);
+								}
 							}
-						}
+						});
+					}
+
+					uni.setNavigationBarTitle({
+						title: goods.name
 					});
 				}
+				if (this.hasLogin) {
+					let params = {
+						goodsId: ops.id,
+						pic: this.goods.pic
+					};
+					await Api.apiCall('post', Api.goods.addView, params);
+				}
+				let params1 = {
+					goodsId: ops.id
+				};
+				let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
+				this.consultList = consoltL.list;
+				this.consultCount = consoltL.count;
 
-				uni.setNavigationBarTitle({
-					title: goods.name
-				});
+				let params3 = {};
+				let couponList1 = await Api.apiCall('get', Api.index.couponList, params3);
+				this.couponList = couponList1;
 			}
-			if (this.hasLogin) {
-				let params = { goodsId: ops.id, pic: this.goods.pic };
-				await Api.apiCall('post', Api.goods.addView, params);
-			}
-			let params1 = { goodsId: ops.id };
-			let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
-			this.consultList = consoltL.list;
-			this.consultCount = consoltL.count;
-
-			let params3 = {};
-			let couponList1 = await Api.apiCall('get', Api.index.couponList, params3);
-			this.couponList = couponList1;
-		}
 
-		//规格 默认选中第一条
-		if (this.specList) {
-			var specs = '';
-			this.specList.forEach(item => {
-				for (let cItem of this.specChildList) {
-					if (cItem.pid === item.id) {
-						this.$set(cItem, 'selected', true);
-						this.specSelected.push(cItem);
-						specs = cItem.name + ',' + specs;
-						break; //forEach不能使用break
+			//规格 默认选中第一条
+			if (this.specList) {
+				var specs = '';
+				this.specList.forEach(item => {
+					for (let cItem of this.specChildList) {
+						if (cItem.pid === item.id) {
+							this.$set(cItem, 'selected', true);
+							this.specSelected.push(cItem);
+							specs = cItem.name + ',' + specs;
+							break; //forEach不能使用break
+						}
 					}
-				}
-			});
-			let valuesA = specs.substr(0, specs.length - 1).split(',');
-
-			this.skuList.forEach(item => {
-				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
-					this.sku = item;
-				}
-				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
-					this.sku = item;
-				}
-				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
-					this.sku = item;
-				}
-				if (!this.sku.pic) {
-					this.sku.pic = this.goods.pic;
-				}
-				if (!this.sku.stock) {
-					this.sku.stock = 0;
-				}
-				this.goods.price = this.sku.price;
-			});
-		}
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
-	},
-	filters: {
-		/**
-		 * 处理富文本里的图片宽度自适应
-		 * 1.去掉img标签里的style、width、height属性
-		 * 2.img标签添加style属性：max-width:100%;height:auto
-		 * 3.修改所有style里的width属性为max-width:100%
-		 * 4.去掉<br/>标签
-		 * @param html
-		 * @returns {void|string|*}
-		 */
-		formatRichText(html) {
-			//控制小程序中图片大小
-			if (html) {
-				let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
-					match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
-					match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-					match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
-					return match;
 				});
-				newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
-					match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
-					return match;
+				let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+				this.skuList.forEach(item => {
+					if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+						this.sku = item;
+					}
+					if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+						this.sku = item;
+					}
+					if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 ==
+						valuesA[2]) {
+						this.sku = item;
+					}
+					if (!this.sku.pic) {
+						this.sku.pic = this.goods.pic;
+					}
+					if (!this.sku.stock) {
+						this.sku.stock = 0;
+					}
+					this.goods.price = this.sku.price;
 				});
-				newContent = newContent.replace(/<br[^>]*\/>/gi, '');
-				newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
-				return newContent;
-			} else {
-				return '暂无商品详情';
 			}
 		},
-		formatCreateTime(time) {
-			let date = new Date(time);
-			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
-		},
-		
-		formatNumber(number) {
-			return new Number(number).toFixed(2);
-		}
-	},
-	methods: {
-		navToTabPageStore(item) {
-			let id = item;
-			uni.navigateTo({
-				url: `../../pagesC/store/store?id=${id}`
-			});
-		},
-		toggleMask(type) {
-			let timer = type === 'show' ? 10 : 300;
-			let state = type === 'show' ? 1 : 0;
-			this.maskState = 2;
-			setTimeout(() => {
-				this.maskState = state;
-			}, timer);
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
 		},
-		//领取优惠券
-		async obtainCoupon(index) {
-			if (!this.hasLogin) {
-				this.$api.msg('请先登录');
-			}
-			uni.showLoading({
-				title: '请稍后'
-			});
-
-			let params = { couponId: index.id };
-			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
-			console.log(data);
-			if (data) {
-				this.$api.msg(data);
-				this.toggleMask();
+		filters: {
+			/**
+			 * 处理富文本里的图片宽度自适应
+			 * 1.去掉img标签里的style、width、height属性
+			 * 2.img标签添加style属性：max-width:100%;height:auto
+			 * 3.修改所有style里的width属性为max-width:100%
+			 * 4.去掉<br/>标签
+			 * @param html
+			 * @returns {void|string|*}
+			 */
+			formatRichText(html) {
+				//控制小程序中图片大小
+				if (html) {
+					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
+						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						return match;
+					});
+					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
+						match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
+							'max-width:100%;');
+						return match;
+					});
+					newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+					newContent = newContent.replace(/\<img/gi,
+						'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+					return newContent;
+				} else {
+					return '暂无商品详情';
+				}
+			},
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+
+			formatNumber(number) {
+				return new Number(number).toFixed(2);
 			}
-			uni.hideLoading();
 		},
-		//规格弹窗开关
-		toggleSpec() {
-			if (this.specClass === 'show') {
-				this.specClass = 'hide';
+		methods: {
+			navToTabPageStore(item) {
+				let id = item;
+				uni.navigateTo({
+					url: `../../pagesC/store/store?id=${id}`
+				});
+			},
+			toggleMask(type) {
+				let timer = type === 'show' ? 10 : 300;
+				let state = type === 'show' ? 1 : 0;
+				this.maskState = 2;
 				setTimeout(() => {
-					this.specClass = 'none';
-				}, 250);
-			} else if (this.specClass === 'none') {
-				this.specClass = 'show';
-			}
-		},
-		//选择规格
-		selectSpec(index, pid) {
-			let list = this.specChildList;
-			list.forEach(item => {
-				if (item.pid === pid) {
-					this.$set(item, 'selected', false);
+					this.maskState = state;
+				}, timer);
+			},
+			//领取优惠券
+			async obtainCoupon(index) {
+				if (!this.hasLogin) {
+					this.$api.msg('请先登录');
 				}
-			});
+				uni.showLoading({
+					title: '请稍后'
+				});
 
-			this.$set(list[index], 'selected', true);
-			//存储已选择
-			/**
-			 * 修复选择规格存储错误
-			 * 将这几行代码替换即可
-			 * 选择的规格存放在specSelected中
-			 */
-			var specs = '';
-			this.specSelected = [];
-			list.forEach(item => {
-				if (item.selected === true) {
-					this.specSelected.push(item);
-					specs = item.name + ',' + specs;
+				let params = {
+					couponId: index.id
+				};
+				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+					this.toggleMask();
+				}
+				uni.hideLoading();
+			},
+			//规格弹窗开关
+			toggleSpec() {
+				if (this.specClass === 'show') {
+					this.specClass = 'hide';
+					setTimeout(() => {
+						this.specClass = 'none';
+					}, 250);
+				} else if (this.specClass === 'none') {
+					this.specClass = 'show';
 				}
-			});
-			let valuesA = specs.substr(0, specs.length - 1).split(',');
-			this.sku = null;
-			this.skuList.forEach(item => {
-				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
-					this.sku = item;
+			},
+			//选择规格
+			selectSpec(index, pid) {
+				let list = this.specChildList;
+				list.forEach(item => {
+					if (item.pid === pid) {
+						this.$set(item, 'selected', false);
+					}
+				});
+
+				this.$set(list[index], 'selected', true);
+				//存储已选择
+				/**
+				 * 修复选择规格存储错误
+				 * 将这几行代码替换即可
+				 * 选择的规格存放在specSelected中
+				 */
+				var specs = '';
+				this.specSelected = [];
+				list.forEach(item => {
+					if (item.selected === true) {
+						this.specSelected.push(item);
+						specs = item.name + ',' + specs;
+					}
+				});
+				let valuesA = specs.substr(0, specs.length - 1).split(',');
+				this.sku = null;
+				this.skuList.forEach(item => {
+					if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+						this.sku = item;
+					}
+					if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+						this.sku = item;
+					}
+					if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 ==
+						valuesA[2]) {
+						this.sku = item;
+					}
+				});
+				if (!this.sku) {
+					uni.showToast({
+						title: '商品不存在！'
+					});
 				}
-				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
-					this.sku = item;
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
 				}
-				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
-					this.sku = item;
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
 				}
-			});
-			if (!this.sku) {
-				uni.showToast({ title: '商品不存在！' });
-			}
-			if (!this.sku.pic) {
-				this.sku.pic = this.goods.pic;
-			}
-			if (!this.sku.stock) {
-				this.sku.stock = 0;
-			}
 
-			this.goods.price = this.sku.price;
+				this.goods.price = this.sku.price;
 
-			console.log(this.sku);
-		},
-		//分享
-		share() {
-			var title = this.goods.name;
-			var imgUrl = this.small[0];
-			var href = 'http://www.yyundong.com:8088/h5/index.html#/pagesA/product/product?id=' + this.goods.id;
-			//var href = 'http://192.168.0.107:8084/#/pagesA/product/product?id=' + this.goods.id;
-			this.$refs.share.toggleMask(title, imgUrl, href);
-		},
-		//收藏
-		toFavorite(item) {
-			if (!this.hasLogin) {
-				let url = '/pages/public/login';
-				uni.navigateTo({
-					url
-				});
-			} else {
-				this.favorite = !this.favorite;
-				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
-				Api.apiCall('post', Api.goods.favoriteSave, params);
-			}
-		},
-		async buy(item) {
-			if (!this.hasLogin) {
-				let url = '/pages/public/login';
-				uni.navigateTo({
-					url
-				});
-				return;
-			}
-			let userInfo = uni.getStorageSync('userInfo');
-			if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
-				uni.showToast({ title: '不能购买自己店铺的商品！' });
-				return;
-			}
-			let data;
-			let id = item.id;
-			console.log(id);
-			if (this.sku && this.sku.id) {
 				console.log(this.sku);
-				console.log(this.sku.stock);
-				if (this.sku.stock < 1) {
-					uni.showToast({ title: '库存不够！' });
+			},
+			//分享
+			share() {
+				var title = this.goods.name;
+				var imgUrl = this.small[0];
+				var href = 'http://www.yyundong.com:8088/h5/index.html#/pagesA/product/product?id=' + this.goods.id;
+				//var href = 'http://192.168.0.107:8084/#/pagesA/product/product?id=' + this.goods.id;
+				this.$refs.share.toggleMask(title, imgUrl, href);
+			},
+			//收藏
+			toFavorite(item) {
+				if (!this.hasLogin) {
+					let url = '/pages/public/login';
+					uni.navigateTo({
+						url
+					});
+				} else {
+					this.favorite = !this.favorite;
+					let params = {
+						objId: item.id,
+						type: 1,
+						name: item.name,
+						meno1: item.pic,
+						meno2: item.price,
+						meno3: item.sale
+					};
+					Api.apiCall('post', Api.goods.favoriteSave, params);
+				}
+			},
+			async buy(item) {
+				if (!this.hasLogin) {
+					let url = '/pages/public/login';
+					uni.navigateTo({
+						url
+					});
 					return;
 				}
-				let params = { goodsId: id, skuId: this.sku.id };
-				// data = await Api.apiCall('post', Api.order.addCart, params);
-				let dataJson = {};
-
-				dataJson.goodsId = this.goods.id;
-
-				dataJson.type = 1;
-				dataJson.skuId = this.sku.id;
-				let url = '/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson);
-
-				uni.navigateTo({
-					url: url
-				});
-			} else {
-				if (this.goods.stock < 1) {
-					uni.showToast({ title: '库存不够！' });
+				let userInfo = uni.getStorageSync('userInfo');
+				if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
+					uni.showToast({
+						title: '不能购买自己店铺的商品！'
+					});
 					return;
 				}
-				let params = { goodsId: id };
-				//	data = await Api.apiCall('post', Api.order.addCart, params);
-				let dataJson = {};
+				let data;
+				let id = item.id;
+				console.log(id);
+				if (this.sku && this.sku.id) {
+					console.log(this.sku);
+					console.log(this.sku.stock);
+					if (this.sku.stock < 1) {
+						uni.showToast({
+							title: '库存不够！'
+						});
+						return;
+					}
+					let params = {
+						goodsId: id,
+						skuId: this.sku.id
+					};
+					// data = await Api.apiCall('post', Api.order.addCart, params);
+					let dataJson = {};
+
+					dataJson.goodsId = this.goods.id;
 
-				dataJson.goodsId = this.goods.id;
+					dataJson.type = 1;
+					dataJson.skuId = this.sku.id;
+					let url = '/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson);
 
-				dataJson.type = 1;
+					uni.navigateTo({
+						url: url
+					});
+				} else {
+					if (this.goods.stock < 1) {
+						uni.showToast({
+							title: '库存不够！'
+						});
+						return;
+					}
+					let params = {
+						goodsId: id
+					};
+					//	data = await Api.apiCall('post', Api.order.addCart, params);
+					let dataJson = {};
 
-				let url = '/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson);
+					dataJson.goodsId = this.goods.id;
 
-				uni.navigateTo({
-					url: url
-				});
-			}
-		},
-		async addCart(item) {
-			if (!this.hasLogin) {
-				let url = '/pages/public/login';
-				uni.navigateTo({
-					url
-				});
-				return false;
-			}
-			let userInfo = uni.getStorageSync('userInfo');
-			console.log(userInfo);
-			console.log(this.goods.storeId);
-			if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
-				uni.showToast({ title: '不能购买自己店铺的商品！' });
-				return;
-			}
-			let id = item.id;
-			let data;
+					dataJson.type = 1;
 
-			if (this.sku && this.sku.id) {
-				if (this.sku.stock < 1) {
-					uni.showToast({ title: '库存不够！' });
-					return;
+					let url = '/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson);
+
+					uni.navigateTo({
+						url: url
+					});
+				}
+			},
+			async addCart(item) {
+				if (!this.hasLogin) {
+					let url = '/pages/public/login';
+					uni.navigateTo({
+						url
+					});
+					return false;
 				}
-				let params = { goodsId: id, skuId: this.sku.id };
-				data = await Api.apiCall('post', Api.order.addCart, params);
-			} else {
-				if (this.goods.stock < 1) {
-					uni.showToast({ title: '库存不够！' });
+				let userInfo = uni.getStorageSync('userInfo');
+				console.log(userInfo);
+				console.log(this.goods.storeId);
+				if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
+					uni.showToast({
+						title: '不能购买自己店铺的商品！'
+					});
 					return;
 				}
-				let params = { goodsId: id };
-				data = await Api.apiCall('post', Api.order.addCart, params);
-			}
-			console.log("data=========:"+data)
-			if (data) {
-				this.$api.msg('添加购物车成功!');
-			} else {
-				this.$api.msg('加入购物车错误');
-			}
-		},
-		stopPrevent() {}
-	}
-};
+				let id = item.id;
+				let data;
+
+				if (this.sku && this.sku.id) {
+					if (this.sku.stock < 1) {
+						uni.showToast({
+							title: '库存不够！'
+						});
+						return;
+					}
+					let params = {
+						goodsId: id,
+						skuId: this.sku.id
+					};
+					data = await Api.apiCall('post', Api.order.addCart, params);
+				} else {
+					if (this.goods.stock < 1) {
+						uni.showToast({
+							title: '库存不够！'
+						});
+						return;
+					}
+					let params = {
+						goodsId: id
+					};
+					data = await Api.apiCall('post', Api.order.addCart, params);
+				}
+				console.log("data=========:" + data)
+				if (data) {
+					this.$api.msg('添加购物车成功!');
+				} else {
+					this.$api.msg('加入购物车错误');
+				}
+			},
+			stopPrevent() {}
+		}
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-	padding-bottom: 160upx;
-}
-.icon-you {
-	font-size: $font-base + 2upx;
-	color: #888;
-}
-.carousel {
-	height: 722upx;
-	position: relative;
-	swiper {
-		height: 100%;
+	page {
+		background: $page-color-base;
+		padding-bottom: 160upx;
 	}
-	.image-wrapper {
-		width: 100%;
-		height: 100%;
+
+	.icon-you {
+		font-size: $font-base + 2upx;
+		color: #888;
 	}
-	.swiper-item {
-		display: flex;
-		justify-content: center;
-		align-content: center;
-		height: 750upx;
-		overflow: hidden;
-		image {
-			width: 100%;
+
+	.carousel {
+		height: 722upx;
+		position: relative;
+
+		swiper {
 			height: 100%;
 		}
-	}
-}
-
-/* 标题简介 */
-.introduce-section {
-	background: #fff;
-	padding: 20upx;
-
-	.title {
-		font-size: 32upx;
-		color: $font-color-dark;
-		height: 50upx;
-		line-height: 50upx;
-	}
-	.price-box {
-		display: flex;
-		align-items: baseline;
-		height: 64upx;
-		padding: 10upx 0;
-		font-size: 26upx;
-		color: $uni-color-primary;
-	}
-	.price {
-		font-size: $font-lg + 2upx;
-	}
-	.m-price {
-		margin: 0 12upx;
-		color: $font-color-light;
-	}
-	.coupon-tip {
-		align-items: center;
-		padding: 4upx 10upx;
-		background: $uni-color-primary;
-		font-size: $font-sm;
-		color: #fff;
-		border-radius: 6upx;
-		line-height: 1;
-		transform: translateY(-4upx);
-	}
-	.bot-row {
-		display: flex;
-		align-items: center;
-		height: 50upx;
-		font-size: $font-sm;
-		color: $font-color-light;
-		text {
-			flex: 1;
+
+		.image-wrapper {
+			width: 100%;
+			height: 100%;
 		}
-	}
-}
-/* 分享 */
-.share-section {
-	display: flex;
-	align-items: center;
-	color: $font-color-base;
-	background: linear-gradient(left, #fdf5f6, #fbebf6);
-	padding: 12upx 30upx;
-	.share-icon {
-		display: flex;
-		align-items: center;
-		width: 70upx;
-		height: 30upx;
-		line-height: 1;
-		border: 1px solid $uni-color-primary;
-		border-radius: 4upx;
-		position: relative;
-		overflow: hidden;
-		font-size: 22upx;
-		color: $uni-color-primary;
-		&:after {
-			content: '';
-			width: 50upx;
-			height: 50upx;
-			border-radius: 50%;
-			left: -20upx;
-			top: -12upx;
-			position: absolute;
-			background: $uni-color-primary;
+
+		.swiper-item {
+			display: flex;
+			justify-content: center;
+			align-content: center;
+			height: 750upx;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
-	.icon-xingxing {
-		position: relative;
-		z-index: 1;
-		font-size: 24upx;
-		margin-left: 2upx;
-		margin-right: 10upx;
-		color: #fff;
-		line-height: 1;
-	}
-	.tit {
-		font-size: $font-base;
-		margin-left: 10upx;
-	}
-	.icon-bangzhu1 {
-		padding: 10upx;
-		font-size: 30upx;
-		line-height: 1;
-	}
-	.share-btn {
-		flex: 1;
-		text-align: right;
-		font-size: $font-sm;
-		color: $uni-color-primary;
-	}
-	.icon-you {
-		font-size: $font-sm;
-		margin-left: 4upx;
-		color: $uni-color-primary;
-	}
-}
 
-.c-list {
-	font-size: $font-sm + 2upx;
-	color: $font-color-base;
-	background: #fff;
-	.c-row {
-		display: flex;
-		align-items: center;
+	/* 标题简介 */
+	.introduce-section {
+		background: #fff;
 		padding: 20upx;
-		position: relative;
-	}
-	.tit {
-		width: 140upx;
-	}
-	.con {
-		flex: 1;
-		color: $font-color-dark;
-		.selected-text {
-			margin-right: 10upx;
-		}
-	}
-	.bz-list {
-		height: 40upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		text {
-			display: inline-block;
-			margin-right: 30upx;
-		}
-	}
-	.con-list {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		color: $font-color-dark;
-		line-height: 40upx;
-	}
-	.red {
-		color: $uni-color-primary;
-	}
-}
-
-/* 评价 */
-.eva-section {
-	display: flex;
-	flex-direction: column;
-	padding: 20upx;
-	background: #fff;
-	margin-top: 16upx;
-	.e-header {
-		display: flex;
-		align-items: center;
-		height: 70upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-light;
-		.tit {
-			font-size: $font-base + 2upx;
+
+		.title {
+			font-size: 32upx;
 			color: $font-color-dark;
-			margin-right: 4upx;
+			height: 50upx;
+			line-height: 50upx;
 		}
-		.tip {
-			flex: 1;
-			text-align: right;
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			height: 64upx;
+			padding: 10upx 0;
+			font-size: 26upx;
+			color: $uni-color-primary;
 		}
-		.icon-you {
-			margin-left: 10upx;
+
+		.price {
+			font-size: $font-lg + 2upx;
 		}
-	}
-}
-.eva-box {
-	display: flex;
-	padding: 20upx 0;
-	.portrait {
-		flex-shrink: 0;
-		width: 80upx;
-		height: 80upx;
-		border-radius: 100px;
-	}
-	.right {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		font-size: $font-base;
-		color: $font-color-base;
-		padding-left: 26upx;
-		.con {
-			font-size: $font-base;
-			color: $font-color-dark;
-			padding: 20upx 0;
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
 		}
-		.bot {
+
+		.bot-row {
 			display: flex;
-			justify-content: space-between;
+			align-items: center;
+			height: 50upx;
 			font-size: $font-sm;
 			color: $font-color-light;
+
+			text {
+				flex: 1;
+			}
 		}
 	}
-}
-/*  详情 */
-.detail-desc {
-	background: #fff;
-	margin-top: 16upx;
-	width: 100%;
-	.d-header {
+
+	/* 分享 */
+	.share-section {
 		display: flex;
-		justify-content: center;
 		align-items: center;
-		height: 80upx;
-		font-size: $font-base + 2upx;
-		color: $font-color-dark;
-		position: relative;
+		color: $font-color-base;
+		background: linear-gradient(left, #fdf5f6, #fbebf6);
+		padding: 12upx 30upx;
 
-		text {
-			padding: 0 20upx;
-			background: #fff;
+		.share-icon {
+			display: flex;
+			align-items: center;
+			width: 70upx;
+			height: 30upx;
+			line-height: 1;
+			border: 1px solid $uni-color-primary;
+			border-radius: 4upx;
 			position: relative;
-			z-index: 1;
-		}
-		&:after {
-			position: absolute;
-			left: 50%;
-			top: 50%;
-			transform: translateX(-50%);
-			width: 300upx;
-			height: 0;
-			content: '';
-			border-bottom: 1px solid #ccc;
-		}
-	}
-}
+			overflow: hidden;
+			font-size: 22upx;
+			color: $uni-color-primary;
 
-/* 规格选择弹窗 */
-.attr-content {
-	padding: 10upx 30upx;
-	.a-t {
-		display: flex;
-		image {
-			width: 170upx;
-			height: 170upx;
-			flex-shrink: 0;
-			margin-top: -40upx;
-			border-radius: 8upx;
+			&:after {
+				content: '';
+				width: 50upx;
+				height: 50upx;
+				border-radius: 50%;
+				left: -20upx;
+				top: -12upx;
+				position: absolute;
+				background: $uni-color-primary;
+			}
 		}
-		.right {
+
+		.icon-xingxing {
+			position: relative;
+			z-index: 1;
+			font-size: 24upx;
+			margin-left: 2upx;
+			margin-right: 10upx;
+			color: #fff;
+			line-height: 1;
+		}
+
+		.tit {
+			font-size: $font-base;
+			margin-left: 10upx;
+		}
+
+		.icon-bangzhu1 {
+			padding: 10upx;
+			font-size: 30upx;
+			line-height: 1;
+		}
+
+		.share-btn {
+			flex: 1;
+			text-align: right;
+			font-size: $font-sm;
+			color: $uni-color-primary;
+		}
+
+		.icon-you {
+			font-size: $font-sm;
+			margin-left: 4upx;
+			color: $uni-color-primary;
+		}
+	}
+
+	.c-list {
+		font-size: $font-sm + 2upx;
+		color: $font-color-base;
+		background: #fff;
+
+		.c-row {
 			display: flex;
-			flex-direction: column;
-			padding-left: 24upx;
-			font-size: $font-sm + 2upx;
-			color: $font-color-base;
-			line-height: 42upx;
-			.price {
-				font-size: $font-lg;
-				color: $uni-color-primary;
-				margin-bottom: 10upx;
-			}
+			align-items: center;
+			padding: 20upx;
+			position: relative;
+		}
+
+		.tit {
+			width: 140upx;
+		}
+
+		.con {
+			flex: 1;
+			color: $font-color-dark;
+
 			.selected-text {
 				margin-right: 10upx;
 			}
 		}
-	}
-	.attr-list {
-		display: flex;
-		flex-direction: column;
-		font-size: $font-base + 2upx;
-		color: $font-color-base;
-		padding-top: 30upx;
-		padding-left: 10upx;
-	}
-	.item-list {
-		padding: 20upx 0 0;
-		display: flex;
-		flex-wrap: wrap;
-		text {
+
+		.bz-list {
+			height: 40upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+
+			text {
+				display: inline-block;
+				margin-right: 30upx;
+			}
+		}
+
+		.con-list {
+			flex: 1;
 			display: flex;
-			align-items: center;
-			justify-content: center;
-			background: #eee;
-			margin-right: 20upx;
-			margin-bottom: 20upx;
-			border-radius: 100upx;
-			min-width: 60upx;
-			height: 60upx;
-			padding: 0 20upx;
-			font-size: $font-base;
+			flex-direction: column;
 			color: $font-color-dark;
+			line-height: 40upx;
 		}
-		.selected {
-			background: #fbebee;
+
+		.red {
 			color: $uni-color-primary;
 		}
 	}
-}
-
-/*  弹出层 */
-.popup {
-	position: fixed;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 99;
-
-	&.show {
-		display: block;
-		.mask {
-			animation: showPopup 0.2s linear both;
-		}
-		.layer {
-			animation: showLayer 0.2s linear both;
+
+	/* 评价 */
+	.eva-section {
+		display: flex;
+		flex-direction: column;
+		padding: 20upx;
+		background: #fff;
+		margin-top: 16upx;
+
+		.e-header {
+			display: flex;
+			align-items: center;
+			height: 70upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-light;
+
+			.tit {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				margin-right: 4upx;
+			}
+
+			.tip {
+				flex: 1;
+				text-align: right;
+			}
+
+			.icon-you {
+				margin-left: 10upx;
+			}
 		}
 	}
-	&.hide {
-		.mask {
-			animation: hidePopup 0.2s linear both;
+
+	.eva-box {
+		display: flex;
+		padding: 20upx 0;
+
+		.portrait {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			border-radius: 100px;
 		}
-		.layer {
-			animation: hideLayer 0.2s linear both;
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-base;
+			color: $font-color-base;
+			padding-left: 26upx;
+
+			.con {
+				font-size: $font-base;
+				color: $font-color-dark;
+				padding: 20upx 0;
+			}
+
+			.bot {
+				display: flex;
+				justify-content: space-between;
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
 		}
 	}
-	&.none {
-		display: none;
-	}
-	.mask {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 1;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-	.layer {
-		position: fixed;
-		z-index: 99;
-		bottom: 0;
+
+	/*  详情 */
+	.detail-desc {
+		background: #fff;
+		margin-top: 16upx;
 		width: 100%;
-		min-height: 40vh;
-		border-radius: 10upx 10upx 0 0;
-		background-color: #fff;
-		.btn {
-			height: 66upx;
-			line-height: 66upx;
-			border-radius: 100upx;
-			background: $uni-color-primary;
+
+		.d-header {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 80upx;
 			font-size: $font-base + 2upx;
-			color: #fff;
-			margin: 30upx auto 20upx;
+			color: $font-color-dark;
+			position: relative;
+
+			text {
+				padding: 0 20upx;
+				background: #fff;
+				position: relative;
+				z-index: 1;
+			}
+
+			&:after {
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translateX(-50%);
+				width: 300upx;
+				height: 0;
+				content: '';
+				border-bottom: 1px solid #ccc;
+			}
 		}
 	}
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
+
+	/* 规格选择弹窗 */
+	.attr-content {
+		padding: 10upx 30upx;
+
+		.a-t {
+			display: flex;
+
+			image {
+				width: 170upx;
+				height: 170upx;
+				flex-shrink: 0;
+				margin-top: -40upx;
+				border-radius: 8upx;
+			}
+
+			.right {
+				display: flex;
+				flex-direction: column;
+				padding-left: 24upx;
+				font-size: $font-sm + 2upx;
+				color: $font-color-base;
+				line-height: 42upx;
+
+				.price {
+					font-size: $font-lg;
+					color: $uni-color-primary;
+					margin-bottom: 10upx;
+				}
+
+				.selected-text {
+					margin-right: 10upx;
+				}
+			}
 		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
+
+		.attr-list {
+			display: flex;
+			flex-direction: column;
+			font-size: $font-base + 2upx;
+			color: $font-color-base;
+			padding-top: 30upx;
+			padding-left: 10upx;
 		}
-		100% {
-			opacity: 0;
+
+		.item-list {
+			padding: 20upx 0 0;
+			display: flex;
+			flex-wrap: wrap;
+
+			text {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background: #eee;
+				margin-right: 20upx;
+				margin-bottom: 20upx;
+				border-radius: 100upx;
+				min-width: 60upx;
+				height: 60upx;
+				padding: 0 20upx;
+				font-size: $font-base;
+				color: $font-color-dark;
+			}
+
+			.selected {
+				background: #fbebee;
+				color: $uni-color-primary;
+			}
 		}
 	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(120%);
+
+	/*  弹出层 */
+	.popup {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 99;
+
+		&.show {
+			display: block;
+
+			.mask {
+				animation: showPopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
 		}
-		100% {
-			transform: translateY(0%);
+
+		&.hide {
+			.mask {
+				animation: hidePopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
 		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(0);
+
+		&.none {
+			display: none;
 		}
-		100% {
-			transform: translateY(120%);
+
+		.mask {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+			background-color: rgba(0, 0, 0, 0.4);
 		}
-	}
-}
-
-/* 底部操作菜单 */
-.page-bottom {
-	position: fixed;
-	left: 30upx;
-	bottom: 30upx;
-	z-index: 95;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 690upx;
-	height: 100upx;
-	background: rgba(255, 255, 255, 0.9);
-	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
-	border-radius: 16upx;
-
-	.p-b-btn {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		font-size: $font-sm;
-		color: $font-color-base;
-		width: 96upx;
-		height: 80upx;
-		.yticon {
-			font-size: 40upx;
-			line-height: 48upx;
-			color: $font-color-light;
+
+		.layer {
+			position: fixed;
+			z-index: 99;
+			bottom: 0;
+			width: 100%;
+			min-height: 40vh;
+			border-radius: 10upx 10upx 0 0;
+			background-color: #fff;
+
+			.btn {
+				height: 66upx;
+				line-height: 66upx;
+				border-radius: 100upx;
+				background: $uni-color-primary;
+				font-size: $font-base + 2upx;
+				color: #fff;
+				margin: 30upx auto 20upx;
+			}
 		}
-		&.active,
-		&.active .yticon {
-			color: $uni-color-primary;
+
+		@keyframes showPopup {
+			0% {
+				opacity: 0;
+			}
+
+			100% {
+				opacity: 1;
+			}
+		}
+
+		@keyframes hidePopup {
+			0% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0;
+			}
 		}
-		.icon-fenxiang2 {
-			font-size: 42upx;
-			transform: translateY(-2upx);
+
+		@keyframes showLayer {
+			0% {
+				transform: translateY(120%);
+			}
+
+			100% {
+				transform: translateY(0%);
+			}
 		}
-		.icon-shoucang {
-			font-size: 46upx;
+
+		@keyframes hideLayer {
+			0% {
+				transform: translateY(0);
+			}
+
+			100% {
+				transform: translateY(120%);
+			}
 		}
 	}
-	.action-btn-group {
+
+	/* 底部操作菜单 */
+	.page-bottom {
+		position: fixed;
+		left: 30upx;
+		bottom: 30upx;
+		z-index: 95;
 		display: flex;
-		height: 76upx;
-		border-radius: 100px;
-		overflow: hidden;
-		box-shadow: 0 20upx 40upx -16upx #fa436a;
-		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
-		margin-left: 20upx;
-		position: relative;
-		&:after {
-			content: '';
-			position: absolute;
-			top: 50%;
-			right: 50%;
-			transform: translateY(-50%);
-			height: 28upx;
-			width: 0;
-			border-right: 1px solid rgba(255, 255, 255, 0.5);
-		}
-		.action-btn {
+		justify-content: center;
+		align-items: center;
+		width: 690upx;
+		height: 100upx;
+		background: rgba(255, 255, 255, 0.9);
+		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+		border-radius: 16upx;
+
+		.p-b-btn {
 			display: flex;
+			flex-direction: column;
 			align-items: center;
 			justify-content: center;
-			width: 180upx;
-			height: 100%;
-			font-size: $font-base;
-			padding: 0;
-			border-radius: 0;
-			background: transparent;
+			font-size: $font-sm;
+			color: $font-color-base;
+			width: 96upx;
+			height: 80upx;
+
+			.yticon {
+				font-size: 40upx;
+				line-height: 48upx;
+				color: $font-color-light;
+			}
+
+			&.active,
+			&.active .yticon {
+				color: $uni-color-primary;
+			}
+
+			.icon-fenxiang2 {
+				font-size: 42upx;
+				transform: translateY(-2upx);
+			}
+
+			.icon-shoucang {
+				font-size: 46upx;
+			}
+		}
+
+		.action-btn-group {
+			display: flex;
+			height: 76upx;
+			border-radius: 100px;
+			overflow: hidden;
+			box-shadow: 0 20upx 40upx -16upx #fa436a;
+			box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+			background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+			margin-left: 20upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				top: 50%;
+				right: 50%;
+				transform: translateY(-50%);
+				height: 28upx;
+				width: 0;
+				border-right: 1px solid rgba(255, 255, 255, 0.5);
+			}
+
+			.action-btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 180upx;
+				height: 100%;
+				font-size: $font-base;
+				padding: 0;
+				border-radius: 0;
+				background: transparent;
+			}
 		}
 	}
-}
-
-/* 优惠券面板 */
-.mask {
-	display: flex;
-	align-items: flex-end;
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-	bottom: 0;
-	width: 100%;
-	background: rgba(0, 0, 0, 0);
-	z-index: 9995;
-	transition: 0.3s;
-
-	.mask-content {
+
+	/* 优惠券面板 */
+	.mask {
+		display: flex;
+		align-items: flex-end;
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
 		width: 100%;
-		min-height: 30vh;
-		max-height: 70vh;
-		background: #f3f3f3;
-		transform: translateY(100%);
+		background: rgba(0, 0, 0, 0);
+		z-index: 9995;
 		transition: 0.3s;
-		overflow-y: scroll;
-	}
-	&.none {
-		display: none;
-	}
-	&.show {
-		background: rgba(0, 0, 0, 0.4);
 
 		.mask-content {
-			transform: translateY(0);
-		}
-	}
-}
-
-/* 优惠券列表 */
-.coupon-item {
-	display: flex;
-	flex-direction: column;
-	margin: 20upx 24upx;
-	background: #fff;
-	.con {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 120upx;
-		padding: 0 30upx;
-		&:after {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			content: '';
 			width: 100%;
-			height: 0;
-			border-bottom: 1px dashed #f3f3f3;
-			transform: scaleY(50%);
+			min-height: 30vh;
+			max-height: 70vh;
+			background: #f3f3f3;
+			transform: translateY(100%);
+			transition: 0.3s;
+			overflow-y: scroll;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, 0.4);
+
+			.mask-content {
+				transform: translateY(0);
+			}
 		}
 	}
-	.left {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		flex: 1;
-		overflow: hidden;
-		height: 100upx;
-	}
-	.title {
-		font-size: 32upx;
-		color: $font-color-dark;
-		margin-bottom: 10upx;
-	}
-	.time {
-		font-size: 24upx;
-		color: $font-color-light;
-	}
-	.right {
+
+	/* 优惠券列表 */
+	.coupon-item {
 		display: flex;
 		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		font-size: 26upx;
-		color: $font-color-base;
-		height: 100upx;
-	}
-	.price {
-		font-size: 44upx;
-		color: $base-color;
-		&:before {
-			content: '￥';
-			font-size: 34upx;
+		margin: 20upx 24upx;
+		background: #fff;
+
+		.con {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 120upx;
+			padding: 0 30upx;
+
+			&:after {
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				content: '';
+				width: 100%;
+				height: 0;
+				border-bottom: 1px dashed #f3f3f3;
+				transform: scaleY(50%);
+			}
 		}
-	}
-	.tips {
-		font-size: 24upx;
-		color: $font-color-light;
-		line-height: 60upx;
-		padding-left: 30upx;
-	}
-	.circle {
-		position: absolute;
-		left: -6upx;
-		bottom: -10upx;
-		z-index: 10;
-		width: 20upx;
-		height: 20upx;
-		background: #f3f3f3;
-		border-radius: 100px;
-		&.r {
-			left: auto;
-			right: -6upx;
+
+		.left {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			flex: 1;
+			overflow: hidden;
+			height: 100upx;
+		}
+
+		.title {
+			font-size: 32upx;
+			color: $font-color-dark;
+			margin-bottom: 10upx;
+		}
+
+		.time {
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+
+		.right {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			font-size: 26upx;
+			color: $font-color-base;
+			height: 100upx;
+		}
+
+		.price {
+			font-size: 44upx;
+			color: $base-color;
+
+			&:before {
+				content: '￥';
+				font-size: 34upx;
+			}
+		}
+
+		.tips {
+			font-size: 24upx;
+			color: $font-color-light;
+			line-height: 60upx;
+			padding-left: 30upx;
+		}
+
+		.circle {
+			position: absolute;
+			left: -6upx;
+			bottom: -10upx;
+			z-index: 10;
+			width: 20upx;
+			height: 20upx;
+			background: #f3f3f3;
+			border-radius: 100px;
+
+			&.r {
+				left: auto;
+				right: -6upx;
+			}
 		}
 	}
-}
-/* 分类推荐楼层 */
-.hot-floor {
-	width: 100%;
-	overflow: hidden;
-	margin-bottom: 20upx;
-	.floor-img-box {
+
+	/* 分类推荐楼层 */
+	.hot-floor {
 		width: 100%;
-		height: 220upx;
-		position: relative;
-		display: flex;
-		&:after {
-			padding: 10 30upx;
-			content: '';
-			position: absolute;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 220upx;
+			position: relative;
+			display: flex;
+
+			&:after {
+				padding: 10 30upx;
+				content: '';
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.name {
+			font-size: 30upx;
+			color: $font-color-base;
+			margin-left: 24upx;
+		}
+
+		.floor-img {
 			width: 100%;
 			height: 100%;
-			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
 		}
-	}
-	.name {
-		font-size: 30upx;
-		color: $font-color-base;
-		margin-left: 24upx;
-	}
-	.floor-img {
-		width: 100%;
-		height: 100%;
-	}
-	.floor-list {
-		white-space: nowrap;
-		padding: 20upx;
-		padding-right: 50upx;
-		border-radius: 6upx;
-		margin-top: -140upx;
-		margin-left: 30upx;
-		background: #fff;
-		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
-		position: relative;
-		z-index: 1;
-	}
-	.scoll-wrapper {
-		display: flex;
-		align-items: flex-start;
-	}
-	.floor-item {
-		width: 180upx;
-		margin-right: 20upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		line-height: 1.8;
-		image {
-			width: 100upx;
-			height: 180upx;
+
+		.floor-list {
+			white-space: nowrap;
+			padding: 20upx;
+			padding-right: 50upx;
 			border-radius: 6upx;
+			margin-top: -140upx;
+			margin-left: 30upx;
+			background: #fff;
+			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+			position: relative;
+			z-index: 1;
 		}
-		.price {
-			color: $uni-color-primary;
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
 		}
-	}
-	.more {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		flex-shrink: 0;
-		width: 180upx;
-		height: 180upx;
-		border-radius: 6upx;
-		background: #f3f3f3;
-		font-size: $font-base;
-		color: $font-color-light;
-		text:first-child {
-			margin-bottom: 4upx;
+
+		.floor-item {
+			width: 180upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 100upx;
+				height: 180upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+
+		.more {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex-shrink: 0;
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
 		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue b/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
index 1ef8f7e..d65a67f 100644
--- a/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
+++ b/mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
@@ -68,7 +68,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesC/seller/goods.vue b/mallplusui-uniapp-app/pagesC/seller/goods.vue
index a1cf6ac..16f7360 100644
--- a/mallplusui-uniapp-app/pagesC/seller/goods.vue
+++ b/mallplusui-uniapp-app/pagesC/seller/goods.vue
@@ -51,7 +51,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { formatDate } from '@/common/date';
 export default {
diff --git a/mallplusui-uniapp-app/pagesC/seller/member.vue b/mallplusui-uniapp-app/pagesC/seller/member.vue
index a00ace6..0dfe0cb 100644
--- a/mallplusui-uniapp-app/pagesC/seller/member.vue
+++ b/mallplusui-uniapp-app/pagesC/seller/member.vue
@@ -32,7 +32,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { formatDate } from '@/common/date';
 export default {
diff --git a/mallplusui-uniapp-app/pagesC/seller/order.vue b/mallplusui-uniapp-app/pagesC/seller/order.vue
index 4a4e60a..6c899bc 100644
--- a/mallplusui-uniapp-app/pagesC/seller/order.vue
+++ b/mallplusui-uniapp-app/pagesC/seller/order.vue
@@ -61,7 +61,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { formatDate } from '@/common/date';
 export default {
diff --git a/mallplusui-uniapp-app/pagesC/seller/orderDetail.vue b/mallplusui-uniapp-app/pagesC/seller/orderDetail.vue
index 8b11e2d..1479964 100644
--- a/mallplusui-uniapp-app/pagesC/seller/orderDetail.vue
+++ b/mallplusui-uniapp-app/pagesC/seller/orderDetail.vue
@@ -70,7 +70,7 @@
 import { mapState } from 'vuex';
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import Json from '@/Json';
 import { formatDate } from '@/common/date';
diff --git a/mallplusui-uniapp-app/pagesC/store/businessDetails.vue b/mallplusui-uniapp-app/pagesC/store/businessDetails.vue
index aef89d6..a5e69a7 100644
--- a/mallplusui-uniapp-app/pagesC/store/businessDetails.vue
+++ b/mallplusui-uniapp-app/pagesC/store/businessDetails.vue
@@ -235,7 +235,7 @@ import { formatDate } from '@/common/date';
 	import uniIcon from "@/components/uni-icon/uni-icon.vue";
 	import eonfox from "@/components/eonfox/eonfox.js"
 	import fns from '@/components/eonfox/fns.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 	// #ifdef H5
 	let jweixin = require('jweixin-module');
 	// #endif
diff --git a/mallplusui-uniapp-app/pagesC/store/list.vue b/mallplusui-uniapp-app/pagesC/store/list.vue
index 5c090e7..bf99b3f 100644
--- a/mallplusui-uniapp-app/pagesC/store/list.vue
+++ b/mallplusui-uniapp-app/pagesC/store/list.vue
@@ -13,7 +13,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
     		mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesC/store/schoolList.vue b/mallplusui-uniapp-app/pagesC/store/schoolList.vue
index 977cd64..fbd6e21 100644
--- a/mallplusui-uniapp-app/pagesC/store/schoolList.vue
+++ b/mallplusui-uniapp-app/pagesC/store/schoolList.vue
@@ -24,7 +24,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
 		uniLoadMore
diff --git a/mallplusui-uniapp-app/pagesC/store/store.vue b/mallplusui-uniapp-app/pagesC/store/store.vue
index 074ed4b..e289f47 100644
--- a/mallplusui-uniapp-app/pagesC/store/store.vue
+++ b/mallplusui-uniapp-app/pagesC/store/store.vue
@@ -98,7 +98,7 @@ import coupon from '@/components/coolc-coupon/coolc-coupon';
 import { formatDate } from '@/common/date';
 import { mapState } from 'vuex';
 import navBar from '@/components/zhouWei-navBar';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import share from '@/components/share';
 export default {
 	components: {
diff --git a/mallplusui-uniapp-app/pagesC/store/storeList.vue b/mallplusui-uniapp-app/pagesC/store/storeList.vue
index 0035613..542c16f 100644
--- a/mallplusui-uniapp-app/pagesC/store/storeList.vue
+++ b/mallplusui-uniapp-app/pagesC/store/storeList.vue
@@ -31,7 +31,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 export default {
 	components: {
     		mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue b/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
index 17186be..f07af60 100644
--- a/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
+++ b/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
@@ -11,11 +11,11 @@
 		<view class="introduce-section">
 			<text class="title">{{ detailData.title }}</text>
 
-			<view class="bot-row">
+			<!-- <view class="bot-row">
 				<text>收藏量: {{ detailData.collectCount }}</text>
 				<text>评论量: {{ detailData.commentCount }}</text>
 				<text>浏览量: {{ detailData.readCount }}</text>
-			</view>
+			</view> -->
 		</view>
 
 		<view class="c-list">
@@ -32,7 +32,7 @@
 		</view>
 
 		<!-- 底部操作菜单 -->
-		<view class="page-bottom">
+		<!-- <view class="page-bottom">
 			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
 				<text class="yticon icon-xiatubiao--copy"></text>
 				<text>首页</text>
@@ -42,10 +42,10 @@
 				<text class="yticon icon-shoucang"></text>
 				<text>收藏</text>
 			</view>
-		</view>
+		</view> -->
 
 		<!-- 分享 -->
-		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+		<!-- <share ref="share" :contentHeight="580" :shareList="shareList"></share> -->
 
 	</view>
 </template>
diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
index bc5ce05..e4ab883 100644
--- a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
+++ b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue
@@ -11,13 +11,13 @@
 							<text>{{item.title}}</text>
 							<text class="listcard-content_title_text">发布时间：{{item.createTime | formatCreateTime}}</text>
 						</view>
-						<view class="listcard-content_des">
+					<!-- 	<view class="listcard-content_des">
 
 							<view class="listcard-content_des-label">
 								<view class="listcard-content_des-label-item">收藏{{item.collectCount}}</view>
 							</view>
 							<view class="listcard-content_des-browe">浏览{{item.readCount}}</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>
@@ -167,6 +167,7 @@
 
 				text {
 					font-size: 22px;
+					margin-top: 5px;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					display: -webkit-box;
@@ -175,7 +176,7 @@
 				}
 
 				.listcard-content_title_text {
-					margin-top: 5px;
+					margin-top: 28px;
 					font-size: 15px;
 					color: #999;
 				}
diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectList_02_14.vue b/mallplusui-uniapp-app/pagesU/notice/subjectList_02_14.vue
index fceeedb..4f75255 100644
--- a/mallplusui-uniapp-app/pagesU/notice/subjectList_02_14.vue
+++ b/mallplusui-uniapp-app/pagesU/notice/subjectList_02_14.vue
@@ -39,7 +39,7 @@
 <script>
 	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 	import Api from '@/common/api';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 	export default {
 		components: {
 			mallplusCopyright,
diff --git a/mallplusui-uniapp-app/pagesU/user/collect.vue b/mallplusui-uniapp-app/pagesU/user/collect.vue
index af10f4b..084fdd0 100644
--- a/mallplusui-uniapp-app/pagesU/user/collect.vue
+++ b/mallplusui-uniapp-app/pagesU/user/collect.vue
@@ -1,12 +1,13 @@
 <template>
 	<view class="content">
 		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData" >
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
 
@@ -19,7 +20,8 @@
 						</view>
 
 						<view class="goods-box-single">
-							<image class="goods-img" :src="item.meno1" @click="navToDetailPage(item)" mode="aspectFill"></image>
+							<image class="goods-img" :src="item.meno1" @click="navToDetailPage(item)" mode="aspectFill">
+							</image>
 							<view class="right">
 								<text class="title clamp">{{ item.name }}</text>
 								<text class="attr-box">{{ item.meno3 }}</text>
@@ -37,94 +39,127 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import { formatDate } from '@/common/date';
-export default {
-	components: {
-    		mallplusCopyright,
-		uniLoadMore,
-		empty
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					type: 1,
-					text: '收藏商品',
-					loadingType: 'more',
-					orderList: []
-				},
-				{
-					type: 2,
-					text: '收藏文章',
-					loadingType: 'more',
-					orderList: []
-				},
-				{
-					type: 3,
-					text: '收藏店铺',
-					loadingType: 'more',
-					orderList: []
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		/**
-		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
-		 * 替换onLoad下代码即可
-		 */
-		if (options && options.type) {
-			this.tabCurrentIndex = +options.type;
-		}
-		//  MP
-		this.loadData();
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
-	},
-	methods: {
-		//详情页
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `../../pagesA/product/product?id=${id}`
-			});
+	import {
+		mapState
+	} from 'vuex';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
+	import empty from '@/components/empty';
+	import {
+		formatDate
+	} from '@/common/date';
+	export default {
+		components: {
+			mallplusCopyright,
+			uniLoadMore,
+			empty
 		},
-		//获取订单列表
-		async loadData(source) {
-			console.log('=======================')
-			
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let type = navItem.type;
-
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				pageNum:1,
+				navList: [{
+						type: 1,
+						text: '收藏商品',
+						loadingType: 'more',
+						orderList: []
+					}
+					// ,
+					// {
+					// 	type: 2,
+					// 	text: '收藏文章',
+					// 	loadingType: 'more',
+					// 	orderList: []
+					// },
+					// {
+					// 	type: 3,
+					// 	text: '收藏店铺',
+					// 	loadingType: 'more',
+					// 	orderList: []
+					// }
+				]
+			};
+		},
+
+		onLoad(options) {
+			/**
+			 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+			 * 替换onLoad下代码即可
+			 */
+			if (options && options.type) {
+				this.tabCurrentIndex = +options.type;
 			}
+			//  MP
+			this.loadData();
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
 
-			navItem.loadingType = 'loading';
+			this.loadData();
+		},
+		onPullDownRefresh() {
 
-			if (!this.hasLogin) {
-				url = '/pages/public/login';
+			console.log("onPullDownRefresh")
+			this.pageNum = this.pageNum + 1;
+			// this.getNewProductList('refresh');
+
+			this.loadData();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
+		},
+		methods: {
+			//详情页
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
 				uni.navigateTo({
-					url
+					url: `../../pagesA/product/product?id=${id}`
 				});
-			} else {
-				let params = {  };
+			},
+			//获取订单列表
+			async loadData(source) {
+				// console.log('=======================')
+
+				//这里是将订单挂载到tab列表下
+				let index = this.tabCurrentIndex;
+				let navItem = this.navList[index];
+				let type = navItem.type;
+
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return;
+				}
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+
+				navItem.loadingType = 'loading';
+
+				// if (!this.hasLogin) {
+				// 	url = '/pages/public/login';
+				// 	uni.navigateTo({
+				// 		url
+				// 	});
+				// } else {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params = {
+					pageNum: this.pageNum,
+				};
 				let data = await Api.apiCall('get', Api.goods.listCollect, params);
 
 				let orderList = data.records.filter(item => {
@@ -148,218 +183,272 @@ export default {
 
 				//判断是否还有数据， 有改为 more， 没有改为noMore
 				navItem.loadingType = 'more';
-			}
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		//删除订单
-		deleteOrder(index) {
-			uni.showLoading({
-				title: '请稍后'
-			});
-			setTimeout(() => {
-				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
-				uni.hideLoading();
-			}, 600);
-			let list = this.navList[this.tabCurrentIndex].orderList;
-			let row = list[index];
-			let id = row.id;
-			let params = { ids: id };
-			let data = Api.apiCall('post', Api.goods.deleteCollect, params);
-		},
-		//取消订单
-		cancelOrder(item) {
-			uni.showLoading({
-				title: '请稍后'
-			});
-			setTimeout(() => {
-				let { stateTip, stateTipColor } = this.orderStateExp(9);
-				item = Object.assign(item, {
-					type: 9,
+				// }
+			},
+
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			//删除订单
+			deleteOrder(index) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				setTimeout(() => {
+					this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+					uni.hideLoading();
+				}, 600);
+				let list = this.navList[this.tabCurrentIndex].orderList;
+				let row = list[index];
+				let id = row.id;
+				let params = {
+					ids: id
+				};
+				let data = Api.apiCall('post', Api.goods.deleteCollect, params);
+			},
+			//取消订单
+			cancelOrder(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				setTimeout(() => {
+					let {
+						stateTip,
+						stateTipColor
+					} = this.orderStateExp(9);
+					item = Object.assign(item, {
+						type: 9,
+						stateTip,
+						stateTipColor
+					});
+
+					//取消订单后删除待付款中该项
+					let list = this.navList[1].orderList;
+					let index = list.findIndex(val => val.id === item.id);
+					index !== -1 && list.splice(index, 1);
+
+					uni.hideLoading();
+				}, 600);
+			},
+
+			//订单状态文字和颜色
+			orderStateExp(type) {
+				let stateTip = '',
+					stateTipColor = '#fa436a';
+				switch (+type) {
+					case 1:
+						stateTip = '收藏商品';
+						break;
+					case 2:
+						stateTip = '收藏文章';
+						break;
+					case 3:
+						stateTip = '收藏店铺';
+						stateTipColor = '#909399';
+						break;
+
+						//更多自定义
+				}
+				return {
 					stateTip,
 					stateTipColor
-				});
-
-				//取消订单后删除待付款中该项
-				let list = this.navList[1].orderList;
-				let index = list.findIndex(val => val.id === item.id);
-				index !== -1 && list.splice(index, 1);
-
-				uni.hideLoading();
-			}, 600);
-		},
-
-		//订单状态文字和颜色
-		orderStateExp(type) {
-			let stateTip = '',
-				stateTipColor = '#fa436a';
-			switch (+type) {
-				case 1:
-					stateTip = '收藏商品';
-					break;
-				case 2:
-					stateTip = '收藏文章';
-					break;
-				case 3:
-					stateTip = '收藏店铺';
-					stateTipColor = '#909399';
-					break;
-
-				//更多自定义
-			}
-			return { stateTip, stateTipColor };
-		},
-		dateFormat(time) {
-			if (time == null || time === '') {
-				return 'N/A';
+				};
+			},
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
 			}
-			let date = new Date(time);
-			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.swiper-box {
-	height: calc(100% - 40px);
-}
-.list-scroll-content {
-	height: 100%;
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+	.swiper-box {
+		height: calc(100% - 40px);
+	}
+
+	.list-scroll-content {
 		height: 100%;
-		font-size: 15px;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
 	}
-}
-
-.uni-swiper-item {
-	height: auto;
-}
-.order-item {
-	display: flex;
-	flex-direction: column;
-	padding-left: 30upx;
-	background: #fff;
-	margin-top: 16upx;
-	.i-top {
+
+	.navbar {
 		display: flex;
-		align-items: center;
-		height: 80upx;
-		padding-right: 30upx;
-		font-size: $font-base;
-		color: $font-color-dark;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 		position: relative;
-		.time {
+		z-index: 10;
+
+		.nav-item {
 			flex: 1;
-		}
-		.state {
-			color: $base-color;
-		}
-		.del-btn {
-			padding: 10upx 0 10upx 36upx;
-			font-size: $font-lg;
-			color: $font-color-light;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
 			position: relative;
-			&:after {
-				content: '';
-				width: 0;
-				height: 30upx;
-				border-left: 1px solid $border-color-dark;
-				position: absolute;
-				left: 20upx;
-				top: 50%;
-				transform: translateY(-50%);
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid $base-color;
+				}
 			}
 		}
 	}
-	/* 多条商品 */
-	.goods-box {
-		height: 160upx;
-		padding: 20upx 0;
-		white-space: nowrap;
-		.goods-item {
-			width: 120upx;
-			height: 120upx;
-			display: inline-block;
-			margin-right: 24upx;
-		}
-		.goods-img {
-			display: block;
-			width: 100%;
-			height: 100%;
-		}
+
+	.uni-swiper-item {
+		height: auto;
 	}
-	/* 单条商品 */
-	.goods-box-single {
+
+	.order-item {
 		display: flex;
-		padding: 20upx 0;
-		.goods-img {
-			display: block;
-			width: 120upx;
-			height: 120upx;
-		}
-		.right {
-			flex: 1;
+		flex-direction: column;
+		padding-left: 30upx;
+		background: #fff;
+		margin-top: 16upx;
+
+		.i-top {
 			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;
+			align-items: center;
+			height: 80upx;
+			padding-right: 30upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+			position: relative;
+
+			.time {
+				flex: 1;
+			}
+
+			.state {
+				color: $base-color;
 			}
-			.attr-box {
-				font-size: $font-sm + 2upx;
+
+			.del-btn {
+				padding: 10upx 0 10upx 36upx;
+				font-size: $font-lg;
 				color: $font-color-light;
-				padding: 10upx 12upx;
+				position: relative;
+
+				&:after {
+					content: '';
+					width: 0;
+					height: 30upx;
+					border-left: 1px solid $border-color-dark;
+					position: absolute;
+					left: 20upx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
 			}
+		}
+
+		/* 多条商品 */
+		.goods-box {
+			height: 160upx;
+			padding: 20upx 0;
+			white-space: nowrap;
+
+			.goods-item {
+				width: 120upx;
+				height: 120upx;
+				display: inline-block;
+				margin-right: 24upx;
+			}
+
+			.goods-img {
+				display: block;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		/* 单条商品 */
+		.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;
+						margin: 0 2upx 0 8upx;
+					}
+				}
+			}
+		}
+
+		.price-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: baseline;
+			padding: 20upx 30upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-light;
+
+			.num {
+				margin: 0 8upx;
+				color: $font-color-dark;
+			}
+
 			.price {
-				font-size: $font-base + 2upx;
+				font-size: $font-lg;
 				color: $font-color-dark;
+
 				&:before {
 					content: '￥';
 					font-size: $font-sm;
@@ -367,191 +456,173 @@ page,
 				}
 			}
 		}
-	}
 
-	.price-box {
-		display: flex;
-		justify-content: flex-end;
-		align-items: baseline;
-		padding: 20upx 30upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-light;
-		.num {
-			margin: 0 8upx;
-			color: $font-color-dark;
+		.action-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			height: 100upx;
+			position: relative;
+			padding-right: 30upx;
 		}
-		.price {
-			font-size: $font-lg;
+
+		.action-btn {
+			width: 160upx;
+			height: 60upx;
+			margin: 0;
+			margin-left: 24upx;
+			padding: 0;
+			text-align: center;
+			line-height: 60upx;
+			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
-			&:before {
-				content: '￥';
-				font-size: $font-sm;
-				margin: 0 2upx 0 8upx;
+			background: #fff;
+			border-radius: 100px;
+
+			&:after {
+				border-radius: 100px;
+			}
+
+			&.recom {
+				background: #fff9f9;
+				color: $base-color;
+
+				&:after {
+					border-color: #f7bcc8;
+				}
 			}
 		}
 	}
-	.action-box {
+
+	/* load-more */
+	.uni-load-more {
 		display: flex;
-		justify-content: flex-end;
+		flex-direction: row;
+		height: 80upx;
 		align-items: center;
-		height: 100upx;
-		position: relative;
-		padding-right: 30upx;
+		justify-content: center;
 	}
-	.action-btn {
-		width: 160upx;
-		height: 60upx;
-		margin: 0;
-		margin-left: 24upx;
-		padding: 0;
-		text-align: center;
-		line-height: 60upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		background: #fff;
-		border-radius: 100px;
-		&:after {
-			border-radius: 100px;
-		}
-		&.recom {
-			background: #fff9f9;
-			color: $base-color;
-			&:after {
-				border-color: #f7bcc8;
-			}
-		}
+
+	.uni-load-more__text {
+		font-size: 28upx;
+		color: #999;
 	}
-}
-
-/* load-more */
-.uni-load-more {
-	display: flex;
-	flex-direction: row;
-	height: 80upx;
-	align-items: center;
-	justify-content: center;
-}
-
-.uni-load-more__text {
-	font-size: 28upx;
-	color: #999;
-}
-
-.uni-load-more__img {
-	height: 24px;
-	width: 24px;
-	margin-right: 10px;
-}
-
-.uni-load-more__img > view {
-	position: absolute;
-}
-
-.uni-load-more__img > view view {
-	width: 6px;
-	height: 2px;
-	border-top-left-radius: 1px;
-	border-bottom-left-radius: 1px;
-	background: #999;
-	position: absolute;
-	opacity: 0.2;
-	transform-origin: 50%;
-	animation: load 1.56s ease infinite;
-}
-
-.uni-load-more__img > view view:nth-child(1) {
-	transform: rotate(90deg);
-	top: 2px;
-	left: 9px;
-}
-
-.uni-load-more__img > view view:nth-child(2) {
-	transform: rotate(180deg);
-	top: 11px;
-	right: 0;
-}
-
-.uni-load-more__img > view view:nth-child(3) {
-	transform: rotate(270deg);
-	bottom: 2px;
-	left: 9px;
-}
-
-.uni-load-more__img > view view:nth-child(4) {
-	top: 11px;
-	left: 0;
-}
-
-.load1,
-.load2,
-.load3 {
-	height: 24px;
-	width: 24px;
-}
-
-.load2 {
-	transform: rotate(30deg);
-}
-
-.load3 {
-	transform: rotate(60deg);
-}
-
-.load1 view:nth-child(1) {
-	animation-delay: 0s;
-}
-
-.load2 view:nth-child(1) {
-	animation-delay: 0.13s;
-}
-
-.load3 view:nth-child(1) {
-	animation-delay: 0.26s;
-}
-
-.load1 view:nth-child(2) {
-	animation-delay: 0.39s;
-}
-
-.load2 view:nth-child(2) {
-	animation-delay: 0.52s;
-}
-
-.load3 view:nth-child(2) {
-	animation-delay: 0.65s;
-}
-
-.load1 view:nth-child(3) {
-	animation-delay: 0.78s;
-}
-
-.load2 view:nth-child(3) {
-	animation-delay: 0.91s;
-}
-
-.load3 view:nth-child(3) {
-	animation-delay: 1.04s;
-}
-
-.load1 view:nth-child(4) {
-	animation-delay: 1.17s;
-}
-
-.load2 view:nth-child(4) {
-	animation-delay: 1.3s;
-}
-
-.load3 view:nth-child(4) {
-	animation-delay: 1.43s;
-}
-
-@-webkit-keyframes load {
-	0% {
-		opacity: 1;
+
+	.uni-load-more__img {
+		height: 24px;
+		width: 24px;
+		margin-right: 10px;
+	}
+
+	.uni-load-more__img>view {
+		position: absolute;
 	}
 
-	100% {
+	.uni-load-more__img>view view {
+		width: 6px;
+		height: 2px;
+		border-top-left-radius: 1px;
+		border-bottom-left-radius: 1px;
+		background: #999;
+		position: absolute;
 		opacity: 0.2;
+		transform-origin: 50%;
+		animation: load 1.56s ease infinite;
+	}
+
+	.uni-load-more__img>view view:nth-child(1) {
+		transform: rotate(90deg);
+		top: 2px;
+		left: 9px;
+	}
+
+	.uni-load-more__img>view view:nth-child(2) {
+		transform: rotate(180deg);
+		top: 11px;
+		right: 0;
+	}
+
+	.uni-load-more__img>view view:nth-child(3) {
+		transform: rotate(270deg);
+		bottom: 2px;
+		left: 9px;
+	}
+
+	.uni-load-more__img>view view:nth-child(4) {
+		top: 11px;
+		left: 0;
+	}
+
+	.load1,
+	.load2,
+	.load3 {
+		height: 24px;
+		width: 24px;
+	}
+
+	.load2 {
+		transform: rotate(30deg);
+	}
+
+	.load3 {
+		transform: rotate(60deg);
+	}
+
+	.load1 view:nth-child(1) {
+		animation-delay: 0s;
+	}
+
+	.load2 view:nth-child(1) {
+		animation-delay: 0.13s;
+	}
+
+	.load3 view:nth-child(1) {
+		animation-delay: 0.26s;
+	}
+
+	.load1 view:nth-child(2) {
+		animation-delay: 0.39s;
+	}
+
+	.load2 view:nth-child(2) {
+		animation-delay: 0.52s;
+	}
+
+	.load3 view:nth-child(2) {
+		animation-delay: 0.65s;
+	}
+
+	.load1 view:nth-child(3) {
+		animation-delay: 0.78s;
+	}
+
+	.load2 view:nth-child(3) {
+		animation-delay: 0.91s;
+	}
+
+	.load3 view:nth-child(3) {
+		animation-delay: 1.04s;
+	}
+
+	.load1 view:nth-child(4) {
+		animation-delay: 1.17s;
+	}
+
+	.load2 view:nth-child(4) {
+		animation-delay: 1.3s;
+	}
+
+	.load3 view:nth-child(4) {
+		animation-delay: 1.43s;
+	}
+
+	@-webkit-keyframes load {
+		0% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0.2;
+		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pagesU/user/inviteList.vue b/mallplusui-uniapp-app/pagesU/user/inviteList.vue
index bde1a2b..0533ca2 100644
--- a/mallplusui-uniapp-app/pagesU/user/inviteList.vue
+++ b/mallplusui-uniapp-app/pagesU/user/inviteList.vue
@@ -24,7 +24,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue'
 import { formatDate } from '@/common/date';
 export default {
 	components: {
diff --git a/mallplusui-uniapp-app/pagesU/user/inviteMoney.vue b/mallplusui-uniapp-app/pagesU/user/inviteMoney.vue
index 4e988ca..7282d81 100644
--- a/mallplusui-uniapp-app/pagesU/user/inviteMoney.vue
+++ b/mallplusui-uniapp-app/pagesU/user/inviteMoney.vue
@@ -32,7 +32,7 @@
 <script>
 import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 import Api from '@/common/api';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 export default {
 	components: {
diff --git a/mallplusui-uniapp-app/plugins/APPUpdate/index.js b/mallplusui-uniapp-app/plugins/APPUpdate/index.js
index b66cda6..d0f3f30 100644
--- a/mallplusui-uniapp-app/plugins/APPUpdate/index.js
+++ b/mallplusui-uniapp-app/plugins/APPUpdate/index.js
@@ -9,10 +9,11 @@ const $iconUrl = "/static/icon/ic_ar.png";
 // 获取当前应用的版本号
 export const getCurrentNo = function(callback) {
 	// 获取本地应用资源版本号
+	console.log("》》》》", 11111111111111111);
 	plus.runtime.getProperty(plus.runtime.appid, function(inf) {
 		callback && callback({
 			versionCode: inf.version.replace(/\./g, ""),
-			version: inf.version
+			version: inf.version,
 		});
 	});
 }
@@ -24,7 +25,7 @@ export const getServerNo = function(version, isPrompt = false, callback) {
 	let userName = userInfos.username;
 	let httpData = {
 		version: version,
-		userName:userName
+		userName: userName
 	};
 	console.log(userName)
 	if (platform == "android") {
@@ -32,11 +33,12 @@ export const getServerNo = function(version, isPrompt = false, callback) {
 	} else {
 		httpData.type = 1102;
 	}
+	console.log("》》》》", 222222);
 	/* 接口入参说明
 	 * version: 应用当前版本号（已自动获取）
 	 * type：平台（1101是安卓，1102是IOS）
 	 */
-	$http.get("api/appVersion/versioninfo", httpData, {
+	$http.get("appVersion/versioninfo", httpData, {
 		isPrompt: isPrompt
 	}).then(res => {
 		/* res的数据说明
@@ -48,6 +50,7 @@ export const getServerNo = function(version, isPrompt = false, callback) {
 		 * | forceUpdate	 | y	    | boolean	| 是否强制更新  |
 		 * | downloadUrl	 | y	    | String	| 版本下载链接（IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接）  |
 		 */
+		console.log("》》》》", 333333333);
 		console.log(res)
 		console.log(JSON.parse(res));
 		console.log(JSON.stringify(JSON.parse(res)))
@@ -76,6 +79,7 @@ export const getDownload = function(res) {
 	let file = data.fileName
 	let dtask;
 	let lastProgressValue = 0;
+	console.log("》》》》", 44444444);
 	downloadPopup(popupData, function(res) {
 			dtask = plus.downloader.createDownload(data.downloadUrl, {
 				// filename: '_doc/update/' + file + '/' + new Date().getTime() + '/'
@@ -670,7 +674,8 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
 			} else if (buttonNum == 2) {
 				// 双按钮
 				let buttonWidth = (popupViewData.viewContentWidth - popupViewData.viewContentPadding) / 2;
-				if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft - buttonWidth - popupViewData.viewContentPadding) {
+				if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft - buttonWidth -
+					popupViewData.viewContentPadding) {
 					maskLayer.hide();
 					popupView.hide();
 					cancelCallback && cancelCallback();
@@ -781,8 +786,10 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
 }
 export default function(isPrompt = false) {
 	getCurrentNo(version => {
+			console.log("》》》》", version);
 		getServerNo(version.versionCode, isPrompt, data => {
 			let res = JSON.parse(data);
+			console.log("》》》》", 6666666);
 			if (res.forceUpdate) {
 				if (/\.wgt$/i.test(res.downloadUrl)) {
 					getDownload(res);
diff --git a/mallplusui-uniapp-app/plugins/request/request.js b/mallplusui-uniapp-app/plugins/request/request.js
index 1b2877b..2eb27d1 100644
--- a/mallplusui-uniapp-app/plugins/request/request.js
+++ b/mallplusui-uniapp-app/plugins/request/request.js
@@ -18,7 +18,8 @@ export default class request {
 	// 获取默认信息
 	getDefault(data, options = {}) {
 		//判断url是不是链接
-		let urlType = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~/])+$/.test(data.url);
+		let urlType = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~/])+$/.test(
+			data.url);
 		let config = Object.assign({}, this.config, options, data);
 		if (data.method == "FILE") {
 			config.url = urlType ? data.url : this.fileUrl + data.url;
@@ -88,6 +89,7 @@ export default class request {
 				return;
 			}
 			let requestInfo = this.getDefault(data);
+
 			//请求前回调
 			if (this.requestStart) {
 				let requestStart = this.requestStart(requestInfo);
@@ -110,9 +112,12 @@ export default class request {
 					return;
 				}
 			}
+			console.log("url: requestInfo.url》》》》", requestInfo.url)
+			console.log("url: requestInfo.header》》》》", requestInfo.header)
 			let requestData = {
 				url: requestInfo.url,
 				header: requestInfo.header, //加入请求头
+
 				success: (res) => {
 					//请求完成回调
 					this.requestEnd && this.requestEnd(requestInfo, res);