20234-13

App.vue

@@ -25,7 +25,7 @@
 	let red =
 		'--view-theme: #e93323;--view-priceColor:#e93323;--view-minorColor:rgba(233, 51, 35, 0.5);--view-minorColorT:rgba(233, 51, 35, 0.1);--view-bntColor:#FE960F;--view-assistColor:#FE960F;'
 	let blue =
-		'--view-theme: #1DB0FC;--view-priceColor:#FD502F;--view-minorColor:rgba(58, 139, 236, 0.5);--view-minorColorT:rgba(9, 139, 243, 0.1);--view-bntColor:#22CAFD;--view-assistColor:#C4D9EC;'
+		'--view-theme: #ca9a72;--view-priceColor:#ca9a72;--view-minorColor:rgba(202,154,114, 0.5);--view-minorColorT:rgba(9, 139, 243, 0.1);--view-bntColor:#ca9a72;--view-assistColor:#C4D9EC;'
 	let pink =
 		'--view-theme: #FF448F;--view-priceColor:#FF448F;--view-minorColor:rgba(255, 68, 143, 0.5);--view-minorColorT:rgba(255, 68, 143, 0.1);--view-bntColor:#282828;--view-assistColor:#FEAC41;'
 	let orange =

libs/login.js

@@ -64,8 +64,9 @@ function _toLogin(push, pathLogin) {
 	path = location.pathname + location.search;
 	// #endif
 
-	if (!pathLogin)
+	if (!pathLogin){
 		pathLogin = '/page/users/login/index'
+	}
 	Cache.set('login_back_url', path);
 	// #ifdef H5
 	if (isWeixin()) {

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "crmeb",
-    "appid" : "__UNI__154C400",
-    "description" : "crmeb商城",
+    "name" : "太极券",
+    "appid" : "__UNI__B0B5BE7",
+    "description" : "太极券商城",
     "versionName" : "2.1.1",
     "versionCode" : 211,
     "transformPx" : false,

pages.json

@@ -12,12 +12,20 @@
         "navigationStyle": "custom"
       }
     },
