:smile: 联调各个接口，只剩登录一些接口没有联调

component/search/search.wxml

@@ -4,7 +4,7 @@
             <image class="icon" src="../../static/image/search.png"></image>
             <input placeholder="输入关键字" bindinput="focus"/>
         </view>
-        <scroll-view class="scroll-view" scroll-y>
+        <scroll-view scroll-y style="height: 92%; overflow: hidden;">
             <view class="title">热门搜索</view>
             <view class="hot-video">
                 <view class="hot-item" wx:for="{{searchData.searchList}}" wx:key="{{inedex}}" bindtap="details" data-id="{{item.id}}">

component/search/search.wxss

@@ -1,5 +1,6 @@
 /* pages/search/search.wxss */
 .search-container {
+    height: 100%;
     padding: 0 26rpx;
     box-sizing: border-box;
 }

pages/album/album.js

@@ -1,11 +1,14 @@
 // pages/album/album.js
+const HOST = require('../../utils/const.js').apiUrl;
+import httpRequestApi from '../../utils/APIRequest';
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
     stateFlag: true,
+    photoList: [],
+    photoBoxToken: []
   },
 
   //更改相册
@@ -13,13 +16,100 @@ Page({
     this.setData({
       stateFlag: !this.data.stateFlag
     })
+    const photoBox = this.data.stateFlag ? 'OPEN' : 'PRIVACY';
+    httpRequestApi.setPhoto(photoBox).success(res => {
+      const photoBoxToken = this.data.stateFlag ? [] : res.data.data.photoBoxToken.toString().split('');
+      this.setData({
+        photoBoxToken,
+      })
+    });
+  },
+  //上传相册
+  addPhoto: function () {
+    if(this.data.photoList.length >= 15) {
+      wx.showModal({  
+        title: '温馨提示',  
+        content: '只能上传15张图片'
+      }) 
+      return false;
+    };
+    wx.chooseImage({
+      count: 9, // 默认9
+      sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+      success:  (res) => {
+        // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+        const tempFilePaths = res.tempFilePaths;
+        //启动上传等待中...  
+        wx.showToast({  
+          title: '正在上传...',  
+          icon: 'loading',  
+          mask: true,  
+          duration: 1000 
+        }) 
+        const that = this;
+        let uploadImgCount = 0;  
+        tempFilePaths.forEach(item => {
+          //上传文件
+          wx.uploadFile({  
+            url: HOST + 'wx/file/upload',  
+            filePath: item,  
+            name: 'uploadfile_ant',  
+            header: {  
+              "Content-Type": "multipart/form-data"  
+            },  
+            success: (res) => {  
+              uploadImgCount++; 
+              const data = JSON.parse(res.data);
+              if(data.success) {
+                //上传文件成功后放到相册里
+                httpRequestApi.addPhotoList({
+                  path: data.data
+                }).success((res) => {
+                  if(res.data.success) {
+                    //再次调用相册列表
+                    that.getPhotoList();
+                  }
+                }).fail(() => {
+                  wx.showModal({  
+                    title: '错误提示',  
+                    content: '图片上传到相册失败'
+                  }) 
+                });
+              }
+              //如果是最后一张,则隐藏等待中  
+              if (uploadImgCount == tempFilePaths.length) {  
+                wx.hideToast();  
+              }  
+            },  
+            fail: function (res) {  
+              wx.hideToast();  
+              wx.showModal({  
+                title: '错误提示',  
+                content: '上传图片失败'
+              })  
+            }  
+          });  
+        });
+      }
+    })
+  },
+
+  //删除相册
+  removePhoto: function ({ currentTarget }) {
+    httpRequestApi.removePhotoList(currentTarget.dataset.id).success((res) => {
+      console.log('删除册列表', res);
+      if(res.data.success) {
+        this.getPhotoList();
+      }
+    })
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.getPhotoList();
   },
 
   /**
@@ -69,5 +159,18 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  //获取相册列表
+  getPhotoList: function () {
+    httpRequestApi.getPhotoList({
+      pageNo: 1,
+      pageSize: 15
+    }).success((res) => {
+      console.log('相册列表', res.data.data.list);
+      this.setData({
+        photoList: res.data.data.list
+      })
+    })
   }
+
 })

pages/album/album.wxml

@@ -4,10 +4,10 @@
         <text>相册状态</text>
         <view class="state" bindtap="setState">
             <view class="left">
-                公开
+               私密 
             </view>
             <view class="right">
-                私密
+                公开
             </view>
             <view class="{{stateFlag ? 'open' : 'private'}}"></view>
         </view>
@@ -18,19 +18,16 @@
            公开相册凭手机尾号提取
         </view>
         <view class="code" wx:if="{{!stateFlag}}">
-           <view>1</view>
-           <view>1</view>
-           <view>1</view>
-           <view>1</view>
+           <view wx:for="{{photoBoxToken}}" wx:key="{{index}}">{{item}}</view>
         </view>
     </view>
     <view class="photo">
-        <view class="img">
+        <view class="img" bindtap="addPhoto">
             <image src="../../static/image/add.jpg"></image>    
         </view>
-        <view class="img">
-            <image src="../../static/image/add.jpg"></image> 
-            <image src="../../static/image/delect.png" class="delect"></image>
+        <view class="img" wx:for="{{photoList}}" wx:key="{{index}}">
+            <image src="{{item.path}}"mode='aspectFill'></image> 
+            <image src="../../static/image/delect.png" class="delect" bindtap="removePhoto" data-id="{{item.id}}"></image>
         </view> 
     </view>
 </view>

pages/album/album.wxss

@@ -59,6 +59,7 @@
 .album-code {
     display: flex;
     align-items: center;
+    height: 60rpx;
     margin-top: 52rpx;
     font-size: 36rpx;
 }

pages/details/details.js

@@ -17,7 +17,9 @@ Page({
     title: '',
     iconImg: '',
     postsList: [],
-    dateArr: []
+    dateArr: [],
+    playUrl: '',
+    courseWareId: ''
   },
   //点击收藏
   favorites: function () {
@@ -29,12 +31,22 @@ Page({
       title: this.data.title,
       iconImg: this.data.iconImg
     }).success((res)=>{
-      console.log(res);
 
     })
     
   },
 
+  //点击添加到播放记录
+  addHistory: function () {
+    //console.log('播放',currentTarget.dataset);
+    httpRequestApi.addPlayLogList({
+      "title": this.data.title,
+      "courseId": this.data.courseId,
+      "courseWareId": this.data.courseWareId
+    }).success(res => {
+    })
+  },
+
   //点击出现选集
   commentAnthology: function () {
     this.setData({
@@ -110,7 +122,9 @@ Page({
         iconImg: data.course.iconImg,
         courseId,
         summary: data.course.summary,
-        courseWareList: data.courseWareList
+        courseWareList: data.courseWareList,
+        playUrl: data.courseWareList[0].playUrl,
+        courseWareId: data.courseWareList[0].id
       })
     })
     //获取评论列表

pages/details/details.wxml

@@ -2,7 +2,7 @@
 <view class="details">
     <scroll-view class="details-scroll" scroll-y>
         <view class="details-video">
-            <video id="myVideo" src="http://efunvideo.ai160.com/vs2m/061/06104039/06104039001/06104039001.m3u8" controls page-gesture objectFit="fill"></video>
+            <video id="myVideo" src="{{playUrl}}" bindplay="addHistory" controls page-gesture objectFit="fill"></video>
         </view>
         <view class="menu">
             <view class="menu-item" style="width: 116rpx;" bindtap="favorites">

utils/APIRequest.js

@@ -20,6 +20,13 @@ class httpRequestApi {
             uid: 1,
         }).url(url).data().send();
     }
+    //添加播放记录
+    static addPlayLogList(data) {
+        const url = httpApiUrl('wx/playLog');
+        return getInstance().header({
+            uid: 1,
+        }).url(url).data(data).send();
+    }    
     //收藏或者取消
     static getDetailsFavorites(data) {
         const url = httpApiUrl('wx/favorites');
@@ -55,6 +62,36 @@ class httpRequestApi {
             uid: 1,
         }).url(url).data(data).send();
     }
+    //上传图片到相册
+    static addPhotoList(data) {
+        const url = httpApiUrl('wx/photoBox');
+        return getInstance().header({
+            uid: 1,
+        }).url(url).data(data).method('POST').send();
+    }
+    //获取相册列表
+    static getPhotoList(data) {
+        const url = httpApiUrl('wx/photoBox');
+        return getInstance().header({
+            uid: 1,
+        }).url(url).data(data).send();
+    }
+    //删除相册
+    static removePhotoList(id) {
+        const url = httpApiUrl(`wx/photoBox/${ id }`);
+        return getInstance().header({
+            uid: 1,
+        }).url(url).method('DELETE').send();
+    }
+    //相册设置
+    static setPhoto(photoBox) {
+        const url = httpApiUrl(`wx/user/photoBox`);
+        return getInstance().header({
+            uid: 1,
+        }).url(url).data({
+            photoBox,
+        }).method('PUT').send();
+    }       
 }
 
 export default httpRequestApi;