Merge branch 'master' of http://192.168.3.207:10080/jianyu/jy-docs

jydocs-back/public/db.go

@@ -103,7 +103,9 @@ func OpenShareJydoc(fromId, openId, docId string) {
 	}) == 0 {
 		return
 	}
-	if redis.Get("other", fmt.Sprintf("integral_article_%s_%s", fromId, docId)) == nil {
+	key := fmt.Sprintf("integral_article_%s_%s_%s", docId, fromId, openId)
+	if redis.Incr("other", key) == 1 {
+		_ = redis.SetExpire("other", key, 24*60*60)
 		pushErr := func() error {
 			b, _ := json.Marshal(&model.Message{
 				E_code:   "jydocs_doc_open",

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/details/details.vue

@@ -118,6 +118,7 @@ export default class extends Vue {
     this.docIds = this.$route.params.id
     this.onList()
     this.setTop()
+    console.log(window.screen.width)
   }
 
   mounted () {
@@ -133,7 +134,7 @@ export default class extends Vue {
     this.$nextTick(() => {
       // 获取到达页面顶端的值
       const heights = document.getElementById('fixedTop')
-      this.offsets = heights.offsetTop
+      this.offsets = heights?.offsetTop
       // this.offsets = heights.getBoundingClientRect().top
       console.log(this.offsets)
     })
@@ -162,7 +163,7 @@ export default class extends Vue {
       config: {
         title: this.detailData.docName,
         desc: this.detailData.docSummary,
-        url: this.links
+        link: this.links
       }
     })
   }
@@ -175,11 +176,11 @@ export default class extends Vue {
     console.log(data)
     switch (data.type) {
       case 'count': {
-        document.getElementById('page_count').textContent = data.value
+        ;(document.getElementById('page_count') as HTMLDivElement).textContent = data.value
         break
       }
       case 'num': {
-        document.getElementById('page_num').textContent = data.value
+        ;(document.getElementById('page_count') as HTMLDivElement).textContent = data.value
         break
       }
     }

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

@@ -147,7 +147,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

@@ -29,7 +29,7 @@
             />
           </div>
         </van-list>
-        <Empty v-if="myLibListState.list.length === 0 && myLibListState.loaded">暂无数据</Empty>
+        <Empty v-if="myLibListState.list.length === 0 && myLibListState.loaded">暂无我的文库</Empty>
       </van-tab>
 
       <van-tab title="文库收藏" name="1">
@@ -54,7 +54,7 @@
             />
           </div>
         </van-list>
-        <Empty v-if="myCollectionListState.list.length === 0 && myCollectionListState.loaded">暂无数据</Empty>
+        <Empty v-if="myCollectionListState.list.length === 0 && myCollectionListState.loaded">暂无文库收藏</Empty>
       </van-tab>
     </van-tabs>
   </div>
@@ -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-mobile/vue.config.js

@@ -45,16 +45,14 @@ module.exports = {
     open: false,
     disableHostCheck: true,
     proxy: {
-      '^/dev/api': {
-        target: 'http://web2-jytest.jydev.jianyu360.com',
+      '^/jydocs': {
+        target: 'https://web2-jytest.jydev.jianyu360.com',
         // target: 'http://192.168.20.180:821',
         changeOrigin: true,
-        logLevel: 'debug',
-        pathRewrite: {
-          '^/dev/api': '/jydocs'
-        }
+        logLevel: 'debug'
       },
       '^/jypay': {
+        // target: 'https://web2-jytest.jydev.jianyu360.com',
         target: 'http://192.168.20.145:86',
         changeOrigin: true,
         logLevel: 'debug'
@@ -63,10 +61,7 @@ module.exports = {
         target: 'http://web2-jytest.jydev.jianyu360.com',
         // target: 'http://192.168.20.145:820',
         changeOrigin: true,
-        logLevel: 'debug',
-        pathRewrite: {
-          '^/jyintegral': '/jyintegral'
-        }
+        logLevel: 'debug'
       }
     }
   },

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/api/modules/detail.js

@@ -75,3 +75,12 @@ export function getShare (data) {
     data
   })
 }
+
+export function getRecommend (data) {
+  console.log(data)
+  return request({
+    url: '/detail/recommend',
+    method: 'post',
+    data
+  })
+}

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/components/recommend.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="c-recommend">
+    <div class="r-bott">
+        <h3>相关推荐</h3>
+        <div class="docs" v-for="item in recomes" :key="item.docId">
+            <div class="imgs">
+                <img :src="item.previewImgId" alt="">
+                <i class="el-icon-jy-word"></i>
+            </div>
+            <div class="conts">
+                <h5>{{item.docName}}</h5>
+                <!-- <p>贡献者：{{item.price}}</p> -->
+                <div class="d-tip">
+                    <p>{{item.downTimes}}次下载</p>
+                    <el-divider direction="vertical"></el-divider>
+                    <p>共{{item.docPageSize}}页</p>
+                    <el-divider direction="vertical"></el-divider>
+                    <p>{{item.docFileSize}}</p>
+                </div>
+                <div class="r-coin">500剑鱼币</div>
+            </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Divider } from 'element-ui'
+export default {
+  props: {
+    recomes: {}
+  },
+  components: {
+    [Divider.name]: Divider
+  },
+  data () {
+    return {
+
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.c-recommend {
+  // display: flex;
+  // flex-direction: initial;
+  .r-bott {
+      min-height: 448px;
+      border-radius: 4px;
+      background: #fff;
+      margin-top: 16px;
+      padding: 15px 12px;
+      h3 {
+          color: #686868;
+          font-size: 16px;
+          line-height: 24px;
+          font-weight: 500;
+          margin-top: 0;
+          margin-bottom: 13px;
+      }
+      .docs {
+          display: flex;
+          height: 112px;
+          .imgs {
+              display: table;
+              position: relative;
+              border-radius: 4px;
+              border: 1px solid #ECECEC;
+              img {
+                  width: 78px;
+                  height: 112px;
+                  border: 0;
+              }
+              i {
+                  position: absolute;
+                  right: 0;
+                  bottom: 0;
+              }
+          }
+          .conts {
+              margin-left: 8px;
+              h5 {
+                  margin: 0;
+                  font-size: 14px;
+                  line-height: 24px;
+                  font-weight: 500;
+                  display: -webkit-box;
+                  -webkit-line-clamp:2;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  -webkit-box-orient: vertical;
+              }
+              p {
+                  margin: 0;
+                  color: #999999;
+                  font-size: 12px;
+                  line-height: 20px;
+              }
+              .d-tip {
+                  display: flex;
+                  flex-direction: initial;
+                  align-items: center;
+                  .el-divider--vertical {
+                      height: 0.8em;
+                      margin: 0 2px;
+                  }
+                  p {
+                      padding: 0 1px;
+                  }
+              }
+              .r-coin {
+                  color: #2CB7CA;
+                  font-size: 14px;
+                  line-height: 24px;
+                  margin-top: 2px;
+              }
+          }
+      }
+      .docs:not(:last-child) {
+        margin-bottom: 16px;
+      }
+  }
+}
+</style>

jydocs-pc/src/views/Content.vue

@@ -37,7 +37,7 @@
                   </div>
               </div>
           </div>
-          <div class="middles">
+          <div class="middles" :class="{'actives':buyed == 0, 'actives1':lineShow == 1}">
               <h3>摘要</h3>
               <p>{{datas.docSummary}}</p>
               <div class="continue" v-show="buyed == 0">全文共{{datas.docPageSize}}页，<span @click="continued">继续阅读<i class="el-icon-arrow-down"></i></span></div>
@@ -79,14 +79,16 @@
                 <img :src="item.s_pic">
               </a>
           </div>
+          <v-recommend :recomes="recomes"></v-recommend>
       </div>
   </div>
 </template>
 
 <script>
 import { Button, Tooltip, Divider, Message } from 'element-ui'
-import { getDetails, getShow, getDown, getAdverse, getCoin, getAdd, getRemove } from '../api/modules/detail'
+import { getDetails, getShow, getRecommend, getDown, getAdverse, getCoin, getAdd, getRemove } from '../api/modules/detail'
 import { formatSize, dateFormatter } from '@/utils/'
+import vRecommend from '@/components/recommend'
 const pdfjsLib = require('pdfjs-dist/build/pdf.js')
 const pdfjsViewer = require('pdfjs-dist/web/pdf_viewer.js')
 export default {
@@ -94,7 +96,8 @@ export default {
     [Button.name]: Button,
     [Tooltip.name]: Tooltip,
     [Divider.name]: Divider,
-    [Message.name]: Message
+    [Message.name]: Message,
+    vRecommend
   },
   data () {
     return {
@@ -103,6 +106,7 @@ export default {
       datas: [],
       conts: [],
       adsUrl: [],
+      recomes: [],
       coinNum: 0,
       btnName: '',
       buyed: 0,
@@ -235,6 +239,14 @@ export default {
         }
       })
     },
+    recommend (str) {
+      getRecommend({ docTag: str, docId: this.docIds, num: 3 }).then(res => {
+        res.data.data.forEach(v => {
+          v.docFileSize = formatSize(v.docFileSize)
+          this.recomes.push(v)
+        })
+      })
+    },
     details () {
       getDetails({ docId: this.docIds, from: this.$route.query.from }).then(res => {
         if (res.data.error_code === 0) {
@@ -245,6 +257,7 @@ export default {
           this.datas.tags = this.datas.tags.split(',')
           this.buyed = res.data.data.status
           this.coined()
+          this.recommend(res.data.data.detail.tags)
           if (res.data.data.status === 1) {
             this.buyShow()
           }
@@ -468,6 +481,7 @@ export default {
           }
       }
       .middles {
+          height: 316px;
           padding: 24px 40px;
           background: #fff;
           border-radius: 4px;
@@ -498,6 +512,12 @@ export default {
               }
           }
       }
+      .actives {
+        height: 530px;
+      }
+      .actives1 {
+        height: 552px;
+      }
       .head-tip {
             width: 920px;
             height: 42px;

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)"
         >
@@ -43,7 +43,7 @@ import DocCard from '@/components/doc-item-card/Card'
 import Price from '@/components/doc-item-card/Price'
 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 {
@@ -57,7 +57,7 @@ export default {
   },
   data () {
     return {
-      title: '我的收藏',
+      title: '文库收藏',
       listState: {
         loaded: false, // 是否已经搜索过
         loading: false,
@@ -102,9 +102,15 @@ export default {
       this.getList()
     },
     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
     }
   }
 }

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 { dateFormatter, formatSize } from '@/utils/index'
 import { mixinBackground } from '@/utils/mixins'
 
 export default {
@@ -102,9 +102,15 @@ export default {
       this.getList()
     },
     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/vue.config.js

@@ -9,8 +9,8 @@ module.exports = {
     disableHostCheck: true,
     proxy: {
       '^/jydocs': {
-        target: 'http://web2-jytest.jydev.jianyu360.com',
-        // target: 'http://192.168.20.180:821',
+        // target: 'http://web2-jytest.jydev.jianyu360.com',
+        target: 'http://192.168.20.180:821',
         changeOrigin: true,
         logLevel: 'debug',
         pathRewrite: {