From 40ce9965257472d715d072647796ac91c3932d73 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 18 九月 2023 17:49:00 +0800
Subject: [PATCH] 修改合卡
---
pages/login/login.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5d31eb0..53ea34c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -18,7 +18,7 @@
text="涓�閿粦瀹氭祴璇�"></u-button>
</view> -->
<view class="register"
- @click="registerClick"><text>娉ㄥ唽</text></view>
+ @click="PrivacyAgreementHandle"><text>娉ㄥ唽</text></view>
<view class="login-bottom-box">
<view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
@@ -73,7 +73,9 @@
// 缁戝畾寰俊妯℃�佹
bindWxModelShow: false,
bindWxModelTitle: '鎻愮ず',
- bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+ bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+ appid: "",
+ secret: "",
};
},
components: {
@@ -81,9 +83,16 @@
},
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
@@ -108,8 +117,9 @@
title: '鍔犺浇涓�...'
});
wx.request({
- url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${code}&grant_type=authorization_code`,
+ 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',
@@ -130,6 +140,10 @@
this.$reqGet('getUserEntity').then(res => {
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
+ uni.setStorageSync("userId", res.data.userId)
+ if (res.data.carNo) {
+ uni.setStorageSync("carNo", res.data.carNo)
+ }
setCustomerId(res.data.customerid);
uni.hideLoading();
//璺宠浆椤甸潰
@@ -161,17 +175,11 @@
openPopup() {
console.log('鎵撳紑浜�');
},
- registerClick() {
+ PrivacyAgreementHandle() {
uni.navigateTo({
- url: '/pages/register/register'
- });
- },
- // 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熼�氳繃鎵爜瑙ｅ喅
- jumpBindBack() {
- uni.navigateTo({
- url: '/pages/bindBackground/bindBackground'
+ url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
})
- }
+ },
}
};
</script>
@@ -179,6 +187,10 @@
<style lang="scss">
@import 'index.scss';
+ .PrivacyAgreement {
+ color: rgb(60, 156, 255)
+ }
+
.login {
// height: 100vh;
// display: flex;
--
Gitblit v1.9.1