hwq 3 anos atrás
pai
commit
8b29ac3a1b

+ 5 - 5
App.vue

@@ -33,7 +33,7 @@ export default {
 		//判断是否已经缓存浏览器
 		let bool = uni.getStorageSync('weichatBrowser') || '';
 		if (bool === '') {
-			//判断是否为微信浏览 
+			//判断是否为微信浏览
 			bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
 			// 保存当前是否为微信内核浏览器
 			uni.setStorageSync('weichatBrowser', bool);
@@ -45,7 +45,7 @@ export default {
 		// #endif
 		// #ifdef APP-PLUS
 		// 判断是否升级
-		getUpApp()
+		getUpApp();
 		// 获取当前运行系统
 		let system = uni.getStorageSync('platform') || '';
 		if (!system) {
@@ -64,14 +64,14 @@ export default {
 		// console.log('App Hide');
 	},
 	methods: {
-		...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),
+		...mapMutations('user', ['setUserInfo', 'login', 'hasLogin'])
 	}
 };
 </script>
 
 <style lang="scss">
 /*全局公共样式和字体图标*/
-@import "uview-ui/index.scss";
+@import 'uview-ui/index.scss';
 @import '/static/css/cmy.css';
 view,
 scroll-view,
@@ -99,7 +99,7 @@ image,
 video {
 	box-sizing: border-box;
 }
-page{
+page {
 	width: 0;
 	min-width: 100%;
 }

+ 1 - 1
components/uni-popup/uni-popup-dialog.vue

@@ -7,7 +7,7 @@
 			<text class="uni-dialog-content-text" v-if="mode === 'base'">{{content}}</text>
 			<input v-else class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholder" :focus="focus">
 		</view>
-		<view class="uni-dialog-picker" if="isSkm">
+		<view class="uni-dialog-picker" v-if="isSkm">
 			<picker @change="bindPickerChange" :value="index" :range="array">
 				<view class="picker-val">支付方式:{{array[index]}}</view>
 			</picker>

+ 15 - 2
pages/index/index.vue

@@ -186,6 +186,8 @@ export default {
 				data: option.spread
 			});
 		}
+		let canChange = uni.getStorageSync('canChange') || '';
+		console.log(canChange)
 		if(option.store_id) {
 			getStore({
 				id: option.store_id
@@ -193,9 +195,20 @@ export default {
 				this.setStoreInfo(data)
 				console.log(data)
 			})
-			this.setCanChange()
+			this.setCanChange();
+			uni.setStorageSync('canChange',option.store_id)
 		}else {
-			this.getaddress();
+			if(canChange == ''){
+				this.getaddress();
+			}else {
+				console.log("进入缓存")
+				getStore({
+					id: canChange
+				}).then(({data}) => {
+					this.setStoreInfo(data)
+				})
+				this.setCanChange();
+			}
 		}
 		
 	},

+ 2 - 2
pages/received/index.vue

@@ -432,8 +432,8 @@ export default {
 				success: function(res) {
 					let i = res.resultStr.split(",");
 					obj.code = i[0];
-					obj.isSkm = /^\d+$/.test(obj.code);
 					obj.payTypeShow = i[1]*1
+					obj.isSkm = /^\d+$/.test(obj.code);
 					
 					obj.$refs.popup1.open();
 				}
@@ -445,8 +445,8 @@ export default {
 				success: function(e) {
 					let i = e.result.split(",");
 					obj.code = i[0];
-					obj.code = i[0];
 					obj.isSkm = /^\d+$/.test(obj.code);
+					console.log(obj.isSkm)
 					obj.payTypeShow = i[1]*1
 					obj.$refs.popup1.open();
 				}

+ 1 - 0
pages/userinfo/userinfo.vue

@@ -92,6 +92,7 @@ export default {
 				content: '确定要退出登录么',
 				success: e => {
 					if (e.confirm) {
+						uni.removeStorageSync('canChange')
 						logout({}).then()
 						uni.navigateBack();
 						obj.logout();

+ 1 - 0
store/index.js

@@ -48,6 +48,7 @@ const store = new Vuex.Store({
 		},
 		setCanChange(state) {
 			state.canChange = 0
+			console.log('不能点击')
 		}
 	},
 	modules:{