From 893ca1ed81652c6caa19e775e35126f402ae9a13 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Tue, 11 Jul 2023 16:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=91=E6=8E=A7,=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E8=B7=B3=E8=BD=AC,=E5=95=86=E6=88=B7=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- pages.json | 2 +- pages/admin/order/index.vue | 400 +++++++++++++++-------- pages/admin/order/monitor.vue | 2 +- pages/admin/orderDetail/index.vue | 2 +- pages/admin/orderList/index.vue | 16 +- pages/gather/gather.vue | 6 +- pages/order_details/stay.vue | 177 ++++++---- pages/product/basicSet.vue | 28 +- pages/users/online_warehousing/index.vue | 23 +- pages/users/order_confirm/index.vue | 3 +- pages/users/order_list/index.vue | 10 +- pages/users/payment/payment.vue | 34 +- 13 files changed, 456 insertions(+), 249 deletions(-) diff --git a/App.vue b/App.vue index 8d05470..6841165 100644 --- a/App.vue +++ b/App.vue @@ -9,7 +9,7 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- // #ifdef APP-PLUS - var jpushModule = uni.requireNativePlugin("JG-JPush"); + let jpushModule = uni.requireNativePlugin("JG-JPush"); // #endif import { checkLogin diff --git a/pages.json b/pages.json index aa227e3..e218497 100644 --- a/pages.json +++ b/pages.json @@ -982,7 +982,7 @@ "path": "plant_release/index", "style": { "navigationBarTitleText": "内容发布", - "enablePullDownRefresh":true + "enablePullDownRefresh": false } }, { diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue index 56c283f..b80c52c 100644 --- a/pages/admin/order/index.vue +++ b/pages/admin/order/index.vue @@ -77,54 +77,47 @@ - - - - 订单监控 - - - - - 图 - - - - - 啊十分大师傅但是发sdfsfasfsfs - - - $ 100.00 - - - - 是的方法 - - - - - - 采购数量 - - sdfa - - - - 已售数量 - - sdfa - - - - 库存数量 - - sdfa - - - - - - - - + - 请在{{orderInfo.cancel_time}}前完成支付! + 请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付! + {{orderInfo.add_time_y}}{{orderInfo.create_time}} @@ -166,13 +167,15 @@ 实付款： - 先货后款 : ￥{{orderInfo.pay_price}} + 先货后款 实付: ￥ + {{orderInfo.pay_price}} + ￥{{orderInfo.pay_price}} - + 结算周期到期后付款 ￥{{orderInfo.interest.total_amount}} - + 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}% @@ -185,16 +188,18 @@ - + - - - - - - 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在xx天xx小时后计息。 - - + + + + + + + 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在{{this.be_overdue}}天后计息。 + + + @@ -266,6 +271,7 @@ ], pay_close: false, pay_order_id: '', + pay_type:'',//是否为先货后款订单 totalPrice: '0', isAuto: false, //没有授权的不会自动授权 isShowAuth: false, //是否隐藏授权 @@ -276,7 +282,9 @@ }, show:false, credit_buy:'', - product_type:0 + product_type:0, + be_overdue:'',//逾期时间 + be_overhours:'',//逾期小时 }; }, watch: { @@ -389,11 +397,15 @@ * */ pay_open: function() { - this.pay_close = true; - this.pay_order_id = this.orderInfo.group_order_id.toString(); - this.totalPrice = this.orderInfo.pay_price; - console.log(this.pay_order_id); - console.log(this.totalPrice); + uni.navigateTo({ + url: '/pages/users/payment/payment?order_id=' + this.order_id + '&product_type=' + this.product_type + }); + // this.pay_close = true; + // this.pay_order_id = this.orderInfo.group_order_id.toString(); + // this.totalPrice = this.orderInfo.pay_price; + + // console.log(this.pay_order_id); + // console.log(this.totalPrice); }, /** * 支付成功回调 @@ -451,7 +463,11 @@ let _type = 0; uni.hideLoading(); that.$set(that, 'orderInfo', res.data); - console.log(that.orderInfo.orderList[0].merchant.settle_cycle); + this.pay_type=this.orderInfo.pay_type + if(this.orderInfo.interest.start_time){ + this.moerTime(this.orderInfo.interest.start_time) + } + console.log(that.orderInfo.interest); }).catch(err => { // console.log(err) uni.hideLoading(); @@ -498,6 +514,21 @@ } }); }, + //计算是否逾期 + moerTime(autoTime){ + var date1 = (Date.parse(new Date()))/1000; + var date2 = (Date.parse(new Date(autoTime)))/1000; + var date3 = (date2- date1)*1000; + this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000)); + var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数 + this.be_overhours = Math.floor(leave1 / (3600 * 1000)); + if(this.be_overdue == 0 || this.be_overdue < 0 ){ + var date1 = (Date.parse(new Date()))/1000; + var date2 = (Date.parse(new Date(autoTime)))/1000; + var date3 = (date2- date1)*1000; + this.be_overdue =Math.floor(date3 / (24 * 3600 * 1000)); + } + } } } @@ -739,7 +770,6 @@ border-radius: 50rpx; color: #fff; font-size: 27rpx; - z-index: 1; } .bgColor{ background-color: var(--view-theme); @@ -999,50 +1029,61 @@ bottom: 5px; color: white; } - .warp { - margin: auto; - - .guanbi { - position: absolute; - right: 0px; - z-index: 1; - width: 30px; - height: 30px; - } - } - - .textp { - width: 320px; - padding-bottom: 20px; - position: absolute; - top: 110px; - border-radius: 10px; - span { - display: block; - width: 280px; - padding-top: 20px; - margin: auto; - } - - .shouhuobtn { - margin: auto; - line-height: 54px; - margin-top: 30px; - width: 191px; - height: 54px; - color: white; - background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); - border-radius: 27px 27px 27px 27px; - } - - .cle { - margin: auto; - text-align: center; - margin-top: 15px; - height: 40px; - background-color: #FFFFFF; - border-radius: 10px; - color: #999999; - } - } + + .stybgc{ + background-color: rgba(0, 0, 0,0.5); + width: 100vw; + height: 100vh; + position: relative; + .warp { + position: absolute; + top:30vh; + left: 30px; + + .guanbi { + position: absolute; + right: 0px; + z-index: 1; + width: 30px; + height: 30px; + } + } + + .textp { + position: absolute; + top: 44vh; + left: 35px; + width: 320px; + padding-bottom: 20px; + border-radius: 10px; + span { + display: block; + width: 290px; + padding-top: 20px; + margin: auto; + } + + .shouhuobtn { + margin: auto; + line-height: 54px; + margin-top: 30px; + width: 191px; + height: 54px; + color: white; + background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); + border-radius: 27px 27px 27px 27px; + } + + .cle { + margin: auto; + text-align: center; + margin-top: 15px; + height: 40px; + background-color: #FFFFFF; + border-radius: 10px; + color: #999999; + } + } + } + \ No newline at end of file diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index e0ce65f..b51ebe8 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -54,7 +54,7 @@ 店铺街背景图 - @@ -132,14 +132,14 @@ 先货后款结算周期： - + - *周期结算时间范围为:15~100 周期单位为:天 + *周期结算时间范围为:15~90 周期单位为:天 先货后款结算利率： - + - *利率结算范围为:0.035 ~ 0.01 利率单位为:% + *利率结算范围为:0.01 ~ 0.1 利率单位为:% - + + + + 暂无商品订单~ + + + @@ -79,7 +85,7 @@ where: { page: 1, limit: 10, - status: 2, + status: 20, product_type: 98 }, data: { @@ -149,6 +155,7 @@ \ No newline at end of file diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue index b2681ad..01e5485 100644 --- a/pages/users/payment/payment.vue +++ b/pages/users/payment/payment.vue @@ -47,12 +47,13 @@ ￥ {{couponData.orderList[0].pay_price}} - + 利息合计: ￥ {{couponData.orderList[0].pay_price}} - （已逾期1天) + + 已逾期{{this.be_overday}}天 @@ -64,7 +65,7 @@ ￥0.00 ￥{{couponData.orderList[0].pay_price}} - + 可结算周期到期后再付款￥{{totalPrice}} @@ -139,15 +140,19 @@ ], order_id: '', product_type: 0, - mer_id:'' + mer_id:'', + be_overdue:'',//逾期时间 + be_overday:'',//逾期天数 }; }, onLoad(options) { this.order_id = options.order_id if (options.product_type) { this.product_type = options.product_type } console.log(this.product_type); - this.getOrderInfo() - this.getUserInfo() + this.$nextTick(()=>{ + this.getOrderInfo() + this.getUserInfo() + }) }, methods: { payItem: function(e) { @@ -170,7 +175,9 @@ getOrderInfo() { groupOrderDetail(this.order_id, this.product_type).then(res => { this.couponData = res.data - console.log(res); + this.$nextTick(()=>{ + this.moerTime(this.couponData.interest.start_time) + }) }) }, SubOrder() { @@ -213,6 +220,19 @@ }) } + }, + //计算是否逾期 + moerTime(autoTime){ + var date1 = (Date.parse(new Date()))/1000; + var date2 = (Date.parse(new Date(autoTime)))/1000; + var date3 = (date2- date1)*1000; + this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000)); + if(this.be_overdue == 0 || this.be_overdue < 0 ){ + var date1 = (Date.parse(new Date()))/1000; + var date2 = (Date.parse(new Date(autoTime)))/1000; + var date3 = (date2- date1)*1000; + this.be_overday =Math.floor(date3 / (24 * 3600 * 1000)); + } } }