更新Note

1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]
This commit is contained in:
337031187
2020-11-05 16:21:06 +08:00
parent e4f4192f07
commit 177a270dd2
574 changed files with 45105 additions and 4899 deletions

View File

@@ -187,22 +187,22 @@ export default {
this.$message.success('添加数据成功')
// 81 82 83
// 针对云存储配置特殊处理 切勿随意改动
_formId = parseInt(_pram.id)
if(_formId === 108 || _formId === 81 || _formId === 82 || _formId === 83){
let _value
switch (_formId) {
case 108: _value = 1
break;
case 81: _value = 2
break;
case 82: _value = 3
break;
case 83: _value = 4
break;
}
const _pram = { key:"uploadType",value:_value }
systemConfigApi.configSaveUniq(_pram)
}
// _formId = parseInt(_pram.id)
// if(_formId === 108 || _formId === 81 || _formId === 82 || _formId === 83){
// let _value
// switch (_formId) {
// case 108: _value = 1
// break;
// case 81: _value = 2
// break;
// case 82: _value = 3
// break;
// case 83: _value = 4
// break;
// }
// const _pram = { key:"uploadType",value:_value }
// systemConfigApi.configSaveUniq(_pram)
// }
})
},
handlerGetTreeList() {

View File

@@ -11,7 +11,7 @@
<el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
</el-form-item>
<el-form-item label="选择门店:">
<el-select v-model="tableFrom.storeId" clearable filterable placeholder="请选择" class="selWidth" clearable @change="seachList">
<el-select v-model="tableFrom.storeId" clearable filterable placeholder="请选择" class="selWidth" clearable @change="getList(1)">
<el-option
v-for="item in storeSelectList"
:key="item.id"
@@ -22,7 +22,7 @@
</el-form-item>
<el-form-item label="关键字:">
<el-input v-model="tableFrom.keywords" placeholder="请输入姓名、电话、订单ID" class="selWidth" size="small">
<el-button slot="append" icon="el-icon-search" size="small" @click="seachList" />
<el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
</el-input>
</el-form-item>
</el-form>
@@ -159,10 +159,6 @@
this.getList()
},
methods: {
seachList() {
this.tableFrom.page = 1
this.getList()
},
storeList() {
let artFrom = {
page: 1,
@@ -197,8 +193,9 @@
this.getList()
},
// 列表
getList() {
getList(num) {
this.listLoading = true
this.tableFrom.page = num ? num : this.tableFrom.page
orderListApi(this.tableFrom).then(res => {
this.tableData.data = res.list.list
this.tableData.total = res.list.total