diff --git a/admin-web-master/src/App.vue b/admin-web-master/src/App.vue index 9d84bba..41183d9 100644 --- a/admin-web-master/src/App.vue +++ b/admin-web-master/src/App.vue @@ -1,9 +1,7 @@ diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 2fb7494..f92c7f5 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,6 +1,15 @@ import request from '@/utils/request' // import request from '@/utils/request2' +// 字典 +export function getChilds(data) { + return request({ + url: '/dict/getChilds', + method: 'post', + data + }) +} + // 方案资源 export function resourcesFindPlan(data) { return request({ diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue index 9aad14c..ea2d378 100644 --- a/admin-web-master/src/components/add/addcd.vue +++ b/admin-web-master/src/components/add/addcd.vue @@ -10,7 +10,9 @@ - + + @@ -243,7 +245,10 @@ }, computed: { regionOptions() { - return this.$store.state.app.regionOptions; + return this.$store.state.cent.regionList; + }, + siteTypeList() { + return this.$store.state.cent.siteTypeList; } }, props: { diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue index 9bfd096..4d9d259 100644 --- a/admin-web-master/src/components/add/addinformation.vue +++ b/admin-web-master/src/components/add/addinformation.vue @@ -10,8 +10,9 @@ - - + + @@ -172,8 +173,11 @@ }, computed: { regionOptions() { - return this.$store.state.app.regionOptions; - } + return this.$store.state.cent.regionList; + }, + typeShopList() { + return this.$store.state.cent.typeShopList; + }, }, data() { return { diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index 099989e..8f718df 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -12,15 +12,19 @@ - - + + - + + @@ -284,6 +288,14 @@ lvdaoList: [], }; }, + computed: { + owningEndList() { + return this.$store.state.cent.owningEndList; + }, + rotationSequenceList() { + return this.$store.state.cent.rotationSequenceList; + }, + }, props: { type: { type: String, diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue index 5600684..4c10b4b 100644 --- a/admin-web-master/src/components/resourceCommodity/index.vue +++ b/admin-web-master/src/components/resourceCommodity/index.vue @@ -20,7 +20,7 @@ -
{{editbgid.shopType=='1'?'移动铺位':editbgid.shopType=='2'?'固定铺位':'无'}}
+
{{gettypeShopList(editbgid.shopType) || '无'}}
 @@ -458,8 +458,24 @@ this.getAll() }, computed: { + typeShopList() { + return this.$store.state.cent.typeShopList; + }, }, methods: { + gettypeShopList(code) { + if (!code) { + return '无'; + } + for (let i = 0; i < this.typeShopList.length; i++) { + const item = this.typeShopList[i]; + item.value=item.value+'' + if (item.value === code) { + return item.label; + } + } + return '无'; + }, async getAll(){ const lvdao = await lvdaoduan() const gongyua = await parkTrails() diff --git a/admin-web-master/src/store/index.js b/admin-web-master/src/store/index.js index 80b10ac..98eb633 100644 --- a/admin-web-master/src/store/index.js +++ b/admin-web-master/src/store/index.js @@ -5,7 +5,7 @@ import app from '@/store/modules/app' import settings from '@/store/modules/settings' import user from '@/store/modules/user' import permission from '@/store/modules/permission.js' - +import cent from '@/store/modules/cent' Vue.use(Vuex) const store = new Vuex.Store({ @@ -13,7 +13,8 @@ const store = new Vuex.Store({ app, settings, user, - permission + permission, + cent }, getters }) diff --git a/admin-web-master/src/store/modules/cent.js b/admin-web-master/src/store/modules/cent.js new file mode 100644 index 0000000..c83c8da --- /dev/null +++ b/admin-web-master/src/store/modules/cent.js @@ -0,0 +1,230 @@ +import {getChilds } from '@/api/newly' + + +const state = () => { + return { + regionList: [],//区域 + typeShopList:[],//商铺类型 + owningEndList:[],//所属端 + rotationSequenceList:[],//轮播顺序 + siteTypeList:[],//场地类型 + + rangeSettingList:[],// 范围设置 + contentClassificationList:[],//内容分类 + channelTypeList:[],//渠道类型 + informationTypeList:[],//信息类型 + cooperationTypeList:[],//合作类型 + receivingMerchantList:[],//接收商家 + } +} + +const mutations = { + setregion: (state, cent) => { + state.regionList = cent + }, + settypeShop: (state, cent) => { + state.typeShopList = cent + }, + setowningEnd: (state, cent) => { + state.owningEndList = cent + }, + setrotationSequence: (state, cent) => { + state.rotationSequenceList = cent + }, + setsiteType: (state, cent) => { + state.siteTypeList = cent + }, + + + setrangeSetting: (state, cent) => { + state.rangeSettingList = cent + }, + setcontentClassification: (state, cent) => { + state.contentClassificationList = cent + }, + setchannelType: (state, cent) => { + state.channelTypeList = cent + }, + setinformationType: (state, cent) => { + state.informationTypeList = cent + }, + setcooperationType: (state, cent) => { + state.cooperationTypeList = cent + }, + setreceivingMerchant: (state, cent) => { + state.receivingMerchantList = cent + }, +} + +const actions = { + getChildsall({commit},) { + console.error(']]]]]]]]]]]]]') + return new Promise((resolve, reject) => { + getChilds({"dictPid":2377,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setregion',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2378,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName=='移动铺位'?'1':item.dictName=='固定铺位'?'2':item.dictId + } + return c1 + }) + commit('settypeShop',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2379,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setowningEnd',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2384,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setrotationSequence',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2385,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setsiteType',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + + + + getChilds({"dictPid":2397,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setrangeSetting',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + + getChilds({"dictPid":2398,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setcontentClassification',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2399,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setchannelType',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2400,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setinformationType',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2401,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setcooperationType',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + getChilds({"dictPid":2402,"page":1,"pageSize":50}).then(response => { + console.error(response.data.list) + response.data.list = response.data.list.map(item => { + let c1 = { + label: item.dictName, + value: item.dictName + } + return c1 + }) + commit('setreceivingMerchant',response.data.list) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, +} + +export default { + state, + mutations, + actions +} + diff --git a/admin-web-master/src/views/activity/activityBian.vue b/admin-web-master/src/views/activity/activityBian.vue index 89ffa43..2e508b0 100644 --- a/admin-web-master/src/views/activity/activityBian.vue +++ b/admin-web-master/src/views/activity/activityBian.vue @@ -75,8 +75,9 @@ - - + + @@ -396,7 +397,11 @@ created() { }, - mounted() { + computed: { + rangeSettingList() { + return this.$store.state.cent.rangeSettingList; + }, + }, mounted() { }, methods: { changimg(e,type) { diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue index 09e3532..618a295 100644 --- a/admin-web-master/src/views/activity/activityBz.vue +++ b/admin-web-master/src/views/activity/activityBz.vue @@ -95,8 +95,9 @@ - - + + @@ -528,6 +529,11 @@ }, + computed: { + rangeSettingList() { + return this.$store.state.cent.rangeSettingList; + }, + }, mounted() { this.editTrue = true this.lishi() diff --git a/admin-web-master/src/views/atmosphere/atmosphereBian.vue b/admin-web-master/src/views/atmosphere/atmosphereBian.vue index 6874407..4bfce25 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereBian.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereBian.vue @@ -72,8 +72,9 @@ - - + + @@ -391,6 +392,11 @@ }, mounted() { }, + computed: { + rangeSettingList() { + return this.$store.state.cent.rangeSettingList; + }, + }, methods: { changimg(e,type) { this.secondData[type] = e diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue index e5e69bf..6584c2d 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue @@ -93,8 +93,9 @@ - - + + @@ -520,6 +521,11 @@ this.lishi() }, + computed: { + rangeSettingList() { + return this.$store.state.cent.rangeSettingList; + }, + }, methods: { changimg(e, type) { this.ruleForm[type] = e diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue index 66f3b06..e56e8dd 100644 --- a/admin-web-master/src/views/detect/information/index.vue +++ b/admin-web-master/src/views/detect/information/index.vue @@ -190,7 +190,7 @@ }, computed: { regionOptions() { - return this.$store.state.app.regionOptions; + return this.$store.state.cent.regionList; } }, components: { diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue index 3364260..7d248d9 100644 --- a/admin-web-master/src/views/detect/map/index.vue +++ b/admin-web-master/src/views/detect/map/index.vue @@ -19,14 +19,17 @@ - - + + - + + @@ -207,6 +210,11 @@ add, resourceCommodity, }, + computed: { + owningEndList() { + return this.$store.state.cent.owningEndList; + } + }, created() { this.getAll() }, diff --git a/admin-web-master/src/views/promotion/contentMant.vue b/admin-web-master/src/views/promotion/contentMant.vue index 1e6b072..63c9e8f 100644 --- a/admin-web-master/src/views/promotion/contentMant.vue +++ b/admin-web-master/src/views/promotion/contentMant.vue @@ -217,9 +217,10 @@ - + + @@ -247,10 +248,11 @@ - + + @@ -401,6 +403,14 @@ mounted() { this.getAll() }, + computed: { + contentClassificationList() { + return this.$store.state.cent.contentClassificationList; + }, + channelTypeList() { + return this.$store.state.cent.channelTypeList; + } + }, methods: { changimg(e,type) { this.formInline[type] = e diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue index 1da5cb4..7ed987f 100644 --- a/admin-web-master/src/views/serve/Merchant/index.vue +++ b/admin-web-master/src/views/serve/Merchant/index.vue @@ -222,10 +222,12 @@ - + + @@ -499,6 +501,11 @@ computed: { }, + computed: { + cooperationTypeList() { + return this.$store.state.cent.cooperationTypeList; + }, + }, methods: { changimg(e, type) { this.formInline[type] = e diff --git a/admin-web-master/src/views/serve/PerWorkstation/index.vue b/admin-web-master/src/views/serve/PerWorkstation/index.vue index 8bcdaff..f97beb1 100644 --- a/admin-web-master/src/views/serve/PerWorkstation/index.vue +++ b/admin-web-master/src/views/serve/PerWorkstation/index.vue @@ -91,7 +91,9 @@ - + + @@ -156,8 +158,9 @@ - - + + @@ -273,6 +276,11 @@ created() { }, + computed: { + receivingMerchantList() { + return this.$store.state.cent.receivingMerchantList; + }, + }, mounted() { this.getAll(); }, diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue index ac08aed..3d3f33d 100644 --- a/admin-web-master/src/views/serve/procedure.vue +++ b/admin-web-master/src/views/serve/procedure.vue @@ -199,10 +199,11 @@ - + + @@ -302,6 +303,11 @@ created() { this.getAll(); }, + computed: { + informationTypeList() { + return this.$store.state.cent.informationTypeList; + }, + }, mounted() {}, methods: { diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index 4c99295..fbc6db9 100644 --- a/lvdao-miniapp/pages/message/message.vue +++ b/lvdao-miniapp/pages/message/message.vue @@ -34,7 +34,7 @@ - + {{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}