Merge branch 'master' of iqiyoo:zhuishuyun_quickapp_front

src/api/fly.js

@@ -17,7 +17,7 @@ fly.config.baseURL = apiConfig.baseURL;
 fly.config.headers["Content-Type"] =
   "application/x-www-form-urlencoded;charset=utf-8";
 
-const filterNoToken = ["/login"];
+const filterNoToken = ["/login", "/refreshToken"];
 
 fly.interceptors.request.use(async config => {
   // 过滤一些不需要登录的路由d
@@ -26,8 +26,8 @@ fly.interceptors.request.use(async config => {
     if (config.headers) config.headers.Authorization = token;
     else config.headers = { Authorization: token };
     if (config.method === "POST") {
-      config.body=qs.stringify(config.body);
-    } 
+      config.body = qs.stringify(config.body);
+    }
     return config;
   } else return config;
 });
@@ -42,7 +42,7 @@ fly.interceptors.response.use(
       return getToken().then(token => {
         return r(res.config);
       });
-    } 
+    }
     else {
       prompt.showToast({
         message: res.data.msg
@@ -51,7 +51,7 @@ fly.interceptors.response.use(
     }
   },
   err => {
-    console.log('err',err)
+    console.log('err', err)
     return Promise.reject(err);
   }
 );

src/api/utils.js

@@ -32,6 +32,7 @@ export const getToken = async () => {
       getToken.promise = null;
     })
     .then(r => {
+      console.log("refresh");
       return setToken(r);
     });
 
@@ -77,9 +78,10 @@ const refreshToken = () => {
         }
       })
     .then(r => {
-      return checkResult(r);
+      return r;
     })
     .catch(e => {
+      console.log(e);
       console.error("刷新token失败");
       return Promise.reject(e);
     });
@@ -87,7 +89,10 @@ const refreshToken = () => {
 
 // 检查token的有效期
 const checkToken = t => {
-  return new Date().valueOf() < t.time;
+  console.log("current timestamp: ", new Date().getTime());
+  console.log("token timestamp: ", t.time);
+  console.log("check time:", new Date().getTime() < t.time)
+  return new Date().getTime() < t.time;
 };
 
 // 设置token
@@ -106,7 +111,7 @@ export const clearToken = async () => {
 // 处理token的格式
 const formatToken = t => {
   t.token = "Bearer " + t.token;
-  t.time = t.time * 1000 - 5 * 1000 * 60;
+  t.time = t.time * 1000;
   return t;
 };
 

src/views/Home/index.ux

@@ -21,7 +21,7 @@
         <swiper class="swipe-bar" autoplay="true" indicator="false">
           <block for="b in banner.books">
             <div class="swipe-item">
-              <image class="cover" src="{{b.banner_url}}"></image>
+              <image class="cover" src="{{b.banner_url}}" @click="pageRouter(b)"></image>
             </div>
           </block>
         </swiper>
@@ -69,6 +69,7 @@
 <script>
 import { getHomeList } from "../../api";
 import storage from '@system.storage';
+import router from '@system.router';
 
 export default {
   props: {
@@ -104,6 +105,15 @@ export default {
   toCategory() {
     this.$emit('change');
   },
+  pageRouter(page) {
+    router.push({
+      uri: page.redirect_url,
+      params: {
+        bid: page.bid,
+        chapter_id: page.cid
+      }
+    })
+  },
   async getCityListByTabChange(index) {
     await storage.set({ key: "sex", value: index || 0 });
     let sex = index ? "female" : "male";