:clap: 解决bug

README.md

@@ -2,13 +2,13 @@
 
 ## 账号
 
-appId: ;
+appId: 	wx04803862d3dab9ea;
 
 secert: ;(注：secert可以更改);
 
 [登录微信公共平台](https://mp.weixin.qq.com/);
 
-账号：pukaiji@jscnnet.com， 密码：Baron4321;
+账号：pukaiji@jscnnet.com， 密码：Baron4321!;
 
 登录成功后需要管理员扫码便可进行小程序的相关操作(如审核、发布、配置合法域名等);
 

component/look/look.wxml

@@ -18,4 +18,5 @@
             </swiper-item>    
         </block>        
     </swiper>
+    
 </template>   

component/look/look.wxss

@@ -36,10 +36,10 @@ swiper {
     height: 266rpx;
     margin-top: 27rpx;
     border-radius: 20rpx;
-    background: red;
 }
 
 .look-item image {
     width: 100%;
     height: 100%;
+    border-radius: 20rpx;
 }

component/mys/mys.js

@@ -5,7 +5,8 @@ export function myInit(that) {
       nav: ['我的娃', '收藏', '历史'],
       myInd: 0,
       favoritesList: [],
-      playLogList: []
+      playLogList: [],
+      userName: ''
     }
   })
   //点击切换
@@ -14,6 +15,10 @@ export function myInit(that) {
     that.setData({
       myData: that.data.myData
     })
+    //获取个人信息
+    if(currentTarget.dataset.index == 0) {
+     that.getUserInfo();
+    }
     //获取收藏列表
     if(currentTarget.dataset.index == 1) {
       that.getFavoritesList();
@@ -30,6 +35,10 @@ export function myInit(that) {
     that.setData({
       myData: that.data.myData
     })
+    //获取个人信息
+    if(detail.current == 0) {
+      that.getUserInfo();
+    }
     //获取收藏列表
     if(detail.current == 1) {
       that.getFavoritesList();
@@ -78,4 +87,25 @@ export function myInit(that) {
       url: '/pages/album/album' 
     })
   }
+  //跳转到详情页
+  that.detail = ({ currentTarget }) => {
+    const id = currentTarget.dataset.id;
+    wx.navigateTo({
+      url: '/pages/details/details?id=' + id 
+    })
+  }
+  //获取个人信息
+  that.getUserInfo = () => {
+    httpRequestApi.getUserInfo().success(res => {
+      console.log('七彩童年的用户信息', res);
+      //wx.setStorage('photoBox', res.data.data.photoBox)
+      wx.setStorageSync('photoBox', res.data.data.photoBox)
+      that.data.myData.userName = res.data.data.nickName;
+      that.setData({
+        myData: that.data.myData
+      })
+    });
+  }
+  //初始化调用个人信息
+  that.getUserInfo();
 }

component/mys/mys.wxml

@@ -9,9 +9,9 @@
         <swiper-item>
             <view class="my-information">
                 <view class="information-item">
-                    <image class="head" src=""></image>
+                    <image class="head" bindtap="setName" src=""></image>
                     <view class="set-name">
-                        <text class="name">阿杰</text>
+                        <text class="name">{{myData.userName}}</text>
                         <text bindtap="setName">点击修改头像和名字</text>
                     </view>
                 </view>
@@ -22,7 +22,7 @@
         <swiper-item>
             <scroll-view class="scroll-view" scroll-y>
                 <view class="my-collection">
-                    <view class="collection-item" wx:for="{{myData.favoritesList}}" wx:key="{{index}}">
+                    <view class="collection-item" wx:for="{{myData.favoritesList}}" wx:key="{{index}}" bindtap="detail" data-id="{{item.targetCode}}">
                         <image src="{{item.iconImg}}"></image>
                     </view>
                 </view>
@@ -31,8 +31,8 @@
         <swiper-item>
             <scroll-view class="scroll-view" scroll-y>
                 <view class="my-collection">
-                    <view class="collection-item" wx:for="{{myData.playLogList}}" wx:key="{{index}}">
-                        <image src="{{item.iconImg}}"></image>
+                    <view class="collection-item" wx:for="{{myData.playLogList}}" wx:key="{{index}}" bindtap="detail" data-id="{{item.courseId}}">
+                        <image src="{{item.courseIcon}}"></image>
                     </view>
                 </view>
             </scroll-view>

component/mys/mys.wxss

@@ -106,10 +106,10 @@ swiper-item {
     height: 266rpx;
     margin-top: 27rpx;
     border-radius: 20rpx;
-    background: red;
 }
 
 .collection-item image {
     width: 100%;
     height: 100%;
+    border-radius: 20rpx;
 }

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;
 }
