:twisted_rightwards_arrows:Merge branch 'master' into channelCMS

src/routes/Resource/Picture/PictureTableList.less

@@ -1,35 +0,0 @@
-@import "../../../../node_modules/antd/lib/style/themes/default.less";
-
-.thumbPic {
-  position: relative;
-  vertical-align: middle;
-  text-align: center;
-  width: 90px;
-  height: 128px;
-  line-height: 128px;
-  img {
-    max-height: 100%;
-    max-width: 100%;
-    vertical-align: middle;
-    height: auto;
-  }
-}
-
-.meta {
-  p {
-    font-weight: 500;
-  }
-}
-
-.editBtn {
-  margin-right: 10px;
-  background: @primary-5;
-  color: #fff;
-  font-weight: 500;
-}
-.delBtn {
-  margin-right: 10px;
-  background: #f5222d;
-  color: #fff;
-  font-weight: 500;
-}

src/services/resource.js

@@ -1,7 +1,7 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
 import { api, Hotax } from '../utils/config';
-import { getSignature } from '../utils/signature';
+// import { getSignature } from '../utils/signature';
 
 export async function queryImageResource(params) {
   const newParams = {
@@ -31,13 +31,15 @@ export async function queryAudioBookResource(params) {
 }
 
 export async function queryOssSignature(params) {
+  /*
   const signature = getSignature();
-  const expireTime = Math.floor(((new Date()).getTime() / 1000) + 5).toString();
+  const expireTime = Math.floor(((new Date()).getTime() / 1000) + 15).toString();
 
   // 检查本地签名是否过期
   if (signature.expire >= expireTime) {
     return signature;
   }
+  */
   // 过期后请求新的签名
   return request(`${api.signature}?${stringify(params)}`);
 }

src/services/terminal.js

@@ -239,4 +239,3 @@ export async function updateTerminalRecommendCourse({ uid, idList }) {
   };
   return request(`${api.userRecommend}/${uid}`, options);
 }
-