1.上线2.0 修改问题

high-unionPay/pages/goods/recording/recording.vue

@@ -145,7 +145,7 @@
 				selectByExpiringSoon().then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
-						this.recordInfo = res.return_data.list;
+						this.recordInfo = res.return_data;
 					} else {
 						this.recordInfo = [];
 					}

high-unionPay/pages/goods/refuel-details/refuel-details.vue

@@ -544,7 +544,7 @@
 					"gasimg": this.storeList.gasLogoSmall,
 					"gasname": this.storeList.gasName,
 					"gasaddress": this.storeList.gasAddress,
-					"highChildOrderList": [{
+					"childOrderList": [{
 						"goodsType": 3,
 						"goodsId": this.counId,
 						"saleCount": 1,

high-unionPay/pages/order/confirmation.vue

@@ -181,7 +181,7 @@
 						<radio :checked="items.id == memDiscountId" color="#0083f5" />
 					</view>
 					<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
-					<view class="font13 fcor999 mart5">有效期至：{{items.salesEndTime | formatDate('-')}}</view>
+					<view class="font13 fcor999 mart5">有效期至：{{items.useEndTime | formatDate('-')}}</view>
 
 				</view>
 			</view>

high-unionPay/pages/user/deposit/deposit.vue

@@ -134,7 +134,7 @@
 				let goods = {
 					"identificationCode": app.globalData.identificationCode,
 					"companyId": app.globalData.companyId,
-					"highChildOrderList": [{
+					"childOrderList": [{
 						"goodsType": 2,
 						"goodsId": app.globalData.userInfo.id,
 						"saleCount": 1,
@@ -148,7 +148,9 @@
 						this.unionPay(res.return_data.orderNo);
 					} else {
 						uni.showToast({
-							title: res.return_msg
+							title: res.return_msg,
+							duration:2000,
+							icon:"none"
 						});
 					}
 				})

high-unionPay/pages/user/order_details/order_details.vue

@@ -50,9 +50,9 @@
 			</view>
 			<view class="mart15 alijusstart font14 width94" v-if="recinfo.payType">
 				<view class="width20 fcor777">支付方式</view>
-				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 1">支付宝</view>
 				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 2">微信支付</view>
 				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 3">积分兑换</view>
+				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 5">银联支付</view>
 				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通工会卡</view>
 				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 7">嗨森逛个人油卡</view>
 				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 8">嗨森逛车队油卡</view>

high-unionPay/qianzhu-KFC/order-details/order-details.vue

@@ -172,6 +172,8 @@
 				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 3">积分兑换</view>
 				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 4">汇联通工会卡</view>
 				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 5">银联支付</view>
+				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 7">嗨森逛个人油卡</view>
+				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 8">嗨森逛个人油卡</view>
 			</view>
 			<view class="width94 alijusstart mart20 font14 fcor666" v-if="typeid == 10">
 				<view class="width30">充值手机号</view>