xgwangman 4 years ago
parent
commit
ce9897ae89
3 changed files with 17 additions and 13 deletions
  1. 1 1
      jydocs-pc/.env.alone
  2. 12 8
      jydocs-pc/src/views/Content.vue
  3. 4 4
      jydocs-pc/vue.config.js

+ 1 - 1
jydocs-pc/.env.alone

@@ -1,6 +1,6 @@
 NODE_ENV=development
 VUE_APP_BASE_API='/jydocs/'
 VUE_APP_BASE_URL='/'
-VUE_APP_MOCK=true
+VUE_APP_MOCK=false
 VUE_APP_ALONE=true
 VUE_APP_BASE_PUBLIC='/'

+ 12 - 8
jydocs-pc/src/views/Content.vue

@@ -18,8 +18,8 @@
                   <div class="coin"><i class="el-icon-jy-iconJianYu"></i><span>{{datas.price}}</span></div>
               </div>
               <div class="buyed" v-if="buyed == 1">您已兑换过该文档,可直接下载</div>
-              <div class="buyed no-buyed" v-else-if="datas.price > coinNum && buyed == 0">剑鱼币余额不足,现有 {{coinNum}} 剑鱼币,还需 {{datas.price - coinNum}} 剑鱼币,请先充值</div>
-              <el-divider class="heng-line" v-else></el-divider>
+              <div class="buyed no-buyed" v-if="redShow">剑鱼币余额不足,现有 {{coinNum}} 剑鱼币,还需 {{datas.price - coinNum}} 剑鱼币,请先充值</div>
+              <el-divider class="heng-line" v-if="lineShow"></el-divider>
               <div class="load-doc">
                   <el-button type="primary" @click="loadFile">{{btnName}}</el-button>
                   <div class="icons">
@@ -30,7 +30,7 @@
                               <p style="color: #686868;font-size: 14px;text-align:center;">微信扫码分享</p>
                           </div>
                       </el-tooltip>
-                      <span class="spa1 spa2" @click="shoucang"><i :class="collectd==1?'el-icon-jy-guanzhu':'el-icon-jy-weiguanzhu'"></i>收藏</span>
+                      <span class="spa1 spa2" @click="shoucang"><i :class="collectd==1?'el-icon-jy-guanzhu':'el-icon-jy-weiguanzhu'"></i>{{collectd==1?'已收藏':'收藏'}}</span>
                       <el-tooltip content="如果您发现此内容有侵权行为,请联系客服400-108-6670进行投诉" placement="top" effect="dark">
                           <span class="spa1"><i class="el-icon-jy-jubao"></i>投诉举报</span>
                       </el-tooltip>
@@ -63,7 +63,7 @@
                                   <p style="color: #686868;font-size: 14px;text-align:center;">微信扫码分享</p>
                               </div>
                           </el-tooltip>
-                          <span class="spa1 spa2" @click="shoucang"><i :class="collectd==1?'el-icon-jy-guanzhu':'el-icon-jy-weiguanzhu'"></i>收藏</span>
+                          <span class="spa1 spa2" @click="shoucang"><i :class="collectd==1?'el-icon-jy-guanzhu':'el-icon-jy-weiguanzhu'"></i>{{collectd==1?'已收藏':'收藏'}}</span>
                           <el-tooltip content="如果您发现此内容有侵权行为,请联系客服400-108-6670进行投诉" placement="top" effect="dark">
                               <span class="spa1"><i class="el-icon-jy-jubao"></i>投诉举报</span>
                           </el-tooltip>
@@ -110,6 +110,8 @@ export default {
       offsetTop: 0,
       offsetWidth: 0,
       colWidth: 0,
+      redShow: false,
+      lineShow: false,
       fixed: false,
       pdfh5: null,
       pdfDocument: null,
@@ -217,14 +219,17 @@ export default {
       getCoin({ B: true }).then(res => {
         if (res.data.error_code === 0) {
           this.coinNum = res.data.data.points.balance
-          console.log(this.buyed)
           if (this.buyed === 1) {
             this.btnName = '下载文档'
+            this.lineShow = false
           } else {
             if (this.coinNum < this.datas.price) {
               this.btnName = '立即充值'
+              this.redShow = true
             } else {
               this.btnName = '立即兑换'
+              this.redShow = false
+              this.lineShow = true
             }
           }
         }
@@ -235,11 +240,10 @@ export default {
         if (res.data.error_code === 0) {
           this.datas = res.data.data.detail
           this.datas.docFileSize = formatSize(this.datas.docFileSize)
-          this.datas.uploadDate = dateFormatter(this.datas.uploadDate, 'yyyy-MM-ss')
+          this.datas.uploadDate = dateFormatter(this.datas.uploadDate, 'yyyy-MM-dd')
           this.datas.docSummary = this.datas.docSummary.split('').length >= 500 ? this.datas.docSummary + '...' : this.datas.docSummary
           this.datas.tags = this.datas.tags.split(',')
           this.buyed = res.data.data.status
-          console.log(res.data.data.status)
           this.coined()
           if (res.data.data.status === 1) {
             this.buyShow()
@@ -412,7 +416,7 @@ export default {
               color: #2CB7CA;
               background: rgba(44,183,202,0.05);
               font-size: 12px;
-              line-height: 20px;
+              line-height: 24px;
               text-align: center;
               border-radius: 4px;
               margin: 10px 0 8px 0;

+ 4 - 4
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: {
@@ -18,8 +18,8 @@ module.exports = {
         }
       },
       '^/jyintegral': {
-        // target: 'http://web2-jytest.jydev.jianyu360.com',
-        target: 'http://192.168.20.145:820',
+        target: 'http://web2-jytest.jydev.jianyu360.com',
+        // target: 'http://192.168.20.145:820',
         changeOrigin: true,
         logLevel: 'debug',
         pathRewrite: {