From a31c7a5ad05d00c552fa11b4d609c98b36008b30 Mon Sep 17 00:00:00 2001 From: paulGao Date: Tue, 6 Dec 2022 16:32:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=B2=A1=E6=9C=89=E5=9C=B0=E6=96=B9=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/page-decoration/wap/decorate.vue | 198 ++++++++++-------- 1 file changed, 108 insertions(+), 90 deletions(-) diff --git a/manager/src/views/page-decoration/wap/decorate.vue b/manager/src/views/page-decoration/wap/decorate.vue index 960d3460..354d717d 100644 --- a/manager/src/views/page-decoration/wap/decorate.vue +++ b/manager/src/views/page-decoration/wap/decorate.vue @@ -26,13 +26,20 @@ >选择促销活动 - 装修提示 - - + 装修提示 + + @@ -119,66 +126,61 @@
绑定
-
-
+
+ - v-if="res.options.list[0].listWay.length != 0" - > - - -
- -
- {{ bindGoods.title }} +
+ +
+ {{ bindGoods.title }} +
+
+ {{ bindGoods.title }} +
+ +
+
-
- {{ bindGoods.title }} -
- -
-
- -
- -
+ +
绑定分类为：{{ title_item.bindCategory.name }}
@@ -437,21 +439,31 @@ {{ item.model === "hotzone" ? "绘制热区" : "选择链接" }}
- -
-
外部链接
-
- -
-
- -

- (如非同域名下，则在小程序与公众号中无效) -

+ +
+
外部链接
+
+ +
+
+ +

+ (如非同域名下，则在小程序与公众号中无效) +

@@ -475,8 +487,11 @@ @selectedGoodsData="selectedGoodsData" > - - + + @@ -496,7 +511,7 @@ export default { components: { ossManage, hotzone, - categoryTemplate + categoryTemplate, }, data() { return { @@ -513,8 +528,8 @@ export default { selectedGoods: "", // 已选商品 selectedLinks: "", // 已选链接 modelList: "", // 装修列表 - enableSelectCategory:false, //商品是否绑定分类 - goodsSelectedIndex:0, //绑定商品分类的索引 + enableSelectCategory: false, //商品是否绑定分类 + goodsSelectedIndex: 0, //绑定商品分类的索引 }; }, watch: { @@ -526,23 +541,26 @@ export default { props: ["res"], methods: { // 选择分类 - confirmCategory(val){ - let data = {...this.res.options.list[0].titleWay[this.goodsSelectedIndex]} + confirmCategory(val) { + let data = { + ...this.res.options.list[0].titleWay[this.goodsSelectedIndex], + }; let callback = { - id:val[0].id, - name:val[0].name, - categoryIdWay:val[0].id + id: val[0].id, + name: val[0].name, + categoryIdWay: val[0].id, }; data = { ...data, - bindCategory:callback - } - this.res.options.list[0].listWay = this.res.options.list[0].listWay.filter(item=>{ - return item.___index != this.goodsSelectedIndex - }) - this.res.options.list[0].titleWay[this.goodsSelectedIndex] = data + bindCategory: callback, + }; + this.res.options.list[0].listWay = + this.res.options.list[0].listWay.filter((item) => { + return item.___index != this.goodsSelectedIndex; + }); + this.res.options.list[0].titleWay[this.goodsSelectedIndex] = data; - console.log( this.res.options.list[0]) + console.log(this.res.options.list[0]); }, // 商品排序 slotGoods(list, key, val) { @@ -621,7 +639,7 @@ export default { }, // 回调选择的链接 selectedLink(val) { - this.selectedLinks.zoneInfo = [] + this.selectedLinks.zoneInfo = []; delete val.selected; delete val.intro; delete val.mobileIntro; @@ -644,20 +662,20 @@ export default { }); this.res.options.list[0].listWay.push(...data); // 清除已经绑定的分类 - this.res.options.list[0].titleWay[this.goodsSelectedIndex].bindCategory = "" + this.res.options.list[0].titleWay[this.goodsSelectedIndex].bindCategory = + ""; this.linkType = ""; }, // 绑定商品 - bindGoodsId(val,index) { + bindGoodsId(val, index) { this.selectedGoods = val; - this.goodsSelectedIndex = index + this.goodsSelectedIndex = index; this.liliDialogFlag(true); }, // 绑定分类 - bindGoodsCategory(index,key){ - this.enableSelectCategory = true - this.goodsSelectedIndex = index - + bindGoodsCategory(index, key) { + this.enableSelectCategory = true; + this.goodsSelectedIndex = index; }, // 点击抽屉 clickDrawer(item, index) { From acc9a0b88a8397b1fa4ad322d3199d208e38a22b Mon Sep 17 00:00:00 2001 From: paulGao Date: Tue, 6 Dec 2022 16:42:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/api/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/seller/src/api/index.js b/seller/src/api/index.js index 438e749a..32d64abe 100644 --- a/seller/src/api/index.js +++ b/seller/src/api/index.js @@ -289,6 +289,10 @@ export const editDepartment = (ids, params) => { export const loadDepartment = (id) => { return getRequest(`/department/${id}`); }; +// 搜索部门 +export const searchDepartment = (params) => { + return getRequest("/department", params); +}; // 通过部门获取全部角色数据 export const getUserByDepartmentId = (id, params) => { From 984bc4b6351220c7a0df4b4863799fff64a30506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com> Date: Wed, 7 Dec 2022 09:58:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E5=BA=97=E9=93=BA=20?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/shop/shopDetail.vue | 4 +++- manager/src/views/seller/shop/shopList.vue | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index 56f0b3ba..ff7763b3 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -871,7 +871,9 @@ this.$set(this, "storeInfo", res.result); //因switch开关需要用到true或者false 所以进行一次格式化 this.storeInfo.storeDisable = this.storeInfo.storeDisable === "OPEN" ? true : false - this.checkAllGroup = this.storeInfo.goodsManagementCategory.split(","); + if(this.storeInfo.goodsManagementCategory != null){ + this.checkAllGroup = this.storeInfo.goodsManagementCategory.split(","); + } this.storeInfo.legalPhoto = this.storeInfo.legalPhoto.split(","); }); }, diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue index 8e25b918..061b5f1a 100644 --- a/manager/src/views/seller/shop/shopList.vue +++ b/manager/src/views/seller/shop/shopList.vue @@ -24,7 +24,7 @@ @@ -329,6 +329,7 @@ export default { }, // 获取列表数据 getDataList() { + console.log(this.searchForm) this.loading = true; // 带多条件搜索参数获取表单数据 请自行修改接口 getShopListData(this.searchForm).then((res) => {