From d69560e61db5c2860a0b5b05ce7f9f606706b2f9 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 19 Mar 2024 14:46:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/activePopup.vue | 2 +- config/app.js | 4 +- pages.json | 12 +-- pages/index/index.vue | 106 +++++++++++------------ pages/product/addGood/addGood.vue | 2 +- pages/product/addGood/addGood_one.vue | 2 +- pages/product/addGood/addGood_supply.vue | 2 +- pages/product/addGoods/index.vue | 2 +- pages/product/list/index.vue | 60 +++---------- 9 files changed, 76 insertions(+), 116 deletions(-) diff --git a/components/activePopup.vue b/components/activePopup.vue index 5c82f8b..b86a6c2 100644 --- a/components/activePopup.vue +++ b/components/activePopup.vue @@ -5,7 +5,7 @@ - + diff --git a/config/app.js b/config/app.js index 479ac47..4f7918e 100644 --- a/config/app.js +++ b/config/app.js @@ -9,9 +9,9 @@ let httpApiThree let wsApi // 在打包之前请检查当前环境是否正确 -const env = 'dev'; // 开发 +// const env = 'dev'; // 开发 // const env = 'prod'; // 生产 -// const env = 'prew'; // 预上线 +const env = 'prew'; // 预上线 switch (env) { case 'prod': diff --git a/pages.json b/pages.json index bb1dd05..757d63a 100644 --- a/pages.json +++ b/pages.json @@ -1675,14 +1675,14 @@ "iconPath": "static/tabbar_icon/s.png", "selectedIconPath": "static/tabbar_icon/s-a.png", "text": "统计" - }, - { - "pagePath": "pages/nongKe/supply_chain/shopping_trolley", - "iconPath": "static/tabbar_icon/d.png", - "selectedIconPath": "static/tabbar_icon/d-a.png", - "text": "采购车" } // { + // "pagePath": "pages/nongKe/supply_chain/shopping_trolley", + // "iconPath": "static/tabbar_icon/d.png", + // "selectedIconPath": "static/tabbar_icon/d-a.png", + // "text": "采购车" + // } + // { // "pagePath": "pages/product/list/index", // "iconPath": "static/tabbar_icon/c.png", // "selectedIconPath": "static/tabbar_icon/c-a.png", diff --git a/pages/index/index.vue b/pages/index/index.vue index 22987f3..21ac93e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -79,7 +79,7 @@ - 转账订单 @@ -98,7 +98,7 @@ - + --> @@ -539,21 +539,21 @@ type: 13, image: require('@/static/images/index9.png') }, - { - name: '供货采购', - type: 3, - image: require('@/static/images/index4.png') - }, + // { + // name: '供货采购', + // type: 3, + // image: require('@/static/images/index4.png') + // }, { name: '扫码付款', type: 18, image: require('@/static/images/index25.png') }, - { - name: '进货管理', - type: 4, - image: require('@/static/images/index5.png') - }, + // { + // name: '进货管理', + // type: 4, + // image: require('@/static/images/index5.png') + // }, { name: '订单管理', type: 2, @@ -589,11 +589,11 @@ type: 17, image: require('@/static/images/index24.png') }, - { - name: '转账订单', - type: 19, - image: require('@/static/images/index13.png') - }, + // { + // name: '转账订单', + // type: 19, + // image: require('@/static/images/index13.png') + // }, { name: '提现管理', type: 5, @@ -671,16 +671,16 @@ type: 17, image: require('@/static/images/index24.png') }, - { - name: '供货采购', - type: 3, - image: require('@/static/images/index4.png') - }, - { - name: '进货管理', - type: 4, - image: require('@/static/images/index5.png') - }, + // { + // name: '供货采购', + // type: 3, + // image: require('@/static/images/index4.png') + // }, + // { + // name: '进货管理', + // type: 4, + // image: require('@/static/images/index5.png') + // }, { name: '商户设置', type: 12, @@ -722,11 +722,11 @@ type: 5, image: require('@/static/images/index8.png') }, - { - name: '供货采购', - type: 3, - image: require('@/static/images/index4.png') - }, + // { + // name: '供货采购', + // type: 3, + // image: require('@/static/images/index4.png') + // }, { name: '提货付款', type: 17, @@ -747,16 +747,16 @@ type: 18, image: require('@/static/images/index25.png') }, - { - name: '进货管理', - type: 4, - image: require('@/static/images/index5.png') - }, - { - name: '转账订单', - type: 19, - image: require('@/static/images/index13.png') - }, + // { + // name: '进货管理', + // type: 4, + // image: require('@/static/images/index5.png') + // }, + // { + // name: '转账订单', + // type: 19, + // image: require('@/static/images/index13.png') + // }, { name: '订单核销', type: 7, @@ -1264,17 +1264,17 @@ }) } ); - otherOrderStatistics(this.userInfoData.service.mer_id, data).then( - res => { - this.other_order[0].value = res.data.order.unshipped - this.other_order[1].value = res.data.order.untake - }, - err => { - that.$util.Tips({ - title: err.msg - }) - } - ); + // otherOrderStatistics(this.userInfoData.service.mer_id, data).then( + // res => { + // this.other_order[0].value = res.data.order.unshipped + // this.other_order[1].value = res.data.order.untake + // }, + // err => { + // that.$util.Tips({ + // title: err.msg + // }) + // } + // ); }, open() { this.isshow = !this.isshow diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue index a05b770..f045471 100644 --- a/pages/product/addGood/addGood.vue +++ b/pages/product/addGood/addGood.vue @@ -395,7 +395,7 @@ }; productDetail(this.merId, this.product_id).then(async (res) => { this.showCommodity = true; - if (res.data.content_arr.length > 0) res.data.content = res.data.content_arr; + if (res.data.content_arr&&res.data.content_arr.length > 0) res.data.content = res.data.content_arr; let editGoodsDetils = res.data; Object.keys(this.setFormData).forEach(item => { this.setFormData[item] = editGoodsDetils[item]; diff --git a/pages/product/addGood/addGood_one.vue b/pages/product/addGood/addGood_one.vue index 1f8e1d4..7d51360 100644 --- a/pages/product/addGood/addGood_one.vue +++ b/pages/product/addGood/addGood_one.vue @@ -395,7 +395,7 @@ }; productDetail(this.merId, this.product_id).then(async (res) => { this.showCommodity = true; - if (res.data.content_arr.length > 0) res.data.content = res.data.content_arr; + if (res.data.content_arr&&res.data.content_arr.length > 0) res.data.content = res.data.content_arr; let editGoodsDetils = res.data; Object.keys(this.setFormData).forEach(item => { this.setFormData[item] = editGoodsDetils[item]; diff --git a/pages/product/addGood/addGood_supply.vue b/pages/product/addGood/addGood_supply.vue index 096021d..77ff0cd 100644 --- a/pages/product/addGood/addGood_supply.vue +++ b/pages/product/addGood/addGood_supply.vue @@ -430,7 +430,7 @@ }; productDetail(this.merId, this.product_id).then(async (res) => { this.showCommodity = true; - if (res.data.content_arr.length > 0) res.data.content = res.data.content_arr; + if (res.data.content_arr&&res.data.content_arr.length > 0) res.data.content = res.data.content_arr; let editGoodsDetils = res.data; Object.keys(this.setFormData).forEach(item => { this.setFormData[item] = editGoodsDetils[item]; diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue index 3496cb9..dcbb740 100644 --- a/pages/product/addGoods/index.vue +++ b/pages/product/addGoods/index.vue @@ -596,7 +596,7 @@ } productDetail(this.merId, this.product_id).then(res => { setStorage('editGoodsDetils', res.data); - if(res.data.content_arr.length>0) res.data.content = res.data.content_arr; + if(res.data.content_arr&&res.data.content_arr.length>0) res.data.content = res.data.content_arr; if(typeof res.data.content == 'string')res.data.content = JSON.parse(res.data.content); this.$store.commit('setStorage', res.data); let editGoodsDetils = res.data; diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 104229e..f2e10db 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -519,56 +519,16 @@ }, //线下 Fline(item) { - this.checkboxList1 = item.attrValue - // console.log(this.checkboxList1.length) - if (this.checkboxList1.length>0){ - navigateTo(1, '/pages/product/updateStock/updateStock', { - product_id: item.product_id - }) - uni.$once('updateStock', (e)=>{ - this.productList.forEach(p=>{ - if(e.product_id==p.product_id){ - p.stock = e.stock; - } - }) - }) - } else if (this.checkboxList1.length > 0) { - uni.showLoading({ - title: '加载中' - }) - getPreviewProDetail({ - id: item.product_id - }).then(res=>{ - uni.hideLoading(); - let att = res.data.attr.map(e=>{ - return { - value: e.attr_name, - detail: e.attr_values - } - }) - this.data.attr = att; - this.data.product_id = this.checkboxList1[0].product_id - this.data.unique = this.checkboxList1[0].unique - this.data.number = this.checkboxList1[0].stock - this.data.spec_type = item.spec_type - this.data.item = item - this.on_line = 1 - this.show = true; - }).catch((e)=>{ - uni.hideLoading(); - uni.showToast({ - title: e.msg||e.message||e - }) - this.show = false; - }) - } else { - this.show = false - navigateTo(1, '/pages/users/online_warehousing/index', { - mer_id: this.mer_id, - product_id: this.data.product_id, - unique: this.data.unique, - }); - } + navigateTo(1, '/pages/product/updateStock/updateStock', { + product_id: item.product_id + }) + uni.$once('updateStock', (e)=>{ + this.productList.forEach(p=>{ + if(e.product_id==p.product_id){ + p.stock = e.stock; + } + }) + }) }, //导入 creat() {