补缴模块提测版本

pages/coupon-buy/coupon-buy.vue

@@ -16,7 +16,7 @@
 					<view class="name">可抵扣余量</view>
 					<image src="@/static/img/my-sta-bg03.png" mode="heightFix" class="bg"></image>
 					<view class="overflow-payment" @click="topage_order">
-						<text v-if="userinfo.amountOwed">超{{userinfo.amountOwed.toFixed(2)||'0.00'}}元</text>
+						<text v-if="order_info.maspStatus===1">超{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)||'0.00'}}元</text>
 						<text class="ax ax-iconline i-arrow-right icon"></text>
 					</view>
 				</view>
@@ -25,10 +25,10 @@
 			<view class="card">
 				<view class="title">
 					<view>请选择抵扣券</view>
-					<view class="title-text" v-if="userinfo.amountOwed">至少充值{{(3+userinfo.amountOwed).toFixed(2)||'0.00'}}元(超充{{userinfo.amountOwed.toFixed(2)||'0.00'}}元，余量需大于3元才能启动)</view>
+					<view class="title-text" v-if="order_info.maspStatus===1">至少充值{{(3+((order_info.maspAmount+order_info.maspRealAmount))).toFixed(2)||'0.00'}}元(超充{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)||'0.00'}}元，余量需大于3元才能启动)</view>
 				</view>
 				<view class="coupons">
-					<view v-for="(item,index) in coupons.data" :key="index" :class="{active:coupons.index==index}"
+					<view v-for="(item,index) in coupons.data" :key="index" :style="{opacity:`${(3+(order_info.maspAmount+order_info.maspRealAmount)).toFixed(2)>item.levelMoney?'0.4':''}`}" :class="{active:coupons.index==index}"
 						@click="choose(item,index)" class="coupon-item">
 						<view class="ticket">
 							<view class="value"><text class="val">{{item.levelMoney}}</text>
@@ -56,7 +56,7 @@
 				<view class="li">5. 实际结算价以具体充电时段为准</view>
 			</view>
 			<view class="footer">
-				<view class="payment-tips" v-if="coupons.index>=0">购买{{select_num}}元，补缴{{userinfo.amountOwed}}元，剩余{{select_num-userinfo.amountOwed}}元</view>
+				<view class="payment-tips" v-if="coupons.index>=0">购买{{select_num}}元，补缴{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)}}元，剩余{{select_num-(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)}}元</view>
 				<button @click="pay()" class="pay" :disabled="coupons.index<0">立即支付购买</button>
 				<ax-ios-indicator></ax-ios-indicator>
 			</view>
@@ -65,6 +65,7 @@
 </template>
 
 <script>
+import app from '../../static/js/app'
 	export default {
 		data() {
 			return {
@@ -83,6 +84,7 @@
 			this.getMyAccount()
 			this.getLevel()
 			this.select_orderstatus()
+			this.get_orderPayment()
 		},
 		onLoad(options) {
 			this.payment=options.payment
@@ -94,6 +96,11 @@
 				})
 			},
 			choose(item, index) {
+				let num=((this.order_info.maspAmount+this.order_info.maspRealAmount)+3).toFixed(2)
+				if(num>item.levelMoney){
+					this.$app.popup.toast(`购买金额必须大于${num}元`)
+					return
+				}
 				this.coupons.index = this.coupons.index != index ? index : -1;
 				this.select_num=item.levelMoney
 			},
@@ -153,13 +160,15 @@
 					this.order_status=res.table.rows
 				})
 			},