@@ -22,6 +23,7 @@
 
 .search-video input {
     padding-left: 20rpx;
+    width:70%;
 }
 
 .title {
@@ -40,10 +42,10 @@
     height: 266rpx;
     margin-top: 27rpx;
     border-radius: 20rpx;
-    background: red;
 }
 
 .hot-item image {
     width: 100%;
     height: 100%;
+    border-radius: 20rpx;
 }

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,48 +16,127 @@ Page({
     this.setData({
       stateFlag: !this.data.stateFlag
     })
+    const photoBox = this.data.stateFlag ? 'OPEN' : 'PRIVACY';
+    wx.setStorageSync('photoBox', photoBox);
+    httpRequestApi.setPhoto(photoBox).success(res => {
+      const photoBoxToken = this.data.stateFlag ? [] : res.data.data.photoBoxToken.toString().split('');
+      this.setData({
+        photoBoxToken,
+      })
+    });
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
+  //上传相册
+  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: '上传图片失败'
+              })  
+            }  
+          });  
+        });
+      }
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  //预览图片
+  preview: function ({ currentTarget }) {
+    // const index = currentTarget.dataset.index;
+    // console.log(this.data.photoList[index].path);
+    const imageUrl = [];
+    for (let item of this.data.photoList) {
+      imageUrl.push(item.path)      
+    }
+    wx.previewImage({
+      urls: imageUrl
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
+  //删除相册
+  removePhoto: function ({ currentTarget }) {
+    httpRequestApi.removePhotoList(currentTarget.dataset.id).success((res) => {
+      console.log('删除册列表', res);
+      if(res.data.success) {
+        this.getPhotoList();
+      }
+    })
   },
 
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
+   * 生命周期函数--监听页面加载
    */
-  onPullDownRefresh: function () {
-
+  onLoad: function (options) {
+    this.getPhotoList();
+    //初始化相册是否加密
+    const photoBox = (wx.getStorageSync('photoBox') === 'OPEN' ? true : false);
+    this.setData({
+      stateFlag: photoBox
+    })
+    if(!photoBox) {
+      httpRequestApi.setPhoto(wx.getStorageSync('photoBox')).success(res => {
+        const photoBoxToken = this.data.stateFlag ? [] : res.data.data.photoBoxToken.toString().split('');
+        this.setData({
+          photoBoxToken,
+        })
+      });
+    }
   },
 
   /**
@@ -69,5 +151,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}}" 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>
         </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,10 @@ Page({
     title: '',
     iconImg: '',
     postsList: [],
-    dateArr: []
+    dateArr: [],
+    playUrl: '',
+    courseWareId: '',
+    currentVideo: 0
   },
   //点击收藏
   favorites: function () {
@@ -29,12 +32,33 @@ 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,
+      "courseIcon": this.data.iconImg
+    }).success(res => {
+    })
+  },
+
+  //视频播放结束
+  endplay: function () {
+    const index = this.data.currentVideo + 1;
+    this.setData({
+      playUrl: this.data.courseWareList[index].playUrl,
+      courseWareId: this.data.courseWareList[index].id,
+      currentVideo: index
+    })
+  },
+
   //点击出现选集
   commentAnthology: function () {
     this.setData({
@@ -42,6 +66,16 @@ Page({
     })
   },
 
+  //选择视频播放
+  Anthology: function ({ currentTarget }) {
+    const index = currentTarget.dataset.index;
+    this.setData({
+      playUrl: this.data.courseWareList[index].playUrl,
+      courseWareId: this.data.courseWareList[index].id,
+      currentVideo: index
+    })
+  },
+
   //出现详情页
   commentDetails: function () {
     this.setData({
@@ -101,6 +135,7 @@ Page({
    */
   onLoad: function (options) {
     const courseId = options.id;
+    console.log(courseId)
     httpRequestApi.getCourseDetails(courseId).success((res)=>{
       console.log('课程详情', res);
       const data = res.data.data;
@@ -110,7 +145,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
       })
     })
     //获取评论列表
@@ -179,7 +216,33 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
+  onShareAppMessage: function (ops) {
+    if (ops.from === 'button') {
+      // 来自页面内转发按钮
+      console.log(ops.target)
+    }
+    return {
+      title: '七彩童年',
+      path: `pages/details/details`,
+      success: function (res) {
+        // 转发成功
+        console.log("转发成功:" + JSON.stringify(res));
+        // var shareTickets = res.shareTickets;
+        // if (shareTickets.length == 0) {
+        //   return false;
+        // }
+        // //可以获取群组信息
+        // wx.getShareInfo({
+        //   shareTicket: shareTickets[0],
+        //   success: function (res) {
+        //     console.log(res)
+        //   }
+        // })
+      },
+      fail: function (res) {
+        // 转发失败
+        console.log("转发失败:" + JSON.stringify(res));
+      }
+    }
   }
 })

pages/details/details.wxml

@@ -1,15 +1,15 @@
 <!--pages/details/details.wxml-->
 <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>
-        </view>
+    <view class="details-video">
+        <video id="myVideo" src="{{playUrl}}" bindplay="addHistory" bindended="endplay" controls page-gesture objectFit="fill" autoplay></video>
+    </view>
+    <scroll-view class="details-scroll" scroll-y>       
         <view class="menu">
             <view class="menu-item" style="width: 116rpx;" bindtap="favorites">
                 <image src="{{favoritesFlag ? '../../static/image/Collection.png' : '../../static/image/no-Collection.png'}}"></image>
             </view>
             <view class="menu-item">
-                <image src="../../static/image/share.png"></image>
+                <button open-type="share" plain><image src="../../static/image/share.png"></image></button>
             </view>
             <view class="menu-item" bindtap="commentAnthology">
                 <image src="../../static/image/Anthology.png"></image>
@@ -20,7 +20,7 @@
         </view>
         <view class="comment">
             <view class="anthology" hidden="{{anthologyHide}}">
-                <view wx:for="{{courseWareList}}" wx:key="{{index}}"  class="collection">
+                <view wx:for="{{courseWareList}}" wx:key="{{index}}" bindtap="Anthology" data-index="{{index}}" class="collection">
                     {{item.sort}}
                 </view>
             </view>              

pages/details/details.wxss

@@ -1,8 +1,11 @@
 /* pages/details/details.wxss */
 .details {
+    position: relative;
     width: 100%;
     height: 100%;
     background: #eaeaea;
+    padding-top: 436rpx;
+    box-sizing: border-box;
 }
 
 .details-scroll {
@@ -11,6 +14,9 @@
 }
 
 .details-video {
+    position: absolute;
+    left: 0;
+    top: 0;
     width: 100%;
     height: 436rpx;
 }
@@ -32,6 +38,14 @@
     height: 120rpx;
 }
 
