1.删除无用的方法

2.新增快充入口

subPages/Phone-recharge-details/Phone-recharge-details.vue

@@ -32,15 +32,15 @@
 		</view>
 		<view class="width90 mart15 height22">
 			<view class="flleft fcor333 width50 font15">订单总额</view>
-			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.orderPrice}}元</view>
+			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.orderPrice == null ? '0': phoneorderdes.orderPrice}}元</view>
 		</view>
 		<view class="width90 mart15 height22">
 			<view class="flleft fcor333 width50 font15">优惠</view>
-			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.deductionPrice}}元</view>
+			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.deductionPrice == null ? '0': phoneorderdes.deductionPrice}}元</view>
 		</view>
 		<view class="width90 mart15 height22">
 			<view class="flleft fcor333 width50 font15">实际支付金额</view>
-			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.payRealPrice}}元</view>
+			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.payRealPrice == null ? '0': phoneorderdes.payRealPrice}}元</view>
 		</view>
 		<view class="width100 height90"></view>
 		<button class="coupne-btn width100" @click="toUser">个人中心</button>

subPages/recharge-centre/recharge-centre.vue

@@ -3,59 +3,104 @@
 		<view class="width100 height100p backcorf06">
 			<view class="block">
 				<view class="content height60">
-					<input type="number" class="my flleft font18 fcorfff" placeholder-style="color:#ffffff;"
+					<input type="number" class="my flleft font18 fcorfff" maxlength="11" placeholder-style="color:#ffffff;"
 						placeholder="请输入充值号码" v-model="inputPhone" />
 				</view>
 				<view class="line1 width100 backcorfff"></view>
 			</view>
 		</view>
-		<view class="width90 font16 fcor333 fontwig6 mart40">
+		<view class="mart5">
+			<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
+				activeColor="#089bf5" lineColor="#089bf5" minWidth="374">
+			</QSTabs>
+		</view>
+		<view class="width90 font16 fcor333 fontwig6 mart20">
 			选择金额
 		</view>
 		<view class="list">
 			<view class="box" :class="{'on':item.id == inputAmountId}" v-for="(item,index) in amountList" :key="index"
 				@click="select(item)">
-				<view class="heTitle">{{item.price}}元</view>
+				<view class="heTitle">{{item.price}}元</view>
 				<view class="font13 fcor999" v-if="item.status == 2">已售空</view>
 			</view>
 		</view>
 		<view class="mart5 width90 font18 fcor333 fontwig6">
-			话费充值温馨提示：
+			充值说明：
-		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-			<view style="width: 5%;" class="flleft">1:</view>
-			<view style="margin-left: 5%;">慢充话费与营业厅充值一样，只是到账时间稍长。充值过程中可能出现分批到账的情况，但是总金额不会少，请耐心等待。</view>
-		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-			<view style="width: 5%;" class="flleft">2:</view>
-			<view style="margin-left: 5%;">此业务为话费慢充，日常72小时内到账，如遇月初、月末高峰期或系统更新到账时间会有一定延迟，敬请谅解！急单勿拍！</view>
-		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-			<view style="width: 5%;" class="flleft">3:</view>
-			<view style="margin-left: 5%;">目前仅支持(移动、联通、电信三网号段)，
-				运营商黑名单号码(长期欠费或非实名制认证)、携号转网，空号、虚拟卡（如165.167.170.171.162等等虚拟号段）、副卡号码或做过某些特殊套餐绑定的卡暂不支持充值，请勿下单。</view>
-		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-			<view style="width: 5%;" class="flleft">4:</view>
-			<view style="margin-left: 5%;">停机号码需要额外补缴欠费后，慢充话费才能到账。<text
-					class="fcoreb5">此服务为虚拟充值类服务，无特殊情况不支持退款，下单前请确认充值的号码无误。</text></view>
-		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-			<view style="width: 5%;" class="flleft">5:</view>
-			<view style="margin-left: 5%;">空号、错号充值后不支持退款，请您务必核对确认号码无误后再进行充值。非空号欠费可充，欠费1个月导致空号的不能充值，损失自负无法退款。</view>
-		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-			<view style="width: 5%;" class="flleft">6:</view>
-			<view style="margin-left: 5%;"><text
-					class="fcoreb5">本充值业务不提供发票</text>。如需发票请在运营商手机客户端储开取电子发票，也可以凭身份证到运营商实体营业厅打印发票。</view>
 		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+		<view v-if="current == 0">
