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

jydocs-back/config.json

@@ -40,5 +40,6 @@
     "行业报告",
     "测试"
   ],
+  "searchNumLimit": 200,
   "shareUrl": "https://web-jydev-wky.jianyu360.cn/swordfish/SingleLogin"
 }

jydocs-back/config/config.go

@@ -17,8 +17,9 @@ type appConfig struct {
 		Points  rpcConfig `json:"points"`  //剑鱼积分rpc接口
 		JyFile  rpcConfig `json:"jyFile"`  //剑鱼文件rpc接口
 	} `json:"rpcServers"` //rpc服务配置
-	IndexSearchTag []string `json:"indexSearchTag"`
-	ShareUrl       string   `json:"shareUrl"`
+	IndexSearchTag []string `json:"indexSearchTag"` //首页标签
+	SearchNumLimit int64    `json:"searchNumLimit"` //检索条数限制
+	ShareUrl       string   `json:"shareUrl"`       //分享地址
 }
 
 type rpcConfig struct {

jydocs-back/db.json

@@ -15,13 +15,13 @@
       "password": "123456"
     }
   },
-  "nsqConfig": {
-    "address": "192.168.3.240:4260",
-    "appName": "jywx_node"
-  },
   "redis": {
     "main": {
       "address": "session=192.168.3.128:1712,other=192.168.3.128:1712"
     }
+  },
+  "nsqConfig": {
+    "address": "192.168.3.240:4260",
+    "appName": "jywx_node"
   }
 }

jydocs-back/go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	app.yhyue.com/moapp/jyPoints v0.0.0-20210319094929-f8c029fa5c82
-	app.yhyue.com/moapp/jy_docs v0.0.0-20210323032815-1d9b66bd95c0
+	app.yhyue.com/moapp/jy_docs v0.0.0-20210323090943-7ac2be34cfa1
 	app.yhyue.com/moapp/jybase v0.0.0-20210322021809-141cc2c37946
 	app.yhyue.com/moapp/jyfs v0.0.0-20210319011832-6cf539ddc5cd
 	app.yhyue.com/moapp/message v0.0.0-20210322082125-2a9762351105

jydocs-back/go.sum

@@ -55,6 +55,8 @@ app.yhyue.com/moapp/jy_docs v0.0.0-20210323011904-8fb7e73d8a90 h1:csXuChAsCUi+73
 app.yhyue.com/moapp/jy_docs v0.0.0-20210323011904-8fb7e73d8a90/go.mod h1:XQ0SPQX4rLnOBelx6WRl8wyRT6T9xhfGzxldglLsBgU=
 app.yhyue.com/moapp/jy_docs v0.0.0-20210323032815-1d9b66bd95c0 h1:I8NVbS/fuLVMmEjrzQ3xDgd6qG5kATn2vXo11z2fMtg=
 app.yhyue.com/moapp/jy_docs v0.0.0-20210323032815-1d9b66bd95c0/go.mod h1:XQ0SPQX4rLnOBelx6WRl8wyRT6T9xhfGzxldglLsBgU=
+app.yhyue.com/moapp/jy_docs v0.0.0-20210323090943-7ac2be34cfa1 h1:X+t4IH73+ftQv//DQRhP/r6leYNoew/w4Eebc++l3U4=
+app.yhyue.com/moapp/jy_docs v0.0.0-20210323090943-7ac2be34cfa1/go.mod h1:XQ0SPQX4rLnOBelx6WRl8wyRT6T9xhfGzxldglLsBgU=
 app.yhyue.com/moapp/jybase v0.0.0-20210317020927-18b0165f5ff9 h1:LVIuqXMqcclMwBbSmqEzXi0nIEiir+a2GpWAqksmfzk=
 app.yhyue.com/moapp/jybase v0.0.0-20210317020927-18b0165f5ff9/go.mod h1:29ShuI8y7qEyg2KviHSx1iamiCioBKdTMm2ndVzWAhk=
 app.yhyue.com/moapp/jybase v0.0.0-20210318061912-f5594310c8fe h1:RSQIrriyi534CCrI/sSLGW+Rd0X/0W4VDDXIalHVo8c=

