From f507cae272a2245be14544fb93c80c98e995ff45 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 26 Jun 2024 16:20:46 +0800
Subject: [PATCH] 111

---
 pages/bookShop/orderList.vue  | 13 ++++----
 pages/course/courseDetail.vue |  4 +--
 pages/course/coursePrice.vue  |  4 +--
 pages/course/index.vue        |  9 +++++-
 pages/course/myCourse.vue     | 22 +++++++++-----
 pages/course/tryListen.vue    | 12 ++++----
 pages/mine/vip/index.vue      | 56 ++++++++++++++++++++---------------
 pages/mine/vip/order.vue      | 15 +++++++---
 8 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 2b647ea..d9aad98 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -396,7 +396,7 @@
                     <view
                       class="orderstatusbtn orderstatusbtn_success"
                       v-if="slotProps.row.orderStatus == 0"
-                      @click.native.stop="goPay(slotProps.row)"
+                      @click.stop="goPay(slotProps.row)"
                       >继续付款</view
                     >
                     <view
@@ -587,14 +587,14 @@
       @close="isShowMore = false"
       @select="selectClick"
     ></u-action-sheet>
-    <music-play :playData="playData"></music-play>
+    <!-- <music-play :playData="playData"></music-play> -->
   </view>
 </template>
 
 <script>
 import $http from "@/config/requestConfig.js";
 import emotion from "@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue";
-import musicPlay from "@/components/music.vue";
+// import musicPlay from "@/components/music.vue";
 import { setPay, setPayAssign, setWXPay } from "@/config/utils";
 // import { data } from 'jquery';
 import { mapState, mapMutations } from "vuex";
@@ -719,6 +719,7 @@ export default {
     // });
   },
   async onShow() {
+	  uni.hideTabBar();
     this.newList = [];
     this.pagination = {
       page: 1, //页码
@@ -998,7 +999,9 @@ export default {
         } else {
           this.iphonepay(payItem);
         }
-      }
+      }else if (payItem.paymentMethod == 4){
+		  console.log('天医币二次支付')
+	  }
     },
     // 取消订单
     canceOrder(item) {
@@ -1255,7 +1258,7 @@ export default {
     },
   },
   components: {
-    musicPlay,
+    // musicPlay,
     emotion,
   },
 };
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 8c1a41a..1c1be4e 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -656,7 +656,7 @@ export default {
 	        scene: "WXSceneSession",
 	        type: 0,
 	        href: this.$apkUrl,
-	        title: "吴门医述",
+	        title: `${this.course.title}这门课程讲的不错，快来围观吧-吴门医述app`,
 	        summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
 	        imageUrl: "static/icon/home_icon_logo.png",
 	        success: function (res) {
@@ -673,7 +673,7 @@ export default {
 	        scene: "WXSceneTimeline",
 	        type: 0,
 	        href: this.$apkUrl,
-	        title: "吴门医述",
+	        title: `${this.course.title}这门课程讲的不错，快来围观吧-吴门医述app`,
 	        summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
 	        imageUrl: "static/icon/home_icon_logo.png",
 	        success: function (res) {
diff --git a/pages/course/coursePrice.vue b/pages/course/coursePrice.vue
index 6d1160e..b46ac8d 100644
--- a/pages/course/coursePrice.vue
+++ b/pages/course/coursePrice.vue
@@ -28,7 +28,7 @@
 							<text>VIP畅学权益生效中</text>
 						</view>
 						<view :class="['text','courseItem','flexbox']"><u-icon name="pushpin" color="#2979ff"
-								size="24"></u-icon><text>{{item1.title}}</text>
+								size="24"></u-icon><text style="font-size: 32rpx;">{{item1.title}}</text>
 
 						</view>
 						<template v-if="item1.courseCatalogueEntityList && item1.courseCatalogueEntityList.length > 0">
@@ -505,7 +505,7 @@
 			display: block;
 			text-align: center;
 			margin-bottom: 10rpx;
-			color: #694bc6;
+			// color: #694bc6;
 		}
 	}
 
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 2e797a3..b2b8395 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -280,10 +280,17 @@
 								this.status = 3 // 暂无数据
 							}
 							console.log('status', this.status)
+							this.flag = true
 						}
