twt 2 years ago
parent
commit
5af918b9fd
3 changed files with 37 additions and 12 deletions
  1. 11 8
      pages/index/index.vue
  2. 20 0
      store/index.js
  3. 6 4
      utils/request.js

+ 11 - 8
pages/index/index.vue

@@ -87,7 +87,7 @@
 			<swiper class="swiper2" circular  :autoplay="false" :interval="interval"
 							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 				<swiper-item v-for="(item,index) in homeCardList.ad1">
-					<view class="swiper-item2">
+					<view class="swiper-item2" @click="goRoter('onlineBooking')">
 						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
 					</view>	
 				</swiper-item>
@@ -165,9 +165,6 @@
 		<!-- 手机号授权 -->
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
-				<view class="sqLogoBox">
-					logo
-				</view>
 				<view class="authorizName">这是小程序名称</view>
 				<view class="authorizMs">您好,欢迎访问本店,授权手机号登录能获取我们最新的促销活动哦~</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
@@ -214,7 +211,8 @@
 				 
 			// 	 }
 			// }); 
-			this.userInfo = uni.getStorageSync("userInfo");
+			//this.userInfo = uni.getStorageSync("userInfo");
+			this.userInfo=this.$store.state.userInfo
 			if(this.userInfo){
 				//this.wxOpenData = uni.getStorageSync("wxOpenData");
 				this.getCarList();
@@ -252,6 +250,7 @@
 			  console.log(e);
 			  this.code=e.detail.code
 			  this.wxPhoneLogin()
+			  this.authorizShow=false;
 			},
              wxgologin(){
              	var that=this;
@@ -296,6 +295,7 @@
 					
 					that.queryHomeCardList()
 					//that.wxPhoneLogin()
+					this.$store.commit('mutationswxOpenData', that.wxOpenData)
 					uni.setStorage({
 						key: 'wxOpenData',
 						data: that.wxOpenData,
@@ -305,6 +305,8 @@
 						 }
 					}); 
 					if(this.wxOpenData.loginInfo){
+						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
+						this.userInfo=that.wxOpenData.loginInfo.openUser
 						uni.setStorage({
 							key: 'userInfo',
 							data: that.wxOpenData.loginInfo.openUser,
@@ -329,7 +331,8 @@
 				  },'POST').then(res => {
 				 	var data = res.data;
 					if(data.loginInfo){
-						this.userInfo=data.loginInfo.openUser
+						this.userInfo=data.loginInfo.openUser;
+						this.$store.commit('mutationsuserInfo', this.userInfo)
 						uni.setStorage({
 							key: 'userInfo',
 							data: data.loginInfo.openUser,
@@ -380,7 +383,7 @@
 	.authorizCont{
 		margin-top: 30vh;
 		width: 564rpx;
-		height: 484rpx;
+		height: 408rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		margin-left: 93rpx;
@@ -405,7 +408,7 @@
 		line-height: 42rpx;
 		font-size: 30rpx;
 		text-align: center;
-		padding-top: 140rpx;
+		padding-top: 58rpx;
 	}
 	.authorizMs{
 		color: #999999;

+ 20 - 0
store/index.js

@@ -7,6 +7,8 @@ const store = new Vuex.Store({
 		yuyueData:'',
 		carInfo:'',
 		ckshopInfo:'',
+		userInfo:'',
+		wxOpenData:'',
 	},
 	getters:{
 		getyuyueData(state){
@@ -18,6 +20,12 @@ const store = new Vuex.Store({
 		getckshopInfo(state){
 			return state.ckshopInfo
 		},
+		getuserInfo(state){
+			return state.userInfo
+		},
+		getwxOpenData(state){
+			return state.wxOpenData
+		}
     },
     mutations: {
 		mutationsyuyueData(state,data){
@@ -29,6 +37,12 @@ const store = new Vuex.Store({
 		mutationsckshopInfo(state,data){
 			state.ckshopInfo=data
 		},
+		mutationsuserInfo(state,data){
+			state.userInfo=data
+		},
+		mutationswxOpenData(state,data){
+			state.wxOpenData=data
+		},
 	},
     actions: {
 		actionsyuyueData(context,playload){
@@ -40,6 +54,12 @@ const store = new Vuex.Store({
 		actionsckshopInfo(context,playload){
 			context.commit('mutationsckshopInfo',playload)
 		},
+		actionsuserInfo(context,playload){
+			context.commit('mutationsuserInfo',playload)
+		},
+		actionswxOpenData(context,playload){
+			context.commit('mutationswxOpenData',playload)
+		},
 	}
 })
 export default store

+ 6 - 4
utils/request.js

@@ -1,19 +1,21 @@
 //测试地址
-//const baseUrl = 'http://api.dms.66km.com.cn/'
-const baseUrl = 'http://192.168.0.122:20187/'
+const baseUrl = 'http://api.dms.66km.com.cn/'
+//const baseUrl = 'http://192.168.0.122:20187/'
 
 //正式地址
-
+import $store from '../store'
 
 const http = (url = '', date = {}, type = 'POST', header = {
 }) => {
     return new Promise((resolve, reject) => {
 		header={};
-		const wxOpenData = uni.getStorageSync("wxOpenData");
+		//const wxOpenData = uni.getStorageSync("wxOpenData");
+		var wxOpenData=$store.state.wxOpenData
 		if(wxOpenData.loginInfo){
 			header['token']=wxOpenData.loginInfo.token;
 			header['uid']=wxOpenData.loginInfo.uid; 
 		}
+		//console.log($store.state.carInfo)
 		//header['token']='98A9FED8814B457288166BDF623F33D1';
 		//header['uid']='39415962-C9D3-466D-A73F-5B5429A8DB2A'; 
 		header['Content-Type']='application/x-www-form-urlencoded';