jydocs-back/servers/stdDoc.go

@@ -30,7 +30,7 @@ func (stdDoc *StdDoc) Search() {
 		sort := stdDoc.GetString("sort")                          //排序 tSort dSort vSort
 		pageNumReq, _ := stdDoc.GetInt("num")                     //页码 从1开始
 		pageSizeReq, _ := stdDoc.GetInt("size")                   //每页数量
-		pageNum, pageSize, err := public.PageNumParse(pageNumReq, pageSizeReq, 20*10)
+		pageNum, pageSize, err := public.PageNumParse(pageNumReq, pageSizeReq, config.JyDocsAppConfig.SearchNumLimit)
 		if err != nil {
 			return nil, err
 		}
@@ -44,6 +44,9 @@ func (stdDoc *StdDoc) Search() {
 		if err != nil {
 			return nil, err
 		}
+		if total > config.JyDocsAppConfig.SearchNumLimit {
+			total = config.JyDocsAppConfig.SearchNumLimit
+		}
 		return map[string]interface{}{
 			"total": total,
 			"list":  list,

jydocs-mobile/src/api/main.ts

@@ -114,7 +114,7 @@ export function getDocPay (data: any) {
   return $request({
     url: '/user/buy',
     method: 'post',
-    params: data
+    data
   })
 }
 
@@ -122,9 +122,10 @@ export function getDocPay (data: any) {
 export function getListDetail (data: any) {
   data = qs.stringify(data)
   return $request({
+    baseURL: '/jyintegral',
     url: '/getList',
     method: 'post',
-    params: data
+    data
   })
 }
 
@@ -135,7 +136,6 @@ export function getAccountInfo (data: any) {
   return $request({
     baseURL: '',
     url: '/jypay/user/getAccountInfo',
-    method: 'post',
-    params: data
+    method: 'post'
   })
 }

jydocs-mobile/src/components/SharePopup.vue

@@ -10,7 +10,7 @@
                 <span class="icon_jianyu"></span>
                 <span class="share_t_text">分享招标信息及文档，好友访问立得剑鱼币</span>
             </div>
-            <span class="share_detail">了解详情</span>
+            <span class="share_detail" @click="reviewDetail()">了解详情</span>
         </div>
         <div class="share_channel">
             <div class="share_c_wx share_out" @click="shareClick('1')">
@@ -55,6 +55,11 @@ export default class extends Vue {
         link: this.links.url
       })
     }
+
+    // 了解详情
+    reviewDetail () {
+      location.href = '/page_points_app/share'
+    }
 }
 </script>
 

jydocs-mobile/src/components/docs-card/Card.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="doc-container van-hairline--bottom" @click="clickCard">
-    <div class="docs-card oneline" v-if="cardType === 'oneline'" key="docs-card">
+    <div class="docs-card oneline" :class="highlightKey.length === 0 ? '' : 'highlight'" v-if="cardType === 'oneline'" key="docs-card">
       <div class="docs-header flex-r-c center">
         <van-icon :name="docTypeIcon" />
         <div class="d-title flex van-ellipsis" v-html="hightLightTitle"></div>
         <Price :price="price" />
       </div>
     </div>
-    <div class="docs-card image flex-r-c" v-else-if="cardType === 'image'" key="docs-card">
+    <div class="docs-card image flex-r-c" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else-if="cardType === 'image'" key="docs-card">
       <div class="image-container">
         <img v-lazy="imageSrc" />
         <van-icon class="doc-type-icon" :name="docTypeIcon" />
@@ -32,7 +32,7 @@
         </div>
       </div>
     </div>
-    <div class="docs-card" v-else key="docs-card">
+    <div class="docs-card" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else key="docs-card">
       <div class="docs-header flex-r-c">
         <van-icon :name="docTypeIcon" />
         <div class="d-title flex van-ellipsis" v-html="hightLightTitle"></div>
@@ -129,6 +129,17 @@ export default class DocsCard extends Vue {
     }
   }
 