-						this.flag = true
+						
 					}).catch(e => {
+						this.flag = true
 						console.log(e, '数据报错')
+						this.status = 3
+						uni.showToast({
+							title:`获取数据失败`,
+							icon:'error'
+						})
 					});
 			},
 			// 跳转
diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue
index 36cfe10..38aeed5 100644
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -565,9 +565,10 @@
 									this.LearningCourseList.status = 2
 								// }
 							} else {
+								this.LearningCourseList.list = []
 								this.LearningCourseList.status = 3 // 暂无数据
 							}
-							console.log('status', this.LearningCourseList.status)
+							// console.log('status我刷新了', this.LearningCourseList)
 						}
 						// this.LearningCourseList.flag = false
 					}).catch(e => {
@@ -670,7 +671,7 @@
 					})
 			},
 			delCollection(val, index){
-				// console.log(val,'val');				
+				console.log('val++++++++', val.id);				
 				$http.request({
 						url: "medical/course/delUserCourseStudying",
 						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -690,13 +691,18 @@
 							})
 							if(this.curTagId == 0){
 								console.log(this.MyCourseList.list[index],'this.MyCourseList[index]')
-								this.MyCourseList.list[index].isStudying = 0
-								this.getLearningCourseList() // 刷新收藏列表
+								this.MyCourseList.list[index].isStudying = 0								
+								setTimeout(() => {
+									this.getLearningCourseList() // 刷新收藏列表
+								},500)
 							}else if(this.curTagId == 1){
-								this.LearningCourseList.list.splice(index,1)
-								this.MyCourseList.page = 1
-								this.MyCourseList.list = []
-								this.getMyCourseList()	
+								this.LearningCourseList.list.splice(index,1)		
+								
+								setTimeout(() => {
+									this.MyCourseList.page = 1
+									this.MyCourseList.list = []
+									this.getMyCourseList()	
+								},500)
 							}
 						}
 				
diff --git a/pages/course/tryListen.vue b/pages/course/tryListen.vue
index a8637cb..8d30187 100644
--- a/pages/course/tryListen.vue
+++ b/pages/course/tryListen.vue
@@ -107,11 +107,7 @@
 					url: `${url}?id=${thatId}&title=${title}`
 				});
 			},	
-			getData() {
-				// if(!this.flag){
-				// 	console.log('正在执行，未完成')
-				// 	return
-				// }
+			getData() {				
 				this.status = 1
 				this.flag = false
 				$http.request({
@@ -147,7 +143,13 @@
 						}
 						this.flag = true
 					}).catch(e => {
+						this.flag = true
+						this.status = 3
 						console.log(e,'数据报错')
+						uni.showToast({
+							title:`获取数据失败`,
+							icon:'error'
+						})
 					});
 			}
 		},
diff --git a/pages/mine/vip/index.vue b/pages/mine/vip/index.vue
index c5f8db1..a187c41 100644
--- a/pages/mine/vip/index.vue
+++ b/pages/mine/vip/index.vue
@@ -43,7 +43,7 @@
               ></view>
               <view class="qunyi_box">
                 <view style="height: auto">
-                  <view
+                  <view class="item"
                     v-for="(item, index1) in v.quanyi"
                     :style="item.style"
                     v-html="item.name"
@@ -92,6 +92,7 @@
         </view> -->
       </view>
     </u-popup>
+	<z-navigation></z-navigation>
   </view>
 </template>
 
