From e52e720168541aa02e0326a505d251f42828aedf Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 30 七月 2024 11:14:08 +0800
Subject: [PATCH] 添加复磅申请及质检同意功能
---
pages/login/login.vue | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5d31eb0..14b9e25 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -10,7 +10,7 @@
:disabled="btnLoading"
:loading="btnLoading"
type="primary"
- text="寰俊涓�閿櫥褰�"></u-button>
+ text="鎵嬫満鍙蜂竴閿櫥褰�"></u-button>
</view>
<!-- <view class="loginBtn">
<u-button @click.stop="jumpBindBack"
@@ -18,9 +18,9 @@
text="涓�閿粦瀹氭祴璇�"></u-button>
</view> -->
<view class="register"
- @click="registerClick"><text>娉ㄥ唽</text></view>
+ @click="PrivacyAgreementHandle" :loading="zhuceLoading"><text>娉ㄥ唽</text></view>
<view class="login-bottom-box">
- <view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
+ <view class="copyright">鏃犱汉鍊煎畧寰俊灏忕▼搴�</view>
<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
</view>
<!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
@@ -64,7 +64,7 @@
import { apiLoginWx, apiLoginPassword } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
import userPassword from './userPassword.vue';
- import { setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
+ import { setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome} from '@/utils/status.js';
export default {
data() {
return {
@@ -73,7 +73,10 @@
// 缁戝畾寰俊妯℃�佹
bindWxModelShow: false,
bindWxModelTitle: '鎻愮ず',
- bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+ bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+ appid: "",
+ secret: "",
+ zhuceLoading: false, //娉ㄥ唽
};
},
components: {
@@ -81,9 +84,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,7 +118,7 @@
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) {
uni.setStorageSync('openid', res.data.openid);
// uni.showToast({
@@ -121,7 +131,6 @@
apiLoginWx({ code: code }).then(res => {
if (res.code != 1) {
this.$u.toast('鐧诲綍鎴愬姛');
- this.changeisLogin(true);
// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
setToken(res.access_token);
setRefreshToken(res.refresh_token);
@@ -131,12 +140,13 @@
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
setCustomerId(res.data.customerid);
+ setU
uni.hideLoading();
//璺宠浆椤甸潰
this.$nextTick(() => {
redirectHome();
});
- });
+ })
} else {
this.$u.toast(res.msg);
this.bindWxModelShow = true;
@@ -161,23 +171,25 @@
openPopup() {
console.log('鎵撳紑浜�');
},
- registerClick() {
+ PrivacyAgreementHandle() {
+ this.zhuceLoading = true
uni.navigateTo({
- url: '/pages/register/register'
- });
- },
- // 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熼�氳繃鎵爜瑙ｅ喅
- jumpBindBack() {
- uni.navigateTo({
- url: '/pages/bindBackground/bindBackground'
+ url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
})
- }
+ setTimeout(() => {
+ this.zhuceLoading = false
+ },1000)
+ },
}
};
</script>
<style lang="scss">
@import 'index.scss';
+
+ .PrivacyAgreement {
+ color: rgb(60, 156, 255)
+ }
.login {
// height: 100vh;
@@ -309,4 +321,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1