-			topage_order(){
+			get_orderPayment(){
 				// maspStatus（1:待补缴，2：已补缴）realPredictServiceCost平台；maspAmount第三方
 				this.$api.base("post","/chargeApi/queryOrderList-arrearage",{},{}).then(res=>{
 					this.order_info=res.data
-					this.$app.url.goto('/pages/order-detail/order-detail?orderId='+res.data.id);
 				})
 			},
+			topage_order(){
+				this.$app.url.goto('/pages/order-detail/order-detail?orderId='+this.order_info.id);
+			},
 			getMyAccount() {
 				this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(res => {
 					this.userinfo = res.accountInfo

pages/index/index.vue

@@ -20,10 +20,10 @@
 				</label>
 			</view>
 		</view>
-		<view class="arrears-tips" v-if="payment_msg">
+		<view class="arrears-tips" v-if="payment_msg!=null">
 			<view class="arrears-left">
 				<image class="arrears-icon" src="@/static/img/arrears-icon.svg" mode=""></image>
-				<view class="arrears-text">您有一笔超充订单{{payment_msg.maspAmount+payment_msg.realPredictServiceCost||'0'}}元待补缴</view>
+				<view class="arrears-text">您有一笔超充订单{{(payment_msg.maspAmount+payment_msg.maspRealAmount).toFixed(2)}}元待补缴</view>
 			</view>
 			<view class="arrears-btn" @click="topage_coupon">去补缴</view>
 		</view>
@@ -195,7 +195,7 @@
 		},
 		data() {
 			return {
-				payment_msg:{},
+				payment_msg:null,
 				user_info:{},
 				// 导航栏高度
 				appNavigationHeight: 0,

pages/order-detail/order-detail.vue

@@ -20,14 +20,14 @@
 				<view class="cell"><view class="lable">终止时间</view><view class="contet">{{orderInfo.endTime || '未知'}}</view></view>
 				<view class="cell"><view class="lable">终止方式</view><view class="contet">{{getStopType()}}</view></view>
 			</view>
-			<view class="cell-group" v-if="orderInfo.maspStatus>0">
+			<view class="cell-group" v-if="orderInfo.maspStatus!=0">
 				<template v-if="orderInfo.maspStatus===1">
 					<view class="cell"><view class="load-payment">待补缴</view><view class="load-payment-btn" @click="$app.url.goto('/pages/coupon-buy/coupon-buy')">去补缴</view></view>
-					<view class="cell"><view class="lable">超充金额</view><view class="flow-money">{{(orderInfo.maspAmount+orderInfo.realPredictServiceCost).toFixed(2)||'0'}}元</view></view>
+					<view class="cell"><view class="lable">超充金额</view><view class="flow-money">{{(orderInfo.maspAmount+orderInfo.maspRealAmount).toFixed(2)||'0'}}元</view></view>
 				</template>
 				<template v-else-if="orderInfo.maspStatus===2">
 					<view class="finish-payment">已补缴</view>
-					<view class="cell"><view class="lable">超充金额</view><view class="contet">{{(orderInfo.maspAmount+orderInfo.realPredictServiceCost).toFixed(2)}}</view></view>
+					<view class="cell"><view class="lable">超充金额</view><view class="contet">{{(orderInfo.maspAmount+orderInfo.maspRealAmount).toFixed(2)}}</view></view>
 					<view class="cell"><view class="lable">补缴时间</view><view class="contet">{{orderInfo.maspTime}}</view></view>
 				</template>
 			</view>

pages/order/order.vue

@@ -30,10 +30,10 @@
 					</view>
 					<view class="button-box">
 						<view @click.stop="customerService()" class="invoice">开发票</view>
-						<view class="arrears-btn-box" v-if="item.maspAmount+item.realPredictServiceCost>0" @click="$app.url.goto('/pages/coupon-buy/coupon-buy')">
-							<view class="overflow-mon">超{{(item.maspAmount+item.realPredictServiceCost).toFixed(2)}}元</view>
-							<view class="arrears-btn">去补缴</view>
-						</view>
+							<view class="arrears-btn-box" v-if="item.maspStatus===1" @click="$app.url.goto('/pages/coupon-buy/coupon-buy')">
+								<view class="overflow-mon">超{{(item.maspAmount+item.maspRealAmount).toFixed(2)}}元</view>
+								<view class="arrears-btn">去补缴</view>
+							</view>
 					</view>
 				</view>
 				<view v-if="orders.data.length==0" class="empty">

pages/recharge-log/recharge-log.css

@@ -70,7 +70,14 @@ ax-body >>> .ax-body{
 	color: #aaa;
 	line-height: 26px;
 }
-
+.backTaxAmount{
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+}
+.check-backTaxAmount{
+	color: #f05000;
+}
 .list .loadmore{
 	display: flex;
 	align-items: center;

pages/recharge-log/recharge-log.vue

@@ -11,6 +11,12 @@
 						<view>订单编号：{{item.outTradeNo}}</view>
 						<view>购券时间：{{item.payTime}}</view>
 						<view>实付金额：{{item.orderMoney}}元</view>
+						<view class="backTaxAmount" v-if="item.backTaxAmount&&item.backTax===0">
+							<view class="">超充金额：{{item.backTaxAmount}}元</view>
+							<view>|</view>
+							<view class="check-backTaxAmount" @click="topage_order(item)">查看超充订单</view>
+						</view>
+						<view v-if="item.backTaxAmount&&item.backTax===0">可抵扣余量：{{item.orderMoney-item.backTaxAmount}}元</view>
 						<view v-if="item.orderStatus!=2">退款时间：{{item.refundTime}}</view>
 						<view v-if="item.orderStatus!=2">退款金额：{{item.refundMoney}}元</view>
 					</view>
@@ -69,6 +75,9 @@
 						this.logs.data = res.orderLsit.rows
 					})
 				}
+			},
+			topage_order(item){
+				this.$app.url.goto('/pages/order-detail/order-detail?orderId='+item.chargeOrderId);
 			}
 		}
 	}