+	{
+	  "path": "pages/store_cate/store_cate_index",
+	  "style": {
+	    "navigationBarTitleText": "门店详情",
+	    "navigationStyle": "custom",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
     {
       "path": "pages/store_cate/store_cate",
       "style": {
-        "navigationBarTitleText": "门店",
-        "navigationStyle": "custom",
-        "navigationBarTextStyle": "white"
+        "navigationBarTitleText": "门店列表"
+        // "navigationStyle": "custom",
+        // "navigationBarTextStyle": "white"
       }
     },
     {
@@ -1857,7 +1865,7 @@
   ],
   "tabBar": {
     "color": "#282828",
-    "selectedColor": "#ff3366",
+    "selectedColor": "#ca9a72",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
     "list": [{

pages/annex/vip_grade/index.vue

@@ -19,10 +19,10 @@
 						<view class="num">{{info.user.now_money}}</view>
 						<view>余额</view>
 					</view>
-					<view class="item">
+					<!-- <view class="item">
 						<view class="num">{{info.user.integral}}</view>
 						<view>积分</view>
-					</view>
+					</view> -->
 					<view class="item">
 						<view class="num">{{ info.level_info.discount　?　parseFloat(info.level_info.discount)/10　:　'0'}}</view>
 						<view>折扣</view>

pages/goods/components/lotteryAleart/index.vue

@@ -26,11 +26,11 @@
 		props: {
 			aleartType: {
 				type: Number,
-				default:0
+				default: 0
 			},
 			alData: {
 				type: Object,
-				default:()=>{}
+				default: () => {}
 			},
 			aleartStatus: {
 				type: Boolean,
@@ -45,7 +45,7 @@
 						msg: `1、您未关注公众号
 2、您未获得VIP权限，获取VIP途径：
 （1）购买过打通版的用户可在会员群联系官方客服开通
-（2）官方小程序商城购买CRMEB打通版、企业版后自动开通`,
+（2）官方小程序商城购买太极券打通版、企业版后自动开通`,
 						btn: '我知道了'
 					}
 				} else if (type === 2) {

pages/index/components/headerSerch.vue

@@ -168,7 +168,7 @@
 				let that = this;
 				uni.chooseLocation({
 					success: (res) => {
-						that.$emit('getAddress',res.address)
+						that.$emit('getAddress',res)
 					},
 					fail: (err)=>{
 						console.log(err)

pages/index/components/indexComponents.vue

@@ -9,7 +9,7 @@
 				<view class="btn" :class="{'activeColor':active==2}" @click="btnFn(2)">
 					常用门店
 				</view>
-				<input type="text" placeholder="搜索门店" class="input" focus @input="setValue"
+				<input type="text" placeholder="搜索门店" class="input" @input="setValue"
 					v-model="content.keyword"></input>
 				<view class="search" @click="searchMap()">
 					<text class="iconfont icon-sousuo6" />
@@ -19,33 +19,36 @@
 		<!-- 门店列表 -->
 		<view class="content" v-if="info.length>0">
 			<view class="list acea-row row-between-wrapper" v-for="(item,index) in info" :key="index"
-				 :class="{active:sortIndex==item.id}">
-				<text class="iconfont icon-xuanzhong6" v-if="sortIndex==item.id"></text>
-				<view class="left">
-					<view class="name line2">
-						{{item.name}}
-					</view>
-					<view class="adress acea-row">
-						<text class="iconfont icon-dingwei2" />
-						<view class="con">{{item.detailed_address}}</view>
-					</view>
-					<view class="adress">
-						<text class="iconfont icon-yingyeshijian2" />
-						营业时间：{{item.day_time}}
-					</view>
-				</view>
-				<view class="right">
+				 :class="{active:sortIndex==item.id}" @click="navTuShopIndex">
+				 <view class="flex">
+				 	<image :src="item.image" class="storeImg" mode="scaleToFill"></image>
+				 	<view class="left">
+				 		<view class="name line2">
+				 			{{item.name}}
+				 		</view>
+				 		<view class="adress acea-row">
+				 			
+				 			<view class="con line2"><text class="iconfont icon-dingwei2" />{{item.detailed_address}}</view>
+				 		</view>
+				 		<view class="adress">
+				 			<text class="iconfont icon-yingyeshijian2" />
+				 			营业时间：{{item.day_time}}
+				 		</view>
+				 	</view>
+				 </view>
+				<!-- <text class="iconfont icon-xuanzhong6" v-if="sortIndex==item.id"></text> -->
+				
+				<view class="right flex">
 					<view class="distance">
 						距离{{item.range}}km
 					</view>
 					<view class="telephone">
-						<view class="phone" @click="callPhone(item)">
+						<view class="phone" @click.stop="callPhone(item)">
 							<text class="iconfont icon-dianhua"></text>
 						</view>
-						<view class="phone" @click="showMaoLocation(item)">
+						<view class="phone" @click.stop="showMaoLocation(item)">
 							<text class="iconfont icon-dingwei2"></text>
 						</view>
-
 					</view>
 				</view>
 			</view>
@@ -81,7 +84,7 @@
 					longitude: uni.getStorageSync('user_longitude'),
 					store_type: 1,
 					keyword: "",
-					limit: 10,
+					limit: 1000,
 					page: 1
 				},
 				info: [],
@@ -94,16 +97,33 @@
 				covers: []
 			};
 		},
-		onLoad(options) {
-			this.comeType = options.type
-			this.sortIndex = options.storeId
-			console.log('dfdff', this.sortIndex);
-			this.getlist()
-		},
 		methods: {
+			// 跳转到门店详情页面
+			navTuShopIndex(){
+				uni.navigateTo({
+					url: '/pages/store_cate/store_cate_index',
+				});
+			},
 			// 门店列表
-			getlist() {
-				getList(this.content).then(res => {
+			getlist(address) {
+				let cot = this.content;
+				let content = {
+						store_type:cot.store_type,
+						keyword: cot.keyword,
+						limit:cot.limit,
+						page:cot.page,
+				}
+				console.log(address)
+				if(address){
+					// 自己的位置
+					content.latitude=address.latitude;
+					content.longitude=address.longitude
+				}else{
+					// 自己的位置
+					content.latitude=uni.getStorageSync('user_latitude');
+					content.longitude=uni.getStorageSync('user_longitude');
+				}
+				getList(content).then(res => {
 					this.info = res.data
 					res.data.forEach(item => {
 						if (this.sortIndex == item.id) {
@@ -292,19 +312,23 @@
 		padding: 0 30rpx;
 
 		.list {
-			display: flex;
 			margin-top: 20rpx;
 			width: 100%;
 			background: #FFFFFF;
 			border-radius: 12rpx;
 			padding: 28rpx 30rpx;
 			border: 1px solid #fff;
-
+			.flex{
+				flex-grow: 1;
+			}
+			.storeImg{
+				width: 200rpx;
+				height:200rpx;
+			}
 			.left {
-				width: 450rpx;
-				border-right: 1px solid #eee;
-				padding-right: 20rpx;
-
+				width: 300rpx;
+				flex-grow: 1;
+				padding: 0 20rpx;
 				.name {
 					font-size: 32rpx;
 					font-weight: bold;
@@ -312,7 +336,7 @@
 				}
 
 				.adress {
-					width: 400rpx;
+					width: 100%;
 					margin-top: 18rpx;
 					word-wrap: break-word;
 					font-size: 28rpx;
@@ -320,7 +344,7 @@
 					color: #888888;
 
 					.con {
-						width: 360rpx;
+						flex-shrink: 1;
 					}
 
 					.icon-dingwei2 {
@@ -339,7 +363,7 @@
 			}
 
 			.right {
-
+				align-items: center;
 				.gostore {
 					font-size: 22rpx;
 					font-weight: 400;
@@ -351,6 +375,7 @@
 					font-size: 28rpx;
 					font-weight: bold;
 					color: #999999;
+					flex-grow: 1;
 				}
 
 				.telephone {

pages/index/index.vue

@@ -159,9 +159,9 @@
 					</view>
 				</view>
 				<!-- #endif -->
-				<indexComponents></indexComponents>
-				<couponWindow :window="isCouponShow" @onColse="couponClose" :couponImage="couponObj.image"
-					:couponList="couponObj.list"></couponWindow>
+				<!-- <indexComponents ref="mapStoreList"></indexComponents> -->
+				<!-- <couponWindow :window="isCouponShow" @onColse="couponClose" :couponImage="couponObj.image"
+					:couponList="couponObj.list"></couponWindow> -->
 				<view class="uni-p-b-98" v-if="footerStatus"></view>
 				<view v-if="site_config" class="site-config" @click="goICP">{{ site_config }}</view>
 				<pageFooter></pageFooter>
@@ -186,7 +186,6 @@
 <script>
 	const app = getApp();
 	import colors from "@/mixins/color";
-	import couponWindow from '@/components/couponWindow/index';
 	import permision from "@/js_sdk/wa-permission/permission.js"
 
 	import {
@@ -204,7 +203,7 @@
 	} from '@/api/public.js';
 	// #endif
 	// #ifdef MP || APP-PLUS
-	import indexComponents from "./components/indexComponents.vue"
+	// import indexComponents from "./components/indexComponents.vue"
 	import userInfor from './components/userInfor';
 	import newVip from './components/newVip';
 	import shortVideo from './components/shortVideo';
@@ -276,8 +275,8 @@
 			recommend,
 			Loading,
 			pageFooter,
-			couponWindow,
-			indexComponents,
+			// couponWindow,
+			// indexComponents,
 			lazyLoad,
 			// #ifdef H5
 			...mConfig,
@@ -388,6 +387,7 @@
 						uni.setStorageSync('user_latitude', res.latitude);
 						uni.setStorageSync('user_longitude', res.longitude);
 						that.getGeocoderCity(res.latitude, res.longitude);
+						// that.$refs.mapStoreList.getlist();
 					} catch {}
 				}
 			});
@@ -405,6 +405,7 @@
 										uni.setStorageSync('user_latitude', res.latitude);
 										uni.setStorageSync('user_longitude', res.longitude);
 										that.getGeocoderCity(res.latitude, res.longitude);
+										// that.$refs.mapStoreList.getlist();
 									} catch {}
 								}
 							});
@@ -422,6 +423,7 @@
 											uni.setStorageSync('user_longitude', res
 											.longitude);
 											that.getGeocoderCity(res.latitude, res.longitude);
+											// that.$refs.mapStoreList.getlist();
 										} catch {}
 									}
 								});
@@ -446,6 +448,7 @@
 							uni.setStorageSync('user_latitude', res.latitude);
 							uni.setStorageSync('user_longitude', res.longitude);
 							that.getGeocoderCity(res.latitude, res.longitude);
+							// that.$refs.mapStoreList.getlist();
 						} catch {}
 					}
 				});
@@ -465,6 +468,7 @@
 			// #ifndef APP-PLUS
 			this.getCopyRight();
 			// #endif
+			// this.$refs.mapStoreList.getlist();
 		},
 		watch: {
 			isLogin: {
@@ -477,7 +481,7 @@
 							var oldDate = uni.getStorageSync('oldDate') || '';
 						} catch {}
 						if (oldDate != newDates) {
-							this.getCoupon();
+							// this.getCoupon();
 						}
 					}
 				}
@@ -496,15 +500,19 @@
 			}
 			uni.removeStorageSync('form_type_cart');
 			// 优惠券弹窗
-			if (this.isLogin) {
-				this.getCoupon();
-			}
+			// if (this.isLogin) {
+			// 	this.getCoupon();
+			// }
 			this.getdiyProduct()
 		},
 		onReady() {},
 		methods: {
+			// 获取地址
 			getAddress(e) {
-				this.addressInfo = e;
+				this.addressInfo = e.address;
+				this.$nextTick(()=>{
+				// this.$refs.mapStoreList.getlist(e);
+				})
 			},
 			getGeocoderCity(latitude, longitude) {
 				getGeocoder({
@@ -670,53 +678,53 @@
 				});
 			},
 			// 新用户优惠券
-			getNewCoupon() {
-				const oldUser = uni.getStorageSync('oldUser') || 0;
-				if (!oldUser) {
-					getCouponNewUser().then(res => {
-						const {
-							data
-						} = res;
-						if (data.show) {
-							if (data.list.length) {
-								this.isCouponShow = true;
-								this.couponObj = data;
-								uni.setStorageSync('oldUser', 1);
-							}
-						} else {
-							uni.setStorageSync('oldUser', 1);
-						}
-					});
-				}
-			},
+			// getNewCoupon() {
+			// 	const oldUser = uni.getStorageSync('oldUser') || 0;
+			// 	if (!oldUser) {
+			// 		getCouponNewUser().then(res => {
+			// 			const {
+			// 				data
+			// 			} = res;
+			// 			if (data.show) {
+			// 				if (data.list.length) {
+			// 					// this.isCouponShow = true;
+			// 					this.couponObj = data;
+			// 					uni.setStorageSync('oldUser', 1);
+			// 				}
+			// 			} else {
+			// 				uni.setStorageSync('oldUser', 1);
+			// 			}
+			// 		});
+			// 	}
+			// },
 			// 优惠券弹窗
-			getCoupon() {
-				const tagDate = uni.getStorageSync('tagDate') || '',
-					nowDate = new Date().toLocaleDateString();
-				if (tagDate === nowDate) {
-					this.getNewCoupon();
-				} else {
-					getCouponV2().then(res => {
-						const {
-							data
-						} = res;
-						if (data.list.length) {
-							this.isCouponShow = true;
-							this.couponObj = data;
-							uni.setStorageSync('tagDate', new Date().toLocaleDateString());
-						} else {
-							this.getNewCoupon();
-						}
-					});
-				}
-			},
+			// getCoupon() {
+			// 	const tagDate = uni.getStorageSync('tagDate') || '',
+			// 		nowDate = new Date().toLocaleDateString();
+			// 	if (tagDate === nowDate) {
+			// 		this.getNewCoupon();
+			// 	} else {
+			// 		getCouponV2().then(res => {
+			// 			const {
+			// 				data
+			// 			} = res;
+			// 			if (data.list.length) {
+			// 				this.isCouponShow = true;
+			// 				this.couponObj = data;
+			// 				uni.setStorageSync('tagDate', new Date().toLocaleDateString());
+			// 			} else {
+			// 				this.getNewCoupon();
+			// 			}
+			// 		});
+			// 	}
+			// },
 			// 优惠券弹窗关闭
-			couponClose() {
-				this.isCouponShow = false;
-				if (!uni.getStorageSync('oldUser')) {
-					this.getNewCoupon();
-				}
-			},
+			// couponClose() {
+			// 	this.isCouponShow = false;
+			// 	if (!uni.getStorageSync('oldUser')) {
+			// 		this.getNewCoupon();
+			// 	}
+			// },
 			onLoadFun() {},
 			// #ifdef H5
 			// 获取url后面的参数

pages/store/map/index.vue

@@ -115,7 +115,7 @@
 				covers: []
 			};
 		},
-		created(options) {
+		onLoad(options) {
 			this.comeType = options.type
 			this.sortIndex = options.storeId
 			console.log('dfdff', this.sortIndex);

pages/store_cate/store_cate.vue

@@ -1,86 +1,138 @@
 <template>
-  <!-- 商品分类 -->
-  <view :style="colorStyle">
-    <!-- 门店的两种样式布局 -->
-    <storeCate1 :info="info" :isFooter="isFooter" v-if="storeShow===1"   ref="refresh2">
-    </storeCate1>
-    <storeCate2 :info="info" :customerType="customerType" v-if="storeShow===2"  ref="refresh">
-    </storeCate2>
-    <pageFooter @newDataStatus="newDataStatus"></pageFooter>
-  </view>
+	<view :style="colorStyle">
+		<!-- 附近门店 -->
+		<view class="nearby" v-if="header">
+			<view class="store acea-row row-middle">
+				<view class="btn" :class="{'activeColor':active==1}" @click="btnFn(1)">
+					附近门店
+				</view>
+				<view class="btn" :class="{'activeColor':active==2}" @click="btnFn(2)">
+					常用门店
+				</view>
+				<input type="text" placeholder="搜索门店" class="input" @input="setValue" v-model="content.keyword"></input>
+				<view class="search" @click="searchMap()">
+					<text class="iconfont icon-sousuo6" />
+				</view>
+			</view>
+		</view>
+		<!-- 门店列表 -->
+		<view class="content" v-if="info.length>0">
+			<view class="list acea-row row-between-wrapper" v-for="(item,index) in info" :key="index"
+				:class="{active:sortIndex==item.id}" @click="navTuShopIndex(item)">
+				<view class="flex">
+					<image :src="item.image" class="storeImg" mode="scaleToFill"></image>
+					<view class="left">
+						<view class="name line2">
+							{{item.name}}
+						</view>
+						<view class="adress acea-row">
+
+							<view class="con line2"><text class="iconfont icon-dingwei2" />{{item.detailed_address}}
+							</view>
+						</view>
+						<view class="adress">
+							<text class="iconfont icon-yingyeshijian2" />
+							营业时间：{{item.day_time}}
+						</view>
+					</view>
+				</view>
+				<!-- <text class="iconfont icon-xuanzhong6" v-if="sortIndex==item.id"></text> -->
+
+				<view class="right flex">
+					<view class="distance">
+						距离{{item.range}}km
+					</view>
+					<view class="telephone">
+						<view class="phone" @click.stop="callPhone(item)">
+							<text class="iconfont icon-dianhua"></text>
+						</view>
+						<view class="phone" @click.stop="showMaoLocation(item)">
+							<text class="iconfont icon-dingwei2"></text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 缺省页 -->
+		<view class="default" v-if="info.length==0">
+			<image :src="imgHost+'/statics/images/store-default.png'" mode="" class="img"></image>
+			<view class="text">
+				暂无门店信息，再去试试其他地址吧~
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import colors from "@/mixins/color";
-  import storeCate1 from './store_cate1.vue'
-  import storeCate2 from './store_cate2.vue'
-  import pageFooter from '@/components/pageFooter/index.vue'
-
-  import {
-    getnearbyStore
-  } from '@/api/new_store.js'
-  import {
-    colorChange
-  } from '@/api/api.js';
-  export default {
-    components: {
-      storeCate1,
-      storeCate2,
-      pageFooter
-    },
-    mixins: [colors],
-    data() {
-      return {
-        info: {},
-        id:0,
-        isFooter: false,
-        category: '',
-        storeShow: 2,
-				customerType:1,
-        where: {
-          latitude: 0,
-          longitude: 0,
-					store_id: 0
-        },
-      }
-    },
-		onLoad(){
-			 try {
-			 	this.where.latitude = uni.getStorageSync('user_latitude');
-			 	this.where.longitude = uni.getStorageSync('user_longitude');
-			 } catch (e) {}
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import colors from "@/mixins/color";
+	import {
+		getList
+	} from '@/api/new_store.js'
+	export default {
+		mixins: [colors],
+		data() {
+			return {
+				imgHost: HTTP_REQUEST_URL,
+				sortIndex: 0,
+				active: 1,
+				content: {
+					// 自己的位置
+					latitude: uni.getStorageSync('user_latitude'),
+					longitude: uni.getStorageSync('user_longitude'),
+					store_type: 1,
+					keyword: "",
+					limit: 1000,
+					page: 1,
+					loding:false,//判断是否加载中
+					lode:false//判断是否可以继续加载
+				},
+				info: [],
+				map: 1,
+				header: 1,
+				comeType: 0,
+				// 门店位置
+				latitudeStore: 0,
+				longitudeStore: 0,
+				covers: []
+			};
 		},
-    onShow(){
-    	uni.removeStorageSync('form_type_cart');
-    	let _this = this
-    	uni.$on("handClick", res => {
-    	  if (res) {
-    	    _this.where.latitude = res.latitude
-					_this.where.longitude = res.longitude
-					_this.where.store_id = res.store_id
-					_this.getStore();
-    	  }
-    	  // 清除监听
-    	  uni.$off('handClick');
-    	})
-			if (this.where.latitude && this.where.longitude) {
-				this.getStore();
+		onShow() {
+			if (this.content.latitude && this.content.longitude) {
+				this.getlist();
 			} else {
 				this.selfLocation();
 			}
-    },
-		mounted() {},
-    methods: {
+		},
+		// onReachBottom() {
+		// 	if (this.content.latitude && this.content.longitude) {
+		// 		this.getlist();
+		// 	} else {
+		// 		this.selfLocation();
+		// 	}
+		// },
+		methods: {
+			// 跳转到门店详情页面
+			navTuShopIndex(item) {
+				uni.setStorageSync('user_latitude', item.latitude);
+				uni.setStorageSync('user_longitude', item.longitude);
+				uni.navigateTo({
+					url: '/pages/store_cate/store_cate_index',
+				});
+			},
+			// 获取当前位置信息
 			selfLocation() {
 				let self = this
 				// #ifdef H5
 				if (self.$wechat.isWeixin()) {
 					self.$wechat.location().then(res => {
-						this.where.latitude = res.latitude;
-						this.where.longitude = res.longitude;
+						this.content.latitude = res.latitude;
+						this.content.longitude = res.longitude;
 						uni.setStorageSync('user_latitude', res.latitude);
 						uni.setStorageSync('user_longitude', res.longitude);
-						self.getStore();
+						self.getlist();
 					})
 				} else {
 					// #endif	
@@ -88,61 +140,372 @@
 						type: 'wgs84',
 						success: (res) => {
 							try {
-								this.where.latitude = res.latitude;
-								this.where.longitude = res.longitude;
+								this.content.latitude = res.latitude;
+								this.content.longitude = res.longitude;
 								uni.setStorageSync('user_latitude', res.latitude);
 								uni.setStorageSync('user_longitude', res.longitude);
 							} catch {}
-							self.getStore();
+							self.getlist();
 						},
 						complete: function() {
-							self.getStore();
+							self.getlist();
+						}
+					});
+					// #ifdef H5	
+				}
+				// #endif
+			},
+			// 门店列表
+			getlist(address) {
+				let cot = this.content;
+				let content = {
+					store_type: cot.store_type,
+					keyword: cot.keyword,
+					limit: cot.limit,
+					page: cot.page,
+				}
+				console.log(address)
+				if (address) {
+					// 自己的位置
+					content.latitude = address.latitude;
+					content.longitude = address.longitude
+				} else {
+					// 自己的位置
+					content.latitude = uni.getStorageSync('user_latitude');
+					content.longitude = uni.getStorageSync('user_longitude');
+				}
+				getList(content).then(res => {
+					this.info = res.data
+					res.data.forEach(item => {
+						if (this.sortIndex == item.id) {
+							this.latitudeStore = item.latitude;
+							this.longitudeStore = item.longitude;
+							this.covers.push({
+								title: item.name,
+								latitude: item.latitude,
+								longitude: item.longitude,
+								iconPath: item.image,
+								width: 30,
+								height: 30
+							})
+						}
+					})
+					if(res.data.length== cot.limit){
+						cot.page++
+					}else{
+						
+					}
+				})
+			},
+			// 输入关键字搜索门店
+			setValue(e) {
+				this.getlist()
+
+			},
+			// 点击高亮
+			// activeFn(row) {
+			// 	this.sortIndex = row.id
+			// 	if (this.comeType) {
+			// 		uni.$emit("handClick", {
+			// 			latitude: row.latitude,
+			// 			longitude: row.longitude,
+			// 			store_id: row.id
+			// 		});
+			// 		uni.navigateBack();
+			// 	}
+			// },
+			// 搜索门店
+			searchMap() {
+				// this.header = 0
+			},
+			// 收起地图
+			putMap() {
+				if (this.map == 1) {
+					this.map = 0
+				} else if (this.map == 0) {
+					this.map = 1
+				}
+
+			},
+			// 打电话
+			callPhone(row) {
+				uni.makePhoneCall({
+					phoneNumber: row.phone //仅为示例
+				});
+			},
+			btnFn(num) {
+				switch (num) {
+					case 1:
+						this.active = 1
+						this.content.store_type = 1
+						break;
+					case 2:
+						this.active = 2
+						this.content.store_type = 2
+						break;
+				}
+				this.getlist()
+			},
+			showMaoLocation(e) {
+				let self = this;
+				// #ifdef H5
+				if (self.$wechat.isWeixin()) {
+					self.$wechat.seeLocation({
+						latitude: Number(e.latitude),
+						longitude: Number(e.longitude),
+						name: e.name,
+						scale: 13,
+						address: `${e.address}-${e.detailed_address}`,
+					}).then(res => {})
+				} else {
+					// #endif	
+					uni.openLocation({
+						latitude: Number(e.latitude),
+						longitude: Number(e.longitude),
+						name: e.name,
+						address: `${e.address}-${e.detailed_address}`,
+						success: function() {
+							Number
 						}
 					});
 					// #ifdef H5	
 				}
 				// #endif
 			},
-      // 获取接口附近门店
-      getStore() {
-				this.where.latitude = uni.getStorageSync('user_latitude');
-				this.where.longitude = uni.getStorageSync('user_longitude');
-        getnearbyStore(this.where).then(res => {
-          this.storeShow = res.data.info.home_style
-          this.info = res.data.info
-          this.id = this.info.id
-		  this.customerType = parseInt(res.data.info.customer_type)
-		  uni.setStorageSync('user_store_id', this.info.id);
-          if (this.storeShow === 1) {
-          setTimeout(()=>{
-            this.$refs.refresh2.getAllCategory();
-            this.$refs.refresh2.getCartList(1);
-              this.$refs.refresh2.getMarTop();
-          },10)
-          } else if (this.storeShow === 2) {
-						setTimeout(()=>{
-							this.$refs.refresh.where.store_id = this.id
-							this.$refs.refresh.getProducts(true)
-						})
-          }
-        })
-      },
-      newDataStatus(val) {
-        this.isFooter = val;
-      },
-    },
-    onReachBottom: function() {
-       if (this.storeShow === 1) {
-         setTimeout(()=>{
-                    this.$refs.refresh2.getProducts()
-         },10)
-    	}
-    	if(this.storeShow === 2){
-    		  this.$refs.refresh.getProducts()
-    	}
-    }
-  }
+		}
+	}
 </script>
-<style scoped lang="scss">
 
+<style lang="scss">
+	page {
+		width: 750rpx;
+	}
+
+	.active {
+		position: relative;
+		border: 1px solid var(--view-theme) !important;
+
+		.icon-xuanzhong6 {
+			font-size: 46rpx;
+			position: absolute;
+			bottom: -4rpx;
+			right: -6rpx;
+			color: var(--view-theme);
+		}
+	}
+
+	.activeColor {
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
+	}
+
+	.nearby {
+		width: 100%;
+		background-color: #fff;
+		box-shadow: 0px -2px 22px 0px rgba(0, 0, 0, 0.0400);
+
+		.store {
+			height: 80rpx;
+			padding: 0 30rpx;
+			align-items: flex-start;
+			.input {
+				padding-left: 30rpx;
+				height: 60rpx;
+				background: #F5F5F5;
+				border-radius: 30rpx;
+				font-size: 26rpx;
+				font-weight: 400;
+			}
+
+			.btn {
+				margin-right: 16rpx;
+				width: 160rpx;
+				height: 56rpx;
+				background: #F5F5F5;
+				border-radius: 29rpx;
+				text-align: center;
+				line-height: 56rpx;
+				font-size: 26rpx;
+				font-weight: 400;
+				color: #999999;
+			}
+
+			.put {
+				color: #666666 !important;
+				margin-left: 96rpx;
+				background-color: #fff !important;
+
+				.icon-xiangshang {
+					margin-right: 10rpx;
+					color: #666666;
+					font-size: 24rpx;
+				}
+
+				.icon-xiangxia {
+					margin-right: 10rpx;
+					color: #666666;
+					font-size: 24rpx;
+				}
+
+			}
+
+			.search {
+				position: absolute;
+				right: 30rpx;
+				text-align: center;
+				line-height: 56rpx;
+				width: 56rpx;
+				height: 56rpx;
+				background: #F5F5F5;
+				border-radius: 50%;
+			}
+		}
+	}
+
+	.content {
+
+		width: 100%;
+		height: 100%;
+		padding: 0 30rpx;
+
+		.list {
+			margin-top: 20rpx;
+			width: 100%;
+			background: #FFFFFF;
+			border-radius: 12rpx;
+			padding: 28rpx 30rpx;
+			border: 1px solid #fff;
+
+			.flex {
+				flex-grow: 1;
+			}
+
+			.storeImg {
+				width: 200rpx;
+				height: 200rpx;
+			}
+
+			.left {
+				width: 300rpx;
+				flex-grow: 1;
+				padding: 0 20rpx;
+
+				.name {
+					font-size: 32rpx;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.adress {
+					width: 100%;
+					margin-top: 18rpx;
+					word-wrap: break-word;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #888888;
+
+					.con {
+						flex-shrink: 1;
+					}
+
+					.icon-dingwei2 {
+						margin-right: 8rpx;
+						font-size: 18rpx;
+						color: #ccc;
+						margin-top: 6rpx;
+					}
+
+					.icon-yingyeshijian2 {
+						margin-right: 8rpx;
+						font-size: 18rpx;
+						color: #ccc;
+					}
+				}
+			}
+
+			.right {
+				align-items: center;
+
+				.gostore {
+					font-size: 22rpx;
+					font-weight: 400;
+					color: var(--view-theme);
+				}
+
+				.distance {
+					margin-top: 14rpx;
+					font-size: 28rpx;
+					font-weight: bold;
+					color: #999999;
+					flex-grow: 1;
+				}
+
+				.telephone {
+					margin-top: 14rpx;
+					display: flex;
+
+					.phone:nth-child(2) {
+						margin-left: 30rpx;
+					}
+
+					.phone {
+						position: relative;
+						width: 60rpx;
+						height: 60rpx;
+						background: var(--view-minorColorT);
+						border-radius: 50%;
+						text-align: center;
+						line-height: 60rpx;
+						z-index: 10;
+
+						.icon-dingwei2 {
+							font-size: 32rpx;
+							color: var(--view-theme) !important;
+						}
+
+						.icon-dianhua {
+							font-size: 32rpx;
+							color: var(--view-theme) !important;
+						}
+					}
+
+				}
+			}
+		}
+	}
+
+	.lyric-enter,
+	.lyric-leave-to {
+		opacity: 0;
+		transform: translateY(60px);
+	}
+
+	.lyric-enter-to,
+	.lyric-leave {
+		opacity: 1;
+
+	}
+
+	.lyric-enter-active,
+	.lyric-leave-active {
+		transition: all 0.3s;
+	}
+
+	.default {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.img {
+			width: 414rpx;
+			height: 256rpx;
+		}
+
+		.text {
+			margin-top: 54rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+	}
 </style>

pages/store_cate/store_cate1.vue

@@ -1,1364 +1,1376 @@
 <template>
-  <!-- 商品分类第三种布局样式 -->
-  <view class="goodCate">
-    <!-- #ifdef MP || APP-PLUS -->
-    <view class="mp-header">
-      <view class="sys-head" :style="{ height: sysHeight }"></view>
-      <view class="serch-box" style="height: 43px;">
-        <view class="serch-wrapper acea-row row-middle">
-          <navigator url="/pages/goods/goods_search/index" class="input acea-row row-center-wrapper" hover-class="none">
-            <text class="iconfont icon-xiazai5"></text>
-            搜索商品信息
-          </navigator>
-        </view>
-      </view>
-      <!-- 门店地址详情 -->
-      <view class="store-address">
-        <view class="address acea-row row-middle" @click="goMap()">
+	<!-- 商品分类第三种布局样式 -->
+	<view class="goodCate">
+		<!-- #ifdef MP || APP-PLUS -->
+		<view class="mp-header">
+			<view class="sys-head" :style="{ height: sysHeight }"></view>
+			<view class="serch-box" style="height: 43px;">
+				<view class="serch-wrapper acea-row row-middle">
+					<navigator url="/pages/goods/goods_search/index" class="input acea-row row-center-wrapper"
+						hover-class="none">
+						<text class="iconfont icon-xiazai5"></text>
+						搜索商品信息
+					</navigator>
+				</view>
+			</view>
+			<!-- 门店地址详情 -->
+			<view class="store-address">
+				<view class="address acea-row row-middle" @click="goMap()">
 					<view class="name line1">{{info.name || '暂无门店'}}</view>
-          <text class="iconfont icon-xiangyou" />
-        </view>
-        <view class="distance">
-          门店距您{{info.range||0}}km
-        </view>
-        <view class="time">
-          营业时间：{{info.day_time || '-'}}
-        </view>
-        <view class="switch" :class='switchNum==2?"rightAdd":""'>
-          <view class="delivery " :class="switchNum==1?'activeColor':''" @click="swithFn(1)">
+					<text class="iconfont icon-xiangyou" />
+				</view>
+				<view class="distance">
+					门店距您{{info.range||0}}km
+				</view>
+				<view class="time">
+					营业时间：{{info.day_time || '-'}}
+				</view>
+				<view class="switch" :class='switchNum==2?"rightAdd":""'>
+					<!-- <view class="delivery " :class="switchNum==1?'activeColor':''" @click="swithFn(1)">
             配送
-          </view>
-          <view class="delivery" :class="switchNum==2?'activeColor2':''" @click="swithFn(2)">
-            自提
-          </view>
-        </view>
-      </view>
-      <!-- 门店详情 -->
-    </view>
-
-    <!-- #endif -->
-    <!-- #ifdef H5 -->
-    <view class="header acea-row row-center-wrapper">
-      <navigator url="/pages/goods/goods_search/index" class="search acea-row row-middle" hover-class="none">
-        <text class="iconfont icon-sousuo5"></text>
-        搜索商品信息
-      </navigator>
-
-      <view class="store-address">
-        <view class="address acea-row row-middle" @click="goMap()">
+          </view> -->
+					<view class="delivery" :class="switchNum==2?'activeColor2':''" @click="swithFn(2)">
+						自提
+					</view>
+				</view>
+			</view>
+			<!-- 门店详情 -->
+		</view>
+
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<view class="header acea-row row-center-wrapper">
+			<navigator url="/pages/goods/goods_search/index" class="search acea-row row-middle" hover-class="none">
+				<text class="iconfont icon-sousuo5"></text>
+				搜索商品信息
+			</navigator>
+
+			<view class="store-address">
+				<view class="address acea-row row-middle" @click="goMap()">
 					<view class="name line1">{{info.name || '暂无门店'}}</view>
-          <text class="iconfont icon-xiangyou" />
-        </view>
-        <view class="distance">
-          门店距您{{info.range||0}}km
-        </view>
-        <view class="time">
-          营业时间：{{info.day_time || '-'}}
-        </view>
-        <view class="switch" :class='switchNum==2?"rightAdd":""'>
-          <view class="delivery " :class="switchNum==1?'activeColor':''" @click="swithFn(1)">
-            配送
-          </view>
-          <view class="delivery" :class="switchNum==2?'activeColor2':''" @click="swithFn(2)">
-            自提
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="conter">
-      <!-- #endif -->
-      <!-- #ifndef H5 -->
-      <view class="conter" :style="'padding-top:'+(marTop+86)+'rpx'">
-      <!-- #endif -->
-        <!-- #ifndef H5 -->
-        <view class='aside'>
-          <!-- #endif -->
-          <!-- #ifdef H5 -->
-          <view class='aside'>
-            <!-- #endif -->
-            <view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
-              v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
-              <text>{{item.cate_name}}</text>
-            </view>
-          </view>
-          <view class="wrapper">
-            <view class="bgcolor" v-if="iSlong">
-              <!-- #ifndef H5 -->
-              <view class="longTab acea-row row-middle">
-                <!-- #endif -->
-                <!-- #ifdef H5 -->
-                <view class="longTab acea-row row-middle">
-                  <!-- #endif -->
-                  <scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height:44rpx;"
-                    scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
-                    <view class="longItem" :style='"width:"+isWidth+"px"' :class="index===tabClick?'click':''"
-                      v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
-                      {{item.cate_name}}
-                    </view>
-                  </scroll-view>
-                </view>
-                <!-- #ifndef H5 -->
-                <view class="openList" @click="openTap"><text
-                    class="iconfont icon-xiangxia"></text></view>
-                <!-- #endif -->
-                <!-- #ifdef H5 -->
-                <view class="openList" @click="openTap"><text class="iconfont icon-xiangxia"></text></view>
-                <!-- #endif -->
-              </view>
-              <view v-else>
-                <!-- #ifndef H5 -->
-                <view class="downTab" :style="'margin-top:'+marTop+'px'">
-                  <!-- #endif -->
-                  <!-- #ifdef H5 -->
-                  <view class="downTab">
-                    <!-- #endif -->
-                    <view class="title acea-row row-between-wrapper">
-                      <view>{{categoryTitle}}</view>
-                      <view class="closeList" @click="closeTap"><text class="iconfont icon-xiangxia"></text>
-                      </view>
-                    </view>
-                    <view class="children">
-                      <view class="acea-row row-middle">
-                        <view class="item line1" :class="index===tabClick?'click':''"
-                          v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
-                          {{item.cate_name}}
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-                  <view class="mask" @click="closeTap"></view>
-                </view>
-                <!--商品列表 -->
-      
-                  <goodClass :tempArr="tempArr" :isLogin="isLogin" @gocartduo="goCartDuo" @gocartdan="goCartDan"
-                    @ChangeCartNumDan="ChangeCartNumDan" @detail="goDetail"></goodClass>
-                  <view class='loadingicon acea-row row-center-wrapper'>
-                    <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-                  </view>
-           
-            
-              </view>
-            </view>
-            <view class="footer acea-row row-between-wrapper" :class="isFooter?'':'on'">
-              <view class="cartIcon acea-row row-center-wrapper" @click="getCartList(0)" v-if="cartNum>0">
-                <view class="iconfont icon-gouwuche-yangshi2"></view>
-                <text class="num">{{cartNum}}</text>
-              </view>
-              <view class="cartIcon acea-row row-center-wrapper noCart" v-else>
-                <view class="iconfont icon-gouwuche-yangshi2"></view>
-              </view>
-              <view class="acea-row row-middle" :class="cartNum>0?'':'noCart'">
-                <view class="money">￥<text class="num">{{totalPrice}}</text></view>
-                <view class="bnt" @click="subOrder">去结算</view>
-              </view>
-            </view>
-            <!-- 分类购物车下拉列表 -->
-            <cartList :cartData="cartData" @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
-              @ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
-            <!-- 产品属性组件 -->
-            <productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent"
-              @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal" @iptCartNum="iptCartNum"
-              @goCat="goCatNum" :is_vip="is_vip" id='product-window'></productWindow>
-          </view>
+					<text class="iconfont icon-xiangyou" />
+				</view>
+				<view class="distance">
+					门店距您{{info.range||0}}km
+				</view>
+				<view class="time">
+					营业时间：{{info.day_time || '-'}}
+				</view>
+				<view class="switch" :class='switchNum==2?"rightAdd":""'>
+					<view class="delivery " :class="switchNum==1?'activeColor':''" @click="swithFn(1)">
+						配送
+					</view>
+					<view class="delivery" :class="switchNum==2?'activeColor2':''" @click="swithFn(2)">
+						自提
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="conter">
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<view class="conter" :style="'padding-top:'+(marTop+86)+'rpx'">
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<view class='aside'>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<view class='aside'>
+						<!-- #endif -->
+						<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
+							v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
+							<text>{{item.cate_name}}</text>
+						</view>
+					</view>
+					<view class="wrapper">
+						<view class="bgcolor" v-if="iSlong">
+							<!-- #ifndef H5 -->
+							<view class="longTab acea-row row-middle">
+								<!-- #endif -->
+								<!-- #ifdef H5 -->
+								<view class="longTab acea-row row-middle">
+									<!-- #endif -->
+									<scroll-view scroll-x="true"
+										style="white-space: nowrap; display: flex;height:44rpx;" scroll-with-animation
+										:scroll-left="tabLeft" show-scrollbar="true">
+										<view class="longItem" :style='"width:"+isWidth+"px"'
+											:class="index===tabClick?'click':''" v-for="(item,index) in categoryErList"
+											:key="index" @click="longClick(index)">
+											{{item.cate_name}}
+										</view>
+									</scroll-view>
+								</view>
+								<!-- #ifndef H5 -->
+								<view class="openList" @click="openTap"><text class="iconfont icon-xiangxia"></text>
+								</view>
+								<!-- #endif -->
+								<!-- #ifdef H5 -->
+								<view class="openList" @click="openTap"><text class="iconfont icon-xiangxia"></text>
+								</view>
+								<!-- #endif -->
+							</view>
+							<view v-else>
+								<!-- #ifndef H5 -->
+								<view class="downTab" :style="'margin-top:'+marTop+'px'">
+									<!-- #endif -->
+									<!-- #ifdef H5 -->
+									<view class="downTab">
+										<!-- #endif -->
+										<view class="title acea-row row-between-wrapper">
+											<view>{{categoryTitle}}</view>
+											<view class="closeList" @click="closeTap"><text
+													class="iconfont icon-xiangxia"></text>
+											</view>
+										</view>
+										<view class="children">
+											<view class="acea-row row-middle">
+												<view class="item line1" :class="index===tabClick?'click':''"
+													v-for="(item,index) in categoryErList" :key="index"
+													@click="longClick(index)">
+													{{item.cate_name}}
+												</view>
+											</view>
+										</view>
+									</view>
+									<view class="mask" @click="closeTap"></view>
+								</view>
+								<!--商品列表 -->
+
+								<goodClass :tempArr="tempArr" :isLogin="isLogin" @gocartduo="goCartDuo"
+									@gocartdan="goCartDan" @ChangeCartNumDan="ChangeCartNumDan" @detail="goDetail">
+								</goodClass>
+								<view class='loadingicon acea-row row-center-wrapper'>
+									<text class='loading iconfont icon-jiazai'
+										:hidden='loading==false'></text>{{loadTitle}}
+								</view>
+
+
+							</view>
+						</view>
+						<view class="footer acea-row row-between-wrapper" :class="isFooter?'':'on'">
+							<view class="cartIcon acea-row row-center-wrapper" @click="getCartList(0)" v-if="cartNum>0">
+								<view class="iconfont icon-gouwuche-yangshi2"></view>
+								<text class="num">{{cartNum}}</text>
+							</view>
+							<view class="cartIcon acea-row row-center-wrapper noCart" v-else>
+								<view class="iconfont icon-gouwuche-yangshi2"></view>
+							</view>
+							<view class="acea-row row-middle" :class="cartNum>0?'':'noCart'">
+								<view class="money">￥<text class="num">{{totalPrice}}</text></view>
+								<view class="bnt" @click="subOrder">去结算</view>
+							</view>
+						</view>
+						<!-- 分类购物车下拉列表 -->
+						<cartList :cartData="cartData" @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
+							@ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
+						<!-- 产品属性组件 -->
+						<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent"
+							@ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal"
+							@iptCartNum="iptCartNum" @goCat="goCatNum" :is_vip="is_vip" id='product-window'>
+						</productWindow>
+					</view>
 </template>
 
 <script>
-  let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-
-  import {
-    vcartList,
-    getCartCounts,
-    cartDel
-  } from '@/api/order.js';
-  import {
-  	getCategoryList,
-  	getProductslist,
-  	getAttr,
-  	postCartNum
-  } from '@/api/store.js';
-  import {
-    getProducts,
-    getCustomerList,
-    getStoreCategory,
-    getStoreBrand
-  } from '@/api/new_store.js';
-  import productWindow from '@/components/productWindow/index';
-  import goodClass from '@/components/goodClass';
-  import cartList from '@/components/cartList';
-  import {
-    mapState,
-    mapGetters
-  } from 'vuex';
-  import {
-    goShopDetail
-  } from '@/libs/order.js';
-  import {
-    toLogin
-  } from '@/libs/login.js';
-  export default {
-    computed: {
-      ...mapState({
-        cartNum: state => state.indexData.cartNum
-      }),
-      ...mapGetters(['isLogin', 'uid', 'cartNum'])
-    },
-    components: {
-      productWindow,
-      goodClass,
-      cartList
-    },
-    props: {
-      isFooter: {
-        type: Boolean,
-        default: false
-      },
-      info: {
-        type: Object,
-        default: {}
-      },
-   
-    },
-    data() {
-      return {
-        marTop: 0,
-        switchNum: 1,
-        sysHeight: sysHeight,
-        categoryList: [],
-        navActive: 0,
-        categoryTitle: '',
-        categoryErList: [],
-        tabLeft: 0,
-        isWidth: 0, //每个导航栏占位
-        tabClick: 0, //导航栏被点击
-        iSlong: true,
-        tempArr: [],
-        loading: false,
-        loadend: false,
-        loadTitle: '加载更多',
-        page: 1,
-        limit: 10,
-        cid: 0, //一级分类
-        sid: 0, //二级分类
-        delivery_type:3, // 配送方式
-        isAuto: false, //没有授权的不会自动授权
-        isShowAuth: false, //是否隐藏授权
-        attr: {
-          cartAttr: false,
-          productAttr: [],
-          productSelect: {}
-        },
-        productValue: [],
-        attrValue: '', //已选属性
-        storeName: '', //多属性产品名称
-        id: 0,
-        cartData: {
-          cartList: [],
-          iScart: false
-        },
-        totalPrice: 0.00,
-        lengthCart: 0,
-        is_vip: 0, //是否是会员
-        cart_num: 0,
-        storeInfo: {},
-      }
-    },
-    mounted() {
-      let that = this;
-      // 获取设备宽度
-      uni.getSystemInfo({
-        success(e) {
-          that.isWidth = e.windowWidth / 5
-        }
-      });
-    },
-    methods: {
-      updateFun(e) {
-        if (e.cartNum) {
-          this.tempArr.forEach((item) => {
-            if (item.id == e.id) {
-              item.cart_num = e.cartNum
-            }
-          })
-        }
-      },
-      // 商品列表
-      getProducts(flag) {
-        let that = this;
-        if(flag===true) {
-          that.tempArr = []
-        }
-        getProducts({
-            page: that.page,
-            limit: that.limit,
-            type: 1,
-            cid: that.cid,
-            sid: that.sid,
-            store_id: that.info.id,
-            delivery_type:that.delivery_type,
-          }).then(res => {
-          console.log(res,'res')
-          let list = res.data,
-            loadend = list.length < that.limit;
-          that.tempArr = that.$util.SplitArray(list, that.tempArr);
-          that.$set(that, 'tempArr', that.tempArr);
-          that.loading = false;
-          that.loadend = loadend;
-          that.loadTitle = loadend ? "没有更多内容啦~" : "加载更多";
-          that.page = that.page + 1;
-        }).catch(err => {
-          that.loading = false;
-          that.loadTitle = '加载更多'
-        });
-      },
-      // 切换自提方式
-      swithFn(num) {
-        switch (num) {
-          case 1:
-            this.switchNum = 1
-            this.delivery_type = '3'
-			this.page = 1
-            break;
-          case 2:
-            this.switchNum = 2
-            this.delivery_type='2'
-			this.page = 1
-            break;
-        }
-        this.getProducts(true)
-      },
-      // 跳转到门店列表
-      goMap() {
-        uni.navigateTo({
-					url: "/pages/store/map/index?type=1&storeId="+this.info.id,
-          success(res) {
-            console.log('成功啦', res);
-          },
-          fail(err) {
-            console.log('失败啦', err);
-          }
-        })
-      },
-      getMarTop() {
-        // #ifdef MP || APP-PLUS
-        let that = this;
-        setTimeout(() => {
-          // 获取小程序头部高度
-          let info = uni.createSelectorQuery().in(this).select(".mp-header");
-          info.boundingClientRect(function(data) {
-            that.marTop = data.height
-          }).exec()
-        }, 100)
-        // #endif
-      },
-      // 生成订单；
-      subOrder: function() {
-        let that = this,
-				  delivery_type = 1,
-          list = that.cartData.cartList,
-          ids = [];
-        if (list.length) {
-          list.forEach(item => {
-            ids.push(item.id)
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+
+	import {
+		vcartList,
+		getCartCounts,
+		cartDel
+	} from '@/api/order.js';
+	import {
+		getCategoryList,
+		getProductslist,
+		getAttr,
+		postCartNum
+	} from '@/api/store.js';
+	import {
+		getProducts,
+		getCustomerList,
+		getStoreCategory,
+		getStoreBrand
+	} from '@/api/new_store.js';
+	import productWindow from '@/components/productWindow/index';
+	import goodClass from '@/components/goodClass';
+	import cartList from '@/components/cartList';
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	export default {
+		computed: {
+			...mapState({
+				cartNum: state => state.indexData.cartNum
+			}),
+			...mapGetters(['isLogin', 'uid', 'cartNum'])
+		},
+		components: {
+			productWindow,
+			goodClass,
+			cartList
+		},
+		props: {
+			isFooter: {
+				type: Boolean,
+				default: false
+			},
+			info: {
+				type: Object,
+				default: {}
+			},
+
+		},
+		data() {
+			return {
+				marTop: 0,
+				switchNum: 2,
+				sysHeight: sysHeight,
+				categoryList: [],
+				navActive: 0,
+				categoryTitle: '',
+				categoryErList: [],
+				tabLeft: 0,
+				isWidth: 0, //每个导航栏占位
+				tabClick: 0, //导航栏被点击
+				iSlong: true,
+				tempArr: [],
+				loading: false,
+				loadend: false,
+				loadTitle: '加载更多',
+				page: 1,
+				limit: 10,
+				cid: 0, //一级分类
+				sid: 0, //二级分类
+				delivery_type: 2, // 配送方式
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				productValue: [],
+				attrValue: '', //已选属性
+				storeName: '', //多属性产品名称
+				id: 0,
+				cartData: {
+					cartList: [],
+					iScart: false
+				},
+				totalPrice: 0.00,
+				lengthCart: 0,
+				is_vip: 0, //是否是会员
+				cart_num: 0,
+				storeInfo: {},
+			}
+		},
+		mounted() {
+			let that = this;
+			// 获取设备宽度
+			uni.getSystemInfo({
+				success(e) {
+					that.isWidth = e.windowWidth / 5
+				}
+			});
+		},
+		methods: {
+			updateFun(e) {
+				if (e.cartNum) {
+					this.tempArr.forEach((item) => {
+						if (item.id == e.id) {
+							item.cart_num = e.cartNum
+						}
+					})
+				}
+			},
+			// 商品列表
+			getProducts(flag) {
+				let that = this;
+				if (flag === true) {
+					that.tempArr = []
+				}
+				getProducts({
+					page: that.page,
+					limit: that.limit,
+					type: 1,
+					cid: that.cid,
+					sid: that.sid,
+					store_id: that.info.id,
+					delivery_type: that.delivery_type,
+				}).then(res => {
+					console.log(res, 'res')
+					let list = res.data,
+						loadend = list.length < that.limit;
+					that.tempArr = that.$util.SplitArray(list, that.tempArr);
+					that.$set(that, 'tempArr', that.tempArr);
+					that.loading = false;
+					that.loadend = loadend;
+					that.loadTitle = loadend ? "没有更多内容啦~" : "加载更多";
+					that.page = that.page + 1;
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多'
+				});
+			},
+			// 切换自提方式
+			swithFn(num) {
+				switch (num) {
+					case 1:
+						this.switchNum = 1
+						this.delivery_type = '3'
+						this.page = 1
+						break;
+					case 2:
+						this.switchNum = 2
+						this.delivery_type = '2'
+						this.page = 1
+						break;
+				}
+				this.getProducts(true)
+			},
+			// 跳转到门店列表
+			goMap() {
+				uni.navigateTo({
+					url: "/pages/store/map/index?type=1&storeId=" + this.info.id,
+					success(res) {
+						console.log('成功啦', res);
+					},
+					fail(err) {
+						console.log('失败啦', err);
+					}
+				})
+			},
+			getMarTop() {
+				// #ifdef MP || APP-PLUS
+				let that = this;
+				setTimeout(() => {
+					// 获取小程序头部高度
+					let info = uni.createSelectorQuery().in(this).select(".mp-header");
+					info.boundingClientRect(function(data) {
+						that.marTop = data.height
+					}).exec()
+				}, 100)
+				// #endif
+			},
+			// 生成订单；
+			subOrder: function() {
+				let that = this,
+					delivery_type = 1,
+					list = that.cartData.cartList,
+					ids = [];
+				if (list.length) {
+					list.forEach(item => {
+						ids.push(item.id)
 						delivery_type = item.productInfo.delivery_type[0]
-          });
-          uni.navigateTo({
-            url: '/pages/goods/order_confirm/index?cartId=' + ids.join(',')+'&delivery_type='+delivery_type
-          });
-          that.cartData.iScart = false;
-        } else {
-          return that.$util.Tips({
-            title: '请选择产品'
-          });
-        }
-      },
-      // 计算总价；
-      getTotalPrice: function() {
-        let that = this,
-          list = that.cartData.cartList,
-          totalPrice = 0.00;
-        list.forEach(item => {
-          if (item.attrStatus && item.status) {
-            totalPrice = that.$util.$h.Add(totalPrice, that.$util.$h.Mul(item.cart_num, item
-              .truePrice));
-          }
-        })
-        that.$set(that, 'totalPrice', totalPrice);
-      },
-      ChangeSubDel: function(event) {
-        let that = this,
-          list = that.cartData.cartList,
-          ids = [];
-        list.forEach(item => {
-          ids.push(item.id)
-        });
-        cartDel(ids.join(",")).then(res => {
-          that.$set(that.cartData, 'cartList', []);
-          that.cartData.iScart = false;
-          that.totalPrice = 0.00;
-          that.page = 1;
-          that.loadend = false;
-          that.tempArr = [];
-          that.productslist();
-          that.getCartNum();
-        })
-      },
-      ChangeOneDel: function(id, index) {
-        let that = this,
-          list = that.cartData.cartList;
-        cartDel(id.toString()).then(res => {
-          list.splice(index, 1);
-          if (!list.length) {
-            that.cartData.iScart = false;
-            that.page = 1;
-            that.loadend = false;
-            that.tempArr = [];
-            that.productslist();
-          };
-          that.getCartNum();
-        })
-      },
-      getCartList(iSshow) {
-        let that = this;
-        vcartList().then(res => {
-          that.$set(that.cartData, 'cartList', res.data);
-          if (res.data.length) {
-            that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
-          } else {
-            that.$set(that.cartData, 'iScart', false);
-          }
-          that.getTotalPrice();
-        })
-      },
-      closeList(e) {
-        this.$set(this.cartData, 'iScart', e);
-        // this.page = 1;
-        // this.loadend = false;
-        // this.tempArr = [];
-        // this.productslist();
-      },
-      getCartNum: function() {
-        let that = this;
-        getCartCounts().then(res => {
-          this.$store.commit('indexData/setCartNum', res.data.count > 99 ? '..' : res.data.count)
-        });
-      },
-
-
-      onMyEvent: function() {
-        this.$set(this.attr, 'cartAttr', false);
-      },
-      /**
-       * 默认选中属性
-       * 
-       */
-      DefaultSelect: function() {
-        let productAttr = this.attr.productAttr;
-        let value = [];
-        for (let key in this.productValue) {
-          if (this.productValue[key].stock > 0) {
-            value = this.attr.productAttr.length ? key.split(",") : [];
-            break;
-          }
-        }
-        for (let i = 0; i < productAttr.length; i++) {
-          this.$set(productAttr[i], "index", value[i]);
-        }
-        //sort();排序函数:数字-英文-汉字；
-        let productSelect = this.productValue[value.join(",")];
-        if (productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeName
-          );
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-          this.$set(this, "attrValue", value.join(","));
-        } else if (!productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeName
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-        } else if (!productSelect && !productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeName
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-          this.$set(
-            this.attr.productSelect,
-            "unique",
-            this.storeInfo.unique || ""
-          );
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", "");
-          this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-        }
-      },
-      /**
-       * 属性变动赋值
-       * 
-       */
-      ChangeAttr: function(res) {
-        let productSelect = this.productValue[res];
-        if (productSelect && productSelect.stock > 0) {
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", res);
-        } else if (productSelect && productSelect.stock == 0) {
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-        } else {
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-        }
-      },
-      attrVal(val) {
-        this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
-          .indexn]);
-      },
-      /**
-       * 购物车手动填写
-       * 
-       */
-      iptCartNum: function(e) {
-        this.$set(this.attr.productSelect, 'cart_num', e);
-      },
-      onLoadFun() {},
-      // 产品列表
-
-      // 点击默认单属性购物车
-      goCartDan(item, index) {
-        if (!this.isLogin) {
-          this.getIsLogin();
-        } else {
-          this.tempArr[index].cart_num = 1;
-          this.$set(this, 'tempArr', this.tempArr);
-          this.goCat(0, item.id, 1);
-        }
-      },
-      // 改变单属性购物车
-      ChangeCartNumDan(changeValue, index, item) {
-        let num = this.tempArr[index];
-        let stock = this.tempArr[index].stock;
-        this.ChangeCartNum(changeValue, num, stock, 0, item.id);
-      },
-      // 改变多属性购物车
-      ChangeCartNumDuo(changeValue) {
-        //获取当前变动属性
-        let productSelect = this.productValue[this.attrValue];
-        //如果没有属性,赋值给商品默认库存
-        if (productSelect === undefined && !this.attr.productAttr.length)
-          productSelect = this.attr.productSelect;
-        //无属性值即库存为0；不存在加减；
-        if (productSelect === undefined) return;
-        let stock = productSelect.stock || 0;
-        let num = this.attr.productSelect;
-        this.ChangeCartNum(changeValue, num, stock, 1, this.id);
-      },
-      // 已经加入购物车时的购物加减；
-      ChangeCartList(changeValue, index) {
-        let list = this.cartData.cartList;
-        let num = list[index];
-        let stock = list[index].trueStock;
-        this.ChangeCartNum(changeValue, num, stock, 0, num.product_id, index, 1);
-        if (!list.length) {
-          this.cartData.iScart = false;
-          this.page = 1;
-          this.loadend = false;
-          this.tempArr = [];
-          this.productslist();
-        }
-      },
-      // 购物车加减计算函数
-      ChangeCartNum(changeValue, num, stock, isDuo, id, index, cart) {
-        if (changeValue) {
-          num.cart_num++;
-          if (num.cart_num > stock) {
-            if (isDuo) {
-              this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
-              this.$set(this, "cart_num", stock ? stock : 1);
-            } else {
-              num.cart_num = stock ? stock : 0;
-              this.$set(this, 'tempArr', this.tempArr);
-              this.$set(this.cartData, 'cartList', this.cartData.cartList);
-            }
-            return this.$util.Tips({
-              title: "该产品没有更多库存了"
-            });
-          } else {
-            if (!isDuo) {
-              if (cart) {
-                this.goCat(0, id, 1, 1, num.product_attr_unique);
-                this.getTotalPrice();
-              } else {
-                this.goCat(0, id, 1);
-              }
-            }
-          }
-        } else {
-          num.cart_num--;
-          if (num.cart_num == 0) {
-            this.cartData.cartList.splice(index, 1);
-            if (isDuo) {
-              this.$set(this.attr.productSelect, "cart_num", 1);
-              this.$set(this, "cart_num", 1);
-            }
-          }
-          if (num.cart_num < 0) {
-            if (isDuo) {
-              this.$set(this.attr.productSelect, "cart_num", 1);
-              this.$set(this, "cart_num", 1);
-            } else {
-              num.cart_num = 0;
-              this.$set(this, 'tempArr', this.tempArr);
-              this.$set(this.cartData, 'cartList', this.cartData.cartList);
-            }
-          } else {
-            if (!isDuo) {
-              if (cart) {
-                this.goCat(0, id, 0, 1, num.product_attr_unique);
-                this.getTotalPrice();
-              } else {
-                this.goCat(0, id, 0);
-              }
-            }
-          }
-        }
-        this.tempArr.forEach((item) => {
-          if (item.id == id) {
-            item.cart_num = num.cart_num;
-          }
-        })
-      },
-      // 多规格加入购物车；
-      goCatNum() {
-        this.goCat(1, this.id, 1);
-      },
-      /*
-       * 加入购物车
-       */
-      goCat: function(duo, id, type, cart, unique) {
-        let that = this;
-        if (duo) {
-          let productSelect = that.productValue[this.attrValue];
-          //如果有属性,没有选择,提示用户选择
-          if (
-            that.attr.productAttr.length &&
-            productSelect === undefined
-          )
-            return that.$util.Tips({
-              title: "产品库存不足，请选择其它属性"
-            });
-        }
-        let q = {
-          product_id: id,
-          num: duo ? that.attr.productSelect.cart_num : 1,
-          type: type,
-          unique: duo ? that.attr.productSelect.unique : cart ? unique : ""
-        };
-        postCartNum(q)
-          .then(function(res) {
-            if (duo) {
-              that.attr.cartAttr = false;
-              that.$util.Tips({
-                title: "添加购物车成功"
-              });
-              // that.page = 1;
-              // that.loadend = false;
-              that.tempArr.forEach((item, index) => {
-                if (item.id == that.id) {
-                  let arrtStock = that.attr.productSelect.stock
-                  let objNum = parseInt(item.cart_num) + parseInt(that.attr.productSelect.cart_num);
-                  item.cart_num = objNum > arrtStock ? arrtStock : objNum
-                }
-              })
-              // that.productslist();
-            }
-            that.getCartNum();
-            if (!cart) {
-              that.getCartList(1);
-            }
-          })
-          .catch(err => {
-            return that.$util.Tips({
-              title: err
-            });
-          });
-      },
-      goCartDuo(item) {
-        if (!this.isLogin) {
-          this.getIsLogin();
-        } else {
-          uni.showLoading({
-            title: '加载中'
-          });
-          this.storeName = item.store_name;
-          this.getAttrs(item.id);
-          this.$set(this, 'id', item.id);
-          this.$set(this.attr, 'cartAttr', true);
-        }
-      },
-      getIsLogin() {
-        toLogin();
-      },
-      // 商品详情接口；
-      getAttrs(id) {
-        let that = this;
-        getAttr(id, 0).then(res => {
-          uni.hideLoading();
-          that.$set(that.attr, 'productAttr', res.data.productAttr);
-          that.$set(that, 'productValue', res.data.productValue);
-          that.$set(that, 'is_vip', res.data.storeInfo.is_vip);
-          that.$set(that, 'storeInfo', res.data.storeInfo);
-          that.DefaultSelect();
-        })
-      },
-      // 去详情页
-      goDetail(item) {
-        goShopDetail(item, this.uid).then(res => {
-          uni.navigateTo({
-            url: `/pages/goods_details/index?id=${item.id}&fromType=1`
-          });
-        });
-      },
-      openTap() {
-        this.iSlong = false
-      },
-      closeTap() {
-        this.iSlong = true
-      },
-      // 分类数据
-
-      getAllCategory: function() {
-        let that = this;
-        getStoreCategory().then(res => {
-          let data = res.data;
-          data.forEach(item => {
-            item.children.unshift({
-              'id': 0,
-              'cate_name': '全部'
-            })
-          })
-          that.categoryTitle = data[0].cate_name;
-          that.cid = data[0].id;
-          that.sid = 0;
-          that.navActive = 0;
-          that.tabClick = 0;
-          that.categoryList = data;
-          that.categoryErList = res.data[0].children ? res.data[0].children : [];
-          that.page = 1;
-          that.loadend = false;
-          that.tempArr = [];
-          that.getProducts();
-        })
-      },
-      tapNav(index, item) {
-        uni.pageScrollTo({
-          duration: 0,
-          scrollTop: 0
-        })
-        let list = this.categoryList[index];
-        this.navActive = index;
-        this.categoryTitle = list.cate_name;
-        this.categoryErList = item.children ? item.children : [];
-        this.tabClick = 0;
-        this.tabLeft = 0;
-        this.cid = list.id;
-        this.sid = 0;
-        this.page = 1;
-        this.loadend = false;
-        this.tempArr = [];
-        this.getProducts();
-      },
-      // 导航栏点击
-      longClick(index) {
-        if (this.categoryErList.length > 3) {
-          this.tabLeft = (index - 1) * (this.isWidth + 6) //设置下划线位置
-        };
-        this.tabClick = index; //设置导航点击了哪一个
-        this.iSlong = true;
-        this.sid = this.categoryErList[index].id;
-        this.page = 1;
-        this.loadend = false;
-        this.tempArr = [];
-        this.getProducts();
-      },
-    },
-    onReachBottom: function() {
-       this.getProducts();
-    }
-  }
+					});
+					uni.navigateTo({
+						url: '/pages/goods/order_confirm/index?cartId=' + ids.join(',') + '&delivery_type=' +
+							delivery_type
+					});
+					that.cartData.iScart = false;
+				} else {
+					return that.$util.Tips({
+						title: '请选择产品'
+					});
+				}
+			},
+			// 计算总价；
+			getTotalPrice: function() {
+				let that = this,
+					list = that.cartData.cartList,
+					totalPrice = 0.00;
+				list.forEach(item => {
+					if (item.attrStatus && item.status) {
+						totalPrice = that.$util.$h.Add(totalPrice, that.$util.$h.Mul(item.cart_num, item
+							.truePrice));
+					}
+				})
+				that.$set(that, 'totalPrice', totalPrice);
+			},
+			ChangeSubDel: function(event) {
+				let that = this,
+					list = that.cartData.cartList,
+					ids = [];
+				list.forEach(item => {
+					ids.push(item.id)
+				});
+				cartDel(ids.join(",")).then(res => {
+					that.$set(that.cartData, 'cartList', []);
+					that.cartData.iScart = false;
+					that.totalPrice = 0.00;
+					that.page = 1;
+					that.loadend = false;
+					that.tempArr = [];
+					that.productslist();
+					that.getCartNum();
+				})
+			},
+			ChangeOneDel: function(id, index) {
+				let that = this,
+					list = that.cartData.cartList;
+				cartDel(id.toString()).then(res => {
+					list.splice(index, 1);
+					if (!list.length) {
+						that.cartData.iScart = false;
+						that.page = 1;
+						that.loadend = false;
+						that.tempArr = [];
+						that.productslist();
+					};
+					that.getCartNum();
+				})
+			},
+			getCartList(iSshow) {
+				let that = this;
+				vcartList().then(res => {
+					that.$set(that.cartData, 'cartList', res.data);
+					if (res.data.length) {
+						that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
+					} else {
+						that.$set(that.cartData, 'iScart', false);
+					}
+					that.getTotalPrice();
+				})
+			},
+			closeList(e) {
+				this.$set(this.cartData, 'iScart', e);
+				// this.page = 1;
+				// this.loadend = false;
+				// this.tempArr = [];
+				// this.productslist();
+			},
+			getCartNum: function() {
+				let that = this;
+				getCartCounts().then(res => {
+					this.$store.commit('indexData/setCartNum', res.data.count > 99 ? '..' : res.data.count)
+				});
+			},
+
+
+			onMyEvent: function() {
+				this.$set(this.attr, 'cartAttr', false);
+			},
+			/**
+			 * 默认选中属性
+			 * 
+			 */
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				for (let key in this.productValue) {
+					if (this.productValue[key].stock > 0) {
+						value = this.attr.productAttr.length ? key.split(",") : [];
+						break;
+					}
+				}
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", value[i]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this, "attrValue", value.join(","));
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+				} else if (!productSelect && !productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+					this.$set(
+						this.attr.productSelect,
+						"unique",
+						this.storeInfo.unique || ""
+					);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+				}
+			},
+			/**
+			 * 属性变动赋值
+			 * 
+			 */
+			ChangeAttr: function(res) {
+				let productSelect = this.productValue[res];
+				if (productSelect && productSelect.stock > 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", res);
+				} else if (productSelect && productSelect.stock == 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+				} else {
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+				}
+			},
+			attrVal(val) {
+				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+					.indexn]);
+			},
+			/**
+			 * 购物车手动填写
+			 * 
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attr.productSelect, 'cart_num', e);
+			},
+			onLoadFun() {},
+			// 产品列表
+
+			// 点击默认单属性购物车
+			goCartDan(item, index) {
+				if (!this.isLogin) {
+					this.getIsLogin();
+				} else {
+					this.tempArr[index].cart_num = 1;
+					this.$set(this, 'tempArr', this.tempArr);
+					this.goCat(0, item.id, 1);
+				}
+			},
+			// 改变单属性购物车
+			ChangeCartNumDan(changeValue, index, item) {
+				let num = this.tempArr[index];
+				let stock = this.tempArr[index].stock;
+				this.ChangeCartNum(changeValue, num, stock, 0, item.id);
+			},
+			// 改变多属性购物车
+			ChangeCartNumDuo(changeValue) {
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attr.productAttr.length)
+					productSelect = this.attr.productSelect;
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let num = this.attr.productSelect;
+				this.ChangeCartNum(changeValue, num, stock, 1, this.id);
+			},
+			// 已经加入购物车时的购物加减；
+			ChangeCartList(changeValue, index) {
+				let list = this.cartData.cartList;
+				let num = list[index];
+				let stock = list[index].trueStock;
+				this.ChangeCartNum(changeValue, num, stock, 0, num.product_id, index, 1);
+				if (!list.length) {
+					this.cartData.iScart = false;
+					this.page = 1;
+					this.loadend = false;
+					this.tempArr = [];
+					this.productslist();
+				}
+			},
+			// 购物车加减计算函数
+			ChangeCartNum(changeValue, num, stock, isDuo, id, index, cart) {
+				if (changeValue) {
+					num.cart_num++;
+					if (num.cart_num > stock) {
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
+							this.$set(this, "cart_num", stock ? stock : 1);
+						} else {
+							num.cart_num = stock ? stock : 0;
+							this.$set(this, 'tempArr', this.tempArr);
+							this.$set(this.cartData, 'cartList', this.cartData.cartList);
+						}
+						return this.$util.Tips({
+							title: "该产品没有更多库存了"
+						});
+					} else {
+						if (!isDuo) {
+							if (cart) {
+								this.goCat(0, id, 1, 1, num.product_attr_unique);
+								this.getTotalPrice();
+							} else {
+								this.goCat(0, id, 1);
+							}
+						}
+					}
+				} else {
+					num.cart_num--;
+					if (num.cart_num == 0) {
+						this.cartData.cartList.splice(index, 1);
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", 1);
+							this.$set(this, "cart_num", 1);
+						}
+					}
+					if (num.cart_num < 0) {
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", 1);
+							this.$set(this, "cart_num", 1);
+						} else {
+							num.cart_num = 0;
+							this.$set(this, 'tempArr', this.tempArr);
+							this.$set(this.cartData, 'cartList', this.cartData.cartList);
+						}
+					} else {
+						if (!isDuo) {
+							if (cart) {
+								this.goCat(0, id, 0, 1, num.product_attr_unique);
+								this.getTotalPrice();
+							} else {
+								this.goCat(0, id, 0);
+							}
+						}
+					}
+				}
+				this.tempArr.forEach((item) => {
+					if (item.id == id) {
+						item.cart_num = num.cart_num;
+					}
+				})
+			},
+			// 多规格加入购物车；
+			goCatNum() {
+				this.goCat(1, this.id, 1);
+			},
+			/*
+			 * 加入购物车
+			 */
+			goCat: function(duo, id, type, cart, unique) {
+				let that = this;
+				if (duo) {
+					let productSelect = that.productValue[this.attrValue];
+					//如果有属性,没有选择,提示用户选择
+					if (
+						that.attr.productAttr.length &&
+						productSelect === undefined
+					)
+						return that.$util.Tips({
+							title: "产品库存不足，请选择其它属性"
+						});
+				}
+				let q = {
+					product_id: id,
+					num: duo ? that.attr.productSelect.cart_num : 1,
+					type: type,
+					unique: duo ? that.attr.productSelect.unique : cart ? unique : ""
+				};
+				postCartNum(q)
+					.then(function(res) {
+						if (duo) {
+							that.attr.cartAttr = false;
+							that.$util.Tips({
+								title: "添加购物车成功"
+							});
+							// that.page = 1;
+							// that.loadend = false;
+							that.tempArr.forEach((item, index) => {
+								if (item.id == that.id) {
+									let arrtStock = that.attr.productSelect.stock
+									let objNum = parseInt(item.cart_num) + parseInt(that.attr.productSelect
+										.cart_num);
+									item.cart_num = objNum > arrtStock ? arrtStock : objNum
+								}
+							})
+							// that.productslist();
+						}
+						that.getCartNum();
+						if (!cart) {
+							that.getCartList(1);
+						}
+					})
+					.catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+			},
+			goCartDuo(item) {
+				if (!this.isLogin) {
+					this.getIsLogin();
+				} else {
+					uni.showLoading({
+						title: '加载中'
+					});
+					this.storeName = item.store_name;
+					this.getAttrs(item.id);
+					this.$set(this, 'id', item.id);
+					this.$set(this.attr, 'cartAttr', true);
+				}
+			},
+			getIsLogin() {
+				toLogin();
+			},
+			// 商品详情接口；
+			getAttrs(id) {
+				let that = this;
+				getAttr(id, 0).then(res => {
+					uni.hideLoading();
+					that.$set(that.attr, 'productAttr', res.data.productAttr);
+					that.$set(that, 'productValue', res.data.productValue);
+					that.$set(that, 'is_vip', res.data.storeInfo.is_vip);
+					that.$set(that, 'storeInfo', res.data.storeInfo);
+					that.DefaultSelect();
+				})
+			},
+			// 去详情页
+			goDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.id}&fromType=1`
+					});
+				});
+			},
+			openTap() {
+				this.iSlong = false
+			},
+			closeTap() {
+				this.iSlong = true
+			},
+			// 分类数据
+
+			getAllCategory: function() {
+				let that = this;
+				getStoreCategory().then(res => {
+					let data = res.data;
+					data.forEach(item => {
+						item.children.unshift({
+							'id': 0,
+							'cate_name': '全部'
+						})
+					})
+					that.categoryTitle = data[0].cate_name;
+					that.cid = data[0].id;
+					that.sid = 0;
+					that.navActive = 0;
+					that.tabClick = 0;
+					that.categoryList = data;
+					that.categoryErList = res.data[0].children ? res.data[0].children : [];
+					that.page = 1;
+					that.loadend = false;
+					that.tempArr = [];
+					that.getProducts();
+				})
+			},
+			tapNav(index, item) {
+				uni.pageScrollTo({
+					duration: 0,
+					scrollTop: 0
+				})
+				let list = this.categoryList[index];
+				this.navActive = index;
+				this.categoryTitle = list.cate_name;
+				this.categoryErList = item.children ? item.children : [];
+				this.tabClick = 0;
+				this.tabLeft = 0;
+				this.cid = list.id;
+				this.sid = 0;
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.getProducts();
+			},
+			// 导航栏点击
+			longClick(index) {
+				if (this.categoryErList.length > 3) {
+					this.tabLeft = (index - 1) * (this.isWidth + 6) //设置下划线位置
+				};
+				this.tabClick = index; //设置导航点击了哪一个
+				this.iSlong = true;
+				this.sid = this.categoryErList[index].id;
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.getProducts();
+			},
+		},
+		onReachBottom: function() {
+			this.getProducts();
+		}
+	}
 </script>
 
 <style lang="scss">
