huoran
/
FE_CRM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

fix

Browse Source
master
yujialong 1 year ago
parent 19f0e898af
commit 1c95bf74ea
9 changed files with 105 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/request.js
  2. 4
      order/clientDetail/clientDetail.vue
  3. 4
      order/orderDetail/orderDetail.vue
  4. 3
      pages/index/index.vue
  5. 12
      pages/login/login.vue
  6. 86
      pages/person/person.vue
  7. 25
      pages/reg/reg.vue
  8. 7
      pages/workbench/workbench.vue
  9. 4
      team/qrcode/qrcode.vue

4
config/request.js
Unescape View File

@ -5,9 +5,9 @@
*/ */
export default { export default {
// baseURL: 'https://huorantech.cn/', baseURL: 'https://huorantech.cn/',
// baseURL: 'http://192.168.31.152:9000/', // baseURL: 'http://192.168.31.152:9000/',
baseURL: 'http://121.37.12.51/', // baseURL: 'http://121.37.12.51/',
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8' 'Content-Type': 'application/json;charset=UTF-8'
}, },

4
order/clientDetail/clientDetail.vue
Unescape View File

@ -107,6 +107,7 @@
return { return {
isDetail: false, isDetail: false,
customerId: '', customerId: '',
shopCart: false,
// 客户类型 // 客户类型
customerTypeList: [{ customerTypeList: [{
name: '正式', name: '正式',
@ -164,6 +165,7 @@
const { options } = pages[pages.length - 1] const { options } = pages[pages.length - 1]
this.customerId = options.customerId this.customerId = options.customerId
this.isDetail = !!options.show this.isDetail = !!options.show
this.shopCart = options.shopCart // 从购物车进去订单的标识
options.customerId && this.getInfo() options.customerId && this.getInfo()
// 非详情才需要查询学校和行业 // 非详情才需要查询学校和行业
@ -323,7 +325,7 @@
if (res.confirm) { if (res.confirm) {
// 选择是则直接跳转到新建订单页面，并且选中当前新加的客户 // 选择是则直接跳转到新建订单页面，并且选中当前新加的客户
uni.redirectTo({ uni.redirectTo({
url: `/order/orderDetail/orderDetail?customerId=${customerId}` url: `/order/orderDetail/orderDetail?customerId=${customerId}${that.shopCart ? '&shopCart=1' : ''}`
}) })
} else if (res.cancel) { } else if (res.cancel) {
uni.navigateBack() uni.navigateBack()

4
order/orderDetail/orderDetail.vue
Unescape View File

@ -445,8 +445,8 @@
}, },
// 前往创建客户 // 前往创建客户
toClient() { toClient() {
uni.setStorageSync('courses', this.courseList) this.shopCart || uni.setStorageSync('courses', this.courses)
this.$util.to(`/order/clientDetail/clientDetail`) this.$util.to(`/order/clientDetail/clientDetail${this.shopCart ? '?shopCart=1' : ''}`)
}, },
// 删除课程 // 删除课程
delCourse(c, i) { delCourse(c, i) {

3
pages/index/index.vue
Unescape View File

@ -138,7 +138,6 @@
title: '加载中' title: '加载中'
}) })
getTeamsByAccountId().then(({ data }) => { getTeamsByAccountId().then(({ data }) => {
let hasOwnTeam = 0 // 是否有自己的团队
data.map(e => { data.map(e => {
const n = e.partnerClassificationList const n = e.partnerClassificationList
e.id = n.id e.id = n.id
@ -146,9 +145,7 @@
e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
e.partnerClassificationName = n.partnerClassificationName e.partnerClassificationName = n.partnerClassificationName
delete e.partnerClassificationList delete e.partnerClassificationList
if (e.isTeam == 1) hasOwnTeam = 1
}) })
uni.setStorageSync('hasOwnTeam', hasOwnTeam)
if (data.length) { if (data.length) {
/** /**
* @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存

12
pages/login/login.vue
Unescape View File

@ -9,8 +9,8 @@
</button> </button>
<template v-else> <template v-else>
<view class="btn wechat" @click="login"> <view class="btn wechat" @click="login">
<image src="@/static/image/wechat.png" mode="widthFix"></image> <!-- <image src="@/static/image/wechat.png" mode="widthFix"></image> -->
微信授权登录 快捷登录
</view> </view>
<!-- <view class="reg" @click="toReg">没有账号？申请注册</view> --> <!-- <view class="reg" @click="toReg">没有账号？申请注册</view> -->
</template> </template>
@ -143,9 +143,7 @@
this.submiting = true this.submiting = true
const phone = data.phoneNumber const phone = data.phoneNumber
if (this.isReg) { // 注册 if (this.isReg) { // 注册
uni.redirectTo({ this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`)
url: `../reg/reg?openid=${this.openid}&phone=${phone}`
})
} else { // 登录绑定手机号 } else { // 登录绑定手机号
userBinding({ userBinding({
openid: this.openid, openid: this.openid,
@ -163,9 +161,7 @@
}).then(({ sessionKey }) => { }).then(({ sessionKey }) => {
this.sessionKey = sessionKey.session_key this.sessionKey = sessionKey.session_key
this.openid = sessionKey.openid this.openid = sessionKey.openid
uni.redirectTo({ this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`)
url: `../reg/reg?openid=${this.openid}&phone=${phone}`
})
}).catch(e => {}) }).catch(e => {})
this.isReg = true this.isReg = true
} }

86
pages/person/person.vue
Unescape View File

@ -97,11 +97,14 @@
<script> <script>
import { my, editProvinceCity } from '@/apis/modules/parner.js' import { my, editProvinceCity } from '@/apis/modules/parner.js'
import { queryProvince, queryCity, updateAvatars } from '@/apis/modules/user.js' import { queryProvince, queryCity, updateAvatars, getUserRolesPermissionMenu } from '@/apis/modules/user.js'
import { getTeamsByAccountId } from '@/apis/modules/client.js'
export default { export default {
data() { data() {
return { return {
per: true, // 是否有权限 per: true, // 是否有权限
teamId: uni.getStorageSync('teamId') || '',
teams: [],
my: { my: {
info: { info: {
phone: '' phone: ''
@ -115,7 +118,7 @@
}, },
avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png', avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
userName: uni.getStorageSync('userName'), userName: uni.getStorageSync('userName'),
hasOwnTeam: uni.getStorageSync('hasOwnTeam') == 1, // 有自己的团队 hasOwnTeam: 0, // 有自己的团队
disabled: true, disabled: true,
provinces: [], provinces: [],
cities: [], cities: [],
@ -137,8 +140,7 @@
}, },
onShow() { onShow() {
this.per = true this.per = true
this.initRole() this.getTeam()
this.disabled = uni.getStorageSync('team').isTeam == 0 // 成员不能改省份城市
}, },
methods: { methods: {
// 初始化权限 // 初始化权限
@ -149,6 +151,80 @@
this.getInfo() this.getInfo()
} }
}, },
// 查询当前角色权限
getAuth() {
uni.showLoading({
title: '加载中'
})
getUserRolesPermissionMenu({
teamId: this.teams.find(e => e.teamId == this.teamId).partnerClassificationId,
platformId: 4
}).then(({ permissionMenu }) => {
uni.hideLoading()
const auth = []
// 生成权限数组
const generateAuth = (list, parent) => {
list.map(e => {
const name = `${parent ? parent + ':' : ''}${e.name}`
auth.push(name)
generateAuth(e.children, name)
})
}
generateAuth(permissionMenu[0].children, '')
uni.setStorageSync('auth', auth)
this.initRole()
}).catch(e => {
uni.hideLoading()
uni.setStorageSync('auth', [])
this.initRole()
})
},
// 获取团队
getTeam() {
uni.showLoading({
title: '加载中'
})
getTeamsByAccountId().then(({ data }) => {
let hasOwnTeam = 0 // 是否有自己的团队
data.map(e => {
const n = e.partnerClassificationList
e.id = n.id
// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
e.partnerClassificationName = n.partnerClassificationName
delete e.partnerClassificationList
if (e.isTeam == 1) hasOwnTeam = 1
})
this.hasOwnTeam = hasOwnTeam
const teamId = uni.getStorageSync('teamId')
if (data.length) {
/**
* @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
* 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
*/
const curTeam = data.find(e => e.teamId == teamId)
if (teamId && curTeam) {
uni.setStorageSync('team', curTeam)
} else if (!uni.getStorageSync('team') || !curTeam) {
this.teamId = data[0].teamId
uni.setStorageSync('teamId', data[0].teamId)
uni.setStorageSync('team', data[0])
}
} else {
// 如果没有团队，则退出登录
uni.hideLoading()
uni.clearStorageSync()
uni.navigateTo({
url: '../login/login'
})
}
this.disabled = uni.getStorageSync('team').isTeam == 0 // 成员不能改省份城市
this.teams = data
this.getAuth()
}).catch(e => {
uni.hideLoading()
})
},
// 获取个人信息 // 获取个人信息
getInfo() { getInfo() {
const { partnerId, teamId } = uni.getStorageSync('team') const { partnerId, teamId } = uni.getStorageSync('team')
@ -187,7 +263,7 @@
}, },
// 创建自己的团队 // 创建自己的团队
createTeam() { createTeam() {
this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}`) this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}&my=1`)
}, },
// 进入设置 // 进入设置
toSet() { toSet() {

25
pages/reg/reg.vue
Unescape View File

@ -2,8 +2,8 @@
<view class="page"> <view class="page">
<image class="logo" src="@/static/image/logo.png" mode=""></image> <image class="logo" src="@/static/image/logo.png" mode=""></image>
<view class="wrap"> <view class="wrap">
<view v-if="form.isTeam !== 0" class="hello"> <view class="hello">
{{ form.isTeam ? '或然科技城市合伙人，欢迎回来！' : '欢迎加入或然城市合伙人计划！请认真填写您的姓名和意向开展业务的区域。注册后，我们将会有区域运营与您联系沟通后续事宜。'}} {{ form.isTeam ? '或然科技城市合伙人，欢迎回来！' : form.isTeam === 0 ? '请认真填写您的姓名和意向开展业务的区域。创建成功后，我们将会有区域运营与您联系沟通后续事宜。' : '欢迎加入或然城市合伙人计划！请认真填写您的姓名和意向开展业务的区域。注册后，我们将会有区域运营与您联系沟通后续事宜。'}}
</view> </view>
<view> <view>
<uni-forms> <uni-forms>
@ -35,6 +35,7 @@
return { return {
openid: '', openid: '',
phone: '', phone: '',
my: false,
form: { form: {
userName: '', userName: '',
provinceId: '', provinceId: '',
@ -51,6 +52,7 @@
const { options } = pages[pages.length - 1] const { options } = pages[pages.length - 1]
this.openid = options.openid this.openid = options.openid
this.phone = options.phone this.phone = options.phone
this.my = options.my
this.getProvince() this.getProvince()
this.checkLogin() this.checkLogin()
}, },
@ -69,19 +71,6 @@
} else { } else {
this.form.isTeam = 0 this.form.isTeam = 0
if (team.userName) this.form.userName = team.userName if (team.userName) this.form.userName = team.userName
uni.showModal({
title: '提示',
content: `或然科技城市合伙人，欢迎回来！您已在${team.teamName}，是否要创建自己的团队？`,
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
uni.redirectTo({
url: '../login/login'
})
}
}
})
} }
} else if (username) { // 没有团队，只有username } else if (username) { // 没有团队，只有username
this.form.userName = username this.form.userName = username
@ -144,14 +133,12 @@
// 跳转到首页 // 跳转到首页
toIndex() { toIndex() {
uni.reLaunch({ uni.reLaunch({
url: '../index/index' url: this.my ? '../person/person' : '../index/index'
}) })
}, },
// 返回 // 返回
back() { back() {
uni.redirectTo({ uni.navigateBack()
url: '../login/login'
})
} }
} }
} }

