From 8bdfcdcb38c5fe6064e02ddae8254875a4cbc352 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 23 Jan 2024 15:52:21 +0800 Subject: [PATCH] 11111111111 --- common/request.api.js | 16 ++- pages.json | 15 +++ pages/home/myCellar.vue | 157 +++++++++++++--------- pages/home/myHome.vue | 28 ++-- pages/records/orderDetail.vue | 230 +++++++++++++++++++++++++++++++++ pages/records/orderRecords.vue | 137 ++++++++++++++++++++ 6 files changed, 511 insertions(+), 72 deletions(-) create mode 100644 pages/records/orderDetail.vue create mode 100644 pages/records/orderRecords.vue diff --git a/common/request.api.js b/common/request.api.js index 7723518..5a1e8da 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -70,9 +70,9 @@ export default { // 結算商品 createOrder: (params = {}) => request.post("/empsreservoorder/createOrder", params), // 预约记录 - orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid", params, {}, {}, true), + orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid", params, {}, {}), // 转赠记录 - transferRecordsList: (params = {}) => request.post("/transferrecords/transferRecordsList", params, {}, {}, true), + transferRecordsList: (params = {}) => request.post("/transferrecords/transferRecordsList", params, {}, {}), // 我的 @@ -97,7 +97,15 @@ export default { // 保存实名 saveRealInfo: (params = {}) => request.post("/lpkcustomer/saveRealInfo", params), // 我的 预约记录 - myOrderListByUserSid: (params = {}) => request.post("/lpksreservoorders/orderListByUserSid", params, {}, {}, true), + myOrderListByUserSid: (params = {}) => request.post("/lpksreservoorders/orderListByUserSid", params, {}, {}), + // 我的 订单列表 + ordersList: (params = {}) => request.post("/empsreservoorder/ordersList", params, {}, {}), + // 我的 订单详情 + orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/"+params, params, {}, {}, true), + // 我的 订单详情 修改订单状态 + changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/"+params, params, {}, {}, true), + + // 2024-1-15 新需求 // 获取分类和品牌 @@ -120,6 +128,8 @@ export default { // 我的菜窖 新人礼包列表 newUserQuota: (params = {}) => request.post("/appletgiftbag/newUserQuota", params), + // 结算新人礼包 支付 + createNewUserBagOrder: (params = {}) => request.post("/empsreservoorder/createNewUserBagOrder", params), // 我的菜窖 类型列表 vegeCellarTypeList: (params = {}) => request.post("/lpkgoods/vegeCellarTypeList", params), // 我的菜窖 商品列表 diff --git a/pages.json b/pages.json index 238b98a..ec3712d 100644 --- a/pages.json +++ b/pages.json @@ -328,6 +328,21 @@ "style": { "navigationStyle": "custom" } + }, + { + "path" : "pages/records/orderRecords", + "style" : + { + "navigationBarTitleText" : "我的订单", + "disableScroll": true + } + }, + { + "path" : "pages/records/orderDetail", + "style" : + { + "navigationBarTitleText" : "订单详情" + } } diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index 828eb3d..beebe52 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -169,30 +169,50 @@ - + - + - - - - - + + + + + + + + - + - {{item.name}} - {{item.weight}}{{item.specificationUnit}} - ￥{{item.name}} - ￥{{item.mefenPrice}} + style="border-radius: 8px;width: 46px;height: 46px;"> + + + + + + {{item.name}} + ￥{{item.prefPrice}} + + + + + {{item.weight}}斤 + ￥{{item.price}} + + + @@ -200,15 +220,21 @@ - + - - 确认结算 + + 确认结算 + + @@ -225,7 +251,7 @@ + style=" display: flex;flex-direction: row;margin-top: 15px; margin-bottom: 10px;"> @@ -367,15 +393,16 @@ ], transferInfo: { - } + }, + newporGiftSid: "", } }, created() { - console.log("==========", getApp().globalData.isNewUser); - // if (getApp().globalData.isNewUser=='1') - // this.showModal = true + // console.log("==========", getApp().globalData.isNewUser); + if (getApp().globalData.isNewUser == '1') + this.showModal = true }, onShow() { if (typeof this.$mp.page.getTabBar === 'function' && this.$mp.page.getTabBar()) { @@ -391,7 +418,7 @@ onLoad(options) { this.shareSid = options.shareSid - console.log("shareSid>>>>", this.shareSid); + // console.log("shareSid>>>>", this.shareSid); let info = uni.getSystemInfoSync(); @@ -545,7 +572,7 @@ let _this = this _this.$api.newUserQuota().then((resp) => { - console.log("--------", resp); + // console.log("--------", resp); _this.newPerGiftList = resp _this.showModal = false @@ -554,10 +581,40 @@ }) + }, + radioChange(event) { + // console.log("radioChange", event.detail.value); + this.newporGiftSid = event.detail.value + }, + newporGift() { + // console.log("radioChange", this.newporGiftSid); + if (!this.newporGiftSid) { + this.shortToast('请先选择优惠礼包') + return + } + + var params = { + customerSid: getApp().globalData.sid, + bagSid: this.newporGiftSid, + + } + // console.log("params", params); + + let _this = this + _this.$api.createNewUserBagOrder(params).then((resp) => { + + // console.log("resp", resp); + this.$pay(resp) + }).catch(e => {}) + + }, colseDialog() { this.showModal = false }, + colseDialog2() { + this.showModal2 = false + }, colseDialog3() { this.showModal3 = false }, @@ -588,11 +645,11 @@ vos: list } - console.log("=========0", params); + // console.log("=========0", params); _this.$api.transSubmission(params).then((resp) => { - console.log("=========", resp); + // console.log("=========", resp); _this.showModal3 = false let shareData = JSON.stringify({ @@ -630,37 +687,6 @@ }, - shareCard() { - let _this = this - - var list = [] - for (var i = 0; i < this.pickingUpGoods.length; i++) { - var item = this.pickingUpGoods[i] - - if (item.count > 0) { - list.push({ - goodsSid: item.goodsSid, - select: item.count - }) - } - - } - - - var params = { - customerSid: getApp().globalData.sid, - brandId: this.brandType, - vos: list - } - - console.log("=========0", params); - - _this.$api.transSubmission(params).then((resp) => { - - console.log("=========", resp); - }).catch(e => {}) - } - } } @@ -683,6 +709,13 @@ border: 0; } + .newpor_bom { + /* 加载背景图 */ + background-image: url(https://supervise.yxtsoft.com/lpk/image/newpor_bom.png); + /* background-image: url(../../static/clound_bj1.png); */ + /* 让背景图基于容器大小伸缩 */ + background-size: 100% 100%; + } .top { @@ -820,6 +853,7 @@ height: 100%; top: 0; left: 0; + flex-direction: column; justify-content: center; align-items: center; } @@ -828,9 +862,10 @@ box-sizing: border-box; padding: 26rpx 6%; display: flex; - justify-content: space-between; + flex-direction: row; align-items: center; border-bottom: 1px solid #eee; + width: 100%; } .modalDlg3 { diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index 9770db1..04bb376 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -10,7 +10,7 @@ - {{userInfo.nick}} + {{userInfo.nick}} {{userInfo.mobile}} @@ -49,28 +49,29 @@ - - 待付款 + 我的订单 - + + - --> + 转赠记录 @@ -278,6 +279,17 @@ uni.navigateTo({ url: '/pages/records/reservationRecords2', }) + break; + case "我的订单": + uni.navigateTo({ + url: '/pages/records/orderRecords', + }) + + // uni.navigateTo({ + // url:"/pages/records/orderDetail" + // }) + + break; case "待付款": diff --git a/pages/records/orderDetail.vue b/pages/records/orderDetail.vue new file mode 100644 index 0000000..0aae4c0 --- /dev/null +++ b/pages/records/orderDetail.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file diff --git a/pages/records/orderRecords.vue b/pages/records/orderRecords.vue new file mode 100644 index 0000000..c584c34 --- /dev/null +++ b/pages/records/orderRecords.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file