Home Explore Help
Register Sign In
mxf
/
lipin
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修复登录bug、优化

牟新芬 4 years ago
parent
6d8531bf13
commit
8b1550eec5
7 changed files with 47 additions and 15 deletions
Unified View Show Diff Stats
  1. 6 10
      libs/login.js
  2. 1 1
      manifest.json
  3. 26 1
      pages/my/index.vue
  4. 11 0
      pages/users/login/index.vue
  5. 1 1
      pages/users/order/index.vue
  6. 1 1
      pages/users/recharge/index.vue
  7. 1 1
      unpackage/dist/build/h5/index.html

+ 6 - 10
libs/login.js
View File 

@@ -35,16 +35,12 @@ export function toLogin(push, pathLogin) {
 
 		pathLogin = '/page/users/login/index'
 
 		pathLogin = '/page/users/login/index'
 
 	Cache.set('login_back_url',path);
 
 	Cache.set('login_back_url',path);
 
 	// #ifdef H5 || APP-PLUS
 
 	// #ifdef H5 || APP-PLUS
 
-	if (isWeixin()) {
 
-		auth.oAuth();
 
-	} else {
 
-		if (path !== pathLogin) {
 
-		 push ? uni.navigateTo({
 
-		 	url:'/pages/users/login/index'
 
-		 }) : uni.reLaunch({
 
-		 	url: '/pages/users/login/index'
 
-		 });
 
-		}
 
+	if (path !== pathLogin) {
 
+	 push ? uni.navigateTo({
 
+		url:'/pages/users/login/index'
 
+	 }) : uni.reLaunch({
 
+		url: '/pages/users/login/index'
 
+	 });
 
 	}
 
 	}
 
 	// #endif
 
 	// #endif

+ 1 - 1
manifest.json
View File 

@@ -87,7 +87,7 @@
 
             "mode" : "history",
 
             "mode" : "history",
 
             "base" : "/h5/"
 
             "base" : "/h5/"
 
         },
 
         },
 
-        "domain" : "lipinwawa.com",
 
+        "domain" : "www.lipinwawa.com",
 
         "sdkConfigs" : {
 
         "sdkConfigs" : {
 
             "maps" : {
 
             "maps" : {
 
                 "qqmap" : {
 
                 "qqmap" : {

+ 26 - 1
pages/my/index.vue
View File 

@@ -8,8 +8,9 @@
 
 				<view class="text">
 
 				<view class="text">
 
 					<view class="name">{{userInfo.nickname}}<text>{{userInfo.levelname}}</text></view>
 
 					<view class="name">{{userInfo.nickname}}<text>{{userInfo.levelname}}</text></view>
 
 					<view>{{userInfo.mobile}}</view>
 
 					<view>{{userInfo.mobile}}</view>
 
-				</view>
 
+				</view>			
 			</view>
 
 			</view>
 
+			<text @click="loginOut">退出</text>
 
 		</view>
 
 		</view>
 
 		<view class="money">
 
 		<view class="money">
 
 			<view class="balance">
 
 			<view class="balance">
 
@@ -150,6 +151,23 @@
 
 						}
 
 						}
 
 					})
 
 					})
 
 				})
 
 				})
 
+			},
 
+			loginOut: function() {
 
+				let that = this;
 
+				uni.showModal({
 
+					title: '提示',
 
+					content: '确定退出登录?',
 
+					success: function (res) {
 
+						if (res.confirm) {
 
+							that.$store.commit("LOGOUT");
 
+							uni.switchTab({
 
+								url: '/pages/index/index'
 
+							});
 
+						} else if (res.cancel) {
 
+							console.log('用户点击取消');
 
+						}
 
+					}
 
+				});
 
 			}
 
 			}
 
 		}
 
 		}
 
 	}
 
 	}
 
