From c1b4f2b02d4f8e827bef31aff91b1a5d7908eca3 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Sun, 29 Sep 2024 18:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  4 +-
 .../commonComponents/selectGoods.vue          |  2 +-
 pages/course/courseDetail.vue                 | 51 +++++++++++++------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0271a7f..006d29e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.21",
-    "versionCode" : 1021,
+    "versionName" : "1.0.22",
+    "versionCode" : 1022,
     "app-plus" : {
         "nvueCompiler" : "weex",
         "compatible" : {
diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue
index 8d206c2..bd64bf9 100644
--- a/pages/component/commonComponents/selectGoods.vue
+++ b/pages/component/commonComponents/selectGoods.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="container commonPageBox commonDetailPage" style="height: auto !important;padding-bottom: 0 !important;">
-    <u-popup :show="show" mode="bottom" @close="close" class="popup_box">
+    <u-popup :show="show" v-if="show" mode="bottom" @close="close" class="popup_box">
       <view class="popup_top">
         <!-- @click="previewImage(selectGoodsData.productImages)" -->
         <view class="product_image">
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 42b35d5..14f28fc 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -3,16 +3,11 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- <z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"> -->
-		<z-nav-bar title="课程介绍">
-			<!-- <view class="curseSet" slot="right" @click="newOnShare">
-			<uni-icons type="redo" size="26"></uni-icons><text style="font-size: 26rpx;"></text> 分享课程
-		</view> -->
-		</z-nav-bar>
-
-		<view class="contentBox commonPageContentBox">
-			<u-alert v-if="goBuyTitle && isAndorid" style="
+		<z-nav-bar title="课程介绍"></z-nav-bar>
+		<view class="contentBox commonPageContentBox" >
+			<!-- <u-alert v-if="goBuyTitle && isAndorid" style="
           background: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
-          position: fixed;
+          position: fixed; top:0;
           left: 0;
           width: 100%;
           z-index: 10;
@@ -30,13 +25,36 @@
 
 				<view> </view>
 			</template>
-			</u-alert>
+			</u-alert> -->
 
 			<!--  <scroll-view scroll-y="true" class="scroll-Y"> -->
 			<view class="curseImg" style="padding-top: 80rpx">
 				<image v-if="!course.image" src="/static/nobg.jpg" mode="widthFix"></image>
 				<image v-else :src="course.image" mode="widthFix"></image>
 			</view>
+			<view class="" v-if="goBuyTitle && isAndorid" style="position: relative; height:100rpx; ">
+				<u-alert v-if="goBuyTitle && isAndorid" style="
+				  background: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
+				  position: absolute; top: 0; 
+				  left: 0;
+				  width: 100%;
+				  z-index: 10;
+				" type="warning" @click="handleClickGetVip" :title="goBuyTitle" :show-icon="true"></u-alert>
+					<template slot="rightSlot" slot-scope="slotProps">
+						<text class="saveBtn vipBtn flexbox buyBtn" v-if="goBuyType == 0">
+							立即购买
+						</text>
+						<text class="flexbox" style="color: #f0f0f0" v-if="goBuyType == 1">
+							立即续费
+						</text>
+						<text class="saveBtn vipBtn flexbox" v-if="goBuyType == 2">
+							立即升级
+						</text>
+				
+						<view> </view>
+					</template>
+					</u-alert>
+			</view>
 			<view class="containerBg1">
 				<view class="course_info_box">
 					<view class="course_info">
@@ -198,8 +216,9 @@
 				</view>
 				<!-- <uni-section class="mb-10" style="padding: 0 20rpx" title="" type="line"
 					v-if="librayList.length > 0 && librayList[curIndex].completion > 0"> -->
+					<!-- {{librayList[curIndex].completion}} -->
 					<view class="progress-box">
-						<progress :percent="librayList[curIndex].completion" show-info stroke-width="3" />
+						<progress :percent="librayList[curIndex].completion ? librayList[curIndex].completion : 0" show-info stroke-width="3" />
 					</view>
 				<!-- </uni-section> -->
 			</view>
@@ -255,8 +274,8 @@
 				</view>
 			</view>
 
-			<u-popup key="1" :show="pricespop" :round="10" @close="closePup">
-				<view class="proListPrice" v-if="proPriceList.length > 0">
+			<!-- <u-popup key="1" v-if="pricespop" :show="true" :round="10" @close="closePup">
+				<view class="proListPrice" v-if="proPriceList.length > 0" style="background-color: #fff;">
 					<view class="title"> 请选择 </view>
 					<view class="list">
 						<view :class="['item', curProId == item.productId ? 'active' : '']"
@@ -272,10 +291,10 @@
 						<view style="margin-left: 40rpx" class="saveBtnss buybtn flexbox" @click="openBuyInfoModal">
 							<u-icon name="bag" color="#fff" size="28"></u-icon>
 							<text>立即购买</text>
-						</view>
+						</view>						
 					</view>
 				</view>
-			</u-popup>
+			</u-popup> -->
 			<view>
 				<u-back-top :scroll-top="scrollTop" bottom="150" :customStyle="bgiStyle"
 					:iconStyle="iconStyle"></u-back-top>
@@ -367,7 +386,7 @@
         $refs.commonSelectGoods.close();
         protocolShow = true;
       "></common-select-goods>
-		<u-popup :show="protocolShow" mode="center" round="6">
+		<u-popup :show="protocolShow" mode="center" round="6" v-if="protocolShow">
 			<view class="popup_box">
 				<view class="title">温馨提示</view>
 				<view class="content">