交付版

component/mys/mys.wxml

@@ -18,7 +18,10 @@
                 <view class="shaiwa">如何使用电视上的晒娃功能</view>
                 <view class="mengwa" bindtap="album">萌娃相册</view>
                 <view class="child" bindtap="childMatch">
-                    孩子王晒娃大赛
+                    <text class="name">孩子王晒娃大赛</text>
+                    <view class="childMatchLogo">
+                      <image class="childMatchLogo" src="../../static/image/28.png"></image>
+                    </view>
                 </view>
             </view>
         </swiper-item>

component/mys/mys.wxss

@@ -130,3 +130,13 @@ swiper-item {
     height: 100%;
     border-radius: 20rpx;
 }
+
+.child {
+    display: flex;
+    justify-content: space-between;
+}
+
+.childMatchLogo image{
+  width: 98.28rpx;
+  height: 62.64rpx;
+}

pages/access/access.js

@@ -1,18 +1,51 @@
 // pages/access/access.js
+import httpRequestApi from '../../utils/APIRequest';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    PhotoBoxInfo: {},
+    likeStatus: false
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options)
+    this.getPhoneBoxInfo(options.id);
+  },
+
+  getPhoneBoxInfo(uid){
+    httpRequestApi.getPhotoBoxInfoById({ uid }).success((res) => {
+      this.setData({
+        PhotoBoxInfo: res.data.data
+      })
+    })
+  },
+
+  //预览图片
+  preview: function ({ currentTarget }) {
+    console.log(currentTarget)
+    const imageUrl = [currentTarget.id];
+    wx.previewImage({
+      urls: imageUrl
+    })
+  },
 