@@ -157,6 +175,8 @@
 
 
 
 <style scoped lang="scss">
 
 <style scoped lang="scss">
 
 	.header{
 
 	.header{
 
+		display: flex;
 
+		justify-content: space-between;
 
 		height:360rpx;
 
 		height:360rpx;
 
 		background: linear-gradient(90deg,#ff5c00 0,#FF464E);
 
 		background: linear-gradient(90deg,#ff5c00 0,#FF464E);
 
 		.info{
 
 		.info{
 
@@ -197,6 +217,11 @@
 
 				}
 
 				}
 
 			}
 
 			}
 
 		}
 
 		}
 
+		text{
 
+			color:#fff;
 
+			padding-top: 80rpx;
 
+			padding-right: 25rpx;
 
+		}
 
 	}
 
 	}
 
 	.money{
 
 	.money{
 
 		width:700rpx;
 
 		width:700rpx;

+ 11 - 0
pages/users/login/index.vue
View File 

@@ -53,6 +53,12 @@
 
 					that.setHeight = res.windowHeight
 
 					that.setHeight = res.windowHeight
 
 				}
 
 				}
 
 		    })
 
 		    })
 
+			try {
 
+				that.userName = uni.getStorageSync('account');
 
+				that.password = uni.getStorageSync('password');
 
+			} catch (e) {
 
+				// error
 
+			}
 
 		},
 
 		},
 
 		methods: {
 
 		methods: {
 
 			async submit() {
 
 			async submit() {
 
@@ -75,6 +81,11 @@
 
 						'token': res.data.token,
 
 						'token': res.data.token,
 
 						'time': 2592000
 
 						'time': 2592000
 
 					});
 
 					});
 
+					try {
 
+						uni.setStorageSync('account', that.userName);
 
+						uni.setStorageSync('password', that.password);
 
+					} catch {}
 
+					
 					that.$store.commit("UPDATE_USERINFO", res.data.user_info);
 
 					that.$store.commit("UPDATE_USERINFO", res.data.user_info);
 
 					const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 
 					const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 
 					that.$Cache.clear(BACK_URL);
 
 					that.$Cache.clear(BACK_URL);

+ 1 - 1
pages/users/order/index.vue
View File 

@@ -5,7 +5,7 @@
 
 				<view class='picTxt acea-row row-between-wrapper'>
 
 				<view class='picTxt acea-row row-between-wrapper'>
 
 					<view class='text'>
 
 					<view class='text'>
 
 						<view class='name'>订单信息</view>
 
 						<view class='name'>订单信息</view>
 
-						<view>总金额：￥{{orderData.total || 0}} 总子订单数：{{orderData.subOrder || 0}}</view>
 
+						<!-- <view>总金额：￥{{orderData.total || 0}} 总子订单数：{{orderData.subOrder || 0}}</view> -->
 
 					</view>
 
 					</view>
 
 					<view class='pictrue'>
 
 					<view class='pictrue'>
 
 						<image src='../../../static/images/orderTime.png'></image>
 
 						<image src='../../../static/images/orderTime.png'></image>

+ 1 - 1
pages/users/recharge/index.vue
View File 

@@ -69,7 +69,7 @@
 
 							this.code = options.code;
 
 							this.code = options.code;
 
 						}else{
 
 						}else{
 
 							var appID = "wxa9130b2090dfb130"; // 公众号AppID
 
 							var appID = "wxa9130b2090dfb130"; // 公众号AppID
 
-							var redirect_uri = "https://babalipin.com/h5/pages/users/recharge/index"; // 授权接口地址
 
+							var redirect_uri = "https://www.babalipin.com/h5/pages/users/recharge/index"; // 授权接口地址
 
 							var url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + appID + "&redirect_uri=" + redirect_uri + "&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
 
 							var url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + appID + "&redirect_uri=" + redirect_uri + "&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
 
 							window.location.href = url;
 
 							window.location.href = url;
 
 						}
 
 						}

+ 1 - 1
unpackage/dist/build/h5/index.html
View File 

@@ -1,2 +1,2 @@
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>巴巴礼品网</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>巴巴礼品网</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.f37b29dd.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.60852841.js></script><script src=/h5/static/js/index.4273dd70.js></script></body></html>
 
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.f37b29dd.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.60852841.js></script><script src=/h5/static/js/index.2b6259c5.js></script></body></html>