From ba4baca76d4476d0bad710a7d2816a5f6909a7fc Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 14 三月 2023 18:43:46 +0800
Subject: [PATCH] （微信一键登录，登录界面完善）（注册，司机上传图片接口）（提煤单详情页的优化，呼叫客服测试环境完成）（称重详情的页面，以及接口对接）
---
pages/login/login.vue | 160 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 98 insertions(+), 62 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d7fe141..961779e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,25 +1,29 @@
<template>
<view class="login">
- <!-- <view class="loginBtn">
- <u-button text="寰俊涓�閿櫥褰�" type="success" shape="circle" icon="weixin-fill" @click="apiLogin"></u-button>
- </view> -->
-
- <!--鍥介檯鍖�-->
- <js-lang title="login.title" :showBtn="false"></js-lang>
<view class="logo">鏃犱汉鍊煎畧</view>
- <!-- 绉熸埛鍒楄〃 -->
- <!-- <view class="tenantList">
- <u-input v-model="tenantId" placeholder="璇疯緭鍏ュ唴瀹�" type="select" border="true" @click="show = true" />
- <u-action-sheet :list="tenantList" v-model="show" @click="selectTenant"></u-action-sheet>
- </view> -->
<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
<user-password />
-
- <!-- #ifdef MP -->
- <view class="loginBtn"><u-button class="button" @click.stop="getUserProfile" :disabled="btnLoading" :loading="btnLoading" type="primary" text="寰俊涓�閿櫥褰�"></u-button></view>
+ <!-- 寰俊openid鐧诲綍 -->
+ <view class="loginBtn">
+ <u-button class="button" @click.stop="beforeLoginEvent" :disabled="btnLoading" :loading="btnLoading" type="primary" text="寰俊涓�閿櫥褰�"></u-button>
+ </view>
<view class="register" @click="registerClick"><text>娉ㄥ唽</text></view>
- <!-- #endif -->
- <view class="login-bottom-box"><view class="copyright">2023鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view></view>
+ <view class="login-bottom-box">
+ <view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
+ <view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
+ </view>
+ <!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
+ <view class="loginPopup">
+ <u-popup :show="loginPopupShow" mode="bottom" @close="closePopup" @open="openPopup" round="10" :safeAreaInsetBottom="true">
+ <view class="popup-warp">
+ <view class="body"><text>鏈皬绋嬪簭锛屼粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳鐧诲綍浣跨敤锛岀偣鍑诲悓鎰忓嵆琛ㄧず鎮ㄥ凡鍚屾剰鐩稿簲淇℃伅鎺堟潈銆�</text></view>
+ <view class="btn">
+ <u-button @click="loginPopupShow = false" type="error" text="涓嶅悓鎰�" shape="circle" :plain="true"></u-button>
+ <u-button @click="wxLogin" type="error" text="鍚屾剰" throttleTime="3000" shape="circle"></u-button>
+ </view>
+ </view>
+ </u-popup>
+ </view>
</view>
</template>
@@ -31,19 +35,9 @@
export default {
data() {
return {
- // wxcode: '31363631363534303739323636', // 瀹㈡埛
- // wxcode: '31363631363534303700000000', // 璐т唬1
- // wxcode: '31363631363534303700000004', // 璐т唬2
- wxcode: '31363631363534303700000001', // 鍙告満1
- // wxcode: '31363631363534303700000005', // 鍙告満2
- // wxcode: '', // 瀹㈡埛
- openid: '',
- roleId: 0,
-
- tenantId: undefined,
+ wxcode: '', // 鍙告満1
btnLoading: false,
- show: false,
- tenantList: []
+ loginPopupShow: false
};
},
components: {
@@ -52,51 +46,76 @@
methods: {
...mapMutations(['setUserTabbar']),
// 璁块棶wx.login,鑾峰彇code
- login() {
- // let _this = this;
+ beforeLoginEvent() {
+ this.loginPopupShow = true;
+ },
+ wxLogin() {
// 鑾峰彇鐧诲綍鐢ㄦ埛code
uni.login({
success: res => {
- console.log('鐧诲綍loginRes', res);
if (res.code) {
this.wxcode = res.code;
+ this.apiLogin();
} else {
uni.showToast({
title: '寰俊鐧诲綍澶辫触锛�',
duration: 2000
});
}
- // this.apiLogin();
}
});
},
// 鐧诲綍鎺ュ彛
apiLogin() {
- // console.log(this.$uStoreKey.roleType);
- apiLogin2({ code: this.wxcode })
- .then(res => {
- console.log('璇锋眰鐧诲綍', res);
- if (res.msg == '闇�缁戝畾') {
- uni.navigateTo({
- url: `/pages/register/register?code=${res.data}`
- });
- }
- if (res.msg == '鐧诲綍鎴愬姛') {
- uni.setStorageSync('userInfo', res.data);
- this.setUserTabbar(res.data.type);
- uni.switchTab({
- url: '/pages/tabbar-page/index-tabbar/index-tabbar'
- });
- }
- })
- .catch(err => {
- console.log('閿欒', err);
- });
+ // apiLogin2({ code: this.wxcode })
+ // .then(res => {
+ // console.log('璇锋眰鐧诲綍', res);
+ // if (res.msg == '闇�缁戝畾') {
+ // uni.navigateTo({
+ // url: `/pages/register/register?code=${res.data}`
+ // });
+ // }
+ // if (res.msg == '鐧诲綍鎴愬姛') {
+ // uni.setStorageSync('userInfo', res.data);
+ // this.setUserTabbar(res.data.type);
+ // uni.switchTab({
+ // url: '/pages/tabbar-page/index-tabbar/index-tabbar'
+ // });
+ // }
+ // })
+ // .catch(err => {
+ // console.log('閿欒', err);
+ // });
+
+ /**
+ * @openid
+ * 鑾峰彇寰俊鐢ㄦ埛openid,寰俊涓�閿櫥褰曟殏鏃犵浉鍏虫帴鍙ｏ紝鐢ㄤ簬娴嬭瘯鍛煎彨瀹㈡湇鍔熻兘
+ */
+
+ wx.request({
+ url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx30f254cbb0b90b3c&secret=938a068410796cda21e5e03b9435cdbf&js_code=${this.wxcode}&grant_type=authorization_code`,
+ success(res) {
+ let id = res.data.openid;
+ uni.setStorageSync('openid', id);
+ uni.showToast({
+ title: '鎴愬姛鑾峰彇娴嬭瘯openid',
+ icon: 'none'
+ });
+ }
+ });
+ this.loginPopupShow = false
},
- registerClick(){
+ // 寮瑰嚭灞傛椂闂�
+ closePopup() {
+ this.loginPopupShow = false;
+ },
+ openPopup() {
+ console.log('鎵撳紑浜�');
+ },
+ registerClick() {
uni.navigateTo({
- url:"/pages/register/register"
- })
+ url: '/pages/register/register'
+ });
}
}
};
@@ -135,7 +154,7 @@
width: 80%;
font-size: 64rpx;
color: #497bff;
- margin: 50rpx auto 0;
+ margin: vww(100) auto 0;
text-align: center;
}
@@ -204,12 +223,29 @@
padding: 0 70rpx;
}
- .tenantList {
- font-size: 32rpx;
- width: 80%;
- height: 80rpx;
- text-align: center;
- margin: 50rpx auto 0;
+ // 寮瑰嚭妗�
+ .loginPopup {
+ .u-popup {
+ .u-transition {
+ .u-popup__content {
+ .popup-warp {
+ height: vww(200);
+ padding: vww(10) vww(20);
+ .body {
+ width: 100%;
+ height: 70%;
+ }
+ .btn {
+ display: flex;
+ justify-content: space-between;
+ .u-button {
+ width: 40%;
+ }
+ }
+ }
+ }
+ }
+ }
}
}
</style>
--
Gitblit v1.9.1