diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..95cfff78
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,24 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+build.sh
+.idea
+unpackage
\ No newline at end of file
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 00000000..501e01c8
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+            "type": "uniCloud",
+            "default": {
+                "launchtype": "remote"
+            }
+        }
+    ]
+}
diff --git a/App.vue b/App.vue
index bd076f53..8497b2a6 100644
--- a/App.vue
+++ b/App.vue
@@ -1,13 +1,8 @@
-<!-- <template>
-	<view>
-		<iframe ref="geoPage" width="0" height="0" frameborder="0" style="display:none;"
-			 scrolling="no" src="https://java.crmeb.net">
-		</iframe>
-	</view>
-</template> -->
 <script>
 	import { checkLogin } from "./libs/login";
 	import { HTTP_REQUEST_URL } from './config/app';
+    import Auth from './libs/wechat.js';
+	import Routine from './libs/routine.js';
 
 	export default {
 		globalData: {
@@ -28,16 +23,16 @@
 			      switch (option.scene) {
 			        //扫描小程序码
 			        case 1047:
-					  let val = that.$util.getUrlParams(decodeURIComponent(option.query.scene));
-			          that.globalData.code = val.pid;
+					//  let val = that.$util.getUrlParams(decodeURIComponent(option.query.scene));
+			          that.globalData.spid = option.query.scene;
 			          break;
 			        //长按图片识别小程序码
 			        case 1048:
-			          that.globalData.code = option.query.scene;
+			          that.globalData.spid = option.query.scene;
 			          break;
 			        //手机相册选取小程序码
 			        case 1049:
-			          that.globalData.code = option.query.scene;
+			          that.globalData.spid = option.query.scene;
 			          break;
 			        //直接进入小程序
 			        case 1001:
@@ -52,9 +47,100 @@
 					that.globalData.navHeight = res.statusBarHeight * (750 / res.windowWidth) + 91;
 			    }
 			});
+
+			// #ifdef H5
+			let snsapiBase = 'snsapi_base';
+			let urlData = location.pathname + location.search;
+			if (!that.$store.getters.isLogin && Auth.isWeixin()) {
+				const { code, state, scope } = option.query;
+				if (code && location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
+					// 存储静默授权code
+					uni.setStorageSync('snsapiCode', code);
+					let spread = that.globalData.spid ? that.globalData.spid : 0;
+					Auth.auth(code, that.$Cache.get('spread'))
+						.then(res => {
+							uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query.back_url)));
+							if (res.type === 'register') {
+								this.$Cache.set('snsapiKey', res.key);
+							}
+							if(res.type === 'login'){
+								// let time = res.data.expires_time - this.$Cache.time();
+								this.$store.commit('LOGIN', {
+									token: res.token,
+									// time: time
+								});
+								// this.$store.commit('SETUID', res.data.userInfo.uid);
+								// this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
+								//location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
+							}
+						})
+						.catch(error => {
+							this.$util.Tips({
+								title: error
+							});
+						});
+				} else {
+					if (!this.$Cache.has('snsapiKey')) {
+						console.log('app.vue页面中',location.pathname.indexOf('/pages/users/wechat_login/index') === -1)
+						//Auth.oAuth(snsapiBase, urlData);
+						if (location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
+							Auth.oAuth(snsapiBase, urlData);
+						}
+					}
+				}
+			} else {
+				if (option.query.back_url) {
+					location.replace(uni.getStorageSync('snRouter'));
+				}
+			}
+			// #endif
+
+			// #ifdef MP
+			// 小程序静默授权
+			if (!this.$store.getters.isLogin) {
+				let spread = that.globalData.spid ? that.globalData.spid : 0;
+				Routine.getCode()
+					.then(code => {
+						Routine.authUserInfo(code,{'spread_spid': spread}).then(res => {
+								that.$store.commit('AuthorizeType', res.data.type);
+							})
+					})
+					.catch(res => {
+						uni.hideLoading();
+					});
+			}
+			// #endif
+
 		},
 		mounted() {
 		},
+		methods: {
+			// 小程序静默授权
+			silenceAuth(code) {
+				let that = this;
+				let spread = that.globalData.spid ? that.globalData.spid : 0;
+				silenceAuth({
+					code: code,
+					spread_spid: spread,
+					spread_code: that.globalData.code
+				})
+					.then(res => {
+						if (res.data.token !== undefined && res.data.token) {
+							uni.hideLoading();
+							let time = res.data.expires_time - this.$Cache.time();
+							that.$store.commit('LOGIN', {
+								token: res.data.token,
+								time: time
+							});
+							that.$store.commit('SETUID', res.data.userInfo.uid);
+							that.$store.commit('UPDATE_USERINFO', res.data.userInfo);
+						}
+					})
+					.catch(res => {
+						console.log(res);
+					});
+			}
+		},
 		onShow: function() {
 		           // #ifdef H5
 		           uni.getSystemInfo({
diff --git a/api/api.js b/api/api.js
index cd5b4b59..7f9e3d42 100644
--- a/api/api.js
+++ b/api/api.js
@@ -171,11 +171,19 @@ export function switchH5Login() {
 // #endif
 
 /**
- * 绑定手机号
+ * 换绑手机号
  * 
 */
 export function bindingPhone(data){
-  return request.post('binding',data);
+  return request.post('update/binding',data);
+}
+
+/**
+ * 换绑手机号校验
+ * 
+*/
+export function bindingVerify(data){
+  return request.post('update/binding/verify',data);
 }
 
 /**
diff --git a/api/public.js b/api/public.js
index fd82616c..8cafef0b 100644
--- a/api/public.js
+++ b/api/public.js
@@ -1,6 +1,9 @@
 import request from "@/utils/request.js";
 import wechat from "@/libs/wechat.js";
-
+import {
+	toLogin,
+	checkLogin
+} from '../libs/login';
 /**
  * 获取微信公众号js配置
  * @returns {*}
@@ -84,4 +87,25 @@ export function copyWords() {
  */
 export function kefuConfig() {
   return request.get("config", {}, { noAuth: true });
+}
+
+/**
+ * 微信（公众号，小程序）绑定手机号
+ * @param {Object} data
+ */
+export function getUserPhone(data){
+	return request.post('wechat/register/binding/phone',data,{noAuth : true});
+}
+
+/**
+ * 静默授权
+ * @param {Object} data
+ */
+export function silenceAuth(data) {
+	//#ifdef MP
+  return request.get("wechat/authorize/program/login", data, { noAuth : true });
+  //#endif
+  //#ifdef H5
+  return request.get("wechat/authorize/login", data, { noAuth : true });
+  //#endif
 }
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index c5966f66..6e42b90a 100644
--- a/api/user.js
+++ b/api/user.js
@@ -365,7 +365,7 @@ export function getChatRecord(to_uid, data) {
  */
 export function spread(puid)
 {
-	return request.post("user/spread",{puid:puid});
+	return request.get("user/bindSpread?spreadPid=" + puid);
 }
 
 /**
diff --git a/components/Authorize.vue b/components/Authorize.vue
index 682966c5..2a1547ac 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -112,7 +112,7 @@
 					return;
 				}
 				getLogo().then(res=>{
-					that.logoUrl = res.data.logo_url
+					that.logoUrl = res.data.logoUrl
 					Cache.set(LOGO_URL,that.logoUrl);
 				})
 			},
diff --git a/components/countDown/index.vue b/components/countDown/index.vue
index 7d035fea..5636aa04 100644
--- a/components/countDown/index.vue
+++ b/components/countDown/index.vue
@@ -3,11 +3,11 @@
 		<text class="red" v-if="tipText">{{ tipText }}</text>
 		<text class="styleAll" v-if="isDay === true">{{ day }}</text>
 		<text class="timeTxt red" v-if="dayText">{{ dayText }}</text>
-		<text class="styleAll">{{ hour }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'>{{ hour }}</text>
 		<text class="timeTxt red" v-if="hourText">{{ hourText }}</text>
-		<text class="styleAll">{{ minute }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'>{{ minute }}</text>
 		<text class="timeTxt red" v-if="minuteText">{{ minuteText }}</text>
-		<text class="styleAll">{{ second }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'>{{ second }}</text>
 		<text class="timeTxt red" v-if="secondText">{{ secondText }}</text>
 	</view>
 </template>
@@ -48,6 +48,10 @@
 			isDay: {
 				type: Boolean,
 				default: true
+			},
+			isCol: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data: function() {
@@ -68,7 +72,7 @@
 
 				function runTime() {
 					//时间函数
-					let intDiff = that.datatime - Date.parse(new Date())/1000; //获取数据中的时间戳的时间差；
+					let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
 					let day = 0,
 						hour = 0,
 						minute = 0,
@@ -109,12 +113,24 @@
 </script>
 
 <style>
-	.time{
+	.time {
 		display: flex;
 		justify-content: center;
-	} 
-	.red{
+	}
+
+	.red {
 		color: #fc4141;
 		margin: 0 4rpx;
 	}
+
+	.timeCol {
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align:center;
+		border-radius: 6px;
+		background: #fff;
+		font-size: 24rpx;
+		color: #E93323;
+	}
 </style>
diff --git a/components/couponListWindow/index.vue b/components/couponListWindow/index.vue
index 0d7d3792..a7fa2cf7 100644
--- a/components/couponListWindow/index.vue
+++ b/components/couponListWindow/index.vue
@@ -5,7 +5,7 @@
 		   <view class='coupon-list' v-if="coupon.list.length">
 		      <view class='item acea-row row-center-wrapper' v-for="(item,index) in coupon.list" @click="getCouponUser(index,item.id)" :key='index'>
 		        <view class='money acea-row row-column row-center-wrapper' :class='item.isUse?"moneyGray":""'>
-					<view>￥<text class='num'>{{item.money}}</text></view>
+					<view>￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
 					<view class="pic-num">满{{item.minPrice}}元可用</view>
 				</view>
 		        <view class='text'>
diff --git a/components/couponWindow/index.vue b/components/couponWindow/index.vue
index b0428035..d30efa09 100644
--- a/components/couponWindow/index.vue
+++ b/components/couponWindow/index.vue
@@ -3,7 +3,7 @@
 		<view class='coupon-window' :class='window==true?"on":""'>
 			<view class='couponWinList'>
 				<view class='item acea-row row-between-wrapper' v-for="(item,index) in couponList" :key="index">
-					<view class='money font-color'>￥<text class='num'>{{item.money}}</text></view>
+					<view class='money font-color'>￥<text class='num'>{{ item.money?Number(item.money):'' }}</text></view>
 					<view class='text'>
 						<view class='name'>购物买{{item.minPrice}}减{{item.money}}</view>
 						<view v-if="item.day>0">领取后{{item.day}}天内可用</view>
diff --git a/components/login_mobile/index.vue b/components/login_mobile/index.vue
new file mode 100644
index 00000000..b78d26a6
--- /dev/null
+++ b/components/login_mobile/index.vue
@@ -0,0 +1,239 @@
+<template>
+	<view v-if="isUp">
+		<view class="mobile-bg" @click="close"></view>
+		<view class="mobile-mask animated" :class="{slideInUp:isUp}">
+			<view class="input-item">
+				<input type="text" v-model="account" placeholder="输入手机号" />
+			</view>
+			<view class="input-item">
+				<input type="text" v-model="codeNum" placeholder="输入验证码" />
+				<button class="code" :disabled="disabled" @click="code">{{text}}</button>
+			</view>
+			<view class="sub_btn" @click="loginBtn">立即登录</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	import sendVerifyCode from "@/mixins/SendVerifyCode";
+	import Routine from '@/libs/routine';
+	import {
+		loginMobile,
+		registerVerify,
+		getCodeApi,
+		getUserInfo,
+		phoneSilenceAuth,
+		phoneWxSilenceAuth
+	} from "@/api/user";
+	import { bindingPhone } from '@/api/api.js'
+	import { getUserPhone } from '@/api/public';
+	export default{
+		name:'login_mobile',
+		props:{
+			isUp:{
+				type:Boolean,
+				default:false,
+			},
+			authKey:{
+				type:String,
+				default:'',
+			}
+		},
+		data(){
+			return {
+				keyCode:'',
+				account:'',
+				codeNum:''
+			}
+		},
+		mixins: [sendVerifyCode],
+		mounted() {
+			//this.getCode();
+		},
+		methods:{
+			// 获取验证码
+			async code() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请填写手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				await registerVerify(that.account).then(res=>{
+					that.$util.Tips({title:res.msg});
+					that.sendCode();
+				}).catch(err=>{
+					return that.$util.Tips({
+						title:err
+					})
+				})
+			},
+			// 获取验证码api
+			getCode() {
+				let that = this
+				getCodeApi().then(res => {
+					that.keyCode = res.data.key;
+				}).catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+			},
+			close(){
+				this.$emit('close',false)
+			},
+			// 登录
+			loginBtn(){
+				let that = this
+				if (!that.account) return that.$util.Tips({
+					title: '请填写手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.codeNum) return that.$util.Tips({
+					title: '请填写验证码'
+				});
+				if (!/^[\w\d]+$/i.test(that.codeNum)) return that.$util.Tips({
+					title: '请输入正确的验证码'
+				});
+				uni.showLoading({ title: '正在登录中' });
+				getUserPhone({
+					captcha: that.codeNum,
+					phone: that.account,
+					spid: app.globalData.spid,
+					spread: app.globalData.code,
+					type: 'public',
+					key: this.authKey
+				}).then(res=>{
+					let time = res.data.expires_time - this.$Cache.time();
+					this.$store.commit('LOGIN', {
+						token: res.data.token,
+						time: time
+					});
+					this.getUserInfo();
+				}).catch(error=>{
+					uni.hideLoading()
+					this.$util.Tips({
+						title:error
+					})
+				})
+			},
+			// #ifdef MP
+			phoneSilenceAuth(code){
+				let self = this
+				phoneSilenceAuth({
+					code:code,
+					spid: app.globalData.spid,
+					spread: app.globalData.code,
+					phone:this.account,
+					captcha:this.codeNum
+				}).then(res=>{
+					let time = res.data.expires_time - this.$Cache.time();
+					this.$store.commit('LOGIN', {
+						token: res.data.token,
+						time: time
+					});
+					this.getUserInfo();
+				}).catch(error=>{
+					self.$util.Tips({
+						title:error
+					})
+				})
+			},
+			// #endif
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					uni.hideLoading();
+					that.userInfo = res.data
+					that.$store.commit("SETUID", res.data.uid);
+					that.$store.commit("UPDATE_USERINFO", res.data);
+					// #ifdef MP
+					that.$util.Tips({
+						title:'登录成功',
+						icon:'success'
+					},{
+						tab:3
+					})
+					that.close()
+					// #endif
+					// #ifdef H5
+					that.$emit('wechatPhone',true)
+					// #endif
+				});
+			},
+		}
+	}
+	
+</script>
+
+<style lang="stylus">
+	.mobile-bg{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,0.5);
+	}
+	.mobile-mask {
+		z-index: 20;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		padding: 67rpx 30rpx;
+		background: #fff;
+		.input-item{
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			height: 86rpx;
+			margin-bottom: 38rpx;
+			input{
+				flex: 1;
+				display: block;
+				height: 100%;
+				padding-left: 40rpx;
+				border-radius: 43rpx;
+				border: 1px solid #DCDCDC;
+			}
+			.code{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 220rpx;
+				height: 86rpx;
+				margin-left: 30rpx;
+				background: rgba(233, 51, 35, 0.05);
+				font-size: 28rpx;
+				color: #E93323;
+				border-radius: 43rpx;
+				&[disabled]{
+					background: rgba(0, 0, 0, 0.05);
+					color: #999;
+				}
+			}
+		}
+		.sub_btn{
+			width: 690rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			margin-top: 60rpx;
+			background: #E93323;
+			border-radius: 43rpx;
+			color: #fff;
+			font-size: 28rpx;
+			text-align: center;
+		}
+	}
+	.animated{
+		animation-duration:.4s
+	}
+</style>
diff --git a/components/login_mobile/routine_phone.vue b/components/login_mobile/routine_phone.vue
new file mode 100644
index 00000000..4d5b8800
--- /dev/null
+++ b/components/login_mobile/routine_phone.vue
@@ -0,0 +1,163 @@
+<template>
+	<view v-if="isPhoneBox">
+		<view class="mobile-bg" @click="close"></view>
+		<view class="mobile-mask animated" :class="{slideInUp:isUp}">
+			<view class="info-box">
+				<image :src="logoUrl"></image>
+				<view class="title">获取授权</view>
+				<view class="txt">获取微信的手机号授权</view>
+			</view>
+			<button class="sub_btn" open-type="getPhoneNumber" @getphonenumber="getphonenumber">获取微信手机号</button>
+		</view>
+	</view>
+</template>
+<script>
+	const app = getApp();
+	import Routine from '@/libs/routine';
+	import {
+		loginMobile,
+		registerVerify,
+		getCodeApi,
+		getUserInfo
+	} from "@/api/user";
+	import { getLogo, silenceAuth, getUserPhone } from '@/api/public';
+	export default{
+		name:'routine_phone',
+		props:{
+			isPhoneBox:{
+				type:Boolean,
+				default:false,
+			},
+			logoUrl:{
+				type:String,
+				default:'',
+			},
+			authKey:{
+				type:String,
+				default:'',
+			}
+		},
+		data(){
+			return {
+				keyCode:'',
+				account:'',
+				codeNum:'',
+				isStatus:false
+			}
+		},
+		mounted() {
+		},
+		methods:{
+			// #ifdef MP
+			// 小程序获取手机号码
+			getphonenumber(e){
+				console.log(e)
+				uni.showLoading({ title: '加载中' });
+				Routine.getCode()
+					.then(code => {
+						this.getUserPhoneNumber(e.detail.encryptedData, e.detail.iv, code);
+					})
+					.catch(error => {
+						uni.hideLoading();
+					});
+			},
+			// 小程序获取手机号码回调
+			getUserPhoneNumber(encryptedData, iv, code) {
+				getUserPhone({
+					encryptedData: encryptedData,
+					iv: iv,
+					code: code,
+					spid: app.globalData.spid,
+					spread: app.globalData.code,
+					key:this.authKey,
+					type: 'routine'
+				})
+					.then(res => {
+						let time = res.data.expires_time - this.$Cache.time();
+						this.$store.commit('LOGIN', {
+							token: res.data.token,
+							time: time
+						});
+						this.getUserInfo();
+					})
+					.catch(res => {
+						console.log(res);
+						uni.hideLoading();
+					});
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					uni.hideLoading();
+					that.userInfo = res.data
+					that.$store.commit("SETUID", res.data.uid);
+					that.$store.commit("UPDATE_USERINFO", res.data);
+					that.isStatus = true
+					this.close()
+				});
+			},
+			// #endif
+			close(){
+				this.$emit('close',{isStatus:this.isStatus})
+			}
+		}
+	}
+	
+</script>
+
+<style lang="scss">
+	.mobile-bg{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,0.5);
+	}
+	.mobile-mask {
+		z-index: 20;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		padding: 67rpx 30rpx;
+		background: #fff;
+		.info-box{
+			display:flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 10rpx;
+			}
+			.title{
+				margin-top: 30rpx;
+				margin-bottom: 20rpx;
+				font-size: 36rpx;
+			}
+			.txt{
+				font-size: 30rpx;
+				color: #868686;
+			}
+		}
+		.sub_btn{
+			width: 690rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			margin-top: 60rpx;
+			background: #E93323;
+			border-radius: 43rpx;
+			color: #fff;
+			font-size: 28rpx;
+			text-align: center;
+		}
+	}
+	.animated{
+		animation-duration:.4s
+	}
+</style>
diff --git a/components/tabNav.vue b/components/tabNav.vue
index 6ba2d8e2..0518488d 100644
--- a/components/tabNav.vue
+++ b/components/tabNav.vue
@@ -83,7 +83,7 @@
 					index:index
 				}
 				this.parentEmit(obj)
-				// this.$parent.currentTab = index //设置swiper的第几页
+				this.$parent.currentTab = index //设置swiper的第几页
 			},
 			// 导航子类点击
 			childTab(tabClick,index){
diff --git a/libs/login.js b/libs/login.js
index 0a47d335..3979b9a6 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -1,5 +1,6 @@
 import store from "../store";
 import Cache from '../utils/cache';
+import { Debounce } from '@/utils/validate.js'
 // #ifdef H5 || APP-PLUS
 import { isWeixin } from "../utils";
 import auth from './wechat';
@@ -10,31 +11,74 @@ import { LOGIN_STATUS, USER_INFO, EXPIRES_TIME, STATE_R_KEY} from './../config/c
 function prePage(){
 	let pages = getCurrentPages();
 	let prePage = pages[pages.length - 1];
+	// #ifndef APP-PLUS
 	return prePage.route;
+	// #endif
+	// #ifdef APP-PLUS
+	return prePage.$page.fullPath;
+	// #endif
 }
 
-export function toLogin(push, pathLogin) {
+export const toLogin = Debounce(_toLogin,800)
+
+export function _toLogin(push, pathLogin) {
 	store.commit("LOGOUT");
 	let path = prePage();
 	// #ifdef H5
-	path = location.href;
+	// path = location.href;
+	path = location.pathname + location.search;
 	// #endif
 	if(!pathLogin)
 		pathLogin = '/page/users/login/index'
 	Cache.set('login_back_url',path);
-	// #ifdef H5 || APP-PLUS
+	// #ifdef H5
 	if (isWeixin()) {
-		auth.oAuth();
-	} else {
-		if (path !== pathLogin) {
-		 push ? uni.navigateTo({
-		 	url:'/pages/users/login/index'
-		 }) : uni.reLaunch({
-		 	url: '/pages/users/login/index'
-		 });
+		// auth.oAuth();
+		let urlData = location.pathname + location.search
+		if (urlData.indexOf('?') !== -1) {
+			urlData += '&go_longin=1';
+		} else {
+			urlData += '?go_longin=1';
 		}
+		console.log('ppppp',Cache.has('snsapiKey'))
+		if (Cache.has('snsapiKey')) {
+			uni.navigateTo({
+				url: '/pages/users/wechat_login/index',
+			});
+		} 
+		// if (!Cache.has('snsapiKey')) {
+			
+		// 	auth.oAuth('snsapi_base', urlData);
+		// } else {
+		// 	uni.navigateTo({
+		// 		url: '/pages/users/wechat_login/index',
+		// 	});
+		// }
+	} else {
+		uni.navigateTo({
+			url: '/pages/users/login/index'
+		})
+		// if (path !== pathLogin) {
+		//  push ? uni.navigateTo({
+		//  	url:'/pages/users/login/index'
+		//  }) : uni.reLaunch({
+		//  	url: '/pages/users/login/index'
+		//  });
+		// }
 	}
 	// #endif
+	
+	// #ifdef MP
+	uni.navigateTo({
+		url: '/pages/users/wechat_login/index'
+	})
+	// #endif
+	
+	// #ifdef APP-PLUS
+	uni.navigateTo({
+		url: '/pages/users/login/index'
+	})
+	// #endif
 }
 
 
diff --git a/libs/routine.js b/libs/routine.js
index 6845f375..17a1b36a 100644
--- a/libs/routine.js
+++ b/libs/routine.js
@@ -3,7 +3,6 @@ import { checkLogin } from './login';
 import { login } from '../api/public';
 import Cache from '../utils/cache';
 import { STATE_R_KEY, USER_INFO, EXPIRES_TIME, LOGIN_STATUS} from './../config/cache';
-
 class Routine 
 {
 	
@@ -65,9 +64,6 @@ class Routine
 	async getCode(){
 		let provider = await this.getProvider();
 		return new Promise((resolve,reject)=>{
-			if(Cache.has(STATE_R_KEY)){
-				return resolve(Cache.get(STATE_R_KEY));
-			}
 			uni.login({
 				provider:provider,
 				success(res) {
@@ -122,14 +118,18 @@ class Routine
 	
 	authUserInfo(code,data)
 	{
+		console.log('code:',code);
+		console.log('data:',data);
 		return new Promise((resolve, reject)=>{
 			login(code,data).then(res=>{
-				// let time = res.data.expiresTime - Cache.time();
-				store.commit('UPDATE_USERINFO', res.data.user);
-				store.commit('LOGIN', {token:res.data.token});
-				store.commit('SETUID', res.data.user.uid);
-				// Cache.set(EXPIRES_TIME,res.data.expiresTime,time);
-				Cache.set(USER_INFO,res.data.user);
+				if(res.data.type==='login'){
+					// let time = res.data.expiresTime - Cache.time();
+					store.commit('UPDATE_USERINFO', res.data.user);
+					store.commit('LOGIN', {token:res.data.token});
+					store.commit('SETUID', res.data.user.uid);
+					// Cache.set(EXPIRES_TIME,res.data.expiresTime,time);
+					Cache.set(USER_INFO,res.data.user);
+				}
 				return resolve(res);
 			}).catch(res=>{
 				return reject(res);
diff --git a/libs/wechat.js b/libs/wechat.js
index 6f31182c..9c802d11 100644
--- a/libs/wechat.js
+++ b/libs/wechat.js
@@ -153,12 +153,37 @@ class AuthWechat {
 	/**
 	 * 自动去授权
 	 */
-	oAuth() {
-		if (uni.getStorageSync(WX_AUTH) && store.state.app.token) return;
+	oAuth(snsapiBase,url) {
+		if (uni.getStorageSync(WX_AUTH) && store.state.app.token && snsapiBase == 'snsapi_base') return;
 		const {
 			code
 		} = parseQuery();
-		if (!code) return this.toAuth();
+		if (!code || code == uni.getStorageSync('snsapiCode')){
+			return this.toAuth(snsapiBase,url);
+		}else{
+			if(Cache.has('snsapiKey'))
+				return this.auth(code).catch(error=>{
+					uni.showToast({
+						title:error,
+						icon:'none'
+					})
+				})
+		}
+		// if (uni.getStorageSync(WX_AUTH) && store.state.app.token) return;
+		// const {
+		// 	code
+		// } = parseQuery();
+		// if (!code){
+		// 	return this.toAuth(snsapiBase,url);
+		// }else{
+		// 	if(Cache.has('snsapiKey'))
+		// 		return this.auth(code).catch(error=>{
+		// 			uni.showToast({
+		// 				title:error,
+		// 				icon:'none'
+		// 			})
+		// 		})
+		// }
 	}
 
 	clearAuthStatus() {
@@ -188,7 +213,7 @@ class AuthWechat {
 					Cache.clear(STATE_KEY);
 					// Cache.clear('spread');
 					loginType && Cache.clear(LOGINTYPE);
-					resolve();
+					resolve(data);
 				})
 				.catch(reject);
 		});
@@ -198,32 +223,42 @@ class AuthWechat {
 	 * 获取跳转授权后的地址
 	 * @param {Object} appId
 	 */
-	getAuthUrl(appId) {
-		const redirect_uri = encodeURIComponent(
-			`${location.origin}/pages/auth/index?back_url=` +
-			encodeURIComponent(
-				encodeURIComponent(
-					uni.getStorageSync(BACK_URL) ?
-					uni.getStorageSync(BACK_URL) :
-					location.pathname + location.search
-				)
-			)
-		);
-		uni.removeStorageSync(BACK_URL);
-		const state = encodeURIComponent(
-			("" + Math.random()).split(".")[1] + "authorizestate"
-		);
-		uni.setStorageSync(STATE_KEY, state);
-		return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
-	}
-
+	getAuthUrl(appId,snsapiBase,backUrl) {
+		let url = `${location.origin}${backUrl}`
+				if(url.indexOf('?') == -1){
+							url = url+'?'
+						}else{
+							url = url+'&'
+						}
+				const redirect_uri = encodeURIComponent(
+					`${url}scope=${snsapiBase}&back_url=` +
+					encodeURIComponent(
+						encodeURIComponent(
+							uni.getStorageSync(BACK_URL) ?
+							uni.getStorageSync(BACK_URL) :
+							location.pathname + location.search
+						)
+					)
+				);
+				uni.removeStorageSync(BACK_URL);
+				const state = encodeURIComponent(
+					("" + Math.random()).split(".")[1] + "authorizestate"
+				);
+				uni.setStorageSync(STATE_KEY, state);
+				if(snsapiBase==='snsapi_base'){
+					return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=${state}#wechat_redirect`;
+				}else{
+					return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
+				}
+    }
+	
 	/**
 	 * 跳转自动登录
 	 */
-	toAuth() {
+	toAuth(snsapiBase,backUrl) {
 		let that = this;
 		this.wechat().then(wx => {
-			location.href = this.getAuthUrl(that.initConfig.appId);
+			location.href = this.getAuthUrl(that.initConfig.appId,snsapiBase,backUrl);
 		})
 	}
 
diff --git a/main.js b/main.js
index 9ba62985..3b64b321 100644
--- a/main.js
+++ b/main.js
@@ -46,7 +46,7 @@ if (vconsole !== undefined && vconsole === md5Crmeb) {
 	let vConsole = new VConsole();
 }
 
-Auth.isWeixin() && Auth.oAuth();
+// Auth.isWeixin() && Auth.oAuth();
 
 // #endif
 
diff --git a/pages.json b/pages.json
index 5efad8e9..6a65473b 100644
--- a/pages.json
+++ b/pages.json
@@ -360,6 +360,13 @@
 					"style": {
 						"navigationBarTitleText": "商品评价"
 					}
+				},
+				{
+					"path": "wechat_login/index",
+					"style": {
+						"navigationBarTitleText": "账户登录",
+						"navigationStyle": "custom"
+					}
 				}
 		  ]
 	    },
diff --git a/pages/activity/goods_bargain/index.vue b/pages/activity/goods_bargain/index.vue
index 4fe12efb..3bb8071a 100644
--- a/pages/activity/goods_bargain/index.vue
+++ b/pages/activity/goods_bargain/index.vue
@@ -1,7 +1,9 @@
 <template>
 	<view>
 		<view class='bargain-list'>
+			<!-- #ifndef APP-PLUS -->
 			<view class='iconfont icon-xiangzuo' @tap='goBack' :style="'top:'+ (navH/2) +'rpx'" v-if="returnShow"></view>
+			<!-- #endif -->
 			<view class='header'></view>
 			<view class='list'>
 				<block v-for="(item,index) in bargainList" :key="index">
@@ -23,7 +25,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -72,6 +74,17 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+		 isLogin:{
+			handler:function(newV,oldV){
+				if(newV){
+					this.getUserInfo();
+					this.getBargainList();
+				}
+			},
+			deep:true
+		 }
+		},
 		onLoad: function(options) {
 			var pages = getCurrentPages();
 			this.returnShow = pages.length===1?false:true;
@@ -83,13 +96,7 @@
 				this.getUserInfo();
 				this.getBargainList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue
index 25986e32..bfbdfaaa 100644
--- a/pages/activity/goods_bargain_details/index.vue
+++ b/pages/activity/goods_bargain_details/index.vue
@@ -2,7 +2,10 @@
 	<view>
 		<view :style="'height:'+systemH+'px'"></view>
 		<view class='bargain'>
+			<!-- #ifndef APP-PLUS -->
 			<view class='iconfont icon-xiangzuo' v-if='retunTop' @tap='goBack' :style="'top:'+navH+'px'"></view>
+			<!-- #endif -->
+			
 			<view class="header" :class="bargainUid != userInfo.uid ? 'on' : ''">
 				<view class='people' >
 					<!-- :style="'top:'+navH/2+'rpx'" -->
@@ -202,12 +205,26 @@
 			</view>
 			<view class='mask' catchtouchmove="true" v-show='active==true' @tap='close'></view>
 		</view>
+		<!-- 分享按钮 -->
+		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
+			<!-- #ifdef APP-PLUS -->
+			<view class="item" @click="appShare('WXSceneSession')">
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">微信好友</view>
+			</view>
+			<view class="item" @click="appShare('WXSenceTimeline')">
+				<view class="iconfont icon-pengyouquan"></view>
+				<view class="">微信朋友圈</view>
+			</view>
+			<!-- #endif -->
+		</view>
+		
 		<!-- 发送给朋友图片 -->
 		<view class="share-box" v-if="H5ShareBox">
 			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -243,6 +260,12 @@
 	import home from '@/components/home';
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import { silenceBindingSpread } from "@/utils";
+	// #ifdef APP-PLUS
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	// #endif
 	const app = getApp();
 
 	export default {
@@ -307,6 +330,17 @@
 
 		},
 		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getBargainDetails();
+						this.addShareBargain();
+					}
+				},
+				deep: true
+			}
+		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
@@ -357,13 +391,7 @@
 				// 	'&spid=' + e.detail.uid;
 				// this.$set(that, 'bargainPartake', e.detail.uid);
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 			
 
@@ -373,6 +401,39 @@
 			})
 		},
 		methods: {
+			// app分享
+			// #ifdef APP-PLUS
+			appShare(scene) {
+				let that = this
+				console.log(HTTP_REQUEST_URL)
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
+			
+				uni.share({
+					provider: "weixin",
+					scene: scene,
+					type: 0,
+					href: `${HTTP_REQUEST_URL}${curRoute}`,
+					title: that.bargainInfo.title,
+					imageUrl: that.bargainInfo.image,
+					success: function(res) {
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+						that.posters = false;
+					},
+					fail: function(err) {
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none',
+							duration: 2000
+						})
+						that.posters = false;
+					}
+				});
+			},
+			// #endif
 			openTap() {
 				this.$set(this,'couponsHidden',!this.couponsHidden);
 			},
@@ -485,6 +546,7 @@
 			},
 			currentBargainUser: function() { //当前用户砍价
 				this.$set(this, 'bargainUid', this.userInfo.uid);
+				this.page = 1;
 				this.setBargain();
 			},
 			setBargain: function() { //参与砍价
@@ -557,14 +619,6 @@
 					that.$set(that, 'bargainUserHelpList', bargainUserHelpList);
 					that.$set(that, 'limitStatus', datas.limit > len);
 					that.$set(that, 'page', that.page + 1);
-					
-					// var bargainUserHelpListNew = [];
-					// var bargainUserHelpList = that.bargainUserHelpList;
-					// var len = res.data.list.length;
-					// bargainUserHelpListNew = bargainUserHelpList.concat(res.data.list);
-					// that.$set(that, 'bargainUserHelpList', res.data.list);
-					// that.$set(that, 'limitStatus', datas.limit > len);
-					// that.$set(that, 'page', (Number(datas.page) + Number(datas.limit)));
 				});
 			},
 			getBargainUserBargainPricePoster: function() {
@@ -641,7 +695,6 @@
 			          configTimeline
 			        )
 			          .then(res => {
-			            console.log(res);
 			          })
 			          .catch(res => {
 			            if (res.is_ready) {
@@ -718,6 +771,38 @@
 	page {
 		background-color: #e93323 !important;
 	}
+	.generate-posters {
+		width: 100%;
+		height: 170rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 300;
+		transform: translate3d(0, 100%, 0);
+		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		border-top: 1rpx solid #eee;
+	}
+	
+	.generate-posters.on {
+		transform: translate3d(0, 0, 0);
+	}
+	
+	.generate-posters .item {
+		flex: 1;
+		text-align: center;
+		font-size: 30rpx;
+	}
+	
+	.generate-posters .item .iconfont {
+		font-size: 80rpx;
+		color: #5eae72;
+	}
+	
+	.generate-posters .item .iconfont.icon-haibao {
+		color: #5391f1;
+	}
+	
 	.bargain .bargainGang .open {
 		font-size: 24rpx;
 		color: #999;
@@ -797,7 +882,7 @@
 		font-size: 20rpx;
 		position: absolute;
 		width: 85%;
-		/* #ifdef MP */
+		/* #ifdef MP  || APP-PLUS */
 		height: 44px;
 		line-height: 44px;
 		/* #endif */
diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index c47e7561..5a7565a5 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -12,7 +12,13 @@
 				</view>
 			</view>
 		</view>
-		<view class='iconfont icon-xiangzuo' :style="'top:'+navH/2+'rpx'" @tap='returns'></view>
+		<!-- #ifndef APP-PLUS -->
+		<view id="home" class="home-nav acea-row row-center-wrapper iconfont icon-xiangzuo" :class="opacity>0.5?'on':''"
+		 :style="{ top: homeTop + 'rpx' }" v-if="returnShow" @tap="returns">
+		</view>
+		<!-- #endif -->
+		
+		<!-- <view class='iconfont icon-xiangzuo' :style="'top:'+navH/2+'rpx'" @tap='returns'></view> -->
 		<!-- 详情 -->
 		<view class='product-con'>
 			<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style="'height:'+height+'px;'"
@@ -169,6 +175,16 @@
 				<view class="">发送给朋友</view>
 			</button>
 			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="item" @click="appShare('WXSceneSession')">
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">微信好友</view>
+			</view>
+			<view class="item" @click="appShare('WXSenceTimeline')">
+				<view class="iconfont icon-pengyouquan"></view>
+				<view class="">微信朋友圈</view>
+			</view>
+			<!-- #endif -->
 			<button class="item" hover-class='none' @tap="goPoster">
 				<view class="iconfont icon-haibao"></view>
 				<view class="">生成海报</view>
@@ -198,7 +214,7 @@
 			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 		<product-window :attr='attribute' :limitNum='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
@@ -332,11 +348,38 @@
 				imgTop:'',
 				qrcodeSize: 600,
 				H5ShareBox: false, //公众号分享图片
-				onceNum: 0 //一次可以购买几个
+				onceNum: 0, //一次可以购买几个
+				errT: '',
+				returnShow: true
 			}
 		},
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.downloadFilePromotionCode();
+						this.combinationDetail();
+					}
+				},
+				deep: true
+			},
+		},
 		onLoad(options) {
 			let that = this
+			var pages = getCurrentPages();
+			that.returnShow = pages.length === 1 ? false : true;
+			this.$nextTick(() => {
+				// #ifdef MP
+				const menuButton = uni.getMenuButtonBoundingClientRect();
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('#home')
+					.boundingClientRect(data => {
+						this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
+					})
+					.exec();
+				// #endif
+			});
 			// #ifdef MP
 			this.navH = app.globalData.navHeight;
 			// #endif
@@ -378,12 +421,8 @@
 					try {
 						uni.setStorageSync('comGoodsId', options.id);
 					} catch (e) {}
-					toLogin();
 					// #endif 
-					// #ifdef MP
-					this.isAuto = true;
-					this.$set(this, 'isShowAuth', true)
-					// #endif
+					toLogin();
 				}
 			} else {
 				try {
@@ -403,6 +442,40 @@
 			};
 		},
 		methods: {
+			// app分享
+			// #ifdef APP-PLUS
+			appShare(scene) {
+				let that = this
+				console.log(HTTP_REQUEST_URL)
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
+				uni.share({
+					provider: "weixin",
+					scene: scene,
+					type: 0,
+					href: `${HTTP_REQUEST_URL}${curRoute}`,
+					title: that.storeInfo.title,
+					summary: that.storeInfo.info,
+					imageUrl: that.storeInfo.image,
+					success: function(res) {
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+						that.posters = false;
+					},
+					fail: function(err) {
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none',
+							duration: 2000
+						})
+						that.posters = false;
+					}
+				});
+			},
+			// #endif
+			
 			getProductReplyCount: function() {
 				let that = this;
 				getReplyConfig(that.storeInfo.productId).then(res => {
@@ -474,7 +547,6 @@
 					that.attribute.productSelect.num = res.data.storeInfo.onceNum;
 					that.pink = res.data.pink || [];
 					that.pindAll = res.data.pindAll || [];
-				//	that.reply = res.data.reply ? res.data.reply : [];
 					that.itemNew = res.data.pinkOkList || [];
 					that.pinkOkSum = res.data.pinkOkSum;
 					that.attribute.productAttr = res.data.productAttr || [];
@@ -487,6 +559,10 @@
 					that.make();
 					that.getImageBase64(that.storeImage);
 					// #endif
+					// #ifdef APP-PLUS
+					that.downloadFilestoreImage();
+					that.downloadFileAppCode();
+					// #endif
 					// #ifdef MP
 					that.getQrcode();
 					that.imgTop = res.data.storeInfo.image;
@@ -786,13 +862,7 @@
 			 */
 			listenerActionSheet: function() {
 				if (this.isLogin == false) {
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
 				} else {
 					// #ifdef H5
 					if (this.$wechat.isWeixin() === true) {
@@ -834,6 +904,24 @@
 					},
 				});
 			},
+			
+			// app获取二维码
+			downloadFileAppCode() {
+				let that = this;
+				uni.downloadFile({
+					url: that.setDomain(that.storeInfo.code_base),
+					success: function(res) {
+						that.PromotionCode = res.tempFilePath;
+					},
+					fail: function() {
+						return that.$util.Tips({
+							title: ''
+						});
+						that.PromotionCode = '';
+					},
+				});
+			},
+			
 			/**
 			 * 获取产品分销二维码
 			 * @param function successFn 下载完成回调
@@ -876,11 +964,22 @@
 			 */
 			goPoster: function() {
 				let that = this;
+				uni.showLoading({
+					title: '海报生成中',
+					mask: true
+				});
 				that.posters = false;
 				let arrImagesUrl = '';
 				let arrImagesUrlTop = '';
+				if(!that.PromotionCode){
+					uni.hideLoading();
+					that.$util.Tips({
+						title: that.errT
+					});
+					return 
+				} 
 				uni.downloadFile({
-					url: that.imgTop, //仅为示例，并非真实的资源
+					url: that.imgTop, 
 					success: (res) => {
 						arrImagesUrlTop = res.tempFilePath;
 						let arrImages = [that.posterbackgd, arrImagesUrlTop, that.PromotionCode];
@@ -890,8 +989,9 @@
 							that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice, function(tempFilePath) {
 								that.posterImage = tempFilePath;
 								that.canvasStatus = true;
+								uni.hideLoading();
 							});	
-						}, 200);
+						}, 500);
 					}
 				});	
 			},
@@ -907,7 +1007,9 @@
 					base64src(res.data.code, res => {
 						that.PromotionCode = res;
 					});
-				})
+				}).catch(err => {
+					that.errT = err;
+				});
 			},
 			// 生成二维码；
 			make() {
@@ -1466,4 +1568,52 @@
 	.pro-wrapper .iconn.iconn1 {
 		background-image: url('data:image/png;base64,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');
 	}
+	
+	.home-nav {
+		/* #ifdef H5 */
+		top: 20rpx !important;
+		/* #endif */
+	}
+	
+	.home-nav {
+		color: #fff;
+		position: fixed;
+		font-size: 33rpx;
+		width: 56rpx;
+		height: 56rpx;
+		z-index: 99;
+		left: 33rpx;
+		background: rgba(190, 190, 190, 0.5);
+		border-radius: 50%;
+	
+		&.on {
+			background: unset;
+			color: #333;
+		}
+	}
+	
+	.home-nav .line {
+		width: 1rpx;
+		height: 24rpx;
+		background: rgba(255, 255, 255, 0.25);
+	}
+	
+	.home-nav .icon-xiangzuo {
+		width: auto;
+		font-size: 28rpx;
+	}
+	
+	.share-box {
+		z-index: 1000;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.share-box image {
+		width: 100%;
+		height: 100%;
+	}
 </style>
diff --git a/pages/activity/goods_combination_status/index.vue b/pages/activity/goods_combination_status/index.vue
index 39dda065..0dd5aa4a 100644
--- a/pages/activity/goods_combination_status/index.vue
+++ b/pages/activity/goods_combination_status/index.vue
@@ -39,22 +39,24 @@
 			</div>
 			<!-- #ifdef H5 -->
 			<div v-if="userBool === 1 && isOk == 0 && pinkBool === 0">
-				<div class="teamBnt bg-color-red" v-if="$wechat.isWeixin()" @click="H5ShareBox = true">邀请好友参团</div>
-				<div class="teamBnt bg-color-red" v-else @click="goPoster">邀请好友参团</div>
+				<div class="teamBnt bg-color-red" v-if="$wechat.isWeixin() && pinkT.stopTime>timestamp" @click="H5ShareBox = true">邀请好友参团</div>
+				<div class="teamBnt bg-color-red" v-if='!$wechat.isWeixin() && pinkT.stopTime>timestamp' @click="goPoster">邀请好友参团</div>
 			</div>
 			<!-- <div class="teamBnt bg-color-red" v-if="userBool === 1 && isOk == 0 && pinkBool === 0" @click="goPoster">
 				邀请好友参团
 			</div> -->
 			<!-- #endif -->
 			<!-- #ifdef MP -->
-			<button open-type="share" class="teamBnt bg-color-red" v-if="userBool === 1 && isOk == 0 && pinkBool === 0">邀请好友参团</button>
+			<button open-type="share" class="teamBnt bg-color-red" v-if="userBool === 1 && isOk == 0 && pinkBool === 0 && pinkT.stopTime>timestamp">邀请好友参团</button>
 			<!-- #endif -->
-			<div class="teamBnt bg-color-red" v-else-if="userBool === 0 && pinkBool === 0 && count > 0" @click="pay">我要参团</div>
+			<div class="teamBnt bg-color-hui" v-if="pinkT.stopTime<timestamp && isOk == 0 && pinkBool === 0">拼团已过期</div>
+			<div class="teamBnt bg-color-red" v-else-if="userBool === 0 && pinkBool === 0 && count > 0 && pinkT.stopTime>timestamp" @click="pay">我要参团</div>
 			<div class="teamBnt bg-color-red" v-if="pinkBool === 1 || pinkBool === -1" @click="goDetail(storeCombination.id)">再次开团</div>
 			<div class="cancel" @click="getCombinationRemove" v-if="pinkBool === 0 && userBool === 1">
 				<span class="iconfont icon-guanbi3"></span>
 				取消开团
 			</div>
+			
 			<div class="lookOrder" v-if="pinkBool === 1" @click="goOrder">
 				查看订单信息
 				<span class="iconfont icon-xiangyou"></span>
@@ -93,10 +95,10 @@
 		<!-- 发送给朋友图片 -->
 		<view class="share-box" v-if="H5ShareBox"><image src="/static/images/share-info.png" @click="H5ShareBox = false"></image></view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
-		<!-- <Product-window v-on:changeFun="changeFun" :attr="attr" :limitNum='1' :iSbnt='1'></Product-window> -->
 		<home></home>
+		<!-- <Product-window v-on:changeFun="changeFun" :attr="attr" :limitNum='1' :iSbnt='1'></Product-window> -->
 	</div>
 </template>
 <script>
@@ -162,9 +164,29 @@ export default {
 			H5ShareBox: false, //公众号分享图片
 			isAuto: false, //没有授权的不会自动授权
 			isShowAuth: false, //是否隐藏授权
-			onceNum: 0 //一次可以购买几个
+			onceNum: 0 ,//一次可以购买几个,
+			timestamp: 0 // 当前时间戳
 		};
 	},
+	watch: {
+		isLogin:{
+			handler:function(newV,oldV){
+				if(newV){
+					this.getCombinationPink();
+				}
+			},
+			deep:true
+		},
+		userData:{
+			handler:function(newV,oldV){
+				if(newV){
+					this.userInfo = newV;
+					app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
+				}
+			},
+			deep:true
+		}
+	},
 	computed: mapGetters({
 		'isLogin':'isLogin',
 		'userData':'userInfo'
@@ -173,14 +195,9 @@ export default {
 		var that = this;
 		that.pinkId = options.id;
 		if (that.isLogin == false) {
-			// #ifdef H5 || APP-PLUS
 			toLogin();
-			// #endif 
-			// #ifdef MP
-			that.isAuto = true;
-			that.$set(that, 'isShowAuth', true);
-			// #endif
 		} else {
+			this.timestamp = (new Date()).getTime();
 			// #ifdef H5
 			this.getCombinationPink();
 			// #endif
@@ -196,8 +213,6 @@ export default {
 	 */
 	onShareAppMessage: function() {
 		let that = this;
-		that.close();
-		that.addShareBargain();
 		return {
 			title: '您的好友' + that.userInfo.nickname + '邀请您参团' + that.storeCombination.title,
 			path: app.globalData.openPages,
@@ -505,17 +520,13 @@ export default {
 					if (that.attr.productAttr != 0) that.DefaultSelect();
 				})
 				.catch(err => {
-					this.$util.Tips({
-						title: err
-					});
-					uni.redirectTo({
-						success(){},
-						fail() {
-							uni.navigateTo({
-								url: '/pages/index/index',
-							})
-						}
-					})
+					if(that.isLogin){
+						that.$util.Tips({
+							title: err
+						}, {
+							url: '/pages/index/index'
+						});
+					}
 				});
 		},
 		//#ifdef H5
diff --git a/pages/activity/goods_seckill/index.vue b/pages/activity/goods_seckill/index.vue
index d03ef106..52ba829b 100644
--- a/pages/activity/goods_seckill/index.vue
+++ b/pages/activity/goods_seckill/index.vue
@@ -3,22 +3,19 @@
 		<view class='flash-sale'>
 			<view class="saleBox"></view>
 			<!-- banner -->
+			<!-- <navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
+				<image :src="item.pic" class="slide-image" lazy-load></image>
+			</navigator> -->
 			<view class="header" v-if="timeList.length">
 				<swiper indicator-dots="true" autoplay="true" :circular="circular" interval="3000" duration="1500"
 				 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-					<block v-for="(item,index) in JSON.parse(timeList[active].slide)" :key="index">
+					<block v-for="(item,index) in timeList[active].slide" :key="index">
 						<swiper-item>
 							<image :src="item.sattDir" class="slide-image" lazy-load></image>
-							<!-- <navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
-								<image :src="item.pic" class="slide-image" lazy-load></image>
-							</navigator> -->
 						</swiper-item>
 					</block>
 				</swiper>
 			</view>
-			<!-- <view class='header' v-if="timeList.length>0">
-				<image :src='timeList[active].slide'></image>
-			</view> -->
 			<view class="seckillList acea-row row-between-wrapper">
 				<view class="priceTag">
 					<image src="/static/images/priceTag.png"></image>
@@ -99,7 +96,7 @@
 				loading: false,
 				loadend: false,
 				pageloading: false,
-				seckillHeader: [],
+				seckillHeader: []
 			}
 		},
 		onLoad() {
@@ -109,10 +106,12 @@
 			getSeckillConfig: function() {
 				let that = this;
 				getSeckillHeaderApi().then(res => {
+					res.data.seckillTime.map(item => {
+						item.slide = JSON.parse(item.slide)
+					})
 					that.timeList = res.data.seckillTime;
 					that.active = res.data.seckillTimeIndex;
 					if (that.timeList.length) {
-						// wxh.time(that.data.timeList[that.data.active].stop, that);
 						that.scrollLeft = (that.active - 1.37) * 100
 						setTimeout(function() {
 							that.loading = true
diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue
index 2e3dfc78..6895221a 100644
--- a/pages/activity/goods_seckill_details/index.vue
+++ b/pages/activity/goods_seckill_details/index.vue
@@ -110,7 +110,7 @@
 		<product-window :attr='attribute' :limitNum='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
 		 @attrVal="attrVal" @iptCartNum="iptCartNum"></product-window>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 		<!-- 分享按钮 -->
@@ -272,7 +272,8 @@
 				sharePacket: {
 					isState: true, //默认不显示
 				},
-				buyNum: 1
+				buyNum: 1,
+				errT: ''
 			}
 		},
 		components: {
@@ -288,6 +289,18 @@
 			// #endif
 		},
 		computed: mapGetters(['isLogin','uid','chatUrl']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getSeckillDetail();
+						this.getProductReplyList();
+						this.getProductReplyCount();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad(options) {
 			
 			let that = this
@@ -337,13 +350,7 @@
 				this.getProductReplyList();
 				this.getProductReplyCount();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.isShowAuth = true
-				// #endif
 			}
 		},
 		methods: {
@@ -828,9 +835,20 @@
 			 */
 			goPoster: function() {
 				let that = this;
+				uni.showLoading({
+					title: '海报生成中',
+					mask: true
+				});
 				that.posters = false;
 				let arrImagesUrl = '';
 				let arrImagesUrlTop = '';
+				if(!that.PromotionCode){
+					uni.hideLoading();
+					that.$util.Tips({
+						title: that.errT
+					});
+					return 
+				} 
 				uni.downloadFile({
 					url: that.imgTop, //仅为示例，并非真实的资源
 					success: (res) => {
@@ -842,10 +860,11 @@
 							that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice,function(tempFilePath) {
 								that.posterImage = tempFilePath;
 								that.canvasStatus = true;
+								uni.hideLoading();
 							});	
-						}, 200);
+						}, 500);
 					}
-				});	
+				});		
 			},
 			// 小程序二维码
 			getQrcode(){
@@ -859,7 +878,9 @@
 					base64src(res.data.code, res => {
 						that.PromotionCode = res;
 					});
-				})
+				}).catch(err => {
+					that.errT = err;
+				});
 			},
 			// 生成二维码；
 			make() {
diff --git a/pages/auth/index.vue b/pages/auth/index.vue
index d199a883..6fbf8dd5 100644
--- a/pages/auth/index.vue
+++ b/pages/auth/index.vue
@@ -34,7 +34,6 @@
 					});
 				})
 				.catch((err) => {
-					// location.replace("/");
 					console.log('auth错误='+err);
 				});
 		}
diff --git a/pages/goods_cate/goods_cate.vue b/pages/goods_cate/goods_cate.vue
index ef2ced81..59d2679a 100644
--- a/pages/goods_cate/goods_cate.vue
+++ b/pages/goods_cate/goods_cate.vue
@@ -1,5 +1,9 @@
 <template>
 	<view class='productSort copy-data'>
+		<!-- #ifdef APP-PLUS -->
+		<view class="sys-head" :style="{height:sysHeight}"></view>
+		<!-- #endif -->
+		
 		<view class='header acea-row row-center-wrapper'>
 			<view class='acea-row row-between-wrapper input'>
 				<text class='iconfont icon-sousuo'></text>
@@ -44,6 +48,7 @@
 </template>
 
 <script>
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import {
 		getCategoryList
 	} from '@/api/store.js';
@@ -58,7 +63,8 @@
 				height: 0,
 				hightArr: [],
 				toView: "",
-				tabbarH: 0
+				tabbarH: 0,
+				sysHeight: sysHeight,
 			}
 		},
 		onLoad(options) {
@@ -133,6 +139,9 @@
 </script>
 
 <style scoped lang="scss">
+	.sys-head{
+		background-color: #fff;
+	}
 	.productSort .header {
 		width: 100%;
 		height: 96rpx;
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 14ad0b78..c8157dc9 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -198,7 +198,7 @@
 		<view class="mask"  v-if="posters" @click="closePosters"></view>
 		<view class="mask"  v-if="canvasStatus"  @click="listenerActionClose"></view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<!-- 海报展示 -->
 		<view class='poster-pop' v-if="canvasStatus">
@@ -356,10 +356,29 @@
 				qrcodeSize: 600,
 				canvasStatus: false,//是否显示海报
 				imagePath:'',//海报路径
-				imgTop:''
+				imgTop:'',
+				errT: ''
 			};
 		},
 		computed: mapGetters(['isLogin', 'uid', 'chatUrl']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV == true) {
+						this.getCouponList();
+						this.getCartCount();
+						this.downloadFilePromotionCode();
+					}
+				},
+				deep: true
+			},
+			storeInfo: {
+				handler: function() {
+					this.$nextTick(() => {});
+				},
+				immediate: true
+			}
+		},
 		onLoad(options) {
 			// this.getChat(this.uid || '');
 			let that = this
@@ -885,13 +904,7 @@
 			setCollect: function() {
 				let that = this;
 				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif 
-					// #ifdef MP
-					this.isAuto = true;
-					this.$set(this, 'isShowAuth', true)
-					// #endif
 				} else {
 					if (this.storeInfo.userCollect) {
 						collectDel(this.storeInfo.id).then(res => {
@@ -917,13 +930,7 @@
 			couponTap: function() {
 				let that = this;
 				if (that.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif
-					// #ifdef MP
-					that.$set(that, 'isAuto', true);
-					that.$set(that, 'isShowAuth', true);
-					// #endif
 				} else {
 					that.getCouponList();
 					that.$set(that.coupon, 'coupon', true);
@@ -940,13 +947,7 @@
 			joinCart: function(e) {
 				//是否登录
 				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true)
-					// #endif
 				} else {
 					this.goCat();
 				}
@@ -1035,13 +1036,7 @@
 			 */
 			goBuy: function(e) {
 				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
 				} else {
 					this.goCat(true);
 				}
@@ -1056,13 +1051,7 @@
 			 */
 			listenerActionSheet: function() {
 				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
 				} else {
 					// #ifdef H5
 					if (this.$wechat.isWeixin() === true) {
@@ -1120,14 +1109,12 @@
 					path: 'pages/goods_details/index'
 				}
 				getQrcode(data).then(res=>{
-					//that.PromotionCode = res.data.code;
 					base64src(res.data.code, res => {
 						that.PromotionCode = res;
 					});
+					
 				}).catch(err => {
-					that.$util.Tips({
-						title: err
-					});
+					that.errT = err;
 				});
 			},
 			// 生成二维码；
@@ -1191,9 +1178,20 @@
 			 */
 			goPoster: function() {
 				let that = this;
+				uni.showLoading({
+					title: '海报生成中',
+					mask: true
+				});
 				that.posters = false;
 				let arrImagesUrl = '';
 				let arrImagesUrlTop = '';
+				if(!that.PromotionCode){
+					uni.hideLoading();
+					that.$util.Tips({
+						title: that.errT
+					});
+					return 
+				} 
 				uni.downloadFile({
 					url: that.imgTop, //仅为示例，并非真实的资源
 					success: (res) => {
@@ -1205,8 +1203,9 @@
 							that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice,function(tempFilePath) {
 								that.imagePath = tempFilePath;
 								that.canvasStatus = true;
+								uni.hideLoading();
 							});	
-						}, 200);
+						}, 500);
 					}
 				});
 			},
diff --git a/pages/goods_list/index.vue b/pages/goods_list/index.vue
index 0ca93bff..aa91ffb2 100644
--- a/pages/goods_list/index.vue
+++ b/pages/goods_list/index.vue
@@ -2,6 +2,7 @@
 	<view>
 		<view class='productList'>
 			<view class='search bg-color acea-row row-between-wrapper'>
+				<view class="iconfont icon-xiangzuo" @click="goback()"></view>
 				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
 					<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search" :value='where.keyword'
 					 @confirm="searchSubmit"></input>
@@ -105,6 +106,16 @@
 			this.get_host_product();
 		},
 		methods: {
+			goback(){
+				// #ifdef H5
+				return history.back();
+				// #endif
+				// #ifndef H5
+				return uni.navigateBack({
+					delta: 1,
+				})
+				// #endif
+			},
 			// 去详情页
 			godDetail(item){
 				goShopDetail(item,this.uid).then(res=>{
@@ -144,14 +155,7 @@
 			set_where: function(e) {
 				switch (e) {
 					case 1:
-						// #ifdef H5
-						return history.back();
-						// #endif
-						// #ifndef H5
-						return uni.navigateBack({
-							delta: 1,
-						})
-						// #endif
+					    return;
 						break;
 					case 2:
 						if (this.price == 0) this.price = 1;
@@ -176,11 +180,11 @@
 			//设置where条件
 			setWhere: function() {
 				if (this.price == 0) this.where.priceOrder = '';
-				else if (this.price == 1) this.where.priceOrder = 'desc';
-				else if (this.price == 2) this.where.priceOrder = 'asc';
+				else if (this.price == 1) this.where.priceOrder = 'asc';
+				else if (this.price == 2) this.where.priceOrder = 'desc';
 				if (this.stock == 0) this.where.salesOrder = '';
-				else if (this.stock == 1) this.where.salesOrder = 'desc';
-				else if (this.stock == 2) this.where.salesOrder = 'asc';
+				else if (this.stock == 1) this.where.salesOrder = 'asc';
+				else if (this.stock == 2) this.where.salesOrder = 'desc';
 				this.where.news = this.nows ? 1 : 0;
 			},
 			//查找产品
@@ -222,6 +226,9 @@
 </script>
 
 <style scoped lang="scss">
+	.iconfont{
+		color: #fff;
+	}
 	.productList .search {
 		width: 100%;
 		height: 86rpx;
@@ -234,7 +241,7 @@
 	}
 
 	.productList .search .input {
-		width: 640rpx;
+		// width: 640rpx;
 		height: 60rpx;
 		background-color: #fff;
 		border-radius: 50rpx;
@@ -243,7 +250,7 @@
 	}
 
 	.productList .search .input input {
-		width: 548rpx;
+		width: 528rpx;
 		height: 100%;
 		font-size: 26rpx;
 	}
diff --git a/pages/index/components/a_seckill.vue b/pages/index/components/a_seckill.vue
index c82e638c..d0cd809a 100644
--- a/pages/index/components/a_seckill.vue
+++ b/pages/index/components/a_seckill.vue
@@ -9,9 +9,9 @@
 				<view class="lines"></view>
 				<view class="point">{{point}} 场</view>
 				<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '" :second-text="' '"
-				 :datatime="datatime"></countDown>
+				 :datatime="datatime" :is-col="true"></countDown>
 			</view>
-			<navigator url="/pages/activity/goods_seckill/index" hover-class="none" class="more acea-row row-center-wrapper">更多<text class="iconfont icon-xiangyou"></text></navigator>
+			<navigator url="/pages/activity/goods_seckill/index" hover-class="none" class="more acea-row row-center-wrapper">GO<text class="iconfont icon-xiangyou"></text></navigator>
 		</view>
 		<view class="conter">
 			<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false">
@@ -21,10 +21,8 @@
 							<image :src="item.image"></image>
 						</view>
 						<view class="name line1">{{item.title}}</view>
-						<view class="money acea-row row-between-wrapper">
-						<!-- 	<view class="y_money acea-row row-center-wrapper line1">¥{{item.otPrice}}</view> -->
-							<view class="x_money acea-row row-center-wrapper line1">¥<text class="num">{{item.price}}</text></view>
-						</view>
+						<view class="x_money line1">¥<text class="num">{{item.price}}</text></view>
+						<view class="y_money line1">¥{{item.otPrice}}</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -67,7 +65,7 @@
 					if(res.data.seckillTime.length){
 						this.datatime = parseFloat(res.data.seckillTime[res.data.seckillTimeIndex].timeSwap);
 						let id = res.data.seckillTime[res.data.seckillTimeIndex].id;
-						this.point = res.data.seckillTime[res.data.seckillTimeIndex].time;
+						this.point = res.data.seckillTime[res.data.seckillTimeIndex].time.split(',')[0];
 						this.status = res.data.seckillTime[res.data.seckillTimeIndex].status;
 						getSeckillList(id, params).then(({data}) => {
 							data.list.forEach((item) => {
@@ -90,7 +88,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.default{
 		width: 690rpx;
 		height: 300rpx;
@@ -104,12 +102,14 @@
 		}
 	}
 	.seckill {
-		width: 690rpx;
+		width: 710rpx;
 		height: 420rpx;
-		background: linear-gradient(139deg, #E4F1FD 0%, #C4D9EC 100%);
+		background-image: url('data:image/png;base64,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'); 
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
 		border-radius: 14rpx;
 		margin: 26rpx auto 0 auto;
-		padding: 23rpx 12rpx 13rpx 12rpx;
+		padding: 23rpx 18rpx 13rpx 12rpx;
 
 		.title {
 			.pictrue {
@@ -125,14 +125,15 @@
 			.lines {
 				width: 1rpx;
 				height: 24rpx;
-				background-color: rgba(29, 176, 252, 0.6);
+				background-color: #fff;
+				opacity: 0.6;
 				margin-left: 16rpx;
 			}
 
 			.point {
 				font-size: 30rpx;
 				font-weight: bold;
-				color: #00A4F8;
+				color: #fff;
 				margin-left: 16rpx;
 			}
 
@@ -150,11 +151,12 @@
 
 			.more {
 				width: 86rpx;
-				height: 36rpx;
-				background: linear-gradient(90deg, #3BBEFF 0%, #1DB0FC 100%);
-				border-radius: 21rpx;
+				height: 40rpx;
+				background: linear-gradient(142deg, #FFE9CE 0%, #FFD6A7 100%);
+				opacity: 1;
+				border-radius: 18px;
 				font-size: 22rpx;
-				color: #fff;
+				color: #FE960F;
 				padding-left: 8rpx;
 
 				.iconfont {
@@ -166,10 +168,9 @@
 		.conter {
 			width: 666rpx;
 			height: 320rpx;
-			background-color: #fff;
 			border-radius: 12px;
 			padding: 24rpx 0 25rpx 16rpx;
-			margin-top: 26rpx;
+			margin-top: 14rpx;
 
 			.itemCon {
 				display: inline-block;
@@ -194,7 +195,23 @@
 					.name {
 						font-size: 24rpx;
 						color: #000;
-						margin-top: 16rpx;
+						margin-top: 14rpx;
+					}
+					.y_money {
+						font-size: 20rpx;
+						color: #999999;
+						text-decoration: line-through;
+					}
+					
+					.x_money {
+						color: #FD502F;
+						font-size: 28rpx;
+						height: 100%;
+						font-weight: bold;
+					    margin: 2rpx 0;
+						.num {
+							font-size: 28rpx;
+						}
 					}
 
 					.money {
@@ -204,26 +221,7 @@
 						// height: 34rpx;
 						margin-top: 14rpx;
 
-						.y_money {
-							font-size: 20rpx;
-							color: #905100;
-							text-decoration: line-through;
-							width: 75rpx;
-							height: 28rpx;
-							line-height: 28rpx;
-						}
-
-						.x_money {
-							// width: 100rpx;
-							color: #FD502F;
-							font-size: 20rpx;
-							height: 100%;
-							font-weight: bold;
-
-							.num {
-								font-size: 28rpx;
-							}
-						}
+						
 					}
 				}
 			}
diff --git a/pages/index/components/b_combination.vue b/pages/index/components/b_combination.vue
index f355c69f..1fd73e20 100644
--- a/pages/index/components/b_combination.vue
+++ b/pages/index/components/b_combination.vue
@@ -1,14 +1,14 @@
 <template>
 	<view :class="{borderShow:isBorader}">
 		<view class="combination" v-if="combinationList.length">
-			<view class="title acea-row row-between-wrapper">
-				<view class="acea-row row-middle">
+			<view class="title acea-row row-right">
+				<!-- <view class="acea-row row-middle">
 					<view class="sign">
 						<image src="../../../static/images/sign02.png"></image>
 					</view>
 					<view class="name">拼团惠<text>享超值开团价</text></view>
-				</view>
-				<navigator url="/pages/activity/goods_combination/index" hover-class="none" class="more acea-row row-center-wrapper">超值精选<text class="iconfont icon-xiangyou"></text></navigator>
+				</view> -->
+				<navigator url="/pages/activity/goods_combination/index" hover-class="none" class="more acea-row row-center-wrapper">更多<text class="iconfont icon-xiangyou"></text></navigator>
 			</view>
 			<view class="conter acea-row">
 				<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false">
@@ -18,8 +18,9 @@
 								<image :src="item.image"></image>
 							</view>
 							<view class="text lines1">
-								<text class="money">¥<text class="num">{{item.price}}</text></text>
-								<!-- <text class="y_money">¥{{item.otPrice}}</text> -->
+								<view class="name line1">{{item.title}}</view>
+								<view class="money">¥<text class="num">{{item.price}}</text></view>
+								<view class="y_money">¥{{item.otPrice}}</view>
 							</view>
 						</view>
 					</view>
@@ -81,7 +82,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.default{
 		width: 690rpx;
 		height: 300rpx;
@@ -95,12 +96,14 @@
 		}
 	}
 	.combination{
-		width: 690rpx;
+		width: 700rpx;
 		background-color: #fff;
 		border-radius: 14rpx;
 		margin: 26rpx auto 0 auto;
 		padding: 25rpx 20rpx 21rpx 20rpx;
-		
+		background-image: url(../../../static/images/pth.png);
+		background-repeat: no-repeat;
+		background-size: 100%;
 		.title {
 			.sign {
 				width: 40rpx;
@@ -127,12 +130,9 @@
 			}
 		
 			.more {
-				width: 122rpx;
 				height: 37rpx;
-				background: linear-gradient(270deg, #1DB0FC 0%, #22CAFD 100%);
-				border-radius: 21rpx;
 				font-size: 22rpx;
-				color: #fff;
+				color: #666666;
 				padding-left: 2rpx;
 		
 				.iconfont {
@@ -141,7 +141,7 @@
 			}
 		}
 		.conter{
-			margin-top: 18rpx;
+			margin-top: 28rpx;
 			.itemCon {
 				display: inline-block;
 				width: 174rpx;
@@ -161,20 +161,26 @@
 				}
 				.text{
 					margin-top: 4rpx;
-					.money{
+					.y_money {
+						font-size: 20rpx;
+						color: #999999;
+						text-decoration: line-through;
+					}
+					.name {
 						font-size: 24rpx;
+						color: #000;
+						margin-top: 14rpx;
+					}
+					.money {
 						color: #FD502F;
+						font-size: 28rpx;
+						height: 100%;
 						font-weight: bold;
-						.num{
+					    margin: 2rpx 0;
+						.num {
 							font-size: 28rpx;
 						}
 					}
-					.y_money{
-						color: #959595;
-						text-decoration: line-through;
-						font-size: 20rpx;
-						margin-left: 8rpx;
-					}
 				}
 			}
 		}
diff --git a/pages/index/components/c_bargain.vue b/pages/index/components/c_bargain.vue
index 4a1549b5..b21688f5 100644
--- a/pages/index/components/c_bargain.vue
+++ b/pages/index/components/c_bargain.vue
@@ -1,14 +1,14 @@
 <template>
 	<view :class="{borderShow:isBorader}">
 		<view class="combination" v-if="bargList.length">
-			<view class="title acea-row row-between-wrapper">
-				<view class="acea-row row-middle">
+			<view class="title acea-row row-between">
+				<view class="acea-row row-column">
 					<view class="sign">
-						<image src="../../../static/images/sign03.png"></image>
+						Hi，{{userData.nickname || '亲爱的顾客'}}！
 					</view>
-					<view class="name">砍价活动<text>呼朋唤友来砍价</text></view>
+					<view class="name"><text>你的好友正在邀请你参与砍价</text></view>
 				</view>
-				<navigator url="/pages/activity/goods_bargain/index" hover-class="none" class="more acea-row row-center-wrapper">品质好货<text class="iconfont icon-xiangyou"></text></navigator>
+				<navigator url="/pages/activity/goods_bargain/index" hover-class="none" class="more acea-row row-center-wrapper">更多<text class="iconfont icon-xiangyou"></text></navigator>
 			</view>
 			<view class="conter acea-row">
 				<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false">
@@ -18,8 +18,10 @@
 								<image :src="item.image"></image>
 							</view>
 							<view class="text lines1">
-								<text class="money">¥<text class="num">{{item.minPrice}}</text></text>
-								<text class="y_money">¥{{item.price}}</text>
+								<view class="name line1">{{item.title}}</view>
+								<view class="money">¥<text class="num">{{item.minPrice}}</text></view>
+								<view class="btn">参与砍价</view>
+								<!-- <view class="y_money">¥{{item.price}}</view> -->
 							</view>
 						</view>
 					</view>
@@ -40,7 +42,10 @@
 	import { mapGetters } from 'vuex';
 	export default {
 		name: 'c_bargain',
-		computed: mapGetters(['uid']),
+		computed: mapGetters({
+			'userData': 'userInfo',
+			'uid': 'uid'
+		}),
 		data() {
 			return {
 				bargList: [],
@@ -72,7 +77,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.default{
 		width: 690rpx;
 		height: 300rpx;
@@ -87,44 +92,37 @@
 	}
 	.combination{
 		width: 690rpx;
+		background-image: url(../../../static/images/kjbj.png);
+		background-repeat: no-repeat;
+		background-size: 100%;
 		// height: 288rpx;
 		background-color: #fff;
 		border-radius: 14rpx;
 		margin: 26rpx auto 0 auto;
-		padding: 25rpx 20rpx 21rpx 20rpx;
+		padding: 25rpx 20rpx 25rpx 20rpx;
 		
 		.title {
 			.sign {
-				width: 40rpx;
-				height: 40rpx;
-		
-				image {
-					width: 100%;
-					height: 100%;
-				}
+				font-size: 32rpx;
+				color: #E93323;
+				margin-bottom: 2rpx;
+				font-weight: bold;
+				margin-bottom: 10rpx;
 			}
 		
 			.name {
-				font-size: 32rpx;
-				color: #282828;
-				margin-left: 12rpx;
-				font-weight: bold;
-		
+				
 				text {
-					color: #797979;
-					font-size: 24rpx;
+					color: #333333;
+					font-size: 26rpx;
 					font-weight: 400;
-					margin-left: 14rpx;
 				}
 			}
 		
 			.more {
-				width: 122rpx;
 				height: 37rpx;
-				background: linear-gradient(135deg, #FF9F6C 0%, #FD502F 100%);
-				border-radius: 21rpx;
 				font-size: 22rpx;
-				color: #fff;
+				color: #666666;
 				padding-left: 2rpx;
 		
 				.iconfont {
@@ -133,7 +131,7 @@
 			}
 		}
 		.conter{
-			margin-top: 18rpx;
+			margin-top: 28rpx;
 			.itemCon {
 				display: inline-block;
 				width: 174rpx;
@@ -153,19 +151,37 @@
 				}
 				.text{
 					margin-top: 4rpx;
-					.money{
+					.y_money {
+						font-size: 20rpx;
+						color: #999999;
+						text-decoration: line-through;
+					}
+					.name {
 						font-size: 24rpx;
+						color: #000;
+						margin-top: 14rpx;
+					}
+					.money {
 						color: #FD502F;
+						font-size: 28rpx;
+						height: 100%;
 						font-weight: bold;
-						.num{
+					    margin: 2rpx 0;
+						.num {
 							font-size: 28rpx;
 						}
 					}
-					.y_money{
-						color: #959595;
-						text-decoration: line-through;
-						font-size: 20rpx;
-						margin-left: 8rpx;
+					.btn{
+						width: 174rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						text-align: center;
+						background: linear-gradient(129deg, #FF5555 0%, #FF0000 100%);
+						opacity: 1;
+						border-radius: 0px 0px 14rpx 14rpx;
+						color: #FFFFFF;
+						font-size: 26rpx;
+						margin-top: 6rpx;
 					}
 				}
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index aba83901..9d845b26 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,1820 +1,1808 @@
-<template>
-	<view class="page-index" :class="{'bgf':navIndex >0}">
-		<!-- #ifdef H5 -->
-		<view class="header">
-			<view class="serch-wrapper flex">
-				<view class="logo">
-					<image :src="logoUrl" mode=""></image>
-				</view>
-				<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text class="iconfont icon-xiazai5"></text>
-					搜索商品</navigator>
-			</view>
-			<tabNav class="tabNav" :class="{'fixed':isFixed}" :tabTitle="navTop" @changeTab='changeTab' @emChildTab='emChildTab'
-			 @childTab='childTab'></tabNav>
-		</view>
-		<!-- #endif -->
-		<!-- #ifdef MP -->
-		<view class="mp-header">
-			<view class="sys-head" view :style="{ height: statusBarHeight }"></view>
-			<view class="serch-box" view style="height: 43px;">
-				<view class="serch-wrapper flex">
-					<view class="logo">
-						<image :src="logoUrl" mode=""></image>
-					</view>
-					<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text class="iconfont icon-xiazai5"></text>
-						搜索商品</navigator>
-				</view>
-			</view>
-			<tabNav class="tabNav" :tabTitle="navTop" @changeTab='changeTab'></tabNav>
-		</view>
-		<!-- #endif -->
-		<!-- 首页展示 -->
-		<view class="page_content" :style="'margin-top:'+(marTop+30)+'px;'" v-if="navIndex == 0">
-			<!-- #ifdef MP -->
-			<view class="mp-bg"></view>
-			<!-- #endif -->
-			<!-- banner -->
-			<view class="swiper" v-if="imgUrls.length">
-				<swiper indicator-dots="true" :autoplay="true" :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 :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
-								<image :src="item.pic" class="slide-image" lazy-load></image>
-							</navigator>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<!-- menu -->
-			<view class='nav acea-row' v-if="menus.length">
-				<block v-for="(item,index) in menus" :key="index">
-					<navigator class='item' v-if="item.show == '1'" :url='item.url' open-type='switchTab' hover-class='none'>
-						<view class='pictrue'>
-							<image :src='item.pic'></image>
-						</view>
-						<view class="menu-txt">{{item.name}}</view>
-					</navigator>
-					<navigator class='item' v-else :url='item.url' hover-class='none'>
-						<view class='pictrue'>
-							<image :src='item.pic'></image>
-						</view>
-						<view class="menu-txt">{{item.name}}</view>
-					</navigator>
-				</block>
-			</view>
-			<!-- 直播 -->
-			<!-- #ifdef MP -->
-			<!-- <block v-if="liveList.length>0">
-				<navigator :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+liveList[0].roomid" class="live-wrapper"
-				 v-if="liveList.length==1" hover-class="none">
-					<view class="live-top" :class="liveList[0].live_status == 101?'pictrue_log_xl':liveList[0].live_status == 103?'pictrue_log_xl_gray':'pictrue_log_xl_blue'">
-						<block v-if="liveList[0].live_status == 101">
-							<image src="/static/images/live-01.png" mode=""></image>
-							<text>直播中</text>
-						</block>
-						<block v-if="liveList[0].live_status == 103">
-							<image src="/static/images/live-02.png" mode=""></image>
-							<text>已结束</text>
-						</block>
-						<block v-if="liveList[0].live_status == 102">
-							<image src="/static/images/live-03.png" mode=""></image>
-							<text>未开始</text>
-						</block>
-					</view>
-					<image :src="liveList[0].share_img"></image>
-					<view class="live-title line1">{{liveList[0].name}}</view>
-				</navigator>
-				<view class="live-wrapper mores" v-else>
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex">
-						<navigator hover-class="none" class="item" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id='+item.roomid">
-							<view class="live-top" :class="item.type == 1?'pictrue_log_xl':item.type == 2?'pictrue_log_xl_gray':'pictrue_log_xl_blue'">
-								<block v-if="item.live_status == 101">
-									<image src="/static/images/live-01.png" mode=""></image>
-									<text>直播中</text>
-								</block>
-								<block v-if="item.live_status == 103">
-									<image src="/static/images/live-02.png" mode=""></image>
-									<text>已结束</text>
-								</block>
-								<block v-if="item.live_status == 102">
-									<image src="/static/images/live-03.png" mode=""></image>
-									<text>未开始</text>
-								</block>
-							</view>
-							<image :src="item.share_img"></image>
-							<view class="live-title">{{item.name}}</view>
-						</navigator>
-					</scroll-view>
-				</view>
-			</block> -->
-			<!-- #endif -->
-			<!-- 超值爆款 -->
-			<view class="explosion">
-				<view class="hd">
-					<image src="/static/images/explosion-title.png" mode=""></image>
-					<view class="txt">美好生活由此开始</view>
-				</view>
-				<view class="bd">
-					<navigator class="item" v-for="(item,index) in explosiveMoney" :key="index" :url="'/pages/columnGoods/HotNewGoods/index?type='+item.type"
-					 hover-class='none'>
-						<view class="con-box">
-							<view class="title line1">{{item.title}}</view>
-							<view class="con line2">{{item.info}}</view>
-							<view class="go">GO！<image src="/static/images/right-icon.png" mode=""></image>
-							</view>
-						</view>
-						<image :src="item.image"></image>
-					</navigator>
-				</view>
-			</view>
-			<!-- 精品推荐 -->
-			<view class='boutique'>
-				<swiper autoplay="true" indicator-dots="true" :circular="circular" :interval="interval" :duration="duration"
-				 indicator-color="rgba(0,0,0,.4)" indicator-active-color="#fff">
-					<block v-for="(item,index) in bastBanner" :key="index">
-						<swiper-item>
-							<navigator :url='item.url' style='width:100%;height:100%;' hover-class='none'>
-								<image :src="item.pic" class="slide-image" />
-							</navigator>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<a_seckill></a_seckill>
-			<b_combination></b_combination>
-			<c_bargain></c_bargain>
-			<!-- 首页推荐 -->
-			<view class="index-product-wrapper" :class="iSshowH?'on':''">
-				<view class="nav-bd">
-					<view class="item" v-for="(item,index) in explosiveMoney" :key="index" :index="item.id" :class="{active:index == ProductNavindex}"
-					 @click="ProductNavTab(item,index)">
-						<view class="txt">{{item.title}}</view>
-						<view class="label">{{item.info}}</view>
-					</view>
-				</view>
-				<!-- 首发新品 -->
-				<view class="list-box animated" :class='tempArr.length > 0?"fadeIn on":""'>
-					<view class="item" v-for="(item,index) in tempArr" :key="index" @click="goDetail(item)">
-						<view class="pictrue">
-							<span class="pictrue_log pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
-							<span class="pictrue_log pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
-							<span class="pictrue_log pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
-							<image :src="item.image" mode=""></image>
-						</view>
-						<view class="text-info">
-							<view class="title line1">{{item.storeName}}</view>
-							<view class="old-price"><text>¥</text>{{item.otPrice}}</view>
-							<view class="price">
-								<text>￥</text>{{item.price}}
-								<view class="txt" v-if="item.checkCoupon">券</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper' v-if="goodScroll">
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-				</view>
-				<view class="mores-txt flex" v-if="!goodScroll">
-					<text>我是有底线的</text>
-				</view>
-			</view>
-		</view>
-		<!-- 分类页 -->
-		<view class="productList" v-if="navIndex>0" :style="'margin-top:'+prodeuctTop+'px'">
-			<block v-if="sortProduct.length>0">
-				<view class='list acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
-					<view class='item' :class='is_switch==true?"":"on"' hover-class='none' v-for="(item,index) in sortProduct" :key="index"
-					 @click="godDetail(item)">
-						<view class='pictrue' :class='is_switch==true?"":"on"'>
-							<image :src='item.image' :class='is_switch==true?"":"on"'></image>
-							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
-							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
-							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
-						</view>
-						<view class='text' :class='is_switch==true?"":"on"'>
-							<view class='name line1'>{{item.storeName}}</view>
-							<view class='money font-color' :class='is_switch==true?"":"on"'>￥<text class='num'>{{item.price}}</text></view>
-							<view class='vip acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
-								<view class='vip-money' v-if="item.vipPrice && item.vipPrice > 0">￥{{item.vipPrice}}
-									<image src='../../static/images/vip.png'></image>
-								</view>
-								<view>已售{{Number(item.sales) + Number(item.ficti) || 0 }}{{item.unitName}}</view>
-							</view>
-						</view>
-					</view>
-					<view class='loadingicon acea-row row-center-wrapper' v-if='sortProduct.length > 0'>
-						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-					</view>
-				</view>
-			</block>
-			<Loading :loaded="loadend" :loading="loading"></Loading>
-			<block v-if="sortProduct.length == 0">
-				<view class="noCommodity">
-					<view class='pictrue'>
-						<image src='../../static/images/noShopper.png'></image>
-					</view>
-					<recommend :hostProduct="hostProduct"></recommend>
-				</view>
-			</block>
-		 
-		</view>
-		<coupon-window :window='window' :couponList="couponList" @onColse="onColse"></coupon-window>
-		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import Auth from '@/libs/wechat';
-	import Cache from '../../utils/cache';
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	let app = getApp();
-	import {
-		getIndexData,
-		getCoupons
-	} from '@/api/api.js';
-	// #ifdef MP-WEIXIN
-	import {
-		getTemlIds
-		// getLiveList
-	} from '@/api/api.js';
-	// import {
-	// 	SUBSCRIBE_MESSAGE,
-	// 	TIPS_KEY
-	// } from '@/config/cache';
-	// #endif
-	// #ifdef H5  
-	import {
-		follow
-	} from '@/api/public.js';
-	// #endif
-	import {
-		getShare
-	} from '@/api/public.js';
-	import a_seckill from './components/a_seckill';
-	import b_combination from './components/b_combination';
-	import c_bargain from './components/c_bargain';
-	import goodList from '@/components/goodList';
-	import promotionGood from '@/components/promotionGood';
-	import couponWindow from '@/components/couponWindow';
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
-	import {
-		mapGetters
-	} from "vuex";
-	import tabNav from '@/components/tabNav.vue'
-	import countDown from '@/components/countDown';
-	import {
-		getCategoryList,
-		getProductslist,
-		getProductHot,
-		getGroomList
-	} from '@/api/store.js';
-	// import {
-	// 	setVisit
-	// } from '@/api/user.js'
-	import recommend from '@/components/recommend';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import {
-		silenceBindingSpread
-	} from '@/utils';
-	// #ifdef H5
-	import {
-		kefuConfig
-	} from "@/api/public";
-	import {
-		getWechatConfig
-	} from "@/api/public";
-	// #endif
-	import Loading from '@/components/Loading/index.vue';
-	const arrTemp = ["beforePay","afterPay","refundApply", "beforeRecharge", "createBargain","pink"];
-	export default {
-		computed: mapGetters(['isLogin', 'uid']),
-		components: {
-			tabNav,
-			goodList,
-			promotionGood,
-			couponWindow,
-			countDown,
-			a_seckill,
-			b_combination,
-			c_bargain,
-			recommend,
-			// #ifdef MP
-			authorize,
-			// #endif
-			Loading
-		},
-		data() {
-			return {
-				loaded: false,
-				loading: false,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				statusBarHeight: statusBarHeight,
-				navIndex: 0,
-				navTop: [],
-				subscribe: false,
-				followUrl: "",
-				followHid: true,
-				followCode: false,
-				logoUrl: "",
-				imgUrls: [],
-				itemNew: [],
-				menus: [],
-				bastBanner: [],
-				bastInfo: '',
-				bastList: [],
-				fastInfo: '',
-				fastList: [],
-				firstInfo: '',
-				firstList: [],
-				salesInfo: '',
-				likeInfo: [],
-				benefit: [],
-				indicatorDots: false,
-				circular: true,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
-				window: false,
-				iShidden: false,
-				navH: "",
-				newGoodsBananr: '',
-				couponList: [],
-				lovely: [],
-				liveList: [],
-				hotList: [{
-					pic: '/static/images/hot_001.png'
-				}, {
-					pic: '/static/images/hot_002.png'
-				}, {
-					pic: '/static/images/hot_003.png'
-				}],
-				ProductNavindex: 0,
-				marTop: 0,
-				childID: 0,
-				loadend: false,
-				loading: false,
-				loadTitle: '加载更多',
-				sortProduct: [],
-				where: {
-					cid: 0,
-					page: 1,
-					limit: 10,
-				},
-				is_switch: true,
-				hostProduct: [],
-				hotPage: 1,
-				hotLimit: 10,
-				hotScroll: false,
-				explosiveMoney: [],
-				prodeuctTop: 0,
-				searchH: 0,
-				isFixed: false,
-				goodType: 0, //精品推荐Type
-				goodScroll: true, //精品推荐开关
-				params: { //精品推荐分页
-					page: 1,
-					limit: 10,
-				},
-				tempArr: [], //精品推荐临时数组
-				pageInfo: '', // 精品推荐全数据
-				site_name: '', //首页title
-				iSshowH: false,
-				configApi: {} ,//分享类容配置
-				spikeList: [], // 秒杀
-				point: ''
-			}
-		},
-		onLoad() {
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					try {
-						uni.setStorageSync('user_latitude', res.latitude);
-						uni.setStorageSync('user_longitude', res.longitude);
-					} catch {}
-				}
-			});
-			let self = this
-			// #ifdef MP
-			// 获取小程序头部高度
-			this.navH = app.globalData.navHeight;
-			let info = uni.createSelectorQuery().select(".mp-header");
-			info.boundingClientRect(function(data) {
-				self.marTop = data.height
-			}).exec()
-			// #endif
-			// #ifndef MP
-			this.navH = 0;
-			// #endif
-			this.isLogin && silenceBindingSpread();
-			Promise.all([this.getAllCategory(), this.getIndexConfig()
-				// , this.setVisit()
-			]);
-			// #ifdef MP
-			this.getTemlIds()
-			// this.getLiveList()
-			// #endif
-		},
-		onShow() {
-			let self = this
-			uni.setNavigationBarTitle({
-				title: self.site_name
-			})
-		},
-		methods: {
-			// #ifdef MP
-			getTemlIds() {
-				for (var i in arrTemp) {
-				   this.getTem(arrTemp[i]);
-				}
-			},
-			getTem(data){
-				getTemlIds({type:data}).then(res => {
-					if (res.data) {
-						let arr = res.data.map((item) => {
-							return item.tempId
-						})
-						wx.setStorageSync('tempID'+ data, arr);
-					}
-				})
-			},
-			// #endif
-			// 关闭优惠券弹窗
-			onColse() {
-				this.$set(this, "window", false);
-			},
-			// 记录会员访问
-			// setVisit() {
-			// 	setVisit({
-			// 		url: '/pages/index/index'
-			// 	}).then(res => {
-			// 		console.log(res)
-			// 	})
-			// },
-			// 获取导航
-			getAllCategory: function() {
-				let that = this;
-				getCategoryList().then(res => {
-					res.data.unshift({
-						'name': '首页'
-					})
-					that.navTop = res.data;
-				})
-			},
-			// 导航分类切换
-			changeTab(e) {
-				let self = this
-				if (e.type == 'big') {
-					if (e.index == 0) {
-						this.navIndex = e.index
-					} else {
-						// #ifdef MP
-						setTimeout(res => {
-							this.navH = app.globalData.navHeight;
-							let info = uni.createSelectorQuery().select(".mp-header");
-							info.boundingClientRect(function(data) {
-								self.prodeuctTop = data.height
-							}).exec()
-						}, 300)
-						// #endif
-						// #ifdef H5
-						self.prodeuctTop = 18
-						// #endif
-						this.navIndex = e.index
-						let child = this.navTop[e.index].child && this.navTop[e.index].child != 'undefined' ? this.navTop[e.index].child :
-							[];
-						if (child.length > 0) {
-							this.where.cid = child[0].id
-						} else {
-							this.where.cid = this.navTop[e.index].id
-						}
-						this.loadend = false
-						this.loading = false
-						this.where.page = 1
-						this.sortProduct = []
-						this.get_product_list()
-					}
-				} else {
-					let child = this.navTop[e.parentIndex].child ? this.navTop[e.parentIndex].child : []
-					this.navIndex = e.parentIndex
-					this.where.cid = child[e.childIndex].id
-					this.loadend = false
-					this.loading = false
-					this.where.page = 1
-					this.sortProduct = []
-					this.get_product_list()
-				}
-			},
-			//分类产品
-			get_product_list: function(isPage) {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				// if (isPage === true) that.$set(that, 'productList', []);
-				that.loading = true;
-				that.loadTitle = '';
-				getProductslist(that.where).then(res => {
-					if (that.where.page == 1 && res.data.list.length == 0) {
-						that.hotScroll = false
-						that.hotPage = 1
-						that.hostProduct = []
-						this.get_host_product()
-					}
-					let list = res.data.list;
-					let productList = that.$util.SplitArray(list, that.sortProduct);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'sortProduct', productList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					that.loadTitle = '加载更多';
-				});
-			},
-			/**
-			 * 获取我的推荐
-			 */
-			get_host_product: function() {
-				let that = this;
-				that.loading = true;
-
-				if (that.hotScroll) return
-				getProductHot(
-					that.hotPage,
-					that.hotLimit,
-				).then(res => {
-					that.hotPage++
-					that.hotScroll = res.data.list.length < that.hotLimit
-					that.hostProduct = that.hostProduct.concat(res.data.list)
-					// that.$set(that, 'hostProduct', res.data)
-				});
-			},
-
-			// 首页数据
-			getIndexConfig: function() {
-				let that = this;
-				getIndexData().then(res => {
-					uni.setNavigationBarTitle({
-						title: '首页'
-					})
-					that.$set(that, "logoUrl", res.data.logoUrl);
-					that.$set(that, "site_name", '首页');
-					that.$set(that, "imgUrls", res.data.banner);
-					that.$set(that, "menus", res.data.menus);
-					that.lovely = res.data.lovely
-					that.$set(that, "pageInfo", res.data)
-					that.$set(that, "firstList", res.data.info.firstList);
-					that.$set(that, "bastList", res.data.info.bastList);
-					that.$set(that, "likeInfo", res.data.likeInfo);
-					that.$set(that, "benefit", res.data.benefit);
-					that.$set(that, "bastBanner", res.data.info.bastBanner);
-					that.$set(that, "couponList", res.data.couponList);
-					that.$set(that, "explosiveMoney", res.data.explosiveMoney);
-					that.goodType = res.data.explosiveMoney[0].type
-					// #ifdef H5
-					that.subscribe = res.data.subscribe;
-					// #endif
-					
-					this.getGroomList();
-					
-					this.shareApi();
-					
-					this.getcouponList();
-				})
-			},
-			getcouponList() {
-				let that = this;
-				getCoupons({
-					page: 1,
-					limit: 6
-				}).then(res => {
-					that.$set(that, "couponList", res.data);
-					// 小程序判断用户是否授权；
-					// #ifdef MP
-					uni.getSetting({
-						success(res) {
-							if (!res.authSetting['scope.userInfo']) {
-								that.window = that.couponList.length ? true : false;
-							} else {
-								that.window = false;
-								that.iShidden = true;
-							}
-						}
-					});
-					// #endif
-					// #ifndef MP
-					if (that.isLogin) {
-						that.window = false;
-					} else {
-						that.window = res.data.length ? true : false;
-					}
-					// #endif
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					});
-				});
-			},
-			shareApi: function() {
-				getShare().then(res => {
-					this.$set(this, 'configApi', res.data);
-					// #ifdef H5
-					this.setOpenShare(res.data);
-					// #endif
-				})
-			},
-			getChatUrL() {
-				kefuConfig().then(res => {
-					let data = res.data;
-					this.$store.commit("SET_CHATURL", data.yzfUrl);
-					Cache.set('chatUrl', data.yzfUrl);
-				})
-			},
-			// getMpChatUrL(){
-			// 	getWechatConfig().then(res => {
-			// 		let data = res.data;
-			// 		this.$store.commit("SET_CHATURL", data.yzfUrl);
-			// 		Cache.set('chatUrl', data.yzfUrl);
-			// 	})
-			// },
-			// setOpenShare:function(mss){
-			// 	getWechatConfig()
-			// 		.then(res => {
-			// 			let data = res.data;
-			// 			console.log('调试配置');
-			// 			console.log(data);
-			// 			WechatJSSDK.config({
-			// 				  debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-			// 				  appId: data.appId, // 必填，公众号的唯一标识
-			// 				  timestamp: data.timestamp, // 必填，生成签名的时间戳
-			// 				  nonceStr: data.nonceStr, // 必填，生成签名的随机串
-			// 				  signature: data.signature,// 必填，签名
-			// 				  jsApiList: data.jsApiList // 必填，需要使用的JS接口列表
-			// 			});
-			// 			WechatJSSDK.error(function(res){
-			// 				console.log('error')
-			// 			   console.log(res);
-			// 			});
-			// 			WechatJSSDK.ready(function () {   //需在用户可能点击分享按钮前就先调用
-			// 			  WechatJSSDK.onMenuShareAppMessage({ 
-			// 			    title: mss.title, // 分享标题
-			// 			    desc: mss.synopsis, // 分享描述
-			// 			    link: location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-			// 			    imgUrl: mss.img, // 分享图标
-			// 			    success: function (res) {
-			// 					console.log('success');
-			// 					console.log(res);
-			// 			      // 设置成功
-			// 			    },
-			// 				fail:function(err){
-			// 					console.log('err');
-			// 					console.log(err);
-			// 				}	
-			// 			  })
-			// 			}); 
-			// 		}).catch(err => {
-			// 			console.log(err);
-			// 			reject(err);
-			// 		});
-			// },
-			// 微信分享；
-			setOpenShare: function(data) {
-				let that = this;
-				if (that.$wechat.isWeixin()) {
-					let configAppMessage = {
-						desc: data.synopsis,
-						title: data.title,
-						link: location.href,
-						imgUrl: data.img
-					};
-					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage);
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 授权回调
-			onLoadFun() {
-
-			},
-			// 首发新品切换
-			ProductNavTab(item, index) {
-				this.goodType = item.type
-				this.ProductNavindex = index
-				this.tempArr = []
-				this.params.page = 1
-				this.goodScroll = true
-				let onloadH = true
-				this.getGroomList(onloadH)
-			},
-			// 首发新品详情
-			goDetail(item) {
-				if (item.activityH5 && item.activityH5.type === "2" && !this.isLogin) {
-					// #ifdef H5
-					uni.showModal({
-						title: '提示',
-						content: '您未登录，请登录！',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/users/login/index'
-								})
-							} else if (res.cancel) {}
-						}
-					})
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
-					return
-				} else {
-					goShopDetail(item, this.uid).then(res => {
-						uni.navigateTo({
-							url: `/pages/goods_details/index?id=${item.id}`
-						})
-					})
-				}
-			},
-			// 分类详情
-			godDetail(item) {
-				goShopDetail(item, this.uid).then(res => {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.id}`
-					})
-				})
-			},
-			// 直播
-			// getLiveList: function() {
-			// 	getLiveList(1, 20).then(res => {
-			// 		this.liveList = res.data
-			// 	}).catch(res => {
-
-			// 	})
-			// },
-			// 精品推荐
-			getGroomList(onloadH) {
-				this.loading = true
-				let type = this.goodType;
-				if (!this.goodScroll) return
-				if (onloadH) {
-					this.iSshowH = true
-				}
-				getGroomList(type, this.params).then(({
-					data
-				}) => {
-					this.iSshowH = false
-					this.loading = false
-					this.goodScroll = data.list.length >= this.params.limit
-					this.params.page++
-					this.tempArr = this.tempArr.concat(data.list)
-				})
-			}
-		},
-		mounted() {
-			let self = this
-			// #ifdef H5
-			self.getChatUrL();
-			// 获取H5 搜索框高度
-			let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
-			appSearchH.boundingClientRect(function(data) {
-				self.searchH = data.height
-			}).exec()
-			// #endif
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			return {
-				title: this.configApi.title,
-				imageUrl: this.configApi.img,
-				desc: this.configApi.synopsis,
-				path: '/pages/index/index'
-			};
-		},
-		// #endif
-		// 滚动到底部
-		onReachBottom() {
-
-			if (this.navIndex == 0) {
-				// 首页加载更多
-				if (this.params.page != 1) {
-					this.getGroomList();
-				}
-			} else {
-				// 分类栏目加载更多
-				if (this.sortProduct.length > 0) {
-					this.get_product_list();
-				} else {
-					this.get_host_product();
-				}
-			}
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			let self = this
-			if (e.scrollTop >= self.searchH) {
-				self.isFixed = true
-			} else {
-				self.isFixed = false
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-		/* #ifdef H5 */
-		background-color: #fff;
-		/* #endif */
-
-	}
-</style>
-<style lang="scss">
-	.page-index {
-		display: flex;
-		flex-direction: column;
-		min-height: 100%;
-		background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
-
-		// &.bgf{
-		// 	background: #fff;
-		// }
-		.header {
-			width: 100%;
-			height: 320rpx;
-			background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-
-			.serch-wrapper {
-				align-items: center;
-				padding: 20rpx 50rpx 0 53rpx;
-
-				.logo {
-					width: 118rpx;
-					height: 42rpx;
-					margin-right: 30rpx;
-				}
-
-				image {
-					width: 118rpx;
-					height: 42rpx;
-				}
-
-				.input {
-					display: flex;
-					align-items: center;
-					width: 500rpx;
-					height: 58rpx;
-					padding: 0 0 0 30rpx;
-					background: rgba(247, 247, 247, 1);
-					border: 1px solid rgba(241, 241, 241, 1);
-					border-radius: 29rpx;
-					color: #BBBBBB;
-					font-size: 28rpx;
-
-					.iconfont {
-						margin-right: 20rpx;
-					}
-				}
-			}
-
-			.tabNav {
-				padding-top: 24rpx;
-			}
-		}
-
-		/* #ifdef MP */
-		.mp-header {
-			z-index: 999;
-			position: fixed;
-			left: 0;
-			top: 0;
-			width: 100%;
-			/* #ifdef H5 */
-			padding-bottom: 20rpx;
-			/* #endif */
-			background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-
-			.serch-wrapper {
-				height: 100%;
-				align-items: center;
-				padding: 0 50rpx 0 53rpx;
-
-				image {
-					width: 118rpx;
-					height: 42rpx;
-					margin-right: 30rpx;
-				}
-
-				.input {
-					display: flex;
-					align-items: center;
-					width: 305rpx;
-					height: 58rpx;
-					padding: 0 0 0 30rpx;
-					background: rgba(247, 247, 247, 1);
-					border: 1px solid rgba(241, 241, 241, 1);
-					border-radius: 29rpx;
-					color: #BBBBBB;
-					font-size: 28rpx;
-
-					.iconfont {
-						margin-right: 20rpx;
-					}
-				}
-			}
-		}
-
-		/* #endif */
-
-		.page_content {
-			background-color: #f5f5f5;
-			/* #ifdef H5 */
-			margin-top: 20rpx !important;
-			/* #endif */
-			padding: 0 20rpx;
-
-			.swiper {
-				position: relative;
-				width: 710rpx;
-				height: 280rpx;
-				margin: 0 auto;
-				border-radius: 10rpx;
-				overflow: hidden;
-				/* #ifdef MP */
-				z-index: 10;
-
-				/* #endif */
-				swiper,
-				.swiper-item,
-				image {
-					width: 100%;
-					height: 280rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.nav {
-				padding: 0 0rpx 30rpx;
-				flex-wrap: wrap;
-
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					width: 20%;
-					margin-top: 30rpx;
-
-					image {
-						width: 82rpx;
-						height: 82rpx;
-					}
-				}
-			}
-
-			.live-wrapper {
-				position: relative;
-				width: 100%;
-				overflow: hidden;
-				border-radius: 16rpx;
-
-				image {
-					width: 100%;
-					height: 400rpx;
-				}
-
-				.live-top {
-					z-index: 20;
-					position: absolute;
-					left: 0;
-					top: 0;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					color: #fff;
-					width: 180rpx;
-					height: 54rpx;
-					border-radius: 0rpx 0px 18rpx 0px;
-
-					image {
-						width: 30rpx;
-						height: 30rpx;
-						margin-right: 10rpx;
-						/* #ifdef H5 */
-						display: block;
-						/* #endif */
-					}
-				}
-
-				.live-title {
-					position: absolute;
-					left: 0;
-					bottom: 6rpx;
-					width: 100%;
-					height: 70rpx;
-					line-height: 70rpx;
-					text-align: center;
-					font-size: 30rpx;
-					color: #fff;
-					background: rgba(0, 0, 0, .35);
-				}
-
-				&.mores {
-					width: 100%;
-
-					.item {
-						position: relative;
-						width: 320rpx;
-						display: inline-block;
-						border-radius: 16rpx;
-						overflow: hidden;
-						margin-right: 20rpx;
-
-						image {
-							width: 320rpx;
-							height: 180rpx;
-							border-radius: 16rpx;
-						}
-
-						.live-title {
-							height: 40rpx;
-							line-height: 40rpx;
-							text-align: center;
-							font-size: 22rpx;
-						}
-
-						.live-top {
-							width: 120rpx;
-							height: 36rpx;
-							font-size: 22rpx;
-
-							image {
-								width: 20rpx;
-								height: 20rpx;
-							}
-						}
-					}
-				}
-			}
-
-			.hot-img {
-				/* #ifndef H5 */
-				margin-top: 40rpx;
-
-				/* #endif */
-				swiper,
-				swiper-item image {
-					width: 100%;
-					height: 225rpx;
-				}
-			}
-
-			.explosion {
-				width: 100%;
-				height: 500rpx;
-				margin-top: 20rpx;
-				padding: 30rpx 20rpx;
-				background-image: url('~@/static/images/explosion.png');
-				background-size: 100% 100%;
-				border-radius: 13px;
-
-				.hd {
-					display: flex;
-					align-items: center;
-
-					image {
-						width: 147rpx;
-						height: 35rpx;
-						margin-right: 20rpx;
-					}
-
-					.txt {
-						width: 220rpx;
-						height: 36rpx;
-						background: linear-gradient(90deg, rgba(255, 168, 0, 1) 0%, rgba(255, 34, 15, 1) 100%);
-						border-radius: 26rpx 0px 26rpx 0px;
-						color: #fff;
-						text-align: center;
-						font-size: 22rpx;
-						box-shadow: 3px 1px 1px 1px rgba(255, 203, 199, .8);
-					}
-				}
-
-				.bd {
-					display: flex;
-					flex-wrap: wrap;
-					margin-top: 28rpx;
-
-					.item {
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						position: relative;
-						width: 325rpx;
-						height: 180rpx;
-						margin-bottom: 20rpx;
-						margin-right: 20rpx;
-						background-color: #fff;
-						border-radius: 16rpx;
-						padding: 0 20rpx;
-						box-sizing: border-box;
-
-						image {
-							width: 160rpx;
-							height: 160rpx;
-						}
-
-						.con-box {
-							display: flex;
-							flex-direction: column;
-							justify-content: center;
-							width: 120rpx;
-							height: 100%;
-
-							.title {
-								color: #282828;
-								font-size: 30rpx;
-							}
-
-							.con {
-								color: #999999;
-								font-size: 20rpx;
-							}
-
-							.go {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								margin-top: 10rpx;
-								width: 112rpx;
-								height: 36rpx;
-								border-radius: 18rpx;
-								color: #fff;
-								font-size: 26rpx;
-								font-weight: bold;
-								font-style: italic;
-
-								image {
-									width: 26rpx;
-									height: 26rpx;
-								}
-							}
-						}
-
-						&:first-child .go {
-							background: linear-gradient(90deg, rgba(75, 196, 255, 1) 0%, rgba(32, 126, 255, 1) 100%);
-						}
-
-						&:nth-child(2) .go {
-							background: linear-gradient(90deg, rgba(255, 144, 67, 1) 0%, rgba(255, 83, 29, 1) 100%);
-						}
-
-						&:nth-child(3) .go {
-							background: linear-gradient(90deg, rgba(150, 225, 135, 1) 0%, rgba(72, 206, 44, 1) 100%);
-						}
-
-						&:nth-child(4) .go {
-							background: linear-gradient(90deg, rgba(255, 197, 96, 1) 0%, rgba(255, 156, 0, 1) 100%);
-						}
-
-						&:nth-child(2n) {
-							margin-right: 0;
-						}
-					}
-				}
-			}
-
-			.spike-box {
-				margin-top: 20rpx;
-				padding: 23rpx 20rpx;
-				border-radius: 24rpx;
-				background-color: #fff;
-				overflow: hidden;
-				box-shadow: 0px 0px 16px 3px rgba(0, 0, 0, 0.04);
-
-				.hd {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
-					.left {
-						display: flex;
-						align-items: center;
-						width: 500rpx;
-
-						.icon {
-							width: 38rpx;
-							height: 38rpx;
-							margin-right: 8rpx;
-						}
-
-						.title {
-							width: 134rpx;
-							height: 33rpx;
-						}
-					}
-
-					.more {
-						font-size: 26rpx;
-						color: #999;
-
-						.iconfont {
-							margin-left: 6rpx;
-							font-size: 25rpx;
-						}
-					}
-				}
-
-				.spike-wrapper {
-					width: 100%;
-					margin-top: 27rpx;
-
-					.spike-item {
-						display: inline-block;
-						width: 222rpx;
-						margin-right: 20rpx;
-
-						.img-box {
-							position: relative;
-							height: 222rpx;
-
-							image {
-								width: 100%;
-								height: 222rpx;
-								border-radius: 16rpx;
-							}
-
-							.msg {
-								position: absolute;
-								left: 10rpx;
-								bottom: 16rpx;
-								width: 86rpx;
-								height: 30rpx;
-								background: rgba(255, 255, 255, 1);
-								border: 1px solid rgba(255, 109, 96, 1);
-								border-radius: 6rpx;
-								font-size: 20rpx;
-								color: $theme-color;
-							}
-						}
-
-
-						.info {
-							margin-top: 8rpx;
-							padding: 0 10rpx;
-
-							.name {
-								font-size: 28rpx;
-							}
-
-							.price-box {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-
-								.tips {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 28rpx;
-									height: 28rpx;
-									background-color: $theme-color;
-									color: #fff;
-									font-size: 20rpx;
-									border-radius: 2px;
-								}
-
-								.price {
-									display: flex;
-									margin-left: 10rpx;
-									color: $theme-color;
-									font-size: 28rpx;
-									font-weight: bold;
-
-									text {
-										font-size: 18rpx;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			.barg {
-				width: 100%;
-				height: 478rpx;
-				margin-top: 20rpx;
-				padding-left: 20rpx;
-				background-image: url('~@/static/images/barg002.png');
-				background-size: 100% 100%;
-
-				.title {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					padding-top: 42rpx;
-
-					image {
-						width: 463rpx;
-						height: 39rpx;
-					}
-				}
-
-				.barg-swiper {
-					margin-top: 43rpx;
-					padding-right: 20rpx;
-
-					.wrapper {
-						display: flex;
-					}
-
-					.list-box {
-						flex-shrink: 0;
-						width: 210rpx;
-						background-color: #fff;
-						border-radius: 16rpx;
-						overflow: hidden;
-						padding-bottom: 18rpx;
-						margin-right: 20rpx;
-
-						image {
-							width: 100%;
-							height: 210rpx;
-						}
-
-						.info-txt {
-							width: 100%;
-							display: flex;
-							flex-direction: column;
-							align-items: center;
-							justify-content: center;
-							padding-top: 15rpx;
-
-							.price {
-								font-weight: 700;
-								color: $theme-color;
-							}
-
-							.txt {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								width: 136rpx;
-								height: 33rpx;
-								margin-top: 10rpx;
-								background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-								border-radius: 17px;
-								font-size: 22rpx;
-								color: #fff;
-
-							}
-						}
-					}
-
-					.more-box {
-						flex-shrink: 0;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						justify-content: center;
-						width: 80rpx;
-						background-color: #fff;
-						border-radius: 16rpx;
-
-						image {
-							width: 24rpx;
-							height: 24rpx;
-							margin-top: 10rpx;
-						}
-
-						.txt {
-							display: block;
-							writing-mode: vertical-lr;
-							font-size: 26rpx;
-							line-height: 1.2;
-						}
-					}
-				}
-			}
-
-			.group-wrapper {
-				padding: 26rpx 20rpx;
-				margin-top: 20rpx;
-				background: #fff;
-				border-radius: 24rpx;
-
-				.hd {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
-					.left {
-						display: flex;
-						align-items: center;
-
-						.icon {
-							width: 38rpx;
-							height: 38rpx;
-							margin-right: 8rpx;
-						}
-
-						.title {
-							width: 134rpx;
-							height: 33rpx;
-						}
-
-						.person {
-							display: flex;
-							align-items: center;
-							margin-left: 40rpx;
-
-							.avatar-box {
-								display: flex;
-								align-items: center;
-
-								image {
-									width: 30rpx;
-									height: 30rpx;
-									border-radius: 50%;
-									margin-right: -10rpx;
-								}
-							}
-
-							.num {
-								margin-left: 18rpx;
-								font-size: 26rpx;
-								color: #999999;
-							}
-						}
-					}
-
-					.more {
-						font-size: 26rpx;
-						color: #999;
-
-						.iconfont {
-							margin-left: 6rpx;
-							font-size: 25rpx;
-						}
-					}
-				}
-
-				.group-scroll {
-					width: 100%;
-					margin-top: 25rpx;
-
-					.group-item {
-						display: inline-block;
-						width: 222rpx;
-						margin-right: 20rpx;
-						box-shadow: 0px 2px 6px 2px rgba(0, 0, 0, 0.03);
-						border-radius: 16rpx;
-
-						image {
-							width: 100%;
-							height: 222rpx;
-							border-radius: 16rpx 16rpx 0 0;
-						}
-
-						.info {
-							padding: 8rpx 13rpx;
-
-							.name {
-								font-size: 24rpx;
-							}
-
-							.price-box {
-								display: flex;
-								align-items: center;
-								margin-top: 10rpx;
-
-								.tips {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 76rpx;
-									height: 30rpx;
-									margin-right: 6rpx;
-									background: linear-gradient(90deg, rgba(255, 0, 0, .1) 0%, rgba(255, 84, 0, .1) 100%);
-									border-radius: 2px;
-									font-size: 20rpx;
-									color: $theme-color;
-								}
-
-								.price {
-									font-size: 26rpx;
-									color: $theme-color;
-									font-weight: 700;
-
-									text {
-										font-size: 20rpx;
-									}
-								}
-							}
-
-						}
-
-						.bom-btn {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 100%;
-							height: 48rpx;
-							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-							border-radius: 0px 0px 16rpx 16rpx;
-							color: #fff;
-
-						}
-					}
-				}
-			}
-
-			.boutique {
-				margin-top: 20rpx;
-
-				swiper,
-				swiper-item,
-				.slide-image {
-					width: 100%;
-					height: 240rpx;
-					border-radius: 12rpx;
-				}
-			}
-
-			.index-product-wrapper {
-				margin-top: 40rpx;
-                margin-bottom: 40rpx;
-				&.on {
-					min-height: 1500rpx;
-				}
-
-				.nav-bd {
-					display: flex;
-					align-items: center;
-
-					.item {
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						justify-content: center;
-						width: 25%;
-
-						.txt {
-							font-size: 32rpx;
-							color: #282828;
-						}
-
-						.label {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 124rpx;
-							height: 32rpx;
-							margin-top: 5rpx;
-							font-size: 24rpx;
-							color: #999;
-						}
-
-						&.active {
-							color: $theme-color;
-
-							.label {
-								background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-								border-radius: 16rpx;
-								color: #fff;
-							}
-						}
-					}
-				}
-
-				.list-box {
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: space-between;
-					margin-top: 30rpx;
-
-					.item {
-						width: 345rpx;
-						margin-bottom: 20rpx;
-						background-color: #fff;
-						border-radius: 10px;
-						overflow: hidden;
-
-						image {
-							width: 100%;
-							height: 345rpx;
-						}
-
-						.text-info {
-							padding: 10rpx 20rpx 15rpx;
-
-							.title {
-								color: #222222;
-							}
-
-							.old-price {
-								margin-top: 8rpx;
-								font-size: 26rpx;
-								color: #AAAAAA;
-								text-decoration: line-through;
-
-								text {
-									margin-right: 2px;
-									font-size: 20rpx;
-								}
-							}
-
-							.price {
-								display: flex;
-								align-items: flex-end;
-								color: $theme-color;
-								font-size: 34rpx;
-								font-weight: 800;
-
-								text {
-									padding-bottom: 4rpx;
-									font-size: 24rpx;
-									font-weight: normal;
-								}
-
-								.txt {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 28rpx;
-									height: 28rpx;
-									margin-left: 15rpx;
-									margin-bottom: 10rpx;
-									border: 1px solid $theme-color;
-									border-radius: 4rpx;
-									font-size: 22rpx;
-									font-weight: normal;
-								}
-							}
-						}
-					}
-
-					&.on {
-						display: flex;
-					}
-				}
-			}
-		}
-	}
-
-	.productList {
-		background-color: #fff;
-		/* #ifdef H5 */
		padding-bottom: 140rpx;
		/* #endif */
-	}
-
-	.productList .list {
-		padding: 0 20rpx;
-	}
-
-	.productList .list.on {
-		background-color: #fff;
-		border-top: 1px solid #f6f6f6;
-	}
-
-	.productList .list .item {
-		width: 345rpx;
-		margin-top: 20rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
-	}
-
-	.productList .list .item.on {
-		width: 100%;
-		display: flex;
-		border-bottom: 1rpx solid #f6f6f6;
-		padding: 30rpx 0;
-		margin: 0;
-	}
-
-	.productList .list .item .pictrue {
-		position: relative;
-		width: 100%;
-		height: 345rpx;
-	}
-
-	.productList .list .item .pictrue.on {
-		width: 180rpx;
-		height: 180rpx;
-	}
-
-	.productList .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-
-	.productList .list .item .pictrue image.on {
-		border-radius: 6rpx;
-	}
-
-	.productList .list .item .text {
-		padding: 20rpx 17rpx 26rpx 17rpx;
-		font-size: 30rpx;
-		color: #222;
-	}
-
-	.productList .list .item .text.on {
-		width: 508rpx;
-		padding: 0 0 0 22rpx;
-	}
-
-	.productList .list .item .text .money {
-		font-size: 26rpx;
-		font-weight: bold;
-		margin-top: 8rpx;
-	}
-
-	.productList .list .item .text .money.on {
-		margin-top: 50rpx;
-	}
-
-	.productList .list .item .text .money .num {
-		font-size: 34rpx;
-	}
-
-	.productList .list .item .text .vip {
-		font-size: 22rpx;
-		color: #aaa;
-		margin-top: 7rpx;
-	}
-
-	.productList .list .item .text .vip.on {
-		margin-top: 12rpx;
-	}
-
-	.productList .list .item .text .vip .vip-money {
-		font-size: 24rpx;
-		color: #282828;
-		font-weight: bold;
-	}
-
-	.productList .list .item .text .vip .vip-money image {
-		width: 46rpx;
-		height: 21rpx;
-		margin-left: 4rpx;
-	}
-
-	.pictrue {
-		position: relative;
-	}
-
-	.fixed {
-		z-index: 100;
-		position: fixed;
-		left: 0;
-		top: 0;
-		background: linear-gradient(90deg, red 50%, #ff5400 100%);
-	}
-
-	.mores-txt {
-		width: 100%;
-		align-items: center;
-		justify-content: center;
-		height: 70rpx;
-		color: #999;
-		font-size: 24rpx;
-
-		.iconfont {
-			margin-top: 2rpx;
-			font-size: 20rpx;
-		}
-	}
-
-	.menu-txt {
-		font-size: 24rpx;
-		color: #454545;
-	}
-
-	.mp-bg {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 330rpx;
-		background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-		// border-radius: 0 0 30rpx 30rpx;
-	}
-</style>
+<template>
+	<view class="page-index" :class="{'bgf':navIndex >0}">
+		<!-- #ifdef H5 -->
+		<view class="header">
+			<view class="serch-wrapper flex">
+				<view class="logo">
+					<image :src="logoUrl" mode=""></image>
+				</view>
+				<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text class="iconfont icon-xiazai5"></text>
+					搜索商品</navigator>
+			</view>
+			<tabNav class="tabNav" :class="{'fixed':isFixed}" :tabTitle="navTop" @changeTab='changeTab' @emChildTab='emChildTab'
+			 @childTab='childTab'></tabNav>
+		</view>
+		<!-- #endif -->
+		<!-- #ifdef MP -->
+		<view class="mp-header">
+			<view class="sys-head" view :style="{ height: statusBarHeight }"></view>
+			<view class="serch-box" view style="height: 43px;">
+				<view class="serch-wrapper flex">
+					<view class="logo">
+						<image :src="logoUrl" mode=""></image>
+					</view>
+					<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text class="iconfont icon-xiazai5"></text>
+						搜索商品</navigator>
+				</view>
+			</view>
+			<tabNav class="tabNav" :tabTitle="navTop" @changeTab='changeTab'></tabNav>
+		</view>
+		<!-- #endif -->
+		<!-- 首页展示 -->
+		<view class="page_content" :style="'margin-top:'+(marTop+30)+'px;'" v-if="navIndex == 0">
+			<!-- #ifdef MP -->
+			<view class="mp-bg"></view>
+			<!-- #endif -->
+			<!-- banner -->
+			<view class="swiper" v-if="imgUrls.length">
+				<swiper indicator-dots="true" :autoplay="true" :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 :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
+								<image :src="item.pic" class="slide-image" lazy-load></image>
+							</navigator>
+						</swiper-item>
+					</block>
+				</swiper>
+			</view>
+			<!-- menu -->
+			<view class='nav acea-row' v-if="menus.length">
+				<block v-for="(item,index) in menus" :key="index">
+					<navigator class='item' v-if="item.show == '1'" :url='item.url' open-type='switchTab' hover-class='none'>
+						<view class='pictrue'>
+							<image :src='item.pic'></image>
+						</view>
+						<view class="menu-txt">{{item.name}}</view>
+					</navigator>
+					<navigator class='item' v-else :url='item.url' hover-class='none'>
+						<view class='pictrue'>
+							<image :src='item.pic'></image>
+						</view>
+						<view class="menu-txt">{{item.name}}</view>
+					</navigator>
+				</block>
+			</view>
+			<!-- 超值爆款 -->
+			<view class="explosion">
+				<view class="hd">
+					<image src="/static/images/explosion-title.png" mode=""></image>
+					<view class="txt">美好生活由此开始</view>
+				</view>
+				<view class="bd">
+					<navigator class="item" v-for="(item,index) in explosiveMoney" :key="index" :url="'/pages/columnGoods/HotNewGoods/index?type='+item.type"
+					 hover-class='none'>
+						<view class="con-box">
+							<view class="title line1">{{item.title}}</view>
+							<view class="con line2">{{item.info}}</view>
+							<view class="go">GO！<image src="/static/images/right-icon.png" mode=""></image>
+							</view>
+						</view>
+						<image :src="item.image"></image>
+					</navigator>
+				</view>
+			</view>
+			<!-- 精品推荐 -->
+			<view class='boutique'>
+				<swiper autoplay="true" indicator-dots="true" :circular="circular" :interval="interval" :duration="duration"
+				 indicator-color="rgba(0,0,0,.4)" indicator-active-color="#fff">
+					<block v-for="(item,index) in bastBanner" :key="index">
+						<swiper-item>
+							<navigator :url='item.url' style='width:100%;height:100%;' hover-class='none'>
+								<image :src="item.pic" class="slide-image" />
+							</navigator>
+						</swiper-item>
+					</block>
+				</swiper>
+			</view>
+			<a_seckill></a_seckill>
+			<b_combination></b_combination>
+			<c_bargain></c_bargain>
+			<!-- 首页推荐 -->
+			<view class="index-product-wrapper" :class="iSshowH?'on':''">
+				<view class="nav-bd">
+					<view class="item" v-for="(item,index) in explosiveMoney" :key="index" :index="item.id" :class="{active:index == ProductNavindex}"
+					 @click="ProductNavTab(item,index)">
+						<view class="txt">{{item.title}}</view>
+						<view class="label">{{item.info}}</view>
+					</view>
+				</view>
+				<!-- 首发新品 -->
+				<view class="list-box animated" :class='tempArr.length > 0?"fadeIn on":""'>
+					<view class="item" v-for="(item,index) in tempArr" :key="index" @click="goDetail(item)">
+						<view class="pictrue">
+							<span class="pictrue_log pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
+							<span class="pictrue_log pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
+							<span class="pictrue_log pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
+							<image :src="item.image" mode=""></image>
+						</view>
+						<view class="text-info">
+							<view class="title line1">{{item.storeName}}</view>
+							<view class="old-price"><text>¥</text>{{item.otPrice}}</view>
+							<view class="price">
+								<text>￥</text>{{item.price}}
+								<view class="txt" v-if="item.checkCoupon">券</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class='loadingicon acea-row row-center-wrapper' v-if="goodScroll">
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
+				</view>
+				<view class="mores-txt flex" v-if="!goodScroll">
+					<text>我是有底线的</text>
+				</view>
+			</view>
+		</view>
+		<!-- 分类页 -->
+		<view class="productList" v-if="navIndex>0" :style="'margin-top:'+prodeuctTop+'px'">
+			<block v-if="sortProduct.length>0">
+				<view class='list acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
+					<view class='item' :class='is_switch==true?"":"on"' hover-class='none' v-for="(item,index) in sortProduct" :key="index"
+					 @click="godDetail(item)">
+						<view class='pictrue' :class='is_switch==true?"":"on"'>
+							<image :src='item.image' :class='is_switch==true?"":"on"'></image>
+							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
+							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
+							<span class="pictrue_log_class" :class="is_switch === true ? 'pictrue_log_big' : 'pictrue_log'" v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
+						</view>
+						<view class='text' :class='is_switch==true?"":"on"'>
+							<view class='name line1'>{{item.storeName}}</view>
+							<view class='money font-color' :class='is_switch==true?"":"on"'>￥<text class='num'>{{item.price}}</text></view>
+							<view class='vip acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
+								<view class='vip-money' v-if="item.vipPrice && item.vipPrice > 0">￥{{item.vipPrice}}
+									<image src='../../static/images/vip.png'></image>
+								</view>
+								<view>已售{{Number(item.sales) + Number(item.ficti) || 0 }}{{item.unitName}}</view>
+							</view>
+						</view>
+					</view>
+					<view class='loadingicon acea-row row-center-wrapper' v-if='sortProduct.length > 0'>
+						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+					</view>
+				</view>
+			</block>
+			<Loading :loaded="loadend" :loading="loading"></Loading>
+			<block v-if="sortProduct.length == 0">
+				<view class="noCommodity">
+					<view class='pictrue'>
+						<image src='../../static/images/noShopper.png'></image>
+					</view>
+					<recommend :hostProduct="hostProduct"></recommend>
+				</view>
+			</block>
+
+		</view>
+		<!-- <coupon-window :window='window' :couponList="couponList" @onColse="onColse"></coupon-window> -->
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import Auth from '@/libs/wechat';
+	import Cache from '../../utils/cache';
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	let app = getApp();
+	import {
+		getIndexData,
+		getCoupons
+	} from '@/api/api.js';
+	// #ifdef MP-WEIXIN
+	import {
+		getTemlIds
+		// getLiveList
+	} from '@/api/api.js';
+	// import {
+	// 	SUBSCRIBE_MESSAGE,
+	// 	TIPS_KEY
+	// } from '@/config/cache';
+	// #endif
+	// #ifdef H5  
+	import {
+		follow
+	} from '@/api/public.js';
+	// #endif
+	import {
+		getShare
+	} from '@/api/public.js';
+	import a_seckill from './components/a_seckill';
+	import b_combination from './components/b_combination';
+	import c_bargain from './components/c_bargain';
+	import goodList from '@/components/goodList';
+	import promotionGood from '@/components/promotionGood';
+	import couponWindow from '@/components/couponWindow';
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		mapGetters
+	} from "vuex";
+	import tabNav from '@/components/tabNav.vue'
+	import countDown from '@/components/countDown';
+	import {
+		getCategoryList,
+		getProductslist,
+		getProductHot,
+		getGroomList
+	} from '@/api/store.js';
+	// import {
+	// 	setVisit
+	// } from '@/api/user.js'
+	import recommend from '@/components/recommend';
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import {
+		silenceBindingSpread
+	} from '@/utils';
+	// #ifdef H5
+	import {
+		kefuConfig
+	} from "@/api/public";
+	import {
+		getWechatConfig
+	} from "@/api/public";
+	// #endif
+	import Loading from '@/components/Loading/index.vue';
+	const arrTemp = ["beforePay", "afterPay", "refundApply", "beforeRecharge", "createBargain", "pink"];
+	export default {
+		computed: mapGetters(['isLogin', 'uid']),
+		components: {
+			tabNav,
+			goodList,
+			promotionGood,
+			couponWindow,
+			countDown,
+			a_seckill,
+			b_combination,
+			c_bargain,
+			recommend,
+			// #ifdef MP
+			authorize,
+			// #endif
+			Loading
+		},
+		data() {
+			return {
+				loaded: false,
+				loading: false,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				statusBarHeight: statusBarHeight,
+				navIndex: 0,
+				navTop: [],
+				subscribe: false,
+				followUrl: "",
+				followHid: true,
+				followCode: false,
+				logoUrl: "",
+				imgUrls: [],
+				itemNew: [],
+				menus: [],
+				bastBanner: [],
+				bastInfo: '',
+				bastList: [],
+				fastInfo: '',
+				fastList: [],
+				firstInfo: '',
+				firstList: [],
+				salesInfo: '',
+				likeInfo: [],
+				benefit: [],
+				indicatorDots: false,
+				circular: true,
+				autoplay: true,
+				interval: 3000,
+				duration: 500,
+				window: false,
+				iShidden: false,
+				navH: "",
+				newGoodsBananr: '',
+				couponList: [],
+				lovely: [],
+				liveList: [],
+				hotList: [{
+					pic: '/static/images/hot_001.png'
+				}, {
+					pic: '/static/images/hot_002.png'
+				}, {
+					pic: '/static/images/hot_003.png'
+				}],
+				ProductNavindex: 0,
+				marTop: 0,
+				childID: 0,
+				loadend: false,
+				loadTitle: '加载更多',
+				sortProduct: [],
+				where: {
+					cid: 0,
+					page: 1,
+					limit: 10,
+				},
+				is_switch: true,
+				hostProduct: [],
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				explosiveMoney: [],
+				prodeuctTop: 0,
+				searchH: 0,
+				isFixed: false,
+				goodType: 0, //精品推荐Type
+				goodScroll: true, //精品推荐开关
+				params: { //精品推荐分页
+					page: 1,
+					limit: 10,
+				},
+				tempArr: [], //精品推荐临时数组
+				pageInfo: '', // 精品推荐全数据
+				site_name: '', //首页title
+				iSshowH: false,
+				configApi: {}, //分享类容配置
+				spikeList: [], // 秒杀
+				point: ''
+			}
+		},
+		// watch: {
+		// 	isLogin: {
+		// 		deep: true, //深度监听设置为 true
+		// 		handler: function(newV, oldV) {
+		// 			// 优惠券弹窗
+		// 			var newDates = new Date().toLocaleDateString();
+		// 			if (newV) {
+		// 				try {
+		// 					var oldDate = uni.getStorageSync('oldDate') || '';
+		// 				} catch {}
+		// 				if (oldDate != newDates) {
+		// 					this.getCoupon();
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// },
+		onLoad() {
+			uni.getLocation({
+				type: 'wgs84',
+				success: function(res) {
+					try {
+						uni.setStorageSync('user_latitude', res.latitude);
+						uni.setStorageSync('user_longitude', res.longitude);
+					} catch {}
+				}
+			});
+			let self = this
+			// #ifdef MP
+			// 获取小程序头部高度
+			this.navH = app.globalData.navHeight;
+			let info = uni.createSelectorQuery().select(".mp-header");
+			info.boundingClientRect(function(data) {
+				self.marTop = data.height
+			}).exec()
+			// #endif
+			// #ifndef MP
+			this.navH = 0;
+			// #endif
+			this.isLogin && silenceBindingSpread();
+			Promise.all([this.getAllCategory(), this.getIndexConfig()
+				// , this.setVisit()
+			]);
+			// #ifdef MP
+			this.getTemlIds()
+			// this.getLiveList()
+			// #endif
+		},
+		onShow() {
+			let self = this
+			uni.setNavigationBarTitle({
+				title: self.site_name
+			})
+		},
+		methods: {
+			// #ifdef MP
+			getTemlIds() {
+				for (var i in arrTemp) {
+					this.getTem(arrTemp[i]);
+				}
+			},
+			getTem(data) {
+				getTemlIds({
+					type: data
+				}).then(res => {
+					if (res.data) {
+						let arr = res.data.map((item) => {
+							return item.tempId
+						})
+						wx.setStorageSync('tempID' + data, arr);
+					}
+				})
+			},
+			// #endif
+			// 关闭优惠券弹窗
+			onColse() {
+				this.$set(this, "window", false);
+			},
+			// 记录会员访问
+			// setVisit() {
+			// 	setVisit({
+			// 		url: '/pages/index/index'
+			// 	}).then(res => {
+			// 		console.log(res)
+			// 	})
+			// },
+			// 获取导航
+			getAllCategory: function() {
+				let that = this;
+				getCategoryList().then(res => {
+					res.data.unshift({
+						'name': '首页'
+					})
+					that.navTop = res.data;
+				})
+			},
+			// 导航分类切换
+			changeTab(e) {
+				let self = this
+				if (e.type == 'big') {
+					if (e.index == 0) {
+						this.navIndex = e.index
+					} else {
+						// #ifdef MP
+						setTimeout(res => {
+							this.navH = app.globalData.navHeight;
+							let info = uni.createSelectorQuery().select(".mp-header");
+							info.boundingClientRect(function(data) {
+								self.prodeuctTop = data.height
+							}).exec()
+						}, 300)
+						// #endif
+						// #ifdef H5
+						self.prodeuctTop = 26
+						// #endif
+						this.navIndex = e.index
+						let child = this.navTop[e.index].child && this.navTop[e.index].child != 'undefined' ? this.navTop[e.index].child :
+							[];
+						if (child.length > 0) {
+							this.where.cid = child[0].id
+						} else {
+							this.where.cid = this.navTop[e.index].id
+						}
+						this.loadend = false
+						this.loading = false
+						this.where.page = 1
+						this.sortProduct = []
+						this.get_product_list()
+					}
+				} else {
+					let child = this.navTop[e.parentIndex].child ? this.navTop[e.parentIndex].child : []
+					this.navIndex = e.parentIndex
+					this.where.cid = child[e.childIndex].id
+					this.loadend = false
+					this.loading = false
+					this.where.page = 1
+					this.sortProduct = []
+					this.get_product_list()
+				}
+			},
+			//分类产品
+			get_product_list: function(isPage) {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				// if (isPage === true) that.$set(that, 'productList', []);
+				that.loading = true;
+				that.loadTitle = '';
+				getProductslist(that.where).then(res => {
+					if (that.where.page == 1 && res.data.list.length == 0) {
+						that.hotScroll = false
+						that.hotPage = 1
+						that.hostProduct = []
+						this.get_host_product()
+					}
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.sortProduct);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'sortProduct', productList);
+					that.$set(that.where, 'page', that.where.page + 1);
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
+			},
+			/**
+			 * 获取我的推荐
+			 */
+			get_host_product: function() {
+				let that = this;
+				that.loading = true;
+
+				if (that.hotScroll) return
+				getProductHot(
+					that.hotPage,
+					that.hotLimit,
+				).then(res => {
+					that.hotPage++
+					that.hotScroll = res.data.list.length < that.hotLimit
+					that.hostProduct = that.hostProduct.concat(res.data.list)
+					// that.$set(that, 'hostProduct', res.data)
+				});
+			},
+
+			// 首页数据
+			getIndexConfig: function() {
+				let that = this;
+				getIndexData().then(res => {
+					uni.setNavigationBarTitle({
+						title: '首页'
+					})
+					that.$set(that, "logoUrl", res.data.logoUrl);
+					that.$set(that, "site_name", '首页');
+					that.$set(that, "imgUrls", res.data.banner);
+					that.$set(that, "menus", res.data.menus);
+					that.lovely = res.data.lovely
+					that.$set(that, "pageInfo", res.data)
+					that.$set(that, "firstList", res.data.info.firstList);
+					that.$set(that, "bastList", res.data.info.bastList);
+					that.$set(that, "likeInfo", res.data.likeInfo);
+					that.$set(that, "benefit", res.data.benefit);
+					that.$set(that, "bastBanner", res.data.info.bastBanner);
+					that.$set(that, "couponList", res.data.couponList);
+					that.$set(that, "explosiveMoney", res.data.explosiveMoney);
+					that.goodType = res.data.explosiveMoney[0].type
+					// #ifdef H5
+					that.subscribe = res.data.subscribe;
+					// #endif
+
+					this.getGroomList();
+
+					this.shareApi();
+
+					this.getcouponList();
+				})
+			},
+			getcouponList() {
+				let that = this;
+				getCoupons({
+					page: 1,
+					limit: 6
+				}).then(res => {
+					that.$set(that, "couponList", res.data);
+					// 小程序判断用户是否授权；
+					// #ifdef MP
+					uni.getSetting({
+						success(res) {
+							// if (!res.authSetting['scope.userInfo']) {
+							// 	that.window = false;
+							// 	that.iShidden = true;
+								
+							// } else {
+							// 	that.window = that.couponList.length ? true : false;
+							// }
+							if (!res.authSetting['scope.userInfo']) {
+								that.window = that.couponList.length ? true : false;
+							} else {
+								that.window = false;
+								that.iShidden = true;
+							}
+						}
+					});
+					// #endif
+					// #ifndef MP
+					// if (that.isLogin) {
+					// 	that.window = res.data.length ? true : false;
+					// } else {
+					// 	that.window = false;
+					// }
+					if (that.isLogin) {
+						that.window = false;
+					} else {
+						that.window = res.data.length ? true : false;
+					}
+					// #endif
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				});
+			},
+			shareApi: function() {
+				getShare().then(res => {
+					this.$set(this, 'configApi', res.data);
+					// #ifdef H5
+					this.setOpenShare(res.data);
+					// #endif
+				})
+			},
+			getChatUrL() {
+				kefuConfig().then(res => {
+					let data = res.data;
+					this.$store.commit("SET_CHATURL", data.yzfUrl);
+					Cache.set('chatUrl', data.yzfUrl);
+				})
+			},
+			// getMpChatUrL(){
+			// 	getWechatConfig().then(res => {
+			// 		let data = res.data;
+			// 		this.$store.commit("SET_CHATURL", data.yzfUrl);
+			// 		Cache.set('chatUrl', data.yzfUrl);
+			// 	})
+			// },
+			// setOpenShare:function(mss){
+			// 	getWechatConfig()
+			// 		.then(res => {
+			// 			let data = res.data;
+			// 			console.log('调试配置');
+			// 			console.log(data);
+			// 			WechatJSSDK.config({
+			// 				  debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+			// 				  appId: data.appId, // 必填，公众号的唯一标识
+			// 				  timestamp: data.timestamp, // 必填，生成签名的时间戳
+			// 				  nonceStr: data.nonceStr, // 必填，生成签名的随机串
+			// 				  signature: data.signature,// 必填，签名
+			// 				  jsApiList: data.jsApiList // 必填，需要使用的JS接口列表
+			// 			});
+			// 			WechatJSSDK.error(function(res){
+			// 				console.log('error')
+			// 			   console.log(res);
+			// 			});
+			// 			WechatJSSDK.ready(function () {   //需在用户可能点击分享按钮前就先调用
+			// 			  WechatJSSDK.onMenuShareAppMessage({ 
+			// 			    title: mss.title, // 分享标题
+			// 			    desc: mss.synopsis, // 分享描述
+			// 			    link: location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+			// 			    imgUrl: mss.img, // 分享图标
+			// 			    success: function (res) {
+			// 					console.log('success');
+			// 					console.log(res);
+			// 			      // 设置成功
+			// 			    },
+			// 				fail:function(err){
+			// 					console.log('err');
+			// 					console.log(err);
+			// 				}	
+			// 			  })
+			// 			}); 
+			// 		}).catch(err => {
+			// 			console.log(err);
+			// 			reject(err);
+			// 		});
+			// },
+			// 微信分享；
+			setOpenShare: function(data) {
+				let that = this;
+				if (that.$wechat.isWeixin()) {
+					let configAppMessage = {
+						desc: data.synopsis,
+						title: data.title,
+						link: location.href,
+						imgUrl: data.img
+					};
+					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage);
+				}
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			// 授权回调
+			onLoadFun() {
+
+			},
+			// 首发新品切换
+			ProductNavTab(item, index) {
+				this.goodType = item.type
+				this.ProductNavindex = index
+				this.tempArr = []
+				this.params.page = 1
+				this.goodScroll = true
+				let onloadH = true
+				this.getGroomList(onloadH)
+			},
+			// 首发新品详情
+			goDetail(item) {
+				if (item.activityH5 && item.activityH5.type === "2" && !this.isLogin) {
+					toLogin();
+					// // #ifdef H5
+					// uni.showModal({
+					// 	title: '提示',
+					// 	content: '您未登录，请登录！',
+					// 	success: function(res) {
+					// 		if (res.confirm) {
+					// 			uni.navigateTo({
+					// 				url: '/pages/users/login/index'
+					// 			})
+					// 		} else if (res.cancel) {}
+					// 	}
+					// })
+					// // #endif
+					// // #ifdef MP
+					// this.$set(this, 'isAuto', true);
+					// this.$set(this, 'isShowAuth', true);
+					// // #endif
+					// return
+				} else {
+					goShopDetail(item, this.uid).then(res => {
+						uni.navigateTo({
+							url: `/pages/goods_details/index?id=${item.id}`
+						})
+					})
+				}
+			},
+			// 分类详情
+			godDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.id}`
+					})
+				})
+			},
+			// 直播
+			// getLiveList: function() {
+			// 	getLiveList(1, 20).then(res => {
+			// 		this.liveList = res.data
+			// 	}).catch(res => {
+
+			// 	})
+			// },
+			// 精品推荐
+			getGroomList(onloadH) {
+				this.loading = true
+				let type = this.goodType;
+				if (!this.goodScroll) return
+				if (onloadH) {
+					this.iSshowH = true
+				}
+				getGroomList(type, this.params).then(({
+					data
+				}) => {
+					this.iSshowH = false
+					this.loading = false
+					this.goodScroll = data.list.length >= this.params.limit
+					this.params.page++
+					this.tempArr = this.tempArr.concat(data.list)
+				})
+			}
+		},
+		mounted() {
+			let self = this
+			// #ifdef H5
+			self.getChatUrL();
+			// 获取H5 搜索框高度
+			let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
+			appSearchH.boundingClientRect(function(data) {
+				self.searchH = data.height
+				//console.log(self.searchH)
+			}).exec()
+			// #endif
+		},
+		/**
+		 * 用户点击右上角分享
+		 */
+		// #ifdef MP
+		onShareAppMessage: function() {
+			return {
+				title: this.configApi.title,
+				imageUrl: this.configApi.img,
+				desc: this.configApi.synopsis,
+				path: '/pages/index/index'
+			};
+		},
+		// #endif
+		// 滚动到底部
+		onReachBottom() {
+
+			if (this.navIndex == 0) {
+				// 首页加载更多
+				if (this.params.page != 1) {
+					this.getGroomList();
+				}
+			} else {
+				// 分类栏目加载更多
+				if (this.sortProduct.length > 0) {
+					this.get_product_list();
+				} else {
+					this.get_host_product();
+				}
+			}
+		},
+		// 滚动监听
+		onPageScroll(e) {
+			let self = this
+			if (self.sortProduct.length>4 && e.scrollTop >= self.searchH) {
+				self.isFixed = true
+			} else {
+				this.$nextTick(() => {
+					self.isFixed = false
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		/* #ifdef H5 */
+		background-color: #fff;
+		/* #endif */
+
+	}
+</style>
+<style lang="scss">
+	.page-index {
+		display: flex;
+		flex-direction: column;
+		min-height: 100%;
+		background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
+
+		.header {
+			width: 100%;
+			background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
+
+			.serch-wrapper {
+				align-items: center;
+				padding: 20rpx 50rpx 0 53rpx;
+
+				.logo {
+					width: 118rpx;
+					height: 42rpx;
+					margin-right: 30rpx;
+				}
+
+				image {
+					width: 118rpx;
+					height: 42rpx;
+				}
+
+				.input {
+					display: flex;
+					align-items: center;
+					width: 500rpx;
+					height: 58rpx;
+					padding: 0 0 0 30rpx;
+					background: rgba(247, 247, 247, 1);
+					border: 1px solid rgba(241, 241, 241, 1);
+					border-radius: 29rpx;
+					color: #BBBBBB;
+					font-size: 28rpx;
+
+					.iconfont {
+						margin-right: 20rpx;
+					}
+				}
+			}
+
+			.tabNav {
+				padding-top: 24rpx;
+			}
+		}
+
+		/* #ifdef MP */
+		.mp-header {
+			z-index: 999;
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			/* #ifdef H5 */
+			padding-bottom: 20rpx;
+			/* #endif */
+			background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
+
+			.serch-wrapper {
+				height: 100%;
+				align-items: center;
+				padding: 0 50rpx 0 53rpx;
+
+				image {
+					width: 118rpx;
+					height: 42rpx;
+					margin-right: 30rpx;
+				}
+
+				.input {
+					display: flex;
+					align-items: center;
+					width: 305rpx;
+					height: 58rpx;
+					padding: 0 0 0 30rpx;
+					background: rgba(247, 247, 247, 1);
+					border: 1px solid rgba(241, 241, 241, 1);
+					border-radius: 29rpx;
+					color: #BBBBBB;
+					font-size: 28rpx;
+
+					.iconfont {
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
+
+		/* #endif */
+
+		.page_content {
+			background-color: #f5f5f5;
+			/* #ifdef H5 */
+			margin-top: 20rpx !important;
+			/* #endif */
+			padding: 0 20rpx;
+
+			.swiper {
+				position: relative;
+				width: 710rpx;
+				height: 280rpx;
+				margin: 0 auto;
+				border-radius: 10rpx;
+				overflow: hidden;
+				/* #ifdef MP */
+				z-index: 10;
+
+				/* #endif */
+				swiper,
+				.swiper-item,
+				image {
+					width: 100%;
+					height: 280rpx;
+					border-radius: 10rpx;
+				}
+			}
+
+			.nav {
+				padding: 0 0rpx 30rpx;
+				flex-wrap: wrap;
+
+				.item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					width: 20%;
+					margin-top: 30rpx;
+
+					image {
+						width: 82rpx;
+						height: 82rpx;
+					}
+				}
+			}
+
+			.live-wrapper {
+				position: relative;
+				width: 100%;
+				overflow: hidden;
+				border-radius: 16rpx;
+
+				image {
+					width: 100%;
+					height: 400rpx;
+				}
+
+				.live-top {
+					z-index: 20;
+					position: absolute;
+					left: 0;
+					top: 0;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: #fff;
+					width: 180rpx;
+					height: 54rpx;
+					border-radius: 0rpx 0px 18rpx 0px;
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 10rpx;
+						/* #ifdef H5 */
+						display: block;
+						/* #endif */
+					}
+				}
+
+				.live-title {
+					position: absolute;
+					left: 0;
+					bottom: 6rpx;
+					width: 100%;
+					height: 70rpx;
+					line-height: 70rpx;
+					text-align: center;
+					font-size: 30rpx;
+					color: #fff;
+					background: rgba(0, 0, 0, .35);
+				}
+
+				&.mores {
+					width: 100%;
+
+					.item {
+						position: relative;
+						width: 320rpx;
+						display: inline-block;
+						border-radius: 16rpx;
+						overflow: hidden;
+						margin-right: 20rpx;
+
+						image {
+							width: 320rpx;
+							height: 180rpx;
+							border-radius: 16rpx;
+						}
+
+						.live-title {
+							height: 40rpx;
+							line-height: 40rpx;
+							text-align: center;
+							font-size: 22rpx;
+						}
+
+						.live-top {
+							width: 120rpx;
+							height: 36rpx;
+							font-size: 22rpx;
+
+							image {
+								width: 20rpx;
+								height: 20rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.hot-img {
+				/* #ifndef H5 */
+				margin-top: 40rpx;
+
+				/* #endif */
+				swiper,
+				swiper-item image {
+					width: 100%;
+					height: 225rpx;
+				}
+			}
+
+			.explosion {
+				width: 100%;
+				height: 500rpx;
+				margin-top: 20rpx;
+				padding: 30rpx 20rpx;
+				background-image: url('~@/static/images/explosion.png');
+				background-size: 100% 100%;
+				border-radius: 13px;
+
+				.hd {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 147rpx;
+						height: 35rpx;
+						margin-right: 20rpx;
+					}
+
+					.txt {
+						width: 220rpx;
+						height: 36rpx;
+						background: linear-gradient(90deg, rgba(255, 168, 0, 1) 0%, rgba(255, 34, 15, 1) 100%);
+						border-radius: 26rpx 0px 26rpx 0px;
+						color: #fff;
+						text-align: center;
+						font-size: 22rpx;
+						box-shadow: 3px 1px 1px 1px rgba(255, 203, 199, .8);
+					}
+				}
+
+				.bd {
+					display: flex;
+					flex-wrap: wrap;
+					margin-top: 28rpx;
+
+					.item {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						position: relative;
+						width: 325rpx;
+						height: 180rpx;
+						margin-bottom: 20rpx;
+						margin-right: 20rpx;
+						background-color: #fff;
+						border-radius: 16rpx;
+						padding: 0 20rpx;
+						box-sizing: border-box;
+
+						image {
+							width: 160rpx;
+							height: 160rpx;
+						}
+
+						.con-box {
+							display: flex;
+							flex-direction: column;
+							justify-content: center;
+							width: 120rpx;
+							height: 100%;
+
+							.title {
+								color: #282828;
+								font-size: 30rpx;
+							}
+
+							.con {
+								color: #999999;
+								font-size: 20rpx;
+							}
+
+							.go {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								margin-top: 10rpx;
+								width: 112rpx;
+								height: 36rpx;
+								border-radius: 18rpx;
+								color: #fff;
+								font-size: 26rpx;
+								font-weight: bold;
+								font-style: italic;
+
+								image {
+									width: 26rpx;
+									height: 26rpx;
+								}
+							}
+						}
+
+						&:first-child .go {
+							background: linear-gradient(90deg, rgba(75, 196, 255, 1) 0%, rgba(32, 126, 255, 1) 100%);
+						}
+
+						&:nth-child(2) .go {
+							background: linear-gradient(90deg, rgba(255, 144, 67, 1) 0%, rgba(255, 83, 29, 1) 100%);
+						}
+
+						&:nth-child(3) .go {
+							background: linear-gradient(90deg, rgba(150, 225, 135, 1) 0%, rgba(72, 206, 44, 1) 100%);
+						}
+
+						&:nth-child(4) .go {
+							background: linear-gradient(90deg, rgba(255, 197, 96, 1) 0%, rgba(255, 156, 0, 1) 100%);
+						}
+
+						&:nth-child(2n) {
+							margin-right: 0;
+						}
+					}
+				}
+			}
+
+			.spike-box {
+				margin-top: 20rpx;
+				padding: 23rpx 20rpx;
+				border-radius: 24rpx;
+				background-color: #fff;
+				overflow: hidden;
+				box-shadow: 0px 0px 16px 3px rgba(0, 0, 0, 0.04);
+
+				.hd {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.left {
+						display: flex;
+						align-items: center;
+						width: 500rpx;
+
+						.icon {
+							width: 38rpx;
+							height: 38rpx;
+							margin-right: 8rpx;
+						}
+
+						.title {
+							width: 134rpx;
+							height: 33rpx;
+						}
+					}
+
+					.more {
+						font-size: 26rpx;
+						color: #999;
+
+						.iconfont {
+							margin-left: 6rpx;
+							font-size: 25rpx;
+						}
+					}
+				}
+
+				.spike-wrapper {
+					width: 100%;
+					margin-top: 27rpx;
+
+					.spike-item {
+						display: inline-block;
+						width: 222rpx;
+						margin-right: 20rpx;
+
+						.img-box {
+							position: relative;
+							height: 222rpx;
+
+							image {
+								width: 100%;
+								height: 222rpx;
+								border-radius: 16rpx;
+							}
+
+							.msg {
+								position: absolute;
+								left: 10rpx;
+								bottom: 16rpx;
+								width: 86rpx;
+								height: 30rpx;
+								background: rgba(255, 255, 255, 1);
+								border: 1px solid rgba(255, 109, 96, 1);
+								border-radius: 6rpx;
+								font-size: 20rpx;
+								color: $theme-color;
+							}
+						}
+
+
+						.info {
+							margin-top: 8rpx;
+							padding: 0 10rpx;
+
+							.name {
+								font-size: 28rpx;
+							}
+
+							.price-box {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+
+								.tips {
+									display: flex;
+									align-items: center;
+									justify-content: center;
+									width: 28rpx;
+									height: 28rpx;
+									background-color: $theme-color;
+									color: #fff;
+									font-size: 20rpx;
+									border-radius: 2px;
+								}
+
+								.price {
+									display: flex;
+									margin-left: 10rpx;
+									color: $theme-color;
+									font-size: 28rpx;
+									font-weight: bold;
+
+									text {
+										font-size: 18rpx;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			.barg {
+				width: 100%;
+				height: 478rpx;
+				margin-top: 20rpx;
+				padding-left: 20rpx;
+				background-image: url('~@/static/images/barg002.png');
+				background-size: 100% 100%;
+
+				.title {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding-top: 42rpx;
+
+					image {
+						width: 463rpx;
+						height: 39rpx;
+					}
+				}
+
+				.barg-swiper {
+					margin-top: 43rpx;
+					padding-right: 20rpx;
+
+					.wrapper {
+						display: flex;
+					}
+
+					.list-box {
+						flex-shrink: 0;
+						width: 210rpx;
+						background-color: #fff;
+						border-radius: 16rpx;
+						overflow: hidden;
+						padding-bottom: 18rpx;
+						margin-right: 20rpx;
+
+						image {
+							width: 100%;
+							height: 210rpx;
+						}
+
+						.info-txt {
+							width: 100%;
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: center;
+							padding-top: 15rpx;
+
+							.price {
+								font-weight: 700;
+								color: $theme-color;
+							}
+
+							.txt {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								width: 136rpx;
+								height: 33rpx;
+								margin-top: 10rpx;
+								background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
+								border-radius: 17px;
+								font-size: 22rpx;
+								color: #fff;
+
+							}
+						}
+					}
+
+					.more-box {
+						flex-shrink: 0;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						width: 80rpx;
+						background-color: #fff;
+						border-radius: 16rpx;
+
+						image {
+							width: 24rpx;
+							height: 24rpx;
+							margin-top: 10rpx;
+						}
+
+						.txt {
+							display: block;
+							writing-mode: vertical-lr;
+							font-size: 26rpx;
+							line-height: 1.2;
+						}
+					}
+				}
+			}
+
+			.group-wrapper {
+				padding: 26rpx 20rpx;
+				margin-top: 20rpx;
+				background: #fff;
+				border-radius: 24rpx;
+
+				.hd {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.left {
+						display: flex;
+						align-items: center;
+
+						.icon {
+							width: 38rpx;
+							height: 38rpx;
+							margin-right: 8rpx;
+						}
+
+						.title {
+							width: 134rpx;
+							height: 33rpx;
+						}
+
+						.person {
+							display: flex;
+							align-items: center;
+							margin-left: 40rpx;
+
+							.avatar-box {
+								display: flex;
+								align-items: center;
+
+								image {
+									width: 30rpx;
+									height: 30rpx;
+									border-radius: 50%;
+									margin-right: -10rpx;
+								}
+							}
+
+							.num {
+								margin-left: 18rpx;
+								font-size: 26rpx;
+								color: #999999;
+							}
+						}
+					}
+
+					.more {
+						font-size: 26rpx;
+						color: #999;
+
+						.iconfont {
+							margin-left: 6rpx;
+							font-size: 25rpx;
+						}
+					}
+				}
+
+				.group-scroll {
+					width: 100%;
+					margin-top: 25rpx;
+
+					.group-item {
+						display: inline-block;
+						width: 222rpx;
+						margin-right: 20rpx;
+						box-shadow: 0px 2px 6px 2px rgba(0, 0, 0, 0.03);
+						border-radius: 16rpx;
+
+						image {
+							width: 100%;
+							height: 222rpx;
+							border-radius: 16rpx 16rpx 0 0;
+						}
+
+						.info {
+							padding: 8rpx 13rpx;
+
+							.name {
+								font-size: 24rpx;
+							}
+
+							.price-box {
+								display: flex;
+								align-items: center;
+								margin-top: 10rpx;
+
+								.tips {
+									display: flex;
+									align-items: center;
+									justify-content: center;
+									width: 76rpx;
+									height: 30rpx;
+									margin-right: 6rpx;
+									background: linear-gradient(90deg, rgba(255, 0, 0, .1) 0%, rgba(255, 84, 0, .1) 100%);
+									border-radius: 2px;
+									font-size: 20rpx;
+									color: $theme-color;
+								}
+
+								.price {
+									font-size: 26rpx;
+									color: $theme-color;
+									font-weight: 700;
+
+									text {
+										font-size: 20rpx;
+									}
+								}
+							}
+
+						}
+
+						.bom-btn {
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							width: 100%;
+							height: 48rpx;
+							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
+							border-radius: 0px 0px 16rpx 16rpx;
+							color: #fff;
+
+						}
+					}
+				}
+			}
+
+			.boutique {
+				margin-top: 20rpx;
+
+				swiper,
+				swiper-item,
+				.slide-image {
+					width: 100%;
+					height: 240rpx;
+					border-radius: 12rpx;
+				}
+			}
+
+			.index-product-wrapper {
+				margin-top: 40rpx;
+				margin-bottom: 110rpx;
+
+				&.on {
+					min-height: 1500rpx;
+				}
+
+				.nav-bd {
+					display: flex;
+					align-items: center;
+
+					.item {
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						width: 25%;
+
+						.txt {
+							font-size: 32rpx;
+							color: #282828;
+						}
+
+						.label {
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							width: 124rpx;
+							height: 32rpx;
+							margin-top: 5rpx;
+							font-size: 24rpx;
+							color: #999;
+						}
+
+						&.active {
+							color: $theme-color;
+
+							.label {
+								background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
+								border-radius: 16rpx;
+								color: #fff;
+							}
+						}
+					}
+				}
+
+				.list-box {
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: space-between;
+					margin-top: 30rpx;
+
+					.item {
+						width: 345rpx;
+						margin-bottom: 20rpx;
+						background-color: #fff;
+						border-radius: 10px;
+						overflow: hidden;
+
+						image {
+							width: 100%;
+							height: 345rpx;
+						}
+
+						.text-info {
+							padding: 10rpx 20rpx 15rpx;
+
+							.title {
+								color: #222222;
+							}
+
+							.old-price {
+								margin-top: 8rpx;
+								font-size: 26rpx;
+								color: #AAAAAA;
+								text-decoration: line-through;
+
+								text {
+									margin-right: 2px;
+									font-size: 20rpx;
+								}
+							}
+
+							.price {
+								display: flex;
+								align-items: flex-end;
+								color: $theme-color;
+								font-size: 34rpx;
+								font-weight: 800;
+
+								text {
+									padding-bottom: 4rpx;
+									font-size: 24rpx;
+									font-weight: normal;
+								}
+
+								.txt {
+									display: flex;
+									align-items: center;
+									justify-content: center;
+									width: 28rpx;
+									height: 28rpx;
+									margin-left: 15rpx;
+									margin-bottom: 10rpx;
+									border: 1px solid $theme-color;
+									border-radius: 4rpx;
+									font-size: 22rpx;
+									font-weight: normal;
+								}
+							}
+						}
+					}
+
+					&.on {
+						display: flex;
+					}
+				}
+			}
+		}
+	}
+
+	.productList {
+		background-color: #fff;
+		/* #ifdef H5 */
+		padding-bottom: 140rpx;
+		/* #endif */
+	}
+
+	.productList .list {
+		padding: 0 20rpx;
+	}
+
+	.productList .list.on {
+		background-color: #fff;
+		border-top: 1px solid #f6f6f6;
+	}
+
+	.productList .list .item {
+		width: 345rpx;
+		margin-top: 20rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+	}
+
+	.productList .list .item.on {
+		width: 100%;
+		display: flex;
+		border-bottom: 1rpx solid #f6f6f6;
+		padding: 30rpx 0;
+		margin: 0;
+	}
+
+	.productList .list .item .pictrue {
+		position: relative;
+		width: 100%;
+		height: 345rpx;
+	}
+
+	.productList .list .item .pictrue.on {
+		width: 180rpx;
+		height: 180rpx;
+	}
+
+	.productList .list .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	.productList .list .item .pictrue image.on {
+		border-radius: 6rpx;
+	}
+
+	.productList .list .item .text {
+		padding: 20rpx 17rpx 26rpx 17rpx;
+		font-size: 30rpx;
+		color: #222;
+	}
+
+	.productList .list .item .text.on {
+		width: 508rpx;
+		padding: 0 0 0 22rpx;
+	}
+
+	.productList .list .item .text .money {
+		font-size: 26rpx;
+		font-weight: bold;
+		margin-top: 8rpx;
+	}
+
+	.productList .list .item .text .money.on {
+		margin-top: 50rpx;
+	}
+
+	.productList .list .item .text .money .num {
+		font-size: 34rpx;
+	}
+
+	.productList .list .item .text .vip {
+		font-size: 22rpx;
+		color: #aaa;
+		margin-top: 7rpx;
+	}
+
+	.productList .list .item .text .vip.on {
+		margin-top: 12rpx;
+	}
+
+	.productList .list .item .text .vip .vip-money {
+		font-size: 24rpx;
+		color: #282828;
+		font-weight: bold;
+	}
+
+	.productList .list .item .text .vip .vip-money image {
+		width: 46rpx;
+		height: 21rpx;
+		margin-left: 4rpx;
+	}
+
+	.pictrue {
+		position: relative;
+	}
+
+	.fixed {
+		z-index: 100;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: linear-gradient(90deg, red 50%, #ff5400 100%);
+	
+	}
+
+	.mores-txt {
+		width: 100%;
+		align-items: center;
+		justify-content: center;
+		height: 70rpx;
+		color: #999;
+		font-size: 24rpx;
+
+		.iconfont {
+			margin-top: 2rpx;
+			font-size: 20rpx;
+		}
+	}
+
+	.menu-txt {
+		font-size: 24rpx;
+		color: #454545;
+	}
+
+	.mp-bg {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 330rpx;
+		background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
+		// border-radius: 0 0 30rpx 30rpx;
+	}
+</style>
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 5e956dfe..1fa71c85 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -113,13 +113,19 @@
 		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
 		 @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="reGoCat" id='product-window'></productWindow>
 		<!-- #ifdef MP -->
-		<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 
 	</view>
 </template>
 
 <script>
+	// #ifdef APP-PLUS
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	// #endif
+	// #ifndef APP-PLUS
+	let sysHeight = 0
+	// #endif
 	import {
 		getCartList,
 		getCartCounts,
@@ -189,20 +195,15 @@
 				attrValue: '', //已选属性
 				attrTxt: '请选择', //属性页面提示
 				cartId: 0,
-				product_id: 0
+				product_id: 0,
+				sysHeight:sysHeight
 			};
 		},
 		computed: mapGetters(['isLogin']),
 		onLoad: function(options) {
 			let that = this;
 			if (that.isLogin == false) {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				that.isAuto = true;
-				that.$set(that, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		onShow: function() {
@@ -593,30 +594,8 @@
 				// let newArr = that.cartList.valid.filter(item => item.attrStatus);
 				that.isAllSelect = newValid.length === arr1.length + arr3.length;
 				that.selectValue = value;
-				console.log(that.selectValue)
 				that.switchSelect();
 			},
-			// checkboxChange: function(event) {
-			// 	let that = this;
-			// 	let value = event.detail.value;
-			// 	let valid = that.cartList.valid;
-			// 	for (let index in valid) {
-			// 		if (that.inArray(valid[index].id, value)){
-			// 			if(valid[index].attrStatus){
-			// 				valid[index].checked = true;
-			// 			}else{
-			// 				valid[index].checked = false;
-			// 			}
-			// 		} else {
-			// 			valid[index].checked = false;
-			// 		} 
-			// 	}
-			// 	that.$set(that.cartList, 'valid', valid);
-			// 	let newArr = that.cartList.valid.filter(item => item.attrStatus);
-			// 	that.isAllSelect = value.length == newArr.length;
-			// 	that.selectValue = value;
-			// 	that.switchSelect();
-			// },
 			inArray: function(search, array) {
 				for (let i in array) {
 					if (array[i] == search) {
@@ -677,6 +656,7 @@
 					that.setCartNum(item.id, item.cartNum, function(data) {
 						that.cartList.valid[index] = item;
 						that.switchSelect();
+						that.getCartNum();
 					});
 				}
 			},
@@ -696,6 +676,7 @@
 				that.setCartNum(item.id, item.cartNum, function(data) {
 					that.cartList.valid[index] = item;
 					that.switchSelect();
+					that.getCartNum();
 				});
 			},
 			setCartNum(cartId, cartNum, successCallback) {
@@ -872,8 +853,8 @@
 			} else {
 				that.getCartList();
 			}
-			if (that.cartList.valid.length == 0 && that.cartList.invalid.length == 0) {
-			//	that.getHostProduct();
+			if (that.cartList.valid.length == 0 && that.cartList.invalid.length == 0 && this.hotPage != 1) {
+				that.getHostProduct();
 			}
 		}
 	}
diff --git a/pages/order_addcart/order_addcart01.vue b/pages/order_addcart/order_addcart01.vue
deleted file mode 100644
index 1caace9f..00000000
--- a/pages/order_addcart/order_addcart01.vue
+++ /dev/null
@@ -1,804 +0,0 @@
-<template>
-	<view>
-		<view class='shoppingCart'>
-			<view class='labelNav acea-row row-around row-middle'>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>100%正品保证</view>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>所有商品精挑细选</view>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>售后无忧</view>
-			</view>
-			<view class='nav acea-row row-between-wrapper'>
-				<view>购物数量 <text class='num font-color'>{{cartCount}}</text></view>
-				<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" class='administrate acea-row row-center-wrapper'
-				 @click='manage'>{{ footerswitch ? '管理' : '取消'}}</view>
-			</view>
-			<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0">
-				<view class='list'>
-					<checkbox-group @change="checkboxChange">
-						<block v-for="(item,index) in cartList.valid" :key="index">
-							<view class='item acea-row row-between-wrapper'>
-								<!-- #ifndef MP -->
-								<checkbox :value="(item.id).toString()" :checked="item.checked" :disabled="!item.attrStatus && footerswitch" />
-								<!-- <checkbox :value="(item.id).toString()" :checked="item.checked" /> -->
-								<!-- #endif -->
-								<!-- #ifdef MP -->
-								<checkbox :value="item.id" :checked="item.checked" :disabled="!item.attrStatus && footerswitch" />
-								<!-- <checkbox :value="item.id" :checked="item.checked" /> -->
-								<!-- #endif -->
-								<navigator :url='"/pages/goods_details/index?id="+item.product_id' hover-class='none' class='picTxt acea-row row-between-wrapper'>
-									<view class='pictrue'>
-										<image v-if="item.productInfo.attrInfo" :src='item.productInfo.attrInfo.image'></image>
-										<image v-else :src='item.productInfo.image'></image>
-									</view>
-									<view class='text'>
-										<view class='line1' :class="item.attrStatus?'':'reColor'">{{item.productInfo.store_name}}</view>
-										<view class='infor line1' v-if="item.productInfo.attrInfo">属性：{{item.productInfo.attrInfo.suk}}</view>
-										<view class='money' v-if="item.attrStatus">￥{{item.truePrice}}</view>
-										<view class="reElection acea-row row-between-wrapper" v-else>
-											<view class="title">请重新选择商品规格</view>
-											<view class="reBnt cart-color acea-row row-center-wrapper" @click.stop="reElection(item)">重选</view>
-										</view>
-									</view>
-									<view class='carnum acea-row row-center-wrapper' v-if="item.attrStatus">
-										<view class="reduce" :class="item.numSub ? 'on' : ''" @click.stop='subCart(index)'>-</view>
-										<view class='num'>{{item.cart_num}}</view>
-										<!-- <view class="num">
-											<input type="number" v-model="item.cart_num" @click.stop @input="iptCartNum(index)" @blur="blurInput(index)"/>
-										</view> -->
-										<view class="plus" :class="item.numAdd ? 'on' : ''" @click.stop='addCart(index)'>+</view>
-									</view>
-								</navigator>
-								<!-- <navigator :url='"/pages/goods_details/index?id="+item.product_id' hover-class='none' class='picTxt acea-row row-between-wrapper'>
-									<view class='pictrue'>
-										<image v-if="item.productInfo.attrInfo" :src='item.productInfo.attrInfo.image'></image>
-										<image v-else :src='item.productInfo.image'></image>
-									</view>
-									<view class='text'>
-										<view class='line1'>{{item.productInfo.store_name}}</view>
-										<view class='infor line1' v-if="item.productInfo.attrInfo">属性：{{item.productInfo.attrInfo.suk}}</view>
-										<view class='money'>￥{{item.truePrice}}</view>
-									</view>
-									<view class='carnum acea-row row-center-wrapper'>
-										<view class="reduce" :class="item.numSub ? 'on' : ''" @click.stop='subCart(index)'>-</view>
-										<view class='num'>{{item.cart_num}}</view>
-										<view class="plus" :class="item.numAdd ? 'on' : ''" @click.stop='addCart(index)'>+</view>
-									</view>
-								</navigator> -->
-							</view>
-						</block>
-					</checkbox-group>
-				</view>
-				<view class='invalidGoods' v-if="cartList.invalid.length > 0">
-					<view class='goodsNav acea-row row-between-wrapper'>
-						<view @click='goodsOpen'><text class='iconfont' :class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品</view>
-						<view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>清空</view>
-					</view>
-					<view class='goodsList' :hidden='goodsHidden'>
-						<block v-for="(item,index) in cartList.invalid" :key='index'>
-							<view class='item acea-row row-between-wrapper'>
-								<view class='invalid'>失效</view>
-								<view class='pictrue'>
-									<image v-if="item.productInfo.attrInfo" :src='item.productInfo.attrInfo.image'></image>
-									<image v-else :src='item.productInfo.image'></image>
-								</view>
-								<view class='text acea-row row-column-between'>
-									<view class='line1 name'>{{item.productInfo.store_name}}</view>
-									<view class='infor line1' v-if="item.productInfo.attrInfo">属性：{{item.productInfo.attrInfo.suk}}</view>
-									<view class='acea-row row-between-wrapper'>
-										<!-- <view>￥{{item.truePrice}}</view> -->
-										<view class='end'>该商品已失效</view>
-									</view>
-								</view>
-							</view>
-						</block>
-					</view>
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper' v-if="cartList.valid.length&&!loadend">
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper' v-if="cartList.invalid.length&&loadend">
-					<text class='loading iconfont icon-jiazai' :hidden='loadingInvalid==false'></text>{{loadTitleInvalid}}
-				</view>
-			</view>
-			<view class='noCart' v-if="cartList.valid.length == 0 && cartList.invalid.length == 0">
-				<view class='pictrue'>
-					<image src='../../static/images/noCart.png'></image>
-				</view>
-				<recommend :hostProduct='hostProduct'></recommend>
-			</view>
-			<view style='height:120rpx;'></view>
-			<view class='footer acea-row row-between-wrapper' v-if="cartList.valid.length > 0">
-				<view>
-					<checkbox-group @change="checkboxAllChange">
-						<checkbox value="all" :checked="!!isAllSelect" /><text class='checkAll'>全选 ({{selectValue.length}})</text>
-					</checkbox-group>
-				</view>
-				<view class='money acea-row row-middle' v-if="footerswitch==true">
-					<text class='font-color'>￥{{selectCountPrice}}</text>
-					<form @submit="subOrder" report-submit='true'>
-						<button class='placeOrder bg-color' formType="submit">立即下单</button>
-					</form>
-				</view>
-				<view class='button acea-row row-middle' v-else>
-					<form @submit="subCollect" report-submit='true'>
-						<button class='bnt cart-color' formType="submit">收藏</button>
-					</form>
-					<form @submit="subDel" report-submit='true'>
-						<button class='bnt' formType="submit">删除</button>
-					</form>
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef MP -->
-		<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		getCartList,
-		getCartCounts,
-		changeCartNum,
-		cartDel
-	} from '@/api/order.js';
-	import {
-		getProductHot,
-		collectAll
-	} from '@/api/store.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import recommend from '@/components/recommend';
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	export default {
-		components: {
-			recommend,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		data() {
-			return {
-				cartCount: 0,
-				goodsHidden: true,
-				footerswitch: true,
-				hostProduct: [],
-				cartList: {
-					valid: [],
-					invalid: []
-				},
-				isAllSelect: false, //全选
-				selectValue: [], //选中的数据
-				selectCountPrice: 0.00,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				hotScroll:false,
-				hotPage:1,
-				hotLimit:10,
-				
-				loading: false,
-				loadend: false,
-				loadTitle: '加载更多', //提示语
-				page: 1,
-				limit: 20,
-				loadingInvalid: false,
-				loadendInvalid: false,
-				loadTitleInvalid: '加载更多', //提示语
-				pageInvalid: 1,
-				limitInvalid: 20,
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				productValue: [], //系统属性
-				storeInfo: {},
-				attrValue: '', //已选属性
-				attrTxt: '请选择', //属性页面提示
-				cartId: 0,
-				product_id: 0
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		onLoad: function(options) {
-			let that = this;
-			if (that.isLogin == false) {
-				// #ifdef H5 || APP-PLUS
-				toLogin();
-				// #endif 
-				// #ifdef MP
-				that.isAuto = true;
-				that.$set(that, 'isShowAuth', true);
-				// #endif
-			}
-		},
-		onShow: function() {
-			if (this.isLogin == true) {
-				this.getHostProduct();
-				this.getCartList();
-				this.getCartNum();
-				this.goodsHidden = true;
-				this.footerswitch = true;
-				this.hostProduct = [];
-				this.hotScroll = false;
-				this.hotPage = 1;
-				this.hotLimit = 10;
-				this.cartList = {
-						valid: [],
-						invalid: []
-					},
-					this.isAllSelect = false; //全选
-				this.selectValue = []; //选中的数据
-				this.selectCountPrice = 0.00;
-				this.cartCount = 0;
-				this.isShowAuth = false;
-			};
-		},
-		methods: {
-			     /**
-			     * 手动输入数量失焦事件
-			     */
-			  //   inputBlur(index,val) {
-			  //     if (val <= 1) {
-			  //       // let index = e.currentTarget.dataset.index;
-			  //       let item = this.cartList.valid[index];
-			  //       item.cart_num = 1;
-			  //       if (item.cart_num) this.setCartNum(item.id, item.cart_num);
-					// this.cartList.valid[index] = item;
-					// this.$set(this.cartList,'valid',this.cartList.valid);
-					// this.switchSelect();
-			  //     }
-			  //   },
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-			subDel: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
-				if (selectValue.length > 0)
-					cartDel(selectValue).then(res => {
-						that.getCartList();
-						that.getCartNum();
-					});
-				else
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-			},
-			getSelectValueProductId: function() {
-				let that = this;
-				let validList = that.cartList.valid;
-				let selectValue = that.selectValue;
-				let productId = [];
-				if (selectValue.length > 0) {
-					for (let index in validList) {
-						if (that.inArray(validList[index].id, selectValue)) {
-							productId.push(validList[index].product_id);
-						}
-					}
-				};
-				return productId;
-			},
-			subCollect: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
-				if (selectValue.length > 0) {
-					let selectValueProductId = that.getSelectValueProductId();
-					collectAll(that.getSelectValueProductId().join(',')).then(res => {
-						return that.$util.Tips({
-							title: res.msg,
-							icon: 'success'
-						});
-					}).catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					});
-				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-				}
-			},
-			subOrder: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
-				if (selectValue.length > 0) {
-					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',')
-					});
-				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-				}
-			},
-			checkboxAllChange: function(event) {
-				let value = event.detail.value;
-				if (value.length > 0) {
-					this.setAllSelectValue(1)
-				} else {
-					this.setAllSelectValue(0)
-				}
-			},
-			setAllSelectValue: function(status) {
-				let that = this;
-				let selectValue = [];
-				let valid = that.cartList.valid;
-				if (valid.length > 0) {
-					for (let index in valid) {
-						if (status == 1) {
-							valid[index].checked = true;
-							selectValue.push(valid[index].id);
-						} else valid[index].checked = false;
-					}
-					that.$set(that.cartList, 'valid', valid);
-					that.selectValue = selectValue;
-					that.switchSelect();
-				}
-			},
-			checkboxChange: function(event) {
-				let that = this;
-				let value = event.detail.value;
-				let valid = that.cartList.valid;
-				for (let index in valid) {
-					if (that.inArray(valid[index].id, value)) valid[index].checked = true;
-					else valid[index].checked = false;
-				}
-				that.$set(that.cartList, 'valid', valid);
-				that.isAllSelect = value.length == that.cartList.valid.length;
-				that.selectValue = value;
-				that.switchSelect();
-			},
-			inArray: function(search, array) {
-				for (let i in array) {
-					if (array[i] == search) {
-						return true;
-					}
-				}
-				return false;
-			},
-			switchSelect: function() {
-				let that = this;
-				let validList = that.cartList.valid;
-				let selectValue = that.selectValue;
-				let selectCountPrice = 0.00;
-				if (selectValue.length < 1) {
-					that.selectCountPrice = selectCountPrice;
-				} else {
-					for (let index in validList) {
-						if (that.inArray(validList[index].id, selectValue)) {
-							selectCountPrice = that.$util.$h.Add(selectCountPrice, that.$util.$h.Mul(validList[index].cart_num, validList[
-								index].truePrice))
-						}
-					}
-					that.selectCountPrice = selectCountPrice;
-				}
-			},
-			/**
-			  * 购物车手动填写
-			  * 
-			 */
-			 iptCartNum: function (index) {
-					let item = this.cartList.valid[index];
-					if(item.cart_num){
-						this.setCartNum(item.id, item.cart_num);
-					}
-					this.switchSelect();
-			 },
-			 blurInput:function (index) {
-				 let item = this.cartList.valid[index];
-				 if(!item.cart_num){
-					 item.cart_num = 1;
-					 this.$set(this.cartList,'valid',this.cartList.valid)
-				 }
-			 },
-			subCart: function(index) {
-				let that = this;
-				let status = false;
-				let item = that.cartList.valid[index];
-				item.cart_num = Number(item.cart_num) - 1;
-				if (item.cart_num < 1) status = true;
-				if (item.cart_num <= 1) {
-					item.cart_num = 1;
-					item.numSub = true;
-				} else {
-					item.numSub = false;
-					item.numAdd = false;
-				}
-				if (false == status) {
-					that.setCartNum(item.id, item.cart_num, function(data) {
-						that.cartList.valid[index] = item;
-						that.switchSelect();
-					});
-				}
-			},
-			addCart: function(index) {
-				let that = this;
-				let item = that.cartList.valid[index];
-				item.cart_num = Number(item.cart_num) + 1;
-				let productInfo = item.productInfo;
-				if (productInfo.hasOwnProperty('attrInfo') && item.cart_num >= item.productInfo.attrInfo.stock) {
-					item.cart_num = item.productInfo.attrInfo.stock;
-					item.numAdd = true;
-					item.numSub = false;
-				}else {
-					item.numAdd = false;
-					item.numSub = false;
-				}
-				that.setCartNum(item.id, item.cart_num, function(data) {
-					that.cartList.valid[index] = item;
-					that.switchSelect();
-				});
-			},
-			setCartNum(cartId, cartNum, successCallback) {
-				let that = this;
-				changeCartNum(cartId, cartNum).then(res => {
-					successCallback && successCallback(res.data);
-				});
-			},
-			getCartNum: function() {
-				let that = this;
-				getCartCounts().then(res => {
-					that.cartCount = res.data.count;
-				});
-			},
-			getCartList: function() {
-				let that = this;
-				getCartList().then(res => {
-					let cartList = res.data;
-					let valid = cartList.valid;
-					let numSub = [{
-						numSub: true
-					}, {
-						numSub: false
-					}];
-					let numAdd = [{
-							numAdd: true
-						}, {
-							numAdd: false
-						}],
-						selectValue = [];
-					if (valid.length > 0) {
-						for (let index in valid) {
-							if (valid[index].cart_num == 1) {
-								valid[index].numSub = true;
-							} else {
-								valid[index].numSub = false;
-							}
-							let productInfo = valid[index].productInfo;
-							if (productInfo.hasOwnProperty('attrInfo') && valid[index].cart_num == valid[index].productInfo.attrInfo.stock) {
-								valid[index].numAdd = true;
-							} else if (valid[index].cart_num == valid[index].productInfo.stock) {
-								valid[index].numAdd = true;
-							} else {
-								valid[index].numAdd = false;
-							}
-							valid[index].checked = true;
-							selectValue.push(valid[index].id);
-						}
-					}
-					that.$set(that, 'cartList', cartList);
-					that.goodsHidden = cartList.valid.length <= 0 ? false : true;
-					that.selectValue = selectValue;
-					that.isAllSelect = valid.length == selectValue.length && valid.length;
-					that.switchSelect();
-				});
-			},
-			getHostProduct: function() {
-				let that = this;
-				if(that.hotScroll) return
-				getProductHot(
-					that.hotPage,
-					that.hotLimit,
-				).then(res => {
-					that.hotPage++
-					that.hotScroll = res.data.list.length<that.hotLimit
-					that.hostProduct = that.hostProduct.concat(res.data.list)
-				});
-			},
-			goodsOpen: function() {
-				let that = this;
-				that.goodsHidden = !that.goodsHidden;
-			},
-			manage: function() {
-				let that = this;
-				that.footerswitch = !that.footerswitch;
-			},
-			unsetCart: function() {
-				let that = this,
-					ids = [];
-				for (let i = 0, len = that.cartList.invalid.length; i < len; i++) {
-					ids.push(that.cartList.invalid[i].id);
-				}
-				cartDel(ids).then(res => {
-					that.$util.Tips({
-						title: '清除成功'
-					});
-					that.$set(that.cartList, 'invalid', []);
-				}).catch(res => {
-
-				});
-			}
-		},
-		onReachBottom() {
-			this.getHostProduct();
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.shoppingCart .labelNav {
-		height: 76rpx;
-		padding: 0 30rpx;
-		font-size: 22rpx;
-		color: #8c8c8c;
-		position: fixed;
-		left: 0;
-		width: 100%;
-		box-sizing: border-box;
-		background-color: #f5f5f5;
-		z-index: 5;
-		top: 0;
-	}
-
-	.shoppingCart .labelNav .item .iconfont {
-		font-size: 25rpx;
-		margin-right: 10rpx;
-	}
-
-	.shoppingCart .nav {
-		width: 100%;
-		height: 80rpx;
-		background-color: #fff;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		color: #282828;
-		position: fixed;
-		left: 0;
-		z-index: 5;
-		top: 76rpx;
-	}
-
-	.shoppingCart .nav .administrate {
-		font-size: 26rpx;
-		color: #282828;
-		width: 110rpx;
-		height: 46rpx;
-		border-radius: 6rpx;
-		border: 1px solid #868686;
-	}
-
-	.shoppingCart .noCart {
-		margin-top: 171rpx;
-		background-color: #fff;
-		padding-top: 0.1rpx;
-	}
-
-	.shoppingCart .noCart .pictrue {
-		width: 414rpx;
-		height: 336rpx;
-		margin: 78rpx auto 56rpx auto;
-	}
-
-	.shoppingCart .noCart .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.shoppingCart .list {
-		margin-top: 171rpx;
-	}
-
-	.shoppingCart .list .item {
-		padding: 25rpx 30rpx;
-		background-color: #fff;
-		margin-bottom: 15rpx;
-	}
-
-	.shoppingCart .list .item .picTxt {
-		width: 627rpx;
-		position: relative;
-	}
-
-	.shoppingCart .list .item .picTxt .pictrue {
-		width: 160rpx;
-		height: 160rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text {
-		width: 444rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.shoppingCart .list .item .picTxt .text .infor {
-		font-size: 24rpx;
-		color: #868686;
-		margin-top: 16rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .money {
-		font-size: 32rpx;
-		color: #282828;
-		margin-top: 28rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum {
-		height: 47rpx;
-		position: absolute;
-		bottom: 7rpx;
-		right: 0;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum view {
-		border: 1rpx solid #a4a4a4;
-		width: 66rpx;
-		text-align: center;
-		height: 100%;
-		line-height: 40rpx;
-		font-size: 28rpx;
-		color: #a4a4a4;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .reduce {
-		border-right: 0;
-		border-radius: 3rpx 0 0 3rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .reduce.on {
-		border-color: #e3e3e3;
-		color: #dedede;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .plus {
-		border-left: 0;
-		border-radius: 0 3rpx 3rpx 0;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .num {
-		color: #282828;
-	}
-
-	.shoppingCart .invalidGoods {
-		background-color: #fff;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav {
-		width: 100%;
-		height: 66rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .iconfont {
-		color: #424242;
-		font-size: 28rpx;
-		margin-right: 17rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .del {
-		font-size: 26rpx;
-		color: #999;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
-		color: #999;
-		font-size: 33rpx;
-		vertical-align: -2rpx;
-		margin-right: 8rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item {
-		padding: 20rpx 30rpx;
-		border-top: 1rpx solid #f5f5f5;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .invalid {
-		font-size: 22rpx;
-		color: #fff;
-		width: 70rpx;
-		height: 36rpx;
-		background-color: #aaa;
-		border-radius: 3rpx;
-		text-align: center;
-		line-height: 36rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .pictrue {
-		width: 140rpx;
-		height: 140rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text {
-		width: 433rpx;
-		font-size: 28rpx;
-		color: #999;
-		height: 140rpx;
-	}
-    .shoppingCart .invalidGoods .goodsList .item .text .name{width:100%;}
-	.shoppingCart .invalidGoods .goodsList .item .text .infor {
-		font-size: 24rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text .end {
-		font-size: 26rpx;
-		color: #bbb;
-	}
-
-	.shoppingCart .footer {
-		z-index:9;
-		width: 100%;
-		height: 96rpx;
-		background-color: #fafafa;
-		position: fixed;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		border-top: 1rpx solid #eee;
-		// 
-		bottom: 0;
-		// 
-		// #ifndef MP
-		bottom: 50px;
-		// #endif
-	}
-
-	.shoppingCart .footer .checkAll {
-		font-size: 28rpx;
-		color: #282828;
-		margin-left: 16rpx;
-	}
-
-	// .shoppingCart .footer checkbox .wx-checkbox-input{background-color:#fafafa;}
-	.shoppingCart .footer .money {
-		font-size: 30rpx;
-	}
-
-	.shoppingCart .footer .placeOrder {
-		color: #fff;
-		font-size: 30rpx;
-		width: 226rpx;
-		height: 70rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 70rpx;
-		margin-left: 22rpx;
-	}
-
-	.shoppingCart .footer .button .bnt {
-		font-size: 28rpx;
-		color: #999;
-		border-radius: 50rpx;
-		border: 1px solid #999;
-		width: 160rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-	}
-
-	.shoppingCart .footer .button form~form {
-		margin-left: 17rpx;
-	}
-</style>
diff --git a/pages/order_addcart/order_addcart11.vue b/pages/order_addcart/order_addcart11.vue
deleted file mode 100644
index 09974a7f..00000000
--- a/pages/order_addcart/order_addcart11.vue
+++ /dev/null
@@ -1,1083 +0,0 @@
-<template>
-	<view>
-		<view class='shoppingCart copy-data'>
-			<view class='labelNav acea-row row-around row-middle'>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>100%正品保证</view>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>所有商品精挑细选</view>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>售后无忧</view>
-			</view>
-			<view class='nav acea-row row-between-wrapper'>
-				<view>购物数量 <text class='num font-color'>{{cartCount}}</text></view>
-				<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" class='administrate acea-row row-center-wrapper'
-				 @click='manage'>{{ footerswitch ? '管理' : '取消'}}</view>
-			</view>
-			<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0">
-				<view class='list'>
-					<checkbox-group @change="checkboxChange">
-						<block v-for="(item,index) in cartList.valid" :key="index">
-							<view class='item acea-row row-between-wrapper'>
-								<!-- #ifndef MP -->
-								<checkbox :value="(item.id).toString()" :checked="item.checked" :disabled="item.attrStatus?false:true" />
-								<!-- #endif -->
-								<!-- #ifdef MP -->
-								<checkbox :value="item.id" :checked="item.checked" :disabled="item.attrStatus?false:true" />
-								<!-- #endif -->
-								<navigator :url='"/pages/goods_details/index?id="+item.productId' hover-class='none' class='picTxt acea-row row-between-wrapper'>
-									<view class='pictrue'>
-										<image v-if="item.productInfo.attrInfo" :src='item.productInfo.attrInfo.image'></image>
-										<image v-else :src='item.productInfo.image'></image>
-									</view>
-									<view class='text'>
-										<view class='line1' :class="item.attrStatus?'':'reColor'">{{item.productInfo.storeName}}</view>
-										<view class='infor line1' v-if="item.productInfo.attrInfo">属性：{{item.productInfo.attrInfo.suk}}</view>
-										<view class='money' v-if="item.attrStatus">￥{{item.truePrice}}</view>
-										<view class="reElection acea-row row-between-wrapper" v-else>
-											<view class="title">请重新选择商品规格</view>
-											<view class="reBnt cart-color acea-row row-center-wrapper" @click.stop="reElection(item)">重选</view>
-										</view>
-									</view>
-									<view class='carnum acea-row row-center-wrapper' v-if="item.attrStatus">
-										<view class="reduce" :class="item.numSub ? 'on' : ''" @click.stop='subCart(index)'>-</view>
-										<view class='num'>{{item.cartNum}}</view>
-										<!-- <view class="num">
-											<input type="number" v-model="item.cart_num" @click.stop @input="iptCartNum(index)" @blur="blurInput(index)"/>
-										</view> -->
-										<view class="plus" :class="item.numAdd ? 'on' : ''" @click.stop='addCart(index)'>+</view>
-									</view>
-								</navigator>
-							</view>
-						</block>
-					</checkbox-group>
-				</view>
-				<view class='invalidGoods' v-if="cartList.invalid.length > 0">
-					<view class='goodsNav acea-row row-between-wrapper'>
-						<view @click='goodsOpen'><text class='iconfont' :class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品</view>
-						<view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>清空</view>
-					</view>
-					<view class='goodsList' :hidden='goodsHidden'>
-						<block v-for="(item,index) in cartList.invalid" :key='index'>
-							<view class='item acea-row row-between-wrapper'>
-								<view class='invalid'>失效</view>
-								<view class='pictrue'>
-									<image v-if="item.productInfo.attrInfo" :src='item.productInfo.attrInfo.image'></image>
-									<image v-else :src='item.productInfo.image'></image>
-								</view>
-								<view class='text acea-row row-column-between'>
-									<view class='line1 name'>{{item.productInfo.storeName}}</view>
-									<view class='infor line1' v-if="item.productInfo.attrInfo">属性：{{item.productInfo.attrInfo.suk}}</view>
-									<view class='acea-row row-between-wrapper'>
-										<!-- <view>￥{{item.truePrice}}</view> -->
-										<view class='end'>该商品已失效</view>
-									</view>
-								</view>
-							</view>
-						</block>
-					</view>
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper' v-if="cartList.valid.length&&!loadend">
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper' v-if="cartList.invalid.length&&loadend">
-					<text class='loading iconfont icon-jiazai' :hidden='loadingInvalid==false'></text>{{loadTitleInvalid}}
-				</view>
-			</view>
-			<view class='noCart' v-if="cartList.valid.length == 0 && cartList.invalid.length == 0">
-				<view class='pictrue'>
-					<image src='../../static/images/noCart.png'></image>
-				</view>
-				<recommend :hostProduct='hostProduct'></recommend>
-			</view>
-			<view style='height:120rpx;color: #F5F5F5;'>{{selectCountPrice}}</view>
-			<view class='footer acea-row row-between-wrapper' v-if="cartList.valid.length > 0">
-				<view>
-					<checkbox-group @change="checkboxAllChange">
-						<checkbox value="all" :checked="!!isAllSelect" /><text class='checkAll'>全选 ({{cartCount}})</text>
-					</checkbox-group>
-				</view>
-				<view class='money acea-row row-middle' v-if="footerswitch==true">
-					<text class='font-color'>￥{{selectCountPrice}}</text>
-					<form @submit="subOrder" report-submit='true'>
-						<button class='placeOrder bg-color' formType="submit">立即下单</button>
-					</form>
-				</view>
-				<view class='button acea-row row-middle' v-else>
-					<form @submit="subCollect" report-submit='true'>
-						<button class='bnt cart-color' formType="submit">收藏</button>
-					</form>
-					<form @submit="subDel" report-submit='true'>
-						<button class='bnt' formType="submit">删除</button>
-					</form>
-				</view>
-			</view>
-		</view>
-		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-		 @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="reGoCat" id='product-window'></productWindow>
-		<!-- #ifdef MP -->
-		<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #endif -->
-
-	</view>
-</template>
-
-<script>
-	import {
-		getCartList,
-		getCartCounts,
-		changeCartNum,
-		cartDel,
-		getResetCart
-	} from '@/api/order.js';
-	import {
-		getProductHot,
-		collectAll,
-		getProductDetail
-	} from '@/api/store.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import recommend from '@/components/recommend';
-	import productWindow from '@/components/productWindow';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	export default {
-		components: {
-			recommend,
-			productWindow,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		data() {
-			return {
-				cartCount: 0,
-				goodsHidden: true,
-				footerswitch: true,
-				hostProduct: [],
-				cartList: {
-					valid: [],
-					invalid: []
-				},
-				isAllSelect: false, //全选
-				selectValue: [], //选中的数据
-				selectCountPrice: 0.00,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				hotScroll: false,
-				hotPage: 1,
-				hotLimit: 10,
-				loading: false,
-				loadend: false,
-				loadTitle: '加载更多', //提示语
-				page: 1,
-				limit: 20,
-				loadingInvalid: false,
-				loadendInvalid: false,
-				loadTitleInvalid: '加载更多', //提示语
-				pageInvalid: 1,
-				limitInvalid: 20,
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				productValue: [], //系统属性
-				storeInfo: {},
-				attrValue: '', //已选属性
-				attrTxt: '请选择', //属性页面提示
-				cartId: 0,
-				product_id: 0
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		onLoad: function(options) {
-			let that = this;
-			if (that.isLogin == false) {
-				// #ifdef H5 || APP-PLUS
-				toLogin();
-				// #endif 
-				// #ifdef MP
-				that.isAuto = true;
-				that.$set(that, 'isShowAuth', true);
-				// #endif
-			}
-		},
-		onShow: function() {
-			if (this.isLogin == true) {
-				this.hotPage = 1;
-				this.hostProduct = [],
-				this.hotScroll = false,
-				this.getHostProduct();
-				this.loadend = false;
-				this.page = 1;
-				this.cartList.valid = [];
-				this.getCartList();
-				this.loadendInvalid = false;
-				this.pageInvalid = 1;
-				this.cartList.invalid = [];
-				this.getInvalidList();
-				this.getCartNum();
-				this.goodsHidden = true;
-				this.footerswitch = true;
-				this.hostProduct = [];
-				this.hotScroll = false;
-				this.hotPage = 1;
-				this.hotLimit = 10;
-				this.cartList = {
-						valid: [],
-						invalid: []
-					},
-					this.isAllSelect = false; //全选
-				this.selectValue = []; //选中的数据
-				this.selectCountPrice = 0.00;
-				this.cartCount = 0;
-				this.isShowAuth = false;
-			};
-		},
-		methods: {
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-			// 修改购物车
-			reGoCat: function() {
-				let that = this,
-					productSelect = that.productValue[this.attrValue];
-				//如果有属性,没有选择,提示用户选择
-				if (
-					that.attr.productAttr.length &&
-					productSelect === undefined
-				)
-					return that.$util.Tips({
-						title: "产品库存不足，请选择其它"
-					});
-					
-				let q = {
-					id: that.cartId,
-					productId: that.product_id,
-					num: that.attr.productSelect.cart_num,
-					unique: that.attr.productSelect !== undefined ?
-						that.attr.productSelect.unique : that.storeInfo.id
-				};
-				getResetCart(q)
-					.then(function(res) {
-						that.attr.cartAttr = false;
-						that.$util.Tips({
-							title: "添加购物车成功",
-							success: () => {
-								that.loadend = false;
-								that.page = 1;
-								that.cartList.valid = [];
-								that.getCartList();
-								that.getCartNum();
-							}
-						});
-					})
-					.catch(res => {
-						return that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-			},
-			reElection: function(item) {
-				this.getGoodsDetails(item)
-			},
-			/**
-			 * 获取产品详情
-			 * 
-			 */
-			getGoodsDetails: function(item) {
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-				let that = this;
-				that.cartId = item.id;
-				that.product_id = item.productId;
-				getProductDetail(item.productId).then(res => {
-					uni.hideLoading();
-					that.attr.cartAttr = true;
-					let storeInfo = res.data.storeInfo;
-					that.$set(that, 'storeInfo', storeInfo);
-					that.$set(that.attr, 'productAttr', res.data.productAttr);
-					that.$set(that, 'productValue', res.data.productValue);
-					that.DefaultSelect();
-				}).catch(err => {
-					uni.hideLoading();
-				})
-			},
-			/**
-			 * 属性变动赋值
-			 * 
-			 */
-			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.id);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", res);
-					this.$set(this, "attrTxt", "已选择");
-				} 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.storeInfo.id);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				}
-			},
-			/**
-			 * 默认选中属性
-			 * 
-			 */
-			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.sort().join(",")];
-				if (productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"storeName",
-						this.storeInfo.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.id);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", value.sort().join(","));
-					this.$set(this, "attrTxt", "已选择");
-				} else if (!productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"storeName",
-						this.storeInfo.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.storeInfo.id);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				} else if (!productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"storeName",
-						this.storeInfo.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.id || ""
-					);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				}
-			},
-			attrVal(val) {
-				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attrValues[val.indexn]);
-			},
-			/**
-			 * 购物车数量加和数量减
-			 * 
-			 */
-			ChangeCartNum: function(changeValue) {
-				//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;
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
-						this.$set(this, "cart_num", stock ? stock : 1);
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num < 1) {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-						this.$set(this, "cart_num", 1);
-					}
-				}
-			},
-			/**
-			 * 购物车手动填写
-			 * 
-			 */
-			iptCartNum: function(e) {
-				this.$set(this.attr.productSelect, 'cart_num', e);
-			},
-			subDel: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
-				if (selectValue.length > 0)
-					cartDel(selectValue).then(res => {
-						that.loadend = false;
-						that.page = 1;
-						that.cartList.valid = [];
-						that.getCartList();
-						that.getCartNum();
-					});
-				else
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-			},
-			getSelectValueProductId: function() {
-				let that = this;
-				let validList = that.cartList.valid;
-				let selectValue = that.selectValue;
-				let productId = [];
-				if (selectValue.length > 0) {
-					for (let index in validList) {
-						if (that.inArray(validList[index].id, selectValue)) {
-							productId.push(validList[index].productId);
-						}
-					}
-				};
-				return productId;
-			},
-			subCollect: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
-				if (selectValue.length > 0) {
-					let selectValueProductId = that.getSelectValueProductId();
-					collectAll(that.getSelectValueProductId()).then(res => {
-						return that.$util.Tips({
-							title: '收藏成功',
-							icon: 'success'
-						});
-					}).catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					});
-				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-				}
-			},
-			subOrder: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
-				if (selectValue.length > 0) {
-					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?new=false&cartId=' + selectValue.join(',')
-					});
-				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-				}
-			},
-			checkboxAllChange: function(event) {
-				let value = event.detail.value;
-				if (value.length > 0) {
-					this.setAllSelectValue(1)
-				} else {
-					this.setAllSelectValue(0)
-				}
-			},
-			setAllSelectValue: function(status) {
-				let that = this;
-				let selectValue = [];
-				let valid = that.cartList.valid;
-				if (valid.length > 0) {
-					for (let index in valid) {
-						if (status == 1) {
-							if(valid[index].attrStatus){
-								valid[index].checked = true;
-								selectValue.push(valid[index].id);
-							}else{
-								valid[index].checked = false;
-							}
-						} else valid[index].checked = false;
-					}
-					that.$set(that.cartList, 'valid', valid);
-					that.selectValue = selectValue;
-					that.switchSelect();
-				}
-			},
-			checkboxChange: function(event) {
-				let that = this;
-				let value = event.detail.value;
-				let valid = that.cartList.valid;
-				for (let index in valid) {
-					if (that.inArray(valid[index].id, value)){
-						if(valid[index].attrStatus){
-							valid[index].checked = true;
-						}else{
-							valid[index].checked = false;
-						}
-					} else {
-						valid[index].checked = false;
-					} 
-				}
-				that.$set(that.cartList, 'valid', valid);
-				let newArr = that.cartList.valid.filter(item => item.attrStatus);
-				that.isAllSelect = value.length == newArr.length;
-				that.selectValue = value;
-				that.switchSelect();
-			},
-			inArray: function(search, array) {
-				for (let i in array) {
-					if (array[i] == search) {
-						return true;
-					}
-				}
-				return false;
-			},
-			switchSelect: function() {
-				let that = this;
-				let validList = that.cartList.valid;
-				let selectValue = that.selectValue;
-				let selectCountPrice = 0.00;
-				if (selectValue.length < 1) {
-					that.selectCountPrice = selectCountPrice;
-				} else {
-					for (let index in validList) {
-						if (that.inArray(validList[index].id, selectValue)) {
-							selectCountPrice = that.$util.$h.Add(selectCountPrice, that.$util.$h.Mul(validList[index].cartNum, validList[
-								index].truePrice))
-						}
-					}
-					that.selectCountPrice = selectCountPrice;
-				}
-			},
-			/**
-			 * 购物车手动填写
-			 * 
-			 */
-			iptCartNum: function(index) {
-				let item = this.cartList.valid[index];
-				if (item.cartNum) {
-					this.setCartNum(item.id, item.cartNum);
-				}
-				this.switchSelect();
-			},
-			blurInput: function(index) {
-				let item = this.cartList.valid[index];
-				if (!item.cartNum) {
-					item.cartNum = 1;
-					this.$set(this.cartList, 'valid', this.cartList.valid)
-				}
-			},
-			subCart: function(index) {
-				let that = this;
-				let status = false;
-				let item = that.cartList.valid[index];
-				item.cartNum = Number(item.cartNum) - 1;
-				if (item.cartNum < 1) status = true;
-				if (item.cartNum <= 1) {
-					item.cartNum = 1;
-					item.numSub = true;
-				} else {
-					item.numSub = false;
-					item.numAdd = false;
-				}
-				if (false == status) {
-					that.setCartNum(item.id, item.cartNum, function(data) {
-						that.cartList.valid[index] = item;
-						that.switchSelect();
-					});
-				}
-			},
-			addCart: function(index) {
-				let that = this;
-				let item = that.cartList.valid[index];
-				item.cartNum = Number(item.cartNum) + 1;
-				let productInfo = item.productInfo;
-				if (productInfo.hasOwnProperty('attrInfo') && item.cartNum >= item.productInfo.attrInfo.stock) {
-					item.cartNum = item.productInfo.attrInfo.stock;
-					item.numAdd = true;
-					item.numSub = false;
-				} else {
-					item.numAdd = false;
-					item.numSub = false;
-				}
-				that.setCartNum(item.id, item.cartNum, function(data) {
-					that.cartList.valid[index] = item;
-					that.switchSelect();
-				});
-			},
-			setCartNum(cartId, cartNum, successCallback) {
-				let that = this;
-				changeCartNum(cartId, cartNum).then(res => {
-					successCallback && successCallback(res.data);
-				});
-			},
-			getCartNum: function() {
-				let that = this;
-				getCartCounts().then(res => {
-					that.cartCount = res.data.count;
-				});
-			},
-			getCartList: function() {
-				let that = this;
-				if (this.loadend) return false;
-				if (this.loading) return false;
-				let data = {
-					page: that.page,
-					limit: that.limit,
-					isValid : true
-				}
-				getCartList(data).then(res => {
-					let valid = res.data.list;
-					let loadend = valid.length < that.limit;
-					let validList = that.$util.SplitArray(valid, that.cartList.valid);
-					let numSub = [{
-						numSub: true
-					}, {
-						numSub: false
-					}];
-					let numAdd = [{
-							numAdd: true
-						}, {
-							numAdd: false
-						}],
-						selectValue = [];
-					if (validList.length > 0) {
-						for (let index in validList) {
-							if (validList[index].cartNum == 1) {
-								validList[index].numSub = true;
-							} else {
-								validList[index].numSub = false;
-							}
-							let productInfo = validList[index].productInfo;
-							
-							let stock = validList[index].productInfo.attrInfo?validList[index].productInfo.attrInfo.stock:0;
-							if (productInfo.hasOwnProperty('attrInfo') && validList[index].cartNum == stock) {
-								validList[index].numAdd = true;
-							} else if (validList[index].cartNum == validList[index].productInfo.stock) {
-								validList[index].numAdd = true;
-							} else {
-								validList[index].numAdd = false;
-							}
-							if(validList[index].attrStatus){
-								validList[index].checked = true;
-								selectValue.push(validList[index].id);
-							}else{
-								validList[index].checked = false;
-							}
-						}
-					}
-					that.$set(that.cartList, 'valid', validList);
-					that.loadend = loadend;
-					that.loadTitle = loadend ? '我也是有底线的' : '加载更多';
-					that.page = that.page + 1;
-					that.loading = false;
-					// that.goodsHidden = cartList.valid.length <= 0 ? false : true;
-					that.selectValue = selectValue;
-					let newArr = validList.filter(item => item.attrStatus);
-					that.isAllSelect = newArr.length == selectValue.length && newArr.length;
-					that.switchSelect();
-				}).catch(function(err) {
-					that.$util.Tips({
-						title: err
-					});
-					that.loading = false;
-					that.loadTitle = '加载更多';
-				})
-			},
-			getInvalidList: function() {
-				let that = this;
-				if (this.loadendInvalid) return false;
-				if (this.loadingInvalid) return false;
-				let data = {
-					page: that.pageInvalid,
-					limit: that.limitInvalid,
-					isValid: false
-				}
-				getCartList(data).then(res => {
-					let invalid = res.data.list,
-						loadendInvalid = invalid.length < that.limitInvalid;
-					let invalidList = that.$util.SplitArray(invalid, that.cartList.invalid);
-					that.$set(that.cartList, 'invalid', invalidList);
-					that.loadendInvalid = loadendInvalid;
-					that.loadTitleInvalid = loadendInvalid ? '我也是有底线的' : '加载更多';
-					
-					that.pageInvalid = that.pageInvalid + 1;
-					that.loadingInvalid = false;
-				}).catch(res => {
-					that.loadingInvalid = false;
-					that.loadTitleInvalid = '加载更多';
-				})
-
-			},
-			getHostProduct: function() {
-				let that = this;
-				if (that.hotScroll) return
-				getProductHot(
-					that.hotPage,
-					that.hotLimit,
-				).then(res => {
-					that.hotPage++
-					that.hotScroll = res.data.list.length < that.hotLimit
-					that.hostProduct = that.hostProduct.concat(res.data.list)
-				});
-			},
-			goodsOpen: function() {
-				let that = this;
-				that.goodsHidden = !that.goodsHidden;
-			},
-			manage: function() {
-				let that = this;
-				that.footerswitch = !that.footerswitch;
-			},
-			unsetCart: function() {
-				let that = this,
-					ids = [];
-				for (let i = 0, len = that.cartList.invalid.length; i < len; i++) {
-					ids.push(that.cartList.invalid[i].id);
-				}
-				cartDel(ids).then(res => {
-					that.$util.Tips({
-						title: '清除成功'
-					});
-					that.$set(that.cartList, 'invalid', []);
-				}).catch(res => {
-
-				});
-			}
-		},
-		onReachBottom() {
-			let that = this;
-			if (that.loadend) {
-				that.getInvalidList();
-			} else {
-				that.getCartList();
-			}
-			if (that.cartList.valid.length == 0 && that.cartList.invalid.length == 0) {
-				that.getHostProduct();
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.shoppingCart .labelNav {
-		height: 76rpx;
-		padding: 0 30rpx;
-		font-size: 22rpx;
-		color: #8c8c8c;
-		position: fixed;
-		left: 0;
-		width: 100%;
-		box-sizing: border-box;
-		background-color: #f5f5f5;
-		z-index: 5;
-		top: 0;
-	}
-
-	.shoppingCart .labelNav .item .iconfont {
-		font-size: 25rpx;
-		margin-right: 10rpx;
-	}
-
-	.shoppingCart .nav {
-		width: 100%;
-		height: 80rpx;
-		background-color: #fff;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		color: #282828;
-		position: fixed;
-		left: 0;
-		z-index: 5;
-		top: 76rpx;
-	}
-
-	.shoppingCart .nav .num {
-		margin-left: 12rpx;
-	}
-
-	.shoppingCart .nav .administrate {
-		font-size: 26rpx;
-		color: #282828;
-		width: 110rpx;
-		height: 46rpx;
-		border-radius: 6rpx;
-		border: 1px solid #868686;
-	}
-
-	.shoppingCart .noCart {
-		margin-top: 171rpx;
-		background-color: #fff;
-		padding-top: 0.1rpx;
-	}
-
-	.shoppingCart .noCart .pictrue {
-		width: 414rpx;
-		height: 336rpx;
-		margin: 78rpx auto 56rpx auto;
-	}
-
-	.shoppingCart .noCart .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.shoppingCart .list {
-		margin-top: 171rpx;
-	}
-
-	.shoppingCart .list .item {
-		padding: 25rpx 30rpx;
-		background-color: #fff;
-		margin-bottom: 15rpx;
-	}
-
-	.shoppingCart .list .item .picTxt {
-		width: 627rpx;
-		position: relative;
-	}
-
-	.shoppingCart .list .item .picTxt .pictrue {
-		width: 160rpx;
-		height: 160rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text {
-		width: 444rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reColor {
-		color: #999;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reElection {
-		margin-top: 20rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reElection .title {
-		font-size: 24rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reElection .reBnt {
-		width: 120rpx;
-		height: 46rpx;
-		border-radius: 23rpx;
-		font-size: 26rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .infor {
-		font-size: 24rpx;
-		color: #868686;
-		margin-top: 16rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .money {
-		font-size: 32rpx;
-		color: #282828;
-		margin-top: 28rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum {
-		height: 47rpx;
-		position: absolute;
-		bottom: 7rpx;
-		right: 0;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum view {
-		border: 1rpx solid #a4a4a4;
-		width: 66rpx;
-		text-align: center;
-		height: 100%;
-		line-height: 40rpx;
-		font-size: 28rpx;
-		color: #a4a4a4;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .reduce {
-		border-right: 0;
-		border-radius: 3rpx 0 0 3rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .reduce.on {
-		border-color: #e3e3e3;
-		color: #dedede;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .plus {
-		border-left: 0;
-		border-radius: 0 3rpx 3rpx 0;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .num {
-		color: #282828;
-	}
-
-	.shoppingCart .invalidGoods {
-		background-color: #fff;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav {
-		width: 100%;
-		height: 66rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .iconfont {
-		color: #424242;
-		font-size: 28rpx;
-		margin-right: 17rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .del {
-		font-size: 26rpx;
-		color: #999;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
-		color: #999;
-		font-size: 33rpx;
-		vertical-align: -2rpx;
-		margin-right: 8rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item {
-		padding: 20rpx 30rpx;
-		border-top: 1rpx solid #f5f5f5;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .invalid {
-		font-size: 22rpx;
-		color: #fff;
-		width: 70rpx;
-		height: 36rpx;
-		background-color: #aaa;
-		border-radius: 3rpx;
-		text-align: center;
-		line-height: 36rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .pictrue {
-		width: 140rpx;
-		height: 140rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text {
-		width: 433rpx;
-		font-size: 28rpx;
-		color: #999;
-		height: 140rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text .name {
-		width: 100%;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text .infor {
-		font-size: 24rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text .end {
-		font-size: 26rpx;
-		color: #bbb;
-	}
-
-	.shoppingCart .footer {
-		z-index: 9;
-		width: 100%;
-		height: 96rpx;
-		background-color: #fafafa;
-		position: fixed;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		border-top: 1rpx solid #eee;
-		// 
-		bottom: 0;
-		// 
-		// #ifndef MP
-		bottom: 50px;
-		// #endif
-	}
-
-	.shoppingCart .footer .checkAll {
-		font-size: 28rpx;
-		color: #282828;
-		margin-left: 16rpx;
-	}
-
-	// .shoppingCart .footer checkbox .wx-checkbox-input{background-color:#fafafa;}
-	.shoppingCart .footer .money {
-		font-size: 30rpx;
-	}
-
-	.shoppingCart .footer .placeOrder {
-		color: #fff;
-		font-size: 30rpx;
-		width: 226rpx;
-		height: 70rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 70rpx;
-		margin-left: 22rpx;
-	}
-
-	.shoppingCart .footer .button .bnt {
-		font-size: 28rpx;
-		color: #999;
-		border-radius: 50rpx;
-		border: 1px solid #999;
-		width: 160rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-	}
-
-	.shoppingCart .footer .button form~form {
-		margin-left: 17rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 5ecf3040..8bf99718 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -226,7 +226,7 @@
 		</view>
 		<home></home>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
 	</view>
@@ -658,7 +658,8 @@
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
 				id: 0, //订单id
-				uniId: ''
+				uniId: '',
+				utils: this.$util,
 			};
 		},
 		computed: mapGetters(['isLogin', 'chatUrl']),
@@ -676,13 +677,7 @@
 				this.getOrderInfo();
 				this.getUserInfo();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		onHide: function() {
@@ -835,7 +830,6 @@
 						newCartInfo.push(item.info);
 					});
 					that.$set(that, 'cartInfo', newCartInfo);
-					console.log(that.cartInfo)
 					if (res.data.refundStatus != 0) {
 						that.isGoodsReturn = true;
 					};
@@ -961,7 +955,7 @@
 			 */
 			delOrder: function() {
 				let that = this;
-				orderDel(this.order_id).then(res => {
+				orderDel(this.id).then(res => {
 					return that.$util.Tips({
 						title: '删除成功',
 						icon: 'success'
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 116c094c..a142d0d0 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -47,7 +47,7 @@
 			<button @click="goIndex" class='returnBnt cart-color' formType="submit" hover-class='none' v-else>返回首页</button>
 			</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -88,6 +88,16 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getOrderPayInfo();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad: function(options) {
 			if (!options.order_id) return this.$util.Tips({
 				title: '缺少参数无法查看订单支付状态'
@@ -101,13 +111,7 @@
 			if (this.isLogin) {
 				this.getOrderPayInfo();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c020ea17..98c4b77f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -12,6 +12,11 @@
 							请点击授权
 						</view>
 						<!-- #endif -->
+						<!-- #ifdef H5 -->
+						<view class="name" v-if="!userInfo.uid && isWeixin" @tap="openAuto">
+							请点击授权
+						</view>
+						<!-- #endif -->
 						<view class="name" v-if="userInfo.uid">
 							{{userInfo.nickname}}
 							<view class="vip" v-if="userInfo.vip">
@@ -20,7 +25,7 @@
 							</view>
 						</view>
 						<view class="num" v-if="userInfo.phone" @click="goEdit()">
-							<view class="num-txt">ID：{{userInfo.uid}}</view>
+							<view class="num-txt">{{userInfo.phone}}</view>
 							<view class="icon">
 								<image src="/static/images/edit.png" mode=""></image>
 							</view>
@@ -71,9 +76,7 @@
 			 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
 				<block v-for="(item,index) in imgUrls" :key="index">
 					<swiper-item>
-						<navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
-							<image :src="item.pic" class="slide-image"></image>
-						</navigator>
+						<image :src="item.pic" class="slide-image" @click="navito(item.url)"></image>
 					</swiper-item>
 				</block>
 			</swiper>
@@ -92,7 +95,7 @@
 			<!-- #ifdef H5 -->
 			<view class="item" @click="kefuClick">
 				<view class="left">
-					<image src="/static/images/user_menu08.png"></image>
+					<image :src="servicePic"></image>
 					<text>联系客服</text>
 				</view>
 				<view class="iconfont icon-xiangyou"></view>
@@ -101,7 +104,7 @@
 			<!-- #ifdef MP -->
 			<button class="item" open-type='contact' hover-class='none'>
 				<view class="left">
-					<image src="/static/images/user_menu08.png"></image>
+					<image :src="servicePic"></image>
 					<text>联系客服</text>
 				</view>
 				<view class="iconfont icon-xiangyou"></view>
@@ -110,7 +113,7 @@
 		</view>
 		<img src="/static/images/support.png" alt="" class='support'>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -129,6 +132,9 @@
 	import {
 		mapGetters
 	} from "vuex";
+	// #ifdef H5
+	import Auth from '@/libs/wechat';
+	// #endif
 	// #ifdef MP
 	import authorize from '@/components/Authorize';
 	// #endif
@@ -184,12 +190,22 @@
 				orderStatusNum: {},
 				userInfo: {},
 				MyMenus: [],
-				wechatUrl: []
+				wechatUrl: [],
+				servicePic: '',
+				// #ifdef H5
+				isWeixin: Auth.isWeixin()
+				//#endif
 			}
 		},
 		onLoad() {
 			let that = this;
 			that.$set(that, 'MyMenus', app.globalData.MyMenus);
+			console.log('user页面',that.isLogin)
+			if (that.isLogin == false) {
+				// #ifdef H5 || APP-PLUS
+				toLogin()
+				// #endif
+			}
 		},
 		onShow: function() {
 			let that = this;
@@ -199,11 +215,7 @@
 				// this.setVisit();
 				this.getOrderData();
 			}else{
-				// #ifdef H5 || APP-PLUS
-				if (that.isLogin == false) {
-					toLogin();
-				}
-				// #endif
+				toLogin();
 			}
 		},
 		methods: {
@@ -213,11 +225,11 @@
 			// 		url:'/pages/user/index'
 			// 	}).then(res=>{})
 			// },
+			navito(e){
+				window.location.href = 'https://' + e;
+			},
 			kefuClick(){
-				location.href = this.wechatUrl[0].wap_url
-				// return this.$util.Tips({
-				// 	title: '客服功能正在开发中......'
-				// });
+				location.href = this.wechatUrl[0].wap_url;
 			},
 			getOrderData(){
 				let that = this;
@@ -246,8 +258,8 @@
 			},
 			// 打开授权
 			openAuto() {
-				this.isAuto = true;
-				this.isShowAuth = true
+				console.log('点击事件','lala')
+				toLogin();
 			},
 			// 授权回调
 			onLoadFun() {
@@ -277,6 +289,7 @@
 			 * 获取个人用户信息
 			 */
 			getUserInfo: function() {
+				const _app = getApp();
 				let that = this;
 				getUserInfo().then(res => {
 					that.userInfo = res.data;
@@ -292,22 +305,27 @@
 				if (this.MyMenus.length) return;
 				getMenuList().then(res => {
 					that.$set(that, 'MyMenus', res.data.routine_my_menus);
-					// location.pathname.indexOf('auth') !== -1
-					// console.log( res.data.routine_my_menus.filter( item => {
-					// 	if( item.url.indexOf('service') !== -1 ) return item.wap_url
-					// }))
-					this.wechatUrl = res.data.routine_my_menus.filter((item) => {
+					that.wechatUrl = res.data.routine_my_menus.filter((item) => {
 						return item.url.indexOf('service') !== -1
 					})
-					console.log(this.wechatUrl)
-					this.imgUrls = res.data.routine_my_banner
+					res.data.routine_my_menus.map((item) => {
+						if(item.url.indexOf('service') !==-1) that.servicePic = item.pic
+					})
+					that.imgUrls = res.data.routine_my_banner
 				});
 			},
 			// 编辑页面
 			goEdit() {
-				uni.navigateTo({
-					url: '/pages/users/user_info/index'
-				})
+				if (this.isLogin == false) {
+					toLogin();
+				} else {
+					uni.navigateTo({
+						url: '/pages/users/user_info/index'
+					})
+				}
+				// uni.navigateTo({
+				// 	url: '/pages/users/user_info/index'
+				// })
 			},
 			// 签到
 			goSignIn() {
@@ -391,13 +409,12 @@
 							.vip {
 								display: flex;
 								align-items: center;
-								height: 36rpx;
-								padding: 0 20rpx;
+								padding: 6rpx 20rpx;
 								background: rgba(0, 0, 0, 0.2);
 								border-radius: 18px;
 								font-size: 20rpx;
 								margin-left: 12rpx;
-								margin-top: 2rpx;
+								// margin-top: 2rpx;
 
 								image {
 									width: 27rpx;
diff --git a/pages/users/commission_rank/index.vue b/pages/users/commission_rank/index.vue
index 3785eaf6..1dd1d26a 100644
--- a/pages/users/commission_rank/index.vue
+++ b/pages/users/commission_rank/index.vue
@@ -32,7 +32,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -74,18 +74,23 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getBrokerageRankList();
+						this.getBrokerageRankNumber(this.type);
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getBrokerageRankList();
 				this.getBrokerageRankNumber(this.type);
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/goods_comment_con/index.vue b/pages/users/goods_comment_con/index.vue
index c5ef3876..8f2f8a70 100644
--- a/pages/users/goods_comment_con/index.vue
+++ b/pages/users/goods_comment_con/index.vue
@@ -40,7 +40,7 @@
 			</view>
 		</form>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -92,6 +92,16 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getOrderProduct();
+					}
+				},
+				deep: true
+			}
+		},
 		onLoad(options) {
 			if (!options.unique || !options.uni || !options.id) return this.$util.Tips({
 				title: '缺少参数'
@@ -106,13 +116,7 @@
 			if (this.isLogin) {
 				this.getOrderProduct();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/goods_comment_list/index.vue b/pages/users/goods_comment_list/index.vue
index ba6fe6ae..0e604dca 100644
--- a/pages/users/goods_comment_list/index.vue
+++ b/pages/users/goods_comment_list/index.vue
@@ -98,7 +98,9 @@
 					that.$set(that,'reply',that.reply);
 					that.loading = false;
 					that.loadend = loadend;
-					that.loadTitle = loadend ? "😕人家是有底线的~~" : "加载更多";
+					if(that.reply.length){
+						that.loadTitle = loadend ? "😕人家是有底线的~~" : "加载更多";
+					}
 					that.page = that.page + 1;
 				}).catch(err => {
 					that.loading = false,
diff --git a/pages/users/goods_details_store/index.vue b/pages/users/goods_details_store/index.vue
index a679ef95..3f3c353b 100644
--- a/pages/users/goods_details_store/index.vue
+++ b/pages/users/goods_details_store/index.vue
@@ -14,7 +14,7 @@
 						<!-- #ifdef H5 -->
 						<a class="store-phone" :href="'tel:' + item.phone"><span class="iconfont icon-dadianhua01"></span></a>
 						<!-- #endif -->
-						<!-- #ifdef MP -->
+						<!-- #ifdef MP || APP-PLUS -->
 						<view class="store-phone" @click="call(item.phone)"><text class="iconfont icon-dadianhua01"></text></view>
 						<!-- #endif -->
 					</div>
diff --git a/pages/users/goods_logistics/index.vue b/pages/users/goods_logistics/index.vue
index 87c119c0..b7ff38c5 100644
--- a/pages/users/goods_logistics/index.vue
+++ b/pages/users/goods_logistics/index.vue
@@ -40,7 +40,7 @@
 			<recommend :hostProduct='hostProduct' v-if="hostProduct.length"></recommend>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -78,10 +78,27 @@
 				},
 				orderInfo: {},
 				expressList: [],
-				hostProduct: []
+				hostProduct: [],
+				loading: false,
+				goodScroll: true,
+				params: { //精品推荐分页
+					page: 1,
+					limit: 10,
+				},
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getExpress();
+						this.get_host_product();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad: function (options) {
 		    if (!options.orderId) return this.$util.Tips({title:'缺少订单号'});
 			this.orderId = options.orderId;
@@ -89,13 +106,7 @@
 				this.getExpress();
 				this.get_host_product();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		  },
 		  onReady: function() {
@@ -133,13 +144,43 @@
 			  /**
 			* 获取我的推荐
 			*/
+		   // getGroomList(onloadH) {
+		   // 	this.loading = true
+		   // 	if (!this.goodScroll) return
+		   // 	if (onloadH) {
+		   // 		this.iSshowH = true
+		   // 	}
+		   // 	getGroomList(type, this.params).then(({
+		   // 		data
+		   // 	}) => {
+		   // 		this.iSshowH = false
+		   // 		this.loading = false
+		   // 		this.goodScroll = data.list.length >= this.params.limit
+		   // 		this.params.page++
+		   // 		this.tempArr = this.tempArr.concat(data.list)
+		   // 	})
+		   // }
 			  get_host_product: function () {
+				  	this.loading = true
+				  	if (!this.goodScroll) return
 			    let that = this;
-			    getProductHot().then(function (res) {
-					that.$set(that,'hostProduct',res.data.list);
+			    getProductHot(that.params.page,that.params.limit).then(function (res) {
+							//this.iSshowH = false
+							that.loading = false
+							that.goodScroll = res.data.list.length >= that.params.limit
+							that.params.page++
+							that.hostProduct = that.hostProduct.concat(res.data.list)
+				//	that.$set(that,'hostProduct',res.data.list);
 			    });
 			  },
-		}
+		},
+		// 滚动到底部
+		onReachBottom() {
+		
+			if (this.params.page != 1) {
+				this.get_host_product();
+			}
+		},
 	}
 </script>
 
diff --git a/pages/users/goods_return/index.vue b/pages/users/goods_return/index.vue
index e9a81074..da56d4f3 100644
--- a/pages/users/goods_return/index.vue
+++ b/pages/users/goods_return/index.vue
@@ -59,7 +59,7 @@
 		  </view>
 		</form>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -93,6 +93,17 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getOrderInfo();
+						this.getRefundReason();
+					}
+				},
+				deep:true
+			}
+		},
 		 onLoad: function (options) {
 		    if (!options.orderId) return this.$util.Tips({title:'缺少订单id,无法退款'},{tab:3,url:1});
 			this.orderId = options.orderId;
@@ -100,13 +111,7 @@
 				this.getOrderInfo();
 				this.getRefundReason();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		  },
 		methods: {
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 725abf8e..7d68acf5 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -1,47 +1,36 @@
 <template>
-	<div class="register absolute">
+	<div class="login-wrapper">
 		<div class="shading">
-			<div class="pictrue acea-row row-center-wrapper">
-				<image :src="logoUrl" v-if="logoUrl" />
-				<image src="../../../static/images/logo2.png" v-else />
-			</div>
+			<image :src="logoUrl" v-if="logoUrl" />
+			<image src="/static/images/logo2.png" v-else />
 		</div>
 		<div class="whiteBg" v-if="formItem === 1">
-			<div class="title acea-row row-center-wrapper">
-				<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)"
-				 :key="index">
-					{{ item }}
-				</div>
-			</div>
-			<div class="list" :hidden="current !== 1">
+			<div class="list" v-if="current !== 1">
 				<form @submit.prevent="submit">
 					<div class="item">
 						<div class="acea-row row-middle">
-							<image src="/static/images/phone_1.png"></image>
+							<image src="/static/images/phone_1.png"  style="width: 24rpx; height: 34rpx;"></image>
 							<input type="text" placeholder="输入手机号码" v-model="account" required />
 						</div>
 					</div>
 					<div class="item">
 						<div class="acea-row row-middle">
-							<image src="/static/images/code_2.png"></image>
+							<image src="/static/images/code_2.png" style="width: 28rpx; height: 32rpx;"></image>
 							<input type="password" placeholder="填写登录密码" v-model="password" required />
 						</div>
 					</div>
 				</form>
-				<!-- <navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
-					<span class="iconfont icon-wenti"></span>忘记密码
-				</navigator> -->
 			</div>
-			<div class="list" :hidden="current !== 0">
+			<div class="list" v-if="current !== 0 || appLoginStatus || appleLoginStatus">
 				<div class="item">
 					<div class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
+						<image src="/static/images/phone_1.png" style="width: 24rpx; height: 34rpx;"></image>
 						<input type="text" placeholder="输入手机号码" v-model="account" />
 					</div>
 				</div>
 				<div class="item">
 					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
+						<image src="/static/images/code_2.png" style="width: 28rpx; height: 32rpx;"></image>
 						<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
 						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
 							{{ text }}
@@ -50,59 +39,44 @@
 				</div>
 				<div class="item" v-if="isShowCode">
 					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
+						<image src="/static/images/code_2.png" style="width: 28rpx; height: 32rpx;"></image>
 						<input type="text" placeholder="填写验证码" class="codeIput" v-model="codeVal" />
 						<div class="code" @click="again"><img :src="codeUrl" /></div>
 					</div>
 				</div>
 			</div>
-			<div class="logon" @click="loginMobile" :hidden="current !== 0">登录</div>
-			<div class="logon" @click="submit" :hidden="current === 0">登录</div>
-			<div class="tip">
-				<div :hidden="current !== 1">
-					没有账号?
-					<span @click="current = 0" class="font-color-red">快速登录</span>
-				</div>
+			<div class="logon" @click="loginMobile" v-if="current !== 0">登录</div>
+			<div class="logon" @click="submit" v-if="current === 0">登录</div>
+			<!-- #ifndef APP-PLUS -->
+			<div class="tips">
+				<div v-if="current==0" @click="current = 1">快速登录</div>
+				<div v-if="current==1" @click="current = 0">账号登录</div>
 			</div>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
+				<view class="hds">
+					<span class="line"></span>
+					<p>其他方式登录</p>
+					<span class="line"></span>
+				</view>
+				<view class="btn-wrapper">
+					<view class="btn wx" @click="wxLogin">
+						<span class="iconfont icon-s-weixindenglu1"></span>
+					</view>
+					<view class="btn mima" v-if="current == 1" @click="current =0">
+						<span class="iconfont icon-s-mimadenglu1"></span>
+					</view>
+					<view class="btn yanzheng" v-if="current == 0" @click="current =1">
+						<span class="iconfont icon-s-yanzhengmadenglu1"></span>
+					</view>
+					<view class="apple-btn" @click="appleLogin" v-if="appleShow">
+						<view class="iconfont icon-s-pingguo"></view>通过Apple登录
+					</view>
+				</view>
+			</view>
+			<!-- #endif -->
 		</div>
-		<!-- <div class="whiteBg" v-else>
-			<div class="title">注册账号</div>
-			<div class="list">
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" v-model="account" />
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
-							{{ text }}
-						</button>
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_1.png"></image>
-						<input type="password" placeholder="填写您的登录密码" v-model="password" />
-					</div>
-				</div>
-				<div class="item" v-if="isShowCode">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="codeVal" />
-						<div class="code" @click="again"><img :src="codeUrl" /></div>
-					</div>
-				</div>
-			</div>
-			<div class="logon" @click="register">注册</div>
-			<div class="tip">
-				已有账号?
-				<span @click="formItem = 1" class="font-color-red">立即登录</span>
-			</div>
-		</div> -->
 		<div class="bottom"></div>
 	</div>
 </template>
@@ -150,7 +124,12 @@
 				keyCode: "",
 				codeUrl: "",
 				codeVal: "",
-				isShowCode: false
+				isShowCode: false,
+				appLoginStatus: false, // 微信登录强制绑定手机号码状态
+				appUserInfo: null, // 微信登录保存的用户信息
+				appleLoginStatus: false, // 苹果登录强制绑定手机号码状态
+				appleUserInfo: null,
+				appleShow: false // 苹果登录版本必须要求ios13以上的
 			};
 		},
 		watch:{
@@ -167,6 +146,138 @@
 			this.getLogoImage();
 		},
 		methods: {
+			// 苹果登录
+			appleLogin() {
+				let self = this
+				this.account = ''
+				this.captcha = ''
+				uni.showLoading({
+					title: '登录中'
+				})
+				uni.login({
+					provider: 'apple',
+					timeout: 10000,
+					success(loginRes) {
+						console.log(loginRes, 'loginRes')
+						uni.getUserInfo({
+							provider: 'apple',
+							success: function(infoRes) {
+								console.log(infoRes.userInfo, 'yyyy')
+								self.appleUserInfo = infoRes.userInfo
+								self.appleLoginApi()
+			
+								console.log(self.$store);
+								console.log(infoRes.userInfo);
+							},
+							fail() {
+								uni.showToast({
+									title: '获取用户信息失败',
+									icon: 'none',
+									duration: 2000
+								})
+							},
+							complete() {
+								uni.hideLoading()
+							}
+						});
+					},
+					fail(error) {
+						console.log(error)
+					}
+				})
+			},
+			// 苹果登录Api
+			appleLoginApi() {
+				let self = this
+				appleLogin({
+					openId: self.appleUserInfo.openId,
+					email: self.appleUserInfo.email || '',
+					phone: this.account,
+					captcha: this.captcha
+				}).then(({
+					data
+				}) => {
+					if (data.isbind) {
+						uni.showModal({
+							title: '提示',
+							content: '请绑定手机号后，继续操作',
+							showCancel: false,
+							success: function(res) {
+								if (res.confirm) {
+									self.current = 1
+									self.appleLoginStatus = true
+								}
+							}
+						});
+					} else {
+						self.$store.commit("LOGIN", {
+							'token': data.token,
+							'time': data.expires_time - self.$Cache.time()
+						});
+						let backUrl = self.$Cache.get(BACK_URL) || "/pages/index/index";
+						self.$Cache.clear(BACK_URL);
+						self.$store.commit("SETUID", data.userInfo.uid);
+						uni.reLaunch({
+							url: backUrl
+						});
+					}
+				}).catch(error => {
+					uni.showModal({
+						title: '提示',
+						content: `错误信息${error}`,
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				})
+			},
+			// App微信登录
+			wxLogin() {
+				let self = this
+				this.account = ''
+				this.captcha = ''
+				uni.showLoading({
+					title: '登录中'
+				})
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						// 获取用户信息
+						uni.getUserInfo({
+							provider: 'weixin',
+							success: function(infoRes) {
+								console.log(infoRes.userInfo, 'yyyy')
+								self.appUserInfo = infoRes.userInfo
+								self.wxLoginApi()
+			
+								console.log(self.$store);
+								console.log(infoRes.userInfo);
+							},
+							fail() {
+								uni.showToast({
+									title: '获取用户信息失败',
+									icon: 'none',
+									duration: 2000
+								})
+							},
+							complete() {
+								uni.hideLoading()
+							}
+						});
+					},
+					fail() {
+						uni.showToast({
+							title: '登录失败',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				});
+			},
 			again() {
 				this.codeUrl =
 					VUE_APP_API_URL +
@@ -221,8 +332,9 @@
 						});
 						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
-						// getUserInfo().then(res => {
-							that.$store.commit("SETUID", res.data.user.uid);
+						getUserInfo().then(res => {
+							that.$store.commit("UPDATE_USERINFO", res.data);
+							that.$store.commit("SETUID", res.data.uid);
 							if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ===
 								'/pages/user/index') {
 
@@ -231,11 +343,12 @@
 								});
 
 							} else {
-								uni.switchTab({
-									url: '/pages/index/index'
-								});
+								uni.navigateBack()
+								// uni.switchTab({
+								// 	url: '/pages/index/index'
+								// });
 							}
-						// })
+						})
 					})
 					.catch(res => {
 						that.$util.Tips({
@@ -304,7 +417,7 @@
 						// 	that.codeUrl = `${VUE_APP_API_URL}/sms_captcha?key=${that.keyCode}`;
 						// 	that.isShowCode = true;
 						// }
-						that.$util.Tips({title:res});
+						that.$util.Tips({title:res.message});
 					});
 			},
 			navTap: function(index) {
@@ -324,7 +437,7 @@
 				loginH5({
 						account: that.account,
 						password: that.password,
-						spread_spid: that.$Cache.get("spread")
+						spread: that.$Cache.get("spread")
 					})
 					.then(({
 						data
@@ -337,6 +450,7 @@
 						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						getUserInfo().then(res => {
+							that.$store.commit("UPDATE_USERINFO", res.data);
 							that.$store.commit("SETUID", res.data.uid);
 							if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ==='/pages/user/index') {
 								uni.switchTab({
@@ -347,11 +461,7 @@
 									url: '/pages/index/index'
 								});
 							}
-						}).catch(e => {
-						that.$util.Tips({
-							title: e
-						    });
-					     });
+						})
 					})
 					.catch(e => {
 						that.$util.Tips({
@@ -362,7 +472,81 @@
 		}
 	};
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+	.appLogin {
+		margin-top: 60rpx;
+	
+		.hds {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 24rpx;
+			color: #B4B4B4;
+	
+			.line {
+				width: 68rpx;
+				height: 1rpx;
+				background: #CCCCCC;
+			}
+	
+			p {
+				margin: 0 20rpx;
+			}
+		}
+	
+		.btn-wrapper {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 30rpx;
+	
+			.btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+			}
+	
+			.apple-btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 246rpx;
+				height: 66rpx;
+				margin-left: 30rpx;
+				background: #EAEAEA;
+				border-radius: 34rpx;
+				font-size: 24rpx;
+	
+				.icon-s-pingguo {
+					color: #333;
+					margin-right: 10rpx;
+					font-size: 34rpx;
+				}
+			}
+	
+			.iconfont {
+				font-size: 40rpx;
+				color: #fff;
+			}
+	
+			.wx {
+				margin-right: 30rpx;
+				background-color: #61C64F;
+			}
+	
+			.mima {
+				background-color: #28B3E9;
+			}
+	
+			.yanzheng {
+				background-color: #F89C23;
+			}
+	
+		}
+	}
 	.code img {
 		width: 100%;
 		height: 100%;
@@ -371,6 +555,67 @@
 	.acea-row.row-middle {
 		input {
 			margin-left: 20rpx;
+			display: block;
+		}
+	}
+	.login-wrapper{
+		padding: 30rpx;
+		.shading{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			height: 200rpx;
+			margin-top: 200rpx;
+			image{
+				width: 180rpx;
+				height: 180rpx;
+			}
+		}
+		.whiteBg{
+			margin-top: 100rpx;
+			.list{
+				border-radius: 16rpx;
+				overflow: hidden;
+				.item{
+					border-bottom: 1px solid #F0F0F0;
+					background: #fff;
+					.row-middle{
+						position: relative;
+						padding: 30rpx 45rpx;
+						input{
+							flex: 1;
+							font-size: 28rpx;
+							height: 80rpx;
+						}
+						.code{
+							position: absolute;
+							right: 30rpx;
+							top: 50%;
+							color: #E93323;
+							font-size: 26rpx;
+							transform: translateY(-50%);
+						}
+					}
+				}
+			}
+			.logon{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 100%;
+				height: 86rpx;
+				margin-top: 100rpx;
+				background-color: $theme-color;
+				border-radius: 120rpx;
+				color: #FFFFFF;
+				font-size: 30rpx;
+			}
+			.tips{
+				margin:30rpx;
+				text-align: center;
+				color: #999;
+			}
 		}
 	}
 </style>
diff --git a/pages/users/login/index2.vue b/pages/users/login/index2.vue
deleted file mode 100644
index 493156ea..00000000
--- a/pages/users/login/index2.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<template>
-	<div class="register absolute">
-		<div class="shading">
-			<div class="pictrue acea-row row-center-wrapper">
-				<image :src="logoUrl" v-if="logoUrl" />
-				<image src="../../../static/images/logo2.png" v-else />
-			</div>
-		</div>
-		<div class="whiteBg" v-if="formItem === 1">
-			<div class="title acea-row row-center-wrapper">
-				<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)"
-				 :key="index">
-					{{ item }}
-				</div>
-			</div>
-			<div class="list" :hidden="current !== 1">
-				<form @submit.prevent="submit">
-					<div class="item">
-						<div class="acea-row row-middle">
-							<image src="/static/images/phone_1.png"></image>
-							<input type="text" placeholder="输入手机号码" v-model="account" required />
-						</div>
-					</div>
-					<div class="item">
-						<div class="acea-row row-middle">
-							<image src="/static/images/code_2.png"></image>
-							<input type="password" placeholder="填写登录密码" v-model="password" required />
-						</div>
-					</div>
-				</form>
-				<!-- <navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
-					<span class="iconfont icon-wenti"></span>忘记密码
-				</navigator> -->
-			</div>
-			<div class="list" :hidden="current !== 0">
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" v-model="account" />
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
-							{{ text }}
-						</button>
-					</div>
-				</div>
-				<div class="item" v-if="isShowCode">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="codeVal" />
-						<div class="code" @click="again"><img :src="codeUrl" /></div>
-					</div>
-				</div>
-			</div>
-			<div class="logon" @click="loginMobile" :hidden="current !== 0">登录</div>
-			<div class="logon" @click="submit" :hidden="current === 0">登录</div>
-			<div class="tip">
-				<div :hidden="current !== 1">
-					没有账号?
-					<span @click="current = 0" class="font-color-red">快速登录</span>
-				</div>
-			</div>
-		</div>
-		<!-- <div class="whiteBg" v-else>
-			<div class="title">注册账号</div>
-			<div class="list">
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" v-model="account" />
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
-							{{ text }}
-						</button>
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_1.png"></image>
-						<input type="password" placeholder="填写您的登录密码" v-model="password" />
-					</div>
-				</div>
-				<div class="item" v-if="isShowCode">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="codeVal" />
-						<div class="code" @click="again"><img :src="codeUrl" /></div>
-					</div>
-				</div>
-			</div>
-			<div class="logon" @click="register">注册</div>
-			<div class="tip">
-				已有账号?
-				<span @click="formItem = 1" class="font-color-red">立即登录</span>
-			</div>
-		</div> -->
-		<div class="bottom"></div>
-	</div>
-</template>
-<script>
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
-	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import {
-		loginH5,
-		loginMobile,
-		registerVerify,
-		register,
-		// getCodeApi,
-		getUserInfo
-	} from "@/api/user";
-	import attrs, {
-		required,
-		alpha_num,
-		chs_phone
-	} from "@/utils/validate";
-	import {
-		validatorDefaultCatch
-	} from "@/utils/dialog";
-	import {
-		getLogo
-	} from "@/api/public";
-	import {
-		VUE_APP_API_URL
-	} from "@/utils";
-
-	const BACK_URL = "login_back_url";
-
-	export default {
-		name: "Login",
-		mixins: [sendVerifyCode],
-		data: function() {
-			return {
-				navList: ["快速登录", "账号登录"],
-				current: 0,
-				account: "",
-				password: "",
-				captcha: "",
-				formItem: 1,
-				type: "login",
-				logoUrl: "",
-				keyCode: "",
-				codeUrl: "",
-				codeVal: "",
-				isShowCode: false
-			};
-		},
-		watch:{
-			formItem:function(nval,oVal){
-				if(nval == 1){
-					this.type = 'login'
-				}else{
-					this.type = 'register'
-				}
-			}
-		},
-		mounted: function() {
-			this.getCode();
-			this.getLogoImage();
-		},
-		methods: {
-			again() {
-				this.codeUrl =
-					VUE_APP_API_URL +
-					"/sms_captcha?" +
-					"key=" +
-					this.keyCode +
-					Date.parse(new Date());
-			},
-			getCode() {
-				let that = this
-				// getCodeApi()
-				// 	.then(res => {
-				// 		that.keyCode = res.data.key;
-				// 	})
-				// 	.catch(res => {
-				// 		that.$util.Tips({
-				// 			title: res
-				// 		});
-				// 	});
-			},
-			async getLogoImage() {
-				let that = this;
-				getLogo().then(res => {
-					that.logoUrl = res.data.logoUrl;
-				});
-			},
-			async loginMobile() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				loginMobile({
-						account: that.account,
-						captcha: that.captcha,
-						spread: that.$Cache.get("spread")
-					})
-					.then(res => {
-						let data = res.data;
-						let newTime = Math.round(new Date() / 1000);
-						that.$store.commit("LOGIN", {
-							'token': data.token
-							// 'time': dayjs(data.expiresTime) - newTime
-						});
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						// getUserInfo().then(res => {
-							that.$store.commit("SETUID", res.data.user.uid);
-							if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ===
-								'/pages/user/index') {
-
-								uni.switchTab({
-									url: backUrl
-								});
-
-							} else {
-								uni.switchTab({
-									url: '/pages/index/index'
-								});
-							}
-						// })
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			async register() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请填写密码'
-				});
-				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
-					title: '您输入的密码过于简单'
-				});
-				register({
-						account: that.account,
-						captcha: that.captcha,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res
-						});
-						that.formItem = 1;
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			async code() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (that.formItem == 2) that.type = "register";
-				// phone: that.account
-				// type: that.type,
-				// key: that.keyCode,
-				// code: that.codeVal
-				await registerVerify(that.account)
-					.then(res => {
-						that.$util.Tips({title:res.message});
-						that.sendCode();
-					})
-					.catch(res => {
-						// if (res.data.status === 402) {
-						// 	that.codeUrl = `${VUE_APP_API_URL}/sms_captcha?key=${that.keyCode}`;
-						// 	that.isShowCode = true;
-						// }
-						that.$util.Tips({title:res.message});
-					});
-			},
-			navTap: function(index) {
-				this.current = index;
-			},
-			async submit() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写账号'
-				});
-				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的账号'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请填写密码'
-				});
-				loginH5({
-						account: that.account,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(({
-						data
-					}) => {
-						// let newTime = Math.round(new Date() / 1000);
-						that.$store.commit("LOGIN", {
-							'token': data.token
-							// 'time': dayjs(data.expiresTime) - newTime
-						});
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						getUserInfo().then(res => {
-							that.$store.commit("SETUID", res.data.uid);
-							if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ==='/pages/user/index') {
-								uni.switchTab({
-									url: backUrl
-								});
-							} else {
-								uni.switchTab({
-									url: '/pages/index/index'
-								});
-							}
-						})
-					})
-					.catch(e => {
-						that.$util.Tips({
-							title: e
-						});
-					});
-			}
-		}
-	};
-</script>
-<style lang="scss">
-	.code img {
-		width: 100%;
-		height: 100%;
-	}
-
-	.acea-row.row-middle {
-		input {
-			margin-left: 20rpx;
-		}
-	}
-</style>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 50250137..09faee3d 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -142,7 +142,7 @@
 		<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address' :pagesUrl="pagesUrl"
 		 @OnChangeAddress="OnChangeAddress" @changeClose="changeClose"></addressWindow>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -280,6 +280,17 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getaddressInfo();
+						this.getConfirm();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad: function(options) {
 			// #ifdef H5
 			this.payChannel = this.$wechat.isWeixin() ? 'public' : 'weixinh5'
@@ -310,13 +321,7 @@
 				//调用子页面方法授权后执行获取地址列表
 				this.$nextTick(function() {})
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		/**
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 6e7de8cf..c3ab5d39 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -93,7 +93,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
@@ -173,13 +173,7 @@
 				this.getOrderList();
 				this.getUserInfo();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index a5251438..47c8082d 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -69,7 +69,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -119,13 +119,7 @@
 			if (this.isLogin) {
 				this.userSpreadNewList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		onShow: function() {
diff --git a/pages/users/promoter-order/index.vue b/pages/users/promoter-order/index.vue
index 646ac72c..fdd36cea 100644
--- a/pages/users/promoter-order/index.vue
+++ b/pages/users/promoter-order/index.vue
@@ -46,7 +46,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -92,13 +92,7 @@
 			if (this.isLogin) {
 				this.getRecordOrderList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/promoter_rank/index.vue b/pages/users/promoter_rank/index.vue
index 9a150c98..890608e1 100644
--- a/pages/users/promoter_rank/index.vue
+++ b/pages/users/promoter_rank/index.vue
@@ -10,21 +10,21 @@
 						</view>
 					</view>
 					<view class="rank acea-row row-bottom row-around">
-						<view class="item" v-if="Two.uid">
+						<view class="item" v-show="Two.uid">
 							<view class="pictrue">
 								<image :src="Two.avatar"></image>
 							</view>
 							<view class="name line1">{{Two.nickname}}</view>
 							<view class="num">{{Two.spreadCount}}人</view>
 						</view>
-						<view class="item" v-if="One.uid">
+						<view class="item" v-show="One.uid">
 							<view class="pictrue">
 								<image :src="One.avatar"></image>
 							</view>
 							<view class="name line1">{{One.nickname}}</view>
 							<view class="num">{{One.spreadCount}}人</view>
 						</view>
-						<view class="item" v-if="Three.uid">
+						<view class="item" v-show="Three.uid">
 							<view class="pictrue">
 								<image :src="Three.avatar"></image>
 							</view>
@@ -48,7 +48,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -93,17 +93,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getRanklist();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getRanklist();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		// onShow: function () {
diff --git a/pages/users/static/home.png b/pages/users/static/home.png
new file mode 100644
index 00000000..3f8782bb
Binary files /dev/null and b/pages/users/static/home.png differ
diff --git a/pages/users/static/left.png b/pages/users/static/left.png
new file mode 100644
index 00000000..0e593e43
Binary files /dev/null and b/pages/users/static/left.png differ
diff --git a/pages/users/static/wechat_login.png b/pages/users/static/wechat_login.png
new file mode 100644
index 00000000..65d6691c
Binary files /dev/null and b/pages/users/static/wechat_login.png differ
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index 18b7f34c..671d7643 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -43,7 +43,7 @@
 			</view>
 		</form>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -102,6 +102,17 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserAddress();
+						this.getCityList();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad(options) {
 			if (this.isLogin) {
 				this.cartId = options.cartId || '';
@@ -120,13 +131,7 @@
 				// 	this.initialize();
 				// }
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_address/index001.vue b/pages/users/user_address/index001.vue
deleted file mode 100644
index 29345cdd..00000000
--- a/pages/users/user_address/index001.vue
+++ /dev/null
@@ -1,537 +0,0 @@
-<template>
-	<view>
-		<form @submit="formSubmit" report-submit='true'>
-			<view class='addAddress'>
-				<view class='list'>
-					<view class='item acea-row row-between-wrapper'>
-						<view class='name'>姓名</view>
-						<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name" placeholder-class='placeholder'></input>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view class='name'>联系电话</view>
-						<input type='text' placeholder='请输入联系电话' name="phone" :value='userAddress.phone' placeholder-class='placeholder'></input>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view class='name'>所在地区</view>
-						<view class="address">
-							<picker mode="multiSelector" @change="bindRegionChange" @columnchange="bindMultiPickerColumnChange" :value="valueRegion"
-							 :range="multiArray">
-								<view class='acea-row'>
-									<view class="picker">{{region[0]}}，{{region[1]}}，{{region[2]}}</view>
-									<view class='iconfont icon-dizhi font-color'></view>
-								</view>
-							</picker>
-						</view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view class='name'>详细地址</view>
-						<input type='text' placeholder='请填写具体地址' name='detail' placeholder-class='placeholder' :value='userAddress.detail'></input>
-					</view>
-				</view>
-				<view class='default acea-row row-middle'>
-					<checkbox-group @change='ChangeIsDefault'>
-						<checkbox :checked="userAddress.is_default ? true : false" />设置为默认地址</checkbox-group>
-				</view>
-
-				<button class='keepBnt bg-color' form-type="submit">立即保存</button>
-				<!-- #ifdef MP -->
-				<view class="wechatAddress" v-if="!id" @click="getWxAddress">导入微信地址</view>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view class="wechatAddress" v-if="this.$wechat.isWeixin() && !id" @click="getAddress">导入微信地址</view>
-				<!-- #endif -->
-			</view>
-		</form>
-		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #endif -->
-		<home></home>
-	</view>
-</template>
-
-<script>
-	import {
-		editAddress,
-		getAddressDetail
-	} from '@/api/user.js';
-	import {
-		getCity
-	} from '@/api/api.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import wPicker from "@/components/wPicker/w-picker.vue";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import home from '@/components/home';
-	import city from '@/utils/city';
-	export default {
-		components: {
-			// #ifdef MP
-			authorize,
-			// #endif
-			home
-		},
-		data() {
-			return {
-				regionDval: ['浙江省', '杭州市', '滨江区'],
-				cartId: '', //购物车id
-				pinkId: 0, //拼团id
-				couponId: 0, //优惠券id
-				id: 0, //地址id
-				userAddress: {
-					is_default: false
-				}, //地址详情
-				region: ['省', '市', '区'],
-				valueRegion: [0, 0, 0],
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				district: [],
-				multiArray: [],
-				multiIndex: [0, 0, 0],
-				cityId: 0,
-				defaultRegion: ['广东省', '广州市', '番禺区'],
-				defaultRegionCode: '440113'
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		onLoad(options) {
-			if (this.isLogin) {
-				this.cartId = options.cartId || '';
-				this.pinkId = options.pinkId || 0;
-				this.couponId = options.couponId || 0;
-				this.id = options.id || 0;
-				uni.setNavigationBarTitle({
-					title: options.id ? '修改地址' : '添加地址'
-				})
-				this.getUserAddress();
-				this.getCityList();
-			} else {
-				// #ifdef H5 || APP-PLUS
-				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
-			}
-		},
-		methods: {
-			// 回去地址数据
-			getCityList: function() {
-				let that = this;
-				getCity().then(res => {
-					this.district = res.data
-					that.initialize();
-				})
-			},
-			initialize: function() {
-				let that = this,
-					province = [],
-					city = [],
-					area = [];
-				if (that.district.length) {
-					let cityChildren = that.district[0].c || [];
-					let areaChildren = cityChildren.length ? (cityChildren[0].c || []) : [];
-					that.district.forEach(function(item) {
-						province.push(item.n);
-					});
-					cityChildren.forEach(function(item) {
-						city.push(item.n);
-					});
-					areaChildren.forEach(function(item) {
-						area.push(item.n);
-					});
-					this.multiArray = [province, city, area]
-				}
-			},
-			bindRegionChange: function(e) {
-				let multiIndex = this.multiIndex,
-					province = this.district[multiIndex[0]] || {
-						c: []
-					},
-					city = province.c[multiIndex[1]] || {
-						v: 0
-					},
-					multiArray = this.multiArray,
-					value = e.detail.value;
-
-				this.region = [multiArray[0][value[0]], multiArray[1][value[1]], multiArray[2][value[2]]]
-				// this.$set(this.region,0,multiArray[0][value[0]]);
-				// this.$set(this.region,1,multiArray[1][value[1]]);
-				// this.$set(this.region,2,multiArray[2][value[2]]);
-				this.cityId = city.v
-				this.valueRegion = [0, 0, 0]
-				this.initialize();
-			},
-			bindMultiPickerColumnChange: function(e) {
-				let that = this,
-					column = e.detail.column,
-					value = e.detail.value,
-					currentCity = this.district[value] || {
-						c: []
-					},
-					multiArray = that.multiArray,
-					multiIndex = that.multiIndex;
-				multiIndex[column] = value;
-				switch (column) {
-					case 0:
-						let areaList = currentCity.c[0] || {
-							c: []
-						};
-						multiArray[1] = currentCity.c.map((item) => {
-							return item.n;
-						});
-						multiArray[2] = areaList.c.map((item) => {
-							return item.n;
-						});
-						break;
-					case 1:
-						let cityList = that.district[multiIndex[0]].c[multiIndex[1]].c || [];
-						multiArray[2] = cityList.map((item) => {
-							return item.n;
-						});
-						break;
-					case 2:
-
-						break;
-				}
-				// #ifdef MP
-				this.$set(this.multiArray, 0, multiArray[0]);
-				this.$set(this.multiArray, 1, multiArray[1]);
-				this.$set(this.multiArray, 2, multiArray[2]);
-				// #endif
-				// #ifdef H5
-				this.multiArray = multiArray;
-				// #endif
-
-
-
-				this.multiIndex = multiIndex
-				// this.setData({ multiArray: multiArray, multiIndex: multiIndex});
-			},
-			// 授权回调
-			onLoadFun: function() {
-				this.getUserAddress();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			toggleTab(str) {
-				this.$refs[str].show();
-			},
-			// bindRegionChange: function(e) {
-			// 	this.$set(this, 'region', e.detail.value);
-			// },
-			onConfirm(val) {
-				this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
-			},
-			getUserAddress: function() {
-				if (!this.id) return false;
-				let that = this;
-				getAddressDetail(this.id).then(res => {
-					// let region = [res.data.province, res.data.city, res.data.district];
-					let region = [res.data.province, res.data.city, res.data.district];
-					that.$set(that, 'userAddress', res.data);
-					that.$set(that, 'region', region);
-					that.city_id = res.data.city_id
-				});
-			},
-			// 导入共享地址（小程序）
-			getWxAddress: function() {
-				let that = this;
-				uni.authorize({
-					scope: 'scope.address',
-					success: function(res) {
-						uni.chooseAddress({
-							success: function(res) {
-								let addressP = {};
-								addressP.province = res.provinceName;
-								addressP.city = res.cityName;
-								addressP.district = res.countyName;
-								editAddress({
-									address: addressP,
-									is_default: 1,
-									real_name: res.userName,
-									post_code: res.postalCode,
-									phone: res.telNumber,
-									detail: res.detailInfo,
-									id: 0,
-									type: 1,
-								}).then(res => {
-									setTimeout(function() {
-										if (that.cartId) {
-											let cartId = that.cartId;
-											let pinkId = that.pinkId;
-											let couponId = that.couponId;
-											that.cartId = '';
-											that.pinkId = '';
-											that.couponId = '';
-											uni.navigateTo({
-												url: '/pages/users/order_confirm/index?cartId=' + cartId + '&addressId=' + (that.id ? that.id :
-													res.data
-													.id) + '&pinkId=' + pinkId + '&couponId=' + couponId
-											});
-										} else {
-											uni.navigateBack({
-												delta: 1
-											});
-										}
-									}, 1000);
-									return that.$util.Tips({
-										title: "添加成功",
-										icon: 'success'
-									});
-								}).catch(err => {
-									return that.$util.Tips({
-										title: err
-									});
-								});
-							},
-							fail: function(res) {
-								if (res.errMsg == 'chooseAddress:cancel') return that.$util.Tips({
-									title: '取消选择'
-								});
-							},
-						})
-					},
-					fail: function(res) {
-						uni.showModal({
-							title: '您已拒绝导入微信地址权限',
-							content: '是否进入权限管理，调整授权？',
-							success(res) {
-								if (res.confirm) {
-									uni.openSetting({
-										success: function(res) {}
-									});
-								} else if (res.cancel) {
-									return that.$util.Tips({
-										title: '已取消！'
-									});
-								}
-							}
-						})
-					},
-				})
-			},
-			// 导入共享地址（微信）；
-			getAddress() {
-				let that = this;
-				that.$wechat.openAddress().then(userInfo => {
-					open();
-					editAddress({
-							id: this.id,
-							real_name: userInfo.userName,
-							phone: userInfo.telNumber,
-							address: {
-								province: userInfo.provinceName,
-								city: userInfo.cityName,
-								district: userInfo.countryName
-							},
-							detail: userInfo.detailInfo,
-							is_default: 1,
-							post_code: userInfo.postalCode,
-							type: 1,
-						})
-						.then(() => {
-							setTimeout(function() {
-								if (that.cartId) {
-									let cartId = that.cartId;
-									let pinkId = that.pinkId;
-									let couponId = that.couponId;
-									that.cartId = '';
-									that.pinkId = '';
-									that.couponId = '';
-									uni.navigateTo({
-										url: '/pages/users/order_confirm/index?cartId=' + cartId + '&addressId=' + (that.id ? that.id :
-											res.data
-											.id) + '&pinkId=' + pinkId + '&couponId=' + couponId
-									});
-								} else {
-									uni.navigateTo({
-										url:'/pages/users/user_address_list/index'
-									})
-									// history.back();
-								}
-							}, 1000);
-							close();
-							that.$util.Tips({
-								title: "添加成功",
-								icon: 'success'
-							});
-						})
-						.catch(err => {
-							close();
-							return that.$util.Tips({
-								title: err || "添加失败"
-							});
-						});
-				}).catch(err => {
-					console.log(err);
-				});
-			},
-			/**
-			 * 提交用户添加地址
-			 * 
-			 */
-			formSubmit: function(e) {
-				let that = this,
-					value = e.detail.value;
-				if (!value.real_name) return that.$util.Tips({
-					title: '请填写收货人姓名'
-				});
-				if (!value.phone) return that.$util.Tips({
-					title: '请填写联系电话'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (that.region == '省-市-区') return that.$util.Tips({
-					title: '请选择所在地区'
-				});
-				if (!value.detail) return that.$util.Tips({
-					title: '请填写详细地址'
-				});
-				value.id = that.id;
-				let regionArray = that.region;
-				value.address = {
-					province: regionArray[0],
-					city: regionArray[1],
-					district: regionArray[2],
-					city_id: that.cityId,
-				};
-				value.is_default = that.userAddress.is_default ? 1 : 0;
-
-				uni.showLoading({
-					title: '保存中',
-					mask: true
-				})
-				editAddress(value).then(res => {
-					if (that.id)
-						that.$util.Tips({
-							title: '修改成功',
-							icon: 'success'
-						});
-					else
-						that.$util.Tips({
-							title: '添加成功',
-							icon: 'success'
-						});
-					setTimeout(function() {
-						if (that.cartId) {
-							let cartId = that.cartId;
-							let pinkId = that.pinkId;
-							let couponId = that.couponId;
-							that.cartId = '';
-							that.pinkId = '';
-							that.couponId = '';
-							uni.navigateTo({
-								url: '/pages/users/order_confirm/index?cartId=' + cartId + '&addressId=' + (that.id ? that.id : res.data.id) +'&pinkId=' + pinkId + '&couponId=' + couponId
-							});
-						} else {
-							// #ifdef H5
-							return history.back();
-							// #endif
-							// #ifndef H5
-							return uni.navigateBack({
-								delta: 1,
-							})
-							// #endif
-						}
-					}, 1000);
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			ChangeIsDefault: function(e) {
-				this.$set(this.userAddress, 'is_default', !this.userAddress.is_default);
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.addAddress .list {
-		background-color: #fff;
-	}
-
-	.addAddress .list .item {
-		padding: 30rpx;
-		border-top: 1rpx solid #eee;
-	}
-
-	.addAddress .list .item .name {
-		width: 195rpx;
-		font-size: 30rpx;
-		color: #333;
-	}
-
-	.addAddress .list .item .address {
-		// width: 412rpx;
-		flex: 1;
-		margin-left: 20rpx;
-	}
-
-	.addAddress .list .item input {
-		width: 475rpx;
-		font-size: 30rpx;
-	}
-
-	.addAddress .list .item .placeholder {
-		color: #ccc;
-	}
-
-	.addAddress .list .item picker {
-		width: 475rpx;
-	}
-
-	.addAddress .list .item picker .picker {
-		width: 410rpx;
-		font-size: 30rpx;
-	}
-
-	.addAddress .list .item picker .iconfont {
-		font-size: 43rpx;
-	}
-
-	.addAddress .default {
-		padding: 0 30rpx;
-		height: 90rpx;
-		background-color: #fff;
-		margin-top: 23rpx;
-	}
-
-	.addAddress .default checkbox {
-		margin-right: 15rpx;
-	}
-
-	.addAddress .keepBnt {
-		width: 690rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 86rpx;
-		margin: 50rpx auto;
-		font-size: 32rpx;
-		color: #fff;
-	}
-
-	.addAddress .wechatAddress {
-		width: 690rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 86rpx;
-		margin: 0 auto;
-		font-size: 32rpx;
-		color: #fe960f;
-		border: 1px solid #fe960f;
-	}
-</style>
diff --git a/pages/users/user_address_list/index.vue b/pages/users/user_address_list/index.vue
index 9ac11e39..85fe3976 100644
--- a/pages/users/user_address_list/index.vue
+++ b/pages/users/user_address_list/index.vue
@@ -52,7 +52,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -102,6 +102,16 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserAddress(true);
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad(options) {
 			if (this.isLogin) {
 				this.cartId = options.cartId || '';
@@ -112,13 +122,7 @@
 				this.bargain = options.bargain || false;
 				this.getAddressList(true);
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		onShow: function() {
diff --git a/pages/users/user_bill/index.vue b/pages/users/user_bill/index.vue
index 498b65cc..9ffbe236 100644
--- a/pages/users/user_bill/index.vue
+++ b/pages/users/user_bill/index.vue
@@ -31,7 +31,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -78,13 +78,7 @@
 			if (this.isLogin) {
 				this.getUserBillList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		/**
@@ -116,6 +110,7 @@
 			getUserBillList: function() {
 				let that = this;
 				if (that.loadend) return;
+				
 				if (that.loading) return;
 				that.loading = true;
 				that.loadTitle = "";
@@ -126,7 +121,7 @@
 				}
 				getBillList(data).then(function(res) {
 					let list = res.data.list?res.data.list:[],
-						loadend = list.length < that.limit;
+						loadend = res.data.list < res.data.limit;
 					that.userBillList = that.$util.SplitArray(list, that.userBillList);
 					that.$set(that, 'userBillList', that.userBillList);
 					that.loadend = loadend;
diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index 136e855a..cabc4459 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -108,7 +108,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -165,19 +165,24 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserInfo();
+						this.getUserExtractBank();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
 				this.getUserExtractBank();
 				//this.getBrokerageCommission();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true);
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_coupon/index.vue b/pages/users/user_coupon/index.vue
index 2872be09..8eeb34c4 100644
--- a/pages/users/user_coupon/index.vue
+++ b/pages/users/user_coupon/index.vue
@@ -3,8 +3,8 @@
 		<view class='coupon-list' v-if="couponsList.length">
 			<view class='item acea-row row-center-wrapper' v-for='(item,index) in couponsList' :key="index">
 				<view class='money' :class="item.validStr==='unusable'||item.validStr==='overdue'||item.validStr==='notStart' ? 'moneyGray' : ''">
-					<view>￥<text class='num'>{{item.money}}</text></view>
-					<view class="pic-num">满{{ item.minPrice }}元可用</view>
+					<view>￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
+					<view class="pic-num">满{{ item.minPrice?Number(item.minPrice):'' }}元可用</view>
 				</view>
 				<view class='text'>
 					<view class='condition line2'>
@@ -26,7 +26,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -73,17 +73,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUseCoupons();
+					}
+				},
+				deep: true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUseCoupons();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_get_coupon/index.vue b/pages/users/user_get_coupon/index.vue
index 63f0bc8b..c4169e31 100644
--- a/pages/users/user_get_coupon/index.vue
+++ b/pages/users/user_get_coupon/index.vue
@@ -3,8 +3,8 @@
 		<view class='coupon-list' v-if="couponsList.length">
 			<view class='item acea-row row-center-wrapper' v-for="(item,index) in couponsList" :key="index">
 				<view class='money' :class='item.isUse ? "moneyGray" : "" '>
-					<view>￥<text class='num'>{{item.money}}</text></view>
-					<view class="pic-num">满{{item.minPrice}}元可用</view>
+					<view>￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
+					<view class="pic-num">满{{item.minPrice?Number(item.minPrice):''}}元可用</view>
 				</view>
 				<view class='text'>
 					<view class='condition line2'>
@@ -31,7 +31,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -69,19 +69,21 @@
 				};
 			},
 			computed: mapGetters(['isLogin']),
+			watch: {
+				isLogin: {
+					handler: function(newV, oldV) {
+						if (newV) {
+							this.getUseCoupons();
+						}
+					},
+					deep: true
+				}
+			},
 			onLoad(){
 				if(this.isLogin){
-					// #ifdef H5
 					this.getUseCoupons();
-					// #endif
 				}else{
-					// #ifdef H5 || APP-PLUS
 					toLogin();
-					// #endif 
-					// #ifdef MP
-					this.isAuto = true;
-					this.$set(this,'isShowAuth',true)
-					// #endif
 				}
 			},
 			 /**
diff --git a/pages/users/user_goods_collection/index.vue b/pages/users/user_goods_collection/index.vue
index eae09cd9..2bc6f78c 100644
--- a/pages/users/user_goods_collection/index.vue
+++ b/pages/users/user_goods_collection/index.vue
@@ -25,7 +25,7 @@
 			<recommend :hostProduct="hostProduct"></recommend>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -75,16 +75,13 @@
 		computed: mapGetters(['isLogin']),
 		onLoad() {
 			if (this.isLogin) {
+				this.loadend = false;
+				this.page = 1;
+				this.collectProductList = [];
 				this.get_user_collect_product();
 				this.get_host_product();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		onShow(){
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 17331ca6..56f57d96 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -16,13 +16,19 @@
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>手机号码</view>
-						<navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
+						<navigator url="/pages/users/user_phone/index" hover-class="none" class="input">
+							<view class='input acea-row row-between-wrapper'>
+								<input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input>
+								<text class='iconfont icon-xiangyou'></text>
+							</view>
+						</navigator>
+						<!-- <navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
 							点击绑定手机号<text class="iconfont icon-xiangyou"></text>
 						</navigator>
 						<view class='input acea-row row-between-wrapper' v-else>
 							<input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input>
 							<text class='iconfont icon-suozi'></text>
-						</view>
+						</view> -->
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>ID号</view>
@@ -53,7 +59,7 @@
 			</view>
 		</form>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -93,17 +99,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUserInfo();
+					}
+				},
+				deep: true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
@@ -164,6 +174,8 @@
 				getUserInfo().then(res => {
 					res.data.localPath = res.data.avatar;
 					that.$set(that, 'userInfo', res.data);
+					that.$store.commit("UPDATE_USERINFO", res.data);
+					that.$store.commit("SETUID", res.data.uid);
 				});
 			},
 			/**
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index adae88fe..c47044ae 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -61,7 +61,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -109,18 +109,23 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserInfo();
+						this.getIntegralList();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
 				this.getIntegralList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		/**
diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue
index 2fba47d1..f48ca8fd 100644
--- a/pages/users/user_money/index.vue
+++ b/pages/users/user_money/index.vue
@@ -121,7 +121,7 @@
 			<recommend :hostProduct="hostProduct" v-if="hostProduct.length"></recommend>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -174,6 +174,19 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserInfo();
+						this.get_host_product();
+						this.get_activity();
+						this.userDalance();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
@@ -181,13 +194,7 @@
 				this.get_activity();
 				this.userDalance();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_payment/index.vue b/pages/users/user_payment/index.vue
index f44339f6..c545dfe5 100644
--- a/pages/users/user_payment/index.vue
+++ b/pages/users/user_payment/index.vue
@@ -47,7 +47,7 @@
 			</view>
 		</form>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -102,6 +102,18 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserInfo();
+						this.getRecharge();
+							this.getUserExtractBank();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad(options) {
 			// #ifdef H5
 			this.from = this.$wechat.isWeixin() ? "public" : "weixinh5"
@@ -111,13 +123,7 @@
 				this.getRecharge();
 				this.getUserExtractBank();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_phone/index.vue b/pages/users/user_phone/index.vue
index 635f5288..e330bd74 100644
--- a/pages/users/user_phone/index.vue
+++ b/pages/users/user_phone/index.vue
@@ -1,23 +1,25 @@
 <template>
 	<view>
-		<form @submit="editPwd" report-submit='true'>
-			<view class="ChangePassword">
-				<view class="list">
-					<view class="item">
-						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="phone"></input>
-					</view>
-					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
-						<button class="code font-color" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="code">
-							{{ text }}
-						</button>
-					</view>
+		<view class="ChangePassword">
+			<view class="list">
+				<view class="item" v-if="isNew">
+					<input type='number' disabled='true' placeholder='填写手机号码1' placeholder-class='placeholder' v-model="userInfo.phone"></input>
+				</view>
+				<view class="item" v-if="!isNew">
+					<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="phone"></input>
+				</view>
+				<view class="item acea-row row-between-wrapper">
+					<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
+					<button class="code font-color" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="code">
+						{{ text }}
+					</button>
 				</view>
-				<button form-type="submit" class="confirmBnt bg-color">确认绑定</button>
 			</view>
-		</form>
+			<button form-type="submit" v-if="isNew" class="confirmBnt bg-color" @click="next">下一步</button>
+			<button form-type="submit" v-if="!isNew" class="confirmBnt bg-color"  @click="editPwd">保存</button>
+		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -27,7 +29,8 @@
 	import {
 		registerVerify,
 		bindingPhone,
-		verifyCode
+		verifyCode,
+		bindingVerify
 	} from '@/api/api.js';
 	import {
 		toLogin
@@ -51,31 +54,75 @@
 				captcha:'',
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				key: ''
+				key: '',
+				isNew: true,
+				timer: '',
+				text: '获取验证码',
+				nums: 60
 			};
 		},
-		computed: mapGetters(['isLogin']),
+		mounted() {
+		      // this.timer = setInterval(this.getTimes, 1000);
+		},
+		computed: mapGetters(['isLogin','userInfo']),
 		onLoad() {
 			if (this.isLogin) {
 				// verifyCode().then(res=>{
 				// 	this.$set(this, 'key', res.data.key)
 				// });
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
+			getTimes(){
+				this.nums = this.nums - 1;
+				this.text = "剩余 " + this.nums + "s";
+				if (this.nums < 0) {
+				  clearInterval(this.timer);
+				}
+				this.text = "剩余 " + this.nums + "s";
+				if (this.text < "剩余 " + 0 + "s") {
+				  this.disabled = false;
+				  this.text = "重新获取";
+				}
+			},
 			onLoadFun:function(){},
 			// 授权关闭
 			authColse: function(e) {
 				this.isShowAuth = e
 			},
+			next() {
+				uni.hideLoading();
+				this.isNew = false;
+				this.captcha = '';
+				clearInterval(this.timer);
+				this.disabled = false;
+				this.text = "获取验证码";
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				if (!this.captcha) return this.$util.Tips({
+					title: '请填写验证码'
+				});
+				bindingVerify({
+					phone: this.userInfo.phone,
+					captcha: this.captcha
+				}).then(res => {
+					uni.hideLoading();
+					this.isNew = false;
+					this.captcha = '';
+					clearInterval(this.timer);
+					this.disabled = false;
+					this.text = "获取验证码";
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+					uni.hideLoading();
+				})
+			},
 			editPwd: function() {
 				let that = this;
 				if (!that.phone) return that.$util.Tips({
@@ -88,12 +135,12 @@
 					title: '请填写验证码'
 				});
 				uni.showModal({
-					title: '是否绑定账号',
+					title: '是否更换绑定账号',
 					confirmText: '绑定',
 					success(res) {
 						if (res.confirm) {
 							bindingPhone({
-								account: that.phone,
+								phone: that.phone,
 								captcha: that.captcha
 							}).then(res => {
 								return that.$util.Tips({
@@ -110,7 +157,7 @@
 							})
 						} else if (res.cancel) {
 							return that.$util.Tips({
-								title: '您已取消绑定！'
+								title: '您已取消更换绑定！'
 							}, {
 								tab: 5,
 								url: '/pages/users/user_info/index'
@@ -124,22 +171,33 @@
 			 * 
 			 */
 			async code() {
+				this.nums = 60;
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
 				let that = this;
-				if (!that.phone) return that.$util.Tips({
-					title: '请填写手机号码！'
-				});
-				if (!(/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.phone))) return that.$util.Tips({
-					title: '请输入正确的手机号码！'
-				});
-				await registerVerify(that.phone).then(res => {
+				if(!that.isNew){
+					if (!that.phone) return that.$util.Tips({
+						title: '请填写手机号码！'
+					});
+					if (!(/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.phone))) return that.$util.Tips({
+						title: '请输入正确的手机号码！'
+					});
+				}
+				await registerVerify(that.isNew?that.userInfo.phone:that.phone).then(res => {
 					that.$util.Tips({
 						title: res.message
 					});
-					that.sendCode();
+					
+					that.timer = setInterval(that.getTimes, 1000);
+					 that.disabled = true;
+					 uni.hideLoading();
 				}).catch(err => {
 					return that.$util.Tips({
 						title: err
 					});
+					uni.hideLoading();
 				});
 			}
 		}
diff --git a/pages/users/user_pwd_edit/index.vue b/pages/users/user_pwd_edit/index.vue
index 4bd4768d..68cafe2a 100644
--- a/pages/users/user_pwd_edit/index.vue
+++ b/pages/users/user_pwd_edit/index.vue
@@ -21,7 +21,7 @@
 			</form>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -63,17 +63,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserInfo();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_return_list/index.vue b/pages/users/user_return_list/index.vue
index a0e93697..2f48e8e9 100644
--- a/pages/users/user_return_list/index.vue
+++ b/pages/users/user_return_list/index.vue
@@ -26,7 +26,7 @@
 			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -67,17 +67,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getOrderList();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getOrderList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		/**
diff --git a/pages/users/user_sgin/index.vue b/pages/users/user_sgin/index.vue
index 43b493a1..d89e2a2a 100644
--- a/pages/users/user_sgin/index.vue
+++ b/pages/users/user_sgin/index.vue
@@ -21,7 +21,8 @@
 			<view class='wrapper'>
 				<view class='list acea-row row-between-wrapper'>
 					<view class='item' v-for="(item,index) in signSystemList" :key="index">
-						<view :class='(index+1) == signSystemList.length ? "rewardTxt" : ""'>{{item.title}}</view>
+						<view :class="(index + 1 === signSystemList.length ? 'reward' : '') + ' ' +(sign_index >= index + 1 ? 'rewardTxt' : '')">{{item.title}}</view>
+						<!-- <view :class='(index+1) == signSystemList.length ? "rewardTxt" : ""'>{{item.title}}</view> -->
 						<view class='venus' :class="(index + 1 === signSystemList.length ? 'reward' : '') + ' ' +(sign_index >= index + 1 ? 'venusSelect' : '')"></view>
 						<view class='num' :class='item.is_sgin ? "on" : ""'>+{{item.integral}}</view>
 					</view>
@@ -64,7 +65,7 @@
 			<view class='mask' @touchmove.stop.prevent="false" :hidden='active==false'></view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -109,19 +110,25 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getUserInfo();
+						this.getSignSysteam();
+						this.getSignList();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
 				this.getSignSysteam();
 				this.getSignList();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
diff --git a/pages/users/user_sgin_list/index.vue b/pages/users/user_sgin_list/index.vue
index 2f378e65..4214bdb8 100644
--- a/pages/users/user_sgin_list/index.vue
+++ b/pages/users/user_sgin_list/index.vue
@@ -20,7 +20,7 @@
 		     </view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -51,17 +51,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler:function(newV,oldV){
+					if(newV){
+						this.getSignMoneList();
+					}
+				},
+				deep:true
+			}
+		},
 		onLoad(){
 			if(this.isLogin){
 				this.getSignMoneList();
 			}else{
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this,'isShowAuth',true)
-				// #endif
 			}
 		},
 		onReachBottom: function () {
diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue
index f537b8b1..e7f56694 100644
--- a/pages/users/user_spread_code/index.vue
+++ b/pages/users/user_spread_code/index.vue
@@ -21,7 +21,7 @@
 			<!-- #endif -->
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<view class="canvas" v-if="canvasStatus">
 			<canvas style="width:750px;height:1190px;" canvas-id="canvasOne"></canvas>
@@ -83,19 +83,23 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.userSpreadBannerList();
+					}
+				},
+				deep: true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 			//	// #ifdef H5
 				this.userSpreadBannerList();
 			//	// #endif
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		/**
diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue
index 5dbe8b69..b71d276f 100644
--- a/pages/users/user_spread_money/index.vue
+++ b/pages/users/user_spread_money/index.vue
@@ -45,7 +45,7 @@
 									<view class='itemn acea-row row-between-wrapper'>
 										<view>
 											<view class='name line1'>{{child.title}}</view>
-											<view>{{child.price}}</view>
+											<view>{{child.updateTime}}</view>
 										</view>
 										<view class='num font-color' v-if="child.type == 1">+{{child.price}}</view>
 										<view class='num' v-else>-{{child.price}}</view>
@@ -61,7 +61,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -113,13 +113,7 @@
 			if (this.isLogin) {
 				this.type = options.type;
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		onShow: function() {
diff --git a/pages/users/user_spread_user/index.vue b/pages/users/user_spread_user/index.vue
index 04cd5a0a..aec204df 100644
--- a/pages/users/user_spread_user/index.vue
+++ b/pages/users/user_spread_user/index.vue
@@ -52,7 +52,7 @@
 			</view>
 		</view>
 		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
 		<home></home>
 	</view>
@@ -86,17 +86,21 @@
 			};
 		},
 		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUserInfo();
+					}
+				},
+				deep: true
+			}
+		},
 		onLoad() {
 			if (this.isLogin) {
 				this.getSpreadInfo();
 			} else {
-				// #ifdef H5 || APP-PLUS
 				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
 			}
 		},
 		methods: {
@@ -108,17 +112,20 @@
 				this.isShowAuth = e
 			},
 			openSubscribe: function(page) {
-				uni.showLoading({
-					title: '正在加载',
-				})
-				openExtrctSubscribe().then(res => {
-					uni.hideLoading();
-					uni.navigateTo({
-						url: page,
-					});
-				}).catch(() => {
-					uni.hideLoading();
+				uni.navigateTo({
+					url: page,
 				});
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// })
+				// openExtrctSubscribe().then(res => {
+				// 	uni.hideLoading();
+				// 	uni.navigateTo({
+				// 		url: page,
+				// 	});
+				// }).catch(() => {
+				// 	uni.hideLoading();
+				// });
 			},
 			/**
 			 * 获取个人用户信息
diff --git a/pages/users/user_vip/index.vue b/pages/users/user_vip/index.vue
index 80d0d7b8..e87ac5c6 100644
--- a/pages/users/user_vip/index.vue
+++ b/pages/users/user_vip/index.vue
@@ -90,7 +90,7 @@
 						</view>
 						<navigator url="/pages/goods_cate/goods_cate" class="button" hover-class="none" open-type='switchTab'>去获取</navigator>
 					</view>
-					<view class="item acea-row row-between-wrapper">
+					<!-- <view class="item acea-row row-between-wrapper">
 						<view class="picTxt acea-row row-middle">
 							<view class="pictrue on2"><text class="iconfont icon-yaoqing"></text></view>
 							<view class="text">
@@ -99,7 +99,7 @@
 							</view>
 						</view>
 						<navigator url="/pages/users/user_spread_code/index" class="button" hover-class="none">去获取</navigator>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -163,6 +163,8 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
+					that.$store.commit("SETUID", res.data.uid);
+					that.$store.commit("UPDATE_USERINFO", res.data);
 					that.userInfo = res.data;
 					that.levelInfo = res.data.experience;
 				}).catch(function(res) {
diff --git a/pages/users/user_vip/index01.vue b/pages/users/user_vip/index01.vue
deleted file mode 100644
index 4f9eb4be..00000000
--- a/pages/users/user_vip/index01.vue
+++ /dev/null
@@ -1,480 +0,0 @@
-<template>
-	<view>
-		<view class='member-center'>
-			<view class='header'>
-				<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
-				 @change="bindchange" previous-margin="30px" next-margin="30px">
-					<block v-for="(item,index) in VipList" :key="index">
-						<swiper-item>
-							<view class="memberBg" :class="swiperIndex == index ? 'active' : 'quiet'" :style='"background-image:url("+item.image+")"'
-							 mode='aspectFill'>
-								<view class='name'>{{item.name}}</view>
-								<view class='discount'>可享受商品折扣:{{item.discount}}折<text class='iconfont icon-zhekou'></text></view>
-								<view class='lock' v-if="item.grade < grade"><text class='iconfont icon-xuanzhong1'></text>已解锁更高等级</view>
-								
-								<view class='lock' v-if="item.grade > grade"><text class='iconfont icon-quanxianguanlisuozi'></text>该会员等级尚未解锁</view>
-								
-								<view class='nav acea-row' v-if="grade==item.grade">
-									<view class='item' v-if="indexn <= 3" v-for="(itemn,indexn) in item.task_list" :key="indexn">
-										<view class='num'>{{itemn.number}}</view>
-										<view>{{itemn.real_name}}</view>
-									</view>
-								</view>
-							</view>
-						</swiper-item>
-					</block>
-				</swiper>
-			</view>
-			<view class='wrapper'>
-				<view class='title acea-row row-between-wrapper'>
-					<view><text class='iconfont icon-jingyanzhi'></text>会员升级要求</view>
-					<view class='num'><text class='current'>{{reach_count || 0}}</text>/{{task.length || 0}}</view>
-				</view>
-				<view class='list'>
-					<view class='item' v-for="(item,index) in task" :key="index">
-						<view class='top acea-row row-between-wrapper'>
-							<view class='name' @click='opHelp(index)'>{{item.name}}<text v-if="item.illustrate" class='iconfont icon-wenti'></text></view>
-							<view v-if="item.finish">已满足条件</view>
-							<view v-else>未满足条件</view>
-						</view>
-						<view class="cu-progress">
-							<view class='bg-red' :style="'width:'+item.speed+'%;'"></view>
-						</view>
-						<view class='experience acea-row row-between-wrapper'>
-							<view>{{item.task_type_title}}</view>
-							<view><text class='num'>{{item.new_number || 0}}</text>/{{item.number || 0}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<recommend :hostProduct="hostProduct"></recommend>
-			<view class='growthValue' :class='growthValue==false?"on":""'>
-				<view class='pictrue'>
-					<image src='../../columnGoods/static/value.jpg'></image><text class='iconfont icon-guanbi3' @click='growthValue'></text>
-				</view>
-				<view class='conter'>{{illustrate}}</view>
-			</view>
-			<view class='mask' :hidden='growthValue' @click='growthValueClose'></view>
-		</view>
-		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		userLevelGrade,
-		userLevelTask,
-		userLevelDetection
-	} from '@/api/user.js';
-	import {
-		getProductHot
-	} from '@/api/store.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import recommend from '@/components/recommend';
-	export default {
-		components: {
-			recommend,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		data() {
-			return {
-				reach_count:0,
-				VipList: [],
-				indicatorDots: false,
-				circular: true,
-				autoplay: false,
-				interval: 3000,
-				duration: 500,
-				swiperIndex: 0,
-				growthValue: true,
-				task: [], //任务列表
-				illustrate: '', //任务说明
-				level_id: 0, //任务id,
-				hostProduct: [],
-				grade: 0,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false ,//是否隐藏授权
-				hotScroll:false,
-				hotPage:1,
-				hotLimit:10
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		watch: {
-			VipList: function() {
-				console.log('观察')
-				let that = this;
-				if (that.VipList.length > 0) {
-					that.VipList.forEach(function(item, index) {
-						if (item.is_clear === false) {
-							// that.swiper.slideTo(index);
-							that.activeIndex = index;
-							that.grade = item.grade;
-						}
-					});
-				}
-			}
-		},
-		onLoad() {
-			if (this.isLogin) {
-				this.setLeveLComplete();
-				this.get_host_product();
-			} else {
-				// #ifdef H5 || APP-PLUS
-				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
-			}
-			let that = this;
-			setTimeout(function() {
-				that.loading = true
-			}, 500)
-		},
-		methods: {
-			onLoadFun: function() {
-				this.setLeveLComplete();
-				this.get_host_product();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/**
-			 * 获取我的推荐
-			 */
-			get_host_product: function() {
-				let that = this;
-				getProductHot().then(res => {
-					let that = this;
-					if(that.hotScroll) return
-					getProductHot(
-						that.hotPage,
-						that.hotLimit,
-					).then(res => {
-						that.hotPage++
-						that.hotScroll = res.data.length<that.hotLimit
-						that.hostProduct = that.hostProduct.concat(res.data)
-					});
-				});
-			},
-			/**
-			 * 会员切换
-			 * 
-			 */
-			bindchange(e) {
-				let index = e.detail.current;
-				this.swiperIndex = index;
-				this.level_id = this.VipList[index].id || 0;
-				// this.grade = this.VipList[index].grade
-				this.getTask();
-			},
-			/**
-			 * 关闭说明
-			 */
-			growthValueClose: function() {
-				this.growthValue = true;
-			},
-			/**
-			 * 打开说明
-			 */
-			opHelp: function(index) {
-				this.growthValue = false;
-				this.illustrate = this.task[index].illustrate;
-			},
-			/**
-			 * 设置会员
-			 */
-			setLeveLComplete: function() {
-				let that = this;
-				userLevelDetection().then(res => {
-					that.getVipList();
-				});
-			},
-			/**
-			 * 获取会员等级
-			 * 
-			 */
-			getVipList: function() {
-				let that = this;
-				userLevelGrade().then(res => {
-					that.$set(that, 'VipList', res.data.list);
-					that.task = res.data.task.task;
-					that.reach_count = res.data.task.reach_count;
-					that.level_id = res.data.list[0] ? res.data.list[0].id : 0;
-					let arr = [];
-					// res.data.list.forEach(function(item, index) {
-					// 	if (item.is_clear == false) {
-					// 		arr.push(item.grade);
-					// 	}
-					// })
-					// that.grade = arr[0] || 0;
-					// that.grade = res.data.list[0].grade
-				});
-			},
-			/**
-			 * 获取任务要求
-			 */
-			getTask: function() {
-				let that = this;
-				userLevelTask(that.level_id).then(res => {
-					that.task = res.data.task;
-					that.reach_count = res.data.reach_count;
-				});
-			}
-		},
-		onReachBottom() {
-			this.get_host_product();
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.member-center .header {
-		background-color: #232323;
-		width: 100%;
-		padding: 50rpx 0;
-	}
-
-	.member-center .header swiper {
-		width: 100%;
-		height: 328rpx;
-		position: relative;
-	}
-
-	.member-center .header swiper-item .memberBg.active {
-		transform: none;
-		transition: all 0.2s ease-in 0s;
-	}
-
-	.member-center .header swiper-item .memberBg.quiet {
-		transform: scale(0.9);
-		transition: all 0.2s ease-in 0s;
-	}
-
-	.member-center .header swiper-item .memberBg {
-		width: 100%;
-		height: 328rpx;
-		border-radius: 16rpx;
-		color: #fff;
-		position: relative;
-		background-size: 100% 100%
-	}
-
-	.member-center .header swiper-item .memberBg image {
-		width: 89rpx;
-		height: 108rpx;
-		display: block;
-		position: absolute;
-		right: 60rpx;
-	}
-
-	.member-center .header swiper-item .memberBg .name {
-		font-size: 46rpx;
-		font-weight: bold;
-		padding: 40rpx 0 0 35rpx;
-	}
-
-	.member-center .header swiper-item .memberBg .discount {
-		font-size: 28rpx;
-		font-weight: bold;
-		margin: 15rpx 0 0 35rpx;
-	}
-
-	.member-center .header swiper-item .memberBg .discount .iconfont {
-		margin-left: 10rpx;
-		font-size: 30rpx;
-	}
-
-	.member-center .header swiper-item .memberBg .nav {
-		margin-top: 55rpx;
-	}
-
-	.member-center .header swiper-item .memberBg .nav .item {
-		flex: 1;
-		text-align: center;
-		color: rgba(255, 255, 255, 0.6);
-		position: relative;
-	}
-
-	.member-center .header swiper-item .memberBg .nav .item .num {
-		font-size: 40rpx;
-		color: #fff;
-		font-family: 'Guildford Pro';
-	}
-
-	.member-center .header swiper-item .memberBg .nav .item~.item::before {
-		position: absolute;
-		width: 2rpx;
-		height: 32rpx;
-		background-color: rgba(255, 255, 255, 0.6);
-		content: '';
-		left: 0;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-
-	.member-center .header swiper-item .memberBg .lock {
-		font-size: 26rpx;
-		margin: 73rpx 0 0 35rpx;
-	}
-
-	.member-center .header swiper-item .memberBg .lock .iconfont {
-		font-size: 37rpx;
-		margin-right: 15rpx;
-		vertical-align: -4rpx;
-	}
-
-	.member-center .wrapper {
-		background-color: #fff;
-		padding-bottom: 16rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.member-center .wrapper .title {
-		height: 98rpx;
-		padding: 0 30rpx;
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #282828;
-	}
-
-	.member-center .wrapper .title .iconfont {
-		color: #ffae06;
-		font-weight: normal;
-		font-size: 40rpx;
-		margin-right: 12rpx;
-		vertical-align: -2rpx;
-	}
-
-	.member-center .wrapper .title .num {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	.member-center .wrapper .title .num .current {
-		color: #ffae06;
-	}
-
-	.member-center .wrapper .list .item {
-		width: 690rpx;
-		height: 184rpx;
-		background-color: #f9f9f9;
-		margin: 0 auto 20rpx auto;
-		padding: 27rpx 0 22rpx 0;
-		border-radius: 12rpx;
-		box-sizing: border-box;
-	}
-
-	.member-center .wrapper .list .item .top {
-		padding-right: 27rpx;
-		font-size: 26rpx;
-		color: #999;
-	}
-
-	.member-center .wrapper .list .item .top .name {
-		border-left: 6rpx solid #ffae06;
-		padding-left: 20rpx;
-		font-size: 28rpx;
-		color: #282828;
-		font-weight: bold;
-	}
-
-	.member-center .wrapper .list .item .top .name .iconfont {
-		color: #999;
-		font-size: 30rpx;
-		vertical-align: -2rpx;
-		margin-left: 10rpx;
-	}
-
-	.member-center .wrapper .list .item .cu-progress {
-		overflow: hidden;
-		height: 12rpx;
-		background-color: #eee;
-		width: 636rpx;
-		border-radius: 20rpx;
-		margin: 35rpx auto 0 auto;
-	}
-
-	.member-center .wrapper .list .item .cu-progress .bg-red {
-		width: 0;
-		height: 100%;
-		transition: width 0.6s ease;
-		background-color: #ffaa29;
-		border-radius: 20rpx;
-	}
-
-	.member-center .wrapper .list .item .experience {
-		margin-top: 17rpx;
-		padding: 0 27rpx;
-		font-size: 24rpx;
-		color: #999;
-	}
-
-	.member-center .wrapper .list .item .experience .num {
-		color: #ffad07;
-	}
-
-	.member-center .growthValue {
-		background-color: #fff;
-		border-radius: 16rpx;
-		position: fixed;
-		top: 266rpx;
-		left: 50%;
-		width: 560rpx;
-		height: 740rpx;
-		margin-left: -280rpx;
-		z-index: 99;
-		transform: translate3d(0, -200%, 0);
-		transition: all .3s cubic-bezier(.25, .5, .5, .9);
-	}
-
-	.member-center .growthValue.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.member-center .growthValue .pictrue {
-		width: 100%;
-		height: 257rpx;
-		position: relative;
-	}
-
-	.member-center .growthValue .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 16rpx 16rpx 0 0;
-	}
-
-	.member-center .growthValue .conter {
-		padding: 0 35rpx;
-		font-size: 30rpx;
-		color: #333;
-		margin-top: 58rpx;
-		line-height: 1.5;
-		height: 350rpx;
-		overflow: auto;
-	}
-
-	.member-center .growthValue .pictrue .iconfont {
-		position: absolute;
-		font-size: 65rpx;
-		color: #fff;
-		top: 775rpx;
-		left: 50%;
-		transform: translateX(-50%);
-	}
-</style>
\ No newline at end of file
diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue
index 04e5f97c..638054e3 100644
--- a/pages/users/wechat_login/index.vue
+++ b/pages/users/wechat_login/index.vue
@@ -1,10 +1,14 @@
 <template>
-	<view>
+	<view class="page">
 		<view class="system-height" :style="{height:statusBarHeight}"></view>
 		<!-- #ifdef MP -->
 		<view class="title-bar" style="height: 43px;">
-			<view class="icon" @click="back" v-if="!isHome"><image src="../static/left.png" ></image></view>
-			<view class="icon" @click="home" v-else><image src="../static/home.png"></image></view>
+			<view class="icon" @click="back" v-if="!isHome">
+				<image src="../static/left.png"></image>
+			</view>
+			<view class="icon" @click="home" v-else>
+				<image src="../static/home.png"></image>
+			</view>
 			账户登录
 		</view>
 		<!-- #endif -->
@@ -13,13 +17,13 @@
 				<image src="../static/wechat_login.png" mode="widthFix"></image>
 			</view>
 			<view class="btn-wrapper">
-				<button class="bg-red" hover-class="none" @click="isUp=true">手机号登录（账户同步）</button>
 				<!-- #ifdef H5 -->
-				<button hover-class="none"  @click="wechatLogin">微信一键登录</button>
+				<button hover-class="none" @click="wechatLogin" class="bg-green btn1">微信登录</button>
 				<!-- #endif -->
 				<!-- #ifdef MP -->
-				<button hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo">微信一键登录</button>
+				<button hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo" class="bg-green btn1">微信登录</button>
 				<!-- #endif -->
+				<!-- <button hover-class="none" @click="isUp = true" class="btn2">手机号登录</button> -->
 			</view>
 		</view>
 		<block v-if="isUp">
@@ -36,6 +40,9 @@
 	let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import mobileLogin from '@/components/login_mobile/index.vue'
 	import routinePhone from '@/components/login_mobile/routine_phone.vue'
+	import {
+		mapGetters
+	} from "vuex";
 	import {
 		getLogo,
 		silenceAuth,
@@ -56,34 +63,39 @@
 	export default {
 		data() {
 			return {
-				isUp:false,
+				isUp: false,
 				phone: '',
 				statusBarHeight: statusBarHeight,
-				isHome:false,
-				isPhoneBox:false,
-				logoUrl:'',
-				code:'',
-				authKey:'',
-				options:'',
-				userInfo:{},
-				codeNum:0
+				isHome: false,
+				isPhoneBox: false,
+				logoUrl: '',
+				code: '',
+				authKey: '',
+				options: '',
+				userInfo: {},
+				codeNum: 0
 			}
 		},
-		components:{
+		components: {
 			mobileLogin,
 			routinePhone
 		},
+		computed: mapGetters({
+			'authorizeType': 'authorizeType'
+		}),
 		onLoad(options) {
-			getLogo().then(res=>{
-				this.logoUrl = res.data.logo_url
+			console.log('options',options)
+			if (this.authorizeType === 'register') this.isPhoneBox = true
+			getLogo().then(res => {
+				this.logoUrl = res.data.logoUrl
 			})
 			let that = this
 			// #ifdef H5
 			document.body.addEventListener("focusout", () => {
-			　　setTimeout(() => {
-			　　　　const scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
-			　　　　window.scrollTo(0, Math.max(scrollHeight - 1, 0));
-			　　}, 100);
+				setTimeout(() => {
+					const scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
+					window.scrollTo(0, Math.max(scrollHeight - 1, 0));
+				}, 100);
 			});
 			const {
 				code,
@@ -91,66 +103,72 @@
 				scope
 			} = options;
 			this.options = options
+			console.log('lalaal',this.options)
 			// 获取确认授权code
 			this.code = code || ''
-			if(code){
-				let spread = app.globalData.spid ? app.globalData.spid : '';
-				//公众号授权登录回调
-				wechat.auth(code, state).then(res => {
-					if (res.key !== undefined && res.key) {
-						that.authKey = res.key;
-						that.isUp = true
-					}else{
-						let time = res.expires_time - that.$Cache.time();
-						that.$store.commit('LOGIN', {
-							token: res.token,
-							time: time
+			if(!code) location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
+			if (code && this.options.scope !== 'snsapi_base') {
+				let spread = app.globalData.spid ? app.globalData.spid : 0;
+				//公众号授权登录回调 wechatAuth(code, Cache.get("spread"), loginType)
+				wechat.auth(code, spread).then(res => {
+					console.log('进来的授权',res)
+					if (res.type === 'register') {
+							this.authKey = res.key;
+							console.log('authKey',this.authKey)
+							this.isUp = true
+					}
+					if(res.type === 'login'){
+						// let time = res.data.expires_time - this.$Cache.time();
+						this.$store.commit('LOGIN', {
+							token: res.data.token,
+							// time: time
 						});
-						that.userInfo = res.userInfo
-						that.$store.commit("SETUID", res.userInfo.uid);
-						that.$store.commit("UPDATE_USERINFO", res.userInfo);
-						that.wechatPhone()
+						// this.$store.commit('SETUID', res.data.userInfo.uid);
+						// this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
+						this.wechatPhone();
+						//location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
 					}
 				}).catch(error => {
-					// location.replace("/");
 				});
 			}
 			// #endif
 			let pages = getCurrentPages();
-			let prePage = pages[pages.length - 2];
-			if(prePage.route == 'pages/order_addcart/order_addcart'){
-				this.isHome = true
-			}else{
-				this.isHome = false
-			}
-			
+			console.log('数据库1',pages)
+			// let prePage = pages[pages.length - 2];
+			// console.log('数据库',prePage)
+			// if (prePage.route == 'pages/order_addcart/order_addcart') {
+			// 	this.isHome = true
+			// } else {
+			// 	this.isHome = false
+			// }
+
 		},
 		methods: {
-			back(){
+			back() {
 				uni.navigateBack();
 			},
-			home(){
+			home() {
 				uni.switchTab({
-					url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			},
 			// 弹窗关闭
-			maskClose(){
+			maskClose() {
 				this.isUp = false
 			},
-			bindPhoneClose(data){
-				if(data.isStatus){
+			bindPhoneClose(data) {
+				if (data.isStatus) {
 					this.isPhoneBox = false
 					this.$util.Tips({
-						title:'登录成功',
-						icon:'success'
-					},{
-						tab:3
+						title: '登录成功',
+						icon: 'success'
+					}, {
+						tab: 3
 					})
-				}else{
+				} else {
 					this.isPhoneBox = false
 				}
-				
+
 			},
 			// #ifdef MP
 			// 小程序获取手机号码
@@ -174,7 +192,9 @@
 						iv: iv,
 						code: code,
 						spid: app.globalData.spid,
-						spread: app.globalData.code
+						spread: app.globalData.code,
+						type: 'routine',
+						key: this.authKey
 					})
 					.then(res => {
 						let time = res.data.expires_time - this.$Cache.time();
@@ -194,8 +214,10 @@
 
 					})
 					.catch(res => {
-						console.log(res);
 						uni.hideLoading();
+						that.$util.Tips({
+								title: res
+							});
 					});
 			},
 			/**
@@ -217,7 +239,9 @@
 				});
 			},
 			setUserInfo(e) {
-				uni.showLoading({ title: '正在登录中' });
+				uni.showLoading({
+					title: '正在登录中'
+				});
 				Routine.getCode()
 					.then(code => {
 						this.getWxUser(code);
@@ -226,21 +250,29 @@
 						uni.hideLoading();
 					});
 			},
-			getWxUser(code){
+			getWxUser(code) {
 				let self = this
 				Routine.getUserInfo()
 					.then(res => {
 						let userInfo = res.userInfo;
 						userInfo.code = code;
-						userInfo.spread_spid = app.globalData.spid; //获取推广人ID
-						userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
-						Routine.authUserInfo(userInfo)
+						userInfo.spread_spid = app.globalData.spid;//获取推广人ID
+						userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID
+						userInfo.avatar  = userInfo.userInfo.avatarUrl;
+						userInfo.city  = userInfo.userInfo.city;
+						userInfo.country  = userInfo.userInfo.country;
+						userInfo.nickName  = userInfo.userInfo.nickName;
+						userInfo.province  = userInfo.userInfo.province;
+						userInfo.sex  = userInfo.userInfo.gender;
+						userInfo.type = 'routine'
+						Routine.authUserInfo(userInfo.code, userInfo)
 							.then(res => {
-								if(res.data.key !== undefined && res.data.key){
+								console.log(res)
+								self.authKey = res.data.key;
+								if (res.data.type === 'register') {
 									uni.hideLoading();
-									self.authKey = res.data.key;
 									self.isPhoneBox = true
-								}else{
+								} else {
 									uni.hideLoading();
 									let time = res.data.expires_time - self.$Cache.time();
 									self.$store.commit('LOGIN', {
@@ -248,13 +280,12 @@
 										time: time
 									});
 									self.$util.Tips({
-										title:res,
-										icon:'success'
-									},{
-										tab:3
+										title: res,
+										icon: 'success'
+									}, {
+										tab: 3
 									})
 								}
-								
 							})
 							.catch(res => {
 								uni.hideLoading();
@@ -269,8 +300,8 @@
 						uni.hideLoading();
 					});
 			},
-			
-			
+
+
 			// #endif
 			// #ifdef H5
 			// 获取url后面的参数
@@ -279,35 +310,62 @@
 				var reg_rewrite = new RegExp("(^|/)" + name + "/([^/]*)(/|$)", "i");
 				var r = window.location.search.substr(1).match(reg);
 				var q = window.location.pathname.substr(1).match(reg_rewrite);
-				if(r != null){
-						return unescape(r[2]);
-				}else if(q != null){
-						return unescape(q[2]);
-				}else{
-						return null;
+				if (r != null) {
+					return unescape(r[2]);
+				} else if (q != null) {
+					return unescape(q[2]);
+				} else {
+					return null;
 				}
 			},
 			// 公众号登录
-			wechatLogin(){
-				if(!this.code){
-					this.$wechat.oAuth('','/pages/users/wechat_login/index')
-				}else{
+			wechatLogin() {
+				console.log('微信登录',this.code)
+				console.log('微信登录2',this.options.code)
+				console.log('微信登录3',this.authKey)
+				console.log('isUp2',this.isUp)
+				if (!this.code && this.options.scope !== 'snsapi_base') {
+					this.$wechat.oAuth('snsapi_userinfo', '/pages/users/wechat_login/index');
+				} else {
+					console.log('isUp',this.isUp)
+					// if (this.authKey) {
+					// 	this.isUp = true;
+					// }
+					this.isUp = true;
 				}
+				// wechat.auth(this.code, this.$Cache.get("spread")).then(res => {
+				// 	if (res.data.type === 'register') {
+				// 			this.authKey = res.data.key;
+				// 			this.isUp = true
+				// 	}
+				// 	if(res.data.type === 'login'){
+				// 		let time = res.data.expires_time - this.$Cache.time();
+				// 		this.$store.commit('LOGIN', {
+				// 			token: res.data.token,
+				// 			time: time
+				// 		});
+				// 		this.$store.commit('SETUID', res.data.userInfo.uid);
+				// 		this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
+				// 	//	location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
+				// 	}
+				// }).catch(error => {
+				// 	// location.replace("/");
+				// });
 			},
 			// 输入手机号后的回调
-			wechatPhone(){
-				if(this.options.back_url){
-					let url =  uni.getStorageSync('snRouter')
+			wechatPhone() {
+				if (this.options.back_url) {
+					let url = uni.getStorageSync('snRouter')
 					let self = this
 					this.isUp = false
 					uni.showToast({
-						title:'登录成功',
-						icon:'none'
+						title: '登录成功',
+						icon: 'none'
 					})
-					setTimeout(res=>{
-						location.href = url.indexOf("/pages/index/index") != -1?'/':url
-					},800)
-				}else{
+					setTimeout(res => {
+						location.href = url.indexOf("/pages/index/index") != -1 ? '/' : url
+					}, 800)
+				} else {
 					uni.navigateBack()
 				}
 			}
@@ -316,11 +374,15 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	page {
 		background: #fff;
 	}
 
+	.page {
+		background: #fff;
+	}
+
 	.wechat_login {
 		padding: 72rpx 34rpx;
 
@@ -330,21 +392,24 @@
 
 		.btn-wrapper {
 			margin-top: 86rpx;
+			padding: 0 66rpx;
 
 			button {
 				width: 100%;
 				height: 86rpx;
 				line-height: 86rpx;
 				margin-bottom: 40rpx;
-				color: $theme-color;
-				border: 1px solid $theme-color;
 				border-radius: 120rpx;
 				font-size: 30rpx;
 
-				&.bg-red {
-					background: $theme-color;
+				&.btn1 {
 					color: #fff;
 				}
+
+				&.btn2 {
+					color: #666666;
+					border: 1px solid #666666;
+				}
 			}
 		}
 	}
@@ -356,7 +421,8 @@
 		justify-content: center;
 		font-size: 36rpx;
 	}
-	.icon{
+
+	.icon {
 		position: absolute;
 		left: 30rpx;
 		top: 0;
@@ -365,7 +431,8 @@
 		justify-content: center;
 		width: 86rpx;
 		height: 86rpx;
-		image{
+
+		image {
 			width: 50rpx;
 			height: 50rpx;
 		}
diff --git a/static/css/style.scss b/static/css/style.scss
index eb1bdc69..c96531c5 100644
--- a/static/css/style.scss
+++ b/static/css/style.scss
@@ -313,7 +313,7 @@
 .coupon-list .item .text .data .bnt.gray{background-color:#ccc;}
 
 .noCommodity {
-	border-top: 7rpx solid #f5f5f5
+	//border-top: 7rpx solid #f5f5f5
 }
 
 .noCommodity .pictrue {
@@ -719,4 +719,7 @@
 	}
 uni-checkbox:not([disabled]) .uni-checkbox-input:hover{
 	border-color: #d1d1d1;
+}
+.bg-green{
+	background-color: #3CBB45;
 }
\ No newline at end of file
diff --git a/static/images/barg002.png b/static/images/barg002.png
index a11e9787..79f2f617 100644
Binary files a/static/images/barg002.png and b/static/images/barg002.png differ
diff --git a/static/images/bargainBg.jpg b/static/images/bargainBg.jpg
index 15a92f92..e47be569 100644
Binary files a/static/images/bargainBg.jpg and b/static/images/bargainBg.jpg differ
diff --git a/static/images/canbj.png b/static/images/canbj.png
index fd127d96..c53084c4 100644
Binary files a/static/images/canbj.png and b/static/images/canbj.png differ
diff --git a/static/images/empty-box.png b/static/images/empty-box.png
index f8153b9d..e2343bad 100644
Binary files a/static/images/empty-box.png and b/static/images/empty-box.png differ
diff --git a/static/images/kjbj.png b/static/images/kjbj.png
new file mode 100644
index 00000000..03b3dd11
Binary files /dev/null and b/static/images/kjbj.png differ
diff --git a/static/images/logo2.png b/static/images/logo2.png
index 9198d1a2..cec5dd39 100644
Binary files a/static/images/logo2.png and b/static/images/logo2.png differ
diff --git a/static/images/noAddress.png b/static/images/noAddress.png
index bb6e3633..19cc300e 100644
Binary files a/static/images/noAddress.png and b/static/images/noAddress.png differ
diff --git a/static/images/noCart.png b/static/images/noCart.png
index d7ba570e..1a8abde0 100644
Binary files a/static/images/noCart.png and b/static/images/noCart.png differ
diff --git a/static/images/noCoupon.png b/static/images/noCoupon.png
index e2da350d..f334e44d 100644
Binary files a/static/images/noCoupon.png and b/static/images/noCoupon.png differ
diff --git a/static/images/noNews.png b/static/images/noNews.png
index 755d2068..88b8f117 100644
Binary files a/static/images/noNews.png and b/static/images/noNews.png differ
diff --git a/static/images/noOrder.png b/static/images/noOrder.png
index 425aaca7..ab0c123e 100644
Binary files a/static/images/noOrder.png and b/static/images/noOrder.png differ
diff --git a/static/images/noSearch.png b/static/images/noSearch.png
index 69e5e9be..c8e7edb8 100644
Binary files a/static/images/noSearch.png and b/static/images/noSearch.png differ
diff --git a/static/images/noShopper.png b/static/images/noShopper.png
index eade689f..f618c972 100644
Binary files a/static/images/noShopper.png and b/static/images/noShopper.png differ
diff --git a/static/images/posterbackgd.png b/static/images/posterbackgd.png
index 90a73bbf..0710edf6 100644
Binary files a/static/images/posterbackgd.png and b/static/images/posterbackgd.png differ
diff --git a/static/images/pth.png b/static/images/pth.png
new file mode 100644
index 00000000..81f6550d
Binary files /dev/null and b/static/images/pth.png differ
diff --git a/static/images/score.png b/static/images/score.png
index f0be9fe3..b785d9ff 100644
Binary files a/static/images/score.png and b/static/images/score.png differ
diff --git a/static/images/seckillTitle.png b/static/images/seckillTitle.png
index df378cfb..0e2d1703 100644
Binary files a/static/images/seckillTitle.png and b/static/images/seckillTitle.png differ
diff --git a/static/images/sign02.png b/static/images/sign02.png
deleted file mode 100644
index d819e840..00000000
Binary files a/static/images/sign02.png and /dev/null differ
diff --git a/static/images/spike-icon-001.png b/static/images/spike-icon-001.png
deleted file mode 100644
index 4355d267..00000000
Binary files a/static/images/spike-icon-001.png and /dev/null differ
diff --git a/static/images/spike-icon-002.gif b/static/images/spike-icon-002.gif
deleted file mode 100644
index 8ce5089d..00000000
Binary files a/static/images/spike-icon-002.gif and /dev/null differ
diff --git a/static/images/user_bg.png b/static/images/user_bg.png
index fa25f16f..9d326555 100644
Binary files a/static/images/user_bg.png and b/static/images/user_bg.png differ
diff --git a/static/images/value.jpg b/static/images/value.jpg
index f5b92938..32d4ab85 100644
Binary files a/static/images/value.jpg and b/static/images/value.jpg differ
diff --git a/static/images/writeOff.jpg b/static/images/writeOff.jpg
index f642a120..6045cf67 100644
Binary files a/static/images/writeOff.jpg and b/static/images/writeOff.jpg differ
diff --git a/static/images/xsms.png b/static/images/xsms.png
new file mode 100644
index 00000000..f1a7dd92
Binary files /dev/null and b/static/images/xsms.png differ
diff --git a/store/getters.js b/store/getters.js
index 789199c2..4e5ed31a 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -1,12 +1,13 @@
 export default {
-  token: state => state.app.token,
-  isLogin: state => !!state.app.token,
-  backgroundColor: state => state.app.backgroundColor,
-  userInfo: state => state.app.userInfo || {},
-	uid:state => state.app.uid,
+	token: state => state.app.token,
+	isLogin: state => !!state.app.token,
+	backgroundColor: state => state.app.backgroundColor,
+	userInfo: state => state.app.userInfo || {},
+	uid: state => state.app.uid,
 	homeActive: state => state.app.homeActive,
 	home: state => state.app.home,
-	chatUrl: state => state.app.chatUrl
+	chatUrl: state => state.app.chatUrl,
+	authorizeType: state => state.app.authorizeType
 };
 // export default {
 //   token: state => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJrYWlmYS5jcm1lYi5uZXQiLCJhdWQiOiJrYWlmYS5jcm1lYi5uZXQiLCJpYXQiOjE1NzcwODM1MzQsIm5iZiI6MTU3NzA4MzUzNCwiZXhwIjoxNTc3MDk0MzM0LCJqdGkiOnsiaWQiOjExMCwidHlwZSI6InVzZXIifX0.U-i1pbdRjyXI1gr79Uq2XBPZ89T8f5Ai9jwrR8woTwE',
diff --git a/store/modules/app.js b/store/modules/app.js
index d25f8175..5a9c4c8a 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -13,10 +13,11 @@ import {
 const state = {
 	token: Cache.get(LOGIN_STATUS) || null,
 	backgroundColor: "#fff",
-	userInfo: null,
+	userInfo: Cache.get(USER_INFO)?JSON.parse(Cache.get(USER_INFO)):null,
 	uid: Cache.get(UID) || null,
 	homeActive: false,
 	chatUrl: Cache.get('chatUrl') || '',
+	authorizeType: ''
 };
 
 const mutations = {
@@ -43,6 +44,7 @@ const mutations = {
 	},
 	UPDATE_USERINFO(state, userInfo) {
 		state.userInfo = userInfo;
+		Cache.set(USER_INFO, userInfo);
 	},
 	OPEN_HOME(state) {
 		state.homeActive = true;
@@ -52,6 +54,9 @@ const mutations = {
 	},
 	SET_CHATURL(state, chatUrl){
 		state.chatUrl = chatUrl;
+	},
+	AuthorizeType(state, authorizeType){
+		state.authorizeType = authorizeType;
 	}
 };
 
diff --git a/utils/index.js b/utils/index.js
index 8a2b795a..d4f08837 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -5,81 +5,78 @@ import Cache from "@/utils/cache";
  * 静默授权绑定上下级，使用在已经登录后扫描了别人的推广二维码
  * @param {Object} puid
  */
-export function silenceBindingSpread()
-{
-	
-	
+export function silenceBindingSpread() {
+
+
 	//#ifdef H5
 	let puid = Cache.get('spread');
 	//#endif
-	
+
 	//#ifdef MP
 	let puid = getApp().globalData.spid;
-	if(!puid){
+	if (!puid) {
 		puid = getApp().globalData.code;
 	}
 	//#endif
-	
+
 	puid = parseInt(puid);
-	if(Number.isNaN(puid)){
+	if (Number.isNaN(puid)) {
 		puid = 0;
 	}
-	if(puid){
+	if (puid) {
+		spread(puid).then(res => {}).catch(res => {});
 		//#ifdef H5
-		 Cache.clear('spread');
+		Cache.clear('spread');
 		//#endif
-		
+
 		//#ifdef MP
-		 getApp().globalData.spid = 0;
-		 getApp().globalData.code = 0;
+		getApp().globalData.spid = 0;
+		getApp().globalData.code = 0;
 		//#endif
-		// spread(puid).then(res=>{
-		// 	console.log(res);		
-		// }).catch(res=>{
-		// 	console.log(res);
-		// });
-	}else{
-		 Cache.set('spread', 0);
+	} else {
+		Cache.set('spread', 0);
 	}
 }
 
 export function isWeixin() {
-  return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
+	return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
 }
 
 export function parseQuery() {
-  const res = {};
+	const res = {};
 
-  const query = (location.href.split("?")[1] || "")
-    .trim()
-    .replace(/^(\?|#|&)/, "");
+	const query = (location.href.split("?")[1] || "")
+		.trim()
+		.replace(/^(\?|#|&)/, "");
 
-  if (!query) {
-    return res;
-  }
+	if (!query) {
+		return res;
+	}
 
-  query.split("&").forEach(param => {
-    const parts = param.replace(/\+/g, " ").split("=");
-    const key = decodeURIComponent(parts.shift());
-    const val = parts.length > 0 ? decodeURIComponent(parts.join("=")) : null;
+	query.split("&").forEach(param => {
+		const parts = param.replace(/\+/g, " ").split("=");
+		const key = decodeURIComponent(parts.shift());
+		const val = parts.length > 0 ? decodeURIComponent(parts.join("=")) : null;
 
-    if (res[key] === undefined) {
-      res[key] = val;
-    } else if (Array.isArray(res[key])) {
-      res[key].push(val);
-    } else {
-      res[key] = [res[key], val];
-    }
-  });
+		if (res[key] === undefined) {
+			res[key] = val;
+		} else if (Array.isArray(res[key])) {
+			res[key].push(val);
+		} else {
+			res[key] = [res[key], val];
+		}
+	});
 
-  return res;
+	return res;
 }
 
 // #ifdef H5
-	const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || `ws://${location.hostname}:20001`;
-	export {VUE_APP_WS_URL}
+const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || `ws://${location.hostname}:20001`;
+export {
+	VUE_APP_WS_URL
+}
 // #endif
 
 
 
-export default parseQuery;
\ No newline at end of file
+export default parseQuery;
diff --git a/utils/util.js b/utils/util.js
index 672a964a..e61215cf 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -170,10 +170,10 @@ import {
 	 */
 	PosterCanvas: function(arr2, store_name, price,ot_price, successFn) {
 		let that = this;
-		uni.showLoading({
-			title: '海报生成中',
-			mask: true
-		});
+		// uni.showLoading({
+		// 	title: '海报生成中',
+		// 	mask: true
+		// });
 		const ctx = uni.createCanvasContext('firstCanvas');
 		ctx.clearRect(0, 0, 0, 0);
 		/**
@@ -259,7 +259,7 @@ import {
 						destWidth: WIDTH,
 						destHeight: HEIGHT,
 						success: function(res) {
-							uni.hideLoading();
+							// uni.hideLoading();
 							successFn && successFn(res.tempFilePath);
 						}
 					})
@@ -605,6 +605,15 @@ import {
 	            obj = obj + '';
 	        }
 	        return obj;
+	},
+	
+	/*
+	 * 替换域名
+	 */
+	setDomain: function(url) {
+	        url = url ? url.toString() : '';
+	        if (url.indexOf("https://") > -1) return url;
+	        else return url.replace('http://', 'https://');
 	}
 
  }
diff --git a/utils/validate.js b/utils/validate.js
index c64779df..bf81cdb3 100644
--- a/utils/validate.js
+++ b/utils/validate.js
@@ -24,7 +24,29 @@ export function checkPhone(phone) {
   }
 }
 
-
+/**
+ * 函数防抖 (只执行最后一次点击)
+ * @param fn
+ * @param delay
+ * @returns {Function}
+ * @constructor
+ */
+export const Debounce = (fn, t) => {
+  const delay = t || 500
+  let timer
+  console.log(fn)
+  console.log(typeof fn)
+  return function() {
+    const args = arguments
+    if (timer) {
+      clearTimeout(timer)
+    }
+    timer = setTimeout(() => {
+      timer = null
+      fn.apply(this, args)
+    }, delay)
+  }
+}