1.优化2.0 合并问题 修改问题

high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue

@@ -174,6 +174,7 @@
 		unionPay,
 		cardPay,
 		getUserOrderPreList,
+		cancel,
 		getRebateIntegral
 	} from '../../Utils/Api.js';
 	let app = getApp();
@@ -234,7 +235,7 @@
 
 				let datas = {
 					platformId: this.showType,
-					regionId: app.globalData.cityId,
+					"companyId": app.globalData.companyId,
 					productType: 3
 				}
 				getThirdPartyByDetail(datas).then(res => {
@@ -532,12 +533,14 @@
 							title: '工会卡余额不足',
 							duration: 2000,
 						});
+						that.cancel();
 						return;
 					}
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../pages/login/updatePas/updatePas'
 						})
+						that.cancel();
 						return;
 					}
 					if (!that.user.isSetHltCard) {
@@ -553,6 +556,7 @@
 								}, 1000)
 							}
 						});
+						that.cancel();
 						return;
 					}
 					that.$refs.paymentPassword.modalFun('show');
@@ -590,6 +594,17 @@
 					});
 				});
 			},
+			//取消订单
+			cancel() {
+				let params = {
+					orderNo: this.orderId,
+				}
+				cancel(params).then(res => {
+					if (res.return_code == '000000') {
+						this.orderId = '';
+					}
+				})
+			},
 			submitHandle(e) {
 				uni.showLoading({
 					title: '支付中...'
@@ -641,6 +656,7 @@
 							icon: 'none',
 							duration: 2000
 						});
+						that.cancel();
 					})
 					return;
 				}

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

@@ -99,14 +99,14 @@
 					title: '商品列表'
 				});
 				this.getCouponListArea();
-				this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+				this.getCmsContent('CMS_BANNER_COUPON');
 			}
 			if (option.id == 2) {
 				uni.setNavigationBarTitle({
 					title: '积分列表'
 				});
 				this.getCouponListArea();
-				this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+				this.getCmsContent('CMS_BANNER_COUPON');
 			}
 			if (option.id == 3) {
 				uni.setNavigationBarTitle({
@@ -124,7 +124,7 @@
 				uni.setNavigationBarTitle({
 					title: '优选商品'
 				});
-				this.getCmsContent('CMS_PRE_LIST');
+				this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
 				this.getBrandCouponList();
 			}
 		},
@@ -176,7 +176,7 @@
 				}
 				getCmsContent(params).then(res => {
 					if (res.return_code == '000000') {
-						this.swiperList = res.return_data;
+						this.swiperList = res.return_data.childCategory;
 					}
 				});
 			},

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

@@ -155,7 +155,7 @@
 
 			<view class="line1" v-if="item == 4"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 4" @tap="paytype='4'">
-				<view class="width60 flleft font14">
+				<view class="width60 flleft font16">
 					银联支付
 				</view>
 				<view class="flright width30 fotct" v-if="isUse">
@@ -165,7 +165,7 @@
 
 			<view class="line1" v-if="item == 6"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'">
-				<view class="width60 flleft font14">
+				<view class="width60 flleft font16">
 					油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text>
 				</view>
 				<view class="flright width30 fotct" v-if="isUse">
@@ -175,7 +175,7 @@
 
 			<view class="line1" v-if="item == 3"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'">
-				<view class="width60 flleft font14">
+				<view class="width60 flleft font16">
 					汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
 				</view>
 				<view class="flright width30 fotct" v-if="isUse">
@@ -531,6 +531,7 @@
 						}],
 						"payGold": this.priceValue[1],
 						"promoteCode": this.identificationCode,
