Browse Source

更改提出的问题

Limengbo 6 years ago
parent
commit
97ac539cf7

+ 2 - 1
app.json

@@ -6,7 +6,8 @@
     "pages/album/album",
     "pages/clip/clip",
     "pages/childMatch/childMatch",
-    "pages/access/access"
+    "pages/access/access",
+    "pages/Instructions/Instructions"
   ],
   "window": {
     "backgroundTextStyle": "light",

+ 1 - 1
component/look/look.wxss

@@ -53,5 +53,5 @@ swiper {
     margin-top: 30rpx;
     color: #ccc;
     font-size: 32rpx;
-    margin-bottom: 20%;
+    margin-bottom: 30%;
 }

+ 8 - 2
component/mys/mys.js

@@ -81,6 +81,12 @@ export function myInit(that) {
       })
     })
   }
+  //跳转到说明页
+  that.Instructions = () => {
+    wx.navigateTo({
+      url: '/pages/Instructions/Instructions' 
+    })
+  }
   //跳转到相册
   that.album = ({ currentTarget }) => {
     //const id = currentTarget.dataset.id;
@@ -105,8 +111,8 @@ export function myInit(that) {
   that.getUserInfo = () => {
     httpRequestApi.getUserInfo().success(res => {
       console.log('七彩童年的用户信息', res);
-      //wx.setStorage('photoBox', res.data.data.photoBox)
-      wx.setStorageSync('photoBox', res.data.data.photoBox)
+      wx.setStorageSync('photoBox', res.data.data.photoBox);
+      wx.setStorageSync('userInfo', res);
       that.data.myData.userName = res.data.data.nickName;
       that.data.myData.avatar = res.data.data.avatar
       that.setData({

+ 2 - 2
component/mys/mys.wxml

@@ -5,7 +5,7 @@
             <view class="{{index == myData.myInd ? 'slecte-nav' : ''}}" bindtap="myChoice" data-index="{{index}}">{{item}}</view>
         </block>
     </view>
-    <swiper current="{{myData.myInd}}" bindchange="mySlide" style="height: 74%;">
+    <swiper current="{{myData.myInd}}" bindchange="mySlide">
         <swiper-item>
             <view class="my-information">
                 <view class="information-item" bindtap="setName">
@@ -15,7 +15,7 @@
                         <text>点击修改头像和名字</text>
                     </view>
                 </view>
-                <view class="shaiwa">如何使用电视上的晒娃功能</view>
+                <view class="shaiwa" bindtap="Instructions">如何使用电视上的晒娃功能</view>
                 <view class="mengwa" bindtap="album">萌娃相册</view>
                 <view class="child" bindtap="childMatch">
                     <text class="name">孩子王晒娃大赛</text>

+ 13 - 2
component/mys/mys.wxss

@@ -79,6 +79,8 @@ swiper-item {
     color: #fff;
     font-size: 40rpx;
     font-weight: 600;
+    box-shadow:0 3px 6px 0 rgba(0, 0, 0, 0.2), 0 3px 6px 0 rgba(0, 0, 0, .2);
+
 }
 
 .mengwa {
@@ -94,6 +96,8 @@ swiper-item {
     color: #000;
     font-size: 40rpx;
     font-weight: 600;
+    box-shadow:0 3px 6px 0 rgba(0, 0, 0, 0.2), 0 3px 6px 0 rgba(0, 0, 0, .2);
+
 }
 
 .child {
@@ -134,9 +138,16 @@ swiper-item {
 .child {
     display: flex;
     justify-content: space-between;
+    position: relative;
+}
+
+.childMatchLogo {
+    position: absolute;
+    bottom: 0;
+    right: 0;
 }
 
 .childMatchLogo image{
-  width: 98.28rpx;
-  height: 62.64rpx;
+  width: 173rpx;
+  height: 116rpx;
 }

+ 2 - 2
component/search/search.wxml

@@ -10,7 +10,7 @@
             <text>没有找到相关的内容</text>
             <text>换个关键字再试试吧</text>
         </view>
-        <scroll-view scroll-y style="height: 64%; overflow: hidden;">
+        <scroll-view scroll-y style="height: 83%; overflow: hidden;">
             <view class="hot-video">
                 <view class="hot-item" wx:for="{{searchData.searchList}}" wx:key="{{inedex}}" bindtap="details" data-id="{{item.id}}">
                     <image src="{{item.iconImg}}"></image>
@@ -20,7 +20,7 @@
                     <image src="{{item.courseIcon}}"></image>
                 </view>
             </view>
-            <view wx:if="{{(searchData.searchList.length > 0) || (searchData.recommendList.length > 0)}}" class="bottom">已经拖到底啦</view>
+            <view wx:if="{{(searchData.searchList.length > 0) || (searchData.recommendList.length > 0)}}" class="bottom" style="margin-bottom:28%;">已经拖到底啦</view>
         </scroll-view>
     </view>
 </template> 

+ 2 - 3
component/search/search.wxss

@@ -1,12 +1,10 @@
 /* pages/search/search.wxss */
 .search-container {
     height: 100%;
-    padding: 0 26rpx;
-    box-sizing: border-box;
 }
 
 .search-video {
-    width: 100%;
+    width: 96%;
     height: 95rpx;
     background: #fff;
     border-radius: 95rpx;
@@ -14,6 +12,7 @@
     align-items: center;
     padding-left: 10rpx;
     box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.2), 0 3px 6px 0 rgba(0, 0, 0, .2);
+    margin: 0 auto;
 }
 
 .search-video image {

+ 66 - 0
pages/Instructions/Instructions.js

@@ -0,0 +1,66 @@
+// pages/Instructions/Instructions.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 1 - 0
pages/Instructions/Instructions.json

@@ -0,0 +1 @@
+{}

+ 49 - 0
pages/Instructions/Instructions.wxml

@@ -0,0 +1,49 @@
+<!--pages/Instructions/Instructions.wxml-->
+<view class="Instructions-container">
+    <scroll-view scroll-y="true">
+        <view>
+            <view class="Explain">
+                <view>
+                    <text>1</text>
+                    点击萌娃相册进入相册管理页面,点击按钮上传图片
+                </view>
+                <image src="../../static/image/1.jpg"></image>
+            </view>
+            <view class="Explain">
+                <view>
+                    <text>2</text>
+                    选择相册类型:公开相册可出现在电视端全部萌娃列表中,别的用户也能看到。私密相册仅可自己看到
+                </view>
+                <image src="../../static/image/2.jpg"></image>
+            </view>
+            <view class="Explain">
+                <view>
+                    <text>3</text>
+                    等待照片通过人工审核
+                </view>
+            </view>
+            <view class="Explain">
+                <view>
+                    <text>4</text>
+                    在电视端七彩童年栏目进入“晒晒娃”页面,选择我的娃
+                </view>
+                <image src="../../static/image/4.jpg"></image>
+            </view>
+            <view class="Explain">
+                <view>
+                    <text>5</text>
+                    公开相册输入手机尾号进行查询;私密相册输入提取码查询
+                </view>
+                <image src="../../static/image/5.jpg"></image>
+            </view>
+            <view class="Explain">
+                <view>
+                    <text>6</text>
+                    在大屏幕欣赏您孩子的相片吧!您也可以在“全部萌娃”观看别的萌娃并点赞哦
+                </view>
+                <image src="../../static/image/6.jpg"></image>
+            </view>                                      
+        </view>
+
+    </scroll-view>
+</view>

+ 36 - 0
pages/Instructions/Instructions.wxss

@@ -0,0 +1,36 @@
+/* pages/Instructions/Instructions.wxss */
+.Instructions-container {
+    height: 100%;
+    width: 100%;
+    background:#eaeaea;    
+}
+
+.Instructions-container scroll-view {
+    height: 100%;
+    width: 100%;
+    padding: 20rpx 25rpx 0 25rpx;
+    box-sizing: border-box;
+}
+
+.Explain {
+    font-size: 36rpx;
+}
+
+.Explain view {
+    margin: 56rpx 0 34rpx 0;
+}
+
+.Explain view text {
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 100%;
+    text-align: center;
+    line-height: 40rpx;
+    border: 2rpx solid #000;
+    display: inline-block;
+}
+
+
+.Explain image {
+   width: 100%;
+}

+ 7 - 0
pages/album/album.js

@@ -27,6 +27,13 @@ Page({
   },
   //上传相册
   addPhoto: function () {
+    const userInfo = wx.getStorageSync('userInfo');
+    if(!userInfo.data.data.mobileNo || !userInfo.data.data.avatar) {
+      wx.navigateTo({
+        url: '/pages/setName/setName'
+      })
+      return false;
+    };
     if(this.data.photoList.length >= 15) {
       wx.showModal({  
         title: '温馨提示',  

+ 1 - 0
pages/index/index.js

@@ -76,6 +76,7 @@ Page({
   init: function (uid) {
     httputil.getOpenidSessionKey((res) => {
       console.log('微信的用户信息', res);
+      wx.setStorageSync('userInfo', res)
       this.setData({
         jurisdictionFlag: true
       })

BIN
static/image/1.jpg


BIN
static/image/2.jpg


BIN
static/image/4.jpg


BIN
static/image/5.jpg


BIN
static/image/6.jpg