public/crmeb_java
1
0
Fork 0
mirror of https://gitee.com/ZhongBangKeJi/crmeb_java.git synced 2026-04-23 12:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

圣诞快乐

Browse Source 
# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题
This commit is contained in:
337031187
2020-12-23 15:56:45 +08:00
parent 9b684bacab
commit f7ec773b8f
768 changed files with 40200 additions and 46123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
admin/src/views/systemSetting/logistics/companyList/index.vue
View File

@@ -4,24 +4,14 @@
<div slot="header" class="clearfix">
<div class="container">
<el-form ref="form" inline :model="form">
<el-form-item label="状态">
<el-select v-model="form.isShow" placeholder="状态" clearable @change="handlerSearch" class="selWidth">
<el-option
v-for="item in constants.switchStatus"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="关键字：">
<el-input v-model="form.keywords" placeholder="请输入关键字" class="selWidth" size="small">
<el-input v-model="form.keywords" placeholder="请输入关键字" class="selWidth" size="small" clearable>
<el-button slot="append" size="small" icon="el-icon-search" @click="handlerSearch" />
</el-input>
</el-form-item>
</el-form>
</div>
<el-button type="primary" size="small" @click="addExpress">添加物流公司</el-button>
<el-button type="primary" size="small" @click="addExpress">同步物流公司</el-button>
</div>
<el-table
v-loading="loading"
@@ -57,7 +47,7 @@
<el-switch
v-model="scope.row.isShow"
class="demo"
:active-value="1" :inactive-value="0"
:active-value="true" :inactive-value="false"
active-text="开启"
inactive-text="关闭"
@change="bindStatus(scope.row)"
@@ -72,7 +62,7 @@
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="bindEdit(scope.row)">编辑</el-button>
<el-button type="text" size="small" @click="bindDelete(scope.row)">删除</el-button>
<!--<el-button type="text" size="small" @click="bindDelete(scope.row)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -89,12 +79,35 @@
</div>
</el-card>
<el-dialog
title="添加物流公司"
title="编辑物流公司"
:visible.sync="dialogVisible"
width="700px"
:before-close="handleClose"
>
<parser v-if="formShow" ref="formBox" class="formBox" :form-conf="formConf" :form-edit-data="formData" :is-edit="isCreate === 1" @submit="submit" />
<el-form :model="formData" :rules="rules" ref="formData" label-width="100px" class="demo-ruleForm">
<el-form-item label="月结账号" prop="account" v-if="formData.partnerId">
<el-input v-model="formData.account" placeholder="请输入月结账号"></el-input>
</el-form-item>
<el-form-item label="月结密码" prop="password" v-if="formData.partnerKey">
<el-input v-model="formData.password" placeholder="请输入月结密码"></el-input>
</el-form-item>
<el-form-item label="网点名称" prop="netName" v-if="formData.net">
<el-input v-model="formData.netName" placeholder="请输入网点名称"></el-input>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" :max="9999" label="排序"></el-input-number>
</el-form-item>
<el-form-item label="是否启用" prop="isShow">
<el-radio-group v-model="formData.isShow">
<el-radio :label="false">隐藏</el-radio>
<el-radio :label="true">启用</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit('formData')">确 定</el-button>
</span>
<!--<parser v-if="formShow" ref="formBox" class="formBox" :form-conf="formConf" :form-edit-data="formData" :is-edit="isCreate === 1" @submit="submit" />-->
</el-dialog>
</div>
</template>
@@ -113,8 +126,7 @@ export default {
// 表单
formConf: { fields: [] },
form: {
keywords: '',
isShow: null
keywords: ''
},
tableData: {},
page: 1,
@@ -122,10 +134,26 @@ export default {
loading: false,
dialogVisible: false,
fromType: 'add',
formData: {},
formData: {
isShow: false
},
isCreate: 0,
formShow: false,
editId: 0
editId: 0,
rules: {
sort: [
{ required: true, message: '请输入排序', trigger: 'blur' },
],
account: [
{ required: true, message: '请输入月结账号', trigger: 'blur' },
],
password: [
{ required: true, message: '请输入月结密码', trigger: 'blur' },
],
netName: [
{ required: true, message: '请输入网点名称', trigger: 'blur' },
]
}
}
},
created() {
@@ -142,16 +170,18 @@ export default {
logistics.expressList({
page: this.page,
limit: this.limit,
keywords: this.form.keywords,
isShow: this.form.isShow
keywords: this.form.keywords
}).then(res => {
this.loading = false
this.tableData = res
}).catch(()=>{
this.loading = false
})
},
// 物流开关
bindStatus(item) {
logistics.expressUpdate({
logistics.expressUpdateShow({
account: item.account,
code: item.code,
id: item.id,
isShow: item.isShow,
@@ -175,12 +205,9 @@ export default {
},
// 添加物流公司
addExpress() {
this.fromType = 'add'
const _pram = { id: 71 }
systemFormConfigApi.getFormConfigInfo(_pram).then(data => {
this.dialogVisible = true
this.formConf = JSON.parse(data.content)
this.formShow = true
logistics.expressSyncApi().then(data => {
this.page = 1
this.getExpressList()
})
},
// 删除物流公司
@@ -193,50 +220,33 @@ export default {
})
},
// 表单提交
submit(data) {
if (this.fromType === 'add') {
logistics.expressSave(data).then(res => {
this.handleClose()
this.getExpressList()
this.$message.success('操作成功')
})
} else {
data.id = this.editId
logistics.expressUpdate(data).then(res => {
this.handleClose()
this.getExpressList()
this.$message.success('操作成功')
})
}
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
logistics.expressUpdate(this.formData).then(res => {
this.$message.success('操作成功')
this.handleClose()
this.getExpressList()
})
} else {
return false;
}
});
},
// 关闭模态框
handleClose(done) {
this.formShow = false
this.formData = {}
// this.formData = {}
this.formConf.fields = []
this.dialogVisible = false
this.isCreate = 0
},
// 编辑
bindEdit(item) {
this.dialogVisible = true
this.editId = item.id
this.fromType = 'edit'
const _pram = { id: 71 }
systemFormConfigApi.getFormConfigInfo(_pram).then(data => {
this.formShow = false
this.isCreate = 0
this.dialogVisible = true
this.formConf = JSON.parse(data.content)
this.getInfo(item)
})
},
getInfo(item) {
logistics.expressInfo({ id: item.id }).then(res => {
this.formData = res
this.isCreate = 1
setTimeout(() => { // 让表单重复渲染待编辑数据
this.formShow = true
}, 80)
})
}
}

2
admin/src/views/systemSetting/logistics/shippingTemplates/index.vue
View File

@@ -5,7 +5,7 @@
<div class="container">
<el-form ref="form" inline :model="form">
<el-form-item label="模板名称：">
<el-input v-model="form.keywords" placeholder="请输入模板名称" class="selWidth" size="small">
<el-input v-model="form.keywords" placeholder="请输入模板名称" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" @click="handleSearch" />
</el-input>
</el-form-item>

87
admin/src/views/systemSetting/setting/index.vue
View File

@@ -6,7 +6,7 @@
v-for="tab,index in treeList"
:key="index"
:label="tab.name"
:name="tab.extra"
:name="tab.id.toString()"
>
<!-- 文件上传特殊处理-->
<!-- <template v-if="activeNamel1 == 4">-->
@@ -77,7 +77,7 @@ export default {
formConf: { content: { fields: [] }, id: null, render: false, isEdit: false },
formConfChild: { content: { fields: [] }, id: null, render: false, isEdit: false },
activeNamel1: null,
activeNamel2: '本地(不推荐)',//针对文件特殊处理
activeNamel2: '',//针对文件特殊处理
treeList: [],
editDataChild: {},
isCreate: 0,
@@ -91,42 +91,46 @@ export default {
this.getCurrentUploadSelectedFlag()
},
methods: {
handleTabClick(tab, event) {
if (tab.name) {
this.handlerGetLevel1FormConfig(tab.name)
} else if (tab.$children.length > 0 ) { // 初次加载第二层的第一个Tab数据
// if(tab.$children[0].panes){ // todo 优化。。。
// this.activeNamel2 = tab.$children[0].panes[0].name
// }else{
// conaole.integralLog()
// }
let _selected = tab.$children[0].panes[0]
// 设置特殊处理的文件长传表单默认选中第一个tab
this.activeNamel2 = _selected.name != 72 ? _selected.name : _selected.label
if(this.activeNamel2 == 108){
switch (this.currentSelectedUploadFlag) {
case 1:
this.activeNamel2 = '本地(不推荐)'
this.handlerGetLevel2FormConfig(108)
break
case 2:
this.activeNamel2 = '阿里云配置'
this.handlerGetLevel2FormConfig(81)
break
case 3:
this.activeNamel2 = '七牛云配置'
this.handlerGetLevel2FormConfig(82)
break
case 4:
this.activeNamel2 = '腾讯云配置'
this.handlerGetLevel2FormConfig(83)
break
}
}else{
this.handlerGetLevel2FormConfig(_selected.name)
}
}
// handleTabClick(tab, event) {
// if (tab.name) {
// this.handlerGetLevel1FormConfig(tab.name)
// } else if (tab.$children.length > 0 ) { // 初次加载第二层的第一个Tab数据
// // if(tab.$children[0].panes){ // todo 优化。。。
// // this.activeNamel2 = tab.$children[0].panes[0].name
// // }else{
// // conaole.integralLog()
// // }
// let _selected = tab.$children[0].panes[0]
// // 设置特殊处理的文件长传表单默认选中第一个tab
// this.activeNamel2 = _selected.name != 72 ? _selected.name : _selected.label
// if(this.activeNamel2 == 108){
// switch (this.currentSelectedUploadFlag) {
// case 1:
// this.activeNamel2 = '本地(不推荐)'
// this.handlerGetLevel2FormConfig(108)
// break
// case 2:
// this.activeNamel2 = '阿里云配置'
// this.handlerGetLevel2FormConfig(81)
// break
// case 3:
// this.activeNamel2 = '七牛云配置'
// this.handlerGetLevel2FormConfig(82)
// break
// case 4:
// this.activeNamel2 = '腾讯云配置'
// this.handlerGetLevel2FormConfig(83)
// break
// }
// }else{
// this.handlerGetLevel2FormConfig(_selected.name)
// }
//
// }
// },
handleTabClick(tab) {
this.activeNamel2 = tab.$children[0].panes[0].name;
this.handlerGetLevel2FormConfig(this.activeNamel2);
},
handlerGetLevel1FormConfig(id) {
const formPram = { id: id }
@@ -210,15 +214,16 @@ export default {
this.loading = true
categoryApi.treeCategroy(_pram).then(data => {
this.treeList = this.handleAddArrt(data)
if (this.treeList.length > 0) this.activeNamel1 = this.treeList[0].extra
if (this.treeList.length > 0) this.activeNamel1 = this.treeList[0].id.toString();
if (this.treeList.length > 0 && this.treeList[0].child.length > 0) {
this.activeNamel2 = this.treeList[0].child[0].extra
}
if (this.activeNamel2) {
this.handlerGetLevel2FormConfig(this.treeList[0].child[0].extra)
} else {
this.handlerGetLevel1FormConfig(this.treeList[0].extra)
}
// else {
// this.handlerGetLevel1FormConfig(this.treeList[0].extra)
//}
this.loading = false
}).catch(() =>{
this.loading = false

4
admin/src/views/systemSetting/systemStore/clerkList/index.vue
View File

@@ -130,8 +130,8 @@
storeStaffUpdateStatusApi({id:id,status:isShow}).then(() => {
that.$message.success("操作成功");
that.tableList();
}).catch(res=>{
that.$message.error(res.message);
}).catch(()=>{
row.isShow = !row.isShow
})
},
storeList() {

6
admin/src/views/systemSetting/systemStore/order/index.vue
View File

@@ -21,7 +21,7 @@
</el-select>
</el-form-item>
<el-form-item label="关键字：">
<el-input v-model="tableFrom.keywords" placeholder="请输入姓名、电话、订单ID" class="selWidth" size="small">
<el-input v-model="tableFrom.keywords" placeholder="请输入姓名、电话、订单ID" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
</el-input>
</el-form-item>
@@ -87,7 +87,7 @@
<el-table-column
prop="storeName"
label="核销门店"
min-width="100"
min-width="150"
/>
<el-table-column
label="支付状态"
@@ -108,7 +108,7 @@
<el-table-column
prop="createTime"
label="下单时间"
min-width="100"
min-width="150"
/>
</el-table>
<div class="block">

4
admin/src/views/systemSetting/systemStore/point/addPoint.vue
View File

@@ -165,7 +165,7 @@
storeInfoApi({id:id}).then(res=>{
that.ruleForm = res;
that.ruleForm.address = res.address.split(",");
that.dayTime = res.dayTime.split("-")
that.dayTime = res.dayTime.split(",")
this.loading = false;
})
},
@@ -235,7 +235,7 @@
},
//营业时间
onchangeTime(e){
this.ruleForm.dayTime = e ? e.join(',','-') : '';
this.ruleForm.dayTime = e ? e.join(',') : '';
},
//上传图片
modalPicTap (tit) {

37
admin/src/views/systemSetting/systemStore/point/index.vue
View File

@@ -9,7 +9,7 @@
</el-tabs>
<el-form ref="form" inline :model="artFrom" @submit.native.prevent>
<el-form-item label="关键字：">
<el-input v-model="artFrom.keywords" placeholder="请输入提货点名称/电话" class="selWidth" size="small">
<el-input v-model="artFrom.keywords" placeholder="请输入提货点名称/电话" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" @click="search" />
</el-input>
</el-form-item>
@@ -82,7 +82,9 @@
<template slot-scope="{ row, index }">
<el-button type="text" size="small" @click="edit(row.id)">编辑</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" size="small" @click="storeDelete(row.id)">删除</el-button>
<el-button v-if="artFrom.status==='2'" type="text" size="small" @click="storeRecovery(row.id)">恢复</el-button>
<el-divider v-if="artFrom.status==='2'" direction="vertical"></el-divider>
<el-button type="text" size="small" @click="artFrom.status==='2'?allDelete(row.id):storeDelete(row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -103,7 +105,7 @@
<script>
import systemStore from './addPoint';
import { storeListApi, storeGetCountApi, storeUpdateStatusApi, storeDeleteApi } from '@/api/storePoint';
import { storeListApi, storeGetCountApi, storeUpdateStatusApi, storeDeleteApi, allDeleteApi, storeRecoveryApi } from '@/api/storePoint';
export default {
name: 'Point',
components: { systemStore },
@@ -141,8 +143,6 @@ export default {
that.loading = false;
that.tableData = res.list;
that.total = res.total;
}).catch(res => {
that.$message.error(res.message);
})
},
//切换页数
@@ -172,8 +172,18 @@ export default {
that.$message.success("操作成功");
that.tableList();
that.storeGetCount();
}).catch(res=>{
that.$message.error(res.message);
}).catch(()=>{
row.isShow = !row.isShow
})
},
// 恢复
storeRecovery(id){
this.$modalSure('恢复提货吗').then(() => {
storeRecoveryApi({ id: id }).then(() => {
this.$message.success('恢复成功')
this.storeGetCount();
this.tableList();
})
})
},
//刪除
@@ -182,11 +192,18 @@ export default {
that.$modalSure().then(() => {
storeDeleteApi({ id: id }).then(() => {
that.$message.success('删除成功')
that.tableList();
that.storeGetCount();
that.tableList();
})
})
},
allDelete(id){
this.$modalSure().then(() => {
allDeleteApi({ id: id }).then(() => {
this.$message.success('删除成功')
this.storeGetCount();
this.tableList();
})
}).catch(res=>{
that.$message.error(res.message);
})
},
//添加