From a585a6714ec4891e2dd6b0abaef24686c619d6d5 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 7 Jan 2022 16:48:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=B2=BE=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/pages/order/confirmation.vue    |  4 +--
 .../mineCouponsDestails.vue                   | 29 +++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index 62fdf88..62f3fa0 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -309,11 +309,11 @@
 					if (item.highDiscount.discountType == 1) {
 						//满减价格
 						this.deductionPrice = item.highDiscount.discountPrice;
-						this.paytheprice = this.couponList.salesPrice - this.deductionPrice;
+						this.paytheprice = parseFloat(this.couponList.salesPrice - this.deductionPrice).toFixed(2);
 					} else if (item.highDiscount.discountType == 2) {
 						//抵扣价格
 						this.deductionPrice = item.highDiscount.discountPrice;
-						this.paytheprice = this.couponList.salesPrice - this.deductionPrice;
+						this.paytheprice = parseFloat(this.couponList.salesPrice - this.deductionPrice).toFixed(2);
 					} else if (item.highDiscount.discountType == 3) {
 						// 打折		
 						this.deductionPrice = parseFloat(this.couponList.salesPrice - (this.couponList.salesPrice *
diff --git a/high-unionPay/pages/user/mineCouponsDestails/mineCouponsDestails.vue b/high-unionPay/pages/user/mineCouponsDestails/mineCouponsDestails.vue
index 14dd3da..ab6938a 100644
--- a/high-unionPay/pages/user/mineCouponsDestails/mineCouponsDestails.vue
+++ b/high-unionPay/pages/user/mineCouponsDestails/mineCouponsDestails.vue
@@ -45,28 +45,40 @@
 				</view>
 			</view>
 		</view>
+		<view class="width90 mart10 fcor666" v-if="videourl !=''">视频教程</view>
+		<view class="width80 mart10 marb30" v-if="videourl !=''">
+			<yy-video-player :auto-play="false" :url="imageUrl+imagedess1" :poster="poster" :show-back-btn="true">
+			</yy-video-player>
+		</view>
 	</view>
 </template>
 
 <script>
 	import {
 		getCouponByDiscount,
-		getDiscountByUserDiscountId
+		getDiscountByUserDiscountId,
+		getCmsContent
 	} from '../../../Utils/Api.js';
+	import xiaoVideoElement from '../../../components/yy-video-player/yy-video-player.nvue'
 	let app = getApp();
 	export default {
+		components: {
+			xiaoVideoElement
+		},
 		data() {
 			return {
 				minecoupones: [],
 				imageUrl: app.globalData.imgUrl,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres:'noorder.png',
+				imagedess1: '/CMS/html/11641540903873.mp4',
 				pageNum: 1,
 				pageSize: 10,
 				isNoMoreData: false,
 				couponsDetails: '',
 				salesEndTime: '',
-				couponId: ''
+				couponId: '',
+				videourl: '' //视频地址
 			}
 		},
 		filters: {
@@ -90,8 +102,21 @@
 		onLoad(option) {
 			this.couponId = option.id;
 			this.getDiscountByUserDiscountId();
+			this.getCmsContentvideo();
 		},
 		methods: {
+			//获取视频资料
+			getCmsContentvideo() {
+				let params = {
+					regionId: app.globalData.cityId,
+					categoryCode: 'CMS_H5_VIDEO'
+				}
+				getCmsContent(params).then(res => {
+					if (res.return_code == '000000') {
+						this.videourl = res.return_data;
+					}
+				});
+			},
 			//获取卡券详情
 			getDiscountByUserDiscountId() {
 				let params = {