diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index c964efb..851e528 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -37,6 +37,11 @@ export default { type: Number, default: null, }, + /* 宽度 */ + wight: { + type: Number, + default: null, + }, /* 最小高度 */ minHeight: { type: Number, diff --git a/src/views/bxg/shop/goods/form.vue b/src/views/bxg/shop/goods/form.vue index bf31408..2dcb0eb 100644 --- a/src/views/bxg/shop/goods/form.vue +++ b/src/views/bxg/shop/goods/form.vue @@ -213,7 +213,8 @@ - + + diff --git a/src/views/bxg/shop/set/aboutUs.vue b/src/views/bxg/shop/set/aboutUs.vue new file mode 100644 index 0000000..cc2043b --- /dev/null +++ b/src/views/bxg/shop/set/aboutUs.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/bxg/shop/set/form.vue b/src/views/bxg/shop/set/form.vue index 3549382..97714e6 100644 --- a/src/views/bxg/shop/set/form.vue +++ b/src/views/bxg/shop/set/form.vue @@ -10,6 +10,16 @@ + + + + + + @@ -25,7 +35,6 @@ @@ -47,10 +56,29 @@ export default { data() { return { loading: false, dialog: false, + options:[ + { + value:0, + label:'首页轮播图', + }, + { + value:1, + label:'品牌馆轮播图', + }, + { + value:2, + label:'优惠券轮播图', + }, + { + value:3, + label:'活动专区轮播图', + }, + ], form: { id: '', groupName: 'zsw_home_banner', name: '', + type:0, url: '', wxapp_url: '', uniapp_url: '', @@ -118,6 +146,7 @@ export default { id: '', groupName: 'zsw_home_banner', name: '', + type:'', url: '', wxapp_url: '', uniapp_url: '', diff --git a/src/views/bxg/shop/set/index.vue b/src/views/bxg/shop/set/index.vue index 167dbda..0c5f924 100644 --- a/src/views/bxg/shop/set/index.vue +++ b/src/views/bxg/shop/set/index.vue @@ -20,6 +20,7 @@ + @@ -87,6 +88,17 @@ export default { }) }, methods: { + Formatter(row,colum,cellValue){ + console.log(cellValue,'row') + switch (cellValue) + { + case 0: return "首页轮播图" + case 1: return "品牌馆轮播图" + case 2: return "优惠券轮播图" + case 3: return "活动专区轮播图" + default: return "首页轮播图" + } + }, checkPermission, beforeInit() { this.url = 'bxg/api/yxSystemGroupData' @@ -123,6 +135,7 @@ export default { id: data.id, groupName: data.groupName, name: data.map.name, + type: data.map.type, url: data.map.url, wxapp_url: data.map.wxapp_url, uniapp_url: data.map.uniapp_url, diff --git a/src/views/bxg/shop/set/problem.vue b/src/views/bxg/shop/set/problem.vue new file mode 100644 index 0000000..3c9a854 --- /dev/null +++ b/src/views/bxg/shop/set/problem.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/bxg/shop/set/problemform.vue b/src/views/bxg/shop/set/problemform.vue new file mode 100644 index 0000000..dc43761 --- /dev/null +++ b/src/views/bxg/shop/set/problemform.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/src/views/bxg/shop/user/form.vue b/src/views/bxg/shop/user/form.vue index 24b500f..adb2f2f 100644 --- a/src/views/bxg/shop/user/form.vue +++ b/src/views/bxg/shop/user/form.vue @@ -14,7 +14,8 @@ - + 开启 @@ -75,6 +76,9 @@ export default { loginType: '' }, rules: { + integral: [ + { type: 'number', min: 0, max: 999999, message: '最大只能是999999', trigger: 'blur' } + ], } } }, diff --git a/src/views/bxg/shop/yxStoreHotList/index.vue b/src/views/bxg/shop/yxStoreHotList/index.vue index e25ef37..c27c8bd 100644 --- a/src/views/bxg/shop/yxStoreHotList/index.vue +++ b/src/views/bxg/shop/yxStoreHotList/index.vue @@ -5,24 +5,32 @@ - + - + - + +
+
+ top{{index+1}}:{{item}} +
+
+ + filterable> @@ -33,7 +41,7 @@ - + @@ -123,6 +131,9 @@ export default { mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()], data() { return { + product:'', + productNameList:[], + changeShow:false, oldProductList:[], props: { multiple: true }, productList:[], @@ -144,17 +155,22 @@ export default { this.getInfo(); }, methods: { + cancel(){ + this.productNameList=[] + }, cascaderChange(val) { - this.productList=[] - let productList=[] - productList=this.getCascader(val,this.oldProductList); + this.productList=[] + this.productNameList=[]; + let productList=[]; + productList=this.getCascader(val,this.oldProductList,this.$refs.quitCascader.getCheckedNodes(true)); this.productList = productList //回显的数据 this.oldProductList=productList; - this.form.productList=JSON.stringify(this.productList.map(item=>item[1])); + console.log('val',val,'element',productList,'Nodes',this.$refs.quitCascader.getCheckedNodes(true)) + this.form.productList=JSON.stringify(this.productList.map(item=>item[1])); }, - getCascader(newVal,oldVal) { + getCascader(newVal,oldVal,Nodes) { let productList = [] - console.log('val',newVal,'element',oldVal) + // console.log('val',newVal,'element',oldVal,'Nodes',Nodes) //这次只选了一个,返回选择的 if(newVal.length <= 1) { productList=newVal; @@ -180,7 +196,6 @@ export default { let diff = newValList.concat(oldValList).filter((value, index, arr) => { return arr.indexOf(value) === arr.lastIndexOf(value) }); - // console.log('newValList',newValList,oldValList,diff) newVal.forEach((item)=> { diff.forEach(ele=>{ if(item[1]==ele) { @@ -189,8 +204,20 @@ export default { }) }); productList=oldVal - console.log('productList',productList) } + console.log('val',newVal,'productList',productList) + let productNameList=[]; + productList.forEach(ele=>{ + Nodes.forEach(item=>{ + if (item.value==ele[1]){ + // productNameList=item.parent.label+'/'+item.label+productNameList; + console.log('item.parent.label+\'/\'+item.label',item.parent.label+'/'+item.label) + productNameList.push(item.parent.label+'/'+item.label) + } + }) + }) + console.log('productList',productNameList) + this.productNameList=productNameList; return productList; }, change(val){ @@ -231,15 +258,19 @@ export default { return true }, // 新增与编辑前做的操作 [CRUD.HOOK.afterToCU](crud, form) { + this.changeShow=false; + this.productNameList=[]; + this.productList=[]; if (form.productList && form.id) { let data=JSON.parse(this.form.productList) console.log('data',data) + let productNameList=[] data.forEach(item=>{ let product=[Number(item.cateId),Number(item.id)] this.productList.push(product) + productNameList.push(item.storeName) }) - // product=select - console.log( '111',this.productList,typeof(this.product)); + this.productNameList=productNameList; } }, } diff --git a/src/views/bxg/wechat/config/robot.vue b/src/views/bxg/wechat/config/robot.vue new file mode 100644 index 0000000..8b96576 --- /dev/null +++ b/src/views/bxg/wechat/config/robot.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/bxg/yxEvaluation/index.vue b/src/views/bxg/yxEvaluation/index.vue index b0e831e..466ad15 100644 --- a/src/views/bxg/yxEvaluation/index.vue +++ b/src/views/bxg/yxEvaluation/index.vue @@ -21,7 +21,6 @@ :options="cateList" filterable> - @@ -36,23 +35,30 @@ - + + + + + + + + - + - + - + - + - + @@ -62,14 +68,10 @@ 隐藏 - - - -