From c2d09870203d07f2772982f23509665e332a3858 Mon Sep 17 00:00:00 2001 From: chenkainan Date: Mon, 16 Jun 2025 14:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 7 +- package-lock.json | 5 + pages.json | 24 + static/js/CommonFunction.js | 4 + store/modules/user.js | 9 - subPackages/homestay/detail.vue | 742 ++++++++++++++++++++++++ subPackages/homestay/index.vue | 133 +++++ subPackages/homestay/order.vue | 730 +++++++++++++++++++++++ subPackages/homestay/policy.vue | 103 ++++ subPackages/homestay/selectCalendar.vue | 76 +++ subPackages/order/orderCoupon.vue | 2 +- subPackages/order/trades.vue | 74 +-- 12 files changed, 1862 insertions(+), 47 deletions(-) create mode 100644 subPackages/homestay/detail.vue create mode 100644 subPackages/homestay/index.vue create mode 100644 subPackages/homestay/order.vue create mode 100644 subPackages/homestay/policy.vue create mode 100644 subPackages/homestay/selectCalendar.vue diff --git a/manifest.json b/manifest.json index e8a569e..af0de38 100644 --- a/manifest.json +++ b/manifest.json @@ -50,9 +50,12 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "", + "appid" : "wx5be1fe6ef11841cd", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "es6" : true, + "postcss" : true, + "minified" : true }, "usingComponents" : true, "lazyCodeLoading" : "requiredComponents", diff --git a/package-lock.json b/package-lock.json index 922878f..8d61998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,6 +2,11 @@ "requires": true, "lockfileVersion": 1, "dependencies": { + "mobile-calendar-simple": { + "version": "2.4.0", + "resolved": "https://registry.npmmirror.com/mobile-calendar-simple/-/mobile-calendar-simple-2.4.0.tgz", + "integrity": "sha512-67Dg/pxQ7EK2uxGrjv4tLOBx+upIErxdtTC27o+luGFmhBtZ3+k1C2DGIzzJYhAF/YsMG9zkSl9XZY0TEt/HOg==" + }, "ydui-district": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/ydui-district/-/ydui-district-1.1.0.tgz", diff --git a/pages.json b/pages.json index 4571efd..e2ece95 100644 --- a/pages.json +++ b/pages.json @@ -174,6 +174,30 @@ "style": { "navigationBarTitleText": "全部订单" } + }, + { + "path": "homestay/index", + "style": { + "navigationBarTitleText": "特色民宿" + } + }, + { + "path": "homestay/detail", + "style": { + "navigationBarTitleText": "特色民宿" + } + }, + { + "path": "homestay/policy", + "style": { + "navigationBarTitleText": "设施/政策" + } + }, + { + "path": "homestay/order", + "style": { + "navigationBarTitleText": "订单填写" + } } ] }], diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js index dd27cf0..dbc5f0c 100644 --- a/static/js/CommonFunction.js +++ b/static/js/CommonFunction.js @@ -232,6 +232,10 @@ Vue.prototype.gotoDetailByType = item => { case 'line': url = '/subPackages/line/lineDetail?id=' + item.id break; + case 'room': + url = '/subPackages/homestay/detail?id=958396' + // || item.scene_id || item.id + break; default: break; } diff --git a/store/modules/user.js b/store/modules/user.js index ff06ba9..b97e7d0 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -14,11 +14,6 @@ export default { coupon: "",//景点下单选择优惠券 eshoppingCart: [],//自提产品购物车下单数据 sshoppingCart: [],//邮寄产品购物车下单数据 - meetRoomReserve: { - date: null, //使用日期信息 - coupon: null, // 优惠券信息 - people: null, //预定人信息 - }, // 会议预定信息 lineInfo: "", // 线路下单 }, // 类似 vue 里的 mothods(同步方法) @@ -68,10 +63,6 @@ export default { changeOrderSCart(state, data){ state.sshoppingCart = data }, - //meetRoomReserve修改会议预定信息 - changeMeetRoomReserve(state, data){ - state.meetRoomReserve = data - }, // 线路下单 changeLineInfo(state, data){ state.lineInfo = data diff --git a/subPackages/homestay/detail.vue b/subPackages/homestay/detail.vue new file mode 100644 index 0000000..5791754 --- /dev/null +++ b/subPackages/homestay/detail.vue @@ -0,0 +1,742 @@ + + + + + \ No newline at end of file diff --git a/subPackages/homestay/index.vue b/subPackages/homestay/index.vue new file mode 100644 index 0000000..63c34d8 --- /dev/null +++ b/subPackages/homestay/index.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/subPackages/homestay/order.vue b/subPackages/homestay/order.vue new file mode 100644 index 0000000..682b063 --- /dev/null +++ b/subPackages/homestay/order.vue @@ -0,0 +1,730 @@ + + + + + \ No newline at end of file diff --git a/subPackages/homestay/policy.vue b/subPackages/homestay/policy.vue new file mode 100644 index 0000000..914bd3a --- /dev/null +++ b/subPackages/homestay/policy.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/subPackages/homestay/selectCalendar.vue b/subPackages/homestay/selectCalendar.vue new file mode 100644 index 0000000..a4a9f6e --- /dev/null +++ b/subPackages/homestay/selectCalendar.vue @@ -0,0 +1,76 @@ + + + \ No newline at end of file diff --git a/subPackages/order/orderCoupon.vue b/subPackages/order/orderCoupon.vue index 60e2a95..8d67e63 100644 --- a/subPackages/order/orderCoupon.vue +++ b/subPackages/order/orderCoupon.vue @@ -86,7 +86,7 @@ this.getList(); }, onLoad(options) { - this.allPrice = (options.allprice) /100 + this.allPrice = options.allprice this.sku_ids = options.sku_ids this.needDefault = options.needDefault console.log('11111',options); diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index df00b45..1f3c89b 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -27,27 +27,27 @@ - 订单号:{{ item.order_id }} - {{ item.status_text }} + 订单编号:{{ item.order_id }} + {{ item.state_text }} - - - + + + - {{ pro.goods_title }} - {{ pro.specifications_name }} + {{ pro.product_title }} + {{ pro.sku_name }} - ￥{{ pro.pay_money / 100 }} - x{{ pro.num }} + ￥{{ pro.product_price / 100 }} + x{{ pro.product_num }} 合计 - ￥{{ item.pay_money / 100 }} + {{ item.total_money / 100 }} @@ -74,32 +74,32 @@ finished: false, list: [], typeList: [{ - id: 'ALL', - name: '全部' + name: '全部', + id: 'ALL' }, { - id: 'WAIT_PAYMENT', - name: '待付款' + name: '待付款', + id: 'WAIT_PAYMENT' }, { - id: 'PAYMENT_SUCCESSFULLY', - name: '待使用' + name: '待发货', + id: 'WAIT_POST' }, { - id: 'PAYMENT_SUCCESSFULLY', - name: '待发货' + name: '待使用', + id: '' }, { - id: 'POST', - name: '待收货' + name: '待出行', + id: 'WAIT_USE' }, - // { - // id: 'WAIT_COMMENT', - // name: '待评价' - // }, { - id: 'WAIT_REFUND,REFUND_SUCCESS,REFUND_REFUSAL,REFUND_ERROR,REFUND_PART', - name: '退款/售后' + name: '待收货', + id: 'WAIT_DELIVERY' + }, + { + name: '退款/售后', + id: 'NEED_REFUND' } ], typeIndex: 0, @@ -309,16 +309,16 @@ }, getList() { let data = { - status: this.typeList[this.typeIndex].id == 'ALL' ? '' : this.typeList[this.typeIndex].true_id || + state: this.typeList[this.typeIndex].id == 'ALL' ? '' : this.typeList[this.typeIndex].true_id || this.typeList[this.typeIndex].id, offset: this.list.length, limit: 5, - name: this.keywords, + keywords: this.keywords, type: this.typeList[this.typeIndex].name == '待使用' ? 1 : (this.typeList[this.typeIndex].name == '待发货' ? 2 : '') }; - this.Post(data, '/api/order/orderList').then(res => { - this.list = [...this.list, ...res.data] + this.Post(data, '/api/order/list').then(res => { + this.list = [...this.list, ...res.data.list] if (res.data.length < 5) { this.finished = true; } @@ -457,7 +457,7 @@ font-size: 27rpx; font-family: PingFang SC; font-weight: bold; - color: #C3282E; + color: #6A8A27; } .trade-item-head-name { @@ -521,7 +521,7 @@ padding: 0 20rpx; font-weight: 500; font-size: 24rpx; - color: #C3282E; + color: #6A8A27; margin-top: 20rpx; } @@ -535,7 +535,7 @@ .trade-item-pro-price-pri { font-size: 27rpx; - color: #C3282E; + color: #6A8A27; font-weight: 500; color: #333333; } @@ -560,7 +560,11 @@ .trade-item-info text { font-size: 36rpx; font-weight: bold; - color: rgba(238, 0, 0, 1); + color: rgba(195, 40, 46, 1); + } + .trade-item-info text::before { + font-size: 26rpx; + content: '￥'; } .trade-item-btns { @@ -585,7 +589,7 @@ .trade-item-btns .pay-btn { color: #FFFFFF; - background: #C3282E; + background: #6A8A27; border: none; padding: 10rpx 16rpx; }