diff --git a/Utils/Api.js b/Utils/Api.js
index d0a5378..2e4bb98 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -220,7 +220,11 @@ export const setCacheParam = params => {
 //查询充值话费详情
 export const getPhoneOrderById = params => {
 	return POST('GET', `${base}/outRechargeOrder/getOrderById`, params).then(res => res.data);
-}
+}
+// 取消话费订单
+export const cancelRechargeOrder = params => {
+	return POST('GET', `${base}/outRechargeOrder/cancelOrder`, params).then(res => res.data);
+}
 //优惠券包列表
 export const getDiscountPackageList = params => {
 	return POST('GET', `${base}/discountPackage/getDiscountPackageList`, params).then(res => res.data);
@@ -437,12 +441,12 @@ export const findById = params => {
 	return POST('GET', `${base}/outRechargePrice/findById`, params).then(res => res.data);
 }
 //提交订单
-export const orderToUNionPay = params => {
-	return POST('POST', `${base}/outRechargeOrder/orderToPay`, params).then(res => res.data);
+export const orderToPayByWx = params => {
+	return POST('POST', `${base}/czOrder/orderToPayByWx`, params).then(res => res.data);
 }
 //工会卡支付
-export const hltUnionCardPayUnion = params => {
-	return POST('POST', `${base}/outRechargeOrder/hltUnionCardPay`, params).then(res => res.data);
+export const hltUnionCardPayghk = params => {
+	return POST('POST', `${base}/czOrder/hltUnionCardPay`, params).then(res => res.data);
 }
 //话费列表
 export const getUserOrderListhuafei = params => {
diff --git a/Utils/Request.js b/Utils/Request.js
index eae7132..b74d33a 100644
--- a/Utils/Request.js
+++ b/Utils/Request.js
@@ -58,7 +58,7 @@ function request(method, url, data) {
 			},
 			fail(err) {
 				uni.showToast({
-					title: '请求失败',
+					title: '网络异常',
 					icon: 'none',
 					duration: 1500,
 				})
diff --git a/pages.json b/pages.json
index 8185efe..268d0da 100644
--- a/pages.json
+++ b/pages.json
@@ -172,7 +172,6 @@
 		{
 			"path": "pages/goods/goods",
 			"style": {
-				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTitleText": "详情",
@@ -472,8 +471,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		}
-
-	],
+    ],
 	"subpackages": [{
 		"root": "subPages",
 		"pages": [{
@@ -664,15 +662,37 @@
 			}, {
 				"path": "cardsDetails/cardsDetails",
 				"style": {
-					"navigationBarTitleText": "卡详情",
-					"enablePullDownRefresh": false,
-					"backgroundTextStyle": "light",
-					"navigationBarBackgroundColor": "#0083f5",
-					"backgroundColorTop": "#0083f5",
+					"navigationBarTitleText": "卡详情",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
 					"navigationBarTextStyle": "white"
 				}
 
-			}
+			}, {
+				"path": "rechargeDetails/rechargeDetails",
+				"style": {
+					"navigationBarTitleText": "详情",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+			} ,{
+            "path" : "recharge-pay/recharge-pay",
+            "style" :                                                                                    
+            {
+               "navigationBarTitleText": "支付",
+               "enablePullDownRefresh": false,
+               "backgroundTextStyle": "light",
+               "navigationBarBackgroundColor": "#0083f5",
+               "backgroundColorTop": "#0083f5",
+               "navigationBarTextStyle": "white"
+            }
+            
+        }
 		]
 	}],
 	"globalStyle": {
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 6a8d024..479b520 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -66,7 +66,7 @@
 		<view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;">
 			<view class="width8 flleft">￥</view>
 			<input type="digit" class="font16 width60 flleft height40" placeholder="输入金额(保留2位小数)" v-model="inputMoney"
-				@blur="Listeningfocus" />
+				@input="Listeningfocus" />
 			<view class="width30 height40 flright font14 fcor999 fotct"
 				style="border-left: 1px solid #f2f2f2;line-height: 40px;">
 				约{{oilLiters}}L
@@ -215,7 +215,7 @@
 			this.counId = options.desId;
 			if (app.globalData.accountId) {
 				this.isTyAgent = true;
-			}
+			}
 			// #ifdef H5
 			if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
 				this.recentGasStation();
@@ -230,7 +230,7 @@
 			this.getDictionaryByCodeTypeMoney();
 		},
 		onShow() {
-			this.user = app.globalData.userInfo;
+			this.user = app.globalData.userInfo;
 		},
 		onUnload() {
 			if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
@@ -256,7 +256,7 @@
 				this.$refs.popup.show();
 			},
 			//一键加油
-			recentGasStation() {
+			recentGasStation() {
 				uni.showLoading({
 					title: '加载中...'
 				})
@@ -264,9 +264,9 @@
 					latitude: app.globalData.latitude,
 					longitude: app.globalData.longitude,
 					isTyAgent: this.isTyAgent
-				}
-				recentGasStation(params).then(res => {
-					uni.hideLoading();
+				}
+				recentGasStation(params).then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.storeList = res.return_data;
 						if (!this.oilNo) {
@@ -276,7 +276,7 @@
 							this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
 							this.detailList = res.return_data.oilPriceList;
 							this.oilType = res.return_data.oilPriceList[0].oilType;
-							this.gasGunList = res.return_data.gasGunList;
+							this.gasGunList = res.return_data.gasGunList;
 							this.counId = res.return_data.goodsId;
 							for (var i = 0; i < res.return_data.gasGunList.length; i++) {
 								if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
@@ -296,7 +296,7 @@
 				})
 			},
 			//查询详情
-			getGasDetailByStoreKey() {
+			getGasDetailByStoreKey() {
 				uni.showLoading({
 					title: '加载中...'
 				})
@@ -305,9 +305,9 @@
 					latitude: app.globalData.latitude,
 					longitude: app.globalData.longitude,
 					isTyAgent: this.isTyAgent
-				}
+				}
 				getGasDetailByStoreKey(params).then(res => {
-					uni.hideLoading();
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.storeList = res.return_data;
 						if (!this.oilNo) {
@@ -423,7 +423,7 @@
 				var a = /^[0-9]+(\.[0-9]{1})?$/;
 				var b = /^[0-9]+(.[0-9]{1})?$/;
 				var c = /^([1-9][0-9]*)+(\.[0-9]{1,2})?$/;
-				if (this.inputMoney == '' || this.inputMoney < 10 || !(c.test(this.inputMoney))) {
+				if (this.inputMoney == '') {
 					uni.showToast({
 						title: '请输入正确加油金额',
 						icon: "none",
@@ -441,38 +441,25 @@
 					this.totalPreferences = '0';
 					return;
 				}
-
-				// let inputs = this.inputMoney.split('.');
-				// if (inputs[1] != undefined && inputs[1].length > 1) {
-				// 	uni.showToast({
-				// 		title: '加油金额精确到小数点1位',
-				// 		icon: "none",
-				// 		duration:2000
-				// 	});
-				// 	return;
-				// }
 				if (parseInt(this.inputMoney) > parseInt(this.xzMoney)) {
 					uni.showToast({
 						title: '加油金额不能超过' + this.xzMoney + '元',
 						icon: "none",
 						duration: 2000
-					});
-					this.inputMoney = this.xzMoney;
-
+					});
+					this.totalPrice = '0.00';
+					this.discountPrice = '0.00';
+					this.litre = '';
+					this.inputMoney = '';
+					this.oilLiters = '0';
+					this.discount = '0';
+					this.oilSubsidy = '0';
+					this.litersPreferences = '0';
+					this.pricePreferences = '0';
+					this.totalPreferences = '0';
+					return;
 				}
-
-				//原来计算方式
-				// this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
-				// var arr1 = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(4);
-				// this.totalPrice = this.numFilter(arr1);
 				this.oilPriceDiscountCompute();
-				//目前计算方式
-				// this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
-				// this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
-				// if (this.priceVip != this.priceGun) {
-				// 	let gbprice = parseFloat(this.litre * this.priceGun).toFixed(2);
-				// 	this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
-				// }
 			},
 			//计算价格
 			oilPriceDiscountCompute() {
@@ -525,7 +512,8 @@
 			 */
 			postionIng() {
 				let that = this;
-				if (that.inputMoney == '' || that.inputMoney < 10) {
+				var c = /^([1-9][0-9]*)+(\.[0-9]{1,2})?$/;
+				if (that.inputMoney == '' || that.inputMoney < 10 || !(c.test(this.inputMoney))) {
 					uni.showToast({
 						title: '请输入正确金额',
 						icon: "none",
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 5e1d1a8..84a65b2 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -190,7 +190,11 @@
 					if (res.return_code == '000000' && res.return_data != '') {
 						this.MerchantList = res.return_data;
 						this.showCategoryIndex = res.return_data[0].merchantName;
-						this.showCategoryIndexId = res.return_data[0].id;
+						this.showCategoryIndexId = res.return_data[0].id;
+						this.pageNum = 1;
+						this.pageSize = 10;
+						this.isNoMoreData = false;
+						this.categoryList = [];
 						this.getStoreListByMerchant();
 
 					} else {
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 221c55a..3761332 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -265,7 +265,7 @@
 		methods: {
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
 			},
 			//获取首页功能
 			getCmsContentcmsContent() {
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index d60da92..1328ac3 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -64,7 +64,9 @@
 			<!-- 订单类型 -->
 			<view class="title">话费充值</view>
 			<view class="list">
-				<view class="box" v-for="(row,index) in huafeiList" :key="index" @tap="toOrdehuafeirList(index)">
+				<view class="box" v-for="(row,index) in huafeiList" :key="index" @tap="toOrdehuafeirList(index)">
+					<uni-badge style="width: 20px;position: absolute; left: 15%;" v-if="row.text == '待支付' && rechargeOrderNum "
+						:text="rechargeOrderNum" type="error" size="normal"></uni-badge>
 					<view class="img">
 						<view class="icon" :class="row.icon"></view>
 					</view>
@@ -157,7 +159,8 @@
 				headerPosition: "fixed",
 				textnum: '',
 				textSend: '',
-				therrNum: '',
+				therrNum: '',
+				rechargeOrderNum:'', //话费待支付
 				headerTop: null,
 				statusTop: null,
 				showHeader: true,
@@ -361,7 +364,8 @@
 						this.user = res.return_data;
 						this.textnum = res.return_data.unusedCouponNum;
 						this.textSend = res.return_data.unusedDiscount;
-						this.therrNum = res.return_data.unpaid;
+						this.therrNum = res.return_data.unpaid;
+						this.rechargeOrderNum = res.return_data.rechargeOrderNum;
 						uni.setStorage({
 							key: "user",
 							data: res.return_data
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index e423025..ec9b48c 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -294,22 +294,7 @@
 					}
 				});
 			},
-			doCancelOrder(ordersn) {
-				let typeNum = this.orderList.length;
-				for (let i = 0; i < typeNum; i++) {
-					let list = this.orderList[i];
-					let orderNum = list.length;
-					if (orderNum > 0 && list[0].type == 'unpaid') {
-						for (let j = 0; j < orderNum; j++) {
-							if (this.orderList[i][j].ordersn == ordersn) {
-								this.orderList[i][j].type = 'cancelled';
-								break;
-							}
-						}
-					}
-
-				}
-			},
+			//去支付
 			toPayment(row) {
 				let payTypes;
 				if (row.payType == 1 || row.payType == null) {
diff --git a/subPages/Phone-recharge-details/Phone-recharge-details.vue b/subPages/Phone-recharge-details/Phone-recharge-details.vue
index 252fd7d..9e2fe99 100644
--- a/subPages/Phone-recharge-details/Phone-recharge-details.vue
+++ b/subPages/Phone-recharge-details/Phone-recharge-details.vue
@@ -20,7 +20,7 @@
 		</view>
 		<view class="width90 mart15 height22">
 			<view class="flleft fcor333 width50 font15">支付成功</view>
-			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.payPrice}}元</view>
+			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.payRealPrice}}元</view>
 		</view>
 		<view class="width90 fcor666 font13">
 			{{phoneorderdes.payTime | timeFormat('yyyy-mm-dd')}} {{phoneorderdes.payTime | timeFormat('hh:mm')}}
@@ -28,15 +28,19 @@
 		<view class="linec6 width90 mart10"></view>
 
 		<view class="width90 mart10 fcor333 font15">
-			话费充值 : {{phoneorderdes.userPhone}}｜{{phoneorderdes.remarks}}
+			话费充值 : {{phoneorderdes.userPhone}}｜{{phoneorderdes.operatorName}}
 		</view>
 		<view class="width90 mart15 height22">
 			<view class="flleft fcor333 width50 font15">订单总额</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 == null ? '0': phoneorderdes.deductionPrice}}元</view>
+			<view class="flleft fcor333 width50 font15">优惠券抵扣</view>
+			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.discountDeductionPrice == null ? '0': phoneorderdes.discountDeductionPrice}}元</view>
+		</view>
+		<view class="width90 mart15 height22">
+			<view class="flleft fcor333 width50 font15">积分抵扣</view>
+			<view class="flright fcor666 width50 fotrt font13">{{phoneorderdes.integralDeductionPrice == null ? '0': phoneorderdes.integralDeductionPrice}}元</view>
 		</view>
 		<view class="width90 mart15 height22">
 			<view class="flleft fcor333 width50 font15">实际支付金额</view>
diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue
index c91fd87..c933393 100644
--- a/subPages/recharge-centre/recharge-centre.vue
+++ b/subPages/recharge-centre/recharge-centre.vue
@@ -121,8 +121,7 @@
 	import QSTabs from '../../components/QS-tabs/QS-tabs.vue';
 	import {
 		getListOutRechargePrice,
-		addOrderPay,
-		orderToUNionPay
+		addOrderPay
 	} from '../../Utils/Api.js';
 	export default {
 		components: {
@@ -304,44 +303,6 @@
 					}
 				})
 
-
-
-				// uni.showLoading({
-				// 	title: '加载中...'
-				// })
-				// addOrderPay(params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.return_code == '000000') {
-				// 		let params = {
-				// 			"orderId": res.return_data.id,
-				// 			"openId": app.globalData.openId
-				// 		}
-				// 		this.orderToUNionPay(params);
-				// 	} else {
-				// 		uni.showToast({
-				// 			title: res.return_msg,
-				// 			icon: "none"
-				// 		})
-				// 	}
-				// })
-
-			},
-			//获取订单信息
-			orderToUNionPay(item) {
-				orderToUNionPay(item).then(res => {
-					if (res.return_code == '000000') {
-						//判断是否是公众号
-						// #ifdef H5
-						//判断微信浏览器
-						this.payRequest(res);
-						// #endif
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none'
-						})
-					}
-				})
 			},
 			//唤起支付
 			payRequest: function(self) {
diff --git a/subPages/recharge-pay/recharge-pay.vue b/subPages/recharge-pay/recharge-pay.vue
new file mode 100644
index 0000000..0be629f
--- /dev/null
+++ b/subPages/recharge-pay/recharge-pay.vue
@@ -0,0 +1,562 @@
+<template>
+	<view>
+		<view class="block">
+			<view class="content">
+				<view class="orderinfo">
+					<view class="row">
+						<view class="nominal">支付金额:</view>
+						<view class="text">{{payPrice}} 元</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="block">
+			<view class="title">
+				选择支付方式
+			</view>
+			<view class="content">
+				<view class="pay-list">
+					<view class="width100" v-for="(item,index) in paytypeList" :key="index">
+						<view class="row" v-if="item == 3" @tap="paytype='3'">
+							<view class="left">
+								<image style="border-radius: 50%;" src='../../static/img/ghkpay.png'></image>
+							</view>
+							<view class="center">
+								汇联通工会卡(余额:{{tongCardPrice}}元)
+							</view>
+							<view class="right">
+								<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
+							</view>
+						</view>
+						<view class="row" v-if="item == 2" @tap="paytype='2'">
+							<view class="left">
+								<image :src="imagewxUrl+imgadres"></image>
+							</view>
+							<view class="center">
+								微信支付
+							</view>
+							<view class="right">
+								<radio :checked="paytype=='2'" color="#0083f5" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="pay">
+			<view class="btn" @tap="orderToPay">立即支付</view>
+			<view class="tis">
+				点击立即支付，即代表您同意<view class="terms">
+					《条款协议》
+				</view>
+			</view>
+		</view>
+
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
+	</view>
+</template>
+
+<script>
+	import {
+		orderToPayByWx,
+		orderToGoldPay,
+		getHuiLianTongCardBalance,
+		hltUnionCardPayghk,
+		oilCardPay,
+		findUser,
+		findById
+	} from '../../Utils/Api.js';
+	import ssPaymentPassword from '../../components/sanshui-payment-password/index.vue'
+	let app = getApp();
+	// #ifdef H5
+	var jweixin = require('jweixin-module');
+	// #endif
+	export default {
+		components: {
+			ssPaymentPassword
+		},
+		data() {
+			return {
+				amount: 0,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'wxpay.png',
+				imgadres1: 'oilcard.png',
+				orderNo: '',
+				goodsid: '', //商品id
+				user: '',
+				PaymentPassword: '',
+				tongCardPrice: 0,
+				payPrice: '', //支付价格
+				oilPirce: 0, //油卡金额
+				paytypeList: [], //支付方式
+				rechargeDes: '', // 话费详情
+			};
+		},
+		onLoad(e) {
+			this.orderNo = e.orderId;
+			this.goodsid = e.goodsId;
+			this.payPrice = e.payPrice;
+			if (!app.globalData.userInfo) {
+				this.findUser();
+			}
+		},
+		onShow() {
+			let that = this;
+			that.user = app.globalData.userInfo;
+			if (this.user.hltCardNo) {
+				that.getHuiLianTongCardBalance();
+			}
+			that.findById();
+			if (app.globalData.userInfo) {
+				that.findUser();
+			}
+		},
+		methods: {
+			//查询详情
+			findById() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let showType;
+				// #ifdef H5
+				showType = 2;
+				// #endif
+				// #ifdef MP
+				showType = 1;
+				// #endif
+				let datas = {
+					platformId: showType,
+					id: this.goodsid
+				}
+				findById(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.rechargeDes = res.return_data;
+						this.paytypeList = res.return_data.productPayTypeString.split(',');
+						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+					}
+				});
+			},
+			//查询我的信息
+			findUser() {
+				let params;
+				findUser(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data;
+						this.user = res.return_data;
+						if (res.return_data.oilCard) {
+							this.oilPirce = res.return_data.oilCard.amount;
+						}
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+						})
+					}
+				});
+			},
+			//获取选择支付方式
+			changeRiado() {
+				if (!this.user.isSetHltCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '../../pages/user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			//油卡支付
+			changeRiado1() {
+				if (!this.user.isSetOilCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '../../pages/user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			//查询工会卡余额
+			//查询详情
+			getHuiLianTongCardBalance() {
+				let params = {
+					cardNo: this.user.hltCardNo.cardNo
+				}
+				getHuiLianTongCardBalance(params).then(res => {
+					if (res.return_code == '000000') {
+						this.tongCardPrice = res.return_data.balance;
+					}
+
+				});
+			},
+			//获取订单数据
+			orderToPay() {
+				let that = this;
+				if (that.paytype == '2') {
+					// #ifdef H5
+					let params = {
+						"orderId": that.orderNo,
+						"openId": app.globalData.openId,
+						"openIdType": 2
+					}
+					// #endif
+					// #ifdef MP
+					let params = {
+						"orderId": that.orderNo,
+						"openId": app.globalData.openId,
+					}
+					// #endif
+					orderToPayByWx(params).then(res => {
+						if (res.return_code == '000000') {
+							// #ifdef MP
+							uni.showLoading({
+								title: '支付中...'
+							})
+							uni.requestPayment({
+								"appId": res.return_data.appId,
+								"nonceStr": res.return_data.nonceStr,
+								"package": res.return_data.package,
+								"paySign": res.return_data.sign,
+								"signType": "MD5",
+								"timeStamp": res.return_data.timeStamp,
+								success: function(res) {
+									uni.hideLoading();
+									uni.showToast({
+										title: '支付成功'
+									})
+									uni.reLaunch({
+										url: '../Phone-recharge-details/Phone-recharge-details?id=' +
+											that.orderNo
+									})
+
+								},
+								fail: function(err) {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+
+							//判断是否是公众号
+							// #ifdef H5
+							//判断微信浏览器
+							that.payRequest(res);
+							// #endif
+
+						} else {
+							uni.showToast({
+								title: res.return_msg,
+								icon: 'none'
+							})
+						}
+					})
+				} else if (that.paytype == '3') {
+					if (that.tongCardPrice < that.payPrice) {
+						uni.showToast({
+							icon: 'none',
+							title: '工会卡余额不足',
+							duration: 2000,
+						});
+						return;
+					}
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../pages/login/updatePas/updatePas'
+						})
+						return;
+					}
+					if (!that.user.isSetHltCard) {
+						uni.showToast({
+							icon: 'none',
+							title: '当前账号还未绑定,前往绑定',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../pages/user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
+						});
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				} else if (that.paytype == 'oilcard') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../pages/login/updatePas/updatePas'
+						})
+						return;
+					}
+					if (!that.user.isSetOilCard) {
+						uni.showToast({
+							icon: 'none',
+							title: '当前账号还未绑定,前往绑定',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../pages/user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
+						});
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				} else {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				uni.showLoading({
+					title: '支付中...'
+				})
+				if (this.paytype == '3') {
+					let params = {
+						"orderId": this.orderNo,
+						"cardNo": this.user.hltCardNo.cardNo,
+						"password": this.PaymentPassword
+					}
+					hltUnionCardPayghk(params).then(res => {
+						uni.hideLoading();
+						if (res.return_code == '000000') {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../Phone-recharge-details/Phone-recharge-details?id=' +
+									that.orderNo
+							})
+							return;
+						}
+						if (res.return_code == '102130') {
+							uni.navigateTo({
+								url: '../../pages/login/updatePas/updatePas'
+							})
+							return;
+						}
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none'
+						})
+					})
+					return;
+				}
+				// if (this.paytype == 'oilcard') {
+				// 	let params = {
+				// 		"orderId": this.orderNo,
+				// 		"cardNo": this.user.oilCard.cardNo,
+				// 		"password": this.PaymentPassword
+				// 	}
+				// 	oilCardPay(params).then(res => {
+				// 		uni.hideLoading();
+				// 		if (res.return_code == '000000') {
+				// 			uni.showToast({
+				// 				title: '支付成功'
+				// 			})
+				// 			uni.reLaunch({
+				// 				url: '../../goods/refuel-succes/refuel-succes?id=' + this.orderNo
+				// 			});
+				// 			return;
+				// 		}
+				// 		if (res.return_code == '102130') {
+				// 			uni.navigateTo({
+				// 				url: '../../login/updatePas/updatePas'
+				// 			})
+				// 			return;
+				// 		}
+				// 		uni.showToast({
+				// 			title: res.return_msg,
+				// 			icon: 'none'
+				// 		})
+				// 	})
+				// 	return;
+				// }
+			},
+			payRequest: function(self) {
+				uni.showLoading({
+					title: '支付中...'
+				})
+				jweixin.config({
+					// debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+					appId: self.return_data.appId, // 必填，公众号的唯一标识
+					timestamp: self.return_data.timeStamp, // 必填，生成签名的时间戳
+					nonceStr: self.return_data.nonceStr, // 必填，生成签名的随机串
+					signature: self.return_data.sign, // 必填，签名，见附录1
+					jsApiList: ['chooseWXPay'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+				});
+				uni.hideLoading();
+				jweixin.ready(function() {
+					jweixin.checkJsApi({
+						jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
+						success: function(res) {},
+						fail: function(res) {}
+					});
+					jweixin.chooseWXPay({
+						appId: self.return_data.appId,
+						timestamp: self.return_data
+							.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+						nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位
+						package: self.return_data
+							.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
+						signType: 'MD5', // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+						paySign: self.return_data.sign, // 支付签名
+						success: function(res) {
+							// 支付成功后的回调函数
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../Phone-recharge-details/Phone-recharge-details?id=' +
+									that.orderNo
+							})
+						},
+						cancel: function(r) {},
+						fail: function(res) {}
+					});
+				});
+
+				jweixin.error(function(res) {
+					uni.showToast({
+						icon: 'none',
+						title: '支付失败了',
+						duration: 4000
+					});
+					// config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+					/*alert("config信息验证失败");*/
+				});
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.block {
+		width: 94%;
+		padding: 0 3% 40upx 3%;
+
+		.title {
+			width: 100%;
+			font-size: 34upx;
+		}
+
+		.content {
+			.orderinfo {
+				width: 100%;
+				border-bottom: solid 1upx #eee;
+
+				.row {
+					width: 100%;
+					height: 90upx;
+					display: flex;
+					align-items: center;
+
+					.nominal {
+						flex-shrink: 0;
+						font-size: 32upx;
+						color: #7d7d7d;
+					}
+
+					.text {
+						width: 70%;
+						margin-left: 10upx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						font-size: 32upx;
+					}
+				}
+			}
+
+			.pay-list {
+				width: 100%;
+				border-bottom: solid 1upx #eee;
+
+				.row {
+					width: 100%;
+					height: 120upx;
+					display: flex;
+					align-items: center;
+
+					.left {
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						align-items: center;
+
+						image {
+							width: 80upx;
+							height: 80upx;
+						}
+					}
+
+					.center {
+						width: 100%;
+						font-size: 30upx;
+					}
+
+					.right {
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						justify-content: flex-end;
+					}
+				}
+			}
+		}
+	}
+
+	.pay {
+		margin-top: 20upx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		flex-wrap: wrap;
+
+		.btn {
+			width: 70%;
+			height: 80upx;
+			border-radius: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			background-color: #0083f5;
+			box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2);
+		}
+
+		.tis {
+			margin-top: 10upx;
+			width: 100%;
+			font-size: 24upx;
+			display: flex;
+			justify-content: center;
+			align-items: baseline;
+			color: #999;
+
+			.terms {
+				color: #5a9ef7;
+			}
+		}
+	}
+</style>
diff --git a/subPages/rechargeDetails/rechargeDetails.vue b/subPages/rechargeDetails/rechargeDetails.vue
new file mode 100644
index 0000000..f6d04b0
--- /dev/null
+++ b/subPages/rechargeDetails/rechargeDetails.vue
@@ -0,0 +1,505 @@
+<template>
+	<view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06">{{typeText[recinfo.payStatus]}}</view>
+		<!-- 购买商品列表 -->
+		<view class="buy-list">
+			<!-- v-for="(row,index) in buylist" :key="index" -->
+			<view class="row">
+				<view class="goods-info">
+					<view class="img">
+						<image mode="widthFix" v-if="recinfo.operatorType == 3" src="../static/cz1.jpg"></image>
+						<image mode="widthFix" v-if="recinfo.operatorType == 2" src="../static/cz3.jpg"></image>
+						<image mode="widthFix" v-if="recinfo.operatorType == 1" src="../static/cz2.jpg"></image>
+					</view>
+					<view class="info">
+						<view class="title">{{recinfo.operatorName}}</view>
+						<view class="price-number">
+							￥{{recinfo.orderPrice}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 提示-备注 -->
+		<view class="order">
+			<view class="row" v-if="recinfo.orderNo">
+				<view class="left">
+					订单流水 :
+				</view>
+				<view class="right">
+					{{recinfo.orderNo}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.paySerialNo">
+				<view class="left">
+					支付流水 :
+				</view>
+				<view class="right">
+					{{recinfo.paySerialNo}}
+				</view>
+			</view>
+
+			<view class="row" v-if="recinfo.payType">
+				<view class="left">
+					支付方式 :
+				</view>
+				<view class="right" v-if="recinfo.payType == 1">
+					支付宝
+				</view>
+				<view class="right" v-if="recinfo.payType == 2">
+					微信
+				</view>
+				<view class="right" v-if="recinfo.payType == 3">
+					汇联通工会卡
+				</view>
+			</view>
+
+			<view class="row" v-if="recinfo.rechargeStatus">
+				<view class="left">
+					充值状态 :
+				</view>
+				<view class="right" v-if="recinfo.rechargeStatus == 201 || recinfo.rechargeStatus == 204">
+					充值中
+				</view>
+				<view class="right" v-if="recinfo.rechargeStatus == 202">
+					充值成功
+				</view>
+				<view class="right" v-if="recinfo.rechargeStatus == 203">
+					充值失败
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.orderPrice">
+				<view class="left">
+					订单总额 :
+				</view>
+				<view class="right">
+					￥{{recinfo.orderPrice}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.discountDeductionPrice">
+				<view class="left">
+					优惠券金额 :
+				</view>
+				<view class="right">
+					￥{{recinfo.discountDeductionPrice}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					应付金额 :
+				</view>
+				<view class="right">
+					￥{{recinfo.outRechargePrice.payPrice}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.integralDeductionPrice">
+				<view class="left">
+					积分抵扣金额 :
+				</view>
+				<view class="right">
+					￥{{recinfo.integralDeductionPrice}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					实付金额 :
+				</view>
+				<view class="right">
+					￥{{recinfo.payRealPrice}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					下单时间 :
+				</view>
+				<view class="right">
+					{{recinfo.createTimed | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.payTime">
+				<view class="left">
+					支付时间 :
+				</view>
+				<view class="right">
+					{{recinfo.payTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.cancelTime">
+				<view class="left">
+					取消时间 :
+				</view>
+				<view class="right">
+					{{recinfo.cancelTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.refundTime">
+				<view class="left">
+					退款时间 :
+				</view>
+				<view class="right">
+					{{recinfo.refundTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.finishTime">
+				<view class="left">
+					完成时间 :
+				</view>
+				<view class="right">
+					{{recinfo.finishTime | formatDate('-')}}
+				</view>
+			</view>
+		</view>
+		<view class="width100 height60"></view>
+		<view class="footer" v-if="recinfo.payStatus == 101">
+			<view class="settlement">
+				<view class="sum">合计:
+					<view class="money">￥{{recinfo.payRealPrice}}</view>
+				</view>
+				<view class="btn" @tap="cancelOrder" style="border: 1px solid #0083f5;color: #0083f5;">取消订单</view>
+				<view class="btn" @tap="toPay" style="background-color: #0083f5;color: #fff;">去支付</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getPhoneOrderById,
+		cancelRechargeOrder,
+	} from '../../Utils/Api.js'
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				buylist: [], //订单列表
+				goodsPrice: 0.0, //商品合计价格
+				sumPrice: 0.0, //用户付款价格
+				freight: 12.00, //运费
+				note: '', //备注
+				int: 1200, //抵扣积分
+				deduction: 0, //抵扣价格
+				recinfo: [],
+				orderId: '',
+				imageUrl: app.globalData.imgUrl,
+				preByOrderInfo: '',
+				typeText: {
+					101: '等待付款',
+					102: '订单已支付',
+					100: '订单已完成',
+					104: '订单已取消',
+					105: '订单已退款'
+				},
+
+			};
+		},
+		onShow() {
+			//页面显示时，加载订单信息
+			this.getPhoneOrderById();
+		},
+		onHide() {
+
+		},
+		onLoad(option) {
+			this.orderId = option.id
+		},
+		filters: {
+			toFixed: function(x) {
+				return parseFloat(x).toFixed(2);
+			},
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		methods: {
+			getPhoneOrderById() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderId: this.orderId,
+				}
+				getPhoneOrderById(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.recinfo = res.return_data;
+					} else {
+						uni.hideLoading()
+					}
+				})
+			},
+			//取消订单
+			cancelOrder() {
+				let that = this;
+				uni.showModal({
+					title: '取消订单',
+					content: '确定取消此订单？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								orderId: this.recinfo.id
+							}
+							cancelRechargeOrder(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									let pages = getCurrentPages() //页面栈
+									let prePage = pages[pages.length - 2] //上一页
+									prePage.$vm.reFresh = Math.random() //触发上一页监听器
+									uni.navigateBack() //返回上一页
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			toPay() {
+				uni.redirectTo({
+					url: '../recharge-pay/recharge-pay?goodsId=' + this.recinfo.goodsId + '&payPrice=' + this
+						.recinfo.payRealPrice+'&orderId='+this.recinfo.id
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.addr {
+		width: 86%;
+		padding: 20upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+		display: flex;
+
+		.icon {
+			width: 80upx;
+			height: 80upx;
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 60upx;
+				height: 60upx;
+			}
+		}
+
+		.tel-name {
+			width: 100%;
+			display: flex;
+			font-size: 32upx;
+
+			.tel {
+				margin-left: 40upx;
+			}
+		}
+
+		.addres {
+			width: 100%;
+			font-size: 26upx;
+			color: #999;
+		}
+	}
+
+	.buy-list {
+		width: 86%;
+		padding: 10upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+
+		.row {
+			margin: 20rpx 0;
+
+			.goods-info {
+				width: 100%;
+				display: flex;
+
+				.img {
+					width: 80px;
+					max-height: 80px;
+					border-radius: 10upx;
+					overflow: hidden;
+					flex-shrink: 0;
+					margin-right: 10upx;
+
+					image {
+						width: 80px;
+						max-height: 80px;
+					}
+				}
+
+				.info {
+					width: 100%;
+					height: 17vw;
+					overflow: hidden;
+					display: flex;
+					flex-wrap: wrap;
+					position: relative;
+
+					.title {
+						width: 100%;
+						font-size: 32upx;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						// text-align: justify;
+						overflow: hidden;
+						max-height: 25px;
+					}
+
+					.price-number {
+						position: absolute;
+						width: 100%;
+						bottom: 0upx;
+						display: flex;
+						justify-content: space-between;
+						align-items: flex-end;
+						font-size: 28upx;
+						height: 40upx;
+						color: #fe4343;
+					}
+				}
+			}
+		}
+	}
+
+	.order {
+		width: 86%;
+		padding: 10upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+
+		.row {
+			margin: 20upx 0;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-bottom: 1px solid #f4f4f4;
+			display: flex;
+
+			.left {
+				font-size: 28upx;
+			}
+
+			.right {
+				margin-left: 40upx;
+				font-size: 26upx;
+				color: #999;
+
+				input {
+					font-size: 26upx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.blck {
+		width: 100%;
+		height: 100upx;
+	}
+
+	.footer {
+		width: 92%;
+		padding: 0 4%;
+		background-color: #fbfbfb;
+		height: 100upx;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		font-size: 28upx;
+		position: fixed;
+		bottom: 0upx;
+		z-index: 5;
+
+		.settlement {
+			width: 100%;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+
+			.sum {
+				color: #FE1A1A;
+				width: 50%;
+				font-size: 28upx;
+				margin-right: 10upx;
+				display: flex;
+				height: 26px;
+				line-height: 26px;
+				justify-content: flex-start;
+
+				.money {
+					font-size: 20px;
+					font-weight: 600;
+					display: flex;
+					align-items: center;
+				}
+			}
+
+			.btn {
+				padding: 0 20upx;
+				height: 70rpx;
+				width: 25%;
+				margin-left: 10px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 30upx;
+				border-radius: 40upx;
+			}
+		}
+	}
+
+	.detail {
+		width: 86%;
+		padding: 10upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+
+		.row {
+			height: 60upx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.nominal {
+				font-size: 28upx;
+			}
+
+			.content {
+				font-size: 26upx;
+				color: #0083f5;
+			}
+		}
+	}
+</style>
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 75c7823..860400c 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -25,7 +25,15 @@
 					￥{{orderPrice}}
 				</view>
 			</view>
-			<!-- #ifdef MP -->
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="height50 width100 backcorfff">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					折扣金额
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999">
+					￥{{saveprice}}
+				</view>
+			</view>
 			<view class="width94 line1 mart5 marb5"></view>
 			<view class="height50 width100 backcorfff" v-if="reType  == 2" @click="showPopup()">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@@ -42,7 +50,6 @@
 					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
 				</view>
 			</view>
-			<!-- #endif -->
 		</view>
 
 		<view class="width94 comorder mart10">
@@ -54,8 +61,12 @@
 				</view>
 				<view class="cj-slider">
 					<view class="flleft fotct font14 fcor666" style="width: 15%;">0</view>
-					<cj-slider style="width: 60%; float:left;" v-model="priceValue" :min="0" :max="availIntegal"
-						:step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving" @end="blockEnd" />
+					<cj-slider style="width: 60%; float:left;" v-if="isDiscount" v-model="priceValue" :min="0"
+						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
+						@end="blockEnd" />
+					<cj-slider style="width: 60%; float:left;" v-if="!isDiscount" v-model="priceValue" :min="0"
+						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
+						@end="blockEnd" />
 					<view class="flright fotrt font14 fcor666" style="width: 25%;">{{availIntegal}}</view>
 				</view>
 			</view>
@@ -76,16 +87,6 @@
 				</view>
 			</view>
 			<view class="width100" v-for="(item,index) in paytypeList" :key="index">
-				<!-- <view class="width94 line1 mart5 marb5"></view>
-				<view class="height50 width100 backcorfff" @tap="paytype='jinbi'">
-					<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
-						积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
-					</view>
-					<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-						style="align-items: center;">
-						<radio :checked="paytype=='jinbi'" color="#0083f5" />
-					</view>
-				</view> -->
 				<view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
 				<view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
 					<view class="width50 flleft fcor666 fontwig6 font16" style="padding-left: 4%;">
@@ -157,11 +158,10 @@
 <script>
 	import {
 		addOrderPay,
-		orderToUNionPay,
+		orderToPayByWx,
 		findUser,
-		orderToGoldPay,
 		orderToGoldPayunion,
-		hltUnionCardPayUnion,
+		hltUnionCardPayghk,
 		getHuiLianTongCardBalance,
 		loginByPhone,
 		getUserOrderPreList,
@@ -208,9 +208,10 @@
 				rechargeDes: '', // 话费详情
 				paytypeList: [], //支付方式
 				priceValue: [0, 0], // 积分可以指定默认值
+				changePrice: '', //滑动值
+				isDiscount: false,
 				availIntegal: '', // 可用积分
-				isUse: true, // 是否禁用状态
-				isIntegral: false //是否使用积分
+				isUse: true // 是否禁用状态
 
 			};
 		},
@@ -226,12 +227,8 @@
 		onShow() {
 			let that = this;
 			// that.paytype = '2';
-			that.user = app.globalData.userInfo;
 			that.findUser();
-			that.findById();
-			// #ifdef MP
 			that.getUserOrderPreList();
-			// #endif
 		},
 		onHide() {
 
@@ -259,30 +256,25 @@
 						this.rechargeDes = res.return_data;
 						this.paytypeList = res.return_data.productPayTypeString.split(',');
 						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
-						if (res.return_data.integralDiscount == 100) {
-							let payprice = parseFloat(res.return_data.payPrice * 100).toFixed(0);
-							if (payprice > this.user.gold) {
-								// this.priceValue[1] = this.user.gold;
-								this.availIntegal = this.user.gold;
-							} else {
-								// this.priceValue[1] = payprice;
-								this.availIntegal = payprice;
-							}
+						let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
+						let pprice = parseFloat(res.return_data.payPrice * 100).toFixed(0)
+						let payprice = parseFloat(res.return_data.payPrice * 100 * zkprice).toFixed(
+							0);
+						if (payprice > this.user.gold) {
+							this.availIntegal = this.user.gold;
 						} else {
-							let payprice1 = parseFloat(res.return_data.payPrice * 100).toFixed(0);
-							// this.priceValue[1] = payprice1;
-							this.availIntegal = payprice1;
+							this.availIntegal = payprice;
 						}
 					}
 				});
 			},
 			//查询积分
 			findUser() {
-				let params;
-				findUser(params).then(res => {
+				findUser().then(res => {
 					if (res.return_code == '000000') {
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
+						this.findById();
 						this.getHuiLianTongCardBalance();
 						uni.setStorage({
 							key: "user",
@@ -309,6 +301,9 @@
 			//查询工会卡余额
 			//查询详情
 			getHuiLianTongCardBalance() {
+				if (!this.user.hltCardNo) {
+					return;
+				}
 				let params = {
 					cardNo: this.user.hltCardNo.cardNo
 				}
@@ -324,15 +319,15 @@
 				uni.navigateTo({
 					url: '/pages/login/register'
 				})
-			},
+			},
+			//选择优惠券
 			radioChanges(item) {
 				this.paytheprice = this.orderPrice;
+				this.isDiscount = false;
 				if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
 					this.memDiscountId = '';
-					this.payPrice = this.saveprice;
+					this.isDiscount = true;
 					this.deductionPrice = '0.00';
-					// this.priceValue[1] = parseFloat(this.saveprice * 100).toFixed(0);
-					this.availIntegal = parseFloat(this.saveprice * 100).toFixed(0);
 					this.priceCaluc(this.saveprice);
 
 				} else { // 否则进行选中赋值
@@ -341,23 +336,19 @@
 						//满减价格
 						this.deductionPrice = item.discountPrice;
 						let oldprice = this.paytheprice - this.deductionPrice;
-						this.availIntegal = parseFloat(oldprice * 100).toFixed(0);
-						// this.priceValue[1] = parseFloat(this.payPrice * 100).toFixed(0);
 						this.priceCaluc(oldprice);
-					} else if (item.discountType == 2) {
+					}
+					if (item.discountType == 2) {
 						//抵扣价格
 						this.deductionPrice = item.discountPrice;
 						let oldprice = this.paytheprice - this.deductionPrice;
-						this.availIntegal = parseFloat(oldprice * 100).toFixed(0);
-						// this.priceValue[1] = parseFloat(this.payPrice * 100).toFixed(0);
 						this.priceCaluc(oldprice);
-					} else if (item.discountType == 3) {
+					}
+					if (item.discountType == 3) {
 						// 打折
 						this.deductionPrice = parseFloat(this.paytheprice - (this.paytheprice * item.discountPrice))
 							.toFixed(2);
 						let oldprice = parseFloat(this.paytheprice * item.discountPrice).toFixed(2);
-						this.availIntegal = parseFloat(oldprice * 100).toFixed(0);
-						// this.priceValue[1] = parseFloat(this.payPrice * 100).toFixed(0);
 						this.priceCaluc(oldprice);
 					}
 				}
@@ -365,29 +356,30 @@
 			},
 			//计算价格
 			priceCaluc(item) {
-				console.log('======' + item);
-				if (this.rechargeDes.integralDiscount == 100) {
-					let payprice = parseFloat(item * 100).toFixed(0);
-					if (payprice > this.user.gold) {
-						// this.priceValue[1] = this.user.gold;
-						this.availIntegal = this.user.gold;
-						if (this.isIntegral) {
-							this.payPrice = (parseFloat(this.availIntegal / 100).toFixed(0)) - (this.priceValue[1] / 100);
-						}else{
-							this.payPrice = parseFloat(this.availIntegal / 100).toFixed(0);
-						}
-						// this.payPrice = parseFloat(this.availIntegal / 100).toFixed(0);
-						// console.log('=====' + this.payPrice);
-					} else {
-						// this.priceValue[1] = payprice;
-						this.availIntegal = payprice;
-						this.payPrice = parseFloat(this.availIntegal / 100).toFixed(0);
+				let zkprice = parseFloat(this.rechargeDes.integralDiscount / 100).toFixed(2);
+				let pprice = parseFloat(item * 100).toFixed(0);
+				let payprice = parseFloat(item * 100 * zkprice).toFixed(0);
+				if (payprice > this.user.gold) {
+					this.availIntegal = this.user.gold;
+					if (this.availIntegal < this.priceValue[1]) {
+						this.priceValue[1] = this.user.gold;
+						this.isDiscount = true;
 					}
 				} else {
-					let payprice1 = parseFloat(item * 100).toFixed(0);
-					// this.priceValue[1] = payprice1;
-					this.availIntegal = payprice1;
-					this.payPrice = item - parseFloat(this.availIntegal / 100).toFixed(0);
+					this.availIntegal = payprice;
+					this.priceValue[1] = 0;
+					this.isDiscount = true;
+				}
+				this.calculatepayPrice();
+			},
+			//计算支付价格
+			calculatepayPrice() {
+				if (this.deductionPrice == 0) {
+					this.payPrice = parseFloat(this.saveprice - (parseFloat(this.priceValue[1] / 100).toFixed(2))).toFixed(
+						2);
+				} else {
+					this.payPrice = parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this
+						.deductionPrice).toFixed(2);
 				}
 			},
 			// 微信获取手机号
@@ -427,6 +419,16 @@
 			},
 			toPay() {
 				let that = this;
+				if (that.payPrice == 0) {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../pages/login/updatePas/updatePas'
+						})
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+					return;
+				}
 				if (that.paytype == '') {
 					uni.showToast({
 						title: '请选择支付方式',
@@ -443,7 +445,7 @@
 					"memDiscountId": that.memDiscountId,
 					"rechargeContent": that.rechargeContent,
 					"goodsId": that.objectId,
-					"integralNum": '',
+					"integralNum": that.priceValue[1],
 					"password": ''
 				}
 				addOrderPay(params).then(res => {
@@ -455,7 +457,7 @@
 							"openId": app.globalData.openId,
 							"openIdType": 2
 						}
-						that.orderToUNionPay(params);
+						that.orderToPayByWx(params);
 					} else {
 						uni.hideLoading();
 						uni.showToast({
@@ -477,7 +479,7 @@
 							"memDiscountId": that.memDiscountId,
 							"rechargeContent": that.rechargeContent,
 							"goodsId": that.objectId,
-							"integralNum": '',
+							"integralNum": that.priceValue[1],
 							"password": ''
 						}
 						addOrderPay(params).then(res => {
@@ -488,7 +490,7 @@
 									"orderId": res.return_data.id,
 									"openId": app.globalData.openId
 								}
-								that.orderToUNionPay(params);
+								that.orderToPayByWx(params);
 							} else {
 								uni.hideLoading();
 								uni.showToast({
@@ -526,10 +528,10 @@
 				this.$refs.popup.show();
 			},
 			//获取订单数据
-			orderToUNionPay(item) {
+			orderToPayByWx(item) {
 				let that = this;
 				if (that.paytype == '2') {
-					orderToUNionPay(item).then(res => {
+					orderToPayByWx(item).then(res => {
 						if (res.return_code == '000000') {
 							// #ifdef MP
 							uni.showLoading({
@@ -547,9 +549,6 @@
 									uni.showToast({
 										title: '支付成功'
 									})
-									// uni.switchTab({
-									// 	url: '../../pages/tabBar/user/user'
-									// })
 									uni.reLaunch({
 										url: '../Phone-recharge-details/Phone-recharge-details?id=' +
 											that.orderId
@@ -575,32 +574,7 @@
 							})
 						}
 					})
-				}
-				// else if (that.paytype == 'jinbi') {
-				// 	if (that.user.gold < that.payPrice * 100) {
-				// 		uni.showToast({
-				// 			icon: 'none',
-				// 			title: '积分不足',
-				// 			duration: 2000,
-				// 			success() {
-				// 				setTimeout(() => {
-				// 					uni.navigateTo({
-				// 						url: '../../pages/user/deposit/deposit'
-				// 					})
-				// 				}, 1000)
-				// 			}
-				// 		});
-				// 		return;
-				// 	}
-				// 	if (!that.user.isSetPayPwd) {
-				// 		uni.navigateTo({
-				// 			url: '../../pages/login/updatePas/updatePas'
-				// 		})
-				// 		return;
-				// 	}
-				// 	that.$refs.paymentPassword.modalFun('show');
-				// }
-				else if (that.paytype == '3') {
+				} else if (that.paytype == '3') {
 					if (that.tongCardPrice < that.payPrice) {
 						uni.showToast({
 							icon: 'none',
@@ -652,17 +626,18 @@
 				uni.showLoading({
 					title: '支付中...'
 				})
-				if (this.paytype == 'jinbi') {
+				if (this.payPrice == 0) {
 					let params = {
-						"orderId": this.orderId,
+						"memDiscountId": this.memDiscountId,
+						"rechargeContent": this.rechargeContent,
+						"goodsId": this.objectId,
+						"integralNum": this.priceValue[1],
 						"password": this.PaymentPassword
 					}
-					orderToGoldPayunion(params).then(res => {
-						uni.hideLoading();
+					addOrderPay(params).then(res => {
 						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
+							uni.hideLoading();
+							this.orderId = res.return_data.id;
 							uni.reLaunch({
 								url: '../Phone-recharge-details/Phone-recharge-details?id=' +
 									this.orderId
@@ -677,8 +652,9 @@
 						}
 						uni.showToast({
 							title: res.return_msg,
-							icon: 'none'
-						})
+							icon: 'none',
+							duration: 2000
+						});
 					})
 					return;
 				}
@@ -687,7 +663,7 @@
 					"cardNo": this.user.hltCardNo.cardNo,
 					"password": this.PaymentPassword
 				}
-				hltUnionCardPayUnion(params).then(res => {
+				hltUnionCardPayghk(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						uni.showToast({
@@ -753,8 +729,12 @@
 									that.orderId
 							})
 						},
-						cancel: function(r) {},
-						fail: function(res) {}
+						cancel: function(r) {
+							uni.navigateBack({})
+						},
+						fail: function(res) {
+							uni.navigateBack({})
+						}
 					});
 				});
 
@@ -770,25 +750,24 @@
 			blockMoving() {
 				// console.log('正在滑动中')
 			},
+			//滑动结束
 			blockEnd() {
-				console.log('=======' + this.priceValue[1]);
-				console.log('=======' + this.priceValue);
-
-				if (this.priceValue[1] > 0) {
-					this.isIntegral = true;
+				this.isDiscount = false;
+				if (this.deductionPrice == 0) {
+					this.payPrice = parseFloat(this.saveprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(
+						2);
 				} else {
-					this.isIntegral = false;
+					this.payPrice = parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) - this
+						.deductionPrice).toFixed(2);
 				}
-				this.payPrice = this.payPrice - parseFloat(this.priceValue[1] / 100).toFixed(0);
 				if (this.payPrice == 0) {
 					this.isUse = false;
 					this.paytype = '';
 				} else {
 					this.isUse = true;
-
 				}
-				// console.log('滑动结束')
-			}
+			},
+
 		}
 	}
 </script>
diff --git a/subPages/unionPay-orderList/unionPay-orderList.vue b/subPages/unionPay-orderList/unionPay-orderList.vue
index b856e16..0f90bcb 100644
--- a/subPages/unionPay-orderList/unionPay-orderList.vue
+++ b/subPages/unionPay-orderList/unionPay-orderList.vue
@@ -1,396 +1,489 @@
-<template>
-	<view>
-		<!-- 顶部导航 -->
-		<view class="topTabBar" :style="{position:headerPosition,top:headerTop}">
-			<view class="grid" v-for="(grid,tbIndex) in orderType" :key="tbIndex" @tap="showType(tbIndex)">
-				<view class="text" :class="[tbIndex==tabbarIndex?'on':'']">{{grid}}</view>
-			</view>
-		</view>
-		<!-- 考虑非APP端长列表和复杂的DOM使用scroll-view会卡顿，所以漂浮顶部选项卡使用page本身的滑动 -->
-		<view class="order-list">
-			<view class="list">
-				<view class="onorder" v-if="orderList.length==0">
-					<image :src="imagewxUrl+imgadres"></image>
-				</view>
-				<view class="row" v-for="(row,index) in orderList" :key="index">
-					<view class="width96 height40">
-						<view class="width50 flleft aliitem fotlt font16">
-							<image src="../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image>
-							话费充值
-						</view>
-						<view class="width50 flright fotrt fcor666 font15">
-							{{row.createTimed | formatDate('-')}}
-						</view>
-					</view>
-					<view class="width96 line1 mart10"></view>
-
-					<view class="width96 height60 mart10">
-						<view class="width70 flleft fotlt ">
-							<view class="font16 fontwig6 text1 fcor333">
-								{{row.remarks}}
-							</view>
-							<view class="font15 text1 fcor999 mart5">
-								数量 : 1
-							</view>
-						</view>
-						<view class="width30 flright fotrt fcor666 font15 fotrt">
-							<view class="font16 fontwig6 text1 fcor333" v-if="row.payType == 1 || row.payType == 3">
-								￥{{row.payPrice}}
-							</view>
-							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else>
-								<image style="width: 15px;height: 15px;"
-									src="../../static/img/jfx.png">
-								</image>{{row.payPrice*100}}
-							</view>
-							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.status]}}</view>
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
-	</view>
-	
-</template>
-<script>
-	import {
-		getUserOrderListhuafei
-	} from '../../Utils/Api.js';
-	let app = getApp()
-	export default {
-		data() {
-			return {
-				headerPosition: "fixed",
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'noorder.png',
-				imgadres1: 'dhf.png',
-				headerTop: "0px",
-				typeText: {
-					1: '等待付款',
-					2: '订单已支付',
-					3: '订单已完成',
-					4: '订单已取消',
-					5: '订单已退款'
-				},
-				// 退换货
-				orderType: ['全部', '待支付', '已支付', '已完成', '已取消', '已退款'],
-				//订单列表 演示数据
-				orderList: [],
-				list: [],
-				tabbarIndex: 0,
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				loadingText: '',
-				typeId: '',
-				imageUrl: app.globalData.imgUrl,
-				reFresh: ""
-			}
-		},
-
-		onLoad(option) {
-			// #ifdef H5
-			this.headerTop = '44px';
-			// #endif
-			let tbIndex = parseInt(option.tbIndex) + 1;
-			this.list = this.orderList[tbIndex];
-			this.tabbarIndex = tbIndex;
-			this.typeId = tbIndex;
-			this.getUserOrderListhuafei();
-		},
-		onPageScroll(e) {
-			return;
-			//兼容iOS端下拉时顶部漂移
-			this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
-		},
-		onReachBottom() {
-			this.getUserOrderListhuafei();
-		},
-		filters: {
-			toFixed: function(x) {
-				return parseFloat(x).toFixed(2);
-			},
-			//过滤器 用于格式化时间
-			formatDate: function(value, spe = '/') {
-				let data = new Date(value);
-				let year = data.getFullYear();
-				let month = data.getMonth() + 1;
-				let day = data.getDate();
-				let h = data.getHours();
-				let mm = data.getMinutes();
-				let s = data.getSeconds();
-				month = month >= 10 ? month : "0" + month;
-				day = day >= 10 ? day : "0" + day;
-				h = h >= 10 ? h : "0" + h;
-				mm = mm >= 10 ? mm : "0" + mm;
-				s = s >= 10 ? s : "0" + s;
-				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
-			}
-		},
-		methods: {
-			//查询订单列表
-			getUserOrderListhuafei() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					return false;
-				}
-				let statusId = this.typeId;
-
-				let pagenum = this.pageNum;
-				let params = {
-					status: statusId,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize
-				}
-
-				getUserOrderListhuafei(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.list != '') {
-						uni.hideLoading();
-						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
-							this.isNoMoreData = true;
-						}
-						this.orderList = this.orderList.concat(res.return_data.list);
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.orderList = [];
-						uni.hideLoading()
-					}
-				})
-
-
-			},
-			showType(tbIndex) {
-				this.tabbarIndex = tbIndex;
-				this.pageNum = 1;
-				this.orderList = []
-				this.isNoMoreData = false;
-				if (tbIndex == 0) {
-					this.typeId = '';
-				} else {
-					this.typeId = tbIndex;
-				}
-				this.getUserOrderListhuafei();
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f3f3f3;
-	}
-
-	.zspec {
-		font-size: 22rpx;
-		background-color: #0083f5;
-		color: #FFFFFF;
-		height: 40rpx;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		width: 44px;
-		-webkit-box-align: center;
-		-webkit-align-items: center;
-		align-items: center;
-		padding: 0 15rpx;
-		border-radius: 4px;
-		margin-bottom: 10px;
-		margin-left: 5px;
-	}
-
-
-	.loading-text {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 60upx;
-		color: #979797;
-		font-size: 24upx;
-	}
-
-	.topTabBar {
-		width: 100%;
-		position: fixed;
-		top: 0;
-		z-index: 10;
-		background-color: #f8f8f8;
-		height: 80upx;
-		display: flex;
-		justify-content: space-around;
-
-		.grid {
-			width: 20%;
-			height: 80upx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #444;
-			font-size: 28upx;
-
-			.text {
-				height: 76upx;
-				display: flex;
-				align-items: center;
-
-				&.on {
-					color: #0083f5;
-					border-bottom: solid 4upx #0083f5;
-				}
-			}
-
-		}
-	}
-
-	.order-list {
-		margin-top: 80upx;
-		padding-top: 20upx;
-		width: 100%;
-
-		.list {
-			width: 94%;
-			margin: 0 auto;
-
-			.onorder {
-				width: 100%;
-				height: 50vw;
-				display: flex;
-				justify-content: center;
-				align-content: center;
-				flex-wrap: wrap;
-
-				image {
-					width: 70vw;
-					margin-top: 150px;
-				}
-
-				.text {
-					width: 100%;
-					height: 60upx;
-					font-size: 28upx;
-					color: #444;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				}
-			}
-
-			.row {
-				width: calc(100% - 40upx);
-				padding: 10upx 20upx;
-				border-radius: 10upx;
-				background-color: #fff;
-				margin-bottom: 20upx;
-
-				.type {
-					font-size: 26upx;
-					color: #0083f5;
-					height: 50upx;
-					display: flex;
-					align-items: center;
-				}
-
-				.order-info {
-					width: 100%;
-					display: flex;
-
-					.left {
-						flex-shrink: 0;
-						width: 25vw;
-						height: 25vw;
-
-						image {
-							width: 25vw;
-							height: 25vw;
-							border-radius: 10upx;
-						}
-					}
-
-					.right {
-						width: 100%;
-						margin-left: 10upx;
-						position: relative;
-
-						.name {
-							width: 100%;
-							font-size: 18px;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							overflow: hidden;
-						}
-
-						.spec {
-							color: #a7a7a7;
-							font-size: 14px;
-						}
-
-						.price-number {
-							width: 100%;
-							font-size: 15px;
-							display: flex;
-
-							.price {
-								font-size: 14px;
-								margin-right: 5upx;
-							}
-
-						}
-					}
-				}
-
-				.detail {
-					display: flex;
-					justify-content: flex-end;
-					align-items: flex-end;
-					height: 60upx;
-					font-size: 26upx;
-
-					.sum {
-						padding: 0 8upx;
-						display: flex;
-						align-items: flex-end;
-
-						.price {
-							font-size: 30upx;
-						}
-					}
-
-				}
-
-				.btns {
-					height: 80upx;
-					display: flex;
-					align-items: center;
-					justify-content: flex-end;
-
-					view {
-						min-width: 120upx;
-						height: 70rpx;
-						padding: 0 20upx;
-						border-radius: 50upx;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						font-size: 28upx;
-						margin-left: 20upx;
-					}
-
-					.default {
-						border: solid 1upx #ccc;
-						color: #666;
-					}
-
-					.pay {
-						background-color: #0083f5;
-						color: #FFFFFF;
-					}
-				}
-			}
-		}
-	}
+<template>
+	<view>
+		<!-- 顶部导航 -->
+		<view class="topTabBar" :style="{position:headerPosition,top:headerTop}">
+			<view class="grid" v-for="(grid,tbIndex) in orderType" :key="tbIndex" @tap="showType(tbIndex)">
+				<view class="text" :class="[tbIndex==tabbarIndex?'on':'']">{{grid}}</view>
+			</view>
+		</view>
+		<!-- 考虑非APP端长列表和复杂的DOM使用scroll-view会卡顿，所以漂浮顶部选项卡使用page本身的滑动 -->
+		<view class="order-list">
+			<view class="list">
+				<view class="onorder" v-if="orderList.length==0">
+					<image :src="imagewxUrl+imgadres"></image>
+				</view>
+				<view class="row" v-for="(row,index) in orderList" :key="index" @click="jumpDetails(row.id)">
+					<view class="width96 height40">
+						<view class="width50 flleft aliitem fotlt font16">
+							<image src="../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image>
+							话费充值
+						</view>
+						<view class="width50 flright fotrt fcor666 font15">
+							{{row.createTimed | formatDate('-')}}
+						</view>
+					</view>
+					<view class="width96 line1 mart10"></view>
+
+					<view class="width96 height60 mart10">
+						<view class="width70 flleft fotlt ">
+							<view class="font16 fontwig6 text1 fcor333">
+								{{row.operatorName}}
+							</view>
+							<view class="font15 text1 fcor999 mart5">
+								数量 : 1
+							</view>
+						</view>
+						<view class="width30 flright fotrt fcor666 font15 fotrt">
+							<view class="font16 fontwig6 text1 fcor333">
+								￥{{row.payRealPrice}}
+							</view>
+							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.payStatus]}}</view>
+						</view>
+					</view>
+					<view class="width96 line1 mart10 marb5" v-if="row.payStatus == 101">
+					</view>
+					<view class="btns" v-if="row.payStatus == 101">
+						<block>
+							<view class="default" @tap.stop="cancelRechargeOrder(row.id)">取消订单</view>
+							<view class="pay" @tap.stop="toPayment(row)">付款</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+<script>
+	import {
+		getUserOrderListhuafei,
+		cancelRechargeOrder
+	} from '../../Utils/Api.js';
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				headerPosition: "fixed",
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'noorder.png',
+				imgadres1: 'dhf.png',
+				headerTop: "0px",
+				typeText: {
+					101: '等待付款',
+					102: '订单已支付',
+					100: '订单已完成',
+					104: '订单已取消',
+					105: '订单已退款'
+				},
+				// 退换货
+				orderType: ['全部', '待支付', '已支付', '已完成', '已取消', '已退款'],
+				//订单列表 演示数据
+				orderList: [],
+				tabbarIndex: 0,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				loadingText: '',
+				typeId: '',
+				imageUrl: app.globalData.imgUrl,
+				reFresh: ""
+			}
+		},
+
+		onLoad(option) {
+			// #ifdef H5
+			this.headerTop = '44px';
+			// #endif
+			let tbIndex = parseInt(option.tbIndex) + 1;
+			this.tabbarIndex = tbIndex;
+			if (tbIndex == 0) {
+				this.typeId = '';
+			}
+			if (tbIndex == 1) {
+				this.typeId = 101;
+			}
+			if (tbIndex == 2) {
+				this.typeId = 102;
+			}
+			if (tbIndex == 3) {
+				this.typeId = 100;
+			}
+			if (tbIndex == 4) {
+				this.typeId = 104;
+			}
+			if (tbIndex == 5) {
+				this.typeId = 105;
+			}
+			this.getUserOrderListhuafei();
+		},
+		onPageScroll(e) {
+			return;
+			//兼容iOS端下拉时顶部漂移
+			this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
+		},
+		onReachBottom() {
+			this.getUserOrderListhuafei();
+		},
+		filters: {
+			toFixed: function(x) {
+				return parseFloat(x).toFixed(2);
+			},
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		watch: {
+			//监听reFresh,如果有修改就执行监听器
+			reFresh: function() {
+				this.tabbarIndex = 0;
+				this.typeId = '';
+				this.pageNum = 1;
+				this.orderList = []
+				this.isNoMoreData = false;
+				this.getUserOrderListhuafei();
+			}
+		},
+		methods: {
+			//查询订单列表
+			getUserOrderListhuafei() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let statusId = this.typeId;
+
+				let pagenum = this.pageNum;
+				let params = {
+					status: statusId,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize
+				}
+
+				getUserOrderListhuafei(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.orderList = this.orderList.concat(res.return_data.list);
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.orderList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//跳转详情
+			jumpDetails(e) {
+				uni.navigateTo({
+					url: '../rechargeDetails/rechargeDetails?id=' + e
+				})
+			},
+			//取消订单
+			cancelRechargeOrder(row) {
+				let that = this;
+				uni.showModal({
+					title: '取消订单',
+					content: '确定取消此订单？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								orderId: row,
+							}
+							cancelRechargeOrder(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									this.pageNum = 1;
+									this.orderList = []
+									this.isNoMoreData = false;
+									that.getUserOrderListhuafei();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//去支付
+			toPayment(row) {
+				uni.redirectTo({
+					url: '../recharge-pay/recharge-pay?goodsId=' + row.goodsId + '&payPrice=' + row.payRealPrice+'&orderId='+row.id
+				})
+			},
+			showType(tbIndex) {
+				this.tabbarIndex = tbIndex;
+				this.pageNum = 1;
+				this.orderList = []
+				this.isNoMoreData = false;
+				if (tbIndex == 0) {
+					this.typeId = '';
+				}
+				if (tbIndex == 1) {
+					this.typeId = 101;
+				}
+				if (tbIndex == 2) {
+					this.typeId = 102;
+				}
+				if (tbIndex == 3) {
+					this.typeId = 100;
+				}
+				if (tbIndex == 4) {
+					this.typeId = 104;
+				}
+				if (tbIndex == 5) {
+					this.typeId = 105;
+				}
+				this.getUserOrderListhuafei();
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f3f3f3;
+	}
+
+	.zspec {
+		font-size: 22rpx;
+		background-color: #0083f5;
+		color: #FFFFFF;
+		height: 40rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		width: 44px;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 0 15rpx;
+		border-radius: 4px;
+		margin-bottom: 10px;
+		margin-left: 5px;
+	}
+
+
+	.loading-text {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 60upx;
+		color: #979797;
+		font-size: 24upx;
+	}
+
+	.topTabBar {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		z-index: 10;
+		background-color: #f8f8f8;
+		height: 80upx;
+		display: flex;
+		justify-content: space-around;
+
+		.grid {
+			width: 20%;
+			height: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #444;
+			font-size: 28upx;
+
+			.text {
+				height: 76upx;
+				display: flex;
+				align-items: center;
+
+				&.on {
+					color: #0083f5;
+					border-bottom: solid 4upx #0083f5;
+				}
+			}
+
+		}
+	}
+
+	.order-list {
+		margin-top: 80upx;
+		padding-top: 20upx;
+		width: 100%;
+
+		.list {
+			width: 94%;
+			margin: 0 auto;
+
+			.onorder {
+				width: 100%;
+				height: 50vw;
+				display: flex;
+				justify-content: center;
+				align-content: center;
+				flex-wrap: wrap;
+
+				image {
+					width: 70vw;
+					margin-top: 150px;
+				}
+
+				.text {
+					width: 100%;
+					height: 60upx;
+					font-size: 28upx;
+					color: #444;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+
+			.row {
+				width: calc(100% - 40upx);
+				padding: 10upx 20upx;
+				border-radius: 10upx;
+				background-color: #fff;
+				margin-bottom: 20upx;
+
+				.type {
+					font-size: 26upx;
+					color: #0083f5;
+					height: 50upx;
+					display: flex;
+					align-items: center;
+				}
+
+				.order-info {
+					width: 100%;
+					display: flex;
+
+					.left {
+						flex-shrink: 0;
+						width: 25vw;
+						height: 25vw;
+
+						image {
+							width: 25vw;
+							height: 25vw;
+							border-radius: 10upx;
+						}
+					}
+
+					.right {
+						width: 100%;
+						margin-left: 10upx;
+						position: relative;
+
+						.name {
+							width: 100%;
+							font-size: 18px;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+						}
+
+						.spec {
+							color: #a7a7a7;
+							font-size: 14px;
+						}
+
+						.price-number {
+							width: 100%;
+							font-size: 15px;
+							display: flex;
+
+							.price {
+								font-size: 14px;
+								margin-right: 5upx;
+							}
+
+						}
+					}
+				}
+
+				.detail {
+					display: flex;
+					justify-content: flex-end;
+					align-items: flex-end;
+					height: 60upx;
+					font-size: 26upx;
+
+					.sum {
+						padding: 0 8upx;
+						display: flex;
+						align-items: flex-end;
+
+						.price {
+							font-size: 30upx;
+						}
+					}
+
+				}
+
+				.btns {
+					height: 80upx;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+
+					view {
+						min-width: 120upx;
+						height: 70rpx;
+						padding: 0 20upx;
+						border-radius: 50upx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						font-size: 28upx;
+						margin-left: 20upx;
+					}
+
+					.default {
+						border: solid 1upx #ccc;
+						color: #666;
+					}
+
+					.pay {
+						background-color: #0083f5;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+	}
 </style>