diff --git a/pages/index/index.vue b/pages/index/index.vue index a11da44..cc29354 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -13,7 +13,7 @@ {{room.room_name}} - + 尾号: {{room.tel}} 备注: {{room.remarks}} @@ -62,7 +62,22 @@ - + + + + + + + + {{tempRoom?.room_name}} + + 尾号: {{tempRoom.tel}} + 备注: {{tempRoom.remarks}} + + + + @@ -116,7 +131,21 @@ return { 'background-color': backgroundColor, }; - } + } + + const visibleInfoPopup = ref(false) + const onShowInfoPopup = (room) => { + console.log("----", room); + Object.assign(tempRoom, room) + visibleInfoPopup.value = true + } + const onCloseInfoPopup = () => { + Object.assign(tempRoom, {}) + visibleInfoPopup.value = false + console.log("关闭"); + }; + + const visiblePopup = ref(false) const tempRoom = reactive({}) const onBooking = (room) => { @@ -134,7 +163,9 @@ }) visiblePopup.value = false console.log("关闭"); - }; + }; + + const getRooms = () => { console.log("房间"); @@ -288,5 +319,22 @@ font-size: 28rpx; font-weight: 400; text-align: center; + } + + .room-info { + text-align: left; + padding: 20rpx 20rpx; + color: #666; + width: 100%; + // min-height: 160rpx; + box-sizing: border-box; + + .room-id { + font-size: 28rpx; + } + + .remark { + font-size: 26rpx; + } } \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map index f041764..ff52369 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["pages/index/index.vue","pages/index/index.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/index/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["reactive","ref","uni","fetchRooms","fetchBooking","fetchUnBooking","onShow","onMounted"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAwFC,UAAM,OAAOA,cAAAA,SAAS;AAAA,MACrB,SAAS;AAAA,MACT,KAAK;AAAA,MACL,SAAS;AAAA,IACX,CAAE;AAED,UAAM,QAAQC,kBAAI,CAAA,CAAE;AACpB,UAAM,eAAe,CAAC,WAAW;AAChC,UAAI,kBAAkB;AAEtB,cAAQ,QAAM;AAAA,QACb,KAAK;AACJ,4BAAkB;AAClB;AAAA,QACD,KAAK;AACJ,4BAAkB;AAClB;AAAA,QACD,KAAK;AACJ,4BAAkB;AAClB;AAAA,QAKD;AACC,4BAAkB;AAAA,MACnB;AACD,aAAO;AAAA,QACN,oBAAoB;AAAA,MACvB;AAAA,IACE;AACD,UAAM,eAAeA,cAAG,IAAC,KAAK;AAC9B,UAAM,WAAWD,cAAQ,SAAC,EAAE;AAC5B,UAAM,YAAY,CAAC,SAAS;AAC3BE,oBAAY,MAAA,MAAA,OAAA,gCAAA,QAAQ,IAAI;AACxB,aAAO,OAAO,UAAU,IAAI;AAC5B,WAAK,UAAU,KAAK;AACpB,mBAAa,QAAQ;AAAA,IACrB;AACD,UAAM,eAAe,MAAM;AAC1B,aAAO,OAAO,UAAU,EAAE;AAC1B,aAAO,OAAO,MAAM;AAAA,QACnB,SAAS;AAAA,QACT,KAAK;AAAA,QACL,SAAS;AAAA,MACZ,CAAG;AACD,mBAAa,QAAQ;AACrBA,oBAAAA,mDAAY,IAAI;AAAA,IAClB;AAEC,UAAM,WAAW,MAAM;AACtBA,oBAAAA,mDAAY,IAAI;AAChBC,2BAAY,EAAC,KAAK,SAAO;AACxBD,sBAAAA,MAAY,MAAA,OAAA,gCAAA,GAAG;AACf,cAAM,QAAQ;AAAA,MACjB,CAAG;AAAA,IACD;AAGD,UAAM,WAAW,MAAM;AACtBE,gBAAAA,aAAa,IAAI,EAAE,KAAK,SAAO;AAC9BF,sBAAAA,MAAY,MAAA,OAAA,gCAAA,GAAG;AACfA,sBAAAA,MAAI,UAAU;AAAA,UACb,MAAM;AAAA,UACN,OAAO;AAAA,QACX,CAAI;AACD,qBAAc;AACd,iBAAU;AAAA,MACb,CAAG;AAAA,IACD;AAED,UAAM,cAAc,CAAC,SAAS;AAC7BG,+BAAe;AAAA,QACd,IAAI,KAAK;AAAA,MACZ,CAAG,EAAE,KAAK,SAAO;AACdH,sBAAAA,MAAY,MAAA,OAAA,gCAAA,GAAG;AACfA,sBAAAA,MAAI,UAAU;AAAA,UACb,MAAM;AAAA,UACN,OAAO;AAAA,QACX,CAAI;AACD,iBAAU;AAAA,MACb,CAAG;AAAA,IACD;AAED,UAAM,OAAO,MAAM;AAClBA,oBAAAA,MAAY,MAAA,OAAA,gCAAA,MAAM;AAClB,eAAU;AAAA,IACV;AAEDI,kBAAAA,OAAO,MAAM;AACZJ,oBAAAA,MAAA,MAAA,OAAA,gCAAY,WAAW;AACvB,eAAU;AAAA,IACZ,CAAE;AAEDK,kBAAAA,UAAU,MAAM;AACf;IACF,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACvLF,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["pages/index/index.vue","pages/index/index.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/index/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["reactive","ref","uni","fetchRooms","fetchBooking","fetchUnBooking","onShow","onMounted"],"mappings":"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"} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js index 4c20c30..dae0e98 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js @@ -48,10 +48,21 @@ const _sfc_main = { "background-color": backgroundColor }; }; + const visibleInfoPopup = common_vendor.ref(false); + const onShowInfoPopup = (room) => { + common_vendor.index.__f__("log", "at pages/index/index.vue:138", "----", room); + Object.assign(tempRoom, room); + visibleInfoPopup.value = true; + }; + const onCloseInfoPopup = () => { + Object.assign(tempRoom, {}); + visibleInfoPopup.value = false; + common_vendor.index.__f__("log", "at pages/index/index.vue:145", "关闭"); + }; const visiblePopup = common_vendor.ref(false); const tempRoom = common_vendor.reactive({}); const onBooking = (room) => { - common_vendor.index.__f__("log", "at pages/index/index.vue:123", "----", room); + common_vendor.index.__f__("log", "at pages/index/index.vue:152", "----", room); Object.assign(tempRoom, room); form.room_id = room.id; visiblePopup.value = true; @@ -64,18 +75,18 @@ const _sfc_main = { remarks: "" }); visiblePopup.value = false; - common_vendor.index.__f__("log", "at pages/index/index.vue:136", "关闭"); + common_vendor.index.__f__("log", "at pages/index/index.vue:165", "关闭"); }; const getRooms = () => { - common_vendor.index.__f__("log", "at pages/index/index.vue:140", "房间"); + common_vendor.index.__f__("log", "at pages/index/index.vue:171", "房间"); api_index.fetchRooms().then((res) => { - common_vendor.index.__f__("log", "at pages/index/index.vue:142", res); + common_vendor.index.__f__("log", "at pages/index/index.vue:173", res); rooms.value = res; }); }; const onSubmit = () => { api_index.fetchBooking(form).then((res) => { - common_vendor.index.__f__("log", "at pages/index/index.vue:150", res); + common_vendor.index.__f__("log", "at pages/index/index.vue:181", res); common_vendor.index.showToast({ icon: "none", title: "预约成功" @@ -88,7 +99,7 @@ const _sfc_main = { api_index.fetchUnBooking({ id: room.id }).then((res) => { - common_vendor.index.__f__("log", "at pages/index/index.vue:164", res); + common_vendor.index.__f__("log", "at pages/index/index.vue:195", res); common_vendor.index.showToast({ icon: "none", title: "取消预约成功" @@ -97,18 +108,18 @@ const _sfc_main = { }); }; const init = () => { - common_vendor.index.__f__("log", "at pages/index/index.vue:174", "init"); + common_vendor.index.__f__("log", "at pages/index/index.vue:205", "init"); getRooms(); }; common_vendor.onShow(() => { - common_vendor.index.__f__("log", "at pages/index/index.vue:179", "onshow---"); + common_vendor.index.__f__("log", "at pages/index/index.vue:210", "onshow---"); getRooms(); }); common_vendor.onMounted(() => { init(); }); return (_ctx, _cache) => { - return { + return common_vendor.e({ a: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)("/pages/index/goodsOrderAdd")), b: common_vendor.p({ type: "primary", @@ -126,48 +137,49 @@ const _sfc_main = { }, room.remarks ? { e: common_vendor.t(room.remarks) } : {}, { - f: room.status === 1 + f: common_vendor.o(($event) => onShowInfoPopup(room), index), + g: room.status === 1 }, room.status === 1 ? { - g: common_vendor.o(($event) => onBooking(room), index), - h: "1cf27b2a-1-" + i0, - i: common_vendor.p({ + h: common_vendor.o(($event) => onBooking(room), index), + i: "1cf27b2a-1-" + i0, + j: common_vendor.p({ size: "small", type: "primary", shape: "square" }) } : room.status === 2 ? { - k: common_vendor.o(($event) => onUnBooking(room), index), - l: "1cf27b2a-2-" + i0, - m: common_vendor.p({ + l: common_vendor.o(($event) => onUnBooking(room), index), + m: "1cf27b2a-2-" + i0, + n: common_vendor.p({ size: "small", type: "warning", plain: true, shape: "square" }) } : {}, { - j: room.status === 2, - n: room.status === 3 + k: room.status === 2, + o: room.status === 3 }, room.status === 3 ? { - o: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)(`/pages/index/orderEdit?roomId=${room.id}`), index), - p: "1cf27b2a-3-" + i0, - q: common_vendor.p({ + p: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)(`/pages/index/orderEdit?roomId=${room.id}`), index), + q: "1cf27b2a-3-" + i0, + r: common_vendor.p({ size: "small", type: "info", plain: true, shape: "square" }) } : { - r: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)(`/pages/index/orderAdd?roomId=${room.id}`), index), - s: "1cf27b2a-4-" + i0, - t: common_vendor.p({ + s: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)(`/pages/index/orderAdd?roomId=${room.id}`), index), + t: "1cf27b2a-4-" + i0, + v: common_vendor.p({ size: "small", type: "success", plain: true, shape: "square" }) }, { - v: index, - w: common_vendor.s(getRoomStyle(room.status)) + w: index, + x: common_vendor.s(getRoomStyle(room.status)) }); }), e: common_vendor.t(tempRoom == null ? void 0 : tempRoom.room_name), @@ -203,8 +215,28 @@ const _sfc_main = { ["safe-area-inset-bottom"]: true, ["close-on-click-overlay"]: true, visible: visiblePopup.value + }), + q: common_vendor.t(tempRoom == null ? void 0 : tempRoom.room_name), + r: tempRoom == null ? void 0 : tempRoom.tel + }, (tempRoom == null ? void 0 : tempRoom.tel) ? { + s: common_vendor.t(tempRoom.tel) + } : {}, { + t: tempRoom == null ? void 0 : tempRoom.remarks + }, (tempRoom == null ? void 0 : tempRoom.remarks) ? { + v: common_vendor.t(tempRoom.remarks) + } : {}, { + w: common_vendor.o(onCloseInfoPopup), + x: common_vendor.o(($event) => visibleInfoPopup.value = $event), + y: common_vendor.p({ + ["custom-style"]: { + height: "50%" + }, + position: "bottom", + ["safe-area-inset-bottom"]: true, + ["close-on-click-overlay"]: true, + visible: visibleInfoPopup.value }) - }; + }); }; } }; diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml index da54b76..d1ac3e5 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml @@ -1 +1 @@ - 新增商品订单 {{room.a}}尾号: {{room.c}}备注: {{room.e}}预约取消预约详情开台{{e}} 预约 \ No newline at end of file + 新增商品订单 {{room.a}}尾号: {{room.c}}备注: {{room.e}}预约取消预约详情开台{{e}} 预约 {{q}}尾号: {{s}}备注: {{v}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss index e8be0a5..fffb18c 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss @@ -130,4 +130,17 @@ font-size: 28rpx; font-weight: 400; text-align: center; +} +.room-info.data-v-1cf27b2a { + text-align: left; + padding: 20rpx 20rpx; + color: #666; + width: 100%; + box-sizing: border-box; +} +.room-info .room-id.data-v-1cf27b2a { + font-size: 28rpx; +} +.room-info .remark.data-v-1cf27b2a { + font-size: 26rpx; } \ No newline at end of file