更用户默认头像

component/look/look.wxml

@@ -10,12 +10,13 @@
     <swiper current="{{lookData.lookInd}}" bindchange="lookSlide">
         <block wx:for="{{lookData.nav}}" wx:key="{{index}}">
             <swiper-item style="height: auto;">
-                <scroll-view class="scroll-view" scroll-y>
+                <scroll-view class="scroll-view" scroll-y scroll-with-animation="true">
                     <view class="look-video">
                         <view class="look-item" wx:for="{{lookData.lookList}}" wx:key="{{index}}" bindtap="details" data-id="{{item.id}}">
                             <image src="{{item.iconImg}}"></image>
                         </view>
                     </view>
+                    <view class="bottom">已经拖到底啦</view>
                 </scroll-view>
             </swiper-item>    
         </block>        

component/look/look.wxss

@@ -26,7 +26,7 @@
 }
 
 swiper {
-    height: 92%;
+    height: 74%;
 }
 
 .look-video {
@@ -37,12 +37,21 @@ swiper {
 .look-item {
     width: 100%;
     height: 266rpx;
-    margin-top: 27rpx;
+    margin-top: 4%;
     border-radius: 20rpx;
+    box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.2), 0 3px 6px 0 rgba(0, 0, 0, .2);
 }
 
 .look-item image {
     width: 100%;
     height: 100%;
     border-radius: 20rpx;
+}
+
+.bottom {
+    text-align: center;
+    margin-top: 30rpx;
+    color: #ccc;
+    font-size: 32rpx;
+    margin-bottom: 20%;
 }

component/mys/mys.wxml

@@ -5,14 +5,14 @@
             <view class="{{index == myData.myInd ? 'slecte-nav' : ''}}" bindtap="myChoice" data-index="{{index}}">{{item}}</view>
         </block>
     </view>
-    <swiper current="{{myData.myInd}}" bindchange="mySlide" style="height: 92%;">
+    <swiper current="{{myData.myInd}}" bindchange="mySlide" style="height: 74%;">
         <swiper-item>
             <view class="my-information">
-                <view class="information-item">
-                    <image class="head" bindtap="setName" src="{{myData.avatar}}"></image>
+                <view class="information-item" bindtap="setName">
+                    <image class="head" src="{{myData.avatar ? myData.avatar : '../../static/image/default.png'}}"></image>
                     <view class="set-name">
                         <text class="name">{{myData.userName}}</text>
-                        <text bindtap="setName">点击修改头像和名字</text>
+                        <text>点击修改头像和名字</text>
                     </view>
                 </view>
                 <view class="shaiwa">如何使用电视上的晒娃功能</view>
@@ -26,6 +26,7 @@
                         <image src="{{item.iconImg}}"></image>
                     </view>
                 </view>
+                <view class="bottom">已经拖到底啦</view>
             </scroll-view>
         </swiper-item>
         <swiper-item>
@@ -35,8 +36,8 @@
                         <image src="{{item.courseIcon}}"></image>
                     </view>
                 </view>
+                <view class="bottom">已经拖到底啦</view>
             </scroll-view>
         </swiper-item>
         </swiper>
-    
 </template> 

component/mys/mys.wxss

@@ -47,7 +47,6 @@ swiper-item {
     width: 193rpx;
     height: 193rpx;
     border-radius: 50%;
-    background: red;
     margin-right: 55rpx;
 }
 
@@ -106,10 +105,11 @@ swiper-item {
     height: 266rpx;
     margin-top: 27rpx;
     border-radius: 20rpx;
+    box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.2), 0 3px 6px 0 rgba(0, 0, 0, .2);
 }
 
 .collection-item image {
     width: 100%;
     height: 100%;
     border-radius: 20rpx;
-}
+}

component/search/search.wxml

@@ -4,8 +4,12 @@
             <image class="icon" src="../../static/image/search.png"></image>
             <input placeholder="输入关键字" bindinput="focus"/>
         </view>
