From 26c761bc2dc03fbaed294aa741fe8b742cba3289 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Thu, 18 Apr 2024 18:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E7=9C=81=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E9=97=A8=E5=BA=97=20-=20=E7=A7=BB=E5=8A=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=20-=20=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=20-=20=E6=8F=90=E4=BA=A4=E5=90=8E=E4=BD=A3=E9=87=91=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E5=9E=8B=E8=87=AA=E5=8A=A8=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=20-=20=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91=20-=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E9=85=92=E5=8D=A1=E9=A2=9D=E5=BA=A6?= =?UTF-8?q?=E5=8F=8A=E8=8F=9C=E5=8D=A1=E9=A2=9D=E5=BA=A6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=A2=9D=E5=BA=A6=E5=85=A8=E9=83=A8=E4=B8=A2=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B?= =?UTF-8?q?=E8=B4=A7=20-=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E5=A4=B1=E8=B4=A5=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=BE=9B=E5=BA=94=E5=95=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=B6=85=E5=87=BA20=E4=B8=AA=E6=97=B6=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=B6=85=E5=87=BA=E7=9A=84=E5=95=86=E5=93=81=EF=BC=8C?= =?UTF-8?q?=E4=BB=85=E6=98=BE=E7=A4=BA=E6=9C=80=E5=89=8D=E9=9D=A2=E7=9A=84?= =?UTF-8?q?20=E4=B8=AA=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/admin/business/index.vue | 10 +++++---- pages/product/addGoods/index.vue | 33 +++++++++++++++++------------ pages/product/addGoods/secound.vue | 4 ++-- pages/supplier/stock/with_goods.vue | 4 ++-- pages/user/index.vue | 14 ++++++++---- 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue index a7fbb44..1b56dbe 100644 --- a/pages/admin/business/index.vue +++ b/pages/admin/business/index.vue @@ -73,7 +73,7 @@ export default { icon: 'iconfont icon-kefujilu' }); } - if(this.service.is_verify && [0,3,4].includes(Number(merchantInfo.merchant_type))){ + if(this.service.is_verify && [0,3,4,5].includes(Number(merchantInfo.merchant_type))){ list.push({ title: '订单核销', url: '/pages/admin/order_cancellation/index?mer_id=' + merId, @@ -92,14 +92,14 @@ export default { icon: 'iconfont icon-daihexiao' }); } - if(this.service.customer && [0,1,3,4].includes(Number(merchantInfo.merchant_type))){ + if(this.service.customer && [0,1,3,4,5].includes(Number(merchantInfo.merchant_type))){ list.push({ title: '订单管理', url: '/pages/admin/order/index?mer_id=' + merId, icon: 'iconfont icon-dingdanguanli' }); } - if(this.service.is_goods && [0].includes(Number(merchantInfo.merchant_type))){ + if(this.service.is_goods && [0,5].includes(Number(merchantInfo.merchant_type))){ list.push({ title: '商品管理', url: '/pages/product/list/index?mer_id=' + merId, @@ -144,7 +144,7 @@ export default { icon: 'iconfont icon-erweima1' }); } - if(this.service.purchase_permission && [1,3,4].includes(Number(merchantInfo.merchant_type))){ + if(this.service.purchase_permission && [1,3,4,5].includes(Number(merchantInfo.merchant_type))){ list.push({ title: '进货', url: '/pages/supplier/stock/with_goods', @@ -171,6 +171,8 @@ export default { if(this.is_sys == 1) this.pageTitle = '平台管理'; if(this.is_sys == 2) this.pageTitle = '酒道馆管理'; else if(this.is_sys == 3) this.pageTitle = '烟酒店管理'; + else if(this.is_sys == 4) this.pageTitle = '超市管理'; + else if(this.is_sys == 5) this.pageTitle = '省公司门店管理'; uni.setNavigationBarTitle({ title: this.pageTitle }) diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue index cd1cb68..f44e0c7 100644 --- a/pages/product/addGoods/index.vue +++ b/pages/product/addGoods/index.vue @@ -13,8 +13,8 @@ 建议：图片尺寸为750*750px - - + + @@ -23,7 +23,7 @@ - + 商品简介 @@ -368,7 +368,7 @@ export default { } if(this.step == 2) { this.secoundModel = !this.secoundModel; - } + } }, watch: { @@ -378,7 +378,7 @@ export default { setTimeout(()=>{ setStorage('addGoodsFormData', this.setFormData); }); - + }, deep: true }, @@ -456,12 +456,17 @@ export default { delivery_way: [], // 配送方式 1 到店核销 2 快递配送 delivery_free: '0', // 是否包邮 0不包邮 1包邮 temp_id: '', // 运费模板ID - tempName: '' // 运费模板名称 - }; - + tempName: '', // 运费模板名称 + extension_type: 0,// 佣金设置 0.系统，1.自定义 + // 赠送酒卡额度 + is_give_quota: 0, + give_quota_num: 0, + is_give_dish: 0, + give_dish_num: 0, + }; if(getStorage('editGoodsDetils')) { removeStorage('editGoodsDetils'); - } + } productDetail(this.merId, this.product_id).then(res => { setStorage('editGoodsDetils', res.data); let editGoodsDetils = res.data; @@ -477,16 +482,16 @@ export default { if(this.setFormData.spec_type == 1) { if(editGoodsDetils.attr.length) { this.setFormData.specifica = '点击修改规格' - } + } if(editGoodsDetils.attrValue.length) { this.setFormData.setSpecificaValue2 = '点击修改价格' - } + } } if (editGoodsDetils.spec_type == 0) { setStorage('singleSpecification', editGoodsDetils.attrValue[0]); if(editGoodsDetils.attrValue.length) { this.setFormData.setSpecificaValue = '点击修改价格' - } + } } setStorage('attrValue', editGoodsDetils.attrValue); editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name); @@ -499,7 +504,7 @@ export default { let that = this; that.$util.uploadImageOne('upload/image', function(res) { that.setFormData.imageList.push(res.data.path); - + }); }, clk() { @@ -531,7 +536,7 @@ export default { complete(res) { console.log(res) } - }); + }); }, getImgName(name){ this.imgName = name diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue index b9fe63c..5d5c9c2 100644 --- a/pages/product/addGoods/secound.vue +++ b/pages/product/addGoods/secound.vue @@ -141,14 +141,14 @@ export default { return; } - if (getStorage('addGoodsSecoundData')) { + if (getStorage('addGoodsSecoundData')) { Object.keys(this.addGoodsSecoundData).forEach(item => { if (getStorage('addGoodsSecoundData')[item] || getStorage('addGoodsSecoundData')[item] == 0) { this.addGoodsSecoundData[item] = getStorage('addGoodsSecoundData')[item]; } }); - + } diff --git a/pages/supplier/stock/with_goods.vue b/pages/supplier/stock/with_goods.vue index 3f0ec14..4a339c1 100644 --- a/pages/supplier/stock/with_goods.vue +++ b/pages/supplier/stock/with_goods.vue @@ -269,12 +269,12 @@ export default { // 数据合并 let list = res.data.list || {}; if (Object.values(list).length > 0) { - oldList = _this.$util.SplitArray(list, oldList); + oldList = Object.values(oldList).concat(list); _this.search.page++; } - _this.$set(_this, 'list', oldList); }).catch(err => { + console.log('错误', err) this.$util.Tips({title: err}); }); }, diff --git a/pages/user/index.vue b/pages/user/index.vue index ddd18f9..2ac82e1 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -177,7 +177,7 @@ - + 运营中心 @@ -192,7 +192,7 @@ {{ operation_center.province_title }} - + {{ operation_center.county_title }} @@ -299,6 +299,12 @@ 超市管理中心 + + 省公司门店管理 + + 省公司门店管理中心 + +