diff --git a/config/app.js b/config/app.js index dea5d28..313fd1e 100644 --- a/config/app.js +++ b/config/app.js @@ -3,9 +3,9 @@ let WSS_URL import store from "@/store/user.js" // 环境 // let env = "dev" -// let env = "prod" +let env = "prod" // let env = "release"; -let env = "local"; +// let env = "local"; switch (env) { case 'dev': @@ -17,7 +17,7 @@ switch (env) { WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; case 'local': - BASE_URL = 'http://192.168.1.22:8545'; + BASE_URL = 'http://192.168.1.7:8545'; WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; default: diff --git a/pageQuota/purchase_product_offer/index.vue b/pageQuota/purchase_product_offer/index.vue index d9023f0..b60511f 100644 --- a/pageQuota/purchase_product_offer/index.vue +++ b/pageQuota/purchase_product_offer/index.vue @@ -51,7 +51,9 @@ - + @@ -59,13 +61,19 @@ - + + + + + + { + columns.value[0].forEach(e => { + if (e['name_b'] == item['category_name']) { + pickerText.value = e['name'] + picker_price.value = e['value'] + } + }) show.value = true formData.value.store_name = item['store_name'] formData.value.id = item['id'] formData.value.nums = item['need_num'] formData.value.product_id = item['product_id'] + formData.value.unit_name = item['unit_name'] } const offerUpdate = () => { purchaseProductOfferUpdate(formData.value).then(res => { @@ -147,7 +167,11 @@ } const changeInputPrice = (e) => { if (formData.value.nums > 0 && formData.value.price > 0) { - formData.value.total_price = formData.value.nums * formData.value.price + formData.value.total_price = (formData.value.nums * formData.value.price).toFixed(2) + if (picker_price.value > 0) { + let outbound_price = (formData.value.price * picker_price.value) + formData.value.outbound_price = (parseInt(formData.value.price) + outbound_price).toFixed(2) + } } } const sectionChange = (index) => { @@ -158,7 +182,7 @@ const pickerConfirm = (e) => { pickerShow.value = false let outbound_price = (formData.value.price * e.value[0].value) - pickerText.value=e.value[0].name + pickerText.value = e.value[0].name formData.value.outbound_price = (parseInt(formData.value.price) + outbound_price).toFixed(2) } const OutboundFloatingLv = () => { @@ -166,6 +190,13 @@ columns.value = res.data }) } + const radioChange=(e)=>{ + if(e=='赊账'){ + formData.pay_type=1 + }else{ + formData.pay_type=2 + } + } getGoodsList() OutboundFloatingLv()