+.menu-item button {
+    width: 100%;
+    height: 100%;
+    border: none;
+    padding: 0;
+    margin: 0;
+}
+
 .menu-item image{
     width: 100%;
     height: 100%;

pages/index/index.js

@@ -5,6 +5,7 @@ import { lookInit } from '../../component/look/look';
 import { myInit } from '../../component/mys/mys';
 import { searchInit } from '../../component/search/search';
 import httpRequestApi from '../../utils/APIRequest';
+import httputil from '../../utils/httputil';
 Page({
   data: {
     tab:[
@@ -28,6 +29,7 @@ Page({
     ],
     ind: 0,
     templates: 'look',
+    jurisdictionFlag: true
   },
   //tab点击
   switcher: function({currentTarget}) {
@@ -39,9 +41,35 @@ Page({
       templates
     })
   },
-  onLoad: function () {
-    lookInit(this);
-    myInit(this);
-    searchInit(this);
+  jurisdiction: function () {
+    setTimeout(()=>{
+      this.init();
+    },1000)
   },
+  onLoad: function (options) {
+    if(options.return && options.ind) {
+      this.setData({
+        templates: options.return,
+        ind: options.ind
+      })
+    }
+    this.init();
+  },
+  //初始化数据
+  init: function () {
+    httputil.getOpenidSessionKey((res) => {
+      console.log('微信的用户信息', res);
+      this.setData({
+        jurisdictionFlag: true
+      })
+      lookInit(this);
+      myInit(this);
+      searchInit(this);
+    },(error) => {
+      console.log(error);
+      this.setData({
+        jurisdictionFlag: false
+      })
+    });
+  }
 })

pages/index/index.wxml

@@ -15,6 +15,7 @@
   <view class="template" wx:else="{{templates == 'mys'}}">
     <template is="{{templates}}" data="{{myData: myData}}"></template>
   </view>
+  <button class="jurisdiction" hidden="{{jurisdictionFlag}}" open-type="getUserInfo" bindtap="jurisdiction">点击授权</button>
   <view class="bottom-tab">
       <block  wx:for="{{tab}}" wx:key="{{index}}">
       <view class="tabbar {{index == ind ? 'select':' '}}" bindtap="switcher" data-ind="{{index}}">

pages/index/index.wxss

@@ -45,4 +45,11 @@
   width: 54rpx;
   height: 54rpx;
   margin-right: 20rpx;
+}
+
+.jurisdiction {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
 }

pages/setName/setName.js

@@ -1,46 +1,68 @@
 // pages/setName/setName.js
+import httpRequestApi from '../../utils/APIRequest';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    phone: '',
+    name: '',
+    headImg: ''
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
+  //获取输入名字
+  getName: function ({detail}) {
+    this.setData({
+      name: detail.value,
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
+  //获取输入手机号
+  getPhone: function ({detail}) {
+    this.setData({
+      phone: detail.value,
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  //保存修改
+  Savemodification: function () {
+    //console.log(this.data.name,this.data.phone);
+    const name = this.data.name;
+    const phone = this.data.phone;
+    const reg = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/;
+    if(phone !== '') {
+      if(phone.length !== 11 || !reg.test(phone)){
+        wx.showModal({
+          title: '提示',
+          content: '请输入正确手机号'
+        })
+        return;
+      }
+    }
+    httpRequestApi.setUserInfo({
+      "mobileNo": phone,
+      "nickName": name,
+      "avatar": ""
+    }).success(res => {
+      if(res.data.success) {
+        wx.navigateBack();
+      }
+    })
   },
 
   /**
-   * 生命周期函数--监听页面卸载
+   * 生命周期函数--监听页面加载
    */
-  onUnload: function () {
-
+  onLoad: function (options) {
+    //初始化获取个人信息
+    httpRequestApi.getUserInfo().success(res => {
+      const user = res.data.data;
+      this.setData({
+        name: user.nickName,
+        phone: user.mobileNo,
+        headImg: user.avatar
+      })
+    });
   },
 
   /**

pages/setName/setName.wxml

@@ -1,21 +1,21 @@
 <!--pages/setName/setName.wxml-->
 <view class="set">
     <view class="set-head">
-        <image src=""></image>
+        <image src="{{headImg}}"></image>
         <text>点击头像进行更换</text>
     </view>
     <view class="set-message">
         <view class="set-name">
             <text> 宝宝名字</text>
-            <input value="阿杰"/>
+            <input value="{{name}}" bindinput="getName"/>
         </view>
         <view class="set-phone">
             <text>手机号</text>
-            <input value="15600099705"/>
+            <input value="{{phone}}" bindinput="getPhone"/>
         </view>        
     </view>
     <view class="explain">
         说明：手机号码用于电视端萌娃相册的建立和查找，非常重要，请如实填写。我们不会对任何第三方透漏您的资料。
     </view>
-    <view class="preservation">保存</view>
+    <view class="preservation" bindtap="Savemodification">保存</view>
 </view>

project.config.json

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
@@ -12,7 +12,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.3.0",
-	"appid": "wx5f14c30856bea407",
+	"appid": "wx04803862d3dab9ea",
 	"projectname": "Colorful-childhood",
 	"debugOptions": {
 		"hidedInDevtools": []

utils/APIRequest.js

@@ -10,51 +10,102 @@ class httpRequestApi {
     static getCourse(data) {
         const url = httpApiUrl('wx/course');
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data(data).send();
     }
     //获取课程详情
     static getCourseDetails(id) {
         const url = httpApiUrl(`wx/course/${id}`);
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data().send();
     }
+    //添加播放记录
+    static addPlayLogList(data) {
+        const url = httpApiUrl('wx/playLog');
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).data(data).method('POST').send();
+    }    
     //收藏或者取消
     static getDetailsFavorites(data) {
         const url = httpApiUrl('wx/favorites');
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data(data).method('POST').send();
     }
     //获取收藏列表
     static getFavoritesList(data) {
         const url = httpApiUrl('wx/favorites');
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data(data).send();
     }
     //添加评论
     static getDetailsPosts(data) {
         const url = httpApiUrl('wx/posts');
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data(data).method('POST').send();
     }
     //获取评论列表
     static getPostsList(data) {
         const url = httpApiUrl('wx/posts');
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data(data).send();
     }
     //获取播放记录
     static getPlayLogList(data) {
         const url = httpApiUrl('wx/playLog');
         return getInstance().header({
-            uid: 1,
+            uid: wx.getStorageSync('uid'),
         }).url(url).data(data).send();
     }
+    //上传图片到相册
+    static addPhotoList(data) {
+        const url = httpApiUrl('wx/photoBox');
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).data(data).method('POST').send();
+    }
+    //获取相册列表
+    static getPhotoList(data) {
+        const url = httpApiUrl('wx/photoBox');
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).data(data).send();
+    }
+    //删除相册
+    static removePhotoList(id) {
+        const url = httpApiUrl(`wx/photoBox/${ id }`);
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).method('DELETE').send();
+    }
+    //相册设置
+    static setPhoto(photoBox) {
+        const url = httpApiUrl(`wx/user/photoBox`);
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).data({
+            photoBox,
+        }).method('PUT').send();
+    } 
+    //获取用户信息
+    static getUserInfo() {
+        const url = httpApiUrl(`wx/user`);
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).send();
+    }
+    //修改用户信息
+    static setUserInfo(data) {
+        const url = httpApiUrl(`wx/user`);
+        return getInstance().header({
+            uid: wx.getStorageSync('uid'),
+        }).url(url).data(data).method('PUT').send();
+    }        
 }
 
 export default httpRequestApi;

utils/const.js

@@ -1,5 +1,5 @@
 // 常量列表
 module.exports = {
   // ----正式环境-----
-  apiUrl:"http://cloud.baron.com.cn/"
+  apiUrl:"https://cloud.baron.com.cn/"
 }

utils/httputil.js

@@ -0,0 +1,94 @@
+const request = require('./httpRequest.js');
+const url = require('./const.js');
+
+const HOST = url.apiUrl;
+
+
+function genAPIUrl(action) {
+	return HOST + action;
+}
+
+// 登录
+function wxLogin(successcallback, failcallback) {
+    wx.showToast({
+        title: '登录中...',
+        icon: 'loading',
+        duration: 1500
+    })
+    wx.login({  
+        success: function(res) {
+            if (res.code) {
+                // 获取openid
+                 let url = genAPIUrl('wx/user/openId')
+                 let data = { code: res.code }
+                 return request.getInstance().url(url).data(data).send().success(successcallback).fail(failcallback);
+            } else {
+                console.log('获取用户登录态失败！' + res.errMsg)
+            }
+        }
+    })
+}
+
+// 获取原来的 openid 和 session_key
+function getOpenidSessionKey(successcallback, failcallback) {
+    if (wx.getStorageSync('user')) {
+      successcallback(
+        wx.getStorageSync('user'),
+        //分享小程序按钮
+        // wx.showShareMenu({
+        //   withShareTicket: true
+        // })
+      );
+      return;
+    }
+    wxLogin(function(res) {
+      if(res.statusCode == 200){
+        let sessionKey = JSON.parse(res.data).session_key;
+        getLoginSchedule(sessionKey, successcallback, failcallback);
+      }
+
+    },function(res) {
+        failcallback(res);
+    })    
+}
+
+//登录
+function getLoginSchedule(sessionKey, successcallback, failcallback) {
+    wx.getSetting({
+        success: function(res) {
+            // 已经授权，可以直接调用 getUserInfo 获取头像昵称
+            wx.getUserInfo({
+                withCredentials: true,
+                success: function (res) {
+                  let url = genAPIUrl('wx/user');
+                  const userData = {
+                      encryptedData: res.encryptedData,
+                      sessionKey: sessionKey,
+                      iv: res.iv
+                  }          
+                  request.getInstance().header({
+                    'content-type': 'application/x-www-form-urlencoded'
+                  }).url(url).data(userData).method('POST').send().success(res => {
+                      wx.hideToast()
+                      wx.showToast({
+                          title: '登录成功',
+                          icon: 'success',
+                          duration: 1500
+                      })
+                      wx.setStorageSync('uid', res.data.data.id)
+                      wx.setStorageSync('user', res)
+                      successcallback(res)
+                  });
+                },
+                fail: function(res) {
+                    failcallback(res)
+                }
+            })
+          } 
+      })
+    
+}
+
+module.exports = {
+    getOpenidSessionKey
+}