From 28d58bd38b1b1f79e0c192fb3c5abc03099fafe8 Mon Sep 17 00:00:00 2001 From: iuu <2167162990@qq.com> Date: Tue, 27 Jan 2026 19:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=9A=E9=80=89=E5=A5=97?= =?UTF-8?q?=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/orderAdd.vue | 429 ++++++++---------- .../mp-weixin/pages/index/orderAdd.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +- .../dev/mp-weixin/pages/index/orderAdd.js | 425 +++++++++-------- .../dev/mp-weixin/pages/index/orderAdd.wxml | 2 +- .../dev/mp-weixin/pages/index/orderAdd.wxss | 14 +- 6 files changed, 399 insertions(+), 475 deletions(-) diff --git a/pages/index/orderAdd.vue b/pages/index/orderAdd.vue index fe96cf8..e8db618 100644 --- a/pages/index/orderAdd.vue +++ b/pages/index/orderAdd.vue @@ -17,27 +17,17 @@ - - - - - - - - - - + \r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/index/orderAdd.vue'\nwx.createPage(MiniProgramPage)"],"names":["onLoad","uni","ref","fetchCombos","computed","reactive","onMounted","fetchGoods"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"orderAdd.js","sources":["pages/index/orderAdd.vue","pages/index/orderAdd.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/index/orderAdd.vue'\nwx.createPage(MiniProgramPage)"],"names":["onLoad","uni","ref","onMounted","fetchGoods","fetchCombos","computed","reactive"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2PCA,kBAAAA,OAAO,aAAW;AACjBC,oBAAA,MAAA,MAAA,OAAA,mCAAY,oBAAoB,OAAO;AACvC,WAAK,UAAU,QAAQ;AACvBA,oBAAY,MAAA,MAAA,OAAA,mCAAA,iBAAiB,IAAI;AAAA,IACnC,CAAE;AACD,UAAM,cAAcC,cAAG,IAAC,EAAE;AAC1B,UAAM,eAAeA,cAAG,IAAC,EAAE;AAC3BC,kBAAAA,UAAU,MAAM;AACfC,2BAAY,EAAC,KAAK,SAAO;AACxB,oBAAY,QAAQ;AAAA,MACvB,CAAG;AACDC,4BAAa,EAAC,KAAK,SAAO;AACzB,qBAAa,QAAQ;AAAA,MACxB,CAAG;AAAA,IACH,CAAE;AAMD,UAAM,4BAA4BH,kBAAI,KAAK;AAE3C,UAAM,sBAAsBA,cAAG,IAAC,EAAE;AAElC,UAAM,kBAAkB;AAAA,MAAC;AAAA,QACvB,OAAO;AAAA,QACP,OAAO;AAAA,MACP;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,OAAO;AAAA,MACP;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,OAAO;AAAA,MACP;AAAA,IACH;AAEC,UAAM,qBAAqB,CAAC,MAAM,QAAQ,OAAO;AAChD,0BAAoB,QAAQ;AAC5B,UAAI,SAAS,UAAU;AAEtB,uBAAe,QAAQ;AAAA,MAC1B,WAAa,SAAS,SAAS;AAE5B,sBAAc,QAAQ;AAAA,MACzB;AAAS;AAIP,gCAA0B,QAAQ;AAClCD,oBAAAA,sDAAY,IAAI;AAAA,IAChB;AAGD,UAAM,yBAAyB,CAAC,kBAAkB;AAEjD,UAAI,QAAQ,cAAc,gBAAgB,CAAC,EAAE;AAC7C,UAAI,QAAQ,cAAc,gBAAgB,CAAC,EAAE;AAC7C,UAAI,oBAAoB,SAAS,OAAO;AAEvC,aAAK,qBAAqB;AAC1B,aAAK,iBAAiB;AAAA,MACtB;AAED,UAAI,oBAAoB,SAAS,QAAQ;AAExC,aAAK,sBAAsB;AAC3B,aAAK,kBAAkB;AAAA,MACvB;AAED,UAAI,oBAAoB,SAAS,YAAY,eAAe,SAAS,GAAG;AAEvEA,sBAAA,MAAA,MAAA,OAAA,mCAAY,YAAY,eAAe,KAAK;AAC5C,oBAAY,MAAM,eAAe,KAAK,EAAE,uBAAuB;AAC/D,oBAAY,MAAM,eAAe,KAAK,EAAE,mBAAmB;AAAA,MAC3D;AACD,UAAI,oBAAoB,SAAS,WAAW,cAAc,SAAS,GAAG;AAErEA,sBAAA,MAAA,MAAA,OAAA,mCAAY,YAAY,cAAc,KAAK;AAC3C,mBAAW,MAAM,cAAc,KAAK,EAAE,uBAAuB;AAC7D,mBAAW,MAAM,cAAc,KAAK,EAAE,mBAAmB;AAAA,MACzD;AACDA,oBAAAA,sDAAY,IAAI;AAChB,gCAA0B,QAAQ;AAClC,0BAAoB,QAAQ;AAC5B,oBAAc,QAAQ;AACtB,qBAAe,QAAQ;AAAA,IACvB;AAID,UAAM,cAAcC,cAAG,IAAC,EAAE;AAC1B,UAAM,iBAAiBA,kBAAI,EAAE;AAC7B,UAAM,cAAcA,kBAAI,EAAE;AAC1B,UAAM,wBAAwBA,cAAG,IAAC,KAAK;AAEvC,UAAM,YAAY,MAAM;AACvBD,0EAAY,YAAY,KAAK;AAC7B,kBAAY,MAAM,KAAK;AAAA,QACtB,iBAAiB;AAAA,QACjB,eAAe;AAAA,QACf,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,aAAa;AAAA,QACb,kBAAkB;AAAA,QAClB,sBAAsB;AAAA,QACtB,cAAc,CAAE;AAAA,MACnB,CAAG;AAAA,IACD;AAED,UAAM,eAAe,CAAC,UAAU;AAC/B,kBAAY,MAAM,OAAO,OAAO,CAAC;AAAA,IACjC;AAED,UAAM,sBAAsBK,cAAAA,SAAS,MAAM;;AAC1C,UAAI,eAAe,CAAA;AACnB,UAAI,YAAY,SAAS,GAAG;AAC3B,iBAAO,iBAAY,MAAM,YAAY,KAAK,MAAnC,mBAAsC,iBAAgB,CAAE;AAAA,MAClE,OAAS;AACN,eAAO;AAAA,MACP;AAAA,IACH,CAAE;AAGD,UAAM,qBAAqB,CAAC,SAAS;AACpCL,oBAAA,MAAA,MAAA,OAAA,mCAAY,sBAAsB,IAAI;AACtCA,oBAAY,MAAA,MAAA,OAAA,mCAAA,eAAe,YAAY,KAAK;AAC5CA,0BAAY,MAAA,OAAA,mCAAA,wCAAwC,YAAY,MAAM,YAAY,KAAK,CAAC;AACxF,kBAAY,MAAM,YAAY,KAAK,EAAE,kBAAkB;AACvD,kBAAY,MAAM,YAAY,KAAK,EAAE,gBAAgB;AACrD,kBAAY,MAAM,YAAY,KAAK,EAAE,WAAW;AAChD,kBAAY,MAAM,YAAY,KAAK,EAAE,aAAa;AAClD,kBAAY,MAAM,YAAY,KAAK,EAAE,cAAc;AACnD,UAAI,KAAK,UAAU,KAAK,KAAK,CAAC,MAAM,MAAM;AACzC,oBAAY,MAAM,YAAY,KAAK,EAAE,kBAAkB,KAAK,CAAC,EAAE;AAC/D,oBAAY,MAAM,YAAY,KAAK,EAAE,gBAAgB,KAAK,CAAC,EAAE;AAAA,MAC7D;AACD,UAAI,KAAK,UAAU,KAAK,KAAK,CAAC,MAAM,MAAM;AACzC,oBAAY,MAAM,YAAY,KAAK,EAAE,aAAa,KAAK,CAAC,EAAE;AAC1D,oBAAY,MAAM,YAAY,KAAK,EAAE,WAAW,KAAK,CAAC,EAAE;AACxD,oBAAY,MAAM,YAAY,KAAK,EAAE,cAAc,KAAK,CAAC,EAAE;AAAA,MAC3D;AACDA,0BAAY,MAAA,OAAA,mCAAA,wCAAwC,YAAY,MAAM,YAAY,KAAK,CAAC;AAAA,IACxF;AAKD,UAAM,uBAAuB,MAAM;AAClCA,oBAAAA,MAAY,MAAA,OAAA,mCAAA,sBAAsB;AAClCA,oBAAY,MAAA,MAAA,OAAA,mCAAA,qBAAqB,YAAY,KAAK;AAAA,IAClD;AAED,UAAM,wBAAwB,MAAM;AACnCA,oBAAAA,MAAY,MAAA,OAAA,mCAAA,uBAAuB;AACnCA,oBAAY,MAAA,MAAA,OAAA,mCAAA,qBAAqB,YAAY,KAAK;AAClD,UAAI,YAAY,MAAM,YAAY,KAAK,EAAE,iBAAiB,YAAY,MAAM,YAAY,KAAK,EAAE,UAAU;AACxG,oBAAY,MAAM,YAAY,KAAK,EAAE,eAAe;AAAA,UACnD,YAAY,MAAM,YAAY,KAAK,EAAE;AAAA,UACrC,YAAY,MAAM,YAAY,KAAK,EAAE;AAAA,QACrC;AAAA,MACD;AACD,kBAAY,QAAQ;AACpBA,oBAAY,MAAA,MAAA,OAAA,mCAAA,qBAAqB,YAAY,KAAK;AAAA,IAClD;AAED,UAAM,iBAAiB,IAAI,SAAS;AACnCA,oBAAY,MAAA,MAAA,OAAA,mCAAA,kBAAkB,IAAI;AAAA,IAClC;AAMD,UAAM,aAAaC,cAAG,IAAC,EAAE;AACzB,UAAM,gBAAgBA,kBAAI,EAAE;AAC5B,UAAM,aAAaA,kBAAI,EAAE;AACzB,UAAM,uBAAuBA,cAAG,IAAC,KAAK;AAGtC,UAAM,WAAW,MAAM;AACtBD,0EAAY,WAAW,KAAK;AAC5B,iBAAW,MAAM,KAAK;AAAA,QACrB,iBAAiB;AAAA,QACjB,eAAe;AAAA,QACf,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,aAAa;AAAA,QACb,kBAAkB;AAAA,QAClB,sBAAsB;AAAA,QACtB,cAAc,CAAE;AAAA,MACnB,CAAG;AAAA,IACD;AAED,UAAM,cAAc,CAAC,UAAU;AAC9B,iBAAW,MAAM,OAAO,OAAO,CAAC;AAAA,IAChC;AAED,UAAM,qBAAqBK,cAAAA,SAAS,MAAM;;AACzC,UAAI,eAAe,CAAA;AACnB,UAAI,WAAW,SAAS,GAAG;AAC1B,iBAAO,gBAAW,MAAM,WAAW,KAAK,MAAjC,mBAAoC,iBAAgB,CAAE;AAAA,MAChE,OAAS;AACN,eAAO;AAAA,MACP;AAAA,IACH,CAAE;AACD,UAAM,gBAAgB,IAAI,SAAS;AAClCL,oBAAY,MAAA,MAAA,OAAA,mCAAA,iBAAiB,IAAI;AAAA,IACjC;AAED,UAAM,oBAAoB,CAAC,SAAS;AACnCA,oBAAA,MAAA,MAAA,OAAA,mCAAY,qBAAqB,IAAI;AACrCA,oBAAA,MAAA,MAAA,OAAA,mCAAY,cAAc,WAAW,KAAK;AAC1CA,0BAAY,MAAA,OAAA,mCAAA,sCAAsC,WAAW,MAAM,WAAW,KAAK,CAAC;AACpF,iBAAW,MAAM,WAAW,KAAK,EAAE,kBAAkB;AACrD,iBAAW,MAAM,WAAW,KAAK,EAAE,gBAAgB;AACnD,iBAAW,MAAM,WAAW,KAAK,EAAE,aAAa;AAChD,iBAAW,MAAM,WAAW,KAAK,EAAE,WAAW;AAC9C,iBAAW,MAAM,WAAW,KAAK,EAAE,cAAc;AACjD,UAAI,KAAK,UAAU,KAAK,KAAK,CAAC,MAAM,MAAM;AACzC,mBAAW,MAAM,WAAW,KAAK,EAAE,kBAAkB,KAAK,CAAC,EAAE;AAC7D,mBAAW,MAAM,WAAW,KAAK,EAAE,gBAAgB,KAAK,CAAC,EAAE;AAAA,MAC3D;AACD,UAAI,KAAK,UAAU,KAAK,KAAK,CAAC,MAAM,MAAM;AACzC,mBAAW,MAAM,WAAW,KAAK,EAAE,aAAa,KAAK,CAAC,EAAE;AACxD,mBAAW,MAAM,WAAW,KAAK,EAAE,WAAW,KAAK,CAAC,EAAE;AACtD,mBAAW,MAAM,WAAW,KAAK,EAAE,cAAc,KAAK,CAAC,EAAE;AAAA,MAEzD;AACDA,0BAAY,MAAA,OAAA,mCAAA,sCAAsC,WAAW,MAAM,WAAW,KAAK,CAAC;AAAA,IACpF;AACD,UAAM,uBAAuB,MAAM;AAClCA,oBAAAA,MAAY,MAAA,OAAA,mCAAA,sBAAsB;AAClCA,oBAAY,MAAA,MAAA,OAAA,mCAAA,oBAAoB,WAAW,KAAK;AAChD,UAAI,WAAW,MAAM,WAAW,KAAK,EAAE,iBAAiB,WAAW,MAAM,WAAW,KAAK,EAAE,UAAU;AACpG,mBAAW,MAAM,WAAW,KAAK,EAAE,eAAe;AAAA,UACjD,WAAW,MAAM,WAAW,KAAK,EAAE;AAAA,UACnC,WAAW,MAAM,WAAW,KAAK,EAAE;AAAA,QACnC;AAAA,MACD;AACD,iBAAW,QAAQ;AACnBA,oBAAY,MAAA,MAAA,OAAA,mCAAA,oBAAoB,WAAW,KAAK;AAAA,IAChD;AACD,UAAM,sBAAsB,MAAM;AACjCA,oBAAAA,MAAY,MAAA,OAAA,mCAAA,qBAAqB;AACjCA,oBAAY,MAAA,MAAA,OAAA,mCAAA,oBAAoB,WAAW,KAAK;AAAA,IAChD;AAKD,UAAM,OAAOM,cAAAA,SAAS;AAAA,MACrB,YAAY;AAAA;AAAA,MACZ,SAAS;AAAA;AAAA,MACT,UAAU;AAAA;AAAA,MAEV,YAAY;AAAA;AAAA,MACZ,gBAAgB;AAAA;AAAA,MAChB,oBAAoB;AAAA;AAAA,MAEpB,YAAY;AAAA;AAAA,MACZ,aAAa;AAAA;AAAA,MACb,iBAAiB;AAAA;AAAA,MACjB,qBAAqB;AAAA;AAAA,MAErB,iBAAiB;AAAA;AAAA,MACjB,SAAS;AAAA,IACX,CAAE;AAOD,UAAM,aAAa,MAAM;AACxB,UAAI,OAAO;AAAA,QACV,aAAa,WAAW;AAAA,QACxB,cAAc,YAAY;AAAA,QAC1B,OAAO;AAAA,MACP;AACDN,0EAAY,YAAY,IAAI;AAAA,IAkB9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACriBA,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 1b2b6a0..b10c571 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -7440,7 +7440,7 @@ function isConsoleWritable() { function initRuntimeSocketService() { const hosts = "127.0.0.1,192.168.31.5,198.18.0.1"; const port = "8090"; - const id = "mp-weixin_EY0X_V"; + const id = "mp-weixin_xGLqys"; const lazy = typeof swan !== "undefined"; let restoreError = lazy ? () => { } : initOnError(); diff --git a/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.js b/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.js index 9348f7f..f84862e 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.js +++ b/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.js @@ -31,81 +31,21 @@ const _sfc_main = { __name: "orderAdd", setup(__props) { common_vendor.onLoad((options) => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:335", "onLoad"); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:253", "onLoad - options", options); form.room_id = options.roomId; - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:338", form); - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:339", options); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:255", "onLoad - form", form); }); - const orderCombos = common_vendor.ref([ - // { - // combo_type_name: null, - // combo_type_id: null, - // combo_name: null, - // goods_id: null, - // goods_price: null, - // goods_pay_status: 0, - // goods_pay_status_txt: "请选择", - // cascader_val: [] - // }, - ]); - const addCombos = () => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:358", orderCombos.value); - orderCombos.value.push({ - combo_type_name: null, - combo_type_id: null, - combo_id: null, - combo_name: null, - combo_price: null, - combo_pay_status: 0, - combo_pay_status_txt: "请选择" - // goods_price: null, - // cascader_val: [] + const selectGoods = common_vendor.ref([]); + const selectCombos = common_vendor.ref([]); + common_vendor.onMounted(() => { + api_index.fetchGoods().then((res) => { + selectGoods.value = res; }); - }; - const removeCombos = (index) => { - orderCombos.value.splice(index, 1); - }; - const visibleComboTypePopup = common_vendor.ref(false); - const comboTypes = [ - { - value: 1, - label: "美团" - }, - { - value: 2, - label: "抖音" - } - ]; - const onConfirmComboType = (selectedValue) => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:389", selectedValue); - form.fee_type_name = selectedValue.selectedOptions[0].label; - form.fee_type = selectedValue.selectedOptions[0].value; - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:392", form); - getCombos(); - visibleComboTypePopup.value = false; - }; - const getCombos = () => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:401", "获取套餐"); - api_index.fetchCombos({ - type: form.fee_type - }).then((res) => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:405", res); - combos.value = res; + api_index.fetchCombos().then((res) => { + selectCombos.value = res; }); - }; - const visibleCombosPopup = common_vendor.ref(false); - const popupCombosVal = common_vendor.ref([]); - const combos = common_vendor.ref([]); - const onConfirmCombos = (selectedValue) => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:420", "selectedValue", selectedValue); - form.fee_combo_name = selectedValue.selectedOptions[0].label; - form.fee_combo_id = selectedValue.selectedOptions[0].value; - form.fee_combo_price = selectedValue.selectedOptions[0].combo_price; - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:424", form); - visibleCombosPopup.value = false; - }; + }); const visiblePaymentStatusPopup = common_vendor.ref(false); - common_vendor.ref([]); const popupPaymentTypeVal = common_vendor.ref(""); const paymentStatuses = [ { @@ -123,45 +63,116 @@ const _sfc_main = { ]; const openPayStatusPopup = (type, index = -1) => { popupPaymentTypeVal.value = type; - goodsPayIndex.value = index; + if (type === "combos") { + combosPayIndex.value = index; + } else if (type === "goods") { + goodsPayIndex.value = index; + } else + ; visiblePaymentStatusPopup.value = true; - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:452", type); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:303", type); }; const onConfirmPaymentStatus = (selectedValue) => { + let label = selectedValue.selectedOptions[0].label; + let value = selectedValue.selectedOptions[0].value; if (popupPaymentTypeVal.value == "fee") { - form.fee_pay_status_txt = selectedValue.selectedOptions[0].label; - form.fee_pay_status = selectedValue.selectedOptions[0].value; + form.fee_pay_status_txt = label; + form.fee_pay_status = value; } if (popupPaymentTypeVal.value == "over") { - form.over_pay_status_txt = selectedValue.selectedOptions[0].label; - form.over_pay_status = selectedValue.selectedOptions[0].value; + form.over_pay_status_txt = label; + form.over_pay_status = value; + } + if (popupPaymentTypeVal.value == "combos" && combosPayIndex.value >= 0) { + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:325", "处理套餐支付状态", combosPayIndex.value); + orderCombos.value[combosPayIndex.value].combo_pay_status_txt = label; + orderCombos.value[combosPayIndex.value].combo_pay_status = value; } if (popupPaymentTypeVal.value == "goods" && goodsPayIndex.value >= 0) { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:466", "处理商品支付状态", goodsPayIndex.value); - orderGoods.value[goodsPayIndex.value].goods_pay_status_txt = selectedValue.selectedOptions[0].label; - orderGoods.value[goodsPayIndex.value].goods_pay_status = selectedValue.selectedOptions[0].value; + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:331", "处理商品支付状态", goodsPayIndex.value); + orderGoods.value[goodsPayIndex.value].goods_pay_status_txt = label; + orderGoods.value[goodsPayIndex.value].goods_pay_status = value; } - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:470", form); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:335", form); visiblePaymentStatusPopup.value = false; popupPaymentTypeVal.value = ""; goodsPayIndex.value = -1; + combosPayIndex.value = -1; }; - const orderGoods = common_vendor.ref([ - // { - // goods_type_name: null, - // goods_type_id: null, - // goods_name: null, - // goods_id: null, - // goods_price: null, - // goods_pay_status: 0, - // goods_pay_status_txt: "请选择", - // cascader_val: [] - // }, - ]); - const goodsPayIndex = common_vendor.ref(0); - const goodsIndex = common_vendor.ref(0); + const orderCombos = common_vendor.ref([]); + const combosPayIndex = common_vendor.ref(-1); + const combosIndex = common_vendor.ref(-1); + const visibleCombosCascader = common_vendor.ref(false); + const addCombos = () => { + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:350", orderCombos.value); + orderCombos.value.push({ + combo_type_name: null, + combo_type_id: null, + combo_id: null, + combo_name: null, + combo_price: null, + combo_pay_status: 0, + combo_pay_status_txt: "请选择", + cascader_val: [] + }); + }; + const removeCombos = (index) => { + orderCombos.value.splice(index, 1); + }; + const cascaderCombosValue = common_vendor.computed(() => { + var _a; + let cascader_val = []; + if (combosIndex.value >= 0) { + return ((_a = orderCombos.value[combosIndex.value]) == null ? void 0 : _a.cascader_val) ?? []; + } else { + return cascader_val; + } + }); + const onCombosPathChange = (args) => { + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:378", "onCombosPathChange", args); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:379", "combosIndex", combosIndex.value); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:380", "orderCombos.value[combosIndex.value]", orderCombos.value[combosIndex.value]); + orderCombos.value[combosIndex.value].combo_type_name = null; + orderCombos.value[combosIndex.value].combo_type_id = null; + orderCombos.value[combosIndex.value].combo_id = null; + orderCombos.value[combosIndex.value].combo_name = null; + orderCombos.value[combosIndex.value].combo_price = null; + if (args.length >= 1 && args[0] !== null) { + orderCombos.value[combosIndex.value].combo_type_name = args[0].text; + orderCombos.value[combosIndex.value].combo_type_id = args[0].value; + } + if (args.length >= 2 && args[1] !== null) { + orderCombos.value[combosIndex.value].combo_name = args[1].text; + orderCombos.value[combosIndex.value].combo_id = args[1].value; + orderCombos.value[combosIndex.value].combo_price = args[1].combo_price; + } + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:395", "orderCombos.value[combosIndex.value]", orderCombos.value[combosIndex.value]); + }; + const onOpenCombosCascader = () => { + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:402", "onOpenCombosCascader"); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:403", "combosIndex.value", combosIndex.value); + }; + const onCloseCombosCascader = () => { + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:407", "onCloseCombosCascader"); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:408", "combosIndex.value", combosIndex.value); + if (orderCombos.value[combosIndex.value].combo_type_id && orderCombos.value[combosIndex.value].combo_id) { + orderCombos.value[combosIndex.value].cascader_val = [ + orderCombos.value[combosIndex.value].combo_type_id, + orderCombos.value[combosIndex.value].combo_id + ]; + } + combosIndex.value = -1; + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:416", "combosIndex.value", combosIndex.value); + }; + const onCombosChange = (...args) => { + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:420", "onCombosChange", args); + }; + const orderGoods = common_vendor.ref([]); + const goodsPayIndex = common_vendor.ref(-1); + const goodsIndex = common_vendor.ref(-1); + const visibleGoodsCascader = common_vendor.ref(false); const addGoods = () => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:497", orderGoods.value); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:434", orderGoods.value); orderGoods.value.push({ goods_type_name: null, goods_type_id: null, @@ -176,7 +187,6 @@ const _sfc_main = { const removeGoods = (index) => { orderGoods.value.splice(index, 1); }; - const visibleGoodsCascader = common_vendor.ref(false); const cascaderGoodsValue = common_vendor.computed(() => { var _a; let cascader_val = []; @@ -187,12 +197,12 @@ const _sfc_main = { } }); const onGoodsChange = (...args) => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:525", "onGoodsChange", args); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:460", "onGoodsChange", args); }; const onGoodsPathChange = (args) => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:529", "onGoodsPathChange", args); - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:530", "goodsIndex", goodsIndex.value); - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:531", "orderGoods.value[goodsIndex.value]", orderGoods.value[goodsIndex.value]); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:464", "onGoodsPathChange", args); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:465", "goodsIndex", goodsIndex.value); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:466", "orderGoods.value[goodsIndex.value]", orderGoods.value[goodsIndex.value]); orderGoods.value[goodsIndex.value].goods_type_name = null; orderGoods.value[goodsIndex.value].goods_type_id = null; orderGoods.value[goodsIndex.value].goods_name = null; @@ -207,23 +217,23 @@ const _sfc_main = { orderGoods.value[goodsIndex.value].goods_id = args[1].value; orderGoods.value[goodsIndex.value].goods_price = args[1].goods_price; } - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:547", "orderGoods.value[goodsIndex.value]", orderGoods.value[goodsIndex.value]); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:482", "orderGoods.value[goodsIndex.value]", orderGoods.value[goodsIndex.value]); }; const onCloseGoodsCascader = () => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:550", "onCloseGoodsCascader"); - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:551", "goodsIndex.value", goodsIndex.value); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:485", "onCloseGoodsCascader"); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:486", "goodsIndex.value", goodsIndex.value); if (orderGoods.value[goodsIndex.value].goods_type_id && orderGoods.value[goodsIndex.value].goods_id) { orderGoods.value[goodsIndex.value].cascader_val = [ orderGoods.value[goodsIndex.value].goods_type_id, orderGoods.value[goodsIndex.value].goods_id ]; } - goodsIndex.value = 0; - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:559", "goodsIndex.value", goodsIndex.value); + goodsIndex.value = -1; + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:494", "goodsIndex.value", goodsIndex.value); }; const onOpenGoodsCascader = () => { - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:562", "onOpenGoodsCascader"); - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:563", "goodsIndex.value", goodsIndex.value); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:497", "onOpenGoodsCascader"); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:498", "goodsIndex.value", goodsIndex.value); }; const form = common_vendor.reactive({ order_type: 1, @@ -232,9 +242,6 @@ const _sfc_main = { // 房间ID fee_type: "1", // 默认是团购 - // fee_combo_id: 0, // 套餐ID - // fee_combo_name: '请选择', // 套餐名称 - // fee_combo_price: null, fee_amount: null, // 线下支付费用 fee_pay_status: 0, @@ -253,18 +260,13 @@ const _sfc_main = { // 优惠金额 remarks: null }); - const selectGoods = common_vendor.ref([]); - common_vendor.onMounted(() => { - api_index.fetchGoods().then((res) => { - selectGoods.value = res; - }); - }); const submitForm = () => { let data = { order_goods: orderGoods.value, + order_combos: orderCombos.value, order: form }; - common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:611", "提交的订单数据:", data); + common_vendor.index.__f__("log", "at pages/index/orderAdd.vue:533", "提交的订单数据:", data); }; return (_ctx, _cache) => { return common_vendor.e({ @@ -286,27 +288,25 @@ const _sfc_main = { }, form.fee_type == 1 ? { g: common_vendor.f(orderCombos.value, (item, index, i0) => { return common_vendor.e({ - a: item.combo_type_name - }, item.combo_type_name ? { - b: common_vendor.t(item.combo_type_name) + a: item.combo_type_name && item.combo_name + }, item.combo_type_name && item.combo_name ? { + b: common_vendor.t(item.combo_type_name), + c: common_vendor.t(item.combo_name) } : {}, { - c: common_vendor.o(($event) => visibleComboTypePopup.value = true, index), - d: "528154d3-6-" + i0 + ",528154d3-5", - e: item.combo_name - }, item.combo_name ? { - f: common_vendor.t(item.combo_name) - } : {}, { - g: common_vendor.o(($event) => visibleCombosPopup.value = true, index), - h: "528154d3-7-" + i0 + ",528154d3-5", - i: common_vendor.t(item.combo_price), + d: common_vendor.o(($event) => { + visibleCombosCascader.value = true; + combosIndex.value = index; + }, index), + e: "528154d3-6-" + i0 + ",528154d3-5", + f: common_vendor.t(item.combo_price), + g: "528154d3-7-" + i0 + ",528154d3-5", + h: common_vendor.t(item.combo_pay_status_txt), + i: common_vendor.o(($event) => openPayStatusPopup("combos", index), index), j: "528154d3-8-" + i0 + ",528154d3-5", - k: common_vendor.t(item.combo_pay_status_txt), - l: common_vendor.o(($event) => openPayStatusPopup("combo", index), index), + k: common_vendor.o(($event) => removeCombos(index), index), + l: "528154d3-10-" + i0 + "," + ("528154d3-9-" + i0), m: "528154d3-9-" + i0 + ",528154d3-5", - n: common_vendor.o(($event) => removeCombos(index), index), - o: "528154d3-11-" + i0 + "," + ("528154d3-10-" + i0), - p: "528154d3-10-" + i0 + ",528154d3-5", - q: index + n: index }); }), h: common_vendor.p({ @@ -319,66 +319,63 @@ const _sfc_main = { ["label-position"]: "top" }), k: common_vendor.p({ - ["label-position"]: "top" - }), - l: common_vendor.p({ type: "danger", size: "mini" }), - m: common_vendor.p({ + l: common_vendor.p({ ["label-position"]: "top" }), - n: common_vendor.o(addCombos), - o: common_vendor.p({ + m: common_vendor.o(addCombos), + n: common_vendor.p({ type: "primary", plain: true, size: "small" }) } : { - p: common_vendor.o(($event) => form.fee_amount = $event), - q: common_vendor.p({ + o: common_vendor.o(($event) => form.fee_amount = $event), + p: common_vendor.p({ placeholder: "请输入金额", type: "number", modelValue: form.fee_amount }), - r: common_vendor.p({ + q: common_vendor.p({ ["label-position"]: "top" }), - s: common_vendor.t(form.fee_pay_status_txt), - t: common_vendor.o(($event) => openPayStatusPopup("fee")), - v: common_vendor.p({ + r: common_vendor.t(form.fee_pay_status_txt), + s: common_vendor.o(($event) => openPayStatusPopup("fee")), + t: common_vendor.p({ ["label-position"]: "top" }) }, { - w: form.fee_type == 1 + v: form.fee_type == 1 }, form.fee_type == 1 ? {} : {}, { - x: form.fee_type == 1 + w: form.fee_type == 1 }, form.fee_type == 1 ? { - y: common_vendor.o(($event) => form.over_often = $event), - z: common_vendor.p({ + x: common_vendor.o(($event) => form.over_often = $event), + y: common_vendor.p({ placeholder: "请输入小时", type: "number", modelValue: form.over_often }), - A: common_vendor.p({ + z: common_vendor.p({ ["label-position"]: "top" }), - B: common_vendor.o(($event) => form.over_amount = $event), - C: common_vendor.p({ + A: common_vendor.o(($event) => form.over_amount = $event), + B: common_vendor.p({ placeholder: "请输入金额", type: "number", modelValue: form.over_amount }), - D: common_vendor.p({ + C: common_vendor.p({ ["label-position"]: "top" }), - E: common_vendor.t(form.over_pay_status_txt), - F: common_vendor.o(($event) => openPayStatusPopup("over")), - G: common_vendor.p({ + D: common_vendor.t(form.over_pay_status_txt), + E: common_vendor.o(($event) => openPayStatusPopup("over")), + F: common_vendor.p({ ["label-position"]: "top" }) } : {}, { - H: common_vendor.f(orderGoods.value, (item, index, i0) => { + G: common_vendor.f(orderGoods.value, (item, index, i0) => { return common_vendor.e({ a: item.goods_type_name && item.goods_name }, item.goods_type_name && item.goods_name ? { @@ -389,18 +386,21 @@ const _sfc_main = { visibleGoodsCascader.value = true; goodsIndex.value = index; }, index), - e: "528154d3-24-" + i0 + ",528154d3-23", + e: "528154d3-23-" + i0 + ",528154d3-22", f: common_vendor.t(item.goods_price), - g: "528154d3-25-" + i0 + ",528154d3-23", + g: "528154d3-24-" + i0 + ",528154d3-22", h: common_vendor.t(item.goods_pay_status_txt), i: common_vendor.o(($event) => openPayStatusPopup("goods", index), index), - j: "528154d3-26-" + i0 + ",528154d3-23", + j: "528154d3-25-" + i0 + ",528154d3-22", k: common_vendor.o(($event) => removeGoods(index), index), - l: "528154d3-28-" + i0 + "," + ("528154d3-27-" + i0), - m: "528154d3-27-" + i0 + ",528154d3-23", + l: "528154d3-27-" + i0 + "," + ("528154d3-26-" + i0), + m: "528154d3-26-" + i0 + ",528154d3-22", n: index }); }), + H: common_vendor.p({ + ["label-position"]: "top" + }), I: common_vendor.p({ ["label-position"]: "top" }), @@ -408,48 +408,45 @@ const _sfc_main = { ["label-position"]: "top" }), K: common_vendor.p({ - ["label-position"]: "top" - }), - L: common_vendor.p({ type: "danger", size: "mini" }), - M: common_vendor.p({ + L: common_vendor.p({ ["label-position"]: "top" }), - N: common_vendor.o(addGoods), - O: common_vendor.p({ + M: common_vendor.o(addGoods), + N: common_vendor.p({ type: "primary", plain: true, size: "small" }), - P: common_vendor.o(($event) => form.discount_amount = $event), - Q: common_vendor.p({ + O: common_vendor.o(($event) => form.discount_amount = $event), + P: common_vendor.p({ placeholder: "请输入金额", type: "number", modelValue: form.discount_amount }), - R: common_vendor.o(($event) => form.remarks = $event), - S: common_vendor.p({ + Q: common_vendor.o(($event) => form.remarks = $event), + R: common_vendor.p({ rows: 3, placeholder: "请输入备注", modelValue: form.remarks }), - T: common_vendor.p({ + S: common_vendor.p({ label: "备注" }), - U: common_vendor.o(submitForm), - V: common_vendor.p({ + T: common_vendor.o(submitForm), + U: common_vendor.p({ type: "primary", block: true }), - W: common_vendor.o(onGoodsChange), - X: common_vendor.o(onGoodsPathChange), - Y: common_vendor.o(onOpenGoodsCascader), - Z: common_vendor.o(onCloseGoodsCascader), - aa: common_vendor.o(($event) => visibleGoodsCascader.value = $event), - ab: common_vendor.o(($event) => cascaderGoodsValue.value = $event), - ac: common_vendor.p({ + V: common_vendor.o(onGoodsChange), + W: common_vendor.o(onGoodsPathChange), + X: common_vendor.o(onOpenGoodsCascader), + Y: common_vendor.o(onCloseGoodsCascader), + Z: common_vendor.o(($event) => visibleGoodsCascader.value = $event), + aa: common_vendor.o(($event) => cascaderGoodsValue.value = $event), + ab: common_vendor.p({ title: "商品选择", ["text-key"]: "label", ["value-key"]: "value", @@ -459,9 +456,25 @@ const _sfc_main = { visible: visibleGoodsCascader.value, modelValue: cascaderGoodsValue.value }), - ad: common_vendor.o(onConfirmPaymentStatus), - ae: common_vendor.o(($event) => visiblePaymentStatusPopup.value = false), - af: common_vendor.p({ + ac: common_vendor.o(onCombosChange), + ad: common_vendor.o(onCombosPathChange), + ae: common_vendor.o(onOpenCombosCascader), + af: common_vendor.o(onCloseCombosCascader), + ag: common_vendor.o(($event) => visibleCombosCascader.value = $event), + ah: common_vendor.o(($event) => cascaderCombosValue.value = $event), + ai: common_vendor.p({ + title: "套餐选择", + ["text-key"]: "label", + ["value-key"]: "value", + ["children-key"]: "children", + options: selectCombos.value, + ["title-ellipsis"]: false, + visible: visibleCombosCascader.value, + modelValue: cascaderCombosValue.value + }), + aj: common_vendor.o(onConfirmPaymentStatus), + ak: common_vendor.o(($event) => visiblePaymentStatusPopup.value = false), + al: common_vendor.p({ columns: paymentStatuses, ["field-names"]: { text: "label", @@ -469,45 +482,11 @@ const _sfc_main = { }, title: "选择支付状态" }), - ag: common_vendor.o(($event) => visiblePaymentStatusPopup.value = $event), - ah: common_vendor.p({ - position: "bottom", - ["safe-area-inset-bottom"]: true, - visible: visiblePaymentStatusPopup.value - }), - ai: common_vendor.o(onConfirmCombos), - aj: common_vendor.o(($event) => visibleCombosPopup.value = false), - ak: common_vendor.o(($event) => popupCombosVal.value = $event), - al: common_vendor.p({ - columns: combos.value, - ["field-names"]: { - text: "label", - value: "value" - }, - title: "选择团购套餐", - modelValue: popupCombosVal.value - }), - am: common_vendor.o(($event) => visibleCombosPopup.value = $event), + am: common_vendor.o(($event) => visiblePaymentStatusPopup.value = $event), an: common_vendor.p({ position: "bottom", ["safe-area-inset-bottom"]: true, - visible: visibleCombosPopup.value - }), - ao: common_vendor.o(onConfirmComboType), - ap: common_vendor.o(($event) => visibleComboTypePopup.value = false), - aq: common_vendor.p({ - columns: comboTypes, - ["field-names"]: { - text: "label", - value: "value" - }, - title: "选择套餐平台" - }), - ar: common_vendor.o(($event) => visibleComboTypePopup.value = $event), - as: common_vendor.p({ - position: "bottom", - ["safe-area-inset-bottom"]: true, - visible: visibleComboTypePopup.value + visible: visiblePaymentStatusPopup.value }) }); }; diff --git a/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxml b/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxml index 2644580..4e05054 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxml @@ -1 +1 @@ -基础台费 团购线下平台{{item.b}}选择平台套餐{{item.f}}选择套餐售价{{item.i}}支付状态{{item.k}}删除套餐新增套餐线下收款支付状态{{s}}超时收费时长(小时)超时金额支付状态{{E}}商品 商品{{item.b}} - {{item.c}}请选择商品售价{{item.f}}支付状态{{item.h}}操作删除商品新增商品订单优惠 优惠金额 开台 \ No newline at end of file +基础台费 团购线下套餐{{item.b}} - {{item.c}}请选择套餐售价{{item.f}}支付状态{{item.h}}操作删除套餐新增套餐线下收款支付状态{{r}}超时收费时长(小时)超时金额支付状态{{D}}商品 商品{{item.b}} - {{item.c}}请选择商品售价{{item.f}}支付状态{{item.h}}操作删除商品新增商品订单优惠 优惠金额 开台 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxss b/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxss index 315881a..6942f8e 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/index/orderAdd.wxss @@ -72,13 +72,25 @@ justify-content: space-between; border-top: 1px solid #eee; } +.inline-combo-form.data-v-528154d3 { + border-bottom: 2rpx solid #909ca4; +} +.inline-combo-form.data-v-528154d3:last-child { + border-bottom: none; +} /* 每个商品项容器 */ +.inline-goods-form.data-v-528154d3 { + border-bottom: 2rpx solid #909ca4; +} +.inline-goods-form.data-v-528154d3:last-child { + border-bottom: none; +} + /* 行容器 */ .form-row.data-v-528154d3 { display: flex; justify-content: space-between; align-items: flex-start; gap: 20rpx; - margin-bottom: 20rpx; } \ No newline at end of file