From fa2f172812de8344fa22c4ef088ea2a67257a0d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:21:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
minipro_standard/pages/login/login.vue | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/minipro_standard/pages/login/login.vue b/minipro_standard/pages/login/login.vue
index 6f10dc0..46d088a 100644
--- a/minipro_standard/pages/login/login.vue
+++ b/minipro_standard/pages/login/login.vue
@@ -7,36 +7,80 @@
</view>
<view class="bg_w rd8 ptb30 pl40 bbox com-input flex input-height">
<image src="@/static/login_ic_code@2x.png" mode="" class="img40 mr25"></image>
- <u--input placeholder="浼佷笟浠ｇ爜" border="none" v-model="loginForm.companyId"></u--input>
+ <u--input placeholder="浼佷笟浠ｇ爜" border="none" v-model="from.companyId"></u--input>
</view>
<view class="bg_w rd8 ptb30 pl40 bbox mt40 flex input-height">
<image src="@/static/login_ic_phone@2x.png" mode="" class="img40 mr25"></image>
- <u--input placeholder="鎵嬫満鍙�" border="none" v-model="loginForm.account"></u--input>
+ <u--input placeholder="鎵嬫満鍙�" border="none" v-model="from.username"></u--input>
</view>
<view class="bg_w rd8 ptb30 pl40 bbox mt40 flex input-height">
<image src="@/static/login_ic_password@2x.png" mode="" class="img40 mr25"></image>
- <u--input placeholder="瀵嗙爜" border="none" v-model="loginForm.password"></u--input>
+ <u--input placeholder="瀵嗙爜" border="none" v-model="from.password"></u--input>
</view>
<view class="login-btn mt80" @click="loginAction">绔嬪嵆鐧诲綍</view>
</view>
</template>
<script>
+ import { wxLogin, wxAccountLogin, getUserInfo, wxProgramLogin } from '@/util/api/index.js';
export default {
data() {
return {
- loginForm: {
+ from: {
+ openid: '',
+ unionid: '',
companyId: '',
- account: '',
+ username: '',
password: ''
}
};
},
+ onLoad() {
+ var that = this
+ uni.login({
+ provider: 'weixin',
+ success: function (loginRes) {
+ wxProgramLogin({ code: loginRes.code })
+ .then(async (res) => {
+ if (res.code === 200) {
+ // 鍏嶇櫥褰曪紝鐩存帴璺抽椤�
+ if (res.data.loginStatus == 0) {
+ that.$store.commit('SETSESSION', res.data.session)
+ let info = await getUserInfo()
+ if (info.code === 200) {
+ await that.$store.commit('setEntrance', 'WX')
+ await that.$store.commit('SETUSERINFO', info.data)
+ await that.$store.dispatch('getMenuList', 2)
+ uni.switchTab({
+ url: '/pages/workbench/workbench'
+ });
+ }
+ } else {
+ that.from.openid = res.data.openid
+ that.from.unionid = res.data.unionid
+ }
+ }
+ })
+ }
+ });
+ },
methods: {
- loginAction() {
- uni.reLaunch({
- url: '/pages/workbench/workbench'
- })
+ async loginAction() {
+ if (!this.from.companyId) return uni.showToast({ title: '浼佷笟浠ｇ爜涓嶈兘涓虹┖', icon:"error", duration: 2000 });
+ if (!this.from.username) return uni.showToast({ title: '鎵嬫満鍙蜂笉鑳戒负绌�', icon:"error", duration: 2000 });
+ if (!this.from.password) return uni.showToast({ title: '瀵嗙爜涓嶈兘涓虹┖', icon:"error", duration: 2000 });
+ let res = await wxAccountLogin(this.from)
+ if (res.code === 200) {
+ await this.$store.commit('SETSESSION', res.data)
+ let user = await getUserInfo({})
+ if (user.code === 200) {
+ await this.$store.commit('SETUSERINFO', user.data)
+ await this.$store.dispatch('getMenuList', 2)
+ uni.switchTab({
+ url: '/pages/workbench/workbench'
+ });
+ }
+ }
}
}
}
@@ -56,7 +100,6 @@
height: 100%;
}
.login-log {
- // margin-top: ;
margin: 356rpx auto 0 auto ;
left: 0;
right: 0;
@@ -75,7 +118,7 @@
}
}
.input-height {
- height: 100rpx;
+ height: 100rpx;
}
.com-input {
margin-top: -60px;
--
Gitblit v1.9.3