From 4e8e4c5db5f8c88daa07cfe3c35c867ba8fafb11 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Mon, 11 Mar 2024 23:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Course/squareStyleCourse.vue |  2 +-
 pages/merchant/teacher_detail.vue       |  8 ++++----
 pages/special/details.vue               | 17 +++++++++++------
 pages/special/offline_details.vue       |  4 ++--
 pages/store/detail.vue                  |  2 +-
 pages/store/index.vue                   | 11 ++++++-----
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/components/Course/squareStyleCourse.vue b/components/Course/squareStyleCourse.vue
index 2845b97..733b28c 100644
--- a/components/Course/squareStyleCourse.vue
+++ b/components/Course/squareStyleCourse.vue
@@ -7,7 +7,7 @@
 			<view class="text">
 				<view class="special-title">{{ item.title }}</view>
 				<view class="special-info">
-					<view v-if="item.type == 1" class="type">视频</view>
+					<view v-if="item.type == 3" class="type">视频</view>
 					<view v-else class="type">直播</view>
 					<view class="count">{{ item.count }}人已学</view>
 				</view>
diff --git a/pages/merchant/teacher_detail.vue b/pages/merchant/teacher_detail.vue
index 1d30cb1..8b186d0 100644
--- a/pages/merchant/teacher_detail.vue
+++ b/pages/merchant/teacher_detail.vue
@@ -35,10 +35,10 @@
             提现
           </navigator>
         </view>
-        <view class="tag-group">
+        <!-- <view class="tag-group">
           <text v-for="label in lecturer.label" :key="label" class="tag">{{ label }}</text>
-        </view>
-        <view class="total-list" v-if="merId === lecturer.mer_id && lecturer.mer_id">
+        </view> -->
+        <!-- <view class="total-list" v-if="merId === lecturer.mer_id && lecturer.mer_id">
           <view class="total-item">
             <view>{{ total }}</view>
             <navigator :url="`/pages/merchant/income?mer_id=${lecturer.mer_id}&type=1`" hover-class="none">
@@ -64,7 +64,7 @@
               <i class="iconfont iconxiangyou"></i>
             </navigator>
           </view>
-        </view>
+        </view> -->
       </view>
       <view class="main">
         <view class="nav">
diff --git a/pages/special/details.vue b/pages/special/details.vue
index 3d3629f..1daeda2 100644
--- a/pages/special/details.vue
+++ b/pages/special/details.vue
@@ -138,13 +138,13 @@
           </view> -->
 					<navigator v-if="lecturer" class="lecturer-info flex" :url="`/pages/merchant/teacher_detail?id=${special.lecturer_id}`">
 						<view class="info-avatar">
-							<image :src="lecturer && lecturer.avatar" mode="aspectFill"></image>
+							<image :src="lecturer && lecturer.lecturer_head" mode="aspectFill"></image>
 						</view>
 						<view class="info-box">
 							<view class="info-name">
-								张三 <text>中学物理老师</text>
+								{{ lecturer.lecturer_name }} <text>{{ lecturer.explain }}</text>
 							</view>
-							<view class="info-desc">老师简介老师简介老师简介老师简介老师简介老师简介</view>
+							<view class="info-desc">{{ lecturer.explain }}</view>
 						</view>
 						<text class="more"></text>
 					</navigator>
@@ -246,7 +246,7 @@
           </view>
 
           <!-- 详情 -->
-          <mp-html v-if="active === 2" class="swiper-conter" container-style="padding: 30rpx;background: #ffffff;"
+          <mp-html v-if="active === 2" class="swiper-conter" container-style="padding: 0 30rpx;background: #ffffff;width: 690rpx; margin: 0 auto;"
             :content="special.content"></mp-html>
 
           <template v-if="special.type === 4">
@@ -2283,6 +2283,12 @@
   page {
     background: #f5f5f5;
   }
+	
+	/* #ifdef MP-WEIXIN */
+	.swiper-conter {
+		padding: 0!important;
+	}
+	/* #endif */
 </style>
 <style scoped lang="scss">
   .teacher-section {
@@ -2830,11 +2836,10 @@
 		.info-avatar {
 			width: 100rpx;
 			height: 100rpx;
-			background: #000;
-			border-radius: 50%;
 			>image {
 				width: 100%;
 				height: 100%;
+				border-radius: 50%;
 			}
 		}
 		.info-box {
diff --git a/pages/special/offline_details.vue b/pages/special/offline_details.vue
index 15a3500..d67e8da 100644
--- a/pages/special/offline_details.vue
+++ b/pages/special/offline_details.vue
@@ -43,10 +43,10 @@
 
           <!-- 详情 -->
           <mp-html v-if="active === 1" class="swiper-conter" container-style="padding: 30rpx;background: #ffffff;"
-            :content="specialInfo.content || '详情'"></mp-html>
+            :content="specialInfo.desc"></mp-html>
 					<!-- 规则 -->
 					<mp-html v-if="active === 2" class="swiper-conter" container-style="padding: 30rpx;background: #ffffff;"
-					  :content="specialInfo.content || '规则'"></mp-html>
+					  :content="specialInfo.rule"></mp-html>
         </view>
       </view>
 
diff --git a/pages/store/detail.vue b/pages/store/detail.vue
index 58e8049..13bce10 100644
--- a/pages/store/detail.vue
+++ b/pages/store/detail.vue
@@ -395,7 +395,7 @@ export default {
 
 <style scoped lang="scss">
 /* 商品详情 */
-::v-deep .goods-detail {
+.goods-detail {
 	background: #f6f6f6;
 	padding-bottom: calc(100px + var(--safe-bottom));
 }
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 6e75faf..0af5ad6 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -26,15 +26,14 @@
       <view class="tab-bar-placeholder">
 				<view class="flex tab-content">
 					<view :data-idx="index" class="tab-item" v-for="(item, index) in categoryList" :key="item.id"  @click="handleCateClick(item)">
-							<image :src="item.pic" mode="aspectFill"></image>
+							<image v-if="item.id > 0" :src="item.pic" mode="aspectFill"></image>
+							<image v-else :src="getImgPath('/static/frontend/more.png')" mode="aspectFill"></image>
 							<view>{{ item.name }}</view>
 						</view>
 				</view>
       </view>
 			<!-- 广告 -->
-			<view class="advert">
-				<image :src="advertList[0].banner" mode="aspectFill"></image>
-			</view>
+			<advert />
       <view class="goods-section">
 				<view class="goods-title">精品推荐</view>
         <view class="list">
@@ -74,12 +73,14 @@
 </template>
 
 <script>
-  import { getGoodsCateList, getGoodsList, getRecommendGoodsList, getIndexData } from "@/api/store";
+import { getGoodsCateList, getGoodsList, getRecommendGoodsList, getIndexData } from "@/api/store";
 import RecommendPoster from "@/components/RecommendPoster/index.vue";
+import Advert from '@/components/Advert/index.vue';
 
   export default {
 		components: {
 			RecommendPoster,
+			Advert,
 		},
     data() {
       const systemInfo = this.$util.getSystemInfo();