:sunglasses: 解决提出的一些问题，增加首页导航切换

component/look/look.js

@@ -6,11 +6,18 @@ export const lookInit =  (that) => {
       nav: [],
       lookInd: 0,
       lookList: [],
+      left: ''
     }
   })
   //点击更改数据
   that.lookChoice = ({ currentTarget }) => {
     that.data.lookData.lookInd = currentTarget.dataset.index;
+    if (that.data.lookData.nav.length > 3 && currentTarget.dataset.index == 2) {
+      that.data.lookData.left = currentTarget.dataset.index * 225;
+    }
+    if (that.data.lookData.nav.length > 3 && currentTarget.dataset.index == 1) {
+      that.data.lookData.left = '';
+    }
     that.setData({
       lookData: that.data.lookData
     })
@@ -20,6 +27,12 @@ export const lookInit =  (that) => {
   //滑动更改数据
   that.lookSlide = ({ detail }) => {
     that.data.lookData.lookInd = detail.current;
+    if (that.data.lookData.nav.length > 3 && detail.current == 2) {
+      that.data.lookData.left = detail.current * 225;
+    }
+    if (that.data.lookData.nav.length > 3 && detail.current == 1) {
+      that.data.lookData.left = '';
+    }
     // console.log(detail.current);
     that.setData({
       lookData: that.data.lookData

component/look/look.wxml

@@ -1,10 +1,12 @@
 <!--component/look/look.wxml-->
 <template name="look">
-    <view class="nav">
-        <block wx:for="{{lookData.nav}}" wx:key="{{index}}">
-            <view class="{{index == lookData.lookInd ? 'slecte-nav' : ''}}" bindtap="lookChoice" data-index="{{index}}">{{item.name}}</view>
-        </block>
-    </view>
+    <scroll-view scroll-x class="scroll-nav" scroll-left="{{lookData.left}}">
+        <view class="nav">
+            <block wx:for="{{lookData.nav}}" wx:key="{{index}}">
+                <view class="{{index == lookData.lookInd ? 'slecte-nav' : ''}}" bindtap="lookChoice" data-index="{{index}}">{{item.name}}</view>
+            </block>
+        </view>
+    </scroll-view>
     <swiper current="{{lookData.lookInd}}" bindchange="lookSlide">
         <block wx:for="{{lookData.nav}}" wx:key="{{index}}">
             <swiper-item style="height: auto;">

component/look/look.wxss

@@ -1,21 +1,24 @@
 /* component/look/look.wxss */
+
+.scroll-nav {
+    width: 100%;
+}
+
 .nav {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
     font-size: 36rpx;
     color: #000;
     padding: 0 5%;
     box-sizing: border-box;
+    white-space:nowrap; 
 }
 
 .nav view {
-    flex: 1;
     height: 89rpx;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+    width: 225rpx;
+    text-align: center;
+    line-height: 89rpx;
     border-radius: 89rpx;
+    display: inline-block;
 }
 
 .slecte-nav {

component/mys/mys.wxml

@@ -1,6 +1,6 @@
 <!--pages/my/my.wxml-->
 <template name="mys">
-    <view class="nav">
+    <view class="my-nav">
         <block wx:for="{{myData.nav}}" wx:key="{{index}}">
             <view class="{{index == myData.myInd ? 'slecte-nav' : ''}}" bindtap="myChoice" data-index="{{index}}">{{item}}</view>
         </block>

component/mys/mys.wxss

@@ -1,5 +1,5 @@
 /* pages/my/my.wxss */
-.nav {
+.my-nav {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -9,7 +9,7 @@
     box-sizing: border-box;
 }
 
-.nav view {
+.my-nav view {
     flex: 1;
     height: 89rpx;
     display: flex;

component/search/search.js

@@ -3,7 +3,8 @@ import httpRequestApi from '../../utils/APIRequest';
 export const searchInit = (that) => {
   that.setData({
     searchData: {
-      searchList: []
+      searchList: [],
+      recommendList: []
     }
   })
   //获取输入值,并请求接口
@@ -12,6 +13,7 @@ export const searchInit = (that) => {
       title: detail.value
     }).success((res)=>{
       that.data.searchData.searchList = res.data.data.list;
+      that.data.searchData.recommendList = [];
       that.setData({
         searchData: that.data.searchData
       })
@@ -24,4 +26,12 @@ export const searchInit = (that) => {
       url: '/pages/details/details?id=' + id 
     })
   }
+  httpRequestApi.getCategoryRecommend().success((res)=>{
+    console.log('搜', res)
+    that.data.searchData.recommendList = res.data.data;
+    that.setData({
+      searchData: that.data.searchData
+    })
+  })
+  
 }

component/search/search.wxml

@@ -10,6 +10,10 @@
                 <view class="hot-item" wx:for="{{searchData.searchList}}" wx:key="{{inedex}}" bindtap="details" data-id="{{item.id}}">
                     <image src="{{item.iconImg}}"></image>
                 </view>
+                <!--推荐-->
+                <view class="hot-item" wx:for="{{searchData.recommendList}}" wx:key="{{inedex}}" bindtap="details" data-id="{{item.courseId}}">
+                    <image src="{{item.courseIcon}}"></image>
+                </view>
             </view>
         </scroll-view>
     </view>

pages/album/album.wxml

@@ -27,7 +27,7 @@
         </view>
         <view class="img" wx:for="{{photoList}}" wx:key="{{index}}" bindtap="preview" data-index="{{index}}">
             <image src="{{item.path}}" mode='aspectFill'></image> 
-            <image src="../../static/image/delect.png" class="delect" bindtap="removePhoto" data-id="{{item.id}}"></image>
+            <image src="../../static/image/delect.png" class="delect" catchtap="removePhoto" data-id="{{item.id}}"></image>
         </view> 
     </view>
 </view>

pages/album/album.wxss

@@ -40,7 +40,7 @@
     position: absolute;
     left: 10rpx;
     top: 5rpx;
-    width: 68rpx;
+    width: 78rpx;
     height: 54rpx;
     background: #A1d100;
     border-radius: 54rpx;

pages/details/details.js

@@ -144,7 +144,7 @@ Page({
         title: data.course.title,
         iconImg: data.course.iconImg,
         courseId,
-        summary: data.course.summary,
+        summary: data.course.description,
         courseWareList: data.courseWareList,
         playUrl: data.courseWareList[0].playUrl,
         courseWareId: data.courseWareList[0].id
@@ -223,7 +223,7 @@ Page({
     }
     return {
       title: '七彩童年',
-      path: `pages/details/details`,
+      path: `pages/details/details?id=` + this.data.courseId,
       success: function (res) {
         // 转发成功
         console.log("转发成功:" + JSON.stringify(res));

pages/details/details.wxml

@@ -21,7 +21,7 @@
         <view class="comment">
             <view class="anthology" hidden="{{anthologyHide}}">
                 <view wx:for="{{courseWareList}}" wx:key="{{index}}" bindtap="Anthology" data-index="{{index}}" class="collection {{index === currentVideo ? 'current' : ''}}">
-                    {{item.sort}}
+                    {{index + 1}}
                 </view>
             </view>              
             <view class="comment-details" hidden="{{detailsHide}}">

pages/details/details.wxss

@@ -94,7 +94,7 @@
 }
 
 .current {
-    background: red; 
+    background: #fece00; 
 }
 
 .comment-details {

pages/index/index.js

@@ -40,6 +40,12 @@ Page({
       ind,
       templates
     })
+    if (ind == 1) {
+      searchInit(this);
+    }
+    if (ind == 2) {
+      myInit(this);
+    }
   },
   jurisdiction: function () {
     setTimeout(()=>{
@@ -54,6 +60,12 @@ Page({
         templates,
         ind,
       })
+      if (ind == 1) {
+        searchInit(this);
+      }
+      if (ind == 2) {
+        myInit(this);
+      }
     }
     this.init();
   },
@@ -65,8 +77,6 @@ Page({
         jurisdictionFlag: true
       })
       lookInit(this);
-      myInit(this);
-      searchInit(this);
     },(error) => {
       console.log(error);
       this.setData({

utils/APIRequest.js

@@ -20,6 +20,13 @@ class httpRequestApi {
             uid: wx.getStorageSync('uid'),
         }).url(url).send();
     }
+    //获取推荐课程
+    static getCategoryRecommend() {
+        const url = httpApiUrl('wx/course/recommend/top');
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).send();
+    }
     //获取课程详情
     static getCourseDetails(id) {
         const url = httpApiUrl(`wx/course/${id}`);