diff --git a/src/components/storemanager/create-store.vue b/src/components/storemanager/create-store.vue index 93bcf11..4f40ad3 100644 --- a/src/components/storemanager/create-store.vue +++ b/src/components/storemanager/create-store.vue @@ -127,11 +127,18 @@ - + + + + + + 单位:元 + + @@ -858,6 +865,7 @@ export default { packageSwitch: 1, // 允许物料购买 0允许 1禁用 deliverySelf:0, // 是否允许自提 默认不允许 freightMarkup: 0, // 三方运单的配送费 + quotationPrice:0, // 报价金额 单位:元 cityCode: null, // 510100, districtCode: null, // 510105, lat: null, // 30.657349, @@ -1561,8 +1569,8 @@ export default { this.storeInfo.deliverySelf = 0 let json = JSON.parse(JSON.stringify(this.storeInfo)) if (json.hasOwnProperty('idExpire') && !json.idExpire) json.idExpire = '' - if (json.hasOwnProperty('licenceExpire') && !json.licenceExpire) - json.licenceExpire = '' + if (json.hasOwnProperty('licenceExpire') && !json.licenceExpire) json.licenceExpire = '' + if (json.hasOwnProperty('quotationPrice') && !json.quotationPrice) json.quotationPrice = json.quotationPrice * 100 createStore(json, async (res) => { // 由于后端未对创建门店接口进行优化,只能先这样做了 diff --git a/src/components/storemanager/jx-store-manager.vue b/src/components/storemanager/jx-store-manager.vue index 6ae503d..79edf4f 100644 --- a/src/components/storemanager/jx-store-manager.vue +++ b/src/components/storemanager/jx-store-manager.vue @@ -2077,7 +2077,10 @@ export default { store.deliveryRange2 = [] } } - this.storeItem = store + this.storeItem = { + ...store, + quotationPrice:store.quotationPrice / 100 + } console.log('修改门店信息',store) this.modifyStoreShow = true }, diff --git a/src/components/storemanager/modify-store.vue b/src/components/storemanager/modify-store.vue index 8fde27e..ef27ddd 100644 --- a/src/components/storemanager/modify-store.vue +++ b/src/components/storemanager/modify-store.vue @@ -104,6 +104,14 @@ + + + + + + + 单位:元 + - + + + + + + + + + + + + {{ '范围:' + item.time_range + ',最低价:' + item.min_price + ',运费:' + item.shipping_fee }} + + + + + + + {{ scope.row.promotion_fee === '暂无法获取' ? '' : scope.row.promotion_fee}} + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/pages/indexpage/indexPage3.vue b/src/pages/indexpage/indexPage3.vue index 4cbc07e..f91c491 100644 --- a/src/pages/indexpage/indexPage3.vue +++ b/src/pages/indexpage/indexPage3.vue @@ -513,6 +513,9 @@ --> + + + @@ -601,6 +604,7 @@ import { getBrands } from '@/apis/controls/brand.js' import jxTimePick from '@/components/cmp/timePick' import jxSelectPick from '@/components/cmp/selectPick' import staticInfo from './cmp/staticInfo' +import mtStoreInfo from './cmp/mtStoreInfo' import storeOrderRank from './cmp/storeOrderRank.vue' import { mapGetters } from 'vuex' import { APIGetInvoiceRecord,APIUploadOrderInvoice } from '@/apis/APIOrder' @@ -614,6 +618,7 @@ export default { jxTimePick, jxSelectPick, staticInfo, + mtStoreInfo, CMPWaybillInfo, storeOrderRank, ChatDetail,