diff --git a/config/appConfig.js b/config/appConfig.js index 7457d1e..6ea43e1 100644 --- a/config/appConfig.js +++ b/config/appConfig.js @@ -1,5 +1,5 @@ //当前环境 test,prod -export const ENV = 'test' +export const ENV = 'prod' export const ENV_BASE_URL = { java: { prod: 'https://cashier.sxczgkj.com/', @@ -15,6 +15,7 @@ export const ENV_BASE_URL = { } } + /** * @param {String} env 环境,测试或者正式 * @param {String} apiType 语言,java或者php diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue index db8eaed..61f7156 100644 --- a/pagesCreateOrder/index/components/car.vue +++ b/pagesCreateOrder/index/components/car.vue @@ -41,7 +41,7 @@ :key="index" > - {{ item.name }} + {{ item.name }} {{ item.specInfo || "" }} @@ -62,7 +62,7 @@ mode="" /> - + {{ item.number.toFixed(2) }} @@ -328,7 +328,11 @@ function setModalShow(key = "show", show = true, type = "", title = "") { console.log(modal); } -const edmits = defineEmits(["clear", "updateNumber"]); +const edmits = defineEmits(["clear", "updateNumber","changeNumber"]); + +function changeNumber(goods){ + edmits('changeNumber',goods) +} // mask let switchGoods = ref(false); diff --git a/pagesCreateOrder/index/components/list-goods-item.vue b/pagesCreateOrder/index/components/list-goods-item.vue index 4f82604..41c09ad 100644 --- a/pagesCreateOrder/index/components/list-goods-item.vue +++ b/pagesCreateOrder/index/components/list-goods-item.vue @@ -1,345 +1,309 @@ + + \ No newline at end of file diff --git a/pagesCreateOrder/index/components/popup-change-number.vue b/pagesCreateOrder/index/components/popup-change-number.vue new file mode 100644 index 0000000..a94f575 --- /dev/null +++ b/pagesCreateOrder/index/components/popup-change-number.vue @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index 981de4a..0a49679 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -79,9 +79,9 @@ @@ -96,6 +96,7 @@ @@ -112,6 +113,9 @@ 历史订单 {{ data.historyOrderNum }} + + +