-        <scroll-view scroll-y style="height: 92%; overflow: hidden;">
-            <view class="title">热门搜索</view>
+        <view class="title" wx:if="{{(searchData.searchList.length > 0) || (searchData.recommendList.length > 0)}}">热门搜索</view>
+        <view class="no-find"wx:else>
+            <text>没有找到相关的内容</text>
+            <text>换个关键字再试试吧</text>
+        </view>
+        <scroll-view scroll-y style="height: 64%; 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>
@@ -15,6 +19,7 @@
                     <image src="{{item.courseIcon}}"></image>
                 </view>
             </view>
+            <view wx:if="{{(searchData.searchList.length > 0) || (searchData.recommendList.length > 0)}}" class="bottom">已经拖到底啦</view>
         </scroll-view>
     </view>
 </template> 

component/search/search.wxss

@@ -29,7 +29,7 @@
 .title {
     text-align: center;
     color: #959595;
-    margin-top: 46rpx;
+    margin: 36rpx 0 26rpx 0;
 }
 
 .hot-video {
@@ -40,12 +40,25 @@
 .hot-item {
     width: 100%;
     height: 266rpx;
-    margin-top: 27rpx;
+    margin-bottom: 27rpx;
     border-radius: 20rpx;
+    box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.2), 0 3px 6px 0 rgba(0, 0, 0, .2);
 }
 
 .hot-item image {
     width: 100%;
     height: 100%;
     border-radius: 20rpx;
+}
+
+.no-find {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    position:absolute;
+    width:100%;
+    top:30%;
+    color: #6a6a6a;
+    
 }

pages/clip/clip.js

@@ -17,7 +17,10 @@ Page({
     top: '',
     clipW: 200
   },
-
+  //点击取消
+  cancel: function () {
+    wx.navigateBack();
+  },
   //拖拽事件
   move: function ({ detail }) {
     this.setData({

pages/clip/clip.wxml

@@ -6,7 +6,7 @@
         </movable-view>
     </movable-area>
     <view class="btn">
-        <text>取消</text>
+        <text bindtap="cancel">取消</text>
         <text bindtap="getImageInfo">保存</text>
     </view>
 </view>

pages/clip/clip.wxss

@@ -9,14 +9,14 @@
 movable-area {
     position: absolute;
     left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);  
+    top: 20%;
+    transform: translateX(-50%);  
 }
 
 movable-view {
     height: 200rpx; 
     width: 200rpx; 
-    border: 2rpx solid #000;
+    border: 4rpx solid #fe9d00;
     border-radius: 50%;
 }
 

pages/details/details.wxml

@@ -37,7 +37,7 @@
             </view>
             <view class="content-speak" wx:for="{{postsList}}" wx:key="{{index}}">
                 <view class="information-item">
-                    <image class="head" src="{{item.user.avatar}}"></image>
+                    <image class="head" src="{{item.user.avatar ? item.user.avatar : '../../static/image/default.png'}}"></image>
                     <view class="name">
                         <text>{{item.user.nickName}}</text>
                         <text>{{dateArr[index]}}</text>

pages/details/details.wxss

@@ -90,7 +90,7 @@
     text-align: center;
     line-height: 100rpx;
     border-radius: 20rpx;
-    margin: 27rpx 0 0 18rpx;
+    margin: 27rpx 18rpx 0 0;
 }
 
 .current {

pages/setName/setName.js

@@ -8,7 +8,7 @@ Page({
   data: {
     phone: '',
     name: '',
-    headImg: ''
+    headImg: '../../static/image/default.png'
   },
   //获取输入名字
   getName: function ({detail}) {

pages/setName/setName.wxml

@@ -1,7 +1,7 @@
 <!--pages/setName/setName.wxml-->
 <view class="set">
     <view class="set-head" bindtap="setHead">
-        <image src="{{headImg}}"></image>
+        <image src="{{headImg  ? headImg : '../../static/image/default.png'}}"></image>
         <text>点击头像进行更换</text>
     </view>
     <view class="set-message">

pages/setName/setName.wxss

@@ -17,7 +17,6 @@
     width: 348rpx;
     height: 348rpx;
     border-radius: 50%;
-    background: red;
 }
 
 .set-head text {