From b1e733c01c8ce32dee4ab6e801a55e74d2e15c33 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 7 Jun 2022 17:49:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BE=85=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                          | 16 ++++++++--------
 manifest.json                                    |  1 -
 pages/user/agentCoupons/agentCoupons.vue         |  8 +++++---
 subPages/recharge-pay/recharge-pay.vue           |  3 ++-
 subPages/rechargeDetails/rechargeDetails.vue     | 10 +++++-----
 .../unionPay-orderList/unionPay-orderList.vue    |  5 ++++-
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/App.vue b/App.vue
index 1fbcc6f..48a6792 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
-			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
+			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/manifest.json b/manifest.json
index 0f1b78e..363e629 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,7 +61,6 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        /* 小程序特有相关 */
         "appid" : "wx8d49e2f83025229d",
         "setting" : {
             "urlCheck" : true
diff --git a/pages/user/agentCoupons/agentCoupons.vue b/pages/user/agentCoupons/agentCoupons.vue
index c75b18f..535a052 100644
--- a/pages/user/agentCoupons/agentCoupons.vue
+++ b/pages/user/agentCoupons/agentCoupons.vue
@@ -43,7 +43,7 @@
 		<!-- /弹窗 -->
 		<view :hidden="userFeedbackHidden" class="popup_content">
 			<view class="popup_title">填写信息</view>
-			<input class="width90 pop_input font14 mart20 marb10" maxlength="11" v-model="feedPhone" placeholder="输入手机号"
+			<input class="width85 pop_input font14 mart20 marb10" maxlength="11" v-model="feedPhone" placeholder="请输入手机号"
 				type="number" v-if="couponSource == 4" />
 			<view class="popup_textarea_item">
 				<textarea class="popup_textarea" placeholder='请填写您的备注信息...' v-model="feedbackContent">
@@ -382,8 +382,10 @@
 
 	.pop_input {
 		// border-bottom: 1px solid #F1F1F1;
-		height: 50rpx;
-		line-height: 50rpx;
+		border: 1px solid #f1f1f1;
+		margin-left: 5%;
+		height: 60rpx;
+		line-height: 60rpx;
 		padding-left: 20rpx;
 	}
 
diff --git a/subPages/recharge-pay/recharge-pay.vue b/subPages/recharge-pay/recharge-pay.vue
index 0be629f..e1ed6bc 100644
--- a/subPages/recharge-pay/recharge-pay.vue
+++ b/subPages/recharge-pay/recharge-pay.vue
@@ -87,7 +87,8 @@
 				PaymentPassword: '',
 				tongCardPrice: 0,
 				payPrice: '', //支付价格
-				oilPirce: 0, //油卡金额
+				oilPirce: 0, //油卡金额
+				paytype:'',  //支付方式
 				paytypeList: [], //支付方式
 				rechargeDes: '', // 话费详情
 			};
diff --git a/subPages/rechargeDetails/rechargeDetails.vue b/subPages/rechargeDetails/rechargeDetails.vue
index fc3917a..354e393 100644
--- a/subPages/rechargeDetails/rechargeDetails.vue
+++ b/subPages/rechargeDetails/rechargeDetails.vue
@@ -81,15 +81,15 @@
 					优惠抵扣 :
 				</view>
 				<view class="right">
-					￥{{recinfo.discountDeductionPrice}}
+					￥{{recinfo.discountDeductionPrice == null ? '0': recinfo.discountDeductionPrice}}
 				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="recinfo.outRechargePrice.payPrice">
 				<view class="left">
 					应付金额 :
 				</view>
 				<view class="right">
-					￥{{recinfo.outRechargePrice.payPrice}}
+					￥{{recinfo.outRechargePrice.payPrice == null ? '0': recinfo.outRechargePrice.payPrice}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.integralDeductionPrice">
@@ -97,7 +97,7 @@
 					积分抵扣 :
 				</view>
 				<view class="right">
-					￥{{recinfo.integralDeductionPrice}}
+					￥{{recinfo.integralDeductionPrice == null ? '0': recinfo.integralDeductionPrice}}
 				</view>
 			</view>
 			<view class="row">
@@ -105,7 +105,7 @@
 					实付金额 :
 				</view>
 				<view class="right">
-					￥{{recinfo.payRealPrice}}
+					￥{{recinfo.payRealPrice == null ? '0': recinfo.payRealPrice}}
 				</view>
 			</view>
 			<view class="row">
diff --git a/subPages/unionPay-orderList/unionPay-orderList.vue b/subPages/unionPay-orderList/unionPay-orderList.vue
index 0f90bcb..c7b3bc2 100644
--- a/subPages/unionPay-orderList/unionPay-orderList.vue
+++ b/subPages/unionPay-orderList/unionPay-orderList.vue
@@ -34,8 +34,11 @@
 							</view>
 						</view>
 						<view class="width30 flright fotrt fcor666 font15 fotrt">
-							<view class="font16 fontwig6 text1 fcor333">
+							<view class="font16 fontwig6 text1 fcor333" v-if="row.payRealPrice">
 								￥{{row.payRealPrice}}
+							</view>
+							<view class="font16 fontwig6 text1 fcor333" v-else>
+								￥0
 							</view>
 							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.payStatus]}}</view>
 						</view>