@@ -110,9 +111,11 @@ export default {
       selectVipData: {},
       orderModalShow: false,
       superQuanyi: [
-        { name: "众妙之门视频",  style: {
-            color: "#2D38F4",
-          },},
+        { name: "众妙之门视频",  
+		// style: {
+  //           color: "#2D38F4",
+  //         },
+		  },
         {
           name: "吴门医述视频",
          
@@ -120,27 +123,29 @@ export default {
         { name: "专属视频视听" },
         {
           name: "读书相关权益",
-          style: {
-            color: "#2D38F4",
-          },
+          // style: {
+          //   color: "#2D38F4",
+          // },
         },
         { name: "活动报名折扣价<text style='color:red'>(更优惠)</text>" },
       ],
-      sociologyQuanyi: [
-      
-        {
-          name: "-",
-          style: {
-            color: "#b0b0b0",
-          },
-        },  { name: "吴门医述视频" },
+      sociologyQuanyi: [      
+        // {
+        //   name: "-",
+        //   style: {
+        //     color: "#b0b0b0",
+        //   },
+        // },  
+		{ name: "吴门医述视频" },
         { name: "专属视频视听" },
-        {
-          name: "-",
-          style: {
-            color: "#b0b0b0",
-          },
-        },
+		
+        // {
+        //   name: "-",
+        //   style: {
+        //     color: "#b0b0b0",
+        //   },
+        // },
+		
         { name: "活动报名折扣价" },
       ],
 
@@ -276,7 +281,8 @@ export default {
                       "linear-gradient(to right,  #3F7FC9 0%,#D3EEFC 100%) ",
                     // titleBackground:
                     //   "linear-gradient(130deg, rgb(153, 202, 192) 0%, rgb(192, 223, 207) 50%)",
-                 color: "linear-gradient(130deg,rgb(45, 56, 244)  0%, #72AD92 100%)",      list: res.list[i],
+                 color: "linear-gradient(130deg,rgb(45, 56, 244)  0%, #72AD92 100%)",      
+				 list: res.list[i],
                     quanyi: this.superQuanyi,
                   });
                 } else if (i == "sociology" || i == "sociology_hd") {
@@ -859,7 +865,7 @@ export default {
   .flash_sale_content_item {
     width: auto;
     min-width: 47%;
-    min-height: 48%;
+    min-height: 56%;
     margin: 10rpx !important;
     border-radius: 20rpx;
     overflow: hidden;
@@ -867,7 +873,7 @@ export default {
     .vip_content {
       width: 100%;
       height: calc(100% - 80rpx);
-      padding: 20rpx;
+      // padding: 20rpx;
       padding-top: 0;
       // display: flex;
       // align-items: center;
@@ -953,6 +959,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  .item{line-height: 60rpx; text-align: center; padding: 0 10rpx; border: 1px solid #64bec5; border-radius: 50rpx; margin-bottom: 20rpx;}
+  
 }
 .popup_box {
   max-height: 95vh;
diff --git a/pages/mine/vip/order.vue b/pages/mine/vip/order.vue
index 5c5f585..dcbce56 100644
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -90,9 +90,8 @@
               <text
                 class="fdButtonBox aui-text-danger fdButtonBoxRed"
                 style="float: right"
-                @click="
-                  onPageJump('/pages/mine/wallet/recharge/index?source=order')
-                "
+                @click="onPageJump('/pages/mine/wallet/recharge/index?source=order')"
+                  
                 >立即充值</text
               >
             </view>
@@ -407,6 +406,7 @@ export default {
     },
     onPageJump(url) {
       console.log(url, "url");
+	  
       uni.navigateTo({
         url: url,
       });
@@ -451,6 +451,7 @@ export default {
           console.log("res at line 374:", res);
           if (res.code == 0) {
             this.initData = res.data;
+			// this.$emit('user')
           }
 
           this.$forceUpdate();
@@ -557,7 +558,13 @@ export default {
       //     quantity: this.cartList[i].productAmount,
       //   });
       // }
-
+	if(this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee){
+				  uni.showToast({
+				  	title:'天医币余额不足',
+					icon:'none'
+				  })
+				  return 
+	}
       let data = {
         paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
         orderMoney: this.dataInfo.lastFee, //订单金额