From 29014207a8882df16d4372ef20e0d79e6e5df6d1 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 30 五月 2024 08:44:28 +0800
Subject: [PATCH] Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into jlhg
---
pages/login/login.vue | 87 +++++++++++++------------------------------
1 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 62d395b..1e3d86b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,6 +4,7 @@
<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
<user-password :btnText="0" />
<!-- 寰俊openid鐧诲綍 -->
+ <!-- #ifdef MP-WEIXIN -->
<view class="loginBtn">
<u-button class="button"
@click.stop="beforeLoginEvent"
@@ -12,17 +13,18 @@
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">
+ <view @click="forgetPassword"><text>蹇樿瀵嗙爜?</text></view>
+ <view @click="PrivacyAgreementHandle"><text>鏂扮敤鎴锋敞鍐�</text></view>
+ </view>
+
<view class="login-bottom-box">
<view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
</view>
+
+ <!-- #ifdef MP-WEIXIN -->
<!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
<view class="loginPopup">
<u-popup :show="loginPopupShow"
@@ -57,21 +59,7 @@
@confirm="bindWxConfirm"
@cancel="bindWxCancel"></u-modal>
</view>
- <!-- 娉ㄥ唽鍚屾剰鑾峰彇闅愮淇℃伅 -->
- <view class="privacy">
- <u-modal :show="privacyShow"
- :title="privacyTitle"
- showCancelButton
- @confirm="privacyConfirm"
- @cancel="privacyCancel"
- confirmText="鍚屾剰"
- cancelText="涓嶅悓鎰�">
- <view class="slot-content"
- @click="PrivacyAgreementHandle">
- <rich-text :nodes="PrivacyAgreement"></rich-text>
- </view>
- </u-modal>
- </view>
+ <!-- #endif -->
</view>
</template>
@@ -91,9 +79,6 @@
bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
appid: "",
secret: "",
- privacyShow: false,
- privacyTitle: "娉ㄦ剰",
- PrivacyAgreement: `<p>娉ㄥ唽鍗充唬琛ㄦ偍鍚屾剰鎴戜滑鐢ㄦ埛闅愮鍗忚</p><p class='PrivacyAgreement'>鐐瑰嚮鏌ョ湅鐢ㄦ埛闅愮鍗忚</p>`
};
},
components: {
@@ -137,6 +122,7 @@
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',
@@ -157,6 +143,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();
//璺宠浆椤甸潰
@@ -188,28 +176,16 @@
openPopup() {
console.log('鎵撳紑浜�');
},
- privacyConfirm() {
+ forgetPassword() {
uni.navigateTo({
- url: '/pages/register/register'
- });
- },
- privacyCancel() {
- this.privacyShow = false
- },
- registerClick() {
- this.privacyShow = true
+ url: '/pages/login/forgetPassword/forgetPassword'
+ })
},
PrivacyAgreementHandle() {
uni.navigateTo({
url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
})
},
- // 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熷凡閫氳繃鎵爜瑙ｅ喅
- jumpBindBack() {
- uni.navigateTo({
- url: '/pages/bindBackground/bindBackground'
- })
- }
}
};
</script>
@@ -222,32 +198,21 @@
}
.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 {
@@ -351,4 +316,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1