调整样式

components/activityList/index.less

@@ -370,7 +370,7 @@
   }
 
   .newActivityBox {
-    margin-bottom: 20rpx;
+    margin-bottom: 40rpx;
     width: 100%;
     padding: 20rpx;
     box-sizing: border-box;

components/activityList/index.wxss

@@ -299,7 +299,7 @@
   box-shadow: none;
 }
 .activityList .newActivityBox {
-  margin-bottom: 20rpx;
+  margin-bottom: 40rpx;
   width: 100%;
   padding: 20rpx;
   box-sizing: border-box;

components/authority/index.less

@@ -7,10 +7,10 @@
 
         .topic {
             font-size: 36rpx;
+            color: #000;
         }
 
         .explain {
-            margin: 10rpx 0rpx;
             color: #666;
             font-size: 28rpx;
         }

components/authority/index.wxss

@@ -7,9 +7,9 @@
 }
 .authority .module .topic {
   font-size: 36rpx;
+  color: #000;
 }
 .authority .module .explain {
-  margin: 10rpx 0rpx;
   color: #666;
   font-size: 28rpx;
 }

components/comment/index.less

@@ -275,7 +275,7 @@
             align-items: center;
             justify-content: space-between;
             background-color: #EEEDED;
-            padding: 20rpx 24rpx;
+            padding: 20rpx 24rpx 30rpx;
 
             .input {
                 height: 80rpx;

components/comment/index.wxml

@@ -1,6 +1,5 @@
 <wxs src="../../utils/filter.wxs" module="filters" />
 <view class="commentBox" wx:if="{{show}}">
-    <!-- <view class="commentBox"> -->
     <view class="commentBg" catchtap="close" catchtouchmove="true"></view>
     <view class="comment {{tabBarPadding?'seat2':''}}" animation="{{animationData}}">
         <view class="header">

components/comment/index.wxss

@@ -235,7 +235,7 @@
   align-items: center;
   justify-content: space-between;
   background-color: #EEEDED;
-  padding: 20rpx 24rpx;
+  padding: 20rpx 24rpx 30rpx;
 }
 .commentBox .comment .footer .input {
   height: 80rpx;

pages/childClassify/index.js

@@ -21,6 +21,7 @@ Page({
     data: {
         // class为二级,search为搜索
         type: 'class',
+        placeholderText: '请输入搜索内容',
         categoryList: [],
         childType: '',
         currentIndex: 0,
@@ -203,6 +204,16 @@ Page({
             }
         }
     },
+    cleanPlaceholder() {
+        this.setData({
+            placeholderText: ''
+        })
+    },
+    setPlaceholder() {
+        this.setData({
+            placeholderText: '请输入搜索内容'
+        })
+    },
     onUnload() {
         this.storeBindings.destroyStoreBindings();
     }

pages/childClassify/index.wxml

@@ -3,7 +3,7 @@
     <!-- 搜索 -->
     <block>
         <view class="searchBox" wx:if="{{type=='search'}}">
-            <input class="input" placeholder="请输入搜索内容" bindconfirm='search' confirm-type='send' bindinput="setSearch"
+            <input class="input" bindfocus='cleanPlaceholder' bindblur='setPlaceholder' placeholder="{{placeholderText}}"bindconfirm='search' confirm-type='send' bindinput="setSearch"
                 value="{{text}}" maxlength='20' />
             <view class="searchBtn" catchtap="search">
                 <image src="/static/search-2.png" class="img" />

pages/index/index.wxml

@@ -5,7 +5,8 @@
     <view class="firstClassify">
         <view class="classifyBox" wx:for="{{categoryList}}" wx:key="id" data-item='{{item}}'
             bindtap="jumpChildClassify">
-            <image class="icon" src="{{item.icon}}" />
+            <image class="icon" src="/static/icon(1)/{{index+1}}.png" />
+            <!-- <image class="icon" src="{{item.icon}}" /> -->
         </view>
         <view class="classifyBox">
             <image bindtap="showTips" class="icon" src="/static/future.png" />

pages/message/index.less

@@ -96,7 +96,7 @@
                     .name {
                         max-width: 330rpx;
                         font-size: 30rpx;
-                        font-weight: bolder;
+                        color: #000;
                     }
                 }
 

pages/message/index.wxss

@@ -294,7 +294,7 @@
 .messagePage .messageList .base .infoBox .body .name {
   max-width: 330rpx;
   font-size: 30rpx;
-  font-weight: bolder;
+  color: #000;
 }
 .messagePage .messageList .base .infoBox .right {
   min-width: 140rpx;

pages/my/index.less

@@ -1,10 +1,10 @@
 .container {
     position: relative;
-    padding: 0rpx 20rpx 240rpx;
+    padding: 55rpx 20rpx 240rpx;
 
     .userBox {
         background-color: white;
-        padding: 20rpx 20rpx 0rpx;
+        padding: 20rpx 20rpx 0;
         border-radius: 20rpx;
 
         .above {

pages/my/index.wxss

@@ -1,10 +1,10 @@
 .container {
   position: relative;
-  padding: 0rpx 20rpx 240rpx;
+  padding: 55rpx 20rpx 240rpx;
 }
 .container .userBox {
   background-color: white;
-  padding: 20rpx 20rpx 0rpx;
+  padding: 20rpx 20rpx 0;
   border-radius: 20rpx;
 }
 .container .userBox .above {

pages/ranking/index.wxml

@@ -11,7 +11,8 @@
                     </swiper-item>
                 </block>
             </swiper>
-            <image src="/static/rbtn.png" class="keys" bindtap="bindDateChange" data-type='previous'  wx:if="{{selector.previous}}" />
+            <image src="/static/rbtn.png" class="keys" bindtap="bindDateChange" data-type='previous'
+                wx:if="{{selector.previous}}" />
         </view>
     </view>
     <view class="podiumBox {{podiumBoxBg}}">
@@ -68,7 +69,7 @@
                 <view class="left">
                     <view class="num">{{index+4}}</view>
                     <image src="{{userList[index+3].avatar}}" class="avatar" bindtap="jumpUserInfo"
-                        data-uid='{{userList[index+3].uid}}' />
+                        data-uid='{{userList[index+3].uid}}' lazy-load />
                     <view class="nickName textOver">
                         {{userList[index+3].nickName||userList[index+3].eid}}
                     </view>

pages/searchFriend/index.js

@@ -1,154 +1,165 @@
 import {
-  getOtherUser,
-  setFans
+    getOtherUser,
+    setFans
 } from '~/api/user';
 import event from '~/mixins/event'
 import reachBottom from '~/mixins/reachBottom';
 Page({
-  behaviors: [reachBottom,event],
-  data: {
-    text: '',
-    historySearch: [],
-    localUid: wx.getStorageSync('uid')
-  },
-  onShow() {
-    // isEachOther 是否互相关注 isFans是否被关注    isFansOther是否关注别人
-    this.setData({
-      historySearch: wx.getStorageSync('userSearch')
-    });
-    this.resetData();
-  },
-  setSearch({
-    detail
-  }) {
-    if (!detail.value) {
-      this.setData({
-        nullList: false,
-        list: []
-      });
-    }
-    this.setData({
-      text: detail.value
-    });
-  },
-  searchUser({
-    currentTarget
-  }) {
-    if (currentTarget.dataset.text) {
-      this.setData({
-        text: currentTarget.dataset.text
-      });
-    }
-    if (!this.data.text) {
-      this.setData({
-        list: []
-      });
-      return;
-    }
-    this.resetData();
-    if (!this.data.historySearch.includes(this.data.text)) {
-      this.setData({
-        historySearch: [this.data.text, ...this.data.historySearch].slice(0, 20)
-      });
-    }
-    wx.setStorageSync('userSearch', this.data.historySearch);
-  },
-  deleteHistory({
-    currentTarget
-  }) {
-    let newList = this.data.historySearch.filter(item => {
-      return item != currentTarget.dataset.text;
-    });
-    this.setData({
-      historySearch: newList.slice(0, 20)
-    });
-    wx.setStorageSync('userSearch', this.data.historySearch);
-  },
-  clearHistory() {
-    wx.showModal({
-      title: '温馨提示',
-      content: '历史记录清除后无法恢复,是否清除全部记录',
-      success: res => {
-        if (res.confirm) {
-          this.setData({
-            historySearch: []
-          });
-          wx.setStorageSync('search', this.data.historySearch);
+    behaviors: [reachBottom, event],
+    data: {
+        text: '',
+        placeholderText:'查找昵称/学号/手机号',
+        historySearch: [],
+        localUid: wx.getStorageSync('uid')
+    },
+    onShow() {
+        // isEachOther 是否互相关注 isFans是否被关注    isFansOther是否关注别人
+        this.setData({
+            historySearch: wx.getStorageSync('userSearch')
+        });
+        this.resetData();
+    },
+    setSearch({
+        detail
+    }) {
+        if (!detail.value) {
+            this.setData({
+                nullList: false,
+                list: []
+            });
         }
-      }
-    });
-  },
-  loadMore() {
-    if (!this.data.text) {
-      return;
-    }
-    this.getData(getOtherUser, {
-      query: this.data.text
-    });
-  },
-  jumpUserInfo({
-    currentTarget
-  }) {
-    let uid = currentTarget.dataset.uid;
-    wx.navigateTo({
-      url: `/pages/personal/index?uid=${uid}`
-    });
-  },
-  async setFans({
-    currentTarget
-  }) {
-    if (!currentTarget.dataset.iseachother) {
-      await setFans({
-        uid: currentTarget.dataset.uid
-      });
-      let listCopy = JSON.parse(JSON.stringify(this.data.list));
-      listCopy.forEach(item => {
-        if (item.uid == currentTarget.dataset.uid) {
-          item.isEachOther = true;
+        this.setData({
+            text: detail.value
+        });
+    },
+    searchUser({
+        currentTarget
+    }) {
+        if (currentTarget.dataset.text) {
+            this.setData({
+                text: currentTarget.dataset.text
+            });
         }
-      });
-      this.setData({
-        list: listCopy
-      });
-      wx.showToast({
-        title: '已关注',
-        icon: 'none'
-      });
-    }
-  },
-  sendMsg({
-    currentTarget
-  }) {
-    let user = currentTarget.dataset.user
-    let {
-      nickName,
-      eid,
-      uid
-    } = user
-    if (this.data.localUid == uid) {
-      return wx.showToast({
-        title: '不可以给自己发私信哦~',
-        icon: 'none'
-      })
-    }
-    wx.navigateTo({
-      url: `/pages/chat/index?title=${nickName||eid}&uid=${uid}`,
-    })
-  },
-  clipboar({
-    currentTarget
-  }) {
-    wx.setClipboardData({
-      data: currentTarget.dataset.eid,
-      success: function (res) { //成功回调函数
-        wx.showToast({
-          title: '已复制',
-          icon: "none"
+        if (!this.data.text) {
+            this.setData({
+                list: []
+            });
+            return;
+        }
+        this.resetData();
+        if (!this.data.historySearch.includes(this.data.text)) {
+            this.setData({
+                historySearch: [this.data.text, ...this.data.historySearch].slice(0, 20)
+            });
+        }
+        wx.setStorageSync('userSearch', this.data.historySearch);
+    },
+    deleteHistory({
+        currentTarget
+    }) {
+        let newList = this.data.historySearch.filter(item => {
+            return item != currentTarget.dataset.text;
+        });
+        this.setData({
+            historySearch: newList.slice(0, 20)
+        });
+        wx.setStorageSync('userSearch', this.data.historySearch);
+    },
+    clearHistory() {
+        wx.showModal({
+            title: '温馨提示',
+            content: '历史记录清除后无法恢复,是否清除全部记录',
+            success: res => {
+                if (res.confirm) {
+                    this.setData({
+                        historySearch: []
+                    });
+                    wx.setStorageSync('search', this.data.historySearch);
+                }
+            }
+        });
+    },
+    loadMore() {
+        if (!this.data.text) {
+            return;
+        }
+        this.getData(getOtherUser, {
+            query: this.data.text
+        });
+    },
+    jumpUserInfo({
+        currentTarget
+    }) {
+        let uid = currentTarget.dataset.uid;
+        wx.navigateTo({
+            url: `/pages/personal/index?uid=${uid}`
+        });
+    },
+    async setFans({
+        currentTarget
+    }) {
+        if (!currentTarget.dataset.iseachother) {
+            await setFans({
+                uid: currentTarget.dataset.uid
+            });
+            let listCopy = JSON.parse(JSON.stringify(this.data.list));
+            listCopy.forEach(item => {
+                if (item.uid == currentTarget.dataset.uid) {
+                    item.isEachOther = true;
+                }
+            });
+            this.setData({
+                list: listCopy
+            });
+            wx.showToast({
+                title: '已关注',
+                icon: 'none'
+            });
+        }
+    },
+    sendMsg({
+        currentTarget
+    }) {
+        let user = currentTarget.dataset.user
+        let {
+            nickName,
+            eid,
+            uid
+        } = user
+        if (this.data.localUid == uid) {
+            return wx.showToast({
+                title: '不可以给自己发私信哦~',
+                icon: 'none'
+            })
+        }
+        wx.navigateTo({
+            url: `/pages/chat/index?title=${nickName||eid}&uid=${uid}`,
         })
-      }
-    })
-  },
-  onReachBottom() {
-    this.loadMore();
-  }
+    },
+    clipboar({
+        currentTarget
+    }) {
+        wx.setClipboardData({
+            data: currentTarget.dataset.eid,
+            success: function (res) { //成功回调函数
+                wx.showToast({
+                    title: '已复制',
+                    icon: "none"
+                })
+            }
+        })
+    },
+    cleanPlaceholder() {
+        this.setData({
+            placeholderText: ''
+        })
+    },
+    setPlaceholder() {
+        this.setData({
+            placeholderText: '请输入搜索内容'
+        })
+    },
+    onReachBottom() {
+        this.loadMore();
+    }
 });

pages/searchFriend/index.wxml

@@ -2,7 +2,7 @@
 
 <view class="searchFriend">
     <view class="searchBox">
-        <input class="input" confirm-type='send' placeholder="查找昵称/学号/手机号" bindinput="setSearch"
+        <input class="input" confirm-type='send' bindfocus='cleanPlaceholder' bindblur='setPlaceholder' placeholder="{{placeholderText}}" bindinput="setSearch"
             bindconfirm='searchUser' maxlength='20' value="{{text}}" />
         <view class="searchBtn" catchtap="searchUser">
             <image src="/static/search-2.png" class="img" />

pages/works/index.wxml

@@ -18,6 +18,6 @@
     <view class="logo">
         <image src="/static/works.png" class="icon" />优秀作品展播
     </view>
-    <worksList id="worksList" worksList="{{list}}" videoType="public" tabBarPadding='true' autoPlay='{{false}}' />
+    <worksList id="worksList" worksList="{{list}}" videoType="public" tabBarPadding='true' autoPlay='{{true}}' />
 </view>
 <canvas id='share' type="2d"> </canvas>

utils/request.js

@@ -6,13 +6,13 @@ const {
         envVersion
     }
 } = wx.getAccountInfoSync();
-if (envVersion == 'develop') {
+/* if (envVersion == 'develop') {
     baseUrl = 'https://reader-api.efunbox.cn/wx'
     oldUrl = 'https://reader-api.efunbox.cn'
-} else {
+} else { */
     baseUrl = 'https://reader-api.ai160.com/wx'
     oldUrl = 'https://reader-api.ai160.com'
-}
+// }
 
 function request(url, method, data, oldBaseUrl = false, intercept = true) {
     let header = {