pages/terminal/terminal.vue

@@ -138,7 +138,7 @@
 			<view class="Modal-tips">
 				<view class="tips-icon">!</view>
 				<view class="icon-title">温馨提示</view>
-				<view class="tips-text" v-if="amountOwed">您有一笔超充订单{{amountOwed}}元待补缴</view>
+				<view class="tips-text" v-if="payment_msg!=null">您有一笔超充订单{{(payment_msg.maspAmount+payment_msg.maspRealAmount).toFixed(2)}}元待补缴</view>
 				<view class="tips-btn">
 					<view class="cancel-btn" @click="$refs.filter.close()">取消</view>
 					<view class="confirm-btn" @click="$app.url.goto('/pages/coupon-buy/coupon-buy')">购券并补缴</view>
@@ -185,19 +185,20 @@
 					})
 				}
 			})
-
-
-
 		},
 		mounted() {
-			if(this.amountOwed!==null){
-				this.$refs.filter.open()
-			}
+			this.get_paymentMsg()
+			setTimeout(()=>{
+				if(this.payment_msg!=null){
+					this.$refs.filter.open()
+				}
+			},500)
+
 
 		},
 		data() {
 			return {
-				amountOwed:null,
+				payment_msg:null,
 				deviceId: 0,
 				deviceStatus: 0,
 				visit: '',
@@ -258,12 +259,17 @@
 					}
 				})
 			},