-			<view style="width: 5%;" class="flleft">7:</view>
+			<view class="mart5 width80 font14 fcoreb5 fontwig6" style="list-style-type: decimal;">
-			<view style="margin-left: 5%;">如遇系统维护充值失败，将72小时后原路退款到付款账户。 </view>
+				<view style="width: 5%;" class="flleft">1:</view>
+				<view style="margin-left: 5%;">此业务为话费慢充。日常72小时内到账，如遇月初、月末运营商高峰期或系统更新，到账时间会有一定延迟，敬请谅解。充值失败后系统会自动为您退款至原账户。急单请选择“6小时到账”充值端口，感谢您的支持！
+				</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">2:</view>
+				<view style="margin-left: 5%;">慢充话费与营业厅充值一样，只是到账时间稍长。充值过程中可能出现分批到账的情况，但是总金额不会少，请耐心等待。</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">3:</view>
+				<view style="margin-left: 5%;">
+					目前仅支持(移动、联通、电信三网号段)，运营商黑名单号码(长期欠费或非实名制认证)携号转网空号、虚拟卡(如165167170171162等等虚拟号段)副卡号码或做过某些特殊套餐绑定的卡暂不支持充值，请勿下单。
+				</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">4:</view>
+				<view style="margin-left: 5%;">停机号码需要额外补缴欠费后，慢充话费才能到账。<text
+						class="fcoreb5">此服务为虚拟充值类服务，无特殊情况不支持退款，下单前请确认充值的号码无误。</text></view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">5:</view>
+				<view style="margin-left: 5%;">空号、错号充值后不支持退款，请您务必核对确认号码无误后再进行充值。非空号欠费可充，欠费1个月导致空号的不能充值，损失自负无法退款。
+				</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">6:</view>
+				<view style="margin-left: 5%;"><text
+						class="fcoreb5">本充值业务不提供发票</text>。如需发票请在运营商手机客户端储开取电子发票，也可以凭身份证到运营商实体营业厅打印发票。</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">7:</view>
+				<view style="margin-left: 5%;">如遇系统维护充值失败，将72小时后原路退款到付款账户。 </view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6 marb40" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">8:</view>
+				<view style="margin-left: 5%;">请登录所属运营商app（手机营业厅）查看充值号码的到账情况，如金额有出入或未到账，请截图充值记录明细反馈给客服。录明细反馈给客服。</view>
+			</view>
 		</view>
-		<view class="mart5 width80 font14 fcor999 fontwig6 marb40" style="list-style-type: decimal;">
+		<view v-if="current == 1">
-			<view style="width: 5%;" class="flleft">8:</view>
+			<view class="mart5 width80 font14 fcoreb5 fontwig6" style="list-style-type: decimal;">
-			<view style="margin-left: 5%;">请登录所属运营商app（手机营业厅）查看充值号码的到账情况，如金额有出入或未到账，请截图充值记录明细反馈给客服。</view>
+				<view style="width: 5%;" class="flleft">1:</view>
+				<view style="margin-left: 5%;">充值后6小时内到账，请耐心等待；如遇月初、月末运营商充值压力大，充值失败后，系统会为您自动再提交一次，如二次充值仍然失败，系统将会自动为您退款至原账户，请悉知。
+				</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">2:</view>
+				<view style="margin-left: 5%;">
+					目前仅支持(移动、联通、电信三网号段)，运营商黑名单号码(长期欠费或非实名制认证)携号转网空号、虚拟卡(如165167170171162等等虚拟号段)副卡号码或做过某些特殊套餐绑定的卡暂不支持充值，请勿下单。
+				</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">3:</view>
+				<view style="margin-left: 5%;">停机号码需要额外补缴欠费后，慢充话费才能到账。此服务为虚拟充值类服务，无特殊情况不支持退款，下单前请确认充值的号码无误。</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">4:</view>
+				<view style="margin-left: 5%;">空号、错号充值后不支持退款，请您务必核对确认号码无误后再进行充值。非空号欠费可充，欠费1个月导致空号的不能充值，损失自负无法退款。</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">5:</view>
+				<view style="margin-left: 5%;"><text
+						class="fcoreb5">本充值业务不提供发票。</text>如需发票请在运营商手机客户端储开取电子发票，也可以凭身份证到运营商实体营业厅打印发票。</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">6:</view>
+				<view style="margin-left: 5%;">如遇系统维护充值失败，将72小时后原路退款到付款账户。
+				</view>
+			</view>
+			<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
+				<view style="width: 5%;" class="flleft">7:</view>
+				<view style="margin-left: 5%;">请登录所属运营商app(手机营业厅)查看充值号码的到账情况，如金额有出入或未到账，请截图充值记录明细反馈给客服。录明细反馈给客服。</view>
+			</view>
 		</view>
 		<view class="height100p"></view>
 		<view class="bombtn width94 font16">