+  &.highlight {
+    .docs-desc,
+    .d-title {
+      ::v-deep {
+        em {
+          color: $color_main;
+        }
+      }
+    }
+  }
+
   @include diy-icon('pdf');
   @include diy-icon('word');
   @include diy-icon('excel');
@@ -139,9 +150,6 @@ export default class DocsCard extends Vue {
       margin-left: 4px;
       font-size: 16px;
       color: #171826;
-      em {
-        color: $color_main;
-      }
     }
   }
 

jydocs-mobile/src/views/Search.vue

@@ -11,7 +11,7 @@
       >
         <van-tab v-for="(item, index) in docsTypeConf.list" :key="index" :title="item.label" :name="item.type"></van-tab>
       </van-tabs>
-      <div class="sort-list flex-r-c center">
+      <div class="sort-list flex-r-c center" v-if="listState.loaded">
         <div
           class="sort-list-item flex-r-c center flex"
           :class="{
@@ -279,7 +279,14 @@ export default class extends Vue {
 
   calcSubInfo (item: any) {
     const { uploadDate, downTimes } = item
-    return [dateFormatter(uploadDate, 'yyyy/MM/dd'), `${downTimes}次下载`]
+    const subInfoArr = []
+    if (uploadDate !== undefined) {
+      subInfoArr.push(dateFormatter(uploadDate, 'yyyy/MM/dd'))
+    }
+    if (downTimes !== undefined) {
+      subInfoArr.push(`${downTimes}次下载`)
+    }
+    return subInfoArr
   }
 
   setScrollTop () {

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

@@ -178,7 +178,7 @@ export default class extends Vue {
       console.log(res)
       if (res.error_code === 0) {
         sessionStorage.setItem('paydata', JSON.stringify(res.data))
-        this.$router.push('/purchasesuccess/' + this.response.balance)
+        this.$router.push('/purchasesuccess' + this.response.balance)
       }
     })
   }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="docs-card-container" @click="clickCard">
-    <div class="docs-card hover flex-r-c" v-if="cardType === 'oneline'" key="docs-card">
+    <div class="docs-card hover flex-r-c" :class="highlightKey.length === 0 ? '' : 'highlight'" v-if="cardType === 'oneline'" key="docs-card">
       <div class="docs-card-header flex-r-c flex">
         <span class="card-title-icon" :class="docTypeIcon"></span>
         <span class="card-title flex" v-html="hightLightTitle"></span>
@@ -17,7 +17,7 @@
         </slot>
       </div>
     </div>
-    <div class="docs-card hover flex-r-c" v-else-if="cardType === 'image'" key="docs-card">
+    <div class="docs-card hover flex-r-c" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else-if="cardType === 'image'" key="docs-card">
       <div class="image-container">
         <el-image :src="imageSrc" lazy></el-image>
         <span class="doc-type-icon" :class="docTypeIcon"></span>
@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <div class="docs-card hover" v-else key="docs-card">
+    <div class="docs-card hover" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else key="docs-card">
       <div class="docs-card-header flex-r-c left">
         <span class="card-title-icon" :class="docTypeIcon"></span>
         <span class="card-title flex" v-html="hightLightTitle"></span>
@@ -155,6 +155,17 @@ export default {
   border-bottom: 1px solid rgba($color: #000, $alpha: 0.05);
   cursor: pointer;
 
+  &.highlight {
+    .card-desc,
+    .card-title {
+      ::v-deep {
+        em {
+          color: $color-text--highlight;
+        }
+      }
+    }
+  }
+
   @include diy-icon("word");
   @include diy-icon("excel");
   @include diy-icon("ppt");
@@ -168,9 +179,6 @@ export default {
     }
     .card-title {
       line-height: 24px;
-      em {
-        color: $color-text--highlight;
-      }
     }
   }
 

jydocs-pc/src/views/Search.vue

@@ -170,10 +170,11 @@ export default {
     },
     toDocDetail (item) {
       const { docId: id } = item
-      this.$router.push({
-        name: 'content',
-        params: { id }
-      })
+      window.open(`./content/${id}`) // 打开新窗口
+      // this.$router.push({
+      //   name: 'content',
+      //   params: { id }
+      // })
     },
     onPageChange (p) {
       this.listState.pageNum = p