From c6baaf755559c71ddcb5a33f889a68b2dcfb4aa0 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 19 Mar 2024 18:15:20 +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/addcartWindow/index.vue | 2 +- components/shortPopup.vue | 6 +++--- main.js | 4 ++-- pages/activeCode/subsidy.vue | 18 ++++++++++++------ pages/admin/delivery/indexOther.vue | 4 ++-- pages/admin/orderDetail/indexOther.vue | 2 +- pages/admin/orderList/indexOther.vue | 2 +- pages/nongKe/cloud_entrepot/indexOther.vue | 14 +++++++------- pages/nongKe/cloud_entrepot/indexb.vue | 14 +++++++------- pages/nongKe/supply_chain/merchant.vue | 2 +- pages/nongKe/supply_chain/shopping_trolley.vue | 18 +++++++++--------- .../nongKe/supply_chain/shopping_trolley_a.vue | 18 +++++++++--------- .../supply_chain/shopping_trolley_other.vue | 18 +++++++++--------- pages/order_details/indexOther.vue | 4 ++-- pages/product/addGood/addGood.vue | 4 ++-- pages/product/addGood/addGood_one.vue | 4 ++-- pages/product/addGood/addGood_supply.vue | 4 ++-- pages/product/addGood/components/price.vue | 6 +++--- pages/product/addGood/components/price_one.vue | 4 ++-- .../addGood/components/price_supply.vue | 10 +++++----- pages/product/addGood/specGood.vue | 3 ++- pages/product/addGoods/price.vue | 4 ++-- pages/product/addGoods/secound.vue | 2 +- pages/product/goodsOnSale/index.vue | 2 +- pages/product/list/index.vue | 2 +- pages/releaseManagement/index.vue | 2 +- pages/users/order_list/indexOther.vue | 4 ++-- 27 files changed, 92 insertions(+), 85 deletions(-) diff --git a/components/addcartWindow/index.vue b/components/addcartWindow/index.vue index 0c69494..ea7e509 100644 --- a/components/addcartWindow/index.vue +++ b/components/addcartWindow/index.vue @@ -21,7 +21,7 @@ - ￥{{ attr.productSelect.procure_price }} + ￥{{ attr.productSelect.wholesale_price }} ￥{{attr.productSelect.svip_price}} diff --git a/components/shortPopup.vue b/components/shortPopup.vue index 1aa138a..5402c35 100644 --- a/components/shortPopup.vue +++ b/components/shortPopup.vue @@ -119,10 +119,10 @@ }, computed:{ leftPrice(){ - return this.sku[this.changeSkuKey]?.procure_price?.split('.')[0]||'0'; + return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[0]||'0'; }, rightPrice(){ - return this.sku[this.changeSkuKey]?.procure_price?.split('.')[1]||'00'; + return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[1]||'00'; } }, methods: { @@ -247,7 +247,7 @@ // return console.log(this.sku[this.changeSkuKey]); if(this.cart_num this.sku[this.changeSkuKey].stock) return uni.showToast({ icon: 'none', diff --git a/main.js b/main.js index da5792a..9179550 100644 --- a/main.js +++ b/main.js @@ -25,10 +25,10 @@ Vue.component('BaseMoney', BaseMoney) Vue.component('barcode', barcode) Vue.prototype.$util = util; Vue.prototype.$Cache = Cache; -Vue.prototype.$procure_price = (item)=>{ +Vue.prototype.$wholesale_price = (item)=>{ if(item.sku){ let key = Object.keys(item.sku)||['']; - return item.sku[key[0]]?.procure_price; + return item.sku[key[0]]?.wholesale_price; } else return '无批发价'; } diff --git a/pages/activeCode/subsidy.vue b/pages/activeCode/subsidy.vue index 534af99..092230b 100644 --- a/pages/activeCode/subsidy.vue +++ b/pages/activeCode/subsidy.vue @@ -17,8 +17,8 @@ {{info.subsidy_amount}}元 - 已到账 - 未激活 + {{info.subsidy_status_name}} + {{info.subsidy_status_name}} @@ -108,13 +108,14 @@ 状态 - ￥{{ item.extra.purchase_amount }} - ￥{{ item.extra.sale_amount }} + ￥{{ cPrice2(item.extra.official_purchase_target, item.extra.purchase_target) }} + ￥{{ item.extra.sale_target }} ￥{{ cPrice(item.coupon_price) }} ￥{{ item.coupon_price }} - 未激活 - 已到账 + + {{item.send_status_cn}} + {{item.send_status_cn}} @@ -182,6 +183,11 @@ t/=3*100; t==0?t=1:null; return (+n*t).toFixed(2); + }, + cPrice2(a,b){ + a = Number(a); + b = Number(b); + return (a+b).toFixed(2) } }, onPullDownRefresh() { diff --git a/pages/admin/delivery/indexOther.vue b/pages/admin/delivery/indexOther.vue index 7423dca..4000f50 100644 --- a/pages/admin/delivery/indexOther.vue +++ b/pages/admin/delivery/indexOther.vue @@ -137,7 +137,7 @@ {{item.cart_info.product.store_name}} {{item.cart_info.productAttr.sku}} - ￥{{item.cart_info.productAttr.procure_price}} + ￥{{item.cart_info.productAttr.wholesale_price}} - {{item.split_num}} @@ -161,7 +161,7 @@ {{item.cart_info.productAttr.sku}} - ￥{{item.cart_info.productAttr.procure_price}} + ￥{{item.cart_info.productAttr.wholesale_price}} x{{item.product_num}} {{item.product_num-item.refund_num}}件{{item.is_refund==1?'退款中' : item.is_refund==2 ? '已退款' : item.is_refund==3?'全部退款':''}} diff --git a/pages/admin/orderDetail/indexOther.vue b/pages/admin/orderDetail/indexOther.vue index 0747029..0427900 100644 --- a/pages/admin/orderDetail/indexOther.vue +++ b/pages/admin/orderDetail/indexOther.vue @@ -51,7 +51,7 @@ - ￥{{ item.cart_info.productAttr.procure_price }} + ￥{{ item.cart_info.productAttr.wholesale_price }} x{{ item.product_num }} (-{{item.product_num-item.refund_num}}) diff --git a/pages/admin/orderList/indexOther.vue b/pages/admin/orderList/indexOther.vue index 828c327..b74dc75 100644 --- a/pages/admin/orderList/indexOther.vue +++ b/pages/admin/orderList/indexOther.vue @@ -125,7 +125,7 @@ - ￥{{ val.cart_info.productAttr.procure_price }} + ￥{{ val.cart_info.productAttr.wholesale_price }} x{{ val.product_num }} diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue index 823548a..2ea9cef 100644 --- a/pages/nongKe/cloud_entrepot/indexOther.vue +++ b/pages/nongKe/cloud_entrepot/indexOther.vue @@ -78,8 +78,8 @@ 销量 @@ -104,7 +104,7 @@ {{item.unit_name}} - ￥{{ getAttr(item).procure_price.split('.')[0] }}.{{getAttr(item).procure_price.split('.')[1]}} + ￥{{ getAttr(item).wholesale_price.split('.')[0] }}.{{getAttr(item).wholesale_price.split('.')[1]}} @@ -254,7 +254,7 @@ street: "", showPicker: false, status: "loadmore", - price_order: 'procure_price_asc', //价格排序方式(升降), procure_price_asc, procure_price_desc + price_order: 'wholesale_price_asc', //价格排序方式(升降), wholesale_price_asc, wholesale_price_desc // 下拉菜单 downMenu: [{ title: '默认', @@ -685,8 +685,8 @@ // this.storeParam.order = 'location' //使用距离进行排序 this.storeParam.order = e //选择排序方式 this.getStoreList(); - if(e=='procure_price_asc') return this.price_order = 'procure_price_desc'; - if(e=='procure_price_desc') return this.price_order = 'procure_price_asc'; + if(e=='wholesale_price_asc') return this.price_order = 'wholesale_price_desc'; + if(e=='wholesale_price_desc') return this.price_order = 'wholesale_price_asc'; }, backjJump() { uni.navigateBack({ @@ -785,7 +785,7 @@ this.cartList = res.data.list this.cartList.forEach(e => { e.list.forEach(item => { - this.totalMoney += item.cart_num * item.productAttr.procure_price + this.totalMoney += item.cart_num * item.productAttr.wholesale_price }) }) this.totalMoney = this.totalMoney.toFixed(2) diff --git a/pages/nongKe/cloud_entrepot/indexb.vue b/pages/nongKe/cloud_entrepot/indexb.vue index 1b62a47..dc4dae5 100644 --- a/pages/nongKe/cloud_entrepot/indexb.vue +++ b/pages/nongKe/cloud_entrepot/indexb.vue @@ -78,8 +78,8 @@ 销量 @@ -104,7 +104,7 @@ {{item.unit_name}} - ￥{{ getAttr(item).procure_price.split('.')[0] }}.{{getAttr(item).procure_price.split('.')[1]}} + ￥{{ getAttr(item).wholesale_price.split('.')[0] }}.{{getAttr(item).wholesale_price.split('.')[1]}} @@ -253,7 +253,7 @@ street: "", showPicker: false, status: "loadmore", - price_order: 'procure_price_asc', //价格排序方式(升降), procure_price_asc, procure_price_desc + price_order: 'wholesale_price_asc', //价格排序方式(升降), wholesale_price_asc, wholesale_price_desc // 下拉菜单 downMenu: [{ title: '默认', @@ -681,8 +681,8 @@ // this.storeParam.order = 'location' //使用距离进行排序 this.storeParam.order = e //选择排序方式 this.getStoreList(); - if(e=='procure_price_asc') return this.price_order = 'procure_price_desc'; - if(e=='procure_price_desc') return this.price_order = 'procure_price_asc'; + if(e=='wholesale_price_asc') return this.price_order = 'wholesale_price_desc'; + if(e=='wholesale_price_desc') return this.price_order = 'wholesale_price_asc'; }, backjJump() { uni.navigateBack({ @@ -780,7 +780,7 @@ this.cartList = res.data.list this.cartList.forEach(e => { e.list.forEach(item => { - this.totalMoney += item.cart_num * item.productAttr.procure_price + this.totalMoney += item.cart_num * item.productAttr.wholesale_price }) }) this.totalMoney = this.totalMoney.toFixed(2) diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue index 2556be0..4dab124 100644 --- a/pages/nongKe/supply_chain/merchant.vue +++ b/pages/nongKe/supply_chain/merchant.vue @@ -33,7 +33,7 @@ ¥ - {{$procure_price(item)}} + {{$wholesale_price(item)}} diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue index 6ff590c..3098a0f 100644 --- a/pages/nongKe/supply_chain/shopping_trolley.vue +++ b/pages/nongKe/supply_chain/shopping_trolley.vue @@ -58,7 +58,7 @@ v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件 - ￥{{goods.productAttr.procure_price}} + ￥{{goods.productAttr.wholesale_price}} @@ -238,7 +238,7 @@ cartAttr: false, productAttr: [], productSelect: { - procure_price: '' + wholesale_price: '' } }, isOpen: false, //是否打开属性组件 @@ -428,7 +428,7 @@ this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods.product .image); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); @@ -448,7 +448,7 @@ ); this.$set(this.attr.productSelect, "image", goods.product.image); this.$set(this.attr.productSelect, "price", goods.product.price); - this.$set(this.attr.productSelect, "procure_price", goods.product.price); + this.$set(this.attr.productSelect, "wholesale_price", goods.product.price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); @@ -464,7 +464,7 @@ ); this.$set(this.attr.productSelect, "image", goods.product.image); this.$set(this.attr.productSelect, "price", goods.product.price); - this.$set(this.attr.productSelect, "procure_price", goods.product.price); + this.$set(this.attr.productSelect, "wholesale_price", goods.product.price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", goods.product.stock); this.$set(this.attr.productSelect, "unique", goods.product.unique || ""); @@ -476,7 +476,7 @@ this.$set(this.attr.productSelect, "store_name", goods.product.store_name); this.$set(this.attr.productSelect, "image", productSelect.image); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); @@ -551,7 +551,7 @@ if (productSelect && productSelect.stock > 0) { this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this, "uniqueValue", productSelect.unique); @@ -560,7 +560,7 @@ } else { this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); @@ -849,7 +849,7 @@ // 总金额 //总数 el.list.forEach(e => { if (e.check) { - totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.procure_price, e.cart_num)) + totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.wholesale_price, e.cart_num)) totalNum += +e.cart_num } }) diff --git a/pages/nongKe/supply_chain/shopping_trolley_a.vue b/pages/nongKe/supply_chain/shopping_trolley_a.vue index c02a6be..790b908 100644 --- a/pages/nongKe/supply_chain/shopping_trolley_a.vue +++ b/pages/nongKe/supply_chain/shopping_trolley_a.vue @@ -52,7 +52,7 @@ v-if="goods.product.once_max_count>0">，最多{{goods.product.once_max_count}}件 - ￥{{goods.productAttr.procure_price}} + ￥{{goods.productAttr.wholesale_price}} @@ -232,7 +232,7 @@ cartAttr: false, productAttr: [], productSelect: { - procure_price: '' + wholesale_price: '' } }, isOpen: false, //是否打开属性组件 @@ -422,7 +422,7 @@ this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods.product .image); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); @@ -442,7 +442,7 @@ ); this.$set(this.attr.productSelect, "image", goods.product.image); this.$set(this.attr.productSelect, "price", goods.product.price); - this.$set(this.attr.productSelect, "procure_price", goods.product.price); + this.$set(this.attr.productSelect, "wholesale_price", goods.product.price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); @@ -458,7 +458,7 @@ ); this.$set(this.attr.productSelect, "image", goods.product.image); this.$set(this.attr.productSelect, "price", goods.product.price); - this.$set(this.attr.productSelect, "procure_price", goods.product.price); + this.$set(this.attr.productSelect, "wholesale_price", goods.product.price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", goods.product.stock); this.$set(this.attr.productSelect, "unique", goods.product.unique || ""); @@ -470,7 +470,7 @@ this.$set(this.attr.productSelect, "store_name", goods.product.store_name); this.$set(this.attr.productSelect, "image", productSelect.image); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); @@ -545,7 +545,7 @@ if (productSelect && productSelect.stock > 0) { this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this, "uniqueValue", productSelect.unique); @@ -554,7 +554,7 @@ } else { this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); @@ -836,7 +836,7 @@ // 总金额 //总数 el.list.forEach(e => { if (e.check) { - totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.procure_price, e.cart_num)) + totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.wholesale_price, e.cart_num)) totalNum += +e.cart_num } }) diff --git a/pages/nongKe/supply_chain/shopping_trolley_other.vue b/pages/nongKe/supply_chain/shopping_trolley_other.vue index 7df678f..de5f2a4 100644 --- a/pages/nongKe/supply_chain/shopping_trolley_other.vue +++ b/pages/nongKe/supply_chain/shopping_trolley_other.vue @@ -52,7 +52,7 @@ v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件 - ￥{{goods.productAttr.procure_price}} + ￥{{goods.productAttr.wholesale_price}} @@ -232,7 +232,7 @@ cartAttr: false, productAttr: [], productSelect: { - procure_price: '' + wholesale_price: '' } }, isOpen: false, //是否打开属性组件 @@ -424,7 +424,7 @@ this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods.product .image); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); @@ -444,7 +444,7 @@ ); this.$set(this.attr.productSelect, "image", goods.product.image); this.$set(this.attr.productSelect, "price", goods.product.price); - this.$set(this.attr.productSelect, "procure_price", goods.product.price); + this.$set(this.attr.productSelect, "wholesale_price", goods.product.price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); @@ -460,7 +460,7 @@ ); this.$set(this.attr.productSelect, "image", goods.product.image); this.$set(this.attr.productSelect, "price", goods.product.price); - this.$set(this.attr.productSelect, "procure_price", goods.product.price); + this.$set(this.attr.productSelect, "wholesale_price", goods.product.price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", goods.product.stock); this.$set(this.attr.productSelect, "unique", goods.product.unique || ""); @@ -472,7 +472,7 @@ this.$set(this.attr.productSelect, "store_name", goods.product.store_name); this.$set(this.attr.productSelect, "image", productSelect.image); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); @@ -547,7 +547,7 @@ if (productSelect && productSelect.stock > 0) { this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this, "uniqueValue", productSelect.unique); @@ -556,7 +556,7 @@ } else { this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage); this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price); + this.$set(this.attr.productSelect, "wholesale_price", productSelect.wholesale_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); @@ -844,7 +844,7 @@ // 总金额 //总数 el.list.forEach(e => { if (e.check) { - totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.procure_price, e.cart_num)) + totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.wholesale_price, e.cart_num)) totalNum += +e.cart_num } }) diff --git a/pages/order_details/indexOther.vue b/pages/order_details/indexOther.vue index 25e2541..bca1725 100644 --- a/pages/order_details/indexOther.vue +++ b/pages/order_details/indexOther.vue @@ -933,8 +933,8 @@ }); getOtherOrderDetail(that.order_id).then(res => { uni.hideLoading(); - res.data.orderProduct[0].cart_info.productAttr.price = res.data.orderProduct[0].cart_info.productAttr.procure_price; - res.data.orderProduct[0].cart_info.product.price = res.data.orderProduct[0].cart_info.productAttr.procure_price; + res.data.orderProduct[0].cart_info.productAttr.price = res.data.orderProduct[0].cart_info.productAttr.wholesale_price; + res.data.orderProduct[0].cart_info.product.price = res.data.orderProduct[0].cart_info.productAttr.wholesale_price; that.$set(that, 'orderInfo', res.data); that.orderInfo.take = res.data.take; that.$set(that, 'cartInfo', res.data.orderProduct); diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue index f045471..abd45d8 100644 --- a/pages/product/addGood/addGood.vue +++ b/pages/product/addGood/addGood.vue @@ -346,7 +346,7 @@ // "cost": "1", // "stock": "11", // "ot_price": "", - // "procure_price": "", + // "wholesale_price": "", // "bar_code": "666", // "weight": "10", // "volume": "5", @@ -636,7 +636,7 @@ if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo); let showFlag = ''; postData.attrValue.forEach(t => { - if (userInfo?.mer_info?.type_code == "TypeSupplyChain" && (!t.procure_price || +t.procure_price <= 0)) { + if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) { showFlag = '批发价不能小于0' } if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0'; diff --git a/pages/product/addGood/addGood_one.vue b/pages/product/addGood/addGood_one.vue index 7d51360..940b964 100644 --- a/pages/product/addGood/addGood_one.vue +++ b/pages/product/addGood/addGood_one.vue @@ -346,7 +346,7 @@ // "cost": "1", // "stock": "11", // "ot_price": "", - // "procure_price": "", + // "wholesale_price": "", // "bar_code": "666", // "weight": "10", // "volume": "5", @@ -636,7 +636,7 @@ if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo); let showFlag = ''; postData.attrValue.forEach(t => { - if (userInfo?.mer_info?.type_code == "TypeSupplyChain" && (!t.procure_price || +t.procure_price <= 0)) { + if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) { showFlag = '批发价不能小于0' } if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0'; diff --git a/pages/product/addGood/addGood_supply.vue b/pages/product/addGood/addGood_supply.vue index 77ff0cd..ac71e52 100644 --- a/pages/product/addGood/addGood_supply.vue +++ b/pages/product/addGood/addGood_supply.vue @@ -365,7 +365,7 @@ // "cost": "1", // "stock": "11", // "ot_price": "", - // "procure_price": "", + // "wholesale_price": "", // "bar_code": "666", // "weight": "10", // "volume": "5", @@ -683,7 +683,7 @@ if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo); let showFlag = ''; postData.attrValue.forEach(t => { - if (userInfo?.mer_info?.type_code == "TypeSupplyChain" && (!t.procure_price || +t.procure_price <= 0)) { + if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) { showFlag = '结算价不能小于0' } if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0'; diff --git a/pages/product/addGood/components/price.vue b/pages/product/addGood/components/price.vue index ed831e0..b37ffa8 100644 --- a/pages/product/addGood/components/price.vue +++ b/pages/product/addGood/components/price.vue @@ -31,7 +31,7 @@ cost: '', // 成本价 stock: '', // 库存 ot_price: '', // 市场价 - procure_price: '', // 批发价 + wholesale_price: '', // 批发价 bar_code: '', // 商品条码 weight: '', // 重量 volume: '', // 体积 @@ -129,13 +129,13 @@ let userInfo = this.$store.state.app.userInfo; if(typeof userInfo == 'string') userInfo = JSON.parse(userInfo); // 市级供应链才需填写批发价 - if(userInfo.mer_info?.type_code=="TypeSupplyChain"){ + if(userInfo.mer_info?.wholesale){ this.formList.unshift({ id: 3, label: '批发价', type: 'digit', holder: '请填写批发价', - model: 'procure_price', + model: 'wholesale_price', require: true, }) } diff --git a/pages/product/addGood/components/price_one.vue b/pages/product/addGood/components/price_one.vue index ec9013b..b05590a 100644 --- a/pages/product/addGood/components/price_one.vue +++ b/pages/product/addGood/components/price_one.vue @@ -31,7 +31,7 @@ cost: '', // 成本价 stock: '', // 库存 ot_price: '', // 市场价 - procure_price: '', // 批发价 + wholesale_price: '', // 批发价 bar_code: '', // 商品条码 weight: '', // 重量 volume: '', // 体积 @@ -137,7 +137,7 @@ label: '批发价', type: 'digit', holder: '请填写批发价', - model: 'procure_price', + model: 'wholesale_price', require: true, }) } diff --git a/pages/product/addGood/components/price_supply.vue b/pages/product/addGood/components/price_supply.vue index 11b196d..4b097f5 100644 --- a/pages/product/addGood/components/price_supply.vue +++ b/pages/product/addGood/components/price_supply.vue @@ -34,7 +34,7 @@ cost: '', // 成本价 stock: '', // 库存 ot_price: '', // 市场价 - procure_price: '', // 结算价 + wholesale_price: '', // 批发价 bar_code: '', // 商品条码 weight: '', // 重量 volume: '', // 体积 @@ -61,10 +61,10 @@ require: true, },{ id: 3, - label: '结算价', + label: '批发价', type: 'digit', - holder: '请填写结算价', - model: 'procure_price', + holder: '请填写批发价', + model: 'wholesale_price', require: true, }, { id: 10, @@ -155,7 +155,7 @@ let userInfo = this.$store.state.app.userInfo; if(typeof userInfo == 'string') userInfo = JSON.parse(userInfo); - // 市级供应链才需填写结算价 + // 市级供应链才需填写批发价 // if(userInfo.mer_info?.type_code=="TypeSupplyChain"){ // let list = [] // this.formList = [...list, ...this.formList] diff --git a/pages/product/addGood/specGood.vue b/pages/product/addGood/specGood.vue index 286d1ce..eda0539 100644 --- a/pages/product/addGood/specGood.vue +++ b/pages/product/addGood/specGood.vue @@ -138,6 +138,7 @@ "cost": "", "ot_price": "", "price": "", + "wholesale_price": "", "volume": "", "weight": "", }, @@ -420,7 +421,7 @@ // flag = false; // str = '成本价不能小于等于0'; // } - else if ((!item.procure_price||+item.procure_price<=0) && this.userInfo.mer_info.type_code == 'TypeSupplyChain') { + else if ((!item.wholesale_price||+item.wholesale_price<=0) && this.userInfo.mer_info.wholesale) { flag = false; str = '批发价不能小于等于0'; } diff --git a/pages/product/addGoods/price.vue b/pages/product/addGoods/price.vue index db5053b..502895b 100644 --- a/pages/product/addGoods/price.vue +++ b/pages/product/addGoods/price.vue @@ -30,7 +30,7 @@ cost: '', // 成本价 stock: '', // 库存 ot_price: '', // 市场价 - procure_price: '', // 批发价 + wholesale_price: '', // 批发价 bar_code: '', // 商品条码 weight: '', // 重量 volume: '', // 体积 @@ -159,7 +159,7 @@ label: '批发价', type: 'digit', holder: '请填写批发价', - model: 'procure_price', + model: 'wholesale_price', require: true, }) } diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue index 3ecde5a..d5ee7ee 100644 --- a/pages/product/addGoods/secound.vue +++ b/pages/product/addGoods/secound.vue @@ -271,7 +271,7 @@ if(!postData.unit_name||postData.unit_name?.trim().length<=0)return Toast('请输入商品单位'); let userInfo = this.$store.state.app.userInfo; if(typeof userInfo == 'string')userInfo= JSON.parse(userInfo); - if(userInfo?.mer_info?.type_code=="TypeSupplyChain" && (!postData.attrValue[0]?.procure_price||postData.attrValue[0]?.procure_price<=0) )return Toast('批发价不能小于0'); + if(userInfo?.mer_info?.type_code=="TypeSupplyChain" && (!postData.attrValue[0]?.wholesale_price||postData.attrValue[0]?.wholesale_price<=0) )return Toast('批发价不能小于0'); if(!postData.attrValue[0]?.price||postData.attrValue[0]?.price<=0)return Toast('零售价不能小于0'); if(!postData.stock||postData.stock<0)return Toast('库存不能小于0'); // if(!postData.attrValue[0]?.cost||postData.attrValue[0]?.cost<=0)return Toast('成本价不能小于0'); diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue index 5caf0a9..4c92cc7 100644 --- a/pages/product/goodsOnSale/index.vue +++ b/pages/product/goodsOnSale/index.vue @@ -47,7 +47,7 @@ - ￥{{item.attrValue[0].procure_price}} + ￥{{item.attrValue[0].wholesale_price}} 零售价￥{{item.attrValue[0].price}} 商品规格错误 diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index f2e10db..bcc7684 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -122,7 +122,7 @@ - ￥{{item.attrValue[0].procure_price}} + ￥{{item.attrValue[0].wholesale_price}} 零售价￥{{item.attrValue[0].price}} 商品规格错误 diff --git a/pages/releaseManagement/index.vue b/pages/releaseManagement/index.vue index 4f26452..139d4ad 100644 --- a/pages/releaseManagement/index.vue +++ b/pages/releaseManagement/index.vue @@ -27,7 +27,7 @@ - 结算价:￥{{item.discount_price}} + 批发价:￥{{item.discount_price}} diff --git a/pages/users/order_list/indexOther.vue b/pages/users/order_list/indexOther.vue index a538929..d1fff49 100644 --- a/pages/users/order_list/indexOther.vue +++ b/pages/users/order_list/indexOther.vue @@ -134,7 +134,7 @@ x{{goods.product_num}} - ￥{{goods.cart_info.productAttr.procure_price}} + ￥{{goods.cart_info.productAttr.wholesale_price}} x{{goods.product_num}} @@ -239,7 +239,7 @@ x{{goods.product_num}} - ￥{{goods.cart_info.productAttr.procure_price}} + ￥{{goods.cart_info.productAttr.wholesale_price}} x{{goods.product_num}}