+			get_paymentMsg(){
+				// maspStatus（1:待补缴，2：已补缴）realPredictServiceCost平台；maspAmount第三方
+				this.$api.base("post","/chargeApi/queryOrderList-arrearage",{},{}).then(res=>{
+					this.payment_msg=res.data
+				})
+			},
 			//获取账户信息
 			getAccountInfo() {
 				if (this.personal == 1) {
 					//获取个人账户信息
 					this.$api.base("post", "/chargeApi/getUserAccount", {}, {}).then(res => {
-						this.amountOwed=res.userAccount.amountOwed
 						this.accountInfo.balance = res.userAccount.balance;
 					})
 				} else {

static/js/config.js

@@ -7,9 +7,9 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	// request : 'https://charge.hub.zswlgz.com/',
-	request : 'http://192.168.1.34:80/',
+	// request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
-	// request : 'https://charge.dev.hub.zswlgz.com/',
+	request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',
 	// 下载地址

unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "首页",
   "usingComponents": {
     "ax-body": "/components/ax-body/ax-body",
+    "ax-popup": "/components/ax-popup/ax-popup",
     "app-navigation": "/components/app-navigation/app-navigation"
   }
 }

unpackage/dist/build/mp-weixin/pages/recharge-log/recharge-log.wxss

@@ -1 +1 @@
-ax-body.data-v-50e6ce4c .ax-body{background-color:#f5f7fb}.data-v-50e6ce4c .ax-custom-title{background-color:#fff}.page-background.data-v-50e6ce4c{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-50e6ce4c{display:flex;flex-direction:column;width:100%;height:100%;padding:10px 0;overflow:auto;position:relative;z-index:1}.list .item + .item.data-v-50e6ce4c{margin-top:10px}.list .item.data-v-50e6ce4c{display:block;background-color:#fff;border-radius:10px;padding:20px 10px}.list .item .title.data-v-50e6ce4c{display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid #f0f0f0;padding-bottom:10px;margin-bottom:10px}.list .item .title .name.data-v-50e6ce4c{font-size:16px;font-weight:700}.list .item .title .state.data-v-50e6ce4c{display:flex;align-items:center;justify-content:center;width:74px;height:22px;font-size:14px;color:#fff;background-color:#4edc86;border-radius:100px 0 0 0;margin-right:-10px}.list .item .title .state.data-v-50e6ce4c:before{content:"";display:inline-block;width:4px;height:4px;border-radius:100%;background-color:#fff;margin-right:5px}.list .item .cell.data-v-50e6ce4c{font-size:12px;color:#aaa;line-height:26px}.list .loadmore.data-v-50e6ce4c{display:flex;align-items:center;justify-content:center;font-size:12px;color:#aaa;height:60px}.nothing.data-v-50e6ce4c{display:flex;align-items:center;justify-content:center;flex-direction:column;width:100%;height:100%;background-color:#fff;border-radius:16px;box-shadow:0 0 10px rgba(0,0,0,.1);font-size:14px;color:#ccc}.nothing .icon.data-v-50e6ce4c{display:block;width:25vw;margin-bottom:10px}
+ax-body.data-v-66ee39cb .ax-body{background-color:#f5f7fb}.data-v-66ee39cb .ax-custom-title{background-color:#fff}.page-background.data-v-66ee39cb{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-66ee39cb{display:flex;flex-direction:column;width:100%;height:100%;padding:10px 0;overflow:auto;position:relative;z-index:1}.list .item + .item.data-v-66ee39cb{margin-top:10px}.list .item.data-v-66ee39cb{display:block;background-color:#fff;border-radius:10px;padding:20px 10px}.list .item .title.data-v-66ee39cb{display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid #f0f0f0;padding-bottom:10px;margin-bottom:10px}.list .item .title .name.data-v-66ee39cb{font-size:16px;font-weight:700}.list .item .title .state.data-v-66ee39cb{display:flex;align-items:center;justify-content:center;width:74px;height:22px;font-size:14px;color:#fff;background-color:#4edc86;border-radius:100px 0 0 0;margin-right:-10px}.list .item .title .state.data-v-66ee39cb:before{content:"";display:inline-block;width:4px;height:4px;border-radius:100%;background-color:#fff;margin-right:5px}.list .item .cell.data-v-66ee39cb{font-size:12px;color:#aaa;line-height:26px}.backTaxAmount.data-v-66ee39cb{display:flex;align-items:center;gap:10rpx}.check-backTaxAmount.data-v-66ee39cb{color:#f05000}.list .loadmore.data-v-66ee39cb{display:flex;align-items:center;justify-content:center;font-size:12px;color:#aaa;height:60px}.nothing.data-v-66ee39cb{display:flex;align-items:center;justify-content:center;flex-direction:column;width:100%;height:100%;background-color:#fff;border-radius:16px;box-shadow:0 0 10px rgba(0,0,0,.1);font-size:14px;color:#ccc}.nothing .icon.data-v-66ee39cb{display:block;width:25vw;margin-bottom:10px}

unpackage/dist/build/mp-weixin/pages/terminal/terminal.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "充电终端",
   "usingComponents": {
     "ax-body": "/components/ax-body/ax-body",
-    "ax-ios-indicator": "/components/ax-ios-indicator/ax-ios-indicator"
+    "ax-ios-indicator": "/components/ax-ios-indicator/ax-ios-indicator",
+    "ax-popup": "/components/ax-popup/ax-popup"
   }
 }

unpackage/dist/build/mp-weixin/static/img/arrears-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15"><defs><style>.a{fill:#fab14f;}</style></defs><path class="a" d="M7.515,0a7.5,7.5,0,1,0,7.5,7.5A7.5,7.5,0,0,0,7.515,0ZM7.322,8.114,6.884,8.8a10.521,10.521,0,0,0-1.109-1.2v3.368H4.989V7.668q-.5.48-1.137.994l-.246-.809A8.073,8.073,0,0,0,5.964,5.167H3.835V4.443H5.09q-.177-.472-.463-1.061l.775-.2A10.771,10.771,0,0,1,5.89,4.443h.867v.648A6.261,6.261,0,0,1,5.772,6.8v.068q.253.168.379.261a3.259,3.259,0,0,0,.732-.758l.463.455a3.326,3.326,0,0,1-.69.69,7.577,7.577,0,0,1,.665.6Zm1-4.9h.783V5.967q1.2.766,2.316,1.65l-.471.7q-1.07-.943-1.844-1.524v4.169H8.324Zm-.1,9.652.208-.489.276.281Zm.628-.3L8.5,12.232l.42-.751.752.764Zm.977-.466-.782-.795,2.15-2.185.781.8Zm2.289-2.348-.763-.777a.549.549,0,0,1,.463-.256.554.554,0,0,1,.554.562.564.564,0,0,1-.254.471Z" transform="translate(-0.015)"/></svg>

unpackage/dist/build/mp-weixin/static/img/charge_loading.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><defs><style>.a{fill:#ffd86e;}.b{fill:none;}</style></defs><g transform="translate(-107 -186)"><path class="a" d="M194.714,81.492h-2.29a.427.427,0,0,1-.4-.578l2.275-5.972a.427.427,0,0,1,.4-.275h3.84a.427.427,0,0,1,.4.588l-1.325,3.252H200.1a.427.427,0,0,1,.321.708l-6.115,6.968a.427.427,0,0,1-.733-.39Z" transform="translate(-81.997 113.333)"/><rect class="b" width="14" height="14" transform="translate(107 186)"/></g></svg>

unpackage/dist/build/mp-weixin/static/js/config.js

@@ -6,10 +6,10 @@ const config = {};
 // 地址类
 config.url = {
 	// API请求基础URL
-	request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://192.168.1.36:80/',
+	// request : 'https://charge.hub.zswlgz.com/',
+	// request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
-	// request : 'https://charge.dev.hub.zswlgz.com/',
+	request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',
 	// 下载地址

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10842,9 +10842,9 @@ var config = {};
 config.url = {
   // API请求基础URL
   // request : 'https://charge.hub.zswlgz.com/',
-  request: 'http://192.168.1.34:80/',
+  // request : 'http://192.168.1.34:80/',
   // request : 'http://120.78.228.211:8866/',
-  // request : 'https://charge.dev.hub.zswlgz.com/',
+  request: 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: 'http://127.0.0.1:3000/upload/',
   // 下载地址

unpackage/dist/dev/mp-weixin/pages/coupon-buy/coupon-buy.js

@@ -128,15 +128,37 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.userinfo.amountOwed
-    ? _vm.userinfo.amountOwed.toFixed(2) || "0.00"
-    : null
-  var g1 = _vm.userinfo.amountOwed
-    ? (3 + _vm.userinfo.amountOwed).toFixed(2) || "0.00"
-    : null
-  var g2 = _vm.userinfo.amountOwed
-    ? _vm.userinfo.amountOwed.toFixed(2) || "0.00"
-    : null
+  var g0 =
+    _vm.order_info.maspStatus === 1
+      ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(
+          2
+        ) || "0.00"
+      : null
+  var g1 =
+    _vm.order_info.maspStatus === 1
+      ? (
+          3 +
+          (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount)
+        ).toFixed(2) || "0.00"
+      : null
+  var g2 =
+    _vm.order_info.maspStatus === 1
+      ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(
+          2
+        ) || "0.00"
+      : null
+  var g3 = (
+    3 +
+    (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount)
+  ).toFixed(2)
+  var g4 =
+    _vm.coupons.index >= 0
+      ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(2)
+      : null
+  var g5 =
+    _vm.coupons.index >= 0
+      ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(2)
+      : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -144,6 +166,9 @@ var render = function () {
         g0: g0,
         g1: g1,
         g2: g2,
+        g3: g3,
+        g4: g4,
+        g5: g5,
       },
     }
   )
@@ -182,10 +207,12 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _app = _interopRequireDefault(__webpack_require__(/*! ../../static/js/app */ 34));
 //
 //
 //
@@ -270,6 +297,7 @@ var _default = {
     this.getMyAccount();
     this.getLevel();
     this.select_orderstatus();
+    this.get_orderPayment();
   },
   onLoad: function onLoad(options) {
     this.payment = options.payment;
@@ -282,6 +310,11 @@ var _default = {
       });
     },
     choose: function choose(item, index) {
+      var num = (this.order_info.maspAmount + this.order_info.maspRealAmount + 3).toFixed(2);
+      if (num > item.levelMoney) {
+        this.$app.popup.toast("\u8D2D\u4E70\u91D1\u989D\u5FC5\u987B\u5927\u4E8E".concat(num, "\u5143"));
+        return;
+      }
       this.coupons.index = this.coupons.index != index ? index : -1;
       this.select_num = item.levelMoney;
     },
@@ -343,14 +376,16 @@ var _default = {
         _this3.order_status = res.table.rows;
       });
     },
