Skip to content

A
admin-base
Commit 69a5494b authored by wangwei's avatar wangwei
Browse files
Options

Merge remote-tracking branch 'origin/development' into development

parents 843213d9 7d9066c0
Hide whitespace changes
Inline Side-by-side
Showing with 317 additions and 1 deletion
src/components/config/index.vue 0 → 100644
View file @ 69a5494b
<template>
<div>
<div style="margin-top:30px;">
</div>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="新用户跳转链接" name="news_user">
<el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm" style="width:600px;">
<el-form-item label="配置信息" prop="msg" :rules="[{ required: true, message: '配置信息不能为空'}, ]">
<el-input type="text" v-model.number="form.msg" autocomplete="off"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('form')" v-if="!$store.state.readonly">修改</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="分享商品ID" name="share_goods">
<el-form :model="form2" ref="form2" label-width="150px" class="demo-ruleForm" style="width:600px;">
<el-form-item label="分享商品ID" prop="msg" :rules="[{ required: true, message: '配置信息不能为空'},]" >
<el-input type="text" v-model.number="form2.msg" autocomplete="off"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('form2')" v-if="!$store.state.readonly">修改</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import { getConfigListApi ,updateConfigApi} from "../../service/api";
export default {
name: "entrance",
props: ["entranceObj"],
data() {
return {
activeName: "news_user",
form: {
msg: ""
},
form2: {
msg: ""
},
thisList:{},
thisList2:{},
};
},
mounted() {
this.first();
},
filters: {},
methods: {
handleClick(tab) {
this.activeName = tab.name;
if (tab.name === 'news_user') {
this.first();
} else {
this.second();
}
},
first() {
getConfigListApi({key: 'new_user_redirect'}).then(res => {
let thisList = res.list[0]
this.form.msg=thisList.desc;
this.thisList=thisList;
})
},
second() {
getConfigListApi({key: 'share_goods_id'}).then(res => {
let thisList2 = res.list[0]
this.form2.msg=thisList2.desc;
this.thisList2=thisList2;
})
},
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
if(formName== "form"){
this.$confirm('确认修改吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let json ={
key:this.thisList.key,
value:this.thisList.value,
desc:this.form.msg,
}
let id=this.thisList.id;
console.log(id,json)
updateConfigApi(id,json).then(res=>{
this.$message({
type: 'success',
message: '修改成功!'
});
});
});
}else{
this.$confirm('确认修改吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let json ={
key:this.thisList2.key,
value:this.thisList2.value,
desc:this.form2.msg
}
let id=this.thisList2.id;
updateConfigApi(id,json).then(res=>{
this.$message({
type: 'success',
message: '修改成功!'
});
});
});
}
} else {
console.log("error submit!!");
return false;
}
});
}
}
};
</script>
<style scoped lang="less">
</style>
src/components/creditsLog/index.vue 0 → 100644
View file @ 69a5494b
<template>
<div class="index">
<!-- <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
<el-form-item label="用户ID">
<el-input v-model="searchFrom.user_id"
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="initPage">
搜索
</el-button>
</el-form-item>
</el-form> -->
<el-table
:data="tableData"
style="width: 100%">
<el-table-column
prop="nickname"
label="用户">
</el-table-column>
<el-table-column
prop="mobile"
label="手机号">
</el-table-column>
<el-table-column
prop="integral"
label="积分">
</el-table-column>
<el-table-column
prop="desc"
label="备注">
</el-table-column>
<el-table-column
label="操作"
min-width="150"
v-if="!$store.state.readonly">
<template slot-scope="scope">
<el-button
@click="editComment(scope.row.id, scope.row.integral)"
type="text"
plain
size="mini">
修改积分
</el-button>
</template>
</el-table-column>
</el-table>
<page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
<!-- 修改积分 -->
<el-dialog
title="修改积分"
center
append-to-body
:visible.sync="showCommentDialog"
:close-on-click-modal="false"
:close-on-press-escape="false"
:show-close="false"
width="600px">
<div>
<el-form ref="commentFrom" :model="commentForm" inline>
<el-form-item label="积分">
<el-input-number v-model="commentForm.integral" :min="0"></el-input-number>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="showCommentDialog = false">取 消</el-button>
<el-button type="primary" @click="saveComment(commentForm.integral)">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import page from '../framework/page'
import {} from "../../service/api";
export default {
name: "index",
components:{
page
},
data(){
return {
total:0,
nowPage:1,
limit: 10,
searchFrom: {
source:''
},
tableData:[1,2],
commentForm: {
integral:0,
},
showCommentDialog: false
}
},
created(){
this.initPage()
},
methods:{
initPage(){
let json = {
limit: this.limit,
page: this.nowPage
}
// if (this.searchFrom.user_id) {
// json.user_id = this.searchFrom.user_id
// }
// getAdsInnerListApi(json).then((res)=>{
// this.tableData = res.list;
// this.total = res.total
// })
},
onPageChange(val){
this.nowPage = val
this.initPage()
},
onSizeChange(val){
this.nowPage = 1
this.limit = val
this.initPage()
},
saveComment(data){
this.$confirm('确定修改?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(()=>{
let json={
integral:data,
}
// Api(id).then(res=>{
this.$message({
type: 'success',
message: '修改成功'
});
this.showCommentDialog = false;
this.initPage();
});
// });
},
editComment(id, integral) {
this.showCommentDialog = true;
this.commentForm = {
id: id,
integral: integral
};
},
}
}
</script>
<style scoped lang="less">
.index {
padding: 20px 0;
}
</style>
src/components/weChat/focusReply.vue
View file @ 69a5494b
......@@ -10,6 +10,9 @@
<el-tab-pane label="有课用户关注" name="focus_reply_course"></el-tab-pane>
<el-tab-pane label="有订单无课用户关注" name="order_no_course_reply"></el-tab-pane>
<el-tab-pane label="自动回复" name="auto_reply"></el-tab-pane>
<el-tab-pane label="半小时无课用户自动回复" name="half_hour_no_course_reply"></el-tab-pane>
<el-tab-pane label="24小时内无课用户自动回复" name="twenty_four_hour_no_course_reply"></el-tab-pane>
<el-tab-pane label="48小时内无课用户自动回复" name="forty_eight_no_course_reply"></el-tab-pane>
<el-tab-pane label="小程序自动回复" name="mini_auto_reply"></el-tab-pane>
</el-tabs>
<el-table
......
src/util/menuList.js
View file @ 69a5494b
......@@ -112,7 +112,19 @@ export default [{
name: 'oldUser',
component: e => require(['@/components/oldUser/'], e),
}
}
},
{
value: '用户积分列表',
routerName: 'creditsLog',
path: '/creditsLog',
cover: '3-4',
router: {
path: '/creditsLog',
name: 'creditsLog',
component: e => require(['@/components/creditsLog'], e),
}
},
]
}, {
name: '',
......@@ -416,6 +428,17 @@ export default [{
component: e => require(['@/components/smsRecord'], e),
}
},
{
value: '系统配置',
routerName: 'config',
path: '/config',
cover: '10-3',
router: {
path: '/config',
name: 'config',
component: e => require(['@/components/config'], e),
}
},
]
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment