Browse Source

fix bug for tid1807

tid1867
刘嘉炜 4 months ago
parent
commit
ed0777f2fd
  1. 2
      src/js/api.js
  2. 2
      src/pages/login/login.vue
  3. 13
      src/pages/menu/forth.vue
  4. 6
      src/subpackage/authorization/components/login.vue

2
src/js/api.js

@ -169,7 +169,7 @@ API['party'] = {
API['mine'] = { API['mine'] = {
userCurrent:`${ORIGIN}/user/current`, //获取账户信息, (不要传品牌id) userCurrent:`${ORIGIN}/user/current`, //获取账户信息, (不要传品牌id)
unbindAssistant:`${ORIGIN}/admin/user/unbindAssistant"`, // 解绑退出
unbindAssistant:`${ORIGIN}/admin/user/unbindAssistant`, // 解绑退出
} }
export default { ORIGIN, API }; export default { ORIGIN, API };

2
src/pages/login/login.vue

@ -67,7 +67,7 @@ export default {
// //
MiniprogramThirdpartyPlugin.init(wx)
// MiniprogramThirdpartyPlugin.init(wx)
}, },

13
src/pages/menu/forth.vue

@ -1,16 +1,16 @@
<template> <template>
<view class="forth-menu"> <view class="forth-menu">
<!-- 后端 account-> 如果有手机号就显示手机号 没有的话显示username, 都没有的话就空好了 -->
<mine-header <mine-header
@on:munted="menuPackageLoaded = true"
:is-login="loginState" :is-login="loginState"
@click:login="loginBtn"
:nickname="userInfo.nickname" :nickname="userInfo.nickname"
:name="userInfo.actual_name" :name="userInfo.actual_name"
:account="userInfo.mobile || userInfo.username || ''" :account="userInfo.mobile || userInfo.username || ''"
:photo="userInfo.avatar_url" :photo="userInfo.avatar_url"
@on:munted="menuPackageLoaded = true"
@click:login="loginBtn"
@click:update="updateUser" @click:update="updateUser"
></mine-header> ></mine-header>
<!-- 后端 account-> 如果有手机号就显示手机号 没有的话显示username, 都没有的话就空好了 -->
<block v-if="menuPackageLoaded"> <block v-if="menuPackageLoaded">
<line-tab :icon-num='0'> <line-tab :icon-num='0'>
<template slot="default">账号管理</template> <template slot="default">账号管理</template>
@ -36,8 +36,6 @@
</view> </view>
</line-tab> </line-tab>
</block> </block>
<line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab> <line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab>
<line-tab :icon-num='6' v-if="loginState" @click="unBindBtn">解绑退出</line-tab> <line-tab :icon-num='6' v-if="loginState" @click="unBindBtn">解绑退出</line-tab>
</block> </block>
@ -69,6 +67,7 @@ export default {
data(){ data(){
return { return {
brand_id: '', brand_id: '',
//
menuPackageLoaded: false, menuPackageLoaded: false,
userInfo: {}, userInfo: {},
deadData: { deadData: {
@ -159,9 +158,7 @@ export default {
this.showAuthor(); this.showAuthor();
}, },
showAuthor(){ showAuthor(){
this.$refs?.authorizationLogin?.alert?.({
success: this.getUserInfo
});
this.$refs?.authorizationLogin?.alert?.({ success: this.getUserInfo });
}, },
getUserInfo(){ getUserInfo(){
showLoad(); showLoad();

6
src/subpackage/authorization/components/login.vue

@ -27,7 +27,7 @@
</template> </template>
<script> <script>
import { promisify, showModal, showNone, showLoad, hideLoad } from "@/utils/util";
import { promisify, showModal, showNone, showLoad, hideLoad, routeTo } from "@/utils/util";
import { AUTHOR_API } from "../js/api"; import { AUTHOR_API } from "../js/api";
import server from "../js/server"; import server from "../js/server";
export default { export default {
@ -107,15 +107,13 @@ export default {
hideLoad(); hideLoad();
let _data = res.data || {}; let _data = res.data || {};
if(_data.code == 0){ if(_data.code == 0){
if(_data.data == '')return util.routeTo(`/pages/login/login`,'rL');
if(_data.data == '')return routeTo(`/pages/login/login`,'rL');
showNone(_data?.message || '登陆成功!'); showNone(_data?.message || '登陆成功!');
this.$store.commit('setLoginState', { loginState: true, token: _data.data }); this.$store.commit('setLoginState', { loginState: true, token: _data.data });
this.initData?.success?.(_data); this.initData?.success?.(_data);
this.hide(); this.hide();
return _data; return _data;
}else{ }else{
// util.showNone(_data.message || '');
// setTimeout(_=>this.closeAuthor(), 1200);
return Promise.reject(_data); return Promise.reject(_data);
} }
}) })

Loading…
Cancel
Save