调整

pages/searchFriend/index.js

@@ -11,6 +11,7 @@ Page({
     localUid: wx.getStorageSync('uid')
   },
   onShow() {
+    // isEachOther 是否互相关注 isFans是否被关注    isFansOther是否关注别人
     this.setData({
       historySearch: wx.getStorageSync('userSearch')
     });

pages/searchFriend/index.wxml

@@ -1,67 +1,68 @@
 <wxs src="../../utils/filter.wxs" module="filters" />
 
 <view class="searchFriend">
-  <view class="searchBox">
-    <input class="input" confirm-type='send' placeholder="查找昵称/学号/手机号" bindinput="setSearch" bindconfirm='searchUser'
-      maxlength='20' value="{{text}}" />
-    <view class="searchBtn" catchtap="searchUser">
-      <image src="/static/search-2.png" class="img" />
-    </view>
-  </view>
-  <view class="historyList" wx:if="{{text==''&&list.length==0}}">
-    <view class="notes" wx:for="{{historySearch}}" wx:key="index" data-text="{{item}}" bindtap="searchUser">
-      <view class="left">
-        <image src="/static/clock.png" class="clock" />
-        {{item}}
-      </view>
-      <view class="delete" data-text="{{item}}" catchtap="deleteHistory">
-        ×
-      </view>
-    </view>
-    <view class="clearHistory" bindtap="clearHistory" wx:if="{{historySearch.length>0}}">
-      清除搜索记录
+    <view class="searchBox">
+        <input class="input" confirm-type='send' placeholder="查找昵称/学号/手机号" bindinput="setSearch"
+            bindconfirm='searchUser' maxlength='20' value="{{text}}" />
+        <view class="searchBtn" catchtap="searchUser">
+            <image src="/static/search-2.png" class="img" />
+        </view>
     </view>
-  </view>
-  <view class="box">
-    <view class="userBox" wx:for="{{list}}" wx:key="index" bindtap="jumpUserInfo" data-uid='{{item.uid}}'>
-      <view class="identity">
-        <image class='avatar' src='{{ item.avatar}}'></image>
-        <view class="identityText">{{item.profession}}</view>
-      </view>
-      <view class="userRight">
-        <view class="topBox">
-          <view class="row">
-            <view class="nickName textOver">{{item.nickName||item.eid }}</view>
-            <view class="gradeText textOver" data-eid="{{item.eid}}" catchtap="clipboar">学号：{{item.eid}}
-              <image src="/static/copy.png" class="copy" />
-            </view>
-          </view>
-          <view class="row">
-            <view class="count">
-              粉丝<text class="countNum textOver">{{filters.numFilter(item.fansAmount)|| '0'}}</text>
+    <view class="historyList" wx:if="{{text==''&&list.length==0}}">
+        <view class="notes" wx:for="{{historySearch}}" wx:key="index" data-text="{{item}}" bindtap="searchUser">
+            <view class="left">
+                <image src="/static/clock.png" class="clock" />
+                {{item}}
             </view>
-            <view class="count">
-              作品<text class="countNum textOver">{{filters.numFilter(item.readAmount)|| 0}}</text>
+            <view class="delete" data-text="{{item}}" catchtap="deleteHistory">
+                ×
             </view>
-            <view class="count countEnd">
-              播放<text class="countNum textOver">{{filters.numFilter(item.playAmount) || 0}}</text>
-            </view>
-          </view>
         </view>
-        <view class="btmBox">
-          <view class="state" data-uid='{{item.uid}}' data-isEachOther="{{item.isEachOther}}" catchtap="setFans">
-            <view class="stateText {{item.isEachOther?'already':'yet'}}">
-              <image src="/static/follow_2.png" class="character" wx:if="{{item.isEachOther}}" />
-              {{item.isEachOther?'互相关注':item.isFans?'回关':'关注'}}
+        <view class="clearHistory" bindtap="clearHistory" wx:if="{{historySearch.length>0}}">
+            清除搜索记录
+        </view>
+    </view>
+    <view class="box">
+        <view class="userBox" wx:for="{{list}}" wx:key="index" bindtap="jumpUserInfo" data-uid='{{item.uid}}'>
+            <view class="identity">
+                <image class='avatar' src='{{ item.avatar}}'></image>
+                <view class="identityText">{{item.profession}}</view>
+            </view>
+            <view class="userRight">
+                <view class="topBox">
+                    <view class="row">
+                        <view class="nickName textOver">{{item.nickName||item.eid }}</view>
+                        <view class="gradeText textOver" data-eid="{{item.eid}}" catchtap="clipboar">学号：{{item.eid}}
+                            <image src="/static/copy.png" class="copy" />
+                        </view>
+                    </view>
+                    <view class="row">
+                        <view class="count">
+                            粉丝<text class="countNum textOver">{{filters.numFilter(item.fansAmount)|| '0'}}</text>
+                        </view>
+                        <view class="count">
+                            作品<text class="countNum textOver">{{filters.numFilter(item.readAmount)|| 0}}</text>
+                        </view>
+                        <view class="count countEnd">
+                            播放<text class="countNum textOver">{{filters.numFilter(item.playAmount) || 0}}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="btmBox">
+                    <view class="state" data-uid='{{item.uid}}' data-isEachOther="{{item.isEachOther}}"
+                        catchtap="setFans">
+                        <view class="stateText {{item.isEachOther||item.isFansOther?'already':'yet'}}">
+                            <image src="/static/follow_2.png" class="character" wx:if="{{item.isEachOther||item.isFansOther}}" />
+                            {{item.isEachOther?'互相关注':item.isFans?'回关':item.isFansOther?'已关注':'关注'}}
+                        </view>
+                    </view>
+                    <view class="follow isFans" data-user="{{item}}" catchtap="sendMsg">
+                        <image src="/static/sx.png" class="character" />
+                        <text>发私信</text>
+                    </view>
+                </view>
             </view>
-          </view>
-          <view class="follow isFans" data-user="{{item}}" catchtap="sendMsg">
-            <image src="/static/sx.png" class="character" />
-            <text>发私信</text>
-          </view>
         </view>
-      </view>
     </view>
-  </view>
-  <emptyBg wx:if="{{nullList}}" message='没有找到小伙伴哦~' />
+    <emptyBg wx:if="{{nullList}}" message='没有找到小伙伴哦~' />
 </view>

utils/request.js

@@ -6,13 +6,13 @@ const {
         envVersion
     }
 } = wx.getAccountInfoSync();
-// if (envVersion == 'develop') {
-baseUrl = 'https://reader-api.efunbox.cn/wx'
-oldUrl = 'https://reader-api.efunbox.cn'
-// } else {
-//   baseUrl = 'https://reader-api.ai160.com/wx'
-//   oldUrl = 'https://reader-api.ai160.com'
-// }
+if (envVersion == 'develop') {
+    baseUrl = 'https://reader-api.efunbox.cn/wx'
+    oldUrl = 'https://reader-api.efunbox.cn'
+} 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 = {