bayi 2 лет назад
Родитель
Сommit
069d17fed4
6 измененных файлов с 17 добавлено и 11 удалено
  1. 1 1
      pages/index/index.less
  2. 1 1
      pages/index/index.wxss
  3. 5 0
      pages/personal/index.js
  4. 1 1
      pages/works/index.less
  5. 1 1
      pages/works/index.wxss
  6. 8 7
      utils/request.js

+ 1 - 1
pages/index/index.less

@@ -70,10 +70,10 @@
     }
 
     .currentType {
-      border: none;
       color: white;
       box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
       background-color: #00C657;
+      border-color: #00C657;
       font-weight: bold;
     }
 

+ 1 - 1
pages/index/index.wxss

@@ -60,10 +60,10 @@
   font-size: 28rpx;
 }
 .recommend .selectType .currentType {
-  border: none;
   color: white;
   box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
   background-color: #00C657;
+  border-color: #00C657;
   font-weight: bold;
 }
 .recommend .selectType .search {

+ 5 - 0
pages/personal/index.js

@@ -22,6 +22,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    if (wx.getStorageSync('uid') == options.uid) {
+      wx.setNavigationBarTitle({
+        title: '我的主页'
+      })
+    }
     this.setData({
       type: options.type || 'user',
       uid: options.uid

+ 1 - 1
pages/works/index.less

@@ -18,9 +18,9 @@
     }
 
     .currentType {
-      border: none;
       box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
       color: white;
+      border-color: #00C657;
       background-color: #00C657;
       font-weight: bold;
     }

+ 1 - 1
pages/works/index.wxss

@@ -16,9 +16,9 @@
   font-size: 28rpx;
 }
 .worksBox .selectType .currentType {
-  border: none;
   box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
   color: white;
+  border-color: #00C657;
   background-color: #00C657;
   font-weight: bold;
 }

+ 8 - 7
utils/request.js

@@ -6,13 +6,14 @@ 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) {
   let header = {
     'uid': wx.getStorageSync('uid') || ''