jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions 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:
stivepeim
2020-12-23 15:56:45 +08:00
parent f3975936c2
commit 0d32da772d
768 changed files with 40200 additions and 46123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/src/views/appSetting/routine/myTemplate/index.vue
View File

@@ -10,10 +10,10 @@
</el-select>
</el-form-item>
<el-form-item label="名称：">
<el-input v-model="tableFrom.title" placeholder="请输入模板名称" class="selWidth" size="small"></el-input>
<el-input v-model="tableFrom.title" placeholder="请输入模板名称" class="selWidth" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="ID：">
<el-input v-model="tableFrom.tempId" placeholder="请输入模板ID" class="selWidth" size="small"></el-input>
<el-input v-model="tableFrom.tempId" placeholder="请输入模板ID" class="selWidth" size="small" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="seachList" size="small">查询</el-button>
@@ -92,7 +92,7 @@
<el-table-column
prop="createTime"
label="添加时间"
min-width="120"
min-width="150"
/>
<el-table-column label="操作" min-width="150" fixed="right" align="center">
<template slot-scope="scope">
@@ -256,6 +256,8 @@
myTempStatusApi({status: row.status , id: row.id}).then(() => {
this.$message.success('修改成功')
this.getList()
}).catch(()=>{
row.status = !row.status
})
},
// 修改场景

2
admin/src/views/appSetting/routine/publicTemplate/index.vue
View File

@@ -5,7 +5,7 @@
<div class="container">
<el-form size="small" :inline="true" label-width="100px">
<el-form-item label="模板标题：">
<el-input v-model="tableFrom.title" placeholder="请输入模板标题" class="selWidth" size="small"></el-input>
<el-input v-model="tableFrom.title" placeholder="请输入模板标题" class="selWidth" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="所属类目：">
<el-select v-model="tableFrom.categoryId" placeholder="请选择状态" clearable class="selWidth">

2
admin/src/views/appSetting/wxAccount/reply/follow/index.vue
View File

@@ -120,7 +120,7 @@
class="mr10"
/>
<el-upload
class="upload-demo mr10 mb15"
class="upload-demo mr10"
action
:http-request="handleUploadForm"
:headers="myHeaders"

17
admin/src/views/appSetting/wxAccount/reply/keyword/index.vue
View File

@@ -5,7 +5,7 @@
<div class="container">
<el-form size="small" :inline="true">
<el-form-item label="回复类型：">
<el-select v-model="tableFrom.type" placeholder="请选择类型" @change="seachList" class="selWidth">
<el-select v-model="tableFrom.type" placeholder="请选择类型" @change="seachList" class="selWidth" clearable>
<el-option label="文本消息" value="text"></el-option>
<el-option label="图片消息" value="image"></el-option>
<el-option label="图文消息" value="news"></el-option>
@@ -13,7 +13,7 @@
</el-select>
</el-form-item>
<el-form-item label="关键字：">
<el-input v-model="tableFrom.keywords" placeholder="请输入关键字" class="selWidth" size="small">
<el-input v-model="tableFrom.keywords" placeholder="请输入关键字" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" size="small" @click="seachList" />
</el-input>
</el-form-item>
@@ -58,6 +58,8 @@
v-model="scope.row.status"
:active-value="true"
:inactive-value="false"
active-text="显示"
inactive-text="隐藏"
@change="onchangeIsShow(scope.row)"
/>
</template>
@@ -87,7 +89,7 @@
</template>
<script>
import { replyListApi, replyDeleteApi, replyUpdateApi } from '@/api/wxApi'
import { replyListApi, replyDeleteApi, replyUpdateApi, replyStatusApi } from '@/api/wxApi'
import { getToken } from '@/utils/auth'
export default {
name: 'WechatKeyword',
@@ -115,8 +117,11 @@ export default {
this.getList()
},
onchangeIsShow(row) {
replyUpdateApi(row.id, row).then(() => {
this.$message.success('修改成功')
replyStatusApi({id:row.id, status:row.status}).then(() => {
this.$message.success('修改成功');
this.getList();
}).catch(()=>{
row.status = !row.status
})
},
// 列表
@@ -141,7 +146,7 @@ export default {
// 删除
handleDelete(id, idx) {
this.$modalSure().then(() => {
replyDeleteApi(id).then(() => {
replyDeleteApi({id: id}).then(() => {
this.$message.success('删除成功')
this.getList()
})

22
admin/src/views/appSetting/wxAccount/wxTemplate/index.vue
View File

@@ -9,17 +9,8 @@
<el-option :label="item.label" :value="item.value" v-for="(item, index) in switchData" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型：">
<el-select v-model="tableFrom.type" placeholder="请选择类型" clearable class="selWidth">
<el-option label="订阅消息" value="0"></el-option>
<el-option label="模板消息" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="模板名称：">
<el-input v-model="tableFrom.name" placeholder="请输入模板名称" class="selWidth" size="small"></el-input>
</el-form-item>
<el-form-item label="微信模板ID：">
<el-input v-model="tableFrom.tempId" placeholder="请输入微信模板ID" class="selWidth" size="small"></el-input>
<el-input v-model="tableFrom.name" placeholder="请输入模板名称" class="selWidth" size="small" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="seachList" size="small">查询</el-button>
@@ -41,6 +32,11 @@
width="80"
prop="id"
/>
<el-table-column
prop="tempKey"
label="模板编号"
min-width="150"
/>
<el-table-column
prop="tempId"
label="模板ID"
@@ -136,9 +132,7 @@
page: 1,
limit: 20,
status: '',
name: '',
type: this.$route.path.indexOf('routineTemplate') !== -1? '0' :'1',
tempId: ''
name: ''
},
tableData: {
data: [],
@@ -217,6 +211,8 @@
wechatTemplateStatusApi(row.id, {status: row.status}).then(() => {
this.$message.success('修改成功')
this.getList()
}).catch(()=>{
row.status = !row.status
})
}
}