From 2ba9d8bba9beffb243e67dfd686bb4160f86221d Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sun, 4 Feb 2024 11:31:30 +0800 Subject: [PATCH] 111111 --- common/request.api.js | 2 +- pages/good/shoppCart.vue | 5 +- pages/home/cloudCard2.vue | 4 +- pages/home/myHome.vue | 5 +- pages/records/orderDetail.vue | 47 +++++++------- pages/records/reservationRecords3.vue | 88 ++++++++++++++++----------- pages/records/reservationRecords4.vue | 69 ++++++++++++++------- utils/requester.js | 11 +++- 8 files changed, 142 insertions(+), 89 deletions(-) diff --git a/common/request.api.js b/common/request.api.js index 01cc9ee..6245fc6 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -158,6 +158,6 @@ export default { // 我的菜窖 预约提菜 选择时间范围 getExtractSaturAndSun: (params = {}) => request.get("/customerstore/isSaturAndSun", params), // 我的菜窖 保存预约提菜 - submissionExtract: (params = {}) => request.post("/lpksreservoorders/submission", params), + submissionExtract: (params = {}) => request.post("/lpksreservoorders/submission", params, {}, {}, true), } \ No newline at end of file diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue index ad7f7df..8190962 100644 --- a/pages/good/shoppCart.vue +++ b/pages/good/shoppCart.vue @@ -85,9 +85,10 @@ ，{{page.qssl}}斤起订。 + style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;"> 起订说明 - + >> diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index 3f18392..f618df9 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -162,10 +162,10 @@ + style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;"> 起订说明 + style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;margin-left: 2px;"> >> diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index f863b9e..de78653 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -149,8 +149,7 @@ - * - {{child.remarks}} + *{{child.remarks}} @@ -221,7 +220,7 @@ methods: { makePhoneCall() { wx.makePhoneCall({ - phoneNumber: '15503115233', + phoneNumber: '15632127890', }) }, diff --git a/pages/records/orderDetail.vue b/pages/records/orderDetail.vue index 0aae4c0..08d2a49 100644 --- a/pages/records/orderDetail.vue +++ b/pages/records/orderDetail.vue @@ -139,10 +139,10 @@ return { page: { sid: "", - countdown: "" + countdown: "", + nowDate: "" }, - data: { - } + data: {} } }, onLoad(options) { @@ -158,6 +158,7 @@ _this.$api.orderDetails(_this.page.sid).then((resp) => { _this.data = resp + _this.page.nowDate = resp.nowDate _this.countTime() // 倒计时 _this.$nextTick(() => { _this.$refs.pageView.setLoadState(2) @@ -170,25 +171,30 @@ }) }, continuePy() { - + var list = this.page.countdown.split(":") - var mm = list[0] // 获取分钟数 - var ss = list[1] // 获取秒数 - - var totalSeconds = Number(mm)*60+ Number(ss) - + var mm = list[0] // 获取分钟数 + var ss = list[1] // 获取秒数 + + var totalSeconds = Number(mm) * 60 + Number(ss) + this.data.result.remainder = totalSeconds - // console.log("==============",this.data.result.remainder); + // console.log("==============",this.data.result.remainder); this.$pay(this.data.result) }, countTime() { var that = this; - var date = new Date(); - var now = date.getTime(); + // var date = new Date(); + // var now = date.getTime(); + // var now = that.data.nowDate; + // console.log("now", that.page.nowDate); var endDate = new Date(that.data.endTime); //设置截止时间 var end = endDate.getTime(); - var leftTime = end - now; //时间差 + // console.log("end", end); + var leftTime = end - that.page.nowDate; //时间差 var d, h, m, s, ms; + // console.log("leftTime", leftTime); + if (leftTime >= 0) { d = Math.floor(leftTime / 1000 / 60 / 60 / 24); h = Math.floor(leftTime / 1000 / 60 / 60 % 24); @@ -199,29 +205,28 @@ s = s < 10 ? "0" + s : s m = m < 10 ? "0" + m : m h = h < 10 ? "0" + h : h - that.page.countdown = m + ":" + s, - //递归每秒调用countTime方法，显示动态时间效果 - setTimeout(that.countTime, 1000); + that.page.countdown = m + ":" + s + //递归每秒调用countTime方法，显示动态时间效果 + that.page.nowDate = that.page.nowDate + 1000 + setTimeout(that.countTime, 1000); } else { that.page.countdown = '00:00:00' that.data.payStatus = '3' that.changePayState() } - }, - changePayState() { let _this = this - _this.$api.changePayState(_this.page.sid).then((resp) => { - + }).catch(e => { }) } - } + + } diff --git a/pages/records/reservationRecords3.vue b/pages/records/reservationRecords3.vue index 973adc8..20131d9 100644 --- a/pages/records/reservationRecords3.vue +++ b/pages/records/reservationRecords3.vue @@ -5,31 +5,37 @@ - + - + - + 预约单号：{{item.reserveCode}} {{item.stateValue}} - + + {{item.storeName}} + + + - + - - {{item.storeName}} - + + + + + + 咨询电话 - + - + 提菜人： {{item.userName}} {{item.userPhone}} @@ -54,20 +60,28 @@ + style="width: 104px; height: 104px;z-index: 100;border-radius: 20px;"> - + + + + + + + + padding-left: 10px;padding-right: 10px;margin-bottom: 8px;"> {{child.goodName}} {{child.num}}{{child.unitName}} @@ -101,7 +115,7 @@ 'padding-top': '10px', 'padding-bottom': '10px', 'border-radius': '15px', - 'background': '#f2f2f2' + 'background': '#F9F9F9' }, data: [] } @@ -156,37 +170,45 @@ .item { position: relative; box-sizing: border-box; + display: flex; + box-sizing: border-box; + flex-direction: column; // /*最重要的部分如下：*/ // background-image: radial-gradient(circle at left 50%, #f2f2f2, #f2f2f2 12px, transparent 12px), // radial-gradient(circle at right 50%, #f2f2f2, #f2f2f2 12px, transparent 12px); .item-line { - width: 100%; - border-bottom: 10rpx dashed #fff; + width: 96%; + display: flex; + flex-direction: row; + box-sizing: border-box; + margin-left: 7px; + margin-right: 7px; + border-bottom: 2rpx dashed #f0f; position: absolute; height: 20rpx; - top: 50%; + top: 150px; } .left-circle { background-color: var(--bgcolor); position: absolute; - width: 40rpx; - height: 40rpx; + width: 50rpx; + height: 50rpx; border-radius: 50%; - top: 50%; - left: -50rpx; + top: 150px; + left: -50px; } .right-circle { background-color: var(--bgcolor); position: absolute; - width: 40rpx; - height: 40rpx; + width: 50rpx; + height: 50rpx; border-radius: 50%; - top: 50%; - right: -50rpx; + top: 150px; + right: -50px; } .item-top { @@ -196,11 +218,9 @@ flex-direction: row; align-items: center; justify-content: space-between; - padding-bottom: 8px; - border-bottom: 1px solid #eee; .item-top-code { - font-size: 13px; + font-size: 14px; color: #333; } @@ -213,7 +233,6 @@ .item-bom { position: relative; //添加的定位 z-index: 100; - margin-top: 10px; display: flex; flex-direction: row; align-items: center; @@ -233,7 +252,7 @@ .item_list { position: relative; //添加的定位 z-index: 100; - margin-top: 10px; + margin-top: 5px; } .item_btn { @@ -243,7 +262,6 @@ align-items: center; width: 100%; justify-content: center; - margin-top: 10px; } } \ No newline at end of file diff --git a/pages/records/reservationRecords4.vue b/pages/records/reservationRecords4.vue index 693a227..cc2dca0 100644 --- a/pages/records/reservationRecords4.vue +++ b/pages/records/reservationRecords4.vue @@ -6,30 +6,45 @@ + padding: 10px 0px; + border-radius: 15px;"> - + - + 预约单号：{{item.reserveCode}} {{item.stateValue}} + + {{item.storeName}} - + + + + - + + + + 咨询电话 + + + @@ -38,7 +53,7 @@ {{item.reserveDate}} - + 提菜人： {{item.userName}} @@ -56,24 +71,33 @@ 已失效 + style="width: 104px; height: 104px;z-index: 100;border-radius: 20px;"> - + + + + + + + + + padding-left: 10px;padding-right: 10px;margin-bottom: 8px;"> {{child.goodName}} {{child.num}}{{child.unitName}} @@ -107,7 +131,7 @@ 'padding-top': '10px', 'padding-bottom': '10px', 'border-radius': '15px', - 'background': '#f2f2f2' + 'background': '#F9F9F9' }, data: [] } @@ -164,6 +188,9 @@ .item { position: relative; box-sizing: border-box; + display: flex; + box-sizing: border-box; + flex-direction: column; // /*最重要的部分如下：*/ // background-image: radial-gradient(circle at left 50%, #f2f2f2, #f2f2f2 12px, transparent 12px), // radial-gradient(circle at right 50%, #f2f2f2, #f2f2f2 12px, transparent 12px); @@ -204,11 +231,11 @@ flex-direction: row; align-items: center; justify-content: space-between; - padding-bottom: 8px; - border-bottom: 1px solid #eee; + // padding-bottom: 8px; + // border-bottom: 1px solid #eee; .item-top-code { - font-size: 13px; + font-size: 14px; color: #BBBBBB; } @@ -221,7 +248,6 @@ .item-bom { position: relative; //添加的定位 z-index: 100; - margin-top: 10px; display: flex; flex-direction: row; align-items: center; @@ -241,7 +267,7 @@ .item_list { position: relative; //添加的定位 z-index: 100; - margin-top: 10px; + margin-top: 5px; } .item_btn { @@ -251,7 +277,6 @@ align-items: center; width: 100%; justify-content: center; - margin-top: 10px; } } \ No newline at end of file diff --git a/utils/requester.js b/utils/requester.js index 18afdc2..5467051 100644 --- a/utils/requester.js +++ b/utils/requester.js @@ -42,7 +42,7 @@ const request = (options, noLoading) => { } Object.assign(_opts, options) let _token = token.getToken() - console.log("token",_token) + console.log("token", _token) let _baseUrl = config.baseUrl let _tokenName = config.tokenName if (_tokenName) { @@ -92,10 +92,13 @@ const request = (options, noLoading) => { }); } else { if (_opts.showFailMessage) { + + console.log("data.msg>>>>>", data.msg); + uni.showToast({ title: data.msg, icon: 'none', - duration: 2000, + duration: 5000, }) } } @@ -157,7 +160,9 @@ const request = (options, noLoading) => { }, complete() { if (_opts.showLoading) { - uni.hideLoading() + console.log("showLoading>>>>>", _opts.showLoading); + uni.hideLoading() + } } })