fix: bugs

jydocs-mobile/src/components/Recharge.vue

@@ -59,7 +59,7 @@ export default class extends Vue {
     }
 
     buyMoney () {
-      window.location.href = '/page_points_app/pay'
+      window.location.href = `/page_points_app/pay?id=${this.detailData.id}`
     }
 }
 </script>

jydocs-mobile/src/utils/index.ts

@@ -1,17 +1,7 @@
 import Vue from 'vue'
 import './globalDirectives'
 import './globalFilters'
-import WeiXinSDK from '@/utils/wx-js-sdk-register.ts'
 import { isWeiXinBrowser, androidOrIOS } from '@/utils/globalFunctions'
-import { getWxSdkSign } from '@/api/index.ts'
-
-declare module 'vue/types/vue' {
-  interface Vue {
-    $env: any;
-    $registerWxSdk: any;
-    $wxSdk: any;
-  }
-}
 
 const inWeiXinBrowser = isWeiXinBrowser()
 const isAndroidOrIos = androidOrIOS()
@@ -23,26 +13,6 @@ Vue.prototype.$env = {
   isIOS: isAndroidOrIos === 'ios'
 }
 
-// 如果是微信浏览器, 注册一个微信SDK初始化函数
-if (!inWeiXinBrowser) {
-  Vue.prototype.$registerWxSdk = async () => {
-    const sdkInfo = await getWxSdkSign({ url: location.href.split('#')[0] })
-    if (!sdkInfo) return
-    const info = sdkInfo.data
-    if (info && info.wxsdk && Array.isArray(info.wxsdk)) {
-      const sdk = info.wxsdk
-      Vue.prototype.$wxSdk = new WeiXinSDK({
-        appId: sdk[0],
-        timestamp: sdk[1],
-        nonceStr: sdk[2],
-        signature: sdk[3]
-      })
-    }
-    return info
-  }
-  Vue.prototype.$registerWxSdk()
-}
-
 // 正式环境下屏蔽console.log
 if (process.env.NODE_ENV === 'production') {
   const print = window.console.log

jydocs-mobile/src/views/Search.vue

@@ -214,6 +214,7 @@ export default class extends Vue {
   }
 
   doSearch () {
+    if (!this.listState.value) return
     this.resetListState()
     this.setScrollTop()
     this.listState.finished = false

jydocs-mobile/src/views/purchase/purchase.vue

@@ -140,7 +140,7 @@ export default class extends Vue {
     this.getBool(this.validator(this.tel))
   }
 
-  getBool (bool) {
+  getBool (bool: any) {
     if (this.checked === true && bool === true) {
       this.btnChecked = true
     } else {

jydocs-mobile/src/views/user/Library.vue

@@ -165,12 +165,26 @@ export default class UserLibrary extends Vue {
 
   calcSubInfoForLib (item: any) {
     const { UpdateAt, DocFileSize } = item
-    return [`${dateFormatter(UpdateAt * 1000, 'yyyy/MM/dd')}下载`, formatSize(DocFileSize)]
+    const subInfoArr = []
+    if (UpdateAt !== undefined) { // 下载时间
+      subInfoArr.push(`${dateFormatter(UpdateAt * 1000, 'yyyy/MM/dd')}下载`)
+    }
+    if (DocFileSize !== undefined) {
+      subInfoArr.push(formatSize(DocFileSize))
+    }
+    return subInfoArr
   }
 
   calcSubInfoForColl (item: any) {
     const { DocPageSize, DocFileSize } = item
-    return [`共${DocPageSize}页`, formatSize(DocFileSize)]
+    const subInfoArr = []
+    if (DocPageSize !== undefined) {
+      subInfoArr.push(`共${DocPageSize}页`)
+    }
+    if (DocFileSize !== undefined) {
+      subInfoArr.push(formatSize(DocFileSize))
+    }
+    return subInfoArr
   }
 
   async onLoad () {

jydocs-pc/public/index.html

@@ -5,26 +5,26 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>app1</title>
+    <title>剑鱼标讯</title>
     <% if (process.env.NODE_ENV === 'development') { %>
-      <!-- <link href="https://web2-jytest.jianyu360.cn/css/bootstrap.min.css" rel="stylesheet">
-      <link href="https://web2-jytest.jianyu360.cn/css/bootswatch.min.css" rel="stylesheet">
-      <link href="https://web2-jytest.jianyu360.cn/css/font.css?v=6302" rel="stylesheet">
-      <link href="https://web2-jytest.jianyu360.cn/css/jy.css?v=6302" rel="stylesheet">
-      <link href="https://web2-jytest.jianyu360.cn/css/common.css?v=6302" rel="stylesheet">
-      <link href="https://web2-jytest.jianyu360.cn/css/animate.css" rel="stylesheet">
-      <link href="https://web2-jytest.jianyu360.cn/css/unicorn.main.css" rel="stylesheet" />
-      <link href="https://web2-jytest.jianyu360.cn/css/unicorn.grey.css" rel="stylesheet" />
-      <script src="https://web2-jytest.jianyu360.cn/js/jquery-3.2.1.min.js?v=6302"></script>
-      <script src="https://web2-jytest.jianyu360.cn/js/jquery.cookie.js"></script>
-      <script src="https://web2-jytest.jianyu360.cn/js/bootstrap.min.js"></script>
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/bootstrap.min.css" rel="stylesheet">
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/bootswatch.min.css" rel="stylesheet">
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/font.css?v=6302" rel="stylesheet">
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/jy.css?v=6302" rel="stylesheet">
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/common.css?v=6302" rel="stylesheet">
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/animate.css" rel="stylesheet">
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/unicorn.main.css" rel="stylesheet" />
+      <link href="https://web2-jytest.jydev.jianyu360.com/css/unicorn.grey.css" rel="stylesheet" />
+      <script src="https://web2-jytest.jydev.jianyu360.com/js/jquery-3.2.1.min.js?v=6302"></script>
+      <script src="https://web2-jytest.jydev.jianyu360.com/js/jquery.cookie.js"></script>
+      <script src="https://web2-jytest.jydev.jianyu360.com/js/bootstrap.min.js"></script>
       <script src="https://cdn.jsdelivr.net/npm/pdfjs-dist@2.6.347/build/pdf.min.js"></script>
       <script src="https://cdn.jsdelivr.net/npm/pdfjs-dist@2.6.347/web/pdf_viewer.js"></script>
 
-      <link href='https://web2-jytest.jianyu360.cn/css/reset.css?v=6302' rel="stylesheet" type="text/css"/>
-      <link href='https://web2-jytest.jianyu360.cn/pccss/reset_pc.css' rel="stylesheet" type="text/css"/>
-      <link href='https://web2-jytest.jianyu360.cn/css/pc.css?v=6302' rel="stylesheet"/>
-      <link href='https://web2-jytest.jianyu360.cn/pccss/public-nav-1200.css?v=6302' rel="stylesheet" type="text/css"/> -->
+      <link href='https://web2-jytest.jydev.jianyu360.com/css/reset.css?v=6302' rel="stylesheet" type="text/css"/>
+      <link href='https://web2-jytest.jydev.jianyu360.com/pccss/reset_pc.css' rel="stylesheet" type="text/css"/>
+      <link href='https://web2-jytest.jydev.jianyu360.com/css/pc.css?v=6302' rel="stylesheet"/>
+      <link href='https://web2-jytest.jydev.jianyu360.com/pccss/public-nav-1200.css?v=6302' rel="stylesheet" type="text/css"/>
     <% } %>
   </head>
   <body>

jydocs-pc/src/assets/style/_variables.scss

@@ -37,6 +37,32 @@ body {
   color: $color-text--highlight;
 }
 
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: justify
+}
+
+/* 超过2行省略号显示 */
+.ellipsis-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  text-align: justify
+}
+
+/* 超过3行省略号显示 */
+.ellipsis-3 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
+
 .flex {
   width: 100%;
   flex: 1;

jydocs-pc/src/components/doc-item-card/Card.vue

@@ -23,7 +23,7 @@
         <span class="doc-type-icon" :class="docTypeIcon"></span>
       </div>
       <div class="image-info-container flex-c-c flex">
-        <div class="card-title">{{ title }}</div>
+        <div class="card-title ellipsis-2">{{ title }}</div>
         <div class="card-info">
           <div class="card-info-item uploader" v-if="uploader">贡献者：{{ uploader }}</div>
           <div class="card-info-item subinfo-container">
@@ -46,7 +46,7 @@
         <span class="card-title flex" v-html="hightLightTitle"></span>
       </div>
       <div class="docs-card-content">
-        <span class="card-desc" v-html="hightLightDesc"></span>
+        <span class="card-desc ellipsis-2" v-html="hightLightDesc"></span>
       </div>
       <div class="docs-card-footer flex-r-c">
         <div class="c-f-left subinfo-container">

jydocs-pc/src/views/Search.vue

@@ -50,7 +50,7 @@ import SearchInput from '@/components/Search'
 import DocCard from '@/components/doc-item-card/Card'
 import NoData from '@/components/NoData'
 import { getSearch } from '../api/modules/search'
-import { formatSize } from '@/utils/'
+import { formatSize, dateFormatter } from '@/utils/'
 import { mixinBackground } from '@/utils/mixins'
 
 export default {
@@ -182,7 +182,20 @@ export default {
     },
     calcSubInfo (item) {
       const { docFileSize: size, downTimes, uploadDate, docPageSize } = item
-      return [uploadDate, `${downTimes}次下载`, `共${docPageSize}页`, formatSize(size)]
+      const subInfoArr = []
+      if (uploadDate !== undefined) {
+        subInfoArr.push(dateFormatter(uploadDate, 'yyyy/MM/dd'))
+      }
+      if (downTimes !== undefined) {
+        subInfoArr.push(`${downTimes}次下载`)
+      }
+      if (docPageSize !== undefined) {
+        subInfoArr.push(`共${docPageSize}页`)
+      }
+      if (size !== undefined) {
+        subInfoArr.push(formatSize(size))
+      }
+      return subInfoArr
     }
   }
 }

jydocs-pc/src/views/UserCollections.vue

@@ -10,7 +10,7 @@
           :key="index"
           :title="item.DocName"
           :desc="item.DocSummary"
-          :docType="item.docFileType"
+          :docType="item.DocFileType"
           :subInfo="calcSubInfo(item)"
           @onClick="toDocDetail(item)"
         >
@@ -103,8 +103,15 @@ export default {
     },
     calcSubInfo (item) {
       // eslint-disable-next-line
-      const { DocFileSize, CreateAt, UpdateAt, DeletedAt } = item
-      return [dateFormatter(CreateAt * 1000, 'yyyy-MM-dd'), formatSize(DocFileSize)]
+      const { UpdateAt, DocFileSize } = item
+      const subInfoArr = []
+      if (UpdateAt !== undefined) {
+        subInfoArr.push(dateFormatter(UpdateAt * 1000, 'yyyy-MM-dd'))
+      }
+      if (DocFileSize !== undefined) {
+        subInfoArr.push(formatSize(DocFileSize))
+      }
+      return subInfoArr
     }
   }
 }

jydocs-pc/src/views/UserDocs.vue

@@ -17,7 +17,7 @@
           cardType="oneline"
           :key="index"
           :title="item.DocName"
-          :docType="item.docFileType"
+          :docType="item.DocFileType"
           :subInfo="calcSubInfo(item)"
           @onClick="toDocDetail(item)"
         />
@@ -44,7 +44,7 @@ import { Pagination } from 'element-ui'
 import DocCard from '@/components/doc-item-card/Card'
 import NoData from '@/components/NoData'
 import { getUserDocs } from '../api/modules/user'
-import { dateFormatter, formatSize } from '@/utils/'
+import { formatSize } from '@/utils/'
 import { mixinBackground } from '@/utils/mixins'
 
 export default {
@@ -103,8 +103,15 @@ export default {
     },
     calcSubInfo (item) {
       // eslint-disable-next-line
-      const { DocFileSize, CreateAt, UpdateAt, DeletedAt } = item
-      return [dateFormatter(CreateAt * 1000, 'yyyy-MM-dd'), formatSize(DocFileSize)]
+      const { DocPageSize, DocFileSize } = item
+      const subInfoArr = []
+      if (DocPageSize !== undefined) {
+        subInfoArr.push(`共${DocPageSize}页`)
+      }
+      if (DocFileSize !== undefined) {
+        subInfoArr.push(formatSize(DocFileSize))
+      }
+      return subInfoArr
     }
   }
 }