@@ -70,12 +115,16 @@
 	var jweixin = require('jweixin-module');
 	// #endif
 	let app = getApp();
+	import QSTabs from '../../components/QS-tabs/QS-tabs.vue';
 	import {
 		getListOutRechargePrice,
 		addOrderPay,
 		orderToUNionPay
 	} from '../../Utils/Api.js';
 	export default {
+		components: {
+			QSTabs
+		},
 		data() {
 			return {
 				typeId: '',
@@ -85,8 +134,11 @@
 				amoutType: '',
 				codesVlues: '',
 				amountList: [],
-				price: '',
+				price: '',
-				amoutstatus:''
+				amoutstatus: '',
+				tabs: ["72小时到账", "6小时到账"], //切换操作
+				current: 0, //默认
+				swiperCurrent: 2
 			}
 		},
 		onLoad(options) {
@@ -115,40 +167,55 @@
 				this.getListOutRechargePrice(3);
 				return;
 			}
-
+		},
-
-		},
 		methods: {
 			select(amoutinfos) {
 				this.inputAmount = amoutinfos.realPrice;
 				this.price = amoutinfos.price;
-				this.inputAmountId = amoutinfos.id;
+				this.inputAmountId = amoutinfos.id;
 				this.amoutstatus = amoutinfos.status;
 			},
-
+			//筛选
+			change(index) {
+				this.$refs.tabs.setFinishCurrent(index);
+				this.current = index;
+				this.inputAmount = '';
+				this.inputAmountId = '';
+				this.amoutstatus = '';
+				if (index == 0) {
+					this.swiperCurrent = 2;
+					this.getListOutRechargePrice(this.amoutType);
+				} else {
+					this.swiperCurrent = 1;
+					this.getListOutRechargePrice(this.amoutType);
+				}
+			},
 			/**
 			 * 查询价格
 			 */
 			getListOutRechargePrice(item) {
 				uni.showLoading({
 					title: '加载中...'
-				})
+				})
-				let	showType;
+				let showType;
-				// #ifdef H5
+				// #ifdef H5
-				showType = 2;
+				showType = 2;
-				// #endif
+				// #endif
-				// #ifdef MP
+				// #ifdef MP
-				showType = 1;
+				showType = 1;
 				// #endif
 				let params = {
-					type: item,
+					type: item,
-					regionId: app.globalData.cityId,
+					regionId: app.globalData.cityId,
-					showType: showType
+					showType: showType,
+					rechargeType: this.swiperCurrent
 				}
 				getListOutRechargePrice(params).then(res => {
 					uni.hideLoading()
-					if (res.return_code == '000000') {
+					if (res.return_code == '000000' && res.return_data) {
 						this.amountList = res.return_data;
+					} else {
+						this.amountList = [];
 					}
 				})
 			},
