From 0bd15917637362c104eb157d5163f65bf9503780 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期六, 14 九月 2024 16:53:14 +0800
Subject: [PATCH] feat:通行证
---
pages/login/login.vue | 117 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 50 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5d31eb0..e66b574 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,8 +2,9 @@
<view class="login">
<view class="logo">鏃犱汉鍊煎畧</view>
<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
- <user-password :btnText="0" />
+ <user-password :btnText="0" :userList="userList"/>
<!-- 寰俊openid鐧诲綍 -->
+ <!-- #ifdef MP-WEIXIN -->
<view class="loginBtn">
<u-button class="button"
@click.stop="beforeLoginEvent"
@@ -12,17 +13,22 @@
type="primary"
text="寰俊涓�閿櫥褰�"></u-button>
</view>
- <!-- <view class="loginBtn">
- <u-button @click.stop="jumpBindBack"
- type="primary"
- text="涓�閿粦瀹氭祴璇�"></u-button>
- </view> -->
- <view class="register"
- @click="registerClick"><text>娉ㄥ唽</text></view>
+ <!-- #endif -->
+ <view class="utils-block">
+ <!-- #ifdef MP-WEIXIN -->
+ <view @click="forgetPassword"><text>蹇樿瀵嗙爜?</text></view>
+ <!-- #endif -->
+ <!-- #ifdef MP-WEIXIN -->
+ <view @click="PrivacyAgreementHandle"><text>鏂扮敤鎴锋敞鍐�</text></view>
+ <!-- #endif -->
+ </view>
+
<view class="login-bottom-box">
- <view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
+ <view class="copyright">娌у窞鑱氶殕鍖栧伐鏃犱汉鍊煎畧寰俊灏忕▼搴�</view>
<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
</view>
+
+ <!-- #ifdef MP-WEIXIN -->
<!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
<view class="loginPopup">
<u-popup :show="loginPopupShow"
@@ -57,6 +63,7 @@
@confirm="bindWxConfirm"
@cancel="bindWxCancel"></u-modal>
</view>
+ <!-- #endif -->
</view>
</template>
@@ -73,17 +80,30 @@
// 缁戝畾寰俊妯℃�佹
bindWxModelShow: false,
bindWxModelTitle: '鎻愮ず',
- bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+ bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+ appid: "",
+ secret: "",
+ userList:[]
};
},
components: {
userPassword
},
+ onShow() {
+ this.userList=uni.getStorageSync('userList')?JSON.parse(uni.getStorageSync('userList')):[];
+ },
methods: {
...mapMutations(['setUserTabbar', 'changeisLogin']),
+ getAppidAndSercet() {
+ this.$reqGet('getAppidAndSercet').then(res => {
+ this.appid = res.data.appid;
+ this.secret = res.data.secret
+ })
+ },
// 璁块棶wx.login,鑾峰彇code
beforeLoginEvent() {
this.loginPopupShow = true;
+ this.getAppidAndSercet();
},
wxLogin() {
// 鑾峰彇鐧诲綍鐢ㄦ埛code
@@ -107,16 +127,17 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- wx.request({
- url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${code}&grant_type=authorization_code`,
- success(res) {
- uni.setStorageSync('openid', res.data.openid);
- // uni.showToast({
- // title: '鎴愬姛鑾峰彇娴嬭瘯openid',
- // icon: 'none'
- // });
- }
- });
+ // wx.request({
+ // url: `https://api.weixin.qq.com/sns/jscode2session?appid=${this.appid}&secret=${this.secret}&js_code=${code}&grant_type=authorization_code`,
+ // success(res) {
+ // console.log(res, 'openid');
+ // uni.setStorageSync('openid', res.data.openid);
+ // // uni.showToast({
+ // // title: '鎴愬姛鑾峰彇娴嬭瘯openid',
+ // // icon: 'none'
+ // // });
+ // }
+ // });
this.$nextTick(() => {
apiLoginWx({ code: code }).then(res => {
if (res.code != 1) {
@@ -130,6 +151,8 @@
this.$reqGet('getUserEntity').then(res => {
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
+ uni.setStorageSync("userId", res.data.userId)
+ uni.setStorageSync("carNo", res.data.carNo)
setCustomerId(res.data.customerid);
uni.hideLoading();
//璺宠浆椤甸潰
@@ -141,6 +164,8 @@
this.$u.toast(res.msg);
this.bindWxModelShow = true;
}
+ }).catch((err) => {
+ this.loginPopupShow = false;
});
});
this.loginPopupShow = false;
@@ -161,17 +186,16 @@
openPopup() {
console.log('鎵撳紑浜�');
},
- registerClick() {
+ forgetPassword() {
uni.navigateTo({
- url: '/pages/register/register'
- });
- },
- // 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熼�氳繃鎵爜瑙ｅ喅
- jumpBindBack() {
- uni.navigateTo({
- url: '/pages/bindBackground/bindBackground'
+ url: '/pages/login/forgetPassword/forgetPassword'
})
- }
+ },
+ PrivacyAgreementHandle() {
+ uni.navigateTo({
+ url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
+ })
+ },
}
};
</script>
@@ -179,33 +203,26 @@
<style lang="scss">
@import 'index.scss';
+ .PrivacyAgreement {
+ color: rgb(60, 156, 255)
+ }
+
.login {
- // height: 100vh;
- // display: flex;
- // align-items: center;
-
- // .loginBtn {
- // margin: 0 auto;
- // width: 80%;
-
- // .u-button {
- // .u-icon {
- // .u-icon__icon {
- // font-size: vww(20) !important;
- // }
- // }
- // }
-
- // .u-button--success {
- // border-style: none;
- // }
- // }
.loginBtn {
margin-top: vww(20);
.u-button {
width: 80%;
}
+ }
+
+ .utils-block {
+ width: 80%;
+ margin: vww(20) auto;
+ display: flex;
+ justify-content: space-between;
+ color: #497bff;
+ font-size: vww(17);
}
.logo {
@@ -309,4 +326,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1