Merge branch 'xqy_topic' into dev

pages/course/index.vue

@@ -288,12 +288,13 @@ export default {
 		},
 		active2(item){
 			// console.log('item', item)
-			if (item.topicId) {
+			// if (item.topicId) {
+				// item.topicId
 				uni.navigateTo({
-					url: '/pages4/courseTopic/goodsTopic?topicId=' + item.topicId
+					url: '/pages4/courseTopic/goodsTopic?topicId=' + 1
 				})
 				return
-			}
+			// }
 			
 			this.selObj.bId = item.id
 			this.show = false

pages4/courseTopic/goodsTopic.vue

@@ -80,9 +80,9 @@
                 <text class="title">详情</text>
             </view>
             <view class="details">
-                <image v-if="courseNum == 0" class="detail_img" src="../static/topic/type1_detail.png" ></image>
-                <image v-if="courseNum == 1" class="detail_img" src="../static/topic/type2_detail.png" ></image>
-                <image v-if="courseNum == 2" class="detail_img" src="../static/topic/type3_detail.png" ></image>
+                <image v-if="courseNum == 0" class="detail_img" src="../static/topic/type1_detail.jpg" ></image>
+                <image v-if="courseNum == 1" class="detail_img" src="../static/topic/type2_detail.jpg" ></image>
+                <image v-if="courseNum == 2" class="detail_img" src="../static/topic/type3_detail.jpg" ></image>
             </view>
         </view>
 
@@ -245,7 +245,7 @@ export default {
 .goods_topic {
     width: 100%;
     height: 100%;
-    background: linear-gradient(180deg, rgba(223,236,253,0) 0%, #DFECFD 100%);
+    background: linear-gradient(180deg, #f1f4f9 0%, #DFECFD 100%);
     .banner_header {
         height: 378rpx;
         position: relative;
@@ -289,6 +289,7 @@ export default {
         .banner {
             width: 670rpx;
             height: 250rpx;
+            display: block;
             border-radius: 20rpx;
         }
     }