@@ -157,27 +224,35 @@
 			 * 提交订单
 			 */
 			addOrderPay() {
-				let that = this;
+				let that = this;
-				if(that.amoutstatus == 2){
+				if (that.amoutstatus == 2) {
-					uni.showToast({
+					uni.showToast({
-						title: '当前面值已售空',
+						title: '当前面值已售空',
-						duration:2000,
+						duration: 2000,
-						icon: "none"
+						icon: "none"
-					});
+					});
-					return;
+					return;
 				}
 				if (that.inputPhone == '') {
 					uni.showToast({
-						title: '请输入充值号码',
+						title: '请输入充值号码',
-						duration:2000,
+						duration: 2000,
 						icon: "none"
 					});
 					return;
+				}
+				if (that.inputPhone.length != 11) {
+					uni.showToast({
+						title: '请输入正确充值号码',
+						duration: 2000,
+						icon: "none"
+					});
+					return;
 				}
 				if (that.inputAmount == '') {
 					uni.showToast({
-						title: '请选择价格',
+						title: '请选择价格',
-						duration:2000,
+						duration: 2000,
 						icon: "none"
 					});
 					return false;
@@ -199,7 +274,7 @@
 							url: '../unionComfirmation/unionComfirmation?orderPrice=' + that.price +
 								'&payPrice=' + that.inputAmount + '&rechargeContent=' + that.inputPhone +
 								'&rechargeModel=' + that.amoutType + '&agentKey=' + that.codesVlues +
-								'&objectId=' + that.inputAmountId
+								'&objectId=' + that.inputAmountId+'&rechargeType='+that.swiperCurrent
 						})
 					}
 				})
@@ -327,7 +402,7 @@
 		width: 94%;
 		margin-left: 3%;
 		display: flow-root;
-		justify-content: space-between;
+		justify-content: space-between;
 		align-items: center;
 		padding: 20upx 0;
 
@@ -338,7 +413,7 @@
 			margin-top: 20upx;
 			float: left;
 			height: 120upx;
-			// line-height: 120upx;
+			// line-height: 120upx;
 			display: inline-grid;
 			justify-content: center;
 			align-items: center;

subPages/unionComfirmation/unionComfirmation.vue

@@ -27,7 +27,7 @@
 			</view>
 			<!-- #ifdef MP -->
 			<view class="width94 line1 mart5 marb5"></view>
-			<view class="height50 width100 backcorfff" @click="showPopup()">
+			<view class="height50 width100 backcorfff" v-if="reType  == 2" @click="showPopup()">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
 					优惠抵扣<text class="yhqky">{{OrderPreList.length}}张可用</text>
 				</view>
@@ -181,7 +181,8 @@
 				rechargeModel: '',
 				agentKey: '',
 				objectId: '',
-				OrderPreList: []
+				OrderPreList: [],
+				reType:''  //充值类型
 
 			};
 		},
@@ -192,7 +193,8 @@
 			this.rechargeContent = options.rechargeContent;
 			this.rechargeModel = options.rechargeModel;
 			this.agentKey = options.agentKey;
-			this.objectId = options.objectId;
+			this.objectId = options.objectId;
+			this.reType =  options.rechargeType;
 		},
 		onShow() {
 			let that = this;
@@ -539,22 +541,17 @@
 					"orderId": this.orderId,
 					"cardNo": this.user.hltCardNo.cardNo,
 					"password": this.PaymentPassword
-				}
+				}
 				hltUnionCardPayUnion(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						uni.showToast({
-							icon: 'none',
+							title: '支付成功'
-							title: '支付成功',
+						})
-							duration: 2000,
+						uni.reLaunch({
-							success() {
+							url: '../Phone-recharge-details/Phone-recharge-details?id=' +
-								setTimeout(() => {
+								this.orderId
-									uni.switchTab({
+						})
-										url: '../../pages/tabBar/user/user'
-									})
-								}, 1000)
-							}
-						});
 						return;
 					}
 					if (res.return_code == '102130') {

subPages/unionPay-orderList/unionPay-orderList.vue

@@ -24,7 +24,7 @@
 					</view>
 					<view class="width96 line1 mart10"></view>
 
-					<view class="width96 height60 mart10" @click="jumpDetails(row.id)">
+					<view class="width96 height60 mart10">
 						<view class="width70 flleft fotlt ">
 							<view class="font16 fontwig6 text1 fcor333">
 								{{row.remarks}}