From 1ab29b3567574a721bd37d5ff9d7e9db386272d6 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 16 三月 2023 17:08:44 +0800
Subject: [PATCH] thirdCommit
---
pages/login/login.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 961779e..7a3b0b5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,7 +2,7 @@
<view class="login">
<view class="logo">鏃犱汉鍊煎畧</view>
<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
- <user-password />
+ <user-password :btnText='0'/>
<!-- 寰俊openid鐧诲綍 -->
<view class="loginBtn">
<u-button class="button" @click.stop="beforeLoginEvent" :disabled="btnLoading" :loading="btnLoading" type="primary" text="寰俊涓�閿櫥褰�"></u-button>
@@ -24,20 +24,28 @@
</view>
</u-popup>
</view>
+ <!-- 璇㈤棶鏄惁缁戝畾寰俊 -->
+ <view class="bindWxModel">
+ <u-modal :show="bindWxModelShow" :title="bindWxModelTitle" showCancelButton :content="bindWxContent" @confirm="bindWxConfirm" @cancel="bindWxCancel"></u-modal>
+ </view>
</view>
</template>
<script>
-import { apiLogin, apiLogin2, apiLoginPassword } from '@/api/publicInterface.js';
+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';
export default {
data() {
return {
wxcode: '', // 鍙告満1
btnLoading: false,
- loginPopupShow: false
+ loginPopupShow: false,
+ // 缁戝畾寰俊妯℃�佹
+ bindWxModelShow: false,
+ bindWxModelTitle: '鎻愮ず',
+ bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
};
},
components: {
@@ -67,7 +75,7 @@
},
// 鐧诲綍鎺ュ彛
apiLogin() {
- // apiLogin2({ code: this.wxcode })
+ // apiLoginWx({ code: this.wxcode })
// .then(res => {
// console.log('璇锋眰鐧诲綍', res);
// if (res.msg == '闇�缁戝畾') {
@@ -93,7 +101,7 @@
*/
wx.request({
- url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx30f254cbb0b90b3c&secret=938a068410796cda21e5e03b9435cdbf&js_code=${this.wxcode}&grant_type=authorization_code`,
+ url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${this.wxcode}&grant_type=authorization_code`,
success(res) {
let id = res.data.openid;
uni.setStorageSync('openid', id);
@@ -103,7 +111,41 @@
});
}
});
- this.loginPopupShow = false
+ this.$nextTick(() => {
+ apiLoginWx({ code: uni.getStorageSync('openid') }).then(res => {
+ if (res.code != 1) {
+ this.$u.toast('鎭枩鎮紝鐧诲綍鎴愬姛锛�');
+ // 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
+ setToken(res.access_token);
+ setRefreshToken(res.refresh_token);
+ setUsernameKey(res.username);
+ //鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛�
+ this.$reqGet('getUserEntity').then(res => {
+ this.setUserTabbar(res.data.type);
+ uni.setStorageSync('roleType', res.data.type);
+ setCustomerId(res.data.customerid);
+ //璺宠浆椤甸潰
+ this.$nextTick(() => {
+ redirectHome();
+ });
+ });
+ } else {
+ this.$u.toast(res.msg);
+ this.bindWxModelShow = true;
+ }
+ });
+ });
+
+ this.loginPopupShow = false;
+ },
+ bindWxConfirm() {
+ uni.navigateTo({
+ url: `/pages/login/wxLogin?code=${uni.getStorageSync('openid')}`
+ });
+ this.bindWxModelShow = false;
+ },
+ bindWxCancel() {
+ this.bindWxModelShow = false;
},
// 寮瑰嚭灞傛椂闂�
closePopup() {
--
Gitblit v1.9.1