7
pages/workbench/workbench.vue
Unescape View File

@ -163,7 +163,7 @@
}, },
// 查询当前角色权限 // 查询当前角色权限
getAuth() { getAuth() {
uni.getStorageSync('token') && getUserRolesPermissionMenu({ getUserRolesPermissionMenu({
teamId: this.list.find(e => e.teamId == this.teamId).partnerClassificationId, teamId: this.list.find(e => e.teamId == this.teamId).partnerClassificationId,
platformId: 4 platformId: 4
}).then(({ permissionMenu }) => { }).then(({ permissionMenu }) => {
@ -208,6 +208,7 @@
*/ */
if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) { if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
this.teamId = data[0].teamId this.teamId = data[0].teamId
uni.setStorageSync('teamId', data[0].teamId)
uni.setStorageSync('team', data[0]) uni.setStorageSync('team', data[0])
} }
} else { } else {
@ -220,7 +221,7 @@
} }
this.list = data this.list = data
this.initRole() this.getAuth()
}).catch(e => { }).catch(e => {
uni.hideLoading() uni.hideLoading()
}) })
@ -272,7 +273,9 @@
teamChange() { teamChange() {
const { teamId } = this const { teamId } = this
const e = this.list.find(e => e.teamId == teamId) const e = this.list.find(e => e.teamId == teamId)
console.log(333,teamId ,e)
uni.setStorageSync('team', e) uni.setStorageSync('team', e)
uni.setStorageSync('teamId', teamId)
this.getAuth() this.getAuth()
}, },
// 提示暂未开放 // 提示暂未开放

4
team/qrcode/qrcode.vue
Unescape View File

@ -63,8 +63,8 @@
generateInvitationCode(uni.getStorageSync('team').accountId).then(({ expireTime }) => { generateInvitationCode(uni.getStorageSync('team').accountId).then(({ expireTime }) => {
const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000 const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}` this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
// this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}` this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}` // this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
}).catch(e => {}) }).catch(e => {})
}, },
// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发 // 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发

Write Preview
Loading…
Cancel
Save