-  /* #ifdef MP || APP-PLUS */
-  .mp-header {
-    z-index: 30;
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-
-    background: #fff;
-    border-bottom: 1px solid #F0F0F0;
-
-    .serch-wrapper {
-      height: 100%;
-      /* #ifdef MP */
-      padding: 0 220rpx 0 53rpx;
-      /* #endif */
-      /* #ifdef APP-PLUS */
-      padding: 0 50rpx 0 40rpx;
-
-      /* #endif */
-      .input {
-        flex: 1;
-        height: 55rpx;
-        padding: 0 0 0 30rpx;
-        background: #F8F8F8;
-        color: #ADADAD;
-        font-size: 26rpx;
-        /* #ifdef MP */
-        width: 70%;
-        /* #endif */
-        /* #ifdef APP-PLUS */
-        width: 100%;
-        /* #endif */
-        border-radius: 50rpx;
-
-        .iconfont {
-          margin-right: 20rpx;
-        }
-      }
-    }
-  }
-
-  /* #endif */
-  page {
-    background-color: #fff;
-  }
-
-  /deep/.product-window.joinCart {
-    z-index: 999;
-  }
-
-  ::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    color: transparent;
-    display: none;
-  }
-
-  .goodCate {
-    /deep/.mask {
-      z-index: 99;
-    }
-
-    /deep/.attrProduct {
-      .mask {
-        z-index: 100;
-      }
-    }
-
-    .header {
-
-      position: fixed;
-      height: 128rpx;
-      background-color: #fff;
-      top: 0;
-      left: 0;
-      width: 100%;
-      z-index: 99;
-
-      border-bottom: 1px solid #eee;
-      /* #ifdef H5 */
-      padding-top: 20rpx;
-      /* #endif */
-
-      .pageIndex {
-        width: 68rpx;
-        height: 68rpx;
-        border-radius: 50%;
-        background-color: #F7F7F7;
-
-        .iconfont {
-          color: #666666;
-          font-size: 30rpx;
-        }
-
-        // image{
-        // 	width: 29rpx;
-        // 	height: 30rpx;
-        // }
-      }
-
-      .search {
-        width: 690rpx;
-        height: 68rpx;
-        border-radius: 36rpx;
-        background-color: #F7F7F7;
-        font-size: 26rpx;
-        color: #cccccc;
-        padding: 0 30rpx;
-        box-sizing: border-box;
-
-        .iconfont {
-          font-size: 30rpx;
-          margin-right: 18rpx;
-          color: #666666;
-        }
-      }
-    }
-
-    .conter {
-      /* #ifdef H5 */
-      padding-top: 128rpx;
-      /* #endif */
-      height: 100vh;
-      background-color: #fff;
-
-      .aside {
-        position: fixed;
-        width: 23%;
-        left: 0;
-        bottom: 0;
+	/* #ifdef MP || APP-PLUS */
+	.mp-header {
+		z-index: 30;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+
+		background: #fff;
+		border-bottom: 1px solid #F0F0F0;
+
+		.serch-wrapper {
+			height: 100%;
+			/* #ifdef MP */
+			padding: 0 220rpx 0 53rpx;
+			/* #endif */
+			/* #ifdef APP-PLUS */
+			padding: 0 50rpx 0 40rpx;
+
+			/* #endif */
+			.input {
+				flex: 1;
+				height: 55rpx;
+				padding: 0 0 0 30rpx;
+				background: #F8F8F8;
+				color: #ADADAD;
+				font-size: 26rpx;
+				/* #ifdef MP */
+				width: 70%;
+				/* #endif */
+				/* #ifdef APP-PLUS */
+				width: 100%;
+				/* #endif */
+				border-radius: 50rpx;
+
+				.iconfont {
+					margin-right: 20rpx;
+				}
+			}
+		}
+	}
+
+	/* #endif */
+	page {
+		background-color: #fff;
+	}
+
+	/deep/.product-window.joinCart {
+		z-index: 999;
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+		display: none;
+	}
+
+	.goodCate {
+		/deep/.mask {
+			z-index: 99;
+		}
+
+		/deep/.attrProduct {
+			.mask {
+				z-index: 100;
+			}
+		}
+
+		.header {
+
+			position: fixed;
+			height: 128rpx;
+			background-color: #fff;
+			top: 0;
+			left: 0;
+			width: 100%;
+			z-index: 99;
+
+			border-bottom: 1px solid #eee;
+			/* #ifdef H5 */
+			padding-top: 20rpx;
+			/* #endif */
+
+			.pageIndex {
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+				background-color: #F7F7F7;
+
+				.iconfont {
+					color: #666666;
+					font-size: 30rpx;
+				}
+
+				// image{
+				// 	width: 29rpx;
+				// 	height: 30rpx;
+				// }
+			}
+
+			.search {
+				width: 690rpx;
+				height: 68rpx;
+				border-radius: 36rpx;
+				background-color: #F7F7F7;
+				font-size: 26rpx;
+				color: #cccccc;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+
+				.iconfont {
+					font-size: 30rpx;
+					margin-right: 18rpx;
+					color: #666666;
+				}
+			}
+		}
+
+		.conter {
+			/* #ifdef H5 */
+			padding-top: 128rpx;
+			/* #endif */
+			height: 100vh;
+			background-color: #fff;
+
+			.aside {
+				position: fixed;
+				width: 23%;
+				left: 0;
+				bottom: 0;
 				/* #ifdef H5 */
 				top: 302rpx;
 				/* #endif */
 				/* #ifndef H5 */
-        top: 316rpx;
+				top: 316rpx;
+				/* #endif */
+				background-color: #F7F7F7;
+				overflow-y: auto;
+				overflow-x: hidden;
+				/* #ifdef H5 */
+				// margin-top: 128rpx;
 				/* #endif */
-        background-color: #F7F7F7;
-        overflow-y: auto;
-        overflow-x: hidden;
-        /* #ifdef H5 */
-        // margin-top: 128rpx;
-        /* #endif */
-        z-index: 99;
-        padding-bottom: 194rpx;
-
-        .item {
-          height: 100rpx;
-          width: 100%;
-          font-size: 26rpx;
-          color: #333333;
-
-          &.on {
-            background-color: #FFFFFF;
-            width: 100%;
-            text-align: center;
-            color: var(--view-theme);
-            font-weight: 500;
-            position: relative;
-
-            &::after {
-              content: "";
-              position: absolute;
-              width: 6rpx;
-              height: 46rpx;
-              background: var(--view-theme);
-              border-radius: 0 4rpx 4rpx 0;
-              left: 0
-            }
-          }
-        }
-      }
-
-      .wrapper {
-        margin-top: 160rpx;
-       padding-bottom: 250rpx;
-        /* #ifdef H5 */
-        margin-top: 50rpx;
-           padding-bottom: 200rpx;
-        /* #endif */
-        width: 77%;
-        float: right;
-        background-color: #FFFFFF;
-        // padding-bottom: 240rpx;
-
-        .bgcolor {
-          width: 100%;
-          background-color: #FFFFFF;
-        }
-
-        // .goodsList {
-        //   margin-top: 0 !important;
-        // }
-
-        .mask {
-          z-index: 9;
-        }
-
-        .longTab {
-          width: 65%;
-          position: fixed;
-          top: 316rpx;
-          /* #ifdef H5 */
-          top: 302rpx;
-          // margin-top: 128rpx;
-          /* #endif */
-          height: 100rpx;
-          z-index: 99;
-          background-color: #FFFFFF;
-
-          .longItem {
-            height: 44rpx;
-            display: inline-block;
-            line-height: 44rpx;
-            text-align: center;
-            font-size: 26rpx;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            color: #333333;
-            background-color: #F7F7F7;
-            border-radius: 22rpx;
-            margin-left: 12rpx;
-
-            &.click {
-              font-weight: bold;
-              background-color: var(--view-theme);
-              color: #ffffff;
-            }
-          }
-
-          .underlineBox {
-            height: 3px;
-            width: 20%;
-            display: flex;
-            align-content: center;
-            justify-content: center;
-            transition: .5s;
-
-            .underline {
-              width: 33rpx;
-              height: 4rpx;
-              background-color: #FFFFFF;
-            }
-          }
-        }
-
-        .openList {
-          width: 12%;
-          height: 100rpx;
-          background-color: #FFFFFF;
-          line-height: 100rpx;
-          padding-left: 30rpx;
-          position: fixed;
-          right: 0;
-          top: 316rpx;
-          /* #ifdef H5 */
-          top: 302rpx;
-          right: 2rpx;
-          /* #endif */
-          z-index: 99;
-
-          .iconfont {
-            font-size: 22rpx;
-            color: #666666;
-          }
-
-        }
-
-
-        .downTab {
-          width: 78%;
-          position: fixed;
-          top: 0rpx;
-          /* #ifdef H5 */
-          top: 302rpx;
-          /* #endif */
-          z-index: 102;
-          background-color: #FFFFFF;
-
-          .title {
-            height: 100rpx;
-            font-size: 26rpx;
-            color: #999999;
-            padding-left: 20rpx;
-
-            .closeList {
-              width: 90rpx;
-              height: 100%;
-              line-height: 100rpx;
-              padding-left: 30rpx;
-              transform: rotate(180deg);
-
-              .iconfont {
-                font-size: 22rpx;
-                color: #666666;
-              }
-            }
-          }
-
-          .children {
-            max-height: 500rpx;
-            overflow-x: hidden;
-            overflow-y: auto;
-            padding-bottom: 20rpx;
-
-            .item {
-              height: 60rpx;
-              background-color: #F7F7F7;
-              border-radius: 30rpx;
-              line-height: 60rpx;
-              padding: 0 15rpx;
-              margin: 0 0 20rpx 20rpx;
-              width: 165rpx;
-              text-align: center;
-
-              &.click {
-                font-weight: bold;
-                background-color: var(--view-theme);
-                color: #ffffff;
-              }
-            }
-          }
-        }
-
-        .goodsList {
-          margin-top: 0rpx;
-          padding: 0 30rpx 0 20rpx;
-          /* #ifdef H5 */
-   margin-top: 228rpx;
-          /* #endif */
-
-          /deep/.item {
-            margin-bottom: 33rpx !important;
-
-            // .pictrue {
-            // 	height: 216rpx;
-            // }
-
-            .text {
-              font-size: 26rpx;
-            }
-
-            .bottom {
-              .sales {
-                .money {
-                  font-size: 34rpx;
-
-                  text {
-                    font-size: 26rpx;
-                  }
-                }
-              }
-
-              .cart {
-                .pictrue {
-                  width: 50rpx;
-                  height: 50rpx;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    .store-address {
-      width: 100%;
-      margin-top: 15rpx;
-
-      position: relative;
-      padding: 0rpx 30rpx 0 30rpx;
-      height: 185rpx;
-      /* #ifdef H5 */
-      height: 200rpx;
-      /* #endif */
-      background-color: #fff;
-
-      .address {
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #333333;
-				.name{
+				z-index: 99;
+				padding-bottom: 194rpx;
+
+				.item {
+					height: 100rpx;
+					width: 100%;
+					font-size: 26rpx;
+					color: #333333;
+
+					&.on {
+						background-color: #FFFFFF;
+						width: 100%;
+						text-align: center;
+						color: var(--view-theme);
+						font-weight: 500;
+						position: relative;
+
+						&::after {
+							content: "";
+							position: absolute;
+							width: 6rpx;
+							height: 46rpx;
+							background: var(--view-theme);
+							border-radius: 0 4rpx 4rpx 0;
+							left: 0
+						}
+					}
+				}
+			}
+
+			.wrapper {
+				margin-top: 160rpx;
+				padding-bottom: 250rpx;
+				/* #ifdef H5 */
+				margin-top: 50rpx;
+				padding-bottom: 200rpx;
+				/* #endif */
+				width: 77%;
+				float: right;
+				background-color: #FFFFFF;
+				// padding-bottom: 240rpx;
+
+				.bgcolor {
+					width: 100%;
+					background-color: #FFFFFF;
+				}
+
+				// .goodsList {
+				//   margin-top: 0 !important;
+				// }
+
+				.mask {
+					z-index: 9;
+				}
+
+				.longTab {
+					width: 65%;
+					position: fixed;
+					top: 316rpx;
+					/* #ifdef H5 */
+					top: 302rpx;
+					// margin-top: 128rpx;
+					/* #endif */
+					height: 100rpx;
+					z-index: 99;
+					background-color: #FFFFFF;
+
+					.longItem {
+						height: 44rpx;
+						display: inline-block;
+						line-height: 44rpx;
+						text-align: center;
+						font-size: 26rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						color: #333333;
+						background-color: #F7F7F7;
+						border-radius: 22rpx;
+						margin-left: 12rpx;
+
+						&.click {
+							font-weight: bold;
+							background-color: var(--view-theme);
+							color: #ffffff;
+						}
+					}
+
+					.underlineBox {
+						height: 3px;
+						width: 20%;
+						display: flex;
+						align-content: center;
+						justify-content: center;
+						transition: .5s;
+
+						.underline {
+							width: 33rpx;
+							height: 4rpx;
+							background-color: #FFFFFF;
+						}
+					}
+				}
+
+				.openList {
+					width: 12%;
+					height: 100rpx;
+					background-color: #FFFFFF;
+					line-height: 100rpx;
+					padding-left: 30rpx;
+					position: fixed;
+					right: 0;
+					top: 316rpx;
+					/* #ifdef H5 */
+					top: 302rpx;
+					right: 2rpx;
+					/* #endif */
+					z-index: 99;
+
+					.iconfont {
+						font-size: 22rpx;
+						color: #666666;
+					}
+
+				}
+
+
+				.downTab {
+					width: 78%;
+					position: fixed;
+					top: 0rpx;
+					/* #ifdef H5 */
+					top: 302rpx;
+					/* #endif */
+					z-index: 102;
+					background-color: #FFFFFF;
+
+					.title {
+						height: 100rpx;
+						font-size: 26rpx;
+						color: #999999;
+						padding-left: 20rpx;
+
+						.closeList {
+							width: 90rpx;
+							height: 100%;
+							line-height: 100rpx;
+							padding-left: 30rpx;
+							transform: rotate(180deg);
+
+							.iconfont {
+								font-size: 22rpx;
+								color: #666666;
+							}
+						}
+					}
+
+					.children {
+						max-height: 500rpx;
+						overflow-x: hidden;
+						overflow-y: auto;
+						padding-bottom: 20rpx;
+
+						.item {
+							height: 60rpx;
+							background-color: #F7F7F7;
+							border-radius: 30rpx;
+							line-height: 60rpx;
+							padding: 0 15rpx;
+							margin: 0 0 20rpx 20rpx;
+							width: 165rpx;
+							text-align: center;
+
+							&.click {
+								font-weight: bold;
+								background-color: var(--view-theme);
+								color: #ffffff;
+							}
+						}
+					}
+				}
+
+				.goodsList {
+					margin-top: 0rpx;
+					padding: 0 30rpx 0 20rpx;
+					/* #ifdef H5 */
+					margin-top: 228rpx;
+					/* #endif */
+
+					/deep/.item {
+						margin-bottom: 33rpx !important;
+
+						// .pictrue {
+						// 	height: 216rpx;
+						// }
+
+						.text {
+							font-size: 26rpx;
+						}
+
+						.bottom {
+							.sales {
+								.money {
+									font-size: 34rpx;
+
+									text {
+										font-size: 26rpx;
+									}
+								}
+							}
+
+							.cart {
+								.pictrue {
+									width: 50rpx;
+									height: 50rpx;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.store-address {
+			width: 100%;
+			margin-top: 15rpx;
+
+			position: relative;
+			padding: 0rpx 30rpx 0 30rpx;
+			height: 185rpx;
+			/* #ifdef H5 */
+			height: 200rpx;
+			/* #endif */
+			background-color: #fff;
+
+			.address {
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+
+				.name {
 					max-width: 400rpx;
 				}
 
-        .icon-xiangyou {
-          font-size: 24rpx;
-          margin-left: 10rpx;
-        }
-      }
-
-      .distance {
-        margin-top: 24rpx;
-        font-size: 24rpx;
-        font-weight: 400;
-        color: #999999;
-      }
-
-      .time {
-        margin-top: 24rpx;
-        font-size: 24rpx;
-        font-weight: 400;
-        color: #333333;
-      }
-
-      .activeColor {
-        position: absolute;
-        right: 45px;
-        background-color: var(--view-theme) !important;
-        color: #fff !important;
-      }
-
-      .activeColor2 {
-        position: absolute;
-         left: 47px;
-        /* #ifdef H5 */
-         left: 40px;
-        /* #endif */
-        background-color: var(--view-theme) !important;
-        color: #fff !important;
-      }
-
-      .rightAdd {
-        right: 110rpx !important;
-
-      }
-
-      .switch {
-        position: absolute;
-        top: 15rpx;
-        /* #ifdef H5 */
-        top: 20rpx;
-        /* #endif */
-        right: 30rpx;
-
-
-        .delivery {
-          display: inline-block;
-          width: 100rpx;
-          height: 50rpx;
-          background: #F5F5F5;
-          border-radius: 33rpx;
-          text-align: center;
-          line-height: 50rpx;
-          font-size: 26rpx;
-          font-weight: 400;
-          color: #999999;
-        }
-      }
-    }
-
-    .footer {
-      width: 100%;
-      position: fixed;
-      left: 0;
-      background-color: #fff;
-      box-shadow: 0px -3px 16px rgba(36, 12, 12, 0.05);
-      z-index: 101;
-      padding-left: 30rpx;
-      box-sizing: border-box;
-      height: 100rpx;
-      bottom: 98rpx;
-      bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-      bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-
-      &.on {
-        // #ifndef H5
-        bottom: 0rpx;
-        // #endif
-      }
-
-      .cartIcon {
-        width: 80rpx;
-        height: 80rpx;
-        border-radius: 50%;
-        position: relative;
-        margin-top: -36rpx;
-
-        .iconfont {
-          font-size: 94rpx;
-          margin-top: 12rpx;
-          color: var(--view-theme);
-        }
-
-        &.noCart {
-          .iconfont {
-            color: #CBCBCB;
-          }
-        }
-
-        .num {
-          min-width: 14rpx;
-          background-color: #fff;
-          color: var(--view-theme);
-          border-radius: 15px;
-          position: absolute;
-          right: -10rpx;
-          top: 20rpx;
-          font-size: 20rpx;
-          padding: 0 10rpx;
-          border: 1px solid var(--view-theme);
-        }
-      }
-
-      .money {
-        font-size: 26rpx;
-        font-weight: bold;
-        color: var(--view-priceColor);
-        margin-right: 34rpx;
-
-        .num {
-          font-size: 34rpx;
-        }
-      }
-
-      .bnt {
-        width: 192rpx;
-        height: 76rpx;
-        background-color: var(--view-theme);
-        border-radius: 46px;
-        line-height: 76rpx;
-        text-align: center;
-        color: #fff;
-        font-size: 28rpx;
-        margin-right: 30rpx;
-      }
-
-      .noCart {
-
-        .money {
-          color: #CBCBCB;
-        }
-
-        .bnt {
-          background-color: #CBCBCB;
-        }
-      }
-    }
-  }
+				.icon-xiangyou {
+					font-size: 24rpx;
+					margin-left: 10rpx;
+				}
+			}
+
+			.distance {
+				margin-top: 24rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #999999;
+			}
+
+			.time {
+				margin-top: 24rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #333333;
+			}
+
+			.activeColor {
+				position: absolute;
+				right: 45px;
+				background-color: var(--view-theme) !important;
+				color: #fff !important;
+			}
+
+			.activeColor2 {
+				position: absolute;
+				left: 47px;
+				/* #ifdef H5 */
+				left: 40px;
+				/* #endif */
+				background-color: var(--view-theme) !important;
+				color: #fff !important;
+			}
+
+			.rightAdd {
+				right: 110rpx !important;
+
+			}
+
+			.switch {
+				position: absolute;
+				top: 15rpx;
+				/* #ifdef H5 */
+				top: 20rpx;
+				/* #endif */
+				right: 30rpx;
+
+
+				.delivery {
+					display: inline-block;
+					width: 100rpx;
+					height: 50rpx;
+					background: #F5F5F5;
+					border-radius: 33rpx;
+					text-align: center;
+					line-height: 50rpx;
+					font-size: 26rpx;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+		}
+
+		.footer {
+			width: 100%;
+			position: fixed;
+			left: 0;
+			background-color: #fff;
+			box-shadow: 0px -3px 16px rgba(36, 12, 12, 0.05);
+			z-index: 101;
+			padding-left: 30rpx;
+			box-sizing: border-box;
+			height: 100rpx;
+			bottom: 98rpx;
+			bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+			bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+
+			&.on {
+				// #ifndef H5
+				bottom: 0rpx;
+				// #endif
+			}
+
+			.cartIcon {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				position: relative;
+				margin-top: -36rpx;
+
+				.iconfont {
+					font-size: 94rpx;
+					margin-top: 12rpx;
+					color: var(--view-theme);
+				}
+
+				&.noCart {
+					.iconfont {
+						color: #CBCBCB;
+					}
+				}
+
+				.num {
+					min-width: 14rpx;
+					background-color: #fff;
+					color: var(--view-theme);
+					border-radius: 15px;
+					position: absolute;
+					right: -10rpx;
+					top: 20rpx;
+					font-size: 20rpx;
+					padding: 0 10rpx;
+					border: 1px solid var(--view-theme);
+				}
+			}
+
+			.money {
+				font-size: 26rpx;
+				font-weight: bold;
+				color: var(--view-priceColor);
+				margin-right: 34rpx;
+
+				.num {
+					font-size: 34rpx;
+				}
+			}
+
+			.bnt {
+				width: 192rpx;
+				height: 76rpx;
+				background-color: var(--view-theme);
+				border-radius: 46px;
+				line-height: 76rpx;
+				text-align: center;
+				color: #fff;
+				font-size: 28rpx;
+				margin-right: 30rpx;
+			}
+
+			.noCart {
+
+				.money {
+					color: #CBCBCB;
+				}
+
+				.bnt {
+					background-color: #CBCBCB;
+				}
+			}
+		}
+	}
 </style>

pages/store_cate/store_cate2.vue

@@ -1,736 +1,748 @@
 <template>
-  <view class="one">
-    <!-- 顶部搜索框 -->
-    <view class="header">
-      <image :src="imgHost+'/statics/images/store-header.png'" mode="" class="header-img"></image>
-      <navigator url="/pages/goods/goods_search/index" class="input acea-row row-center-wrapper" hover-class="none">
+	<view class="one">
+		<!-- 顶部搜索框 -->
+		<view class="header">
+			<image :src="imgHost+'/statics/images/store-header.png'" mode="" class="header-img"></image>
+			<navigator url="/pages/goods/goods_search/index" class="input acea-row row-center-wrapper"
+				hover-class="none">
 				<!-- #ifndef MP  -->
 				<view class="search">
-				<!-- #endif -->	
-				<!-- #ifdef MP  -->
-				<view class="search on acea-row row-middle" style="height: 43px;" :style="'top:'+statusBarHeight+'px'">
-        <view class="searchCon">
-				<!-- #endif -->	
-          <text class="iconfont icon-xiazai5"></text>
-          搜索店内商品
-        </view>
-				<!-- #ifdef MP  -->
-				</view>
-				<!-- #endif -->	
-      </navigator>
-      <!-- 门店地址 -->
-      <view class="address">
-        <view class="left">
-          <view class="left-title" @click="goMap">
+					<!-- #endif -->
+					<!-- #ifdef MP  -->
+					<view class="search on acea-row row-middle" style="height: 43px;"
+						:style="'top:'+statusBarHeight+'px'">
+						<view class="searchCon">
+							<!-- #endif -->
+							<text class="iconfont icon-xiazai5"></text>
+							搜索店内商品
+						</view>
+						<!-- #ifdef MP  -->
+					</view>
+					<!-- #endif -->
+			</navigator>
+			<!-- 门店地址 -->
+			<view class="address">
+				<view class="left">
+					<view class="left-title" @click="goMap">
 						<text class="iconfont icon-mendian"></text>
-            <text class="text line1">{{info.name || '暂无门店'}}</text>
-            <text class="iconfont icon-xiangyou"></text>
-          </view>
-          <!-- 营业时间 -->
-          <view class="time">
-            营业时间：{{info.day_time || '-'}}
-          </view>
-          <view class="distance">
-               <text class="iconfont icon-chakanditu"></text>
-                 距您<text>{{info.range||0}}km</text>
-                   <text class="distance-name">{{info.detailed_address}}</text>
-          </view>
-    
-        </view>
-        <!-- 客服 -->
-        <view class="right">
-          <view class="kefu" @click="goKefu()">
-            <text class="iconfont icon-kefu-mendian" />
-            <text>客服</text>
-          </view>
-          <view class="goods" @click="shoppCart">
-            <view class="cartNum" v-if="cartNum>0">
-              {{cartNum}}
-            </view>
-            <text class="iconfont icon-gouwuche-mendian" />
-            <text>购物车</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 商品排序条件 -->
-    <view class="content">
-      <view class="nav">
-        <view @click="set_where(1)" :class="{'activeColor':active == 1}">
-          综合排序
-        </view>
-        <view @click='set_where(2)' :class="{'activeColor':active == 2}">
-          价格
-          <image v-if="price==1" src="../../static/images/up.png" alt="" class="nav-img"></image>
-          <image v-else-if="price==2" src='../../static/images/down.png' class="nav-img"></image>
-          <image v-else src='../../static/images/horn.png' class="nav-img"></image>
-        </view>
-        <view @click='set_where(3)' :class="{'activeColor':active == 3}">
-          销量
-          <image v-if="stock==1" src="../../static/images/up.png" alt="" class="nav-img"></image>
-          <image v-else-if="stock==2" src='../../static/images/down.png' class="nav-img"></image>
-          <image v-else src='../../static/images/horn.png' class="nav-img"></image>
-        </view>
-        <view @click="set_where(4)">
-          <text class="iconfont icon-shaixuan"></text>
-          筛选
-        </view>
-      </view>
-    </view>
-    <!-- 商品列表 -->
-   	<view class="list waterList" >
-    				<waterfallsFlow ref="waterfallsFlow" :list="productList" @wapper-lick="godDetail">
-    					<!--  #ifdef  MP-WEIXIN -->
-    					<view v-for="(item, index) of productList" :key="index" slot="slot{{index}}">
-    						<view class="waterfalls">
-    							<view class='name line2'>{{item.store_name}}</view>
-    							<span class="label"
-    								v-if="item.activity && item.activity.type === '1' && !promotions_type">秒杀</span>
-    							<span class="label"
-    								v-if="item.activity && item.activity.type === '2' && !promotions_type">砍价</span>
-    							<span class="label"
-    								v-if="item.activity && item.activity.type === '3' && !promotions_type">拼团</span>
-    							<text class="label" v-if="item.promotions.title">{{item.promotions.title}}</text>
-    							<view class="vip acea-row row-middle">
-    								<view class='money font-color'>
-    									￥<text class='num'>{{item.price.toString().split(".")[0]}}</text>
-    									<text class='nums'
-    										v-if="item.price.toString().split('.').length>1">.{{item.price.toString().split(".")[1]}}</text>
-    								</view>
-    								<view class='vip-money acea-row row-middle' v-if="item.vip_price && item.vip_price > 0">
-    									<view>￥{{item.vip_price}}</view>
-    									<!-- 	<image src='../../static/images/vip.png' v-if="item.price_type == 'member'"></image> -->
-    									<view class="icon on" v-if="item.price_type && item.price_type == 'member'"><text
-    											class="iconfont icon-huangguan4"></text>SVIP</view>
-    									<view class="icon" v-if="item.price_type && item.price_type == 'level'"><text
-    											class="iconfont icon-dengjitubiao"></text>{{item.level_name}}</view>
-    								</view>
-    							</view>
-    							<view class='vip acea-row row-between-wrapper'>
-    								<view>已售{{item.sales}}{{item.unit_name || '件'}}</view>
-    								<view>评分 {{item.star}}</view>
-    							</view>
-    						</view>
-    					</view>
-    					<!--  #endif -->
-    
-    					<!-- #ifndef  MP-WEIXIN -->
-    					<template v-slot:default="item">
-    						<view class="waterfalls">
-    							<view class='name line2'>{{item.store_name}}</view>
-    							<span class="label"
-    								v-if="item.activity && item.activity.type === '1' && !promotions_type">秒杀</span>
-    							<span class="label"
-    								v-if="item.activity && item.activity.type === '2' && !promotions_type">砍价</span>
-    							<span class="label"
-    								v-if="item.activity && item.activity.type === '3' && !promotions_type">拼团</span>
-    							<text class="label" v-if="item.promotions.title">{{item.promotions.title}}</text>
-    							<view class="vip acea-row row-middle">
-    								<view class='money font-color'>
-    									￥<text class='num'>{{item.price.toString().split(".")[0]}}</text>
-    									<text class='nums'
-    										v-if="item.price.toString().split('.').length>1">.{{item.price.toString().split(".")[1]}}</text>
-    								</view>
-    								<view class='vip-money acea-row row-middle' v-if="item.vip_price && item.vip_price > 0">
-    									<view>￥{{item.vip_price}}</view>
-    									<view class="icon on" v-if="item.price_type && item.price_type == 'member'"><text
-    											class="iconfont icon-huangguan4"></text>SVIP</view>
-    									<view class="icon" v-if="item.price_type && item.price_type == 'level'"><text
-    											class="iconfont icon-v"></text>{{item.level_name}}</view>
-    								</view>
-    							</view>
-    							<view class='vip acea-row row-between-wrapper'>
-    								<view>已售{{item.sales}}{{item.unit_name || '件'}}</view>
-    								<view>评分 {{item.star}}</view>
-    							</view>
-    						</view>
-    					</template>
-    					<!-- #endif -->
-    				</waterfallsFlow>
-    				<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
-    								<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-    							</view>
-    			</view>
-    <!-- 商品列表 -->
-   <view class="default" v-if="productList.length==0 && where.page > 1">
+						<text class="text line1">{{info.name || '暂无门店'}}</text>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+					<!-- 营业时间 -->
+					<view class="time">
+						营业时间：{{info.day_time || '-'}}
+					</view>
+					<view class="distance">
+						<text class="iconfont icon-chakanditu"></text>
+						距您<text>{{info.range||0}}km</text>
+						<text class="distance-name">{{info.detailed_address}}</text>
+					</view>
+
+				</view>
+				<!-- 客服 -->
+				<view class="right">
+					<view class="kefu" @click="goKefu()">
+						<text class="iconfont icon-kefu-mendian" />
+						<text>客服</text>
+					</view>
+					<view class="goods" @click="shoppCart">
+						<view class="cartNum" v-if="cartNum>0">
+							{{cartNum}}
+						</view>
+						<text class="iconfont icon-gouwuche-mendian" />
+						<text>购物车</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品排序条件 -->
+		<view class="content">
+			<view class="nav">
+				<view @click="set_where(1)" :class="{'activeColor':active == 1}">
+					综合排序
+				</view>
+				<view @click='set_where(2)' :class="{'activeColor':active == 2}">
+					价格
+					<image v-if="price==1" src="../../static/images/up.png" alt="" class="nav-img"></image>
+					<image v-else-if="price==2" src='../../static/images/down.png' class="nav-img"></image>
+					<image v-else src='../../static/images/horn.png' class="nav-img"></image>
+				</view>
+				<view @click='set_where(3)' :class="{'activeColor':active == 3}">
+					销量
+					<image v-if="stock==1" src="../../static/images/up.png" alt="" class="nav-img"></image>
+					<image v-else-if="stock==2" src='../../static/images/down.png' class="nav-img"></image>
+					<image v-else src='../../static/images/horn.png' class="nav-img"></image>
+				</view>
+				<view @click="set_where(4)">
+					<text class="iconfont icon-shaixuan"></text>
+					筛选
+				</view>
+			</view>
+		</view>
+		<!-- 商品列表 -->
+		<view class="list waterList">
+			<waterfallsFlow ref="waterfallsFlow" :list="productList" @wapper-lick="godDetail">
+				<!--  #ifdef  MP-WEIXIN -->
+				<view v-for="(item, index) of productList" :key="index" slot="slot{{index}}">
+					<view class="waterfalls">
+						<view class='name line2'>{{item.store_name}}</view>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '1' && !promotions_type">秒杀</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '2' && !promotions_type">砍价</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '3' && !promotions_type">拼团</span>
+						<text class="label" v-if="item.promotions.title">{{item.promotions.title}}</text>
+						<view class="vip acea-row row-middle">
+							<view class='money font-color'>
+								￥<text class='num'>{{item.price.toString().split(".")[0]}}</text>
+								<text class='nums'
+									v-if="item.price.toString().split('.').length>1">.{{item.price.toString().split(".")[1]}}</text>
+							</view>
+							<view class='vip-money acea-row row-middle' v-if="item.vip_price && item.vip_price > 0">
+								<view>￥{{item.vip_price}}</view>
+								<!-- 	<image src='../../static/images/vip.png' v-if="item.price_type == 'member'"></image> -->
+								<view class="icon on" v-if="item.price_type && item.price_type == 'member'"><text
+										class="iconfont icon-huangguan4"></text>SVIP</view>
+								<view class="icon" v-if="item.price_type && item.price_type == 'level'"><text
+										class="iconfont icon-dengjitubiao"></text>{{item.level_name}}</view>
+							</view>
+						</view>
+						<view class='vip acea-row row-between-wrapper'>
+							<view>已售{{item.sales}}{{item.unit_name || '件'}}</view>
+							<view>评分 {{item.star}}</view>
+						</view>
+					</view>
+				</view>
+				<!--  #endif -->
+
+				<!-- #ifndef  MP-WEIXIN -->
+				<template v-slot:default="item">
+					<view class="waterfalls">
+						<view class='name line2'>{{item.store_name}}</view>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '1' && !promotions_type">秒杀</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '2' && !promotions_type">砍价</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '3' && !promotions_type">拼团</span>
+						<text class="label" v-if="item.promotions.title">{{item.promotions.title}}</text>
+						<view class="vip acea-row row-middle">
+							<view class='money font-color'>
+								￥<text class='num'>{{item.price.toString().split(".")[0]}}</text>
+								<text class='nums'
+									v-if="item.price.toString().split('.').length>1">.{{item.price.toString().split(".")[1]}}</text>
+							</view>
+							<view class='vip-money acea-row row-middle' v-if="item.vip_price && item.vip_price > 0">
+								<view>￥{{item.vip_price}}</view>
+								<view class="icon on" v-if="item.price_type && item.price_type == 'member'"><text
+										class="iconfont icon-huangguan4"></text>SVIP</view>
+								<view class="icon" v-if="item.price_type && item.price_type == 'level'"><text
+										class="iconfont icon-v"></text>{{item.level_name}}</view>
+							</view>
+						</view>
+						<view class='vip acea-row row-between-wrapper'>
+							<view>已售{{item.sales}}{{item.unit_name || '件'}}</view>
+							<view>评分 {{item.star}}</view>
+						</view>
+					</view>
+				</template>
+				<!-- #endif -->
+			</waterfallsFlow>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		</view>
+		<!-- 商品列表 -->
+		<view class="default" v-if="productList.length==0 && where.page > 1">
 			<image :src="imgHost+'/statics/images/no-thing.png'" mode="" class="img"></image>
-      <view class="text">
-        暂无商品，去添加点什么吧
-      </view>
-    </view>
-    <!-- 筛选弹窗 -->
-    <filterPopup ref="popup" :storeCategory="storeCategory" :storeBrand="storeBrand" @brandChange="brandChange"
-      @categoryChange="categoryChange" @submitFn="submitFn"></filterPopup>
-    <!-- 客服弹窗 -->
-    <Kefu ref="kefu" @closeKefu="closeKefu" :customerList="customerList" :customerType="customerType"></Kefu>
-  </view>
+			<view class="text">
+				暂无商品，去添加点什么吧
+			</view>
+		</view>
+		<!-- 筛选弹窗 -->
+		<filterPopup ref="popup" :storeCategory="storeCategory" :storeBrand="storeBrand" @brandChange="brandChange"
+			@categoryChange="categoryChange" @submitFn="submitFn"></filterPopup>
+		<!-- 客服弹窗 -->
+		<Kefu ref="kefu" @closeKefu="closeKefu" :customerList="customerList" :customerType="customerType"></Kefu>
+	</view>
 </template>
 
 <script>
 	let statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-  import waterfallsFlow from "@/components/maramlee-waterfalls-flow/maramlee-waterfalls-flow.vue";
-  import filterPopup from "@/components/filterPopup/index.vue";
-  import Kefu from "@/components/kefu/index.vue"
-  import {
-    mapState,
-    mapGetters
-  } from 'vuex';
-  import {
-    getProducts,
-    getCustomerList,
-    getStoreCategory,
-    getStoreBrand
-  } from '@/api/new_store.js';
-  	import {
-  		goShopDetail
-  	} from '@/libs/order.js';
+	import waterfallsFlow from "@/components/maramlee-waterfalls-flow/maramlee-waterfalls-flow.vue";
+	import filterPopup from "@/components/filterPopup/index.vue";
+	import Kefu from "@/components/kefu/index.vue"
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import {
+		getProducts,
+		getCustomerList,
+		getStoreCategory,
+		getStoreBrand
+	} from '@/api/new_store.js';
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
 	import {
-	  HTTP_REQUEST_URL
-	} from '@/config/app';	
-  export default {
-    components: {
-      filterPopup,
-      waterfallsFlow,
-      Kefu
-    },
-    props: {
-      info: {
-        type: Object,
-        default: {}
-      },
-			customerType:{
-				type:Number,
-				default:1
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+		components: {
+			filterPopup,
+			waterfallsFlow,
+			Kefu
+		},
+		props: {
+			info: {
+				type: Object,
+				default: {}
+			},
+			customerType: {
+				type: Number,
+				default: 1
 			}
-    },
-    computed: {
-      ...mapState({
-        cartNum: state => state.indexData.cartNum
-      }),
-      ...mapGetters(['isLogin', 'uid', 'cartNum']),
-    },
-    data() {
-      return {
-				statusBarHeight:statusBarHeight,
+		},
+		computed: {
+			...mapState({
+				cartNum: state => state.indexData.cartNum
+			}),
+			...mapGetters(['isLogin', 'uid', 'cartNum']),
+		},
+		data() {
+			return {
+				statusBarHeight: statusBarHeight,
 				imgHost: HTTP_REQUEST_URL,
-        price: 0,
-        stock: 0,
-        productList: [], // 商品数据
-        customerList: [], // 客服数据
-        storeCategory: [], // 分类数据
-        storeBrand: [], // 品牌数据
-        show: false,
-        active: 1,
-        where: {
-          cid: 0,
-          sid: 0,
-          keyword: '',
-          priceOrder: '',
-          salesOrder: '',
-          news: 0,
-          page: 1,
-          limit: 5,
-          store_id: 0,
-          brand_id: '',
-        },
-        loading: false,
-        loadend: false,
-        loadTitle: '加载更多',
-      }
-    },
-    mounted() {
+				price: 0,
+				stock: 0,
+				productList: [], // 商品数据
+				customerList: [], // 客服数据
+				storeCategory: [], // 分类数据
+				storeBrand: [], // 品牌数据
+				show: false,
+				active: 1,
+				where: {
+					cid: 0,
+					sid: 0,
+					keyword: '',
+					priceOrder: '',
+					salesOrder: '',
+					news: 0,
+					page: 1,
+					limit: 5,
+					store_id: 0,
+					brand_id: '',
+				},
+				loading: false,
+				loadend: false,
+				loadTitle: '加载更多',
+			}
 		},
-    methods: {
-      // 选择品牌
-      brandChange(val) {
-        this.where.brand_id=val
-      },
-      // 选择分类
-      categoryChange(val) {
-        this.where.cid = val.cid
-        this.where.sid = val.sid
-      },
-      // 确认提交
-      submitFn(val) {
-        if (val == 1) {
-          this.getProducts(true)
-          this.$refs.popup.visible = false
-        } else if (val == 2) {
-          this.where.brand_id = ""
-          this.where.cid = ""
-          this.where.sid = ""
-          this.getProducts(true)
-            this.$refs.popup.visible = false
-        }
-      },
-      // 打开附近门店
-      goMap() {
-        uni.navigateTo({
-          url: "/pages/store/map/index?type=1&storeId="+this.info.id
-        })
-      },
-      // 打开客服
-      goKefu() {
-        this.getCustomerList()
-        this.$refs.kefu.show = true
-      },
-      // 购物车
-      shoppCart() {
-        uni.switchTab({
-          url: "/pages/order_addcart/order_addcart"
-        })
-      },
-      // 关闭客服
-      closeKefu() {
-        this.$refs.kefu.show = false
-      },
-      // 获取客服列表数据
-      getCustomerList() {
-        getCustomerList(this.where.store_id).then(res => {
-          this.customerList = res.data
-        })
-      },
-    	// 去详情页
-    			godDetail(item) {
-    				this.currentPage = false
-    				if (this.promotions_type) {
-    					uni.navigateTo({
-    						url: `/pages/goods_details/index?id=${item.id}`
-    					})
-    				} else {
-    					goShopDetail(item, this.uid).then(res => {
-    						uni.navigateTo({
-    							url: `/pages/goods_details/index?id=${item.id}`
-    						})
-    					})
-    				}
-    			},
-      // 操作
-      set_where: function(e) {
-        switch (e) {
-          case 1:
-            this.active = 1
-            this.where.priceOrder = ""
-            this.where.salesOrder = ""
-            this.where.brand_id = ""
-            this.price= 0
-            break;
-          case 2:
-            if (this.price == 0) this.price = 1;
-            else if (this.price == 1) this.price = 2;
-            else if (this.price == 2) this.price = 0;
-            if (this.price == 1) {
-              this.where.priceOrder = "asc"
-            } else if (this.price == 2) {
-              this.where.priceOrder = "desc"
-            } else {
-              this.where.priceOrder = ""
-            }
-            this.active = 2
-            this.stock = 0;
-
-            break;
-          case 3:
-            if (this.stock == 0) this.stock = 1;
-            else if (this.stock == 1) this.stock = 2;
-            else if (this.stock == 2) this.stock = 0;
-
-            if (this.stock == 1) {
-              this.where.priceOrder = ""
-              this.where.salesOrder = "asc"
-            } else if (this.stock == 2) {
-              this.where.priceOrder = ""
-              this.where.salesOrder = "desc"
-            } else {
-              this.where.salesOrder = ""
-            }
-            this.active = 3
-            this.price = 0
-            break;
-          case 4:
-					  console.log('1111111111');
-            this.getStoreCategory()
-            this.getStoreBrand()
-            this.$refs.popup.visible = true
+		mounted() {},
+		methods: {
+			// 选择品牌
+			brandChange(val) {
+				this.where.brand_id = val
+			},
+			// 选择分类
+			categoryChange(val) {
+				this.where.cid = val.cid
+				this.where.sid = val.sid
+			},
+			// 确认提交
+			submitFn(val) {
+				if (val == 1) {
+					this.getProducts(true)
+					this.$refs.popup.visible = false
+				} else if (val == 2) {
+					this.where.brand_id = ""
+					this.where.cid = ""
+					this.where.sid = ""
+					this.getProducts(true)
+					this.$refs.popup.visible = false
+				}
+			},
+			// 打开附近门店
+			goMap() {
+				uni.navigateTo({
+					url: "/pages/store/map/index?type=1&storeId=" + this.info.id
+				})
+			},
+			// 打开客服
+			goKefu() {
+				this.getCustomerList()
+				this.$refs.kefu.show = true
+			},
+			// 购物车
+			shoppCart() {
+				uni.switchTab({
+					url: "/pages/order_addcart/order_addcart"
+				})
+			},
+			// 关闭客服
+			closeKefu() {
+				this.$refs.kefu.show = false
+			},
+			// 获取客服列表数据
+			getCustomerList() {
+				getCustomerList(this.where.store_id).then(res => {
+					this.customerList = res.data
+				})
+			},
+			// 去详情页
+			godDetail(item) {
+				this.currentPage = false
+				if (this.promotions_type) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.id}`
+					})
+				} else {
+					goShopDetail(item, this.uid).then(res => {
+						uni.navigateTo({
+							url: `/pages/goods_details/index?id=${item.id}`
+						})
+					})
+				}
+			},
+			// 操作
+			set_where: function(e) {
+				switch (e) {
+					case 1:
+						this.active = 1
+						this.where.priceOrder = ""
+						this.where.salesOrder = ""
+						this.where.brand_id = ""
+						this.price = 0
+						break;
+					case 2:
+						if (this.price == 0) this.price = 1;
+						else if (this.price == 1) this.price = 2;
+						else if (this.price == 2) this.price = 0;
+						if (this.price == 1) {
+							this.where.priceOrder = "asc"
+						} else if (this.price == 2) {
+							this.where.priceOrder = "desc"
+						} else {
+							this.where.priceOrder = ""
+						}
+						this.active = 2
+						this.stock = 0;
+
+						break;
+					case 3:
+						if (this.stock == 0) this.stock = 1;
+						else if (this.stock == 1) this.stock = 2;
+						else if (this.stock == 2) this.stock = 0;
+
+						if (this.stock == 1) {
+							this.where.priceOrder = ""
+							this.where.salesOrder = "asc"
+						} else if (this.stock == 2) {
+							this.where.priceOrder = ""
+							this.where.salesOrder = "desc"
+						} else {
+							this.where.salesOrder = ""
+						}
+						this.active = 3
+						this.price = 0
+						break;
+					case 4:
+						console.log('1111111111');
+						this.getStoreCategory()
+						this.getStoreBrand()
+						this.$refs.popup.visible = true
 						this.loadend = false;
 						this.loading = false;
-            break;
-        }
-				if(e<4){
+						break;
+				}
+				if (e < 4) {
 					this.loadend = false;
 					this.$set(this.where, 'page', 1);
 					this.getProducts(true)
 				}
-      },
-      // 商品列表
-      getProducts(isPage) {
-        let that = this;
-        if (that.loadend) return;
-        if (that.loading) return;
-        if (isPage === true) {
-					 that.$refs.waterfallsFlow.refresh();
-					 that.where.page = 1;
-					 that.$set(that, 'productList', []);
-        }
-        that.loading = true;
-        that.loadTitle = '';
-        getProducts(this.where).then(res => {
-            	let list = res.data;
-      				let productList = that.$util.SplitArray(list, that.productList);
-      				let loadend = list.length < that.where.limit;
-      				that.loadend = loadend;
-      				that.loading = false;
-      				that.loadTitle = loadend ? '没有更多内容啦~' : '加载更多';
-      				that.$set(that, 'productList', productList);
-      				that.$set(that.where, 'page', that.where.page + 1);
-          
-        }).catch(err => {
-          that.loading = false;
-          that.loadTitle = '加载更多'
-        });
-      },
-      // 筛选-分类数据
-      getStoreCategory() {
-        let data = {
-          pid: 0
-        }
-        getStoreCategory(data).then(res => {
-          res.data.map(item => {
-            this.$set(item, 'disabled', false)
-            this.$set(item, 'current', -1)
-            item.children.unshift({
-              'id': 0,
-              'cate_name': '全部'
-            })
-          })
-
-          this.storeCategory = res.data
-        })
-      },
-      // 筛选-品牌数据
-      getStoreBrand() {
-        getStoreBrand(this.where).then(res => {
-          this.storeBrand = res.data
-        })
-      },
-      // 触底刷新
-      onReachBottom() {
-
-        this.getProducts()
-
-      }
-    }
-  }
+			},
+			// 商品列表
+			getProducts(isPage) {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (isPage === true) {
+					that.$refs.waterfallsFlow.refresh();
+					that.where.page = 1;
+					that.$set(that, 'productList', []);
+				}
+				that.loading = true;
+				that.loadTitle = '';
+				getProducts(this.where).then(res => {
+					let list = res.data;
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '没有更多内容啦~' : '加载更多';
+					that.$set(that, 'productList', productList);
+					that.$set(that.where, 'page', that.where.page + 1);
+
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多'
+				});
+			},
+			// 筛选-分类数据
+			getStoreCategory() {
+				let data = {
+					pid: 0
+				}
+				getStoreCategory(data).then(res => {
+					res.data.map(item => {
+						this.$set(item, 'disabled', false)
+						this.$set(item, 'current', -1)
+						item.children.unshift({
+							'id': 0,
+							'cate_name': '全部'
+						})
+					})
+
+					this.storeCategory = res.data
+				})
+			},
+			// 筛选-品牌数据
+			getStoreBrand() {
+				getStoreBrand(this.where).then(res => {
+					this.storeBrand = res.data
+				})
+			},
+			// 触底刷新
+			onReachBottom() {
+
+				this.getProducts()
+
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
 	page {
-	  background-color: #F5F5F5;
+		background-color: #F5F5F5;
 	}
 
-  .activeColor {
-    color: var(--view-theme) !important;
-  }
+	.activeColor {
+		color: var(--view-theme) !important;
+	}
 
-  .header {
-    margin-bottom: 40rpx;
+	.header {
+		margin-bottom: 40rpx;
 
-    .header-img {
-      width: 100%;
-      height: 300rpx;
+		.header-img {
+			width: 100%;
+			height: 300rpx;
 			display: block;
-    }
+		}
 
-    .search {
-      position: absolute;
+		.search {
+			position: absolute;
 			// #ifndef MP
-      top: 56rpx;
+			top: 56rpx;
 			// #endif
-      left: 20rpx;
+			left: 20rpx;
 			// #ifdef MP
 			width: 520rpx;
 			// #endif
-      // #ifndef MP
-      width: 710rpx;
-      // #endif
-      height: 64rpx;
-      background: rgba(255, 255, 255, 0.2800);
-      border-radius: 43rpx;
-      font-weight: 400;
-      color: #FFFFFF;
-      font-size: 26rpx;
-      line-height: 64rpx;
-			&.on{
-				background:unset;
+			// #ifndef MP
+			width: 710rpx;
+			// #endif
+			height: 64rpx;
+			background: rgba(255, 255, 255, 0.2800);
+			border-radius: 43rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			font-size: 26rpx;
+			line-height: 64rpx;
+
+			&.on {
+				background: unset;
 			}
-			.searchCon{
+
+			.searchCon {
 				width: 100%;
 				height: 64rpx;
 				background: rgba(255, 255, 255, 0.2800);
 				border-radius: 43rpx;
 			}
-      .icon-xiazai5 {
-        margin-left: 32rpx;
-        margin-right: 12rpx;
-      }
-    }
-
-    .address {
-      position: absolute;
-      top: 160rpx;
-      margin: 0 20rpx;
-      width: 710rpx;
-      height: 192rpx;
-      background: #fff;
-      border-radius: 14rpx;
-      padding: 30rpx 20rpx;
-      display: flex;
+
+			.icon-xiazai5 {
+				margin-left: 32rpx;
+				margin-right: 12rpx;
+			}
+		}
+
+		.address {
+			position: absolute;
+			top: 160rpx;
+			margin: 0 20rpx;
+			width: 710rpx;
+			height: 192rpx;
+			background: #fff;
+			border-radius: 14rpx;
+			padding: 30rpx 20rpx;
+			display: flex;
 			justify-content: space-between;
 
-      .left {
-        .left-title {
-          height: 30rpx;
-          line-height: 30rpx;
-          display: flex;
-
-          image {
-            width: 30rpx;
-            height: 28rpx;
-          }
-
-          .text {
-            font-weight: 600;
-            color: #333333;
-            font-size: 30rpx;
-            margin: 0 10rpx;
+			.left {
+				.left-title {
+					height: 30rpx;
+					line-height: 30rpx;
+					display: flex;
+
+					image {
+						width: 30rpx;
+						height: 28rpx;
+					}
+
+					.text {
+						font-weight: 600;
+						color: #333333;
+						font-size: 30rpx;
+						margin: 0 10rpx;
 						max-width: 390rpx;
-          }
-
-          .icon-xiangyou {
-            color: #333;
-            font-size: 24rpx;
-          }
-        }
-
-        .time {
-          margin: 20rpx 0;
-          font-size: 22rpx;
-          font-weight: 400;
-          color: #666666;
-        }
-
-        .distance {
-          width: 500rpx;
-          font-size: 22rpx;
-          color: #666666;
-          font-weight: 400;
-          .icon-chakanditu {
-            margin-right: 8rpx;
-            font-size: 28rpx;
-            color: #ccc;
-          }
-          .distance-name {
-            display: inline-block;
-            width: 286rpx;
-            height: 22rpx;
-            border-left: 1px solid #000;
-            margin-left: 16rpx;
-            line-height: 22rpx;
-            text-align: left;
-            padding-left: 16rpx;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-
-          }
-        }
-      }
-
-      .right {
-margin-top: 36rpx;
-        display: flex;
-        font-size: 20rpx;
-        color: #333333;
-
-        .kefu {
-          margin-right: 30rpx;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-
-          .icon-kefu-mendian {
-            font-size: 36rpx;
-          }
-        }
-      }
-
-      .goods {
-        position: relative;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        .icon-gouwuche-mendian {
-          font-size: 36rpx;
-
-        }
-
-        .cartNum {
-          position: absolute;
-          top: -8rpx;
-          right: 2rpx;
-          width: 30rpx;
-          height: 30rpx;
-          line-height: 30rpx;
-          text-align: center;
-          font-weight: 500;
-          color: #FFFFFF;
-          border-radius: 50%;
-          background: var(--view-theme);
-          border: 1px solid #FFFFFF;
-        }
-
-      }
-    }
-  }
-
-  .goods-list {
-    padding: 0 30rpx;
-    margin-bottom: 50rpx !important;
-
-  }
-
-  .content {
-    height: 100%;
-
-    // margin-bottom: 200rpx;
-    .nav {
-      padding: 40rpx 50rpx 40rpx 50rpx;
-      display: flex;
-      justify-content: space-between;
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #666666;
-
-      .nav-img {
-        width: 15rpx;
-        height: 18rpx;
-        margin-left: 10rpx;
-      }
-
-      .icon-shaixuan {
-        font-size: 24rpx;
-        margin-right: 10rpx;
-      }
-    }
-  }
-  .vip {
-    margin: 20rpx 0 10rpx 0;
-    .price {
-      font-size: 34rpx;
-      font-weight: 600;
-      color: var(--view-theme);
-    }
-    .sold {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-    }
-  }
+					}
+
+					.icon-xiangyou {
+						color: #333;
+						font-size: 24rpx;
+					}
+				}
+
+				.time {
+					margin: 20rpx 0;
+					font-size: 22rpx;
+					font-weight: 400;
+					color: #666666;
+				}
+
+				.distance {
+					width: 500rpx;
+					font-size: 22rpx;
+					color: #666666;
+					font-weight: 400;
+
+					.icon-chakanditu {
+						margin-right: 8rpx;
+						font-size: 28rpx;
+						color: #ccc;
+					}
+
+					.distance-name {
+						display: inline-block;
+						width: 286rpx;
+						height: 22rpx;
+						border-left: 1px solid #000;
+						margin-left: 16rpx;
+						line-height: 22rpx;
+						text-align: left;
+						padding-left: 16rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+
+					}
+				}
+			}
+
+			.right {
+				margin-top: 36rpx;
+				display: flex;
+				font-size: 20rpx;
+				color: #333333;
+
+				.kefu {
+					margin-right: 30rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.icon-kefu-mendian {
+						font-size: 36rpx;
+					}
+				}
+			}
+
+			.goods {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.icon-gouwuche-mendian {
+					font-size: 36rpx;
+
+				}
+
+				.cartNum {
+					position: absolute;
+					top: -8rpx;
+					right: 2rpx;
+					width: 30rpx;
+					height: 30rpx;
+					line-height: 30rpx;
+					text-align: center;
+					font-weight: 500;
+					color: #FFFFFF;
+					border-radius: 50%;
+					background: var(--view-theme);
+					border: 1px solid #FFFFFF;
+				}
+
+			}
+		}
+	}
+
+	.goods-list {
+		padding: 0 30rpx;
+		margin-bottom: 50rpx !important;
+
+	}
+
+	.content {
+		height: 100%;
+
+		// margin-bottom: 200rpx;
+		.nav {
+			padding: 40rpx 50rpx 40rpx 50rpx;
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+
+			.nav-img {
+				width: 15rpx;
+				height: 18rpx;
+				margin-left: 10rpx;
+			}
+
+			.icon-shaixuan {
+				font-size: 24rpx;
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	.vip {
+		margin: 20rpx 0 10rpx 0;
+
+		.price {
+			font-size: 34rpx;
+			font-weight: 600;
+			color: var(--view-theme);
+		}
+
+		.sold {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+	}
+
 	.list {
-		padding: 0  20rpx 90rpx 20rpx;
+		padding: 0 20rpx 90rpx 20rpx;
 	}
 
-.list .waterList {
-  margin-bottom: 60rpx;
+	.list .waterList {
+		margin-bottom: 60rpx;
 		// margin-top: 192rpx;
 	}
 
-  .default {
-    margin-top: 100rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .img {
-      width: 414rpx;
-      height: 256rpx;
-    }
-
-    .text {
-      font-size: 26rpx;
-      font-weight: 400;
-      color: #999999;
-    }
-  }
-  	.waterfalls {
-  		padding: 10rpx 16rpx 16rpx 16rpx;
-  		color: #222;
-  
-  		.name {
-  			font-size: 28rpx;
-  		}
-  
-  		.label {
-  			font-size: 20rpx;
-  			color: var(--view-theme);
-  			border-radius: 4rpx;
-  			border: 1px solid var(--view-theme);
-  			padding: 0 6rpx;
-  			display: inline-block;
-  			margin-top: 10rpx;
-  			margin-right: 10rpx;
-  		}
-  
-  		.money {
-  			font-size: 26rpx;
-  			font-weight: 700;
-  
-  			.num {
-  				font-size: 34rpx;
-  			}
-  
-  			.nums {
-  				font-size: 28rpx;
-  			}
-  		}
-  
-  		.vip {
-  			font-size: 22rpx;
-  			color: #aaa;
-  			margin-top: 6rpx;
-  
-  			.vip-money {
-  				font-size: 24rpx;
-  				color: #282828;
-  				font-weight: bold;
-					.icon{
+	.default {
+		margin-top: 100rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.img {
+			width: 414rpx;
+			height: 256rpx;
+		}
+
+		.text {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+	}
+
+	.waterfalls {
+		padding: 10rpx 16rpx 16rpx 16rpx;
+		color: #222;
+
+		.name {
+			font-size: 28rpx;
+		}
+
+		.label {
+			font-size: 20rpx;
+			color: var(--view-theme);
+			border-radius: 4rpx;
+			border: 1px solid var(--view-theme);
+			padding: 0 6rpx;
+			display: inline-block;
+			margin-top: 10rpx;
+			margin-right: 10rpx;
+		}
+
+		.money {
+			font-size: 26rpx;
+			font-weight: 700;
+
+			.num {
+				font-size: 34rpx;
+			}
+
+			.nums {
+				font-size: 28rpx;
+			}
+		}
+
+		.vip {
+			font-size: 22rpx;
+			color: #aaa;
+			margin-top: 6rpx;
+
+			.vip-money {
+				font-size: 24rpx;
+				color: #282828;
+				font-weight: bold;
+
+				.icon {
+					font-size: 15rpx;
+					background: #FF9500;
+					color: #fff;
+					border-radius: 18rpx;
+					padding: 1rpx 6rpx;
+					margin-left: 10rpx;
+					min-width: 60rpx;
+
+					.iconfont {
 						font-size: 15rpx;
-						background: #FF9500;
-						color: #fff;
-						border-radius: 18rpx;
-						padding: 1rpx 6rpx;
-						margin-left: 10rpx;
-						min-width: 60rpx;
-						
-						.iconfont {
-							font-size: 15rpx;
-							margin-right: 5rpx;
-						}
-						
-						&.on {
-							background: #333;
-							color: #FDDAA4;
-							min-width: unset;
-						}
+						margin-right: 5rpx;
+					}
+
+					&.on {
+						background: #333;
+						color: #FDDAA4;
+						min-width: unset;
 					}
-  
-  				image {
-  					width: 46rpx;
-  					height: 21rpx;
-  					margin-left: 4rpx;
-  				}
-  			}
-  		}
-  	}
+				}
+
+				image {
+					width: 46rpx;
+					height: 21rpx;
+					margin-left: 4rpx;
+				}
+			}
+		}
+	}
 </style>

pages/store_cate/store_cate_index.vue

@@ -0,0 +1,822 @@
+<template>
+	<view class="one">
+		<!-- 顶部搜索框 -->
+		<view class="header">
+			<image :src="imgHost+'/statics/images/store-header.png'" mode="" class="header-img"></image>
+			<navigator url="/pages/goods/goods_search/index" class="input acea-row row-center-wrapper"
+				hover-class="none">
+				<!-- #ifndef MP  -->
+				<view class="search">
+					<!-- #endif -->
+					<!-- #ifdef MP  -->
+					<view class="search on acea-row row-middle" style="height: 43px;"
+						:style="'top:'+statusBarHeight+'px;'">
+						<view class="search_Back">
+							<view class="iconfont icon-fanhui2" @tap.stop="returns"></view>
+						</view>
+						<view class="searchCon">
+							<!-- #endif -->
+							<text class="iconfont icon-xiazai5"></text>
+							搜索店内商品
+						</view>
+						<!-- #ifdef MP  -->
+					</view>
+					<!-- #endif -->
+			</navigator>
+			<!-- 门店地址 -->
+			<view class="address">
+				<view class="left">
+					<view class="left-title" @click="goMap">
+						<text class="iconfont icon-mendian"></text>
+						<text class="text line1">{{info.name || '暂无门店'}}</text>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+					<!-- 营业时间 -->
+					<view class="time">
+						营业时间：{{info.day_time || '-'}}
+					</view>
+					<view class="distance">
+						<text class="iconfont icon-chakanditu"></text>
+						距您<text>{{info.range||0}}km</text>
+						<text class="distance-name">{{info.detailed_address}}</text>
+					</view>
+
+				</view>
+				<!-- 客服 -->
+				<view class="right">
+					<view class="kefu" @click="goKefu()">
+						<text class="iconfont icon-kefu-mendian" />
+						<text>客服</text>
+					</view>
+					<view class="goods" @click="shoppCart">
+						<view class="cartNum" v-if="cartNum>0">
+							{{cartNum}}
+						</view>
+						<text class="iconfont icon-gouwuche-mendian" />
+						<text>购物车</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品排序条件 -->
+		<view class="content">
+			<view class="nav">
+				<view @click="set_where(1)" :class="{'activeColor':active == 1}">
+					综合排序
+				</view>
+				<view @click='set_where(2)' :class="{'activeColor':active == 2}">
+					价格
+					<image v-if="price==1" src="../../static/images/up.png" alt="" class="nav-img"></image>
+					<image v-else-if="price==2" src='../../static/images/down.png' class="nav-img"></image>
+					<image v-else src='../../static/images/horn.png' class="nav-img"></image>
+				</view>
+				<view @click='set_where(3)' :class="{'activeColor':active == 3}">
+					销量
+					<image v-if="stock==1" src="../../static/images/up.png" alt="" class="nav-img"></image>
+					<image v-else-if="stock==2" src='../../static/images/down.png' class="nav-img"></image>
+					<image v-else src='../../static/images/horn.png' class="nav-img"></image>
+				</view>
+				<view @click="set_where(4)">
+					<text class="iconfont icon-shaixuan"></text>
+					筛选
+				</view>
+			</view>
+		</view>
+		<!-- 商品列表 -->
+		<view class="list waterList">
+			<waterfallsFlow ref="waterfallsFlow" :list="productList" @wapper-lick="godDetail">
+				<!--  #ifdef  MP-WEIXIN -->
+				<view v-for="(item, index) of productList" :key="index" slot="slot{{index}}">
+					<view class="waterfalls">
+						<view class='name line2'>{{item.store_name}}</view>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '1' && !promotions_type">秒杀</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '2' && !promotions_type">砍价</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '3' && !promotions_type">拼团</span>
+						<text class="label" v-if="item.promotions.title">{{item.promotions.title}}</text>
+						<view class="vip acea-row row-middle">
+							<view class='money font-color'>
+								￥<text class='num'>{{item.price.toString().split(".")[0]}}</text>
+								<text class='nums'
+									v-if="item.price.toString().split('.').length>1">.{{item.price.toString().split(".")[1]}}</text>
+							</view>
+							<view class='vip-money acea-row row-middle' v-if="item.vip_price && item.vip_price > 0">
+								<view>￥{{item.vip_price}}</view>
+								<!-- 	<image src='../../static/images/vip.png' v-if="item.price_type == 'member'"></image> -->
+								<view class="icon on" v-if="item.price_type && item.price_type == 'member'"><text
+										class="iconfont icon-huangguan4"></text>SVIP</view>
+								<view class="icon" v-if="item.price_type && item.price_type == 'level'"><text
+										class="iconfont icon-dengjitubiao"></text>{{item.level_name}}</view>
+							</view>
+						</view>
+						<view class='vip acea-row row-between-wrapper'>
+							<view>已售{{item.sales}}{{item.unit_name || '件'}}</view>
+							<view>评分 {{item.star}}</view>
+						</view>
+					</view>
+				</view>
+				<!--  #endif -->
+
+				<!-- #ifndef  MP-WEIXIN -->
+				<template v-slot:default="item">
+					<view class="waterfalls">
+						<view class='name line2'>{{item.store_name}}</view>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '1' && !promotions_type">秒杀</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '2' && !promotions_type">砍价</span>
+						<span class="label"
+							v-if="item.activity && item.activity.type === '3' && !promotions_type">拼团</span>
+						<text class="label" v-if="item.promotions.title">{{item.promotions.title}}</text>
+						<view class="vip acea-row row-middle">
+							<view class='money font-color'>
+								￥<text class='num'>{{item.price.toString().split(".")[0]}}</text>
+								<text class='nums'
+									v-if="item.price.toString().split('.').length>1">.{{item.price.toString().split(".")[1]}}</text>
+							</view>
+							<view class='vip-money acea-row row-middle' v-if="item.vip_price && item.vip_price > 0">
+								<view>￥{{item.vip_price}}</view>
+								<view class="icon on" v-if="item.price_type && item.price_type == 'member'"><text
+										class="iconfont icon-huangguan4"></text>SVIP</view>
+								<view class="icon" v-if="item.price_type && item.price_type == 'level'"><text
+										class="iconfont icon-v"></text>{{item.level_name}}</view>
+							</view>
+						</view>
+						<view class='vip acea-row row-between-wrapper'>
+							<view>已售{{item.sales}}{{item.unit_name || '件'}}</view>
+							<view>评分 {{item.star}}</view>
+						</view>
+					</view>
+				</template>
+				<!-- #endif -->
+			</waterfallsFlow>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		</view>
+		<!-- 商品列表 -->
+		<view class="default" v-if="productList.length==0 && where.page > 1">
+			<image :src="imgHost+'/statics/images/no-thing.png'" mode="" class="img"></image>
+			<view class="text">
+				暂无商品，去添加点什么吧
+			</view>
+		</view>
+		<!-- 筛选弹窗 -->
+		<filterPopup ref="popup" :storeCategory="storeCategory" :storeBrand="storeBrand" @brandChange="brandChange"
+			@categoryChange="categoryChange" @submitFn="submitFn"></filterPopup>
+		<!-- 客服弹窗 -->
+		<Kefu ref="kefu" @closeKefu="closeKefu" :customerList="customerList" :customerType="customerType"></Kefu>
+	</view>
+</template>
+
+<script>
+	let statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+	import waterfallsFlow from "@/components/maramlee-waterfalls-flow/maramlee-waterfalls-flow.vue";
+	import filterPopup from "@/components/filterPopup/index.vue";
+	import Kefu from "@/components/kefu/index.vue"
+
+	import {
+		getnearbyStore
+	} from '@/api/new_store.js'
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import {
+		getProducts,
+		getCustomerList,
+		getStoreCategory,
+		getStoreBrand
+	} from '@/api/new_store.js';
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+		components: {
+			filterPopup,
+			waterfallsFlow,
+			Kefu
+		},
+		computed: {
+			...mapState({
+				cartNum: state => state.indexData.cartNum
+			}),
+			...mapGetters(['isLogin', 'uid', 'cartNum']),
+		},
+		data() {
+			return {
+				storeShow: 2,
+				customerType: 1,
+				info: {},
+				statusBarHeight: statusBarHeight,
+				imgHost: HTTP_REQUEST_URL,
+				price: 0,
+				stock: 0,
+				productList: [], // 商品数据
+				customerList: [], // 客服数据
+				storeCategory: [], // 分类数据
+				storeBrand: [], // 品牌数据
+				show: false,
+				active: 1,
+				where: {
+					cid: 0,
+					sid: 0,
+					keyword: '',
+					priceOrder: '',
+					salesOrder: '',
+					news: 0,
+					page: 1,
+					limit: 5,
+					store_id: 0,
+					brand_id: '',
+				},
+				loading: false,
+				loadend: false,
+				loadTitle: '加载更多',
+			}
+		},
+		onLoad() {
+			try {
+				this.where.latitude = uni.getStorageSync('user_latitude');
+				this.where.longitude = uni.getStorageSync('user_longitude');
+			} catch (e) {
+				console.log(e);
+			}
+			if (this.where.latitude && this.where.longitude) {
+				this.getStore();
+			} else {
+				this.selfLocation();
+			}
+		},
+		mounted() {},
+		methods: {
+			returns: function() {
+				uni.navigateBack();
+			},
+			getStore() {
+				this.where.latitude = uni.getStorageSync('user_latitude');
+				this.where.longitude = uni.getStorageSync('user_longitude');
+				getnearbyStore(this.where).then(res => {
+					this.info = res.data.info
+					this.id = this.info.id
+					this.customerType = parseInt(res.data.info.customer_type)
+					uni.setStorageSync('user_store_id', this.info.id);
+					setTimeout(() => {
+						this.where.store_id = this.id
+						this.getProducts(true)
+					})
+				})
+			},
+			// 获取附近位置
+			selfLocation() {
+				let self = this
+				// #ifdef H5
+				if (self.$wechat.isWeixin()) {
+					self.$wechat.location().then(res => {
+						this.where.latitude = res.latitude;
+						this.where.longitude = res.longitude;
+						uni.setStorageSync('user_latitude', res.latitude);
+						uni.setStorageSync('user_longitude', res.longitude);
+						self.getStore();
+					})
+				} else {
+					// #endif	
+					uni.getLocation({
+						type: 'wgs84',
+						success: (res) => {
+							try {
+								this.where.latitude = res.latitude;
+								this.where.longitude = res.longitude;
+								uni.setStorageSync('user_latitude', res.latitude);
+								uni.setStorageSync('user_longitude', res.longitude);
+							} catch {}
+							self.getStore();
+						},
+						complete: function() {
+							self.getStore();
+						}
+					});
+					// #ifdef H5	
+				}
+				// #endif
+			},
+			// 选择品牌
+			brandChange(val) {
+				this.where.brand_id = val
+			},
+			// 选择分类
+			categoryChange(val) {
+				this.where.cid = val.cid
+				this.where.sid = val.sid
+			},
+			// 确认提交
+			submitFn(val) {
+				if (val == 1) {
+					this.getProducts(true)
+					this.$refs.popup.visible = false
+				} else if (val == 2) {
+					this.where.brand_id = ""
+					this.where.cid = ""
+					this.where.sid = ""
+					this.getProducts(true)
+					this.$refs.popup.visible = false
+				}
+			},
+			// 打开附近门店
+			goMap() {
+				uni.navigateTo({
+					url: "/pages/store/map/index?type=1&storeId=" + this.info.id
+				})
+			},
+			// 打开客服
+			goKefu() {
+				this.getCustomerList()
+				this.$refs.kefu.show = true
+			},
+			// 购物车
+			shoppCart() {
+				uni.switchTab({
+					url: "/pages/order_addcart/order_addcart"
+				})
+			},
+			// 关闭客服
+			closeKefu() {
+				this.$refs.kefu.show = false
+			},
+			// 获取客服列表数据
+			getCustomerList() {
+				getCustomerList(this.where.store_id).then(res => {
+					this.customerList = res.data
+				})
+			},
+			// 去详情页
+			godDetail(item) {
+				this.currentPage = false
+				if (this.promotions_type) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.id}`
+					})
+				} else {
+					goShopDetail(item, this.uid).then(res => {
+						uni.navigateTo({
+							url: `/pages/goods_details/index?id=${item.id}`
+						})
+					})
+				}
+			},
+			// 操作
+			set_where: function(e) {
+				switch (e) {
+					case 1:
+						this.active = 1
+						this.where.priceOrder = ""
+						this.where.salesOrder = ""
+						this.where.brand_id = ""
+						this.price = 0
+						break;
+					case 2:
+						if (this.price == 0) this.price = 1;
+						else if (this.price == 1) this.price = 2;
+						else if (this.price == 2) this.price = 0;
+						if (this.price == 1) {
+							this.where.priceOrder = "asc"
+						} else if (this.price == 2) {
+							this.where.priceOrder = "desc"
+						} else {
+							this.where.priceOrder = ""
+						}
+						this.active = 2
+						this.stock = 0;
+
+						break;
+					case 3:
+						if (this.stock == 0) this.stock = 1;
+						else if (this.stock == 1) this.stock = 2;
+						else if (this.stock == 2) this.stock = 0;
+
+						if (this.stock == 1) {
+							this.where.priceOrder = ""
+							this.where.salesOrder = "asc"
+						} else if (this.stock == 2) {
+							this.where.priceOrder = ""
+							this.where.salesOrder = "desc"
+						} else {
+							this.where.salesOrder = ""
+						}
+						this.active = 3
+						this.price = 0
+						break;
+					case 4:
+						console.log('1111111111');
+						this.getStoreCategory()
+						this.getStoreBrand()
+						this.$refs.popup.visible = true
+						this.loadend = false;
+						this.loading = false;
+						break;
+				}
+				if (e < 4) {
+					this.loadend = false;
+					this.$set(this.where, 'page', 1);
+					this.getProducts(true)
+				}
+			},
+			// 商品列表
+			getProducts(isPage) {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (isPage === true) {
+					that.$refs.waterfallsFlow.refresh();
+					that.where.page = 1;
+					that.$set(that, 'productList', []);
+				}
+				that.loading = true;
+				that.loadTitle = '';
+				getProducts(this.where).then(res => {
+					let list = res.data;
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '没有更多内容啦~' : '加载更多';
+					that.$set(that, 'productList', productList);
+					that.$set(that.where, 'page', that.where.page + 1);
+
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多'
+				});
+			},
+			// 筛选-分类数据
+			getStoreCategory() {
+				let data = {
+					pid: 0
+				}
+				getStoreCategory(data).then(res => {
+					res.data.map(item => {
+						this.$set(item, 'disabled', false)
+						this.$set(item, 'current', -1)
+						item.children.unshift({
+							'id': 0,
+							'cate_name': '全部'
+						})
+					})
+
+					this.storeCategory = res.data
+				})
+			},
+			// 筛选-品牌数据
+			getStoreBrand() {
+				getStoreBrand(this.where).then(res => {
+					this.storeBrand = res.data
+				})
+			},
+			// 触底刷新
+			onReachBottom() {
+
+				this.getProducts()
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F5F5F5;
+	}
+
+	.activeColor {
+		color: var(--view-theme) !important;
+	}
+
+	.header {
+		margin-bottom: 40rpx;
+
+		.header-img {
+			width: 100%;
+			height: 300rpx;
+			display: block;
+		}
+
+		.search {
+			display: flex;
+			flex-wrap: nowrap;
+			position: absolute;
+			// #ifndef MP
+			top: 56rpx;
+			// #endif
+			left: 20rpx;
+			// #ifdef MP
+			width: 520rpx;
+			// #endif
+			// #ifndef MP
+			width: 710rpx;
+			// #endif
+			height: 64rpx;
+			background: rgba(255, 255, 255, 0.2800);
+			border-radius: 43rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			font-size: 26rpx;
+			line-height: 64rpx;
+
+			.search_Back {
+				width: 50rpx;
+				height: 100%;
+				flex-shrink: 0;
+				display: flex;
+				align-items: center;
+			}
+
+			&.on {
+				background: unset;
+			}
+
+			.searchCon {
+				width: 100%;
+				height: 64rpx;
+				background: rgba(255, 255, 255, 0.2800);
+				border-radius: 43rpx;
+				flex-shrink: 1;
+			}
+
+			.icon-xiazai5 {
+				margin-left: 32rpx;
+				margin-right: 12rpx;
+			}
+		}
+
+		.address {
+			position: absolute;
+			top: 160rpx;
+			margin: 0 20rpx;
+			width: 710rpx;
+			height: 192rpx;
+			background: #fff;
+			border-radius: 14rpx;
+			padding: 30rpx 20rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				.left-title {
+					height: 30rpx;
+					line-height: 30rpx;
+					display: flex;
+
+					image {
+						width: 30rpx;
+						height: 28rpx;
+					}
+
+					.text {
+						font-weight: 600;
+						color: #333333;
+						font-size: 30rpx;
+						margin: 0 10rpx;
+						max-width: 390rpx;
+					}
+
+					.icon-xiangyou {
+						color: #333;
+						font-size: 24rpx;
+					}
+				}
+
+				.time {
+					margin: 20rpx 0;
+					font-size: 22rpx;
+					font-weight: 400;
+					color: #666666;
+				}
+
+				.distance {
+					width: 500rpx;
+					font-size: 22rpx;
+					color: #666666;
+					font-weight: 400;
+
+					.icon-chakanditu {
+						margin-right: 8rpx;
+						font-size: 28rpx;
+						color: #ccc;
+					}
+
+					.distance-name {
+						display: inline-block;
+						width: 286rpx;
+						height: 22rpx;
+						border-left: 1px solid #000;
+						margin-left: 16rpx;
+						line-height: 22rpx;
+						text-align: left;
+						padding-left: 16rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+
+					}
+				}
+			}
+
+			.right {
+				margin-top: 36rpx;
+				display: flex;
+				font-size: 20rpx;
+				color: #333333;
+
+				.kefu {
+					margin-right: 30rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.icon-kefu-mendian {
+						font-size: 36rpx;
+					}
+				}
+			}
+
+			.goods {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.icon-gouwuche-mendian {
+					font-size: 36rpx;
+
+				}
+
+				.cartNum {
+					position: absolute;
+					top: -8rpx;
+					right: 2rpx;
+					width: 30rpx;
+					height: 30rpx;
+					line-height: 30rpx;
+					text-align: center;
+					font-weight: 500;
+					color: #FFFFFF;
+					border-radius: 50%;
+					background: var(--view-theme);
+					border: 1px solid #FFFFFF;
+				}
+
+			}
+		}
+	}
+
+	.goods-list {
+		padding: 0 30rpx;
+		margin-bottom: 50rpx !important;
+
+	}
+
+	.content {
+		height: 100%;
+
+		// margin-bottom: 200rpx;
+		.nav {
+			padding: 40rpx 50rpx 40rpx 50rpx;
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+
+			.nav-img {
+				width: 15rpx;
+				height: 18rpx;
+				margin-left: 10rpx;
+			}
+
+			.icon-shaixuan {
+				font-size: 24rpx;
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	.vip {
+		margin: 20rpx 0 10rpx 0;
+
+		.price {
+			font-size: 34rpx;
+			font-weight: 600;
+			color: var(--view-theme);
+		}
+
+		.sold {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+	}
+
+	.list {
+		padding: 0 20rpx 90rpx 20rpx;
+	}
+
+	.list .waterList {
+		margin-bottom: 60rpx;
+		// margin-top: 192rpx;
+	}
+
+	.default {
+		margin-top: 100rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.img {
+			width: 414rpx;
+			height: 256rpx;
+		}
+
+		.text {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+	}
+
+	.waterfalls {
+		padding: 10rpx 16rpx 16rpx 16rpx;
+		color: #222;
+
+		.name {
+			font-size: 28rpx;
+		}
+
+		.label {
+			font-size: 20rpx;
+			color: var(--view-theme);
+			border-radius: 4rpx;
+			border: 1px solid var(--view-theme);
+			padding: 0 6rpx;
+			display: inline-block;
+			margin-top: 10rpx;
+			margin-right: 10rpx;
+		}
+
+		.money {
+			font-size: 26rpx;
+			font-weight: 700;
+
+			.num {
+				font-size: 34rpx;
+			}
+
+			.nums {
+				font-size: 28rpx;
+			}
+		}
+
+		.vip {
+			font-size: 22rpx;
+			color: #aaa;
+			margin-top: 6rpx;
+
+			.vip-money {
+				font-size: 24rpx;
+				color: #282828;
+				font-weight: bold;
+
+				.icon {
+					font-size: 15rpx;
+					background: #FF9500;
+					color: #fff;
+					border-radius: 18rpx;
+					padding: 1rpx 6rpx;
+					margin-left: 10rpx;
+					min-width: 60rpx;
+
+					.iconfont {
+						font-size: 15rpx;
+						margin-right: 5rpx;
+					}
+
+					&.on {
+						background: #333;
+						color: #FDDAA4;
+						min-width: unset;
+					}
+				}
+
+				image {
+					width: 46rpx;
+					height: 21rpx;
+					margin-left: 4rpx;
+				}
+			}
+		}
+	}
+</style>

pages/store_cate/store_cate备份.vue

@@ -0,0 +1,148 @@
+<template>
+	<!-- 商品分类 -->
+	<view :style="colorStyle">
+		<!-- 门店的两种样式布局 -->
+		<storeCate1 :info="info" :isFooter="isFooter" v-if="storeShow===1" ref="refresh2">
+		</storeCate1>
+		<storeCate2 :info="info" :customerType="customerType" v-if="storeShow===2" ref="refresh">
+		</storeCate2>
+		<pageFooter @newDataStatus="newDataStatus"></pageFooter>
+	</view>
+</template>
+
+<script>
+	import colors from "@/mixins/color";
+	import storeCate1 from './store_cate1.vue'
+	import storeCate2 from './store_cate2.vue'
+	import pageFooter from '@/components/pageFooter/index.vue'
+
+	import {
+		getnearbyStore
+	} from '@/api/new_store.js'
+	import {
+		colorChange
+	} from '@/api/api.js';
+	export default {
+		components: {
+			storeCate1,
+			storeCate2,
+			pageFooter
+		},
+		mixins: [colors],
+		data() {
+			return {
+				info: {},
+				id: 0,
+				isFooter: false,
+				category: '',
+				storeShow: 2,
+				customerType: 1,
+				where: {
+					latitude: 0,
+					longitude: 0,
+					store_id: 0
+				},
+			}
+		},
+		onLoad() {
+			try {
+				this.where.latitude = uni.getStorageSync('user_latitude');
+				this.where.longitude = uni.getStorageSync('user_longitude');
+			} catch (e) {}
+		},
+		onShow() {
+			uni.removeStorageSync('form_type_cart');
+			let _this = this
+			uni.$on("handClick", res => {
+				if (res) {
+					_this.where.latitude = res.latitude
+					_this.where.longitude = res.longitude
+					_this.where.store_id = res.store_id
+					_this.getStore();
+				}
+				// 清除监听
+				uni.$off('handClick');
+			})
+			if (this.where.latitude && this.where.longitude) {
+				this.getStore();
+			} else {
+				this.selfLocation();
+			}
+		},
+		mounted() {},
+		methods: {
+			selfLocation() {
+				let self = this
+				// #ifdef H5
+				if (self.$wechat.isWeixin()) {
+					self.$wechat.location().then(res => {
+						this.where.latitude = res.latitude;
+						this.where.longitude = res.longitude;
+						uni.setStorageSync('user_latitude', res.latitude);
+						uni.setStorageSync('user_longitude', res.longitude);
+						self.getStore();
+					})
+				} else {
+					// #endif	
+					uni.getLocation({
+						type: 'wgs84',
+						success: (res) => {
+							try {
+								this.where.latitude = res.latitude;
+								this.where.longitude = res.longitude;
+								uni.setStorageSync('user_latitude', res.latitude);
+								uni.setStorageSync('user_longitude', res.longitude);
+							} catch {}
+							self.getStore();
+						},
+						complete: function() {
+							self.getStore();
+						}
+					});
+					// #ifdef H5	
+				}
+				// #endif
+			},
+			// 获取接口附近门店
+			getStore() {
+				this.where.latitude = uni.getStorageSync('user_latitude');
+				this.where.longitude = uni.getStorageSync('user_longitude');
+				getnearbyStore(this.where).then(res => {
+					this.storeShow = res.data.info.home_style
+					this.info = res.data.info
+					this.id = this.info.id
+					this.customerType = parseInt(res.data.info.customer_type)
+					uni.setStorageSync('user_store_id', this.info.id);
+					if (this.storeShow === 1) {
+						setTimeout(() => {
+							this.$refs.refresh2.getAllCategory();
+							this.$refs.refresh2.getCartList(1);
+							this.$refs.refresh2.getMarTop();
+						}, 10)
+					} else if (this.storeShow === 2) {
+						setTimeout(() => {
+							this.$refs.refresh.where.store_id = this.id
+							this.$refs.refresh.getProducts(true)
+						})
+					}
+				})
+			},
+			newDataStatus(val) {
+				this.isFooter = val;
+			},
+		},
+		onReachBottom: function() {
+			if (this.storeShow === 1) {
+				setTimeout(() => {
+					this.$refs.refresh2.getProducts()
+				}, 10)
+			}
+			if (this.storeShow === 2) {
+				this.$refs.refresh.getProducts()
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+
+</style>

pages/user/index.vue

@@ -1,2069 +1,2117 @@
-<template>
-  <!-- 个人中心模块 -->
-  <view class="new-users copy-data" :style="{height:pageHeight}">
-    <!-- 自定义顶部背景颜色 -->
-    <view class="top" :style="colorStyle">
-      <!-- #ifdef MP || APP-PLUS -->
-      <view class="sys-head">
-        <view class="sys-bar" :style="{height:sysHeight}"></view>
-        <!-- #ifdef MP -->
-        <view class="sys-title" :style="member_style==3?'color:#333':''">个人中心</view>
-        <!-- #endif -->
-        <view class="bg" :style="member_style==3?'background:#f5f5f5':''"></view>
-      </view>
-      <!-- #endif -->
-    </view>
-    <!-- 自定义顶部背景颜色 -->
-    <view class="mid style-add" :style="colorStyle">
-      <scroll-view scroll-y="true" class="height-add">
-        <view class="head">
-          <view class="user-card" :class="member_style==3?'unBg':''"
-            :style="{backgroundImage:'url('+imgHost+'/statics/images/user01.png'+')'}">
-            <view class="bg"></view>
-            <!-- 个人资料展示 -->
-            <view class="user-info">
-              <view>
-                <!-- 公众号未授权时显示 -->
-                <!-- #ifdef H5 -->
-                <button class="bntImg" v-if="userInfo.is_complete == 0 && isWeixin" @click="getWechatuserinfo">
-                  <image class="avatar" src='/static/images/f.png'></image>
-                  <view class="avatarName">获取头像</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifdef MP -->
-                <button class="bntImg" v-if="userInfo.is_complete == 0" @tap="getUserProfile">
-                  <image class="avatar" src='/static/images/f.png'></image>
-                  <view class="avatarName">获取头像</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifndef APP-PLUS -->
-                <view v-else class="avatar-box" :class="{on:userInfo.is_money_level}">
-                  <image class="avatar" :src='userInfo.avatar' v-if="userInfo.avatar" @click="goEdit()">
-                  </image>
-                  <image v-else class="avatar" src="/static/images/f.png" mode="" @click="goEdit()">
-                  </image>
-                  <view class="headwear" v-if="userInfo.is_money_level && stu">
-                    <image src="/static/images/headwear.png"></image>
-                  </view>
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef APP-PLUS -->
-                <view class="avatar-box" :class="{on:userInfo.is_money_level}">
-                  <image class="avatar" :src='userInfo.avatar' v-if="userInfo.avatar" @click="goEdit()">
-                  </image>
-                  <image v-else class="avatar" src="/static/images/f.png" mode="" @click="goEdit()">
-                  </image>
-                  <view class="headwear" v-if="userInfo.is_money_level && stu">
-                    <image src="/static/images/headwear.png"></image>
-                    <view>
-                      未登录
-                    </view>
-                  </view>
-                </view>
-                <!-- #endif -->
-              </view>
-              <view class="info">
-                <!-- #ifdef MP -->
-                <view class="name display-add" v-if="!userInfo.uid" @click="openAuto">
-                  请点击授权
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef H5 -->
-                <view class="name display-add" v-if="!userInfo.uid" @click="openAuto">
-                  请点击授权
-                </view>
-                <!-- #endif -->
-                <view class="name" v-if="userInfo.uid">
-                  {{userInfo.nickname}}
-                  <image class="live" :src="userInfo.vip_icon" v-if="userInfo.vip_icon"></image>
-                  <view class="vip" v-if="userInfo.is_money_level> 0 && stu">
-                    <image src="/static/images/svip.png"></image>
-                  </view>
-                </view>
-                <view class="num" v-if="userInfo.phone" @click="goEdit()">
-                  <view class="num-txt">ID：{{userInfo.uid}}</view>
-                  <view class="icon">
-                    <image src="/static/images/edit.png" mode=""></image>
-                  </view>
-                </view>
-                <view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
-              </view>
-              <view class="qrCode message iconfont icon-erweima-xingerenzhongxin" @click="tapQrCode">
-              </view>
-              <view class="message">
-                <navigator url="/pages/users/user_info/index" hover-class="none">
-                  <view class="iconfont icon-shezhi"></view>
-                </navigator>
-              </view>
-              <view class="message">
-                <navigator url="/pages/users/message_center/index" hover-class="none">
-                  <view v-if="userInfo.service_num" class="num">
-                    {{userInfo.service_num >= 100 ? '99+' : userInfo.service_num}}
-                  </view>
-                  <view class="iconfont icon-s-kefu"></view>
-                </navigator>
-              </view>
-              <!-- #ifdef MP -->
-              <!-- <view class="setting" @click="Setting"><text class="iconfont icon-shezhi"></text></view> -->
-              <!-- #endif -->
-
-            </view>
-            <view class="achsac">
-            </view>
-            <!-- <view class="sign" @click="goSignIn">签到</view> -->
-            <!-- 会员权益 -->
-            <view class="cardVipA acea-row row-between-wrapper" v-if="member_style==1 && stu && vip_type==2"
-              :style="{backgroundImage:'url('+imgHost+'/statics/images/member.png'+')'}">
-              <view class="left-box">
-                <view v-if="vipStatus == 1" class="small">永久</view>
-                <view v-else-if="vipStatus == 3" class="small">会员到期
-                  {{ userInfo.overdue_time | dateFormat }}
-                </view>
-                <view v-else-if="vipStatus == -1" class="small">已过期</view>
-                <view v-else-if="vipStatus == 2" class="small">未开通会员</view>
-              </view>
-              <view class="acea-row row-middle">
-                <navigator v-if="vipStatus == 1" url="/pages/annex/vip_paid/index" hover-class="none" class="btn">查看会员权益
-                </navigator>
-                <navigator v-else url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
-                  {{ userInfo.overdue_time ? '立即续费' : '立即激活' }}
-                </navigator>
-                <text class="iconfont icon-xiangyou"></text>
-              </view>
-            </view>
-            <view class="cardVipB acea-row row-between" v-if="member_style==3 && stu && vip_type==2">
-              <view class="left-box acea-row">
-                <view class="pictrue">
-                  <image src="../../static/images/member01.png"></image>
-                </view>
-                <view v-if="vipStatus == 1" class="small">永久</view>
-                <view v-else-if="vipStatus == 3" class="small">会员到期
-                  {{ userInfo.overdue_time | dateFormat }}
-                </view>
-                <view v-else-if="vipStatus == -1" class="small">已过期</view>
-                <view v-else-if="vipStatus == 2" class="small">未开通会员</view>
-              </view>
-              <view class="acea-row">
-                <navigator v-if="vipStatus == 1" url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
-                  会员可享多项权益</navigator>
-                <navigator v-else url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
-                  {{ userInfo.overdue_time ? '立即续费' : '立即激活' }}
-                </navigator>
-                <text class="iconfont icon-xiangyou btn"></text>
-              </view>
-            </view>
-						<view class="cardVipA acea-row row-between-wrapper" :style="{backgroundImage:'url('+imgHost+'/statics/images/grade.png'+')'}" v-if="member_style==1 && memberStatus && vip_type==1">
-							<view class="left-box on">
-								<view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view>
-							</view>
-							<view class="acea-row row-middle">
-								<!-- 去激活 -->
-								<navigator :url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'" hover-class="none" class="btn on">{{userInfo.level_status==1?'查看会员卡':'去激活'}}</navigator>
-								<text class="iconfont icon-xiangyou on"></text>
-							</view>
-						</view>
-						<view class="cardVipB acea-row row-between on" :style="{backgroundImage:'url('+imgHost+'/statics/images/grade01.png'+')'}" v-if="member_style==3 && memberStatus && vip_type==1">
-							<view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view>
-							<view class="acea-row">
-								<navigator :url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'" hover-class="none" class="btn on">{{userInfo.level_status==1?'查看会员卡':'去激活'}}</navigator>
-								<text class="iconfont icon-xiangyou"></text>
-							</view>
-						</view>
-          </view>
-          <view class="card-vip" v-if="member_style==2 && stu && vip_type==2">
-            <view class="left-box">
-              <!-- <view class="big">会员可享多项权益</view> -->
-              <view v-if="vipStatus == 1" class="small">永久</view>
-              <view v-else-if="vipStatus == 3" class="small">会员到期
-                {{ userInfo.overdue_time | dateFormat }}
-              </view>
-              <view v-else-if="vipStatus == -1" class="small">已过期</view>
-              <view v-else-if="vipStatus == 2" class="small">未开通会员</view>
-            </view>
-            <view class="acea-row">
-              <navigator v-if="vipStatus == 1" url="/pages/annex/vip_paid/index" hover-class="none" class="btn">查看会员权益
-              </navigator>
-              <navigator v-else url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
-                {{ userInfo.overdue_time ? '立即续费' : '立即激活' }}
-              </navigator>
-              <text class="iconfont icon-xiangyou"></text>
-            </view>
-          </view>
-					<view class="card-vip on" v-if="member_style==2 && memberStatus && vip_type==1" :style="{backgroundImage:'url('+imgHost+'/statics/images/grade01.png'+')'}">
-						<view class="left-box">
-							<view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view>
-						</view>
-						<view class="acea-row">
-							<navigator :url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'" hover-class="none" class="btn">{{userInfo.level_status==1?'查看会员卡':'去激活'}}</navigator>
-							<text class="iconfont icon-xiangyou"></text>
-						</view>
-					</view>
-          <view class="num-wrapper"
-            :class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
-            v-if="userInfo.uid">
-            <view class="num-item" v-show="userInfo.balance_func_status"
-              @click="goMenuPage('/pages/users/user_money/index')">
-              <text class="num">{{userInfo.now_money || 0}}</text>
-              <view class="txt">余额</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
-              <text class="num">{{userInfo.couponCount || 0}}</text>
-              <view class="txt">优惠券</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
-              <text class="num">{{userInfo.integral || 0}}</text>
-              <view class="txt">积分</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
-              <text class="num">{{userInfo.collectCount || 0}}</text>
-              <view class="txt">收藏</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/visit_list/index')">
-              <text class="num">{{userInfo.visit_num || 0}}</text>
-              <view class="txt">浏览记录</view>
-            </view>
-          </view>
-          <!-- 新人礼物 -->
-          <view class="num-wrapper on" v-if="!userInfo.uid">
-            <image :src="giftPic" mode="" class="img"></image>
-            <view class="text">
-              登录即获得<text class="gift">新人大礼包</text>
-            </view>
-            <view class="btn-login" @click="openAuto">去登录</view>
-          </view>
-          <!-- 新人专享 -->
-					<view class="newcomersCon" :class="newcomer_style==1?'':'on'" v-if="newList.length">
-						<view class="newcomers" :style="{backgroundImage:'url('+ (newcomer_style==1?imgHost+'/statics/images/new-bg.png':newBg) +')'}">
-						  <view class="title">
-						    <view class="tl">
-						      新人专享
-						    </view>
-						    <view class="tr" @click="goNewcomers">
-						      更多 <text class="iconfont icon-xiangyou"></text>
-						    </view>
-						  </view>
-							<scroll-view  scroll-x="true"  class="scroll">
-								<view class="scroll-item" v-for="(item,index) in newList" :key="index" @click="goDetail(item)">
-									<view class="pictrue">
-										<image :src='item.image'></image>
-										<view class="label">新人价</view>
-									</view>
-									<view class="money">¥{{item.price}}</view>
-								</view>
-							</scroll-view>	
-						</view>
-					</view>
-          <!-- 订单中心 -->
-          <view class="order-wrapper">
-            <view class="order-hd flex">
-              <view class="left">订单中心</view>
-              <navigator class="right flex" hover-class="none" url="/pages/goods/order_list/index" open-type="navigate">
-                查看全部
-                <text class="iconfont icon-xiangyou"></text>
-              </navigator>
-            </view>
-            <view class="order-bd">
-              <block v-for="(item,index) in orderMenu" :key="index">
-                <navigator class="order-item" hover-class="none" :url="item.url">
-                  <view class="pic">
-                    <!-- <image :src="item.img" mode=""></image> -->
-                    <text class="iconfont" :class="item.img"></text>
-                    <text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
-                  </view>
-                  <view class="txt">{{item.title}}</view>
-                </navigator>
-              </block>
-            </view>
-          </view>
-        </view>
-        <!-- 轮播 -->
-        <view class="slider-wrapper" v-if="imgUrls.length>0 && my_banner_status">
-          <swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
-            :duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-            <block v-for="(item,index) in imgUrls" :key="index">
-              <swiper-item>
-                <navigator @click="goMenuPage(item.url)" class='slide-navigator acea-row row-between-wrapper'
-                  hover-class='none'>
-                  <image :src="item.pic" class="slide-image"></image>
-                </navigator>
-              </swiper-item>
-            </block>
-          </swiper>
-        </view>
-        <!-- 会员菜单二 -->
-        <view class="menus-list" v-if="menu_status == 2 && MyMenus.length">
-          <view class="title">我的服务</view>
-          <!-- #ifdef APP-PLUS || H5 -->
-          <block v-for="(item,index) in MyMenus" :key="index">
-            <view class="item acea-row row-between-wrapper" v-if="item.url!='#' && item.url!='/pages/service/index'"
-              @click="goMenuPage(item.url, item.name)">
-              <image :src="item.pic"></image>
-              <view class="text acea-row row-between-wrapper">
-                <view>{{item.name}}</view>
-                <view class="iconfont icon-xiangyou"></view>
-              </view>
-            </view>
-          </block>
-          <!-- #endif -->
-          <!-- #ifdef MP -->
-          <block v-for="(item,index) in MyMenus" :key="index">
-            <view class="item acea-row row-between-wrapper" v-if="item.url!='#'
-							&& item.url!='/pages/service/index' 
-							&& item.url!='/pages/extension/customer_list/chat' 
-							|| (item.url=='/pages/extension/customer_list/chat' && routineContact == 0)"
-              @click="goMenuPage(item.url, item.name)">
-              <image :src="item.pic"></image>
-              <view class="text acea-row row-between-wrapper">
-                <view>{{item.name}}</view>
-                <view class="iconfont icon-xiangyou"></view>
-              </view>
-            </view>
-          </block>
-          <button class="item acea-row row-between-wrapper" open-type='contact' v-if="routineContact == 1">
-            <image src="/static/images/contact.png"></image>
-            <view class="text acea-row row-between-wrapper">
-              <view>联系客服</view>
-              <view class="iconfont icon-xiangyou"></view>
-            </view>
-          </button>
-          <!-- #endif -->
-          <!-- #ifdef APP-PLUS -->
-          <view class="item acea-row row-between-wrapper" hover-class="none"
-            @click="goMenuPage('/pages/users/privacy/index')">
-            <image src="/static/images/menu.png"></image>
-            <view class="text acea-row row-between-wrapper">
-              <view>隐私协议</view>
-              <view class="iconfont icon-xiangyou"></view>
-            </view>
-          </view>
-          <!-- #endif -->
-        </view>
-        <!-- 会员菜单一 -->
-        <view class="user-menus" style="margin-top: 25rpx;" v-if="menu_status == 1 && MyMenus.length">
-          <view class="menu-title">我的服务</view>
-          <view class="list-box">
-            <!-- #ifdef APP-PLUS || H5 -->
-            <block v-for="(item,index) in MyMenus" :key="index">
-              <view class="item" v-if="item.url!='#' && item.url!='/pages/service/index'"
-                @click="goMenuPage(item.url, item.name)">
-                <image :src="item.pic"></image>
-                <text>{{item.name}}</text>
-              </view>
-            </block>
-            <!-- #endif -->
-            <!-- #ifdef MP -->
-            <block v-for="(item,index) in MyMenus" :key="index">
-              <view class="item" v-if="item.url!='#' 
-								&& item.url!='/pages/service/index' 
-								&& item.url!='/pages/extension/customer_list/chat' 
-								|| (item.url=='/pages/extension/customer_list/chat' && routineContact == 0)"
-                @click="goMenuPage(item.url, item.name)">
-                <image :src="item.pic"></image>
-                <text>{{item.name}}</text>
-              </view>
-            </block>
-            <button class="item" open-type='contact' v-if="routineContact == 1">
-              <image src="/static/images/contact.png"></image>
-              <text>联系客服</text>
-            </button>
-            <!-- #endif -->
-            <!-- #ifdef APP-PLUS -->
-            <view class="item" hover-class="none" @click="goMenuPage('/pages/users/privacy/index?type=privacy')">
-              <image src="/static/images/menu.png"></image>
-              <text>隐私协议</text>
-            </view>
-            <!-- #endif -->
-          </view>
-        </view>
-        <view class="user-menus" style="margin-top: 25rpx;" v-if="service_status == 1 && storeMenu.length">
-          <view class="menu-title">商家管理</view>
-          <view class="list-box">
-            <block v-for="(item,index) in storeMenu" :key="index">
-              <view class="item" :url="item.url" v-if="item.url!='#' && item.url!='/pages/service/index'"
-                @click="goMenuPage(item.url, item.name)">
-                <image :src="item.pic"></image>
-                <text>{{item.name}}</text>
-              </view>
-            </block>
-          </view>
-        </view>
-        <view class="menus-list" v-if="service_status == 2 && storeMenu.length">
-          <view class="title">商家管理</view>
-          <block v-for="(item,index) in storeMenu" :key="index">
-            <view class="item acea-row row-between-wrapper" :url="item.url" hover-class="none"
-              v-if="item.url!='#' && item.url!='/pages/service/index'" @click="goMenuPage(item.url, item.name)">
-              <image :src="item.pic"></image>
-              <view class="text acea-row row-between-wrapper">
-                <view>{{item.name}}</view>
-                <view class="iconfont icon-xiangyou"></view>
-              </view>
-            </view>
-          </block>
-        </view>
-        <view class="copy_right">
-          <template v-if='copyRightText'>
-            <image :src="copyRightImg" mode="" class="copyRightImg"></image>
-            <view class="copyRightText">
-              {{copyRightText}}
-            </view>
-          </template>
-          <image v-else src="/static/images/support.png" alt="" class='support'></image>
-        </view>
-        <view class="uni-p-b-98"></view>
-      </scroll-view>
-    </view>
-    <view class="codePopup" :style="colorStyle" v-show="isCode">
-      <view class="header acea-row row-between-wrapper">
-        <view class="title" :class="{'on': codeIndex == index,'onLeft':codeIndex == 1}"
-          v-for="(item, index) in codeList" :key="index" @click="tapCode(index)">{{item.name}}</view>
-      </view>
-      <view>
-        <view class="acea-row row-center-wrapper">
-          <w-barcode :options="config.bar"></w-barcode>
-        </view>
-        <view class="acea-row row-center-wrapper" style="margin-top: 35rpx;">
-          <w-qrcode :options="config.qrc" @generate="hello"></w-qrcode>
-        </view>
-        <view class="codeNum">{{config.bar.code}}</view>
-        <view class="tip">如遇到扫码失败请将屏幕调至最亮重新扫码</view>
-      </view>
-      <view class="iconfont icon-guanbi2" @click="closeCode"></view>
-    </view>
-    <view class="mark" v-if="isCode"></view>
-    <pageFooter></pageFooter>
-    <!-- 店员推广码 extension-->
-    <view class="codePopup heg" :style="colorStyle" v-show="isextension">
-      <view class="header">
-        <view class="title on" style="width: 100%;">店员推广码</view>
-      </view>
-      <view>
-        <view class="acea-row row-center-wrapper" style="margin-top: 25rpx;" @click="hah">
-          <w-qrcode id="hah" :options="extension"></w-qrcode>
-        </view>
-        <view class="tip">如遇到扫码失败请将屏幕调至最亮重新扫码</view>
-      </view>
-      <view class="iconfont icon-guanbi2" @click="closeCode"></view>
-    </view>
-    <view class="mark" v-show="isextension"></view>
-		<ewcomerPop v-if="isComerGift" :comerGift="comerGift" @comerPop="comerPop"></ewcomerPop>
-  </view>
-</template>
-<script>
-  let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-  import {
-    storeCardApi
-  } from '@/api/store.js';
-	import {
-	  newcomerGift
-	} from '@/api/new_store.js';
-	import {
-		newcomerList
-	} from '@/api/api.js';
-  import {
-    getMenuList,
-    getUserInfo,
-    setVisit,
-    updateUserInfo,
-    getRandCode,
-    updateWechatInfo
-  } from '@/api/user.js';
-  import {
-    wechatAuthV2,
-    silenceAuth
-  } from '@/api/public.js'
-  import {
-    toLogin
-  } from '@/libs/login.js';
-  import {
-    mapState,
-    mapGetters
-  } from "vuex";
-  // #ifdef H5
-  import Auth from '@/libs/wechat';
-  // #endif
-  import {
-    HTTP_REQUEST_URL
-  } from '@/config/app';
-  const app = getApp();
-	import ewcomerPop from '@/components/ewcomerPop/index.vue'
-  import pageFooter from '@/components/pageFooter/index.vue'
-  import dayjs from '@/plugin/dayjs/dayjs.min.js';
-  import Routine from '@/libs/routine';
-  import colors from '@/mixins/color';
-  export default {
-    components: {
-      pageFooter,
-			ewcomerPop
-    },
-    computed: {
-      ...mapGetters({
-        cartNum: 'cartNum',
-        isLogin: 'isLogin'
-      })
-    },
-    filters: {
-      coundTime(val) {
-        var setTime = val * 1000
-        var nowTime = new Date()
-        var rest = setTime - nowTime.getTime()
-        var day = parseInt(rest / (60 * 60 * 24 * 1000))
-        // var hour = parseInt(rest/(60*60*1000)%24) //小时
-        return day + '天'
-      },
-      dateFormat: function(value) {
-        return dayjs(value * 1000).format('YYYY-MM-DD');
-      }
-    },
-    mixins: [colors],
-    data() {
-      return {
-        vipStatus: 0,
-        stu: false,
-        storeMenu: [], // 商家管理
-        orderMenu: [{
-            img: 'icon-daifukuan',
-            title: '待付款',
-            url: '/pages/goods/order_list/index?status=0'
-          },
-          {
-            img: 'icon-daifahuo',
-            title: '待发货',
-            url: '/pages/goods/order_list/index?status=1'
-          },
-          {
-            img: 'icon-daishouhuo',
-            title: '待收货',
-            url: '/pages/goods/order_list/index?status=2'
-          },
-          {
-            img: 'icon-daipingjia',
-            title: '待评价',
-            url: '/pages/goods/order_list/index?status=3'
-          },
-          {
-            img: 'icon-a-shouhoutuikuan',
-            title: '售后/退款',
-            url: '/pages/users/user_return_list/index'
-          },
-        ],
-        imgUrls: [],
-        autoplay: true,
-        circular: true,
-        interval: 3000,
-        duration: 500,
-        isAuto: false, //没有授权的不会自动授权
-        isShowAuth: false, //是否隐藏授权
-        orderStatusNum: {},
-        userInfo: {},
-        MyMenus: [],
-        sysHeight: sysHeight,
-        mpHeight: 0,
-        showStatus: 1,
-        // #ifdef H5 || MP
-        pageHeight: '100%',
-        routineContact: 0,
-        // #endif
-        // #ifdef APP-PLUS
-        pageHeight: app.globalData.windowHeight,
-        // #endif
-        // #ifdef H5
-        isWeixin: Auth.isWeixin(),
-        //#endif
-        footerSee: false,
-        member_style: 1,
-        my_banner_status: 1,
-        menu_status: 1,
-        service_status: 1,
-        codeList: [{
-          name: '会员码'
-        }, {
-          name: '付款码'
-        }],
-        codeIndex: 0,
-        config: {
-          bar: {
-            code: '',
-            color: ['#000'],
-            bgColor: '#FFFFFF', // 背景色
-            width: 480, // 宽度
-            height: 110 // 高度
-          },
-          qrc: {
-            code: '',
-            size: 380, // 二维码大小
-            level: 3, //等级 0～4
-            bgColor: '#FFFFFF', //二维码背景色 默认白色
-            border: {
-              color: ['#eee', '#eee'], //边框颜色支持渐变色
-              lineWidth: 3, //边框宽度
-            },
-            // img: '/static/logo.png', //图片
-            // iconSize: 40, //二维码图标的大小
-            color: ['#333', '#333'], //边框颜色支持渐变色
-          }
-        },
-        isCode: false,
-        isextension: false,
-        extension: {
-          code: "",
-          size: 380, // 二维码大小
-          level: 3, //等级 0～4
-          bgColor: '#FFFFFF', //二维码背景色 默认白色
-          border: {
-            color: ['#eee', '#eee'], //边框颜色支持渐变色
-            lineWidth: 3, //边框宽度
-          },
-          // img: '/static/logo.png', //图片
-          // iconSize: 40, //二维码图标的大小
-          color: ['#333', '#333'], //边框颜色支持渐变色
-        },
-        imgHost: HTTP_REQUEST_URL,
-        copyRightText: "",
-        copyRightImg: '',
-				giftPic:'',
-				vip_type:1,
-				newcomer_style:1,
-				newList:[],
-				newBg:'',
-				comerGift:{},
-				isComerGift:false,
-				memberStatus:0
-      }
-    },
-    created() {
-      let that = this;
-      // #ifdef MP
-      // 小程序静默授权
-      if (!this.$store.getters.isLogin) {
-        Routine.getCode()
-          .then(code => {
-            Routine.silenceAuth(code).then(res => {
-              this.onLoadFun();
-            })
-          })
-          .catch(res => {
-            uni.hideLoading();
-          });
-      }
-      // #endif
-      // #ifdef H5 || APP-PLUS
-      if (that.isLogin == false) {
-        toLogin()
-      }
-      // #endif
-      // #ifdef APP-PLUS
-      that.$set(that, 'pageHeight', app.globalData.windowHeight);
-      // #endif
-    },
-    async onLoad(option) {
-			if(this.isLogin){
-				this.getNewcomerGift();
-			}
-      // #ifdef H5 
-      if (this.isLogin && Auth.isWeixin() && option.code) {
-        try {
-          let res = await updateWechatInfo({
-            code: option.code
-          });
-          this.userInfo.nickname = res.data.nickname;
-          this.userInfo.avatar = res.data.avatar;
-          this.userInfo.is_complete = 1;
-        } catch (e) {}
-      }
-      // #endif
-			this.getNewList();
-			this.colorData();
-			let giftList = [
-				this.imgHost+'/statics/images/gift01.png',
-				this.imgHost+'/statics/images/gift02.png',
-				this.imgHost+'/statics/images/gift03.png',
-				this.imgHost+'/statics/images/gift04.png',
-				this.imgHost+'/statics/images/gift05.png'
-			];
-			let newBg = [
-				this.imgHost+'/statics/images/blue-bg.png',
-				this.imgHost+'/statics/images/green-bg.png',
-				this.imgHost+'/statics/images/red-bg.png',
-				this.imgHost+'/statics/images/pink-bg.png',
-				this.imgHost+'/statics/images/orange-bg.png'
-			]
-			setTimeout(()=>{
-				switch(this.colorNum){
-					case 1:
-						this.giftPic = giftList[2];
-						this.newBg = newBg[0];
-						break;
-					case 2:
-						this.giftPic = giftList[1];
-						this.newBg = newBg[1];
-						break;
-					case 3:
-						this.giftPic = giftList[4];
-						this.newBg = newBg[2];
-						break;
-					case 4:
-						this.giftPic = giftList[0];
-						this.newBg = newBg[3];
-						break;
-					case 5:
-						this.giftPic = giftList[3];
-						this.newBg = newBg[4];
-						break;
-					default:
-						this.giftPic = giftList[4];
-						this.newBg = newBg[2];
-						break					
-				}
-			},1)
-    },
-    onReady() {
-      let self = this
-      // #ifdef MP
-      let info = uni.createSelectorQuery().select(".sys-head");
-      info.boundingClientRect(function(data) { //data - 各种参数
-        self.mpHeight = data.height
-      }).exec()
-      // #endif
-    },
-    onShow: function() {
-      if (this.cartNum > 0) {
-        uni.setTabBarBadge({
-          index: 3,
-          text: this.cartNum + ''
-        })
-      } else {
-        uni.hideTabBarRedDot({
-          index: 3
-        })
-      }
-      this.copyRightText = uni.getStorageSync('copyNameInfo');
-      this.copyRightImg = uni.getStorageSync('copyImageInfo');
-      uni.removeStorageSync('form_type_cart');
-      let that = this;
-      // #ifdef APP-PLUS
-      uni.getSystemInfo({
-        success: function(res) {
-          that.pageHeight = res.windowHeight + 'px'
-        }
-      });
-      // #endif
-      if (that.isLogin) {
-        this.getUserInfo();
-        this.getMyMenus();
-        this.setVisit();
-      };
-    },
-    methods: {
-			goDetail(item){
-				uni.navigateTo({
-					url: `/pages/goods_details/index?id=${item.id}&fromPage='newVip'`
-				});
-			},
-			comerPop(){
-				this.isComerGift = false;
-			},
-			getNewcomerGift(){
-				if(uni.getStorageSync('newcomerGift')){
-					return this.isComerGift = false;
-				}
-				newcomerGift().then(res=>{
-					this.comerGift = res.data;
-					if(Object.prototype.toString.call(this.comerGift) == '[object Object]'){
-						if(res.data.coupon_count || res.data.product_count || res.data.register_give_money || res.data.first_oder_discount || res.data.register_give_integral){
-							uni.setStorageSync('newcomerGift', true);
-							this.isComerGift = true;
-						}
-					}
-				}).catch(err=>{
-					return this.$util.Tips({
-						title: err
-					});
-				})
-			},
-			getNewList(){
-				newcomerList({
-					page: 1,
-					limit: 6,
-					priceOrder: '',
-					salesOrder: ''
-				}).then(res=>{
-					this.newList = res.data;
-				}).catch(err=>{
-					return this.$util.Tips({
-						title: err
-					});
-				})
-			},
-      hah() {
-        let that = this
-        // #ifdef H5
-        var canvas = document.getElementById("hah").getElementsByTagName("canvas")
-        var imgURL = canvas[0].toDataURL("image/png")
-        var dlLink = document.createElement('a');
-        dlLink.download = "店员推广码";
-        dlLink.href = imgURL;
-        dlLink.dataset.downloadurl = ["image/png", dlLink.download, dlLink.href].join(':');
-
-        document.body.appendChild(dlLink);
-        dlLink.click();
-        document.body.removeChild(dlLink);
-        // #endif
-        // #ifdef MP
-        // let ctx = uni.createCanvasContext("WQrcode")
-
-        // let ctx = uni.createSelectorQuery().in(this).select("canvas")
-        // uni.canvasToTempFilePath({
-        // 	canvasId: "WQrcode",
-        // 	fileType: 'image/png',
-        // 	success: (res) => {
-        // 	 // 保存当前绘制推广码
-        // 	that.savePic(res.tempFilePath)
-        // 	},
-        // 	fail: function(err) {
-        // 	console.log(err, '推广码生成失败')
-        // 	}
-        // },that)
-
-        //  ctx.draw(false, uni.canvasToTempFilePath({
-        // 			canvasId: 'WQrcode',
-        // 			success: function (res) {
-        // 			that.savePic(res.tempFilePath)
-        // 			},
-        // 			fail: function (err) {
-        // 				console.log(err, '推广码生成失败')
-        // 			}
-        // },that))
-        // console.log("222222",ctx)
-        // #endif
-        // #ifdef APP-PLUS
-        uni.canvasToTempFilePath({
-          canvasId: 'WQrcode',
-          success: (res) => {
-            uni.hideLoading()
-            // 保存当前绘制推广码
-            that.savePic(res.tempFilePath)
-          },
-          fail: function(err) {
-            console.log(err, '推广码生成失败')
-          }
-        })
-        // #endif
-      },
-      //保存推广码到本地
-      savePic(filePath) {
-        // #ifdef APP-PLUS
-        uni.showLoading({
-          title: '正在保存'
-        });
-        uni.saveImageToPhotosAlbum({
-          filePath: filePath,
-          success: function() {
-            uni.showToast({
-              title: '推广码保存成功～'
-            });
-          },
-          fail: function(e) {
-            console.log(e, '推广码保存失败')
-          },
-          complete: function() {
-            uni.hideLoading()
-          }
-        });
-        // #endif
-      },
-      hello(res) {
-        // console.log(321,res)
-      
-      },
-      // 前往新人专享
-      goNewcomers() {
-        uni.navigateTo({
-          url:'/pages/store/newcomers/index'
-        })
-      },
-      
-      getCode() {
-        getRandCode().then(res => {
-          let code = res.data.code;
-          this.config.bar.code = code;
-          this.config.qrc.code = code;
-        }).catch(err => {
-          return this.$util.Tips(err);
-        })
-      },
-      tapQrCode() {
-        this.isCode = true;
-        this.codeIndex = 0;
-        this.$nextTick(function() {
-          let code = this.userInfo.bar_code;
-          this.config.bar.code = code;
-          this.config.qrc.code = code;
-        })
-      },
-      closeCode() {
-        this.isCode = false
-        this.isextension = false
-      },
-      tapCode(index) {
-        this.codeIndex = index;
-        if (index == 1) {
-          this.getCode();
-        } else {
-          let code = this.userInfo.bar_code;
-          this.config.bar.code = code;
-          this.config.qrc.code = code;
-        }
-      },
-      getWechatuserinfo() {
-        //#ifdef H5
-        Auth.isWeixin() && Auth.toAuth('snsapi_userinfo', '/pages/user/index');
-        //#endif
-      },
-      getRoutineUserInfo(e) {
-        updateUserInfo({
-          userInfo: e.detail.userInfo
-        }).then(res => {
-          this.getUserInfo();
-          return this.$util.Tips('更新用户信息成功');
-        }).catch(err => {
-          return this.$util.Tips(err);
-        })
-      },
-      // 记录会员访问
-      setVisit() {
-        setVisit({
-          url: '/pages/user/index'
-        }).then(res => {})
-      },
-      // 打开授权
-      openAuto() {
-        toLogin();
-      },
-      // 授权回调
-      onLoadFun() {
-        this.getUserInfo();
-        this.getMyMenus();
-        this.setVisit();
-      },
-      Setting: function() {
-        uni.openSetting({
-          success: function(res) {}
-        });
-      },
-      // 授权关闭
-      authColse: function(e) {
-        this.isShowAuth = e
-      },
-      // 绑定手机
-      bindPhone() {
-        uni.navigateTo({
-          url: '/pages/users/user_phone/index'
-        })
-      },
-      /**
-       * 获取个人用户信息
-       */
-      getUserInfo: function() {
-        let that = this;
-        getUserInfo().then(res => {
-          that.userInfo = res.data
-          that.stu = res.data.svip_open
-					that.memberStatus = parseInt(res.data.member_func_status)
-          that.vipStatus = res.data.vip_status
-          that.$store.commit("SETUID", res.data.uid);
-          that.$store.commit("UPDATE_USERINFO", res.data);
-          that.orderMenu.forEach((item, index) => {
-            switch (item.title) {
-              case '待付款':
-                item.num = res.data.orderStatusNum.unpaid_count
-                break
-              case '待发货':
-                item.num = res.data.orderStatusNum.unshipped_count
-                break
-              case '待收货':
-                item.num = res.data.orderStatusNum.received_count
-                break
-              case '待评价':
-                item.num = res.data.orderStatusNum.evaluated_count
-                break
-              case '售后/退款':
-                item.num = res.data.orderStatusNum.refunding_count
-                break
-            }
-          })
-        });
-      },
-      //小程序授权api替换 getUserInfo
-      getUserProfile() {
-        uni.showLoading({
-          title: '获取中'
-        });
-        let self = this;
-        Routine.getUserProfile()
-          .then(res => {
-            Routine.getCode()
-              .then(code => {
-                let userInfo = res.userInfo;
-                userInfo.code = code;
-                userInfo.spread_spid = app.globalData.spid; //获取推广人ID
-                userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
-                Routine.authUserInfo(userInfo)
-                  .then(res => {
-                    if (res.data.key !== undefined && res.data.key) {
-                      uni.hideLoading();
-                      self.authKey = res.data.key;
-                      self.isPhoneBox = true;
-                    } else {
-                      uni.hideLoading();
-                      let time = res.data.expires_time - self.$Cache.time();
-                      self.$store.commit('LOGIN', {
-                        token: res.data.token,
-                        time: time
-                      });
-                      this.getUserInfo()
-                    }
-                  })
-                  .catch(res => {
-                    uni.hideLoading();
-                    uni.showToast({
-                      title: res.msg,
-                      icon: 'none',
-                      duration: 2000
-                    });
-                  });
-              })
-              .catch(res => {
-                uni.hideLoading();
-              });
-          })
-          .catch(res => {
-            uni.hideLoading();
-          });
-      },
-      /**
-       * 
-       * 获取个人中心图标
-       */
-      switchTab(order) {
-        this.orderMenu.forEach((item, index) => {
-          switch (item.title) {
-            case '待付款':
-              item.img = order.dfk
-              break
-            case '待发货':
-              item.img = order.dfh
-              break
-            case '待收货':
-              item.img = order.dsh
-              break
-            case '待评价':
-              item.img = order.dpj
-              break
-            case '售后/退款':
-              item.img = order.sh
-              break
-          }
-        })
-      },
-      getMyMenus: function() {
-        let that = this;
-        // if (this.MyMenus.length) return;
-        getMenuList().then(res => {
-          let storeMenu = []
-          let myMenu = []
-          res.data.routine_my_menus.forEach((el, index, arr) => {
-            if (el.type == '2') {
-              storeMenu.push(el)
-            } else {
-              myMenu.push(el)
-            }
-          })
-          this.member_style = Number(res.data.diy_data.status)
-          this.my_banner_status = res.data.diy_data.my_banner_status
-          this.menu_status = res.data.diy_data.menu_status
-          this.service_status = res.data.diy_data.service_status
-					this.vip_type = res.data.diy_data.vip_type;
-					this.newcomer_style = res.data.diy_data.newcomer_style;
-          let order01 = {
-            dfk: 'icon-daifukuan',
-            dfh: 'icon-daifahuo',
-            dsh: 'icon-daishouhuo',
-            dpj: 'icon-daipingjia',
-            sh: 'icon-a-shouhoutuikuan'
-          }
-          let order02 = {
-            dfk: 'icon-daifukuan-lan',
-            dfh: 'icon-daifahuo-lan',
-            dsh: 'icon-daishouhuo-lan',
-            dpj: 'icon-daipingjia-lan',
-            sh: 'icon-shouhou-tuikuan-lan'
-          }
-          let order03 = {
-            dfk: 'icon-daifukuan-ju',
-            dfh: 'icon-daifahuo-ju',
-            dsh: 'icon-daishouhuo-ju',
-            dpj: 'icon-daipingjia-ju',
-            sh: 'icon-shouhou-tuikuan-ju'
-          }
-          let order04 = {
-            dfk: 'icon-daifukuan-fen',
-            dfh: 'icon-daifahuo-fen',
-            dsh: 'icon-daishouhuo-fen',
-            dpj: 'icon-daipingjia-fen',
-            sh: 'icon-a-shouhoutuikuan-fen'
-          }
-          let order05 = {
-            dfk: 'icon-daifukuan-lv',
-            dfh: 'icon-daifahuo-lv',
-            dsh: 'icon-daishouhuo-lv',
-            dpj: 'icon-daipingjia-lv',
-            sh: 'icon-shouhou-tuikuan-lv'
-          }
-          switch (res.data.diy_data.order_status) {
-            case 1:
-              this.switchTab(order01)
-              break
-            case 2:
-              this.switchTab(order02)
-              break
-            case 3:
-              this.switchTab(order03)
-              break
-            case 4:
-              this.switchTab(order04)
-              break
-            case 5:
-              this.switchTab(order05)
-              break
-          }
-          that.$set(that, 'MyMenus', myMenu);
-          that.$set(that, 'storeMenu', storeMenu);
-          this.imgUrls = res.data.routine_my_banner
-          this.routineContact = Number(res.data.routine_contact_type)
-        });
-      },
-      // 编辑页面
-      goEdit() {
-        if (this.isLogin == false) {
-          toLogin();
-        } else {
-          uni.navigateTo({
-            url: '/pages/users/user_info/index'
-          })
-        }
-
-      },
-      // 签到
-      goSignIn() {
-        uni.navigateTo({
-          url: '/pages/users/user_sgin/index'
-        })
-      },
-      goMenuPage(url, name) {
-        if (this.isLogin) {
-          if (url == '/pages/extension/customer_list/chat' || url == 'https://chat.crmeb.net/chat/mobile') {
-            this.$util.getCustomer(this.userInfo)
-          } else {
-            if (url.indexOf('http') === -1) {
-              // #ifdef H5
-              if (name && name === '订单核销') {
-                return window.location.href = `${location.origin}${url}`
-              }
-              // #endif
-              // #ifdef MP
-              if (url != '#' && url == '/pages/users/user_info/index') {
-                uni.openSetting({
-                  success: function(res) {}
-                });
-              }
-              // #endif
-              if (url == '/pages/store_spread/index') {
-                storeCardApi().then(res => {
-                  this.isextension = true
-                  this.$nextTick(function() {
-                    this.extension.code = res.data.url
-                  })
-                }).catch(err => {
-                  uni.hideLoading()
-                  this.$util.Tips({
-                    title: err
-                  })
-                })
-              }
-              uni.navigateTo({
-                url: url
-              })
-            } else {
-              uni.navigateTo({
-                url: `/pages/annex/web_view/index?url=${url}`
-              });
-            }
-          }
-        } else {
-          // #ifdef MP
-          this.openAuto()
-          // #endif
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  .style-add {
-    flex: 1;
-    overflow: hidden;
-  }
-
-  .height-add {
-    height: 100%;
-  }
-
-  .display-add {
-    height: 100%;
-    display: flex;
-    align-items: center;
-  }
-
-  page,
-  body {
-    height: 100%;
-  }
-
-  .heg {
-    height: 670rpx !important;
-  }
-
-  .mark {
-    position: fixed;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    background: rgba(0, 0, 0, 0.5);
-    z-index: 30;
-  }	
-	.height {
		margin-top: -84rpx !important;
	}
-
-  .menus-list {
-    width: 690rpx;
-    background-color: #fff;
-    border-radius: 14rpx;
-    margin: 25rpx auto 0 auto;
-
-    .title {
-      font-weight: 600;
-      font-size: 30rpx;
-      color: #333;
-      padding: 30rpx 30rpx 10rpx 30rpx;
-    }
-
-    .item {
-      margin-left: 30rpx;
-      font-size: 30rpx;
-      color: #333;
-
-      image {
-        width: 42rpx;
-        height: 42rpx;
-        display: block;
-      }
-
-      .text {
-        width: 590rpx;
-        border-bottom: 1rpx solid #EEEEEE;
-        padding: 28rpx 30rpx 28rpx 0;
-
-        .iconfont {
-          font-size: 20rpx;
-          color: #8A8A8A;
-        }
-      }
-    }
-  }
-
-  .num-wrapper {
-    background-color: #fff;
-    z-index: 29;
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 22rpx;
-    color: #333;
-    margin: 30rpx 30rpx 25rpx 30rpx;
-    border-radius: 16rpx;
-    height: 160rpx;
-		
-		&.on{
-			height: 128rpx;
-			margin-top: -68rpx;
-			.gift{
-				color: var(--view-theme);
-				margin-left: 10rpx;
-				font-weight: bold;
-			}
-		}
-
-    .img {
-      margin-left: 38rpx;
-      width: 76rpx;
-      height: 68rpx;
-    }
-
-    .text {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #333333;
-      margin-left: -60rpx;
-    }
-
-    .btn-login {
-      width: 144rpx;
-      height: 56rpx;
-      // background: linear-gradient(270deg, #FF7931 0%, #E93323 100%);
-      background-color: var(--view-theme);
-      border-radius: 28rpx;
-      text-align: center;
-      line-height: 56rpx;
-      margin-right: 32rpx;
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #FFFFFF;
-
-    }
-
-    .num-item {
-      width: 33.33%;
-      text-align: center;
-
-      &~.num-item {
-        position: relative;
-
-        &:before {
-          content: '';
-          position: absolute;
-          width: 1rpx;
-          height: 28rpx;
-          top: 50%;
-          margin-top: -14rpx;
-          background-color: rgba(255, 255, 255, 0.4);
-          left: 0;
-        }
-      }
-
-      .num {
-        font-size: 36rpx;
-        font-weight: bold;
-      }
-
-      .txt {
-        margin-top: 8rpx;
-        font-size: 26rpx;
-        color: #555;
-      }
-    }
-  }
-
-  // 新人专享
-	.newcomersCon{
-		background-color: var(--view-theme);
-		width: 690rpx;
-		height: 296rpx;
-		margin: 0 30rpx;
-		border-radius: 16rpx;
-		&.on{
-			background-color: #fff;
-			.newcomers{
-				.title{
-					.tl{
-						color: #333;
-					}
-					.tr{
-						width: unset;
-						color: #666666;
-						background: unset;
-					}
-				}
-				.scroll{
-					.scroll-item{
-						background-color: var(--view-minorColorT);
-					}
-				}
-			}
-		}
-		.newcomers {
-			padding: 24rpx 30rpx;
-			width: 100%;
-			height: 100%;
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-		
-		  .title {
-		    display: flex;
-		    justify-content: space-between;
-		
-		    .tl {
-		      font-size: 30rpx;
-		      font-weight: 600;
-		      color: #FFFFFF;
-		    }
-		
-		    .tr {
-		      width: 90rpx;
-		      height: 36rpx;
-		      background: linear-gradient(135deg, #FFCA52 0%, #FE960F 100%);
-		      border-radius: 18rpx;
-		      font-size: 24rpx;
-		      text-align: center;
-		      line-height: 36rpx;
-		      font-weight: 400;
-		      color: #FFFFFF;
-		
-		      .icon-xiangyou {
-		        font-size: 16rpx;
-		      }
-		    }
-		  }
-		  .scroll {
-		    width: 690rpx;
-		    margin-top: 20rpx;
-		    white-space: nowrap;
-		    padding-right: 60rpx;
-		    .scroll-item {
-		      display: inline-block;
-		      width: 162rpx;
-		      height: 194rpx;
-					background-color: #fff;
-		      border-radius: 12rpx;
-		      margin-right: 10rpx;
-					padding: 12rpx;
-					.pictrue{
-						width: 138rpx;
-						height: 138rpx;
-						position: relative;
-						image{
-							width: 100%;
-							height: 100%;
-						}
-						.label{
-							width: 98rpx;
-							height: 32rpx;
-							background: var(--view-theme);
-							border-radius: 16rpx;
-							color: #FFFFFF;
-							font-size: 24rpx;
-							text-align: center;
-							line-height: 32rpx;
-							position: absolute;
-							bottom: 2rpx;
-							left:50%;
-							margin-left: -49rpx;
-						}
-					}
-					.money{
-						font-size: 24rpx;
-						color: var(--view-priceColor);
-						margin-top: 6rpx;
-					}
-		    }
-		  }
-		}
-	}
-
- .Tnum-wrapper {
- 	margin: -34rpx 30rpx 25rpx 30rpx;
- }
- 
- .unNum-wrapper {
- 	margin: 0 30rpx 25rpx 30rpx;
- }
-
-  .unBg {
-    background-color: unset !important;
-
-    .user-info {
-      .info {
-        .name {
-          color: #333333 !important;
-          font-weight: 600;
-        }
-
-        .num {
-          color: #333 !important;
-
-          .num-txt {
-            height: 38rpx;
-            background-color: rgba(51, 51, 51, 0.13);
-            padding: 0 12rpx;
-            border-radius: 16rpx;
-          }
-        }
-      }
-    }
-
-    .qrCode {
-      color: #333 !important;
-    }
-
-    .message {
-      .iconfont {
-        color: #333 !important;
-      }
-
-      .num {
-        color: #fff !important;
-        background-color: var(--view-theme) !important;
-      }
-    }
-
-    .setting {
-      .iconfont {
-        color: #333 !important;
-      }
-    }
-  }
-
-  .cardVipB {
-    background-color: #343A48;
-    width: 100%;
-    height: 124rpx;
-    border-radius: 16rpx 16rpx 0 0;
-    padding: 22rpx 30rpx 0 30rpx;
-    margin-top: 16px;
-		&.on{
-			width: 690rpx;
-			height: 130rpx;
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			color: #fff;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 22rpx 30rpx 0 90rpx;
-			.iconfont{
-				font-size: 24rpx;
-				margin-left: 6rpx;
-			}
-		}
-
-    .left-box {
-      .small {
-        color: #F8D5A8;
-        font-size: 28rpx;
-        margin-left: 18rpx;
-      }
-
-      .pictrue {
-        width: 40rpx;
-        height: 45rpx;
-
-        image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-
-    .btn {
-      color: #BBBBBB;
-      font-size: 26rpx;
-			&.on{
-				color: #fff;
-			}
-    }
-
-    .icon-xiangyou {
-      margin-top: 6rpx;
-    }
-  }
-
-  .cardVipA {
-    position: absolute;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    width: 750rpx;
-    height: 84rpx;
-    bottom: -2rpx;
-    left: 0;
-    padding: 0 56rpx 0 135rpx;
-
-    .left-box {
-      font-size: 26rpx;
-      color: #905100;
-      font-weight: 400;
-			&.on{
-				color: #fff;
-			}
-    }
-
-    .btn {
-      color: #905100;
-      font-weight: 400;
-      font-size: 24rpx;
-			&.on{
-				color: #fff;
-			}
-    }
-
-    .iconfont {
-      font-size: 20rpx;
-      margin: 4rpx 0 0 4rpx;
-			&.on{
-				color: #fff;
-				margin-top: 0;
-			}
-    }
-  }
-
-  .new-users {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-
-    .sys-head {
-      position: relative;
-      width: 100%;
-      // background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
-
-      .bg {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        // background: url("~@/static/images/user-sys.png") no-repeat;
-        background: var(--view-theme);
-        background-size: 100% auto;
-        background-position: left bottom;
-      }
-
-      .sys-title {
-        z-index: 10;
-        position: relative;
-        height: 43px;
-        text-align: center;
-        line-height: 43px;
-        font-size: 36rpx;
-        color: #FFFFFF;
-      }
-    }
-
-    .head {
-      // background: #fff;
-
-      .user-card {
-        position: relative;
-        width: 100%;
-        height: 270rpx;
-        margin: 0 auto;
-        padding: 35rpx 28rpx;
-        background-size: 100% auto;
-        background-color: var(--view-theme);
-
-        .user-info {
-          z-index: 20;
-          position: relative;
-          display: flex;
-
-          .headwear {
-            position: absolute;
-            right: -4rpx;
-            top: -14rpx;
-            width: 44rpx;
-            height: 44rpx;
-
-            image {
-              width: 100%;
-              height: 100%;
-            }
-          }
-
-          .live {
-            width: 28rpx;
-            height: 28rpx;
-            margin-left: 20rpx;
-          }
-
-          .bntImg {
-            width: 120rpx;
-            height: 120rpx;
-            border-radius: 50%;
-            text-align: center;
-            line-height: 120rpx;
-            background-color: unset;
-            position: relative;
-
-            .avatarName {
-              font-size: 16rpx;
-              color: #fff;
-              text-align: center;
-              background-color: rgba(0, 0, 0, 0.6);
-              height: 37rpx;
-              line-height: 37rpx;
-              position: absolute;
-              bottom: 0;
-              left: 0;
-              width: 100%;
-            }
-          }
-
-          .avatar-box {
-            position: relative;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 120rpx;
-            height: 120rpx;
-            border-radius: 50%;
-
-            &.on {
-              .avatar {
-                border: 2px solid #FFAC65;
-                border-radius: 50%;
-              }
-            }
-          }
-
-          .avatar {
-            position: relative;
-            width: 120rpx;
-            height: 120rpx;
-            border-radius: 50%;
-
-          }
-
-          .info {
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            margin-left: 20rpx;
-            padding: 15rpx 0;
-
-            .name {
-              display: flex;
-              align-items: center;
-              color: #fff;
-              font-size: 31rpx;
-
-              .vip {
-                margin-left: 10rpx;
-
-                image {
-                  width: 78rpx;
-                  height: 30rpx;
-                  display: block;
-                }
-              }
-            }
-
-            .num {
-              display: flex;
-              align-items: center;
-              font-size: 26rpx;
-              color: rgba(255, 255, 255, 0.6);
-
-              image {
-                width: 22rpx;
-                height: 23rpx;
-                margin-left: 20rpx;
-              }
-            }
-          }
-        }
-
-        .qrCode {
-          color: #fff;
-          margin-top: 16rpx !important;
-          font-size: 38rpx;
-          margin-right: 36rpx !important;
-        }
-
-        .message {
-          align-self: flex-start;
-          position: relative;
-          margin-top: 15rpx;
-          margin-right: 20rpx;
-
-          .num {
-            position: absolute;
-            top: -8rpx;
-            left: 18rpx;
-            padding: 0 6rpx;
-            height: 28rpx;
-            border-radius: 12rpx;
-            background-color: #fff;
-            font-size: 18rpx;
-            line-height: 28rpx;
-            text-align: center;
-            color: var(--view-theme);
-          }
-
-          .iconfont {
-            font-size: 40rpx;
-            color: #fff;
-          }
-        }
-
-        .sign {
-          z-index: 200;
-          position: absolute;
-          right: -12rpx;
-          top: 80rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 120rpx;
-          height: 60rpx;
-          background: linear-gradient(90deg, rgba(255, 225, 87, 1) 0%, rgba(238, 193, 15, 1) 100%);
-          border-radius: 29rpx 4rpx 4rpx 29rpx;
-          color: #282828;
-          font-size: 28rpx;
-          font-weight: bold;
-        }
-      }
-
-      .order-wrapper {
-        background: #fff;
-        margin: 0 30rpx;
-        border-radius: 16rpx;
-        position: relative;
-
-        .order-hd {
-          justify-content: space-between;
-          padding: 30rpx 20rpx 10rpx;
-          margin-top: 25rpx;
-          font-size: 30rpx;
-          color: #282828;
-
-          .left {
-            font-weight: bold;
-          }
-
-          .right {
-            align-items: center;
-            color: #666666;
-            font-size: 26rpx;
-
-            .icon-xiangyou {
-              margin-left: 5rpx;
-              margin-top: 6rpx;
-              font-size: 26rpx;
-            }
-          }
-        }
-
-        .order-bd {
-          display: flex;
-          padding: 0 0;
-
-          .order-item {
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            width: 20%;
-            height: 140rpx;
-
-            .pic {
-              position: relative;
-              text-align: center;
-
-              .iconfont {
-                font-size: 48rpx;
-                color: var(--view-theme);
-              }
-
-              image {
-                width: 58rpx;
-                height: 48rpx;
-              }
-            }
-
-            .txt {
-              margin-top: 6rpx;
-              font-size: 26rpx;
-              color: #454545;
-            }
-          }
-        }
-      }
-    }
-
-    .slider-wrapper {
-      margin: 20rpx 30rpx;
-      height: 130rpx;
-
-      swiper,
-      swiper-item {
-        height: 100%;
-      }
-
-      image {
-        width: 100%;
-        height: 130rpx;
-        border-radius: 16rpx;
-      }
-    }
-
-    .user-menus {
-      background-color: #fff;
-      margin: 0 30rpx;
-      border-radius: 16rpx;
-
-      .menu-title {
-        padding: 30rpx 30rpx 40rpx;
-        font-size: 30rpx;
-        color: #282828;
-        font-weight: bold;
-      }
-
-      .list-box {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 0;
-      }
-
-      .item {
-        position: relative;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        flex-direction: column;
-        width: 25%;
-        margin-bottom: 47rpx;
-        font-size: 26rpx;
-        color: #333333;
-
-        image {
-          width: 52rpx;
-          height: 52rpx;
-          margin-bottom: 18rpx;
-        }
-
-
-        &:last-child::before {
-          display: none;
-        }
-      }
-
-      button {
-        font-size: 28rpx;
-      }
-    }
-
-    .phone {
-      color: #fff;
-      background-color: #CCC;
-      border-radius: 15px;
-      width: max-content;
-      padding: 0 10px;
-    }
-
-    .order-status-num {
-      min-width: 12rpx;
-      background-color: #fff;
-      color: var(--view-theme);
-      border-radius: 15px;
-      position: absolute;
-      right: -14rpx;
-      top: -15rpx;
-      font-size: 20rpx;
-      padding: 0 8rpx;
-      border: 1px solid var(--view-theme);
-    }
-
-    .support {
-      width: 219rpx;
-      height: 74rpx;
-      margin: 54rpx auto;
-      display: block;
-    }
-
-    .copyRightImg {
-      width: 219rpx;
-      height: 74rpx;
-      margin: 16rpx auto;
-      display: block;
-    }
-
-    .copy_right {
-      text-align: center;
-      color: #ccc;
-      font-size: 22rpx;
-      margin-top: 40rpx;
-
-      .copyRightText {
-        margin-top: 0rpx;
-        color: #ccc;
-        font-size: 20rpx;
-        margin-bottom: 20rpx;
-      }
-    }
-  }
-
-  .card-vip {
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-    width: 690rpx;
-    height: 125rpx;
-    margin: -72rpx auto 0;
-    background: url('~@/static/images/user_vip.png');
-    background-size: cover;
-    padding: 28rpx 30rpx 0 92rpx;
-		
-		&.on{
-			.left-box{
-				color: #fff;
-			}
-			.btn{
-				color: #fff;
-			}
-			.iconfont{
-				color: #fff;
-			}
-		}
-
-    .left-box {
-      font-size: 28rpx;
-      color: #AE5A2A;
-
-      .big {
-        font-size: 28rpx;
-      }
-
-      .small {
-        opacity: 0.8;
-      }
-    }
-
-    .btn {
-      color: #AE5A2A;
-      font-weight: 400;
-      font-size: 26rpx;
-    }
-
-    .iconfont {
-      font-size: 20rpx;
-      margin: 4rpx 0 0 4rpx;
-      color: #AE5A2A;
-    }
-  }
-
-  .setting {
-    margin-top: 15rpx;
-    margin-left: 15rpx;
-    color: #fff;
-
-    .iconfont {
-      font-size: 40rpx;
-    }
-  }
-
-  .new-users {
-    padding-bottom: 0;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-  }
-</style>
+<template>
+	<!-- 个人中心模块 -->
+	<view class="new-users copy-data" :style="{height:pageHeight}">
+		<!-- 自定义顶部背景颜色 -->
+		<view class="top" :style="colorStyle">
+			<!-- #ifdef MP || APP-PLUS -->
+			<view class="sys-head">
+				<view class="sys-bar" :style="{height:sysHeight}"></view>
+				<!-- #ifdef MP -->
+				<view class="sys-title" :style="member_style==3?'color:#333':''">个人中心</view>
+				<!-- #endif -->
+				<view class="bg" :style="member_style==3?'background:#f5f5f5':''"></view>
+			</view>
+			<!-- #endif -->
+		</view>
+		<!-- 自定义顶部背景颜色 -->
+		<view class="mid style-add" :style="colorStyle">
+			<scroll-view scroll-y="true" class="height-add">
+				<view class="head">
+					<view class="user-card" :class="member_style==3?'unBg':''"
+						:style="{backgroundImage:'url('+imgHost+'/statics/images/user01.png'+')'}">
+						<view class="bg"></view>
+						<!-- 个人资料展示 -->
+						<view class="user-info">
+							<view>
+								<!-- 公众号未授权时显示 -->
+								<!-- #ifdef H5 -->
+								<button class="bntImg" v-if="userInfo.is_complete == 0 && isWeixin"
+									@click="getWechatuserinfo">
+									<image class="avatar" src='/static/images/f.png'></image>
+									<view class="avatarName">获取头像</view>
+								</button>
+								<!-- #endif -->
+								<!-- #ifdef MP -->
+								<button class="bntImg" v-if="userInfo.is_complete == 0" @tap="getUserProfile">
+									<image class="avatar" src='/static/images/f.png'></image>
+									<view class="avatarName">获取头像</view>
+								</button>
+								<!-- #endif -->
+								<!-- #ifndef APP-PLUS -->
+								<view v-else class="avatar-box" :class="{on:userInfo.is_money_level}">
+									<image class="avatar" :src='userInfo.avatar' v-if="userInfo.avatar"
+										@click="goEdit()">
+									</image>
+									<image v-else class="avatar" src="/static/images/f.png" mode="" @click="goEdit()">
+									</image>
+									<view class="headwear" v-if="userInfo.is_money_level && stu">
+										<image src="/static/images/headwear.png"></image>
+									</view>
+								</view>
+								<!-- #endif -->
+								<!-- #ifdef APP-PLUS -->
+								<view class="avatar-box" :class="{on:userInfo.is_money_level}">
+									<image class="avatar" :src='userInfo.avatar' v-if="userInfo.avatar"
+										@click="goEdit()">
+									</image>
+									<image v-else class="avatar" src="/static/images/f.png" mode="" @click="goEdit()">
+									</image>
+									<view class="headwear" v-if="userInfo.is_money_level && stu">
+										<image src="/static/images/headwear.png"></image>
+										<view>
+											未登录
+										</view>
+									</view>
+								</view>
+								<!-- #endif -->
+							</view>
+							<view class="info">
+								<!-- #ifdef MP -->
+								<view class="name display-add" v-if="!userInfo.uid" @click="openAuto">
+									请点击授权
+								</view>
+								<!-- #endif -->
+								<!-- #ifdef H5 -->
+								<view class="name display-add" v-if="!userInfo.uid" @click="openAuto">
+									请点击授权
+								</view>
+								<!-- #endif -->
+								<view class="name" v-if="userInfo.uid">
+									{{userInfo.nickname}}
+									<image class="live" :src="userInfo.vip_icon" v-if="userInfo.vip_icon"></image>
+									<view class="vip" v-if="userInfo.is_money_level> 0 && stu">
+										<image src="/static/images/svip.png"></image>
+									</view>
+								</view>
+								<view class="num" v-if="userInfo.phone" @click="goEdit()">
+									<view class="num-txt">ID：{{userInfo.uid}}</view>
+									<view class="icon">
+										<image src="/static/images/edit.png" mode=""></image>
+									</view>
+								</view>
+								<view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
+							</view>
+							<view class="qrCode message iconfont icon-erweima-xingerenzhongxin" @click="tapQrCode">
+							</view>
+							<view class="message">
+								<navigator url="/pages/users/user_info/index" hover-class="none">
+									<view class="iconfont icon-shezhi"></view>
+								</navigator>
+							</view>
+							<view class="message">
+								<navigator url="/pages/users/message_center/index" hover-class="none">
+									<view v-if="userInfo.service_num" class="num">
+										{{userInfo.service_num >= 100 ? '99+' : userInfo.service_num}}
+									</view>
+									<view class="iconfont icon-s-kefu"></view>
+								</navigator>
+							</view>
+							<!-- #ifdef MP -->
+							<!-- <view class="setting" @click="Setting"><text class="iconfont icon-shezhi"></text></view> -->
+							<!-- #endif -->
+
+						</view>
+						<view class="achsac">
+						</view>
+						<!-- <view class="sign" @click="goSignIn">签到</view> -->
+						<!-- 会员权益 -->
+						<view class="cardVipA acea-row row-between-wrapper" v-if="member_style==1 && stu && vip_type==2"
+							:style="{backgroundImage:'url('+imgHost+'/statics/images/member.png'+')'}">
+							<view class="left-box">
+								<view v-if="vipStatus == 1" class="small">永久</view>
+								<view v-else-if="vipStatus == 3" class="small">会员到期
+									{{ userInfo.overdue_time | dateFormat }}
+								</view>
+								<view v-else-if="vipStatus == -1" class="small">已过期</view>
+								<view v-else-if="vipStatus == 2" class="small">未开通会员</view>
+							</view>
+							<view class="acea-row row-middle">
+								<navigator v-if="vipStatus == 1" url="/pages/annex/vip_paid/index" hover-class="none"
+									class="btn">查看会员权益
+								</navigator>
+								<navigator v-else url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
+									{{ userInfo.overdue_time ? '立即续费' : '立即激活' }}
+								</navigator>
+								<text class="iconfont icon-xiangyou"></text>
+							</view>
+						</view>
+						<view class="cardVipB acea-row row-between" v-if="member_style==3 && stu && vip_type==2">
+							<view class="left-box acea-row">
+								<view class="pictrue">
+									<image src="../../static/images/member01.png"></image>
+								</view>
+								<view v-if="vipStatus == 1" class="small">永久</view>
+								<view v-else-if="vipStatus == 3" class="small">会员到期
+									{{ userInfo.overdue_time | dateFormat }}
+								</view>
+								<view v-else-if="vipStatus == -1" class="small">已过期</view>
+								<view v-else-if="vipStatus == 2" class="small">未开通会员</view>
+							</view>
+							<view class="acea-row">
+								<navigator v-if="vipStatus == 1" url="/pages/annex/vip_paid/index" hover-class="none"
+									class="btn">
+									会员可享多项权益</navigator>
+								<navigator v-else url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
+									{{ userInfo.overdue_time ? '立即续费' : '立即激活' }}
+								</navigator>
+								<text class="iconfont icon-xiangyou btn"></text>
+							</view>
+						</view>
+						<!-- <view class="cardVipA acea-row row-between-wrapper"
+							:style="{backgroundImage:'url('+imgHost+'/statics/images/grade.png'+')'}"
+							v-if="member_style==1 && memberStatus && vip_type==1">
+							<view class="left-box on">
+								<view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view>
+							</view>
+							<view class="acea-row row-middle">
+								<navigator
+									:url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'"
+									hover-class="none" class="btn on">{{userInfo.level_status==1?'查看会员卡':'去激活'}}
+								</navigator>
+								<text class="iconfont icon-xiangyou on"></text>
+							</view>
+						</view> -->
+						<!-- <view class="cardVipB acea-row row-between on"
+							:style="{backgroundImage:'url('+imgHost+'/statics/images/grade01.png'+')'}"
+							v-if="member_style==3 && memberStatus && vip_type==1">
+							<view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view>
+							<view class="acea-row">
+								<navigator
+									:url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'"
+									hover-class="none" class="btn on">{{userInfo.level_status==1?'查看会员卡':'去激活'}}
+								</navigator>
+								<text class="iconfont icon-xiangyou"></text>
+							</view>
+						</view> -->
+					</view>
+					<view class="card-vip" v-if="member_style==2 && stu && vip_type==2">
+						<view class="left-box">
+							<!-- <view class="big">会员可享多项权益</view> -->
+							<view v-if="vipStatus == 1" class="small">永久</view>
+							<view v-else-if="vipStatus == 3" class="small">会员到期
+								{{ userInfo.overdue_time | dateFormat }}
+							</view>
+							<view v-else-if="vipStatus == -1" class="small">已过期</view>
+							<view v-else-if="vipStatus == 2" class="small">未开通会员</view>
+						</view>
+						<view class="acea-row">
+							<navigator v-if="vipStatus == 1" url="/pages/annex/vip_paid/index" hover-class="none"
+								class="btn">查看会员权益
+							</navigator>
+							<navigator v-else url="/pages/annex/vip_paid/index" hover-class="none" class="btn">
+								{{ userInfo.overdue_time ? '立即续费' : '立即激活' }}
+							</navigator>
+							<text class="iconfont icon-xiangyou"></text>
+						</view>
+					</view>
+					<!-- <view class="card-vip on" v-if="member_style==2 && memberStatus && vip_type==1"
+						:style="{backgroundImage:'url('+imgHost+'/statics/images/grade01.png'+')'}">
+						<view class="left-box">
+							<view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view>
+						</view>
+						<view class="acea-row">
+							<navigator
+								:url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'"
+								hover-class="none" class="btn">{{userInfo.level_status==1?'查看会员卡':'去激活'}}</navigator>
+							<text class="iconfont icon-xiangyou"></text>
+						</view>
+					</view> -->
+					<view class="num-wrapper"
+						:class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
+						v-if="userInfo.uid">
+						<view class="num-item" v-show="userInfo.balance_func_status"
+							@click="goMenuPage('/pages/users/user_money/index')">
+							<text class="num">{{userInfo.now_money || 0}}</text>
+							<view class="txt">余额</view>
+						</view>
+						<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+							<text class="num">{{userInfo.couponCount || 0}}</text>
+							<view class="txt">优惠券</view>
+						</view> -->
+						<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
+							<text class="num">{{userInfo.integral || 0}}</text>
+							<view class="txt">积分</view>
+						</view> -->
+						<view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
+							<text class="num">{{userInfo.collectCount || 0}}</text>
+							<view class="txt">收藏</view>
+						</view>
+						<view class="num-item" @click="goMenuPage('/pages/users/visit_list/index')">
+							<text class="num">{{userInfo.visit_num || 0}}</text>
+							<view class="txt">浏览记录</view>
+						</view>
+					</view>
+					<!-- 新人礼物 -->
+					<view class="num-wrapper on" v-if="!userInfo.uid">
+						<image :src="giftPic" mode="" class="img"></image>
+						<view class="text">
+							登录即获得<text class="gift">新人大礼包</text>
+						</view>
+						<view class="btn-login" @click="openAuto">去登录</view>
+					</view>
+					<!-- 新人专享 -->
+					<view class="newcomersCon" :class="newcomer_style==1?'':'on'" v-if="newList.length">
+						<view class="newcomers"
+							:style="{backgroundImage:'url('+ (newcomer_style==1?imgHost+'/statics/images/new-bg.png':newBg) +')'}">
+							<view class="title">
+								<view class="tl">
+									新人专享
+								</view>
+								<view class="tr" @click="goNewcomers">
+									更多 <text class="iconfont icon-xiangyou"></text>
+								</view>
+							</view>
+							<scroll-view scroll-x="true" class="scroll">
+								<view class="scroll-item" v-for="(item,index) in newList" :key="index"
+									@click="goDetail(item)">
+									<view class="pictrue">
+										<image :src='item.image'></image>
+										<view class="label">新人价</view>
+									</view>
+									<view class="money">¥{{item.price}}</view>
+								</view>
+							</scroll-view>
+						</view>
+					</view>
+					<!-- 订单中心 -->
+					<view class="order-wrapper">
+						<view class="order-hd flex">
+							<view class="left">订单中心</view>
+							<navigator class="right flex" hover-class="none" url="/pages/goods/order_list/index"
+								open-type="navigate">
+								查看全部
+								<text class="iconfont icon-xiangyou"></text>
+							</navigator>
+						</view>
+						<view class="order-bd">
+							<block v-for="(item,index) in orderMenu" :key="index">
+								<navigator class="order-item" hover-class="none" :url="item.url">
+									<view class="pic">
+										<!-- <image :src="item.img" mode=""></image> -->
+										<text class="iconfont" :class="item.img"></text>
+										<text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
+									</view>
+									<view class="txt">{{item.title}}</view>
+								</navigator>
+							</block>
+						</view>
+					</view>
+				</view>
+				<!-- 轮播 -->
+				<view class="slider-wrapper" v-if="imgUrls.length>0 && my_banner_status">
+					<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
+						:duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+						<block v-for="(item,index) in imgUrls" :key="index">
+							<swiper-item>
+								<navigator @click="goMenuPage(item.url)"
+									class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
+									<image :src="item.pic" class="slide-image"></image>
+								</navigator>
+							</swiper-item>
+						</block>
+					</swiper>
+				</view>
+				<!-- 会员菜单二 -->
+				<view class="menus-list" v-if="menu_status == 2 && MyMenus.length">
+					<view class="title">我的服务</view>
+					<!-- #ifdef APP-PLUS || H5 -->
+					<block v-for="(item,index) in MyMenus" :key="index">
+						<view class="item acea-row row-between-wrapper"
+							v-if="item.url!='#' && item.url!='/pages/service/index'"
+							@click="goMenuPage(item.url, item.name)">
+							<image :src="item.pic"></image>
+							<view class="text acea-row row-between-wrapper">
+								<view>{{item.name}}</view>
+								<view class="iconfont icon-xiangyou"></view>
+							</view>
+						</view>
+					</block>
+					<!-- #endif -->
+					<!-- #ifdef MP -->
+					<block v-for="(item,index) in MyMenus" :key="index">
+						<view class="item acea-row row-between-wrapper" v-if="item.url!='#'
+							&& item.url!='/pages/service/index' 
+							&& item.url!='/pages/extension/customer_list/chat' 
+							|| (item.url=='/pages/extension/customer_list/chat' && routineContact == 0)"
+							@click="goMenuPage(item.url, item.name)">
+							<image :src="item.pic"></image>
+							<view class="text acea-row row-between-wrapper">
+								<view>{{item.name}}</view>
+								<view class="iconfont icon-xiangyou"></view>
+							</view>
+						</view>
+					</block>
+					<button class="item acea-row row-between-wrapper" open-type='contact' v-if="routineContact == 1">
+						<image src="/static/images/contact.png"></image>
+						<view class="text acea-row row-between-wrapper">
+							<view>联系客服</view>
+							<view class="iconfont icon-xiangyou"></view>
+						</view>
+					</button>
+					<!-- #endif -->
+					<!-- #ifdef APP-PLUS -->
+					<view class="item acea-row row-between-wrapper" hover-class="none"
+						@click="goMenuPage('/pages/users/privacy/index')">
+						<image src="/static/images/menu.png"></image>
+						<view class="text acea-row row-between-wrapper">
+							<view>隐私协议</view>
+							<view class="iconfont icon-xiangyou"></view>
+						</view>
+					</view>
+					<!-- #endif -->
+				</view>
+				<!-- 会员菜单一 -->
+				<view class="user-menus" style="margin-top: 25rpx;" v-if="menu_status == 1 && MyMenus.length">
+					<view class="menu-title">我的服务</view>
+					<view class="list-box">
+						<!-- #ifdef APP-PLUS || H5 -->
+						<block v-for="(item,index) in MyMenus" :key="index">
+							<view class="item" v-if="item.url!='#' && item.url!='/pages/service/index'"
+								@click="goMenuPage(item.url, item.name)">
+								<image :src="item.pic"></image>
+								<text>{{item.name}}</text>
+							</view>
+						</block>
+						<!-- #endif -->
+						<!-- #ifdef MP -->
+						<block v-for="(item,index) in MyMenus" :key="index">
+							<view class="item" v-if="item.url!='#' 
+								&& item.url!='/pages/service/index' 
+								&& item.url!='/pages/extension/customer_list/chat' 
+								|| (item.url=='/pages/extension/customer_list/chat' && routineContact == 0)"
+								@click="goMenuPage(item.url, item.name)">
+								<image :src="item.pic"></image>
+								<text>{{item.name}}</text>
+							</view>
+						</block>
+						<button class="item" open-type='contact' v-if="routineContact == 1">
+							<image src="/static/images/contact.png"></image>
+							<text>联系客服</text>
+						</button>
+						<!-- #endif -->
+						<!-- #ifdef APP-PLUS -->
+						<view class="item" hover-class="none"
+							@click="goMenuPage('/pages/users/privacy/index?type=privacy')">
+							<image src="/static/images/menu.png"></image>
+							<text>隐私协议</text>
+						</view>
+						<!-- #endif -->
+					</view>
+				</view>
+				<view class="user-menus" style="margin-top: 25rpx;" v-if="service_status == 1 && storeMenu.length">
+					<view class="menu-title">商家管理</view>
+					<view class="list-box">
+						<block v-for="(item,index) in storeMenu" :key="index">
+							<view class="item" :url="item.url" v-if="item.url!='#' && item.url!='/pages/service/index'"
+								@click="goMenuPage(item.url, item.name)">
+								<image :src="item.pic"></image>
+								<text>{{item.name}}</text>
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class="menus-list" v-if="service_status == 2 && storeMenu.length">
+					<view class="title">商家管理</view>
+					<block v-for="(item,index) in storeMenu" :key="index">
+						<view class="item acea-row row-between-wrapper" :url="item.url" hover-class="none"
+							v-if="item.url!='#' && item.url!='/pages/service/index'"
+							@click="goMenuPage(item.url, item.name)">
+							<image :src="item.pic"></image>
+							<view class="text acea-row row-between-wrapper">
+								<view>{{item.name}}</view>
+								<view class="iconfont icon-xiangyou"></view>
+							</view>
+						</view>
+					</block>
+				</view>
+				<!-- <view class="copy_right">
+					<template v-if='copyRightText'>
+						<image :src="copyRightImg" mode="" class="copyRightImg"></image>
+						<view class="copyRightText">
+							{{copyRightText}}
+						</view>
+					</template>
+					<image v-else src="/static/images/support.png" alt="" class='support'></image>
+				</view> -->
+				<view class="uni-p-b-98"></view>
+			</scroll-view>
+		</view>
+		<view class="codePopup" :style="colorStyle" v-show="isCode">
+			<view class="header acea-row row-between-wrapper">
+				<view class="title" :class="{'on': codeIndex == index,'onLeft':codeIndex == 1}"
+					v-for="(item, index) in codeList" :key="index" @click="tapCode(index)">{{item.name}}</view>
+			</view>
+			<view>
+				<view class="acea-row row-center-wrapper">
+					<w-barcode :options="config.bar"></w-barcode>
+				</view>
+				<view class="acea-row row-center-wrapper" style="margin-top: 35rpx;">
+					<w-qrcode :options="config.qrc" @generate="hello"></w-qrcode>
+				</view>
+				<view class="codeNum">{{config.bar.code}}</view>
+				<view class="tip">如遇到扫码失败请将屏幕调至最亮重新扫码</view>
+			</view>
+			<view class="iconfont icon-guanbi2" @click="closeCode"></view>
+		</view>
+		<view class="mark" v-if="isCode"></view>
+		<pageFooter></pageFooter>
+		<!-- 店员推广码 extension-->
+		<view class="codePopup heg" :style="colorStyle" v-show="isextension">
+			<view class="header">
+				<view class="title on" style="width: 100%;">店员推广码</view>
+			</view>
+			<view>
+				<view class="acea-row row-center-wrapper" style="margin-top: 25rpx;" @click="hah">
+					<w-qrcode id="hah" :options="extension"></w-qrcode>
+				</view>
+				<view class="tip">如遇到扫码失败请将屏幕调至最亮重新扫码</view>
+			</view>
+			<view class="iconfont icon-guanbi2" @click="closeCode"></view>
+		</view>
+		<view class="mark" v-show="isextension"></view>
+		<ewcomerPop v-if="isComerGift" :comerGift="comerGift" @comerPop="comerPop"></ewcomerPop>
+	</view>
+</template>
+<script>
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	import {
+		storeCardApi
+	} from '@/api/store.js';
+	import {
+		newcomerGift
+	} from '@/api/new_store.js';
+	import {
+		newcomerList
+	} from '@/api/api.js';
+	import {
+		getMenuList,
+		getUserInfo,
+		setVisit,
+		updateUserInfo,
+		getRandCode,
+		updateWechatInfo
+	} from '@/api/user.js';
+	import {
+		wechatAuthV2,
+		silenceAuth
+	} from '@/api/public.js'
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapState,
+		mapGetters
+	} from "vuex";
+	// #ifdef H5
+	import Auth from '@/libs/wechat';
+	// #endif
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	const app = getApp();
+	import ewcomerPop from '@/components/ewcomerPop/index.vue'
+	import pageFooter from '@/components/pageFooter/index.vue'
+	import dayjs from '@/plugin/dayjs/dayjs.min.js';
+	import Routine from '@/libs/routine';
+	import colors from '@/mixins/color';
+	export default {
+		components: {
+			pageFooter,
+			ewcomerPop
+		},
+		computed: {
+			...mapGetters({
+				cartNum: 'cartNum',
+				isLogin: 'isLogin'
+			})
+		},
+		filters: {
+			coundTime(val) {
+				var setTime = val * 1000
+				var nowTime = new Date()
+				var rest = setTime - nowTime.getTime()
+				var day = parseInt(rest / (60 * 60 * 24 * 1000))
+				// var hour = parseInt(rest/(60*60*1000)%24) //小时
+				return day + '天'
+			},
+			dateFormat: function(value) {
+				return dayjs(value * 1000).format('YYYY-MM-DD');
+			}
+		},
+		mixins: [colors],
+		data() {
+			return {
+				vipStatus: 0,
+				stu: false,
+				storeMenu: [], // 商家管理
+				orderMenu: [{
+						img: 'icon-daifukuan',
+						title: '待付款',
+						url: '/pages/goods/order_list/index?status=0'
+					},
+					{
+						img: 'icon-daifahuo',
+						title: '待发货',
+						url: '/pages/goods/order_list/index?status=1'
+					},
+					{
+						img: 'icon-daishouhuo',
+						title: '待收货',
+						url: '/pages/goods/order_list/index?status=2'
+					},
+					{
+						img: 'icon-daipingjia',
+						title: '待评价',
+						url: '/pages/goods/order_list/index?status=3'
+					},
+					{
+						img: 'icon-a-shouhoutuikuan',
+						title: '售后/退款',
+						url: '/pages/users/user_return_list/index'
+					},
+				],
+				imgUrls: [],
+				autoplay: true,
+				circular: true,
+				interval: 3000,
+				duration: 500,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				orderStatusNum: {},
+				userInfo: {},
+				MyMenus: [],
+				sysHeight: sysHeight,
+				mpHeight: 0,
+				showStatus: 1,
+				// #ifdef H5 || MP
+				pageHeight: '100%',
+				routineContact: 0,
+				// #endif
+				// #ifdef APP-PLUS
+				pageHeight: app.globalData.windowHeight,
+				// #endif
+				// #ifdef H5
+				isWeixin: Auth.isWeixin(),
+				//#endif
+				footerSee: false,
+				member_style: 1,
+				my_banner_status: 1,
+				menu_status: 1,
+				service_status: 1,
+				codeList: [{
+					name: '会员码'
+				}, {
+					name: '付款码'
+				}],
+				codeIndex: 0,
+				config: {
+					bar: {
+						code: '',
+						color: ['#000'],
+						bgColor: '#FFFFFF', // 背景色
+						width: 480, // 宽度
+						height: 110 // 高度
+					},
+					qrc: {
+						code: '',
+						size: 380, // 二维码大小
+						level: 3, //等级 0～4
+						bgColor: '#FFFFFF', //二维码背景色 默认白色
+						border: {
+							color: ['#eee', '#eee'], //边框颜色支持渐变色
+							lineWidth: 3, //边框宽度
+						},
+						// img: '/static/logo.png', //图片
+						// iconSize: 40, //二维码图标的大小
+						color: ['#333', '#333'], //边框颜色支持渐变色
+					}
+				},
+				isCode: false,
+				isextension: false,
+				extension: {
+					code: "",
+					size: 380, // 二维码大小
+					level: 3, //等级 0～4
+					bgColor: '#FFFFFF', //二维码背景色 默认白色
+					border: {
+						color: ['#eee', '#eee'], //边框颜色支持渐变色
+						lineWidth: 3, //边框宽度
+					},
+					// img: '/static/logo.png', //图片
+					// iconSize: 40, //二维码图标的大小
+					color: ['#333', '#333'], //边框颜色支持渐变色
+				},
+				imgHost: HTTP_REQUEST_URL,
+				copyRightText: "",
+				copyRightImg: '',
+				giftPic: '',
+				vip_type: 1,
+				newcomer_style: 1,
+				newList: [],
+				newBg: '',
+				comerGift: {},
+				isComerGift: false,
+				memberStatus: 0
+			}
+		},
+		created() {
+			let that = this;
+			// #ifdef MP
+			// 小程序静默授权
+			if (!this.$store.getters.isLogin) {
+				Routine.getCode()
+					.then(code => {
+						Routine.silenceAuth(code).then(res => {
+							this.onLoadFun();
+						})
+					})
+					.catch(res => {
+						uni.hideLoading();
+					});
+			}
+			// #endif
+			// #ifdef H5 || APP-PLUS
+			if (that.isLogin == false) {
+				toLogin()
+			}
+			// #endif
+			// #ifdef APP-PLUS
+			that.$set(that, 'pageHeight', app.globalData.windowHeight);
+			// #endif
+		},
+		async onLoad(option) {
+			if (this.isLogin) {
+				this.getNewcomerGift();
+			}
+			// #ifdef H5 
+			if (this.isLogin && Auth.isWeixin() && option.code) {
+				try {
+					let res = await updateWechatInfo({
+						code: option.code
+					});
+					this.userInfo.nickname = res.data.nickname;
+					this.userInfo.avatar = res.data.avatar;
+					this.userInfo.is_complete = 1;
+				} catch (e) {}
+			}
+			// #endif
+			this.getNewList();
+			this.colorData();
+			let giftList = [
+				this.imgHost + '/statics/images/gift01.png',
+				this.imgHost + '/statics/images/gift02.png',
+				this.imgHost + '/statics/images/gift03.png',
+				this.imgHost + '/statics/images/gift04.png',
+				this.imgHost + '/statics/images/gift05.png'
+			];
+			let newBg = [
+				this.imgHost + '/statics/images/blue-bg.png',
+				this.imgHost + '/statics/images/green-bg.png',
+				this.imgHost + '/statics/images/red-bg.png',
+				this.imgHost + '/statics/images/pink-bg.png',
+				this.imgHost + '/statics/images/orange-bg.png'
+			]
+			setTimeout(() => {
+				switch (this.colorNum) {
+					case 1:
+						this.giftPic = giftList[2];
+						this.newBg = newBg[0];
+						break;
+					case 2:
+						this.giftPic = giftList[1];
+						this.newBg = newBg[1];
+						break;
+					case 3:
+						this.giftPic = giftList[4];
+						this.newBg = newBg[2];
+						break;
+					case 4:
+						this.giftPic = giftList[0];
+						this.newBg = newBg[3];
+						break;
+					case 5:
+						this.giftPic = giftList[3];
+						this.newBg = newBg[4];
+						break;
+					default:
+						this.giftPic = giftList[4];
+						this.newBg = newBg[2];
+						break
+				}
+			}, 1)
+		},
+		onReady() {
+			let self = this
+			// #ifdef MP
+			let info = uni.createSelectorQuery().select(".sys-head");
+			info.boundingClientRect(function(data) { //data - 各种参数
+				self.mpHeight = data.height
+			}).exec()
+			// #endif
+		},
+		onShow: function() {
+			if (this.cartNum > 0) {
+				uni.setTabBarBadge({
+					index: 3,
+					text: this.cartNum + ''
+				})
+			} else {
+				uni.hideTabBarRedDot({
+					index: 3
+				})
+			}
+			this.copyRightText = uni.getStorageSync('copyNameInfo');
+			this.copyRightImg = uni.getStorageSync('copyImageInfo');
+			uni.removeStorageSync('form_type_cart');
+			let that = this;
+			// #ifdef APP-PLUS
+			uni.getSystemInfo({
+				success: function(res) {
+					that.pageHeight = res.windowHeight + 'px'
+				}
+			});
+			// #endif
+			if (that.isLogin) {
+				this.getUserInfo();
+				this.getMyMenus();
+				this.setVisit();
+			};
+		},
+		methods: {
+			goDetail(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.id}&fromPage='newVip'`
+				});
+			},
+			comerPop() {
+				this.isComerGift = false;
+			},
+			getNewcomerGift() {
+				if (uni.getStorageSync('newcomerGift')) {
+					return this.isComerGift = false;
+				}
+				newcomerGift().then(res => {
+					this.comerGift = res.data;
+					if (Object.prototype.toString.call(this.comerGift) == '[object Object]') {
+						if (res.data.coupon_count || res.data.product_count || res.data.register_give_money || res
+							.data.first_oder_discount || res.data.register_give_integral) {
+							uni.setStorageSync('newcomerGift', true);
+							this.isComerGift = true;
+						}
+					}
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				})
+			},
+			getNewList() {
+				newcomerList({
+					page: 1,
+					limit: 6,
+					priceOrder: '',
+					salesOrder: ''
+				}).then(res => {
+					this.newList = res.data;
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				})
+			},
+			hah() {
+				let that = this
+				// #ifdef H5
+				var canvas = document.getElementById("hah").getElementsByTagName("canvas")
+				var imgURL = canvas[0].toDataURL("image/png")
+				var dlLink = document.createElement('a');
+				dlLink.download = "店员推广码";
+				dlLink.href = imgURL;
+				dlLink.dataset.downloadurl = ["image/png", dlLink.download, dlLink.href].join(':');
+
+				document.body.appendChild(dlLink);
+				dlLink.click();
+				document.body.removeChild(dlLink);
+				// #endif
+				// #ifdef MP
+				// let ctx = uni.createCanvasContext("WQrcode")
+
+				// let ctx = uni.createSelectorQuery().in(this).select("canvas")
+				// uni.canvasToTempFilePath({
+				// 	canvasId: "WQrcode",
+				// 	fileType: 'image/png',
+				// 	success: (res) => {
+				// 	 // 保存当前绘制推广码
+				// 	that.savePic(res.tempFilePath)
+				// 	},
+				// 	fail: function(err) {
+				// 	console.log(err, '推广码生成失败')
+				// 	}
+				// },that)
+
+				//  ctx.draw(false, uni.canvasToTempFilePath({
+				// 			canvasId: 'WQrcode',
+				// 			success: function (res) {
+				// 			that.savePic(res.tempFilePath)
+				// 			},
+				// 			fail: function (err) {
+				// 				console.log(err, '推广码生成失败')
+				// 			}
+				// },that))
+				// console.log("222222",ctx)
+				// #endif
+				// #ifdef APP-PLUS
+				uni.canvasToTempFilePath({
+					canvasId: 'WQrcode',
+					success: (res) => {
+						uni.hideLoading()
+						// 保存当前绘制推广码
+						that.savePic(res.tempFilePath)
+					},
+					fail: function(err) {
+						console.log(err, '推广码生成失败')
+					}
+				})
+				// #endif
+			},
+			//保存推广码到本地
+			savePic(filePath) {
+				// #ifdef APP-PLUS
+				uni.showLoading({
+					title: '正在保存'
+				});
+				uni.saveImageToPhotosAlbum({
+					filePath: filePath,
+					success: function() {
+						uni.showToast({
+							title: '推广码保存成功～'
+						});
+					},
+					fail: function(e) {
+						console.log(e, '推广码保存失败')
+					},
+					complete: function() {
+						uni.hideLoading()
+					}
+				});
+				// #endif
+			},
+			hello(res) {
+				// console.log(321,res)
+
+			},
+			// 前往新人专享
+			goNewcomers() {
+				uni.navigateTo({
+					url: '/pages/store/newcomers/index'
+				})
+			},
+
+			getCode() {
+				getRandCode().then(res => {
+					let code = res.data.code;
+					this.config.bar.code = code;
+					this.config.qrc.code = code;
+				}).catch(err => {
+					return this.$util.Tips(err);
+				})
+			},
+			tapQrCode() {
+				this.isCode = true;
+				this.codeIndex = 0;
+				this.$nextTick(function() {
+					let code = this.userInfo.bar_code;
+					this.config.bar.code = code;
+					this.config.qrc.code = code;
+				})
+			},
+			closeCode() {
+				this.isCode = false
+				this.isextension = false
+			},
+			tapCode(index) {
+				this.codeIndex = index;
+				if (index == 1) {
+					this.getCode();
+				} else {
+					let code = this.userInfo.bar_code;
+					this.config.bar.code = code;
+					this.config.qrc.code = code;
+				}
+			},
+			getWechatuserinfo() {
+				//#ifdef H5
+				Auth.isWeixin() && Auth.toAuth('snsapi_userinfo', '/pages/user/index');
+				//#endif
+			},
+			getRoutineUserInfo(e) {
+				updateUserInfo({
+					userInfo: e.detail.userInfo
+				}).then(res => {
+					this.getUserInfo();
+					return this.$util.Tips('更新用户信息成功');
+				}).catch(err => {
+					return this.$util.Tips(err);
+				})
+			},
+			// 记录会员访问
+			setVisit() {
+				setVisit({
+					url: '/pages/user/index'
+				}).then(res => {})
+			},
+			// 打开授权
+			openAuto() {
+				toLogin();
+			},
+			// 授权回调
+			onLoadFun() {
+				this.getUserInfo();
+				this.getMyMenus();
+				this.setVisit();
+			},
+			Setting: function() {
+				uni.openSetting({
+					success: function(res) {}
+				});
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			// 绑定手机
+			bindPhone() {
+				uni.navigateTo({
+					url: '/pages/users/user_phone/index'
+				})
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfo = res.data
+					that.stu = res.data.svip_open
+					that.memberStatus = parseInt(res.data.member_func_status)
+					that.vipStatus = res.data.vip_status
+					that.$store.commit("SETUID", res.data.uid);
+					that.$store.commit("UPDATE_USERINFO", res.data);
+					that.orderMenu.forEach((item, index) => {
+						switch (item.title) {
+							case '待付款':
+								item.num = res.data.orderStatusNum.unpaid_count
+								break
+							case '待发货':
+								item.num = res.data.orderStatusNum.unshipped_count
+								break
+							case '待收货':
+								item.num = res.data.orderStatusNum.received_count
+								break
+							case '待评价':
+								item.num = res.data.orderStatusNum.evaluated_count
+								break
+							case '售后/退款':
+								item.num = res.data.orderStatusNum.refunding_count
+								break
+						}
+					})
+				});
+			},
+			//小程序授权api替换 getUserInfo
+			getUserProfile() {
+				uni.showLoading({
+					title: '获取中'
+				});
+				let self = this;
+				Routine.getUserProfile()
+					.then(res => {
+						Routine.getCode()
+							.then(code => {
+								let userInfo = res.userInfo;
+								userInfo.code = code;
+								userInfo.spread_spid = app.globalData.spid; //获取推广人ID
+								userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
+								Routine.authUserInfo(userInfo)
+									.then(res => {
+										if (res.data.key !== undefined && res.data.key) {
+											uni.hideLoading();
+											self.authKey = res.data.key;
+											self.isPhoneBox = true;
+										} else {
+											uni.hideLoading();
+											let time = res.data.expires_time - self.$Cache.time();
+											self.$store.commit('LOGIN', {
+												token: res.data.token,
+												time: time
+											});
+											this.getUserInfo()
+										}
+									})
+									.catch(res => {
+										uni.hideLoading();
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										});
+									});
+							})
+							.catch(res => {
+								uni.hideLoading();
+							});
+					})
+					.catch(res => {
+						uni.hideLoading();
+					});
+			},
+			/**
+			 * 
+			 * 获取个人中心图标
+			 */
+			switchTab(order) {
+				this.orderMenu.forEach((item, index) => {
+					switch (item.title) {
+						case '待付款':
+							item.img = order.dfk
+							break
+						case '待发货':
+							item.img = order.dfh
+							break
+						case '待收货':
+							item.img = order.dsh
+							break
+						case '待评价':
+							item.img = order.dpj
+							break
+						case '售后/退款':
+							item.img = order.sh
+							break
+					}
+				})
+			},
+			getMyMenus: function() {
+				let that = this;
+				// if (this.MyMenus.length) return;
+				getMenuList().then(res => {
+					let storeMenu = []
+					let myMenu = []
+					res.data.routine_my_menus.forEach((el, index, arr) => {
+						if (el.type == '2') {
+							storeMenu.push(el)
+						} else {
+							myMenu.push(el)
+						}
+					})
+					this.member_style = Number(res.data.diy_data.status)
+					this.my_banner_status = res.data.diy_data.my_banner_status
+					this.menu_status = res.data.diy_data.menu_status
+					this.service_status = res.data.diy_data.service_status
+					this.vip_type = res.data.diy_data.vip_type;
+					this.newcomer_style = res.data.diy_data.newcomer_style;
+					let order01 = {
+						dfk: 'icon-daifukuan',
+						dfh: 'icon-daifahuo',
+						dsh: 'icon-daishouhuo',
+						dpj: 'icon-daipingjia',
+						sh: 'icon-a-shouhoutuikuan'
+					}
+					let order02 = {
+						dfk: 'icon-daifukuan-lan',
+						dfh: 'icon-daifahuo-lan',
+						dsh: 'icon-daishouhuo-lan',
+						dpj: 'icon-daipingjia-lan',
+						sh: 'icon-shouhou-tuikuan-lan'
+					}
+					let order03 = {
+						dfk: 'icon-daifukuan-ju',
+						dfh: 'icon-daifahuo-ju',
+						dsh: 'icon-daishouhuo-ju',
+						dpj: 'icon-daipingjia-ju',
+						sh: 'icon-shouhou-tuikuan-ju'
+					}
+					let order04 = {
+						dfk: 'icon-daifukuan-fen',
+						dfh: 'icon-daifahuo-fen',
+						dsh: 'icon-daishouhuo-fen',
+						dpj: 'icon-daipingjia-fen',
+						sh: 'icon-a-shouhoutuikuan-fen'
+					}
+					let order05 = {
+						dfk: 'icon-daifukuan-lv',
+						dfh: 'icon-daifahuo-lv',
+						dsh: 'icon-daishouhuo-lv',
+						dpj: 'icon-daipingjia-lv',
+						sh: 'icon-shouhou-tuikuan-lv'
+					}
+					switch (res.data.diy_data.order_status) {
+						case 1:
+							this.switchTab(order01)
+							break
+						case 2:
+							this.switchTab(order02)
+							break
+						case 3:
+							this.switchTab(order03)
+							break
+						case 4:
+							this.switchTab(order04)
+							break
+						case 5:
+							this.switchTab(order05)
+							break
+					}
+					that.$set(that, 'MyMenus', myMenu);
+					that.$set(that, 'storeMenu', storeMenu);
+					this.imgUrls = res.data.routine_my_banner
+					this.routineContact = Number(res.data.routine_contact_type)
+				});
+			},
+			// 编辑页面
+			goEdit() {
+				if (this.isLogin == false) {
+					toLogin();
+				} else {
+					uni.navigateTo({
+						url: '/pages/users/user_info/index'
+					})
+				}
+
+			},
+			// 签到
+			goSignIn() {
+				uni.navigateTo({
+					url: '/pages/users/user_sgin/index'
+				})
+			},
+			goMenuPage(url, name) {
+				if (this.isLogin) {
+					if (url == '/pages/extension/customer_list/chat' || url == 'https://chat.crmeb.net/chat/mobile') {
+						this.$util.getCustomer(this.userInfo)
+					} else {
+						if (url.indexOf('http') === -1) {
+							// #ifdef H5
+							if (name && name === '订单核销') {
+								return window.location.href = `${location.origin}${url}`
+							}
+							// #endif
+							// #ifdef MP
+							if (url != '#' && url == '/pages/users/user_info/index') {
+								uni.openSetting({
+									success: function(res) {}
+								});
+							}
+							// #endif
+							if (url == '/pages/store_spread/index') {
+								storeCardApi().then(res => {
+									this.isextension = true
+									this.$nextTick(function() {
+										this.extension.code = res.data.url
+									})
+								}).catch(err => {
+									uni.hideLoading()
+									this.$util.Tips({
+										title: err
+									})
+								})
+							}
+							uni.navigateTo({
+								url: url
+							})
+						} else {
+							uni.navigateTo({
+								url: `/pages/annex/web_view/index?url=${url}`
+							});
+						}
+					}
+				} else {
+					// #ifdef MP
+					this.openAuto()
+					// #endif
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.style-add {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.height-add {
+		height: 100%;
+	}
+
+	.display-add {
+		height: 100%;
+		display: flex;
+		align-items: center;
+	}
+
+	page,
+	body {
+		height: 100%;
+	}
+
+	.heg {
+		height: 670rpx !important;
+	}
+
+	.mark {
+		position: fixed;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background: rgba(0, 0, 0, 0.5);
+		z-index: 30;
+	}
+
+	.height {
+		margin-top: -84rpx !important;
+	}
+
+	.menus-list {
+		width: 690rpx;
+		background-color: #fff;
+		border-radius: 14rpx;
+		margin: 25rpx auto 0 auto;
+
+		.title {
+			font-weight: 600;
+			font-size: 30rpx;
+			color: #333;
+			padding: 30rpx 30rpx 10rpx 30rpx;
+		}
+
+		.item {
+			margin-left: 30rpx;
+			font-size: 30rpx;
+			color: #333;
+
+			image {
+				width: 42rpx;
+				height: 42rpx;
+				display: block;
+			}
+
+			.text {
+				width: 590rpx;
+				border-bottom: 1rpx solid #EEEEEE;
+				padding: 28rpx 30rpx 28rpx 0;
+
+				.iconfont {
+					font-size: 20rpx;
+					color: #8A8A8A;
+				}
+			}
+		}
+	}
+
+	.num-wrapper {
+		background-color: #fff;
+		z-index: 29;
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 22rpx;
+		color: #333;
+		margin: 30rpx 30rpx 25rpx 30rpx;
+		border-radius: 16rpx;
+		height: 160rpx;
+
+		&.on {
+			height: 128rpx;
+			margin-top: -68rpx;
+
+			.gift {
+				color: var(--view-theme);
+				margin-left: 10rpx;
+				font-weight: bold;
+			}
+		}
+
+		.img {
+			margin-left: 38rpx;
+			width: 76rpx;
+			height: 68rpx;
+		}
+
+		.text {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333333;
+			margin-left: -60rpx;
+		}
+
+		.btn-login {
+			width: 144rpx;
+			height: 56rpx;
+			// background: linear-gradient(270deg, #FF7931 0%, #E93323 100%);
+			background-color: var(--view-theme);
+			border-radius: 28rpx;
+			text-align: center;
+			line-height: 56rpx;
+			margin-right: 32rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+
+		}
+
+		.num-item {
+			width: 33.33%;
+			text-align: center;
+
+			&~.num-item {
+				position: relative;
+
+				&:before {
+					content: '';
+					position: absolute;
+					width: 1rpx;
+					height: 28rpx;
+					top: 50%;
+					margin-top: -14rpx;
+					background-color: rgba(255, 255, 255, 0.4);
+					left: 0;
+				}
+			}
+
+			.num {
+				font-size: 36rpx;
+				font-weight: bold;
+			}
+
+			.txt {
+				margin-top: 8rpx;
+				font-size: 26rpx;
+				color: #555;
+			}
+		}
+	}
+
+	// 新人专享
+	.newcomersCon {
+		background-color: var(--view-theme);
+		width: 690rpx;
+		height: 296rpx;
+		margin: 0 30rpx;
+		border-radius: 16rpx;
+
+		&.on {
+			background-color: #fff;
+
+			.newcomers {
+				.title {
+					.tl {
+						color: #333;
+					}
+
+					.tr {
+						width: unset;
+						color: #666666;
+						background: unset;
+					}
+				}
+
+				.scroll {
+					.scroll-item {
+						background-color: var(--view-minorColorT);
+					}
+				}
+			}
+		}
+
+		.newcomers {
+			padding: 24rpx 30rpx;
+			width: 100%;
+			height: 100%;
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+
+			.title {
+				display: flex;
+				justify-content: space-between;
+
+				.tl {
+					font-size: 30rpx;
+					font-weight: 600;
+					color: #FFFFFF;
+				}
+
+				.tr {
+					width: 90rpx;
+					height: 36rpx;
+					background: linear-gradient(135deg, #FFCA52 0%, #FE960F 100%);
+					border-radius: 18rpx;
+					font-size: 24rpx;
+					text-align: center;
+					line-height: 36rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+
+					.icon-xiangyou {
+						font-size: 16rpx;
+					}
+				}
+			}
+
+			.scroll {
+				width: 690rpx;
+				margin-top: 20rpx;
+				white-space: nowrap;
+				padding-right: 60rpx;
+
+				.scroll-item {
+					display: inline-block;
+					width: 162rpx;
+					height: 194rpx;
+					background-color: #fff;
+					border-radius: 12rpx;
+					margin-right: 10rpx;
+					padding: 12rpx;
+
+					.pictrue {
+						width: 138rpx;
+						height: 138rpx;
+						position: relative;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+
+						.label {
+							width: 98rpx;
+							height: 32rpx;
+							background: var(--view-theme);
+							border-radius: 16rpx;
+							color: #FFFFFF;
+							font-size: 24rpx;
+							text-align: center;
+							line-height: 32rpx;
+							position: absolute;
+							bottom: 2rpx;
+							left: 50%;
+							margin-left: -49rpx;
+						}
+					}
+
+					.money {
+						font-size: 24rpx;
+						color: var(--view-priceColor);
+						margin-top: 6rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.Tnum-wrapper {
+		margin: -34rpx 30rpx 25rpx 30rpx;
+	}
+
+	.unNum-wrapper {
+		margin: 0 30rpx 25rpx 30rpx;
+	}
+
+	.unBg {
+		background-color: unset !important;
+
+		.user-info {
+			.info {
+				.name {
+					color: #333333 !important;
+					font-weight: 600;
+				}
+
+				.num {
+					color: #333 !important;
+
+					.num-txt {
+						height: 38rpx;
+						background-color: rgba(51, 51, 51, 0.13);
+						padding: 0 12rpx;
+						border-radius: 16rpx;
+					}
+				}
+			}
+		}
+
+		.qrCode {
+			color: #333 !important;
+		}
+
+		.message {
+			.iconfont {
+				color: #333 !important;
+			}
+
+			.num {
+				color: #fff !important;
+				background-color: var(--view-theme) !important;
+			}
+		}
+
+		.setting {
+			.iconfont {
+				color: #333 !important;
+			}
+		}
+	}
+
+	.cardVipB {
+		background-color: #343A48;
+		width: 100%;
+		height: 124rpx;
+		border-radius: 16rpx 16rpx 0 0;
+		padding: 22rpx 30rpx 0 30rpx;
+		margin-top: 16px;
+
+		&.on {
+			width: 690rpx;
+			height: 130rpx;
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			color: #fff;
+			margin-left: auto;
+			margin-right: auto;
+			padding: 22rpx 30rpx 0 90rpx;
+
+			.iconfont {
+				font-size: 24rpx;
+				margin-left: 6rpx;
+			}
+		}
+
+		.left-box {
+			.small {
+				color: #F8D5A8;
+				font-size: 28rpx;
+				margin-left: 18rpx;
+			}
+
+			.pictrue {
+				width: 40rpx;
+				height: 45rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.btn {
+			color: #BBBBBB;
+			font-size: 26rpx;
+
+			&.on {
+				color: #fff;
+			}
+		}
+
+		.icon-xiangyou {
+			margin-top: 6rpx;
+		}
+	}
+
+	.cardVipA {
+		position: absolute;
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		width: 750rpx;
+		height: 84rpx;
+		bottom: -2rpx;
+		left: 0;
+		padding: 0 56rpx 0 135rpx;
+
+		.left-box {
+			font-size: 26rpx;
+			color: #905100;
+			font-weight: 400;
+
+			&.on {
+				color: #fff;
+			}
+		}
+
+		.btn {
+			color: #905100;
+			font-weight: 400;
+			font-size: 24rpx;
+
+			&.on {
+				color: #fff;
+			}
+		}
+
+		.iconfont {
+			font-size: 20rpx;
+			margin: 4rpx 0 0 4rpx;
+
+			&.on {
+				color: #fff;
+				margin-top: 0;
+			}
+		}
+	}
+
+	.new-users {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.sys-head {
+			position: relative;
+			width: 100%;
+			// background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
+
+			.bg {
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				// background: url("~@/static/images/user-sys.png") no-repeat;
+				background: var(--view-theme);
+				background-size: 100% auto;
+				background-position: left bottom;
+			}
+
+			.sys-title {
+				z-index: 10;
+				position: relative;
+				height: 43px;
+				text-align: center;
+				line-height: 43px;
+				font-size: 36rpx;
+				color: #FFFFFF;
+			}
+		}
+
+		.head {
+			// background: #fff;
+
+			.user-card {
+				position: relative;
+				width: 100%;
+				height: 220rpx;
+				margin: 0 auto;
+				padding: 35rpx 28rpx;
+				background-size: 100% auto;
+				background-color: var(--view-theme);
+
+				.user-info {
+					z-index: 20;
+					position: relative;
+					display: flex;
+
+					.headwear {
+						position: absolute;
+						right: -4rpx;
+						top: -14rpx;
+						width: 44rpx;
+						height: 44rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.live {
+						width: 28rpx;
+						height: 28rpx;
+						margin-left: 20rpx;
+					}
+
+					.bntImg {
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 50%;
+						text-align: center;
+						line-height: 120rpx;
+						background-color: unset;
+						position: relative;
+
+						.avatarName {
+							font-size: 16rpx;
+							color: #fff;
+							text-align: center;
+							background-color: rgba(0, 0, 0, 0.6);
+							height: 37rpx;
+							line-height: 37rpx;
+							position: absolute;
+							bottom: 0;
+							left: 0;
+							width: 100%;
+						}
+					}
+
+					.avatar-box {
+						position: relative;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 50%;
+
+						&.on {
+							.avatar {
+								border: 2px solid #FFAC65;
+								border-radius: 50%;
+							}
+						}
+					}
+
+					.avatar {
+						position: relative;
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 50%;
+
+					}
+
+					.info {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						margin-left: 20rpx;
+						padding: 15rpx 0;
+
+						.name {
+							display: flex;
+							align-items: center;
+							color: #fff;
+							font-size: 31rpx;
+
+							.vip {
+								margin-left: 10rpx;
+
+								image {
+									width: 78rpx;
+									height: 30rpx;
+									display: block;
+								}
+							}
+						}
+
+						.num {
+							display: flex;
+							align-items: center;
+							font-size: 26rpx;
+							color: rgba(255, 255, 255, 0.6);
+
+							image {
+								width: 22rpx;
+								height: 23rpx;
+								margin-left: 20rpx;
+							}
+						}
+					}
+				}
+
+				.qrCode {
+					color: #fff;
+					margin-top: 16rpx !important;
+					font-size: 38rpx;
+					margin-right: 36rpx !important;
+				}
+
+				.message {
+					align-self: flex-start;
+					position: relative;
+					margin-top: 15rpx;
+					margin-right: 20rpx;
+
+					.num {
+						position: absolute;
+						top: -8rpx;
+						left: 18rpx;
+						padding: 0 6rpx;
+						height: 28rpx;
+						border-radius: 12rpx;
+						background-color: #fff;
+						font-size: 18rpx;
+						line-height: 28rpx;
+						text-align: center;
+						color: var(--view-theme);
+					}
+
+					.iconfont {
+						font-size: 40rpx;
+						color: #fff;
+					}
+				}
+
+				.sign {
+					z-index: 200;
+					position: absolute;
+					right: -12rpx;
+					top: 80rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 120rpx;
+					height: 60rpx;
+					background: linear-gradient(90deg, rgba(255, 225, 87, 1) 0%, rgba(238, 193, 15, 1) 100%);
+					border-radius: 29rpx 4rpx 4rpx 29rpx;
+					color: #282828;
+					font-size: 28rpx;
+					font-weight: bold;
+				}
+			}
+
+			.order-wrapper {
+				background: #fff;
+				margin: 0 30rpx;
+				border-radius: 16rpx;
+				position: relative;
+
+				.order-hd {
+					justify-content: space-between;
+					padding: 30rpx 20rpx 10rpx;
+					margin-top: 25rpx;
+					font-size: 30rpx;
+					color: #282828;
+
+					.left {
+						font-weight: bold;
+					}
+
+					.right {
+						align-items: center;
+						color: #666666;
+						font-size: 26rpx;
+
+						.icon-xiangyou {
+							margin-left: 5rpx;
+							margin-top: 6rpx;
+							font-size: 26rpx;
+						}
+					}
+				}
+
+				.order-bd {
+					display: flex;
+					padding: 0 0;
+
+					.order-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						width: 20%;
+						height: 140rpx;
+
+						.pic {
+							position: relative;
+							text-align: center;
+
+							.iconfont {
+								font-size: 48rpx;
+								color: var(--view-theme);
+							}
+
+							image {
+								width: 58rpx;
+								height: 48rpx;
+							}
+						}
+
+						.txt {
+							margin-top: 6rpx;
+							font-size: 26rpx;
+							color: #454545;
+						}
+					}
+				}
+			}
+		}
+
+		.slider-wrapper {
+			margin: 20rpx 30rpx;
+			height: 130rpx;
+
+			swiper,
+			swiper-item {
+				height: 100%;
+			}
+
+			image {
+				width: 100%;
+				height: 130rpx;
+				border-radius: 16rpx;
+			}
+		}
+
+		.user-menus {
+			background-color: #fff;
+			margin: 0 30rpx;
+			border-radius: 16rpx;
+
+			.menu-title {
+				padding: 30rpx 30rpx 40rpx;
+				font-size: 30rpx;
+				color: #282828;
+				font-weight: bold;
+			}
+
+			.list-box {
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0;
+			}
+
+			.item {
+				position: relative;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				flex-direction: column;
+				width: 25%;
+				margin-bottom: 47rpx;
+				font-size: 26rpx;
+				color: #333333;
+
+				image {
+					width: 52rpx;
+					height: 52rpx;
+					margin-bottom: 18rpx;
+				}
+
+
+				&:last-child::before {
+					display: none;
+				}
+			}
+
+			button {
+				font-size: 28rpx;
+			}
+		}
+
+		.phone {
+			color: #fff;
+			background-color: #CCC;
+			border-radius: 15px;
+			width: max-content;
+			padding: 0 10px;
+		}
+
+		.order-status-num {
+			min-width: 12rpx;
+			background-color: #fff;
+			color: var(--view-theme);
+			border-radius: 15px;
+			position: absolute;
+			right: -14rpx;
+			top: -15rpx;
+			font-size: 20rpx;
+			padding: 0 8rpx;
+			border: 1px solid var(--view-theme);
+		}
+
+		.support {
+			width: 219rpx;
+			height: 74rpx;
+			margin: 54rpx auto;
+			display: block;
+		}
+
+		.copyRightImg {
+			width: 219rpx;
+			height: 74rpx;
+			margin: 16rpx auto;
+			display: block;
+		}
+
+		.copy_right {
+			text-align: center;
+			color: #ccc;
+			font-size: 22rpx;
+			margin-top: 40rpx;
+
+			.copyRightText {
+				margin-top: 0rpx;
+				color: #ccc;
+				font-size: 20rpx;
+				margin-bottom: 20rpx;
+			}
+		}
+	}
+
+	.card-vip {
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		width: 690rpx;
+		height: 125rpx;
+		margin: -72rpx auto 0;
+		background: url('~@/static/images/user_vip.png');
+		background-size: cover;
+		padding: 28rpx 30rpx 0 92rpx;
+
+		&.on {
+			.left-box {
+				color: #fff;
+			}
+
+			.btn {
+				color: #fff;
+			}
+
+			.iconfont {
+				color: #fff;
+			}
+		}
+
+		.left-box {
+			font-size: 28rpx;
+			color: #AE5A2A;
+
+			.big {
+				font-size: 28rpx;
+			}
+
+			.small {
+				opacity: 0.8;
+			}
+		}
+
+		.btn {
+			color: #AE5A2A;
+			font-weight: 400;
+			font-size: 26rpx;
+		}
+
+		.iconfont {
+			font-size: 20rpx;
+			margin: 4rpx 0 0 4rpx;
+			color: #AE5A2A;
+		}
+	}
+
+	.setting {
+		margin-top: 15rpx;
+		margin-left: 15rpx;
+		color: #fff;
+
+		.iconfont {
+			font-size: 40rpx;
+		}
+	}
+
+	.new-users {
+		padding-bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>

pages/users/user_money/index.vue

@@ -52,12 +52,12 @@
 						<view class='iconfont icon-s-chongzhijilu'></view>
 						<view>充值记录</view>
 					</navigator>
-					<navigator class='item' hover-class='none' url='/pages/users/user_integral/index'>
+					<!-- <navigator class='item' hover-class='none' url='/pages/users/user_integral/index'>
 						<view class='iconfont icon-jifenzhongxin'></view>
 						<view>积分中心</view>
-					</navigator>
+					</navigator> -->
 				</view>
-				<view class='advert acea-row row-between-wrapper'>
+				<!-- <view class='advert acea-row row-between-wrapper'>
 					<navigator class='item acea-row row-between-wrapper' hover-class='none'
 						url='/pages/users/user_sgin/index'>
 						<view class='text'>
@@ -78,8 +78,8 @@
 							<image src='../static/money.png'></image>
 						</view>
 					</navigator>
-				</view>
-				<view class='list'>
+				</view> -->
+				<!-- <view class='list'>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='picTxt acea-row row-between-wrapper'>
 							<view class='iconfont icon-hebingxingzhuang'></view>
@@ -116,7 +116,7 @@
 							v-if="activity.is_bargin">立即参与</navigator>
 						<view class='bnt acea-row row-center-wrapper end' v-else>已结束</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			<recommend :hostProduct="hostProduct"></recommend>
 		</view>

pages/users/wechat_login/index.vue

@@ -14,7 +14,7 @@
 		<!-- #endif -->
 		<view class="wechat_login">
 			<view class="img">
-				<image src="../static/wechat_login.png" mode="widthFix"></image>
+				<image :src="logoUrl" mode="widthFix"></image>
 			</view>
 			<view class="btn-wrapper">
 				<!-- #ifdef H5 -->

static/html/pc.html

@@ -4,7 +4,7 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-		<title>crmeb-PC端</title>
+		<title>太极券-PC端</title>
 		<meta name="Copyright" content="helang">
 		<link rel="shortcut icon" type="image/png" href="">
 		<meta name="keywords" content="">