diff --git a/.env.development b/.env.development index a151a59..bfb5748 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,8 @@ ENV = 'development' # http://mer.crmeb.net/admin # base api # www.shop.xyz -VUE_APP_BASE_API = 'http://test.tropjoin.com' +VUE_APP_BASE_API = 'http://www.shop.xyz' +# VUE_APP_BASE_API = 'http://test.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com' # socket 连接地址 diff --git a/src/api/marketing.js b/src/api/marketing.js index 8454250..3709ded 100644 --- a/src/api/marketing.js +++ b/src/api/marketing.js @@ -379,6 +379,12 @@ export function integralLogLst(data) { export function brokerageLogLst(data) { return request.get(`user/brokerage/lst/log`, data) } +/** + * @description 奖励金 -- 列表 + */ +export function bonusLogLst(data) { + return request.get(`user/brokerage/bonus/log`, data) +} /** * @description 积分日志 -- 导出 */ diff --git a/src/components/mobileConfig/c_banner.vue b/src/components/mobileConfig/c_banner.vue index cf0b132..10324ed 100644 --- a/src/components/mobileConfig/c_banner.vue +++ b/src/components/mobileConfig/c_banner.vue @@ -104,6 +104,8 @@ export default { this.$nextTick(() => { let value = JSON.parse(JSON.stringify(this.$store.state.mobildConfig.defaultArray[this.num])) this.configObj = value; + console.log(this.configObj); + }) }, methods: { diff --git a/src/components/mobileConfigRight/c_menu_list.vue b/src/components/mobileConfigRight/c_menu_list.vue index d38f62a..069bf87 100644 --- a/src/components/mobileConfigRight/c_menu_list.vue +++ b/src/components/mobileConfigRight/c_menu_list.vue @@ -119,6 +119,9 @@ export default { handler (nVal, oVal) { this.defaults = nVal this.configData = nVal[this.configNme] + console.log(this.configData); + console.log(this.configNme); + }, deep: true } diff --git a/src/router/modules/promoter.js b/src/router/modules/promoter.js index 5ef607d..ec7be95 100644 --- a/src/router/modules/promoter.js +++ b/src/router/modules/promoter.js @@ -30,6 +30,15 @@ const promoterRouter = }, component: () => import('@/views/promoter/brokerage/index') }, + { + path: 'bonusLog', + name: 'bonusLog', + meta: { + title: '奖励金记录', + noCache: true + }, + component: () => import('@/views/promoter/bonusLog/index') + }, { path: 'user', name: 'AccountsUser', diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index b92fa58..4862145 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -640,7 +640,7 @@ />
- + + +
+
+ +
+
+ +
+
- { diff --git a/src/views/promoter/bonusLog/index.vue b/src/views/promoter/bonusLog/index.vue new file mode 100644 index 0000000..e8ee069 --- /dev/null +++ b/src/views/promoter/bonusLog/index.vue @@ -0,0 +1,245 @@ + + + diff --git a/src/views/setting/devise/index.vue b/src/views/setting/devise/index.vue index 95e8d9f..e4004d8 100644 --- a/src/views/setting/devise/index.vue +++ b/src/views/setting/devise/index.vue @@ -672,6 +672,8 @@ export default { let tempItem = JSON.parse(JSON.stringify(item)); this.rConfig.push(tempItem); this.activeIndex = index; + console.log(this.rConfig); + this.$store.commit("mobildConfig/SETCONFIGNAME", item.name); }, // 组件删除 @@ -859,6 +861,7 @@ export default { this.$store.commit('mobildConfig/radioUpdata', data.info.bg_tab_val || 0); this.$store.commit('mobildConfig/picurlUpdata', data.info.bg_pic || ''); this.defaultData(data.info.value); + }); }, defaultData(data) {