+  userLike: function ({ currentTarget }) {
+    console.log(currentTarget)
+    console.log(this.data.PhotoBoxInfo.isLike)
+    if(!this.data.PhotoBoxInfo.isLike) {
+      httpRequestApi.setPhotoBoxLike({ target: currentTarget.id }).success((res) => {
+        this.setData({
+          likeStatus: res.data.data
+        })
+        this.getPhoneBoxInfo(currentTarget.id);
+      })
+    }
   },
 
   /**

pages/access/access.wxml

@@ -3,61 +3,16 @@
     <view class="information-item">
         <image class="head" src="{{myData.avatar ? myData.avatar : '../../static/image/default.png'}}"></image>
         <view class="access-name">
-            <text class="name">安安</text>
-            <text>00000赞</text>
+            <text class="name">{{PhotoBoxInfo.user.nickName}}</text>
+            <text>{{PhotoBoxInfo.user.likeCount}}赞</text>
         </view>
-        <view class="stick">点赞</view>
+        <view id="{{PhotoBoxInfo.user.id}}" class="stick" bindtap="userLike">{{PhotoBoxInfo.isLike ? '已赞' : '点赞'}}</view>
     </view>
     <scroll-view scroll-y style="height: 80%; overflow: hidden;">
         <view class="photo">
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view>
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view>
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view> 
-            <view class="img">
-                <image style="background: skyblue;" src="" mode='aspectFill'></image> 
-            </view>                                                              
+            <view class="img" wx:for="{{PhotoBoxInfo.photoBoxList}}" wx:key="{{index}}" data-index="{{index}}">
+                <image id="{{item.path}}" style="background: skyblue;" src="{{item.path}}" mode='aspectFill' bindtap="preview" ></image> 
+            </view>                 
         </view>            
     </scroll-view>
 </view>

pages/childMatch/childMatch.js

@@ -1,24 +1,34 @@
 // pages/childMatch/childMatch.js
+import httpRequestApi from '../../utils/APIRequest';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    photoBoxList: []
   },
 
   //点击跳转到相册
   album: ({ currentTarget }) => {
+    console.log(currentTarget)
     wx.navigateTo({
-      url: '/pages/access/access?id=1' 
+      url: `/pages/access/access?id=${currentTarget.id}`
     })
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.getPhotoBoxList();
+  },
 
+  getPhotoBoxList() {
+    httpRequestApi.getPhotoBoxList().success((res) => {
+      this.setData({
+        photoBoxList: res.data.data.list
+      })
+    })
   },
 
   /**
@@ -32,7 +42,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getPhotoBoxList();
   },
 
   /**

pages/childMatch/childMatch.wxml

@@ -6,11 +6,12 @@
         </view>
         <scroll-view scroll-y style="height: 92%; overflow: hidden;">
             <view class="photo">
-                <view class="img" bindtap="album">
-                    <image src="" style="background: skyblue;" mode='aspectFill'></image> 
-                    <image src="../../static/image/huangguan.png" class="crown"></image>
-                    <view class="ticket">0</view>
-                    <view class="child-name">安安</view>
+                <view class="img" bindtap="album" id="{{item.user.id}}" wx:for="{{photoBoxList}}" wx:key="{{index}}" data-index="{{index}}">
+                    <!-- <image src="{{item.cover}}" class="crown" mode='aspectFill'></image>  -->
+                    <image src="{{item.cover}}" style="background: skyblue;" mode='aspectFill'></image> 
+                    <image wx:if="{{index < 3}}" src="../../static/image/huangguan.png" class="crown"></image>
+                    <view class="ticket">{{item.user.likeCount}}赞</view>
+                    <view class="child-name">{{item.user.nickName}}</view>
                 </view> 
             </view>
         </scroll-view>

pages/index/index.js

@@ -53,6 +53,9 @@ Page({
     },1000)
   },
   onLoad: function (options) {
+    if (options.id) {
+      wx.setStorageSync('uid', options.uid);
+    }
     if(options.ind) {
       let ind = options.ind;
       let templates = this.data.tab[ind].templates;
@@ -70,7 +73,7 @@ Page({
     this.init();
   },
   //初始化数据
-  init: function () {
+  init: function (uid) {
     httputil.getOpenidSessionKey((res) => {
       console.log('微信的用户信息', res);
       this.setData({

project.config.json

@@ -27,13 +27,24 @@
 			"current": -1,
 			"list": []
 		},
+		"plugin": {
+			"current": -1,
+			"list": []
+		},
 		"game": {
 			"currentL": -1,
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
-			"list": []
+			"current": 0,
+			"list": [
+				{
+					"id": 0,
+					"name": "用户对接",
+					"pathName": "pages/index/index",
+					"query": "uid=1"
+				}
+			]
 		}
 	}
 }

utils/APIRequest.js

@@ -1,130 +1,151 @@
-import { getInstance } from './httpRequest';
-import { apiUrl } from './const.js';
+import {
+  getInstance
+} from './httpRequest';
+import {
+  apiUrl
+} from './const.js';
 //console.log(getInstance().url)
 const httpApiUrl = (str) => {
-    return apiUrl + str;
+  return apiUrl + str;
 }
 
 class httpRequestApi {
-    //课程表首页
-    static getCourse(data) {
-        const url = httpApiUrl('wx/course');
-        return getInstance().header({
-            uid: wx.getStorageSync('uid'),
-        }).url(url).data(data).send();
-    }
-    //获取看nav切换
-    static getCategory() {
-        const url = httpApiUrl('wx/category');
-        return getInstance().header({
-            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}`);
-        return getInstance().header({
-            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: wx.getStorageSync('uid'),
-        }).url(url).data(data).method('POST').send();
-    }
-    //获取收藏列表
-    static getFavoritesList(data) {
-        const url = httpApiUrl('wx/favorites');
-        return getInstance().header({
-            uid: wx.getStorageSync('uid'),
-        }).url(url).data(data).send();
-    }
-    //添加评论
-    static getDetailsPosts(data) {
-        const url = httpApiUrl('wx/posts');
-        return getInstance().header({
-            uid: wx.getStorageSync('uid'),
-        }).url(url).data(data).method('POST').send();
-    }
-    //获取评论列表
-    static getPostsList(data) {
-        const url = httpApiUrl('wx/posts');
-        return getInstance().header({
-            uid: wx.getStorageSync('uid'),
-        }).url(url).data(data).send();
-    }
-    //获取播放记录
-    static getPlayLogList(data) {
-        const url = httpApiUrl('wx/playLog');
-        return getInstance().header({
-            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();
-    }        
+  //课程表首页
+  static getCourse(data) {
+    const url = httpApiUrl('wx/course');
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).data(data).send();
+  }
+  //获取看nav切换
+  static getCategory() {
+    const url = httpApiUrl('wx/category');
+    return getInstance().header({
+      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}`);
+    return getInstance().header({
+      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: wx.getStorageSync('uid'),
+    }).url(url).data(data).method('POST').send();
+  }
+  //获取收藏列表
+  static getFavoritesList(data) {
+    const url = httpApiUrl('wx/favorites');
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).data(data).send();
+  }
+  //添加评论
+  static getDetailsPosts(data) {
+    const url = httpApiUrl('wx/posts');
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).data(data).method('POST').send();
+  }
+  //获取评论列表
+  static getPostsList(data) {
+    const url = httpApiUrl('wx/posts');
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).data(data).send();
+  }
+  //获取播放记录
+  static getPlayLogList(data) {
+    const url = httpApiUrl('wx/playLog');
+    return getInstance().header({
+      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 getPhotoBoxList() {
+    const url = httpApiUrl('wx/photoBox/cuteBaby/list');
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).send();
+  }
+  //根据用户id获取用户相册信息
+  static getPhotoBoxInfoById(data) {
+    const url = httpApiUrl('wx/photoBox/cuteBaby/info');
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).data(data).send();
+  }
+  //点赞
+  static setPhotoBoxLike(data) {
+    const url = httpApiUrl(`wx/user/like/${data.target}`);
+    return getInstance().header({
+      uid: wx.getStorageSync('uid'),
+    }).url(url).method('POST').send();
+  }
+  //获取用户信息
+  static getUserInfo() {
+    const url = httpApiUrl(`wx/user`);
+    console.log('===============================', wx.getStorageSync('uid'));
+    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;
-
-
-
-
-
+export default httpRequestApi;

utils/httputil.js

@@ -64,7 +64,8 @@ function getLoginSchedule(sessionKey, successcallback, failcallback) {
                   const userData = {
                       encryptedData: res.encryptedData,
                       sessionKey: sessionKey,
-                      iv: res.iv
+                      iv: res.iv,
+                      code: wx.getStorageSync('uid') ? wx.getStorageSync('uid') : ''
                   }          
                   request.getInstance().header({
                     'content-type': 'application/x-www-form-urlencoded'