第一版 支付微信

pages/advertisement/index/index.vue

@@ -25,6 +25,14 @@
 					融儒、释、道、医、美、文为一体，<br />
 					带你感受国学之美
 				</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="guide_pages_bg4">
+					众妙之门，
+					<br />
+					融儒、释、道、医、美、文为一体，<br />
+					带你感受国学之美
+				</view>
 				<button v-if="screenHeight > 667" style="color: #fff; border-color: #fff"
 					class="guide_pages_close close_1624" @click="onClose">
 					开始使用
@@ -95,7 +103,7 @@
 				let systemInfo = uni.getSystemInfoSync();
 				this.screenHeight = systemInfo.screenHeight;
 				this.show = true;
-				this.protocolShow = true;
+				// this.protocolShow = true;
 			} else {
 				uni.switchTab({
 					url: "/pages/homePage/index/index",
@@ -205,6 +213,20 @@
 			font-weight: bold;
 			line-height: 80rpx;
 		}
+		.guide_pages_bg4 {
+			width: 100vw;
+			height: 100vh;
+			background: url("@/static/icon/e_0ban_4.jpg") no-repeat;
+			background-size: cover;
+			// background-color: #EA552D;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			font-size: 46rpx;
+			font-weight: bold;
+			line-height: 80rpx;
+		}
 
 		.guide_pages_close {
 			border: 2rpx solid #000;

pages/component/commonComponents/selectGoods.vue

@@ -15,7 +15,7 @@
 
       <view :class="`common_radius_box  goods_box popup_content`">
         <view class="title title_box"
-          ><text class="title_price">￥{{ selectGoodsData.price }}</text
+          ><text class="title_price">￥{{ selectGoodsData.activityPrice?selectGoodsData.activityPrice:selectGoodsData.price }}</text
           >
           <u-icon
             name="close"
@@ -61,7 +61,7 @@
               <view :class="`goods_info `">
                 <view class="name">{{ slotProps.row.productName }}</view>
                 <view class="price" style="color: #3ab3ae"
-                  >￥{{ slotProps.row.price }}</view
+                  >￥{{ slotProps.row.activityPrice?slotProps.row.activityPrice:slotProps.row.price }}</view
                 ></view
               >
             </view>

pages/courseInformation/index/index.vue

@@ -123,16 +123,18 @@ export default {
                 title: "课程说明",
                 type: 'courseDescription',
                 apiUrl: 'app/phoneDoctor.do?getTaiHuToShine'
-            }, {
-                title: "使用须知",
-                type: 'instructionsForUse'
-
-            }, {
-                title: "购买须知",
-                type: 'purchaseNotice',
-                oid: 'd0f47071c2194e94845fbb373d06f59d',
-
             }
+            
+            // , {
+            //     title: "使用须知",
+            //     type: 'instructionsForUse'
+
+            // }, {
+            //     title: "购买须知",
+            //     type: 'purchaseNotice',
+            //     oid: 'd0f47071c2194e94845fbb373d06f59d',
+
+            // }
 
 
 

pages/curriculum/order/curriculum/index.vue

@@ -34,7 +34,7 @@
         :src="curriculumData.image"
         mode="widthFix"
         class="headImage"
-        style="height: auto !important;"
+        style="height: auto !important"
         @click="previewImage(curriculumData.image)"
       >
       </image>
@@ -51,10 +51,12 @@
       >
       </view>
 
-      <view class="curriulum_box"   v-if="curriculumData.content">
+      <view class="curriulum_box" v-if="curriculumData.content">
         <view class="curriulum_title_box">
           <view class="curriulum_title">
-            <view style="font-weight: 600; color: #018f89;margin-bottom: 20rpx;">介绍</view>
+            <view style="font-weight: 600; color: #018f89; margin-bottom: 20rpx"
+              >介绍</view
+            >
             <rich-text
               v-if="curriculumData.content"
               :nodes="curriculumData.content"
@@ -489,6 +491,8 @@ export default {
             this.selectGoodsData = this.goodsList[0];
             this.$refs.commonSelectGoods.open();
             this.show = true;
+          } else {
+            this.$commonJS.showToast("此课程暂无购买方式");
           }
 
           this.$forceUpdate();

pages/goods/index/index.vue

@@ -844,7 +844,7 @@ export default {
             productImages: this.selectGoodsData.productImages,
             productId: this.selectGoodsData.productId,
             productName: this.selectGoodsData.productName,
-            price: this.selectGoodsData.price,
+            price: this.selectGoodsData.activityPrice?this.selectGoodsData.activityPrice:this.selectGoodsData.price,
             goodsType: this.selectGoodsData.goodsType,
           },
         ],