-    topage_order: function topage_order() {
+    get_orderPayment: function get_orderPayment() {
       var _this4 = this;
       // maspStatus（1:待补缴，2：已补缴）realPredictServiceCost平台；maspAmount第三方
       this.$api.base("post", "/chargeApi/queryOrderList-arrearage", {}, {}).then(function (res) {
         _this4.order_info = res.data;
-        _this4.$app.url.goto('/pages/order-detail/order-detail?orderId=' + res.data.id);
       });
     },
+    topage_order: function topage_order() {
+      this.$app.url.goto('/pages/order-detail/order-detail?orderId=' + this.order_info.id);
+    },
     getMyAccount: function getMyAccount() {
       var _this5 = this;
       this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(function (res) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -132,9 +132,13 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var s0 = _vm.__get_style([_vm.StyleSheet])
-  var g0 = _vm.banners.length
+  var g0 =
+    _vm.payment_msg != null
+      ? (_vm.payment_msg.maspAmount + _vm.payment_msg.maspRealAmount).toFixed(2)
+      : null
+  var g1 = _vm.banners.length
   var l0 =
-    g0 > 0
+    g1 > 0
       ? _vm.__map(_vm.banners, function (item, index) {
           var $orig = _vm.__get_orig(item)
           var m0 = _vm.showImg(item.pic)
@@ -146,21 +150,21 @@ var render = function () {
       : null
   var l1 = _vm.__map(_vm.list.data, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g1 =
+    var g2 =
       (_vm.user_info.firmType === 0 ||
         _vm.user_info.firmId === null ||
         _vm.user_info === null) &&
       item.params.nowPrice
         ? item.params.nowPrice.toFixed(4)
         : null
-    var g2 = !(
+    var g3 = !(
       _vm.user_info.firmType === 0 ||
       _vm.user_info.firmId === null ||
       _vm.user_info === null
     )
       ? item.params.firmPrice.toFixed(4)
       : null
-    var g3 =
+    var g4 =
       !(
         _vm.user_info.firmType === 0 ||
         _vm.user_info.firmId === null ||
@@ -170,9 +174,9 @@ var render = function () {
         : null
     return {
       $orig: $orig,
-      g1: g1,
       g2: g2,
       g3: g3,
+      g4: g4,
     }
   })
   var l2 = _vm.__map(_vm.adBanner, function (item, index) {
@@ -215,6 +219,7 @@ var render = function () {
       $root: {
         s0: s0,
         g0: g0,
+        g1: g1,
         l0: l0,
         l1: l1,
         l2: l2,
@@ -475,7 +480,7 @@ var _default = {
   },
   data: function data() {
     return {
-      payment_msg: {},
+      payment_msg: null,
       user_info: {},
       // 导航栏高度
       appNavigationHeight: 0,

unpackage/dist/dev/mp-weixin/pages/order-detail/order-detail.js

@@ -127,18 +127,15 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = _vm.getStopType()
   var g0 =
-    _vm.orderInfo.maspStatus > 0 && _vm.orderInfo.maspStatus === 1
-      ? (
-          _vm.orderInfo.maspAmount + _vm.orderInfo.realPredictServiceCost
-        ).toFixed(2) || "0"
+    _vm.orderInfo.maspStatus != 0 && _vm.orderInfo.maspStatus === 1
+      ? (_vm.orderInfo.maspAmount + _vm.orderInfo.maspRealAmount).toFixed(2) ||
+        "0"
       : null
   var g1 =
-    _vm.orderInfo.maspStatus > 0 &&
+    _vm.orderInfo.maspStatus != 0 &&
     !(_vm.orderInfo.maspStatus === 1) &&
     _vm.orderInfo.maspStatus === 2
-      ? (
-          _vm.orderInfo.maspAmount + _vm.orderInfo.realPredictServiceCost
-        ).toFixed(2)
+      ? (_vm.orderInfo.maspAmount + _vm.orderInfo.maspRealAmount).toFixed(2)
       : null
   var m1 = _vm.getOrderStatus(_vm.orderInfo.status)
   var g2 =

unpackage/dist/dev/mp-weixin/pages/order/order.js

@@ -138,8 +138,8 @@ var render = function () {
         : null
     var g1 = item.realCost.toFixed(4) || ""
     var g2 =
-      item.maspAmount + item.realPredictServiceCost > 0
-        ? (item.maspAmount + item.realPredictServiceCost).toFixed(2)
+      item.maspStatus === 1
+        ? (item.maspAmount + item.maspRealAmount).toFixed(2)
         : null
     return {
       $orig: $orig,

unpackage/dist/dev/mp-weixin/pages/recharge-log/recharge-log.js

@@ -213,6 +213,12 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default = {
   onLoad: function onLoad() {
     this.loadData();
@@ -257,6 +263,9 @@ var _default = {
           _this.logs.data = res.orderLsit.rows;
         });
       }
+    },
+    topage_order: function topage_order(item) {
+      this.$app.url.goto('/pages/order-detail/order-detail?orderId=' + item.chargeOrderId);
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/recharge-log/recharge-log.wxss

@@ -69,6 +69,14 @@ ax-body.data-v-1059d8c6 .ax-body{
 	color: #aaa;
 	line-height: 26px;
 }
+.backTaxAmount.data-v-1059d8c6{
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+}
+.check-backTaxAmount.data-v-1059d8c6{
+	color: #f05000;
+}
 .list .loadmore.data-v-1059d8c6{
 	display: flex;
 	align-items: center;

unpackage/dist/dev/mp-weixin/pages/terminal/terminal.js

@@ -154,6 +154,10 @@ var render = function () {
       : null
   var m2 = _vm.getPriceLable(_vm.nowPriceTime.timeType)
   var m3 = _vm.getDeviceStatusLable(_vm.deviceInfo.deviceStatus)
+  var g5 =
+    _vm.payment_msg != null
+      ? (_vm.payment_msg.maspAmount + _vm.payment_msg.maspRealAmount).toFixed(2)
+      : null
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       return _vm.$app.url.goto(
@@ -180,6 +184,7 @@ var render = function () {
         g4: g4,
         m2: m2,
         m3: m3,
+        g5: g5,
       },
     }
   )
@@ -410,13 +415,17 @@ var _default = {
     });
   },
   mounted: function mounted() {
-    if (this.amountOwed !== null) {
-      this.$refs.filter.open();
-    }
+    var _this3 = this;
+    this.get_paymentMsg();
+    setTimeout(function () {
+      if (_this3.payment_msg != null) {
+        _this3.$refs.filter.open();
+      }
+    }, 500);
   },
   data: function data() {
     return {
-      amountOwed: null,
+      payment_msg: null,
       deviceId: 0,
       deviceStatus: 0,
       visit: '',
@@ -474,40 +483,46 @@ var _default = {
     },
     //获取设备的详情信息
     getDeviceInfo: function getDeviceInfo(deviceId) {
-      var _this3 = this;
+      var _this4 = this;
       this.$api.base("post", "/chargeApi/getDevicesDetial", {
         "deviceId": deviceId
       }, {}).then(function (res) {
-        _this3.deviceInfo = res.device;
-        _this3.nowPriceTime = res.nowPriceTime;
-        _this3.stationInfo = res.stationInfo;
+        _this4.deviceInfo = res.device;
+        _this4.nowPriceTime = res.nowPriceTime;
+        _this4.stationInfo = res.stationInfo;
         if (res.discountInfo) {
-          _this3.discountInfo = res.discountInfo;
+          _this4.discountInfo = res.discountInfo;
         }
-        if (_this3.deviceInfo.tipsStatus == 1) {
-          _this3.$app.popup.alert(_this3.deviceInfo.tipsContent, "温馨提示");
+        if (_this4.deviceInfo.tipsStatus == 1) {
+          _this4.$app.popup.alert(_this4.deviceInfo.tipsContent, "温馨提示");
         }
       });
     },
+    get_paymentMsg: function get_paymentMsg() {
+      var _this5 = this;
+      // maspStatus（1:待补缴，2：已补缴）realPredictServiceCost平台；maspAmount第三方
+      this.$api.base("post", "/chargeApi/queryOrderList-arrearage", {}, {}).then(function (res) {
+        _this5.payment_msg = res.data;
+      });
+    },
     //获取账户信息
     getAccountInfo: function getAccountInfo() {
-      var _this4 = this;
+      var _this6 = this;
       if (this.personal == 1) {
         //获取个人账户信息
         this.$api.base("post", "/chargeApi/getUserAccount", {}, {}).then(function (res) {
-          _this4.amountOwed = res.userAccount.amountOwed;
-          _this4.accountInfo.balance = res.userAccount.balance;
+          _this6.accountInfo.balance = res.userAccount.balance;
         });
       } else {
         //获取集团账户信息
         this.$api.base("post", "/chargeApi/getEcUserAccount", {}, {
           error: false
         }).then(function (res) {
-          _this4.ecInfo = res.ecInfo;
-          _this4.accountInfo.balance = res.ecUserAccount.balance;
+          _this6.ecInfo = res.ecInfo;
+          _this6.accountInfo.balance = res.ecUserAccount.balance;
         }).catch(function (err) {
-          _this4.accountInfo.balance = 0;
-          _this4.$app.popup.alert(err.msg, "温馨提示");
+          _this6.accountInfo.balance = 0;
+          _this6.$app.popup.alert(err.msg, "温馨提示");
         });
       }
     },
@@ -590,7 +605,7 @@ var _default = {
       return str;
     },
     startup: function startup() {
-      var _this5 = this;
+      var _this7 = this;
       if (this.visit) {
         this.$app.popup.alert("该充电枪被占用或存在异常，请重新尝试或更换其他充电枪。", "温馨提示");
         return;
@@ -602,7 +617,7 @@ var _default = {
           confirmText: "立即购券"
         }).then(function (confirm) {
           if (confirm) {
-            _this5.$app.url.goto('/pages/coupon-buy/coupon-buy', true);
+            _this7.$app.url.goto('/pages/coupon-buy/coupon-buy', true);
           }
         });
       }
@@ -624,7 +639,7 @@ var _default = {
     },
     //统一下单并启动接口
     startChangeAndOrder: function startChangeAndOrder() {
-      var _this6 = this;
+      var _this8 = this;
       var obj = {
         userId: this.userInfo.id,
         deviceId: this.deviceInfo.id,
@@ -633,18 +648,18 @@ var _default = {
 
       this.$api.base("post", "/chargeApi/startChangeAndOrder", obj, {}).then(function (res) {
         //下单成功，并进行了订单预充值
-        _this6.orderInfo = res.orderInfo;
+        _this8.orderInfo = res.orderInfo;
         if (res.flg && res.flg == 1) {
           //用户有充电中的订单
-          _this6.$app.popup.confirm("您有一个进行中充电订单，不可再次启动。", null, {
+          _this8.$app.popup.confirm("您有一个进行中充电订单，不可再次启动。", null, {
             showCancel: false,
             confirmText: "查看订单"
           }).then(function (cres) {
-            _this6.$app.url.goto('/pages/charging/charging?orderId=' + _this6.orderInfo.id + "&deviceId=" + _this6.deviceInfo.id, false);
+            _this8.$app.url.goto('/pages/charging/charging?orderId=' + _this8.orderInfo.id + "&deviceId=" + _this8.deviceInfo.id, false);
           });
         } else {
           //正常启动充电订单
-          _this6.$app.url.goto('/pages/charging/charging?orderId=' + _this6.orderInfo.id + "&deviceId=" + _this6.deviceInfo.id, false);
+          _this8.$app.url.goto('/pages/charging/charging?orderId=' + _this8.orderInfo.id + "&deviceId=" + _this8.deviceInfo.id, false);
         }
         //this.$app.popup.loading(true,{title:"启动中...."})
         //延迟5s查询一下订单，看看是否真的启动成功
@@ -688,7 +703,7 @@ var _default = {
     }, */
     // 延迟5s查询一下订单，看看是否真的启动成功
     checkedStartStatus: function checkedStartStatus() {
-      var _this7 = this;
+      var _this9 = this;
       this.$api.base("post", "/chargeApi/checkedStartStatus", {
         "id": this.orderInfo.id
       }, {}).then(function (res) {
@@ -698,20 +713,20 @@ var _default = {
             if (respObj.status == 1) {
               uni.hideLoading();
               //状态为1说明正常启动
-              _this7.$app.url.goto('/pages/charging/charging?orderId=' + _this7.orderInfo.id + "&deviceId=" + _this7.deviceInfo.id, false);
+              _this9.$app.url.goto('/pages/charging/charging?orderId=' + _this9.orderInfo.id + "&deviceId=" + _this9.deviceInfo.id, false);
             } else {
               //其他状态，说明充电桩，未启动。或其他问题，需要再次进行进行验证
-              if (_this7.checkNum < 20) {
-                _this7.checkNum = _this7.checkNum + 1;
+              if (_this9.checkNum < 20) {
+                _this9.checkNum = _this9.checkNum + 1;
                 //延迟2s查询一下订单，看看是否真的启动成功
                 setTimeout(function () {
-                  return _this7.checkedStartStatus();
+                  return _this9.checkedStartStatus();
                 }, 2000);
               }
             }
           } else {
             uni.hideLoading();
-            _this7.$app.popup.alert(respObj.msg, "温馨提示");
+            _this9.$app.popup.alert(respObj.msg, "温馨提示");
           }
         } else {
           uni.hideLoading();

unpackage/dist/dev/mp-weixin/static/js/config.js

@@ -7,9 +7,9 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	// request : 'https://charge.hub.zswlgz.com/',
-	request : 'http://192.168.1.34:80/',
+	// request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
-	// request : 'https://charge.dev.hub.zswlgz.com/',
+	request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',
 	// 下载地址