+						"companyId": app.globalData.companyId,
 						"payPwd": this.PaymentPassword
 					}
 					create(goods).then(res => {
@@ -695,6 +696,7 @@
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
 					"payPwd": this.PaymentPassword,
+					"companyId": app.globalData.companyId,
 					"memDiscountId": this.memDiscountId
 				}
 				create(goods).then(res => {

high-unionPay/pages/order/confirmation.vue

@@ -161,7 +161,7 @@
 		</view>
 
 
-		<view class="width100 height60"></view>
+		<view class="width100 height110"></view>
 		<view class="footer">
 			<view class="settlement">
 				<view class="sum">实付:<view class="money">￥{{paytheprice}}</view>
@@ -527,6 +527,7 @@
 					"promoteCode": this.identificationCode,
 					memDiscountId: this.memDiscountId,
 					"storeId": this.storeId,
+					"companyId": app.globalData.companyId,
 					"postData": {
 						"address": this.contactAddress,
 						"user": this.contactPepole,
@@ -688,6 +689,7 @@
 						"payGold": this.priceValue[1],
 						"promoteCode": this.identificationCode,
 						"payPwd": this.PaymentPassword,
+						"companyId": app.globalData.companyId,
 						memDiscountId: this.memDiscountId
 					}
 					create(goods).then(res => {

high-unionPay/pages/pay/success/success.vue

@@ -57,7 +57,7 @@
 				<view class="mart20 fotct fcorred font15 marb20"
 					v-if="!couponDesInfo.couponInfo.reserveStatus && coupstus != 0 && couponDesInfo.couponInfo.couponSource != 3 && couponDesInfo.couponInfo.couponSource != 5">
 					请告知加油员用码商支付</view>
-				<view class="width90 mart20 fotct" v-if="couponDesInfo.couponInfo.reserveStatus">
+				<view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.qrCodeImg">
 					<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg">
 					</image>
 				</view>

high-unionPay/pages/tabBar/category/category.vue

@@ -272,7 +272,7 @@
 			},
 			//拨打客服电话
 			playPhone() {
-				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let cont = "本服务由惠兑礼品提供\n400-678-0738";
 				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',

high-unionPay/pages/tabBar/home/home.vue

@@ -6,6 +6,9 @@
 				@animCreated="handleAnimation" />
 		</view> -->
 		<!-- <view class="status"></view> -->
+		<view v-if="isdisplay">
+			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
+		</view>
 		<view v-for="(item,index) in homeCateList" :key="index">
 			<view class="height90 backcorltop" v-if="item.type == 1">
 				<view class="category-list">
@@ -22,7 +25,7 @@
 			<image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
 
 			<!-- 顶部菜单 -->
-			<view class="category-list backcorfff" style="margin-top: -5px;" v-if="item.type == 7">
+			<view class="category-list backcorfff" style="margin-top: -7px;" v-if="item.type == 7">
 				<view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
 					@click="toCategory(row)">
 					<view class="img">
@@ -42,7 +45,7 @@
 							<view class="paddleft10 font14 fcor666 text1 width70">
 								{{item.childDate[0].title}}
 							</view>
-							<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
+							<view class="width25 font13 fcor999">{{item.childDate[0].timeData}}</view>
 						</view>
 						<view class="width20 alijus">
 							<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
@@ -84,22 +87,26 @@
 				</view>
 				<view class="width30 font14 fotrt fcor666">更多</view>
 			</view>
-			<view class="width94 alijus mart20" v-if="item.type == 6 ">
+			<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
-				<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
+				<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
-					<image mode="widthFix" class="width100" :src="imageUrl+goods.couponImg"></image>
+					@click="toGoods(item.detailJumpUrl,goods.id)">
+					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+						:src="imageUrl+goods.couponImg"></image>
 					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
-					<view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+					<!-- <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					</view>
+					</view> -->
 					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
 				</view>
 			</view>
-			<view class="width94 alijus mart20" v-if="item.type == 9 ">
+			<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
-				<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
+				<view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
-					<image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image>
+					@click="toGoods(item.detailJumpUrl,goods.id)">
+					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+						:src="imageUrl+goods.listImg"></image>
 					<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
-					<view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
+					<!-- <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
 						{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					</view>
+					</view> -->
 					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
 				</view>
 			</view>
@@ -156,7 +163,8 @@
 				imgadres: '/home/home1.png',
 				imgadres1: '/home/home2.png',
 				imgadres2: 'jt.png',
-				imgadres5: 'unionarea.png',
+				// imgadres5: 'unionarea.png',
+				imgadres5: 'loading.gif',
 				imgadres3: '',
 				imgadres4: 'cusservice.png',
 				webUrl: '',
@@ -170,7 +178,6 @@
 				pageSize: 6,
 				homeCateList: [],
 				//切换状态
-				cpStuats: 1,
 				jumpType: '',
 				isdisplay: true //是否展示
 			};
@@ -285,8 +292,8 @@
 						app.globalData.cityId = res.return_data.regionId;
 						// app.globalData.cityId = '520000';
 						app.globalData.companyId = res.return_data.companyId;
-						this.getCmsAactibity();
 						this.getCmsContentcmsContent();
+						this.getCmsAactibity();
 					}
 				});
 			},
@@ -295,7 +302,7 @@
 				let params = {
 					companyId: app.globalData.companyId,
 					platform: 3,
-					categoryCode: 'CMS_HOME'
+					categoryCode: 'CMS_HOME_POPOVER'
 				}
 				getCmsContent(params).then(res => {
 					this.isdisplay = false;
@@ -312,7 +319,7 @@
 				let params = {
 					companyId: app.globalData.companyId,
 					platform: 3,
-					categoryCode: 'CMS_UNIONPAY_ALERT'
+					categoryCode: 'CMS_HOME_POPOVER'
 				}
 				getCmsContent(params).then(res => {
 					uni.hideLoading();
@@ -368,9 +375,9 @@
 				})
 			},
 			//商品跳转
-			toGoods(e) {
+			toGoods(e, id) {
 				uni.navigateTo({
-					url: '../../goods/goods?id=' + e
+					url: e + id
 				});
 			},
 			//积分卡券列表

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- #ifdef H5 -->
-		<view  class="status"></view>
+		<view class="status"></view>
 		<!-- #endif -->
 		<view class="user">
 			<!-- 头像 -->
@@ -59,13 +59,31 @@
 			</view>
 			<view class="width90 mart10 height60" v-if="nopaylist != ''">
 				<swiper circular="true" interval="3000" autoplay="true" @change="swiperChange">
-					<swiper-item v-for="(swiper,index) in nopaylist" :key="index" @click="jumpDetails(swiper.orderNo,swiper.productType)">
+					<swiper-item v-for="(swiper,index) in nopaylist" :key="index"
+						@click="jumpDetails(swiper.orderNo,swiper.productType)">
 						<view class="alijusstart  border-8r backcor9 height60 ">
-							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/user/user5.png">
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order7.png"
+								v-if="swiper.productType== 1"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order9.png"
+								v-if="swiper.productType== 2"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order3.png"
+								v-if="swiper.productType== 3"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order2.png"
+								v-if="swiper.productType== 4"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order5.png"
+								v-if="swiper.productType== 5"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order4.png"
+								v-if="swiper.productType== 6"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order8.png"
+								v-if="swiper.productType== 7"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/unioncard.png"
+								v-if="swiper.productType== 8"></image>
+							<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order6.png"
+								v-if="swiper.productType== 9">
 							</image>
 							<view class="width50  margle10">
 								<view class="font15 fcor333 fontspec">等待付款</view>
-								<view class="font12 fcor666 fontspec mart5">剩余时间: {{countdownm}}:{{countdowns}}</view>
+								<view class="font12 fcor666 fontspec mart5">剩余时间: {{countdownm}}分钟</view>
 							</view>
 							<view class="topay">
 								去支付
@@ -174,7 +192,7 @@
 				textnum: '',
 				textSend: '',
 				therrNum: '',
-				rechargeOrderNum:'', //话费待支付
+				rechargeOrderNum: '', //话费待支付
 				whetherCheckNum: '', //未查看数量
 				orderPayNum: '', //支付订单数量
 				//个人信息,
@@ -200,7 +218,7 @@
 				czList: '',
 				nopaylist: [], //待支付
 				assetsstu: 2,
-				userphone:'' ,// 手机号
+				userphone: '', // 手机号
 				userAccount: '', //用户余额,
 				countdownm: '', // 倒计时分
 				countdowns: '', // 倒计时秒
@@ -240,7 +258,7 @@
 						url: '../../login/updatePas/updatePas',
 						text: '支付密码',
 						img: '../../../static/img/user/user11.png'
-					},  {
+					}, {
 						url: '',
 						text: '客服',
 						img: '../../../static/img/user/user13.png'
@@ -346,7 +364,7 @@
 					lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
 						(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
 						24), //计算小时数
-					leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
+					leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? +Math.floor(lefttime / (1000 * 60) % 60) :
 					Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
 					lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
 						lefttime / 1000 % 60); //计算秒数
@@ -488,8 +506,8 @@
 			},
 			//拨打客服电话
 			playPhone() {
-				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let cont = "本服务由惠兑礼品提供\n400-678-0738";
-				let content = cont.replace(/<br>/g,"\n");
+				let content = cont.replace(/<br>/g, "\n");
 				uni.showModal({
 					title: '客服',
 					content: content,
@@ -516,6 +534,7 @@
 	page {
 		background-color: #f5f5f5;
 	}
+
 	.status {
 		width: 100%;
 		height: 44px;

high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue

@@ -131,7 +131,7 @@
 				})
 				let params = {
 					operatorType: item,
-					regionId: app.globalData.cityId,
+					"companyId": app.globalData.companyId,
 					platformId: 3
 					// rechargeType: this.swiperCurrent
 				}

high-unionPay/pages/unionPay/recharge/recharge.vue

@@ -42,8 +42,9 @@
 			//查询弹窗
 			getCmsAactibity() {
 				let params = {
-					regionId: app.globalData.cityId,
+					companyId: app.globalData.companyId,
-					categoryCode: 'CMS_TELEPHONE_POP_UP'
+					platform: 3,
+					categoryCode: 'CMS_RECHARGE_POPOVER'
 				}
 				getCmsContent(params).then(res => {
 					if (res.return_code == '000000' && res.return_data != '') {

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

@@ -36,8 +36,8 @@
 				选择支付方式
 			</view>
 			<view class="content">
-				<view class="pay-list">
+				<view class="pay-list" v-for="(item,index) in paytypeList" :key="index">
-					<view class="row" @tap="paytype='wxpay'">
+					<view class="row" @tap="paytype='4'" v-if="item == 4">
 						<view class="left">
 							<image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png">
 							</image>
@@ -46,7 +46,7 @@
 							银联支付
 						</view>
 						<view class="right">
-							<radio :checked="paytype=='wxpay'" color="#0083f5" />
+							<radio :checked="paytype=='4'" color="#0083f5" />
 						</view>
 					</view>
 				</view>
@@ -66,26 +66,43 @@
 <script>
 	let app = getApp()
 	import {
-		addOrder,
+		create,
-		orderToPay,
+		unionPay,
-		unionPay
+		getThirdPartyByDetail
 	} from "../../../Utils/Api.js";
 	export default {
 		data() {
 			return {
 				inputAmount: '', //金额
 				amountList: [100, 200, 300, 500, 800, 1000], //预设3个可选快捷金额
-				paytype: 'wxpay', //支付类型
+				paytype: '4', //支付类型
 				user: "",
 				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'wxpay.png'
+				imgadres: 'wxpay.png',
+				paytypeList: [] //支付方式
 			};
 		},
 		onLoad() {
 			this.user = app.globalData.userInfo
 		},
+		onShow() {
+			this.getThirdPartyByDetail();
+		},
 		methods: {
-
+			//查询支付方式
+			getThirdPartyByDetail() {
+				let datas = {
+					platformId: 3,
+					"companyId": app.globalData.companyId,
+					productType: 4
+				}
+				getThirdPartyByDetail(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.paytypeList = res.return_data.productPayType.split(',');
+						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+					}
+				});
+			},
 			select(amount) {
 				this.inputAmount = amount;
 			},
@@ -116,6 +133,7 @@
 				})
 				let goods = {
 					"identificationCode": app.globalData.identificationCode,
+					"companyId": app.globalData.companyId,
 					"highChildOrderList": [{
 						"goodsType": 2,
 						"goodsId": app.globalData.userInfo.id,
@@ -123,11 +141,11 @@
 						"goodsPrice": this.inputAmount
 					}]
 				}
-				addOrder(goods).then(res => {
+				create(goods).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						//模板模拟支付，实际应用请调起微信/支付宝
-						this.unionPay(res.return_data.id);
+						this.unionPay(res.return_data.orderNo);
 					} else {
 						uni.showToast({
 							title: res.return_msg
@@ -138,7 +156,7 @@
 			//银联获取信息
 			unionPay(item) {
 				let goods = {
-					"orderId": item
+					"orderNo": item
 				}
 				unionPay(goods).then(res => {
 					if (res.return_code == '000000') {
@@ -227,6 +245,7 @@
 						font-size: 36upx;
 						color: #089bf5;
 						background-color: #f1f1f1;
+
 						&.on {
 							background-color: #089bf5;
 							color: #ffffff;

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

@@ -7,7 +7,7 @@
 				{{countdownm}}:{{countdowns}}
 			</view>
 			<view class="width100  font13 fcor666 mart10">若超时未支付,订单将自动取消</view>
-			<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="jumppay()">立即支付
+			<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="toPay()">立即支付
 			</view>
 		</view>
 		<view class="width100 headsbg paddbotm15" v-if="recinfo.orderStatus != 1">
@@ -51,8 +51,11 @@
 			<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 == 2">微信支付</view>
+				<view class="width80p fotrt fcor333" v-if="recinfo.payType == 3">积分兑换</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>
 			</view>
 			<view class="mart15 alijusstart font14 width94" v-if="recinfo.productType == 6">
 				<view class="width20 fcor777">地址</view>
@@ -95,10 +98,22 @@
 				<view class="width50 fcor777">加油金额</view>
 				<view class="width50 fotrt fcor333">¥{{oilList.gasRefuelPrice}}</view>
 			</view>
+			<view class="mart15 alijusstart font14 width94" v-if="materialData">
+				<view class="width50 fcor777">联系人</view>
+				<view class="width50 fotrt fcor333">¥{{materialData.user}}</view>
+			</view>
+			<view class="mart15 alijusstart font14 width94" v-if="materialData">
+				<view class="width50 fcor777">联系电话</view>
+				<view class="width50 fotrt fcor333">¥{{materialData.phone}}</view>
+			</view>
+			<view class="mart15 alijusstart font14 width94" v-if="materialData">
+				<view class="width50 fcor777">联系地址</view>
+				<view class="width50 fotrt fcor333">¥{{materialData.address}}</view>
+			</view>
 		</view>
 
 		<!-- 支付信息 -->
-		<view class="width90 backcorfff  mart10 concont">
+		<view class="width90 backcorfff  mart10">
 			<view class="paddtop20 font22 width94 fcor333">优惠信息</view>
 			<view class="mart15 alijusstart font14 width94">
 				<view class="width50 fcor777">商品优惠</view>
@@ -112,21 +127,31 @@
 				<view class="width50 fcor777">积分抵扣</view>
 				<view class="width50 fotrt fcoreb5">-¥{{recinfo.payGold / 100}}</view>
 			</view>
-			<view class="width95 height20 borderleft alijusnostart">
+			<view class="width95 height20 alijusnostart">
 				<view style="width: 5%;"></view>
 				<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view>
 			</view>
 		</view>
-		<view class="gooddes width90 backcorfff marb20">
+		<view class="width95 alijusnostart">
-			<view class="width90w height20 bordertopleft alijusnostart">
+			<view style="width: 9%;"></view>
+			<view style="border-bottom: 1px dashed #bebcbc;width: 88%;"></view>
+		</view>
+		<view class="width90 backcorfff marb20">
+			<view class="width100" style="height: 10px;">
+				<view class="cro_left_top flleft"></view>
+				<view class="cro_right_top flright"></view>
 			</view>
-
 			<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice">
 
 			</view>
-			<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else>
+			<view class="width90 height50 fotrt fcor777 font16 paddbotm10"
+				v-if="recinfo.productType == 6 && recinfo.payRealPrice">
 				加油实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
 			</view>
+			<view class="width90 height50 fotrt fcor777 font16 paddbotm10"
+				v-if="recinfo.productType != 6 && recinfo.payRealPrice">
+				实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
+			</view>
 		</view>
 
 
@@ -459,7 +484,7 @@
 		<view class="height50 width100"></view>
 		<view class="bottomstu backcorfff width100 height50 alijusend">
 			<button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
-			<view class="buybtn font12 fcorfff">再来一单</view>
+			<!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
 		</view>
 	</view>
 </template>
@@ -718,11 +743,16 @@
 				} else {
 					payTypes = 2;
 				}
+				// uni.redirectTo({
+				// 	url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
+				// 		'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
+				// 		.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
+				// 		'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
+				// })
 				uni.redirectTo({
-					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
+					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo +
-						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
+						'&amount=' + this.recinfo
-						.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
+						.payPrice + '&productType=' + this.recinfo.productType
-						'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
 				})
 			},
 		}
@@ -1032,22 +1062,28 @@
 		border-radius: 25px;
 	}
 
+	.cro_left_top,
+	.cro_right_top,
+	.cro_left_bottom,
+	.cro_right_bottom {
+		width: 20rpx;
+		height: 20rpx;
+		background: #f0f0f0;
+	}
 
-	.borderleft {
+	.cro_left_top {
-		background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
+		border-radius: 0px 0px 20rpx 0px;
 	}
 
-	.bordertopleft {
+	.cro_right_top {
-		background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
+		border-radius: 0px 0px 0px 20rpx;
 	}
 
-	.concont {
+	.cro_left_bottom {
-		border-radius: 8px 8px 0 0;
+		border-radius: 0px 20rpx 0px 0px;
-		background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
 	}
 
-	.gooddes {
+	.cro_right_bottom {
-		border-radius: 0 0 8px 8px;
+		border-radius: 20rpx 0px 0px 0px;
-		background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
 	}
 </style>

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

@@ -46,8 +46,24 @@
 					<view class="width96 height22 mart10">
 						<view class="width70 flleft fotlt ">
 							<view class="font16 fontwig6 fcor333 alijusstart">
-								<image src="../../../static/img/order5.png" class="marglerig"
+								<image mode="widthFix" src="../../../static/img/order2.png" v-if="row.productType == 4"
-									style="width: 50rpx;height: 50rpx;"></image>
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order3.png" v-if="row.productType == 3"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order4.png" v-if="row.productType == 6"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order5.png" v-if="row.productType == 5"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order6.png" v-if="row.productType == 9"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order8.png" v-if="row.productType == 7"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order7.png" v-if="row.productType == 1"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/unioncard.png" v-if="row.productType == 8"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
+									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
 								<view class="width100 text1">{{row.title}}</view>
 							</view>
 						</view>
@@ -106,12 +122,12 @@
 				headerswper: '120px',
 				typeText: {
 					1: '等待付款',
-					2: '订单已支付',
+					2: '已支付',
-					3: '订单已完成',
+					3: '已完成',
-					4: '订单已退款',
+					4: '已退款',
-					5: '订单已取消',
+					5: '已取消',
-					6: '订单退款中',
+					6: '退款中',
-					7: '订单退款失败'
+					7: '退款失败'
 				},
 				// 退换货
 				orderType: ['全部', '待支付', '已支付', '已完成', '已退款'],
@@ -340,7 +356,7 @@
 					payTypes = 2;
 				}
 				uni.redirectTo({
-					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row
+					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.orderNo + '&amount=' + row
 						.payPrice + '&productType=' + row.productType
 				})
 			}
@@ -623,7 +639,7 @@
 	}
 
 	.orderlabel {
-		width: 50px;
+		width: 60px;
 		border-radius: 5px;
 		height: 22px;
 		line-height: 22px;

high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue

@@ -358,7 +358,7 @@
 				}
 				let datas = {
 					platformId: this.showType,
-					regionId: app.globalData.cityId,
+					"companyId": app.globalData.companyId,
 					productType: this.productType
 				}
 				getThirdPartyByDetail(datas).then(res => {

high-unionPay/subPages/coupon-comfirmation/coupon-comfirmation.vue

@@ -37,14 +37,16 @@
 					支付方式
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5"></view>
+			<view class="width100" v-for="(item,index) in paytypeList" :key="index">
-			<view class="height50 width100 backcorfff" @tap="paytype='unionPay'">
+				<view class="width94 line1 mart5 marb5"  v-if="item == 4"></view>
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+				<view class="height50 width100 backcorfff" @tap="paytype='4'" v-if="item == 4">
-					银联支付
+					<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-				</view>
+						银联支付
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					</view>
-					style="align-items: center;">
+					<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					<radio :checked="paytype=='unionPay'" color="#0083f5" />
+						style="align-items: center;">
+						<radio :checked="paytype=='4'" color="#0083f5" />
+					</view>
 				</view>
 			</view>
 		</view>
@@ -69,7 +71,8 @@
 		unionPay,
 		findUser,
 		cardPay,
-		getHuiLianTongCardBalance
+		getHuiLianTongCardBalance,
+		getThirdPartyByDetail
 	} from '../../Utils/Api.js';
 	import ssPaymentPassword from '../../components/sanshui-payment-password'
 	let app = getApp();
@@ -101,9 +104,8 @@
 				jumpType: '',
 				tongCardPrice: 0,
 				storeId: '',
-				isDiscont: false,
+				identificationCode: '', //渠道商
-				identificationCode: '' //渠道商
+				paytypeList: [] //支付方式
-
 			};
 		},
 		onLoad(option) {
@@ -115,6 +117,7 @@
 			that.paytype = '';
 			that.user = app.globalData.userInfo;
 			that.findUser();
+			that.getThirdPartyByDetail();
 		},
 		onHide() {
 
@@ -144,6 +147,20 @@
 			}
 		},
 		methods: {
+			//查询支付方式
+			getThirdPartyByDetail() {
+				let datas = {
+					platformId: 3,
+					"companyId": app.globalData.companyId,
+					productType: 7
+				}
+				getThirdPartyByDetail(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.paytypeList = res.return_data.productPayType.split(',');
+						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+					}
+				});
+			},
 			//查询积分
 			findUser() {
 				let params;
@@ -258,7 +275,8 @@
 						"goodsType": 7,
 						"saleCount": 1,
 					}],
-					"promoteCode": this.identificationCode
+					"promoteCode": this.identificationCode,
+					"companyId": app.globalData.companyId
 				}
 				create(goods).then(res => {
 					if (res.return_code == '000000') {

high-unionPay/subPages/coupon-package/coupon-package.vue

@@ -79,7 +79,7 @@
 				title: '优惠券包列表'
 			});
 			this.getDiscountPackageList();
-			this.getCmsContent('CMS_DISCOUNT_BANNER');
+			this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
 		},
 		onPageScroll(e) {
 
@@ -92,12 +92,12 @@
 			//获取弹出或者弹窗
 			getCmsContent(item) {
 				let params = {
-					regionId: app.globalData.cityId,
+					companyId: app.globalData.companyId,
 					categoryCode: item
 				}
 				getCmsContent(params).then(res => {
 					if (res.return_code == '000000') {
-						this.swiperList = res.return_data;
+						this.swiperList = res.return_data.childCategory;
 					}
 				});
 			},