diff --git a/src/config/index.js b/src/config/index.js index 73cd2bd..68aed2a 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -4,8 +4,8 @@ export const productUrl='dj-admin'; // const baseUrl = "http://192.168.1.7:8100/czg/" // const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/" -// const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试 -const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上 + const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试 +// const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上 export default{ baseUrl diff --git a/src/router/index.js b/src/router/index.js index 043de70..9641b7e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,6 +37,8 @@ const mainRoutes = { {path: '/userList', component: _import('user/userList'), name: 'userList', meta: {title: '用户列表', isTab: true}}, {path: '/allocationList',component: _import('allocation/allocationList'),name: 'allocationList',meta: {title: '配置列表', isTab: true}}, {path: '/financeList', component: _import('finance/financeList'), name: 'financeList', meta: {title: '财务中心', isTab: true}}, + {path: '/shareFriends', component: _import('finance/shareFriends'), name: 'shareFriends', meta: {title: '邀请好友奖励', isTab: true}}, + {path: '/lotteryInquiry', component: _import('finance/lotteryInquiry'), name: 'lotteryInquiry', meta: {title: '抽奖查询', isTab: true}}, {path: '/message', component: _import('message/message'), name: 'message', meta: {title: '消息中心', isTab: true}}, {path: '/renwu', component: _import('renwu/index'), name: 'renwu', meta: {title: '任务中心', isTab: false}}, {path: '/taskConfig', component: _import('taskConfig/taskConfig'), name: 'taskConfig', meta: {title: '任务配置', isTab: true}}, diff --git a/src/views/allocation/allocationList.vue b/src/views/allocation/allocationList.vue index c6b83f7..a4bc6d3 100644 --- a/src/views/allocation/allocationList.vue +++ b/src/views/allocation/allocationList.vue @@ -261,6 +261,32 @@ + + + +
+ + + + +
+
*建议优先选择jpg格式,并且最好控制在500kb内
+
+ + + + + + + + 保存 + +
+
@@ -340,6 +366,19 @@ export default { dialogFormVisible1: false, tableDataLoading: true, formLabelWidth: '200px', + ShareFriends: {}, + ShareFriendsrules: { + imageUrl: [{ + required: true, + message: '请选择图片', + trigger: 'blur' + }], + tips: [{ + required: true, + message: '请输入文案', + trigger: 'blur' + }], + }, form: { id: '', min: '', @@ -362,6 +401,7 @@ export default { label: '否' } ], + imageUrl: '', tableData: [], checkBoxData: [] //多选框选择的值 } @@ -375,6 +415,47 @@ export default { this.page = val - 1; this.dataSelect(); }, + onSubmit() { + console.log(this.ShareFriends,'111111111111') + if (!this.ShareFriends.imageUrl) { + this.$message({ + message: '请选择图片', + type: 'warning', + duration: 1500 + }) + return false + } + this.$refs.ShareFriends.validate((valid) => { + if (valid) { + console.log(111) + this.$http({ + url: this.$http.adornUrl('/ext/sys/invite/friend/config/save'), + method: 'post', + data: this.$http.adornData({ + ...this.ShareFriends, + }) + }).then(({ + data + }) => { + if (data && data.code === 0) { + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + this.getData() + } + }) + } else { + this.$message.error(data.msg) + } + }) + } else { + console.log('error submit!!'); + return false; + } + }); + }, handleClick(tab, event) { if (tab._props.label == '全局系统配置') { this.condition = 'xitong' @@ -424,8 +505,26 @@ export default { this.condition = 'kefu' this.dataSelect() } + if (tab._props.label == '分享好友页面配置') { + this.condition = 'Share' + this.getData() + } }, + getData(){ + this.$http({ + url: this.$http.adornUrl(`ext/sys/invite/friend/config/get`), + method: 'get', + params: {} + }).then(({ + data + }) => { + if (data && data.code === 0) { + this.ShareFriends = data.data + this.imageUrl = data.data.imageUrl + } + }) + }, // 修改弹框 amend(index, rows) { this.dialogFormVisible = true; @@ -558,6 +657,10 @@ export default { } }) }, + handleAvatarSuccess(file, fileList) { + this.ShareFriends.imageUrl = file.data + this.imageUrl = file.data + }, handleAvatarSuccess1(file, fileList) { this.form.value = file.data console.log('file.data', file.data) diff --git a/src/views/finance/lotteryInquiry.vue b/src/views/finance/lotteryInquiry.vue new file mode 100644 index 0000000..0713f38 --- /dev/null +++ b/src/views/finance/lotteryInquiry.vue @@ -0,0 +1,144 @@ + + \ No newline at end of file diff --git a/src/views/finance/shareFriends.vue b/src/views/finance/shareFriends.vue new file mode 100644 index 0000000..fa73490 --- /dev/null +++ b/src/views/finance/shareFriends.vue @@ -0,0 +1,178 @@ + + \ No newline at end of file diff --git a/src/views/orderCenter/orderCenter.vue b/src/views/orderCenter/orderCenter.vue index a292df2..23d02a7 100644 --- a/src/views/orderCenter/orderCenter.vue +++ b/src/views/orderCenter/orderCenter.vue @@ -138,6 +138,8 @@