diff --git a/src/App.vue b/src/App.vue
index ee7fb9d..1cab69a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,10 +12,10 @@
if (sessionStorage.getItem("store") ) {
this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("store"))))
}
-
+
//在页面刷新时将vuex里的信息保存到sessionStorage里
window.addEventListener("beforeunload",()=>{
- sessionStorage.setItem("store",JSON.stringify(this.$store.state))
+ sessionStorage.getItem("token") && sessionStorage.setItem("store",JSON.stringify(this.$store.state))
})
}
}
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 24162f5..38ca490 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -437,4 +437,7 @@ li {
min-width: auto !important;
width: 85%;
}
+}
+.el-tooltip__popper {
+ max-width: 500px !important;
}
\ No newline at end of file
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 0a82600..bfcd51d 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -43,6 +43,7 @@ export default {
},
loginout() {
localStorage.removeItem('ms_username');
+ localStorage.removeItem('token');
sessionStorage.clear()
location.reload()
},
diff --git a/src/setting.js b/src/setting.js
index f688425..70e8e90 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -10,8 +10,8 @@ let host = `${location.origin}:9000/`
if (isDev) {
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = 'http://39.108.250.202:9000/'
- // host = 'http://192.168.31.151:9000/'// 榕
- host = 'http://192.168.31.137:9000/'// 赓
+ host = 'http://192.168.31.151:9000/'// 榕
+ // host = 'http://192.168.31.137:9000/'// 赓
} else if (isPro) {
jumpPath = "http://www.huorantech.cn/judgmentPoint/";
}
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index a42205e..122e86f 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -5,7 +5,7 @@
返回
-
+
@@ -971,7 +971,7 @@ export default {
i ? this.tabChange(i, 1) : this.backPage()
})
} else {
- this.tabChange(i, 1)
+ i ? this.tabChange(i, 1) : this.backPage()
}
},
backPage(){
diff --git a/src/views/customer/Order.vue b/src/views/customer/Order.vue
index a5ce0cc..3f76882 100644
--- a/src/views/customer/Order.vue
+++ b/src/views/customer/Order.vue
@@ -29,7 +29,7 @@
{{ customerName }}
-
+
diff --git a/src/views/join/index.vue b/src/views/join/index.vue
index ca3855a..feb855d 100644
--- a/src/views/join/index.vue
+++ b/src/views/join/index.vue
@@ -132,7 +132,7 @@ export default {
if (this.emailRepeat) return util.warningMsg("该邮箱已存在")
const { form } = this
form.uniqueIdentification = Date.now()
- form.isTeam = +this.isMobile // 移动端创建的为成员(1)，pc创建的为团队(0)
+ form.isTeam = this.isMobile ? 0 : 1 // 移动端创建的为成员(0)，pc创建的为团队(1)
this.submiting = true
this.$post(this.api.savePartnerAccount, form).then(res => {
util.successMsg('加入成功！')
diff --git a/src/views/parner/staff.vue b/src/views/parner/staff.vue
index 84fb65d..bd899f3 100644
--- a/src/views/parner/staff.vue
+++ b/src/views/parner/staff.vue
@@ -53,6 +53,7 @@
:visible.sync="orgVisible"
:close-on-click-modal="false"
width="50%"
+ @close="closeType"
>
@@ -275,6 +276,7 @@ export default {
id: '',
parentId: data ? data.id : 1,
level: data ? data.level + 1 : 1,
+ parentName: data ? data.partnerClassificationName : '',
partnerClassificationName: ''
}
this.orgListDia = this.orgList
@@ -294,6 +296,13 @@ export default {
ids.splice(ids.length - 1, 1)
this.cascaderValue = ids
},
+ // 关闭分类弹框
+ closeType() {
+ this.typeForm = {
+ id: '',
+ partnerClassificationName: ''
+ }
+ },
// 处理更换部门的禁选
handleOrg(list) {
for (const i in list) {
@@ -366,7 +375,7 @@ export default {
this.getTeamId(data.children)
}
if (!this.curTeamId) this.curTeamId = data.id
- this.$refs.orgTree.setCurrentKey(this.curTeamId)
+ // this.$refs.orgTree.setCurrentKey(this.curTeamId)
this.initData()
this.$refs.table.clearSelection()
},
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index 7ab80fe..670e65b 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -42,6 +42,7 @@
+ 已撤回
撤销
@@ -155,7 +156,7 @@ export default {
this.$confirm("确定要撤销吗？", "提示", {
type: "warning"
}).then(() => {
- this.$get(`${this.api.logWithdrawal}?platformId=${this.platformId}`).then(res => {
+ this.$get(`${this.api.logWithdrawal}?platformId=${this.platformId}&logId=${item.logId}`).then(res => {
this.$message.success('撤销成功')
this.getData()
}).catch(res => {})
@@ -254,6 +255,11 @@ export default {
color: #9076FF;
border-bottom: 1px dashed #bfbfbf;
}
+ .withdraw {
+ margin-right: 10px;
+ font-size: 13px;
+ color: #979797;
+ }
.action {
margin-left: 15px;
i {
diff --git a/src/views/system/staff.vue b/src/views/system/staff.vue
index 75122b5..9bc90be 100644
--- a/src/views/system/staff.vue
+++ b/src/views/system/staff.vue
@@ -672,6 +672,7 @@ export default {
})
} else {
form.uniqueIdentification = new Date().getTime()
+ form.userAvatars = this.$store.state.avatar
this.$post(this.api.saveStaff, form).then(res => {
util.successMsg("新增成功！")
this.staffVisible = false