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

jydocs-mobile/src/api/main.ts

@@ -64,9 +64,9 @@ export function getShow (data: any) {
 
 export function getDown (data: any) {
   return $request({
-      url: '/getDown',
-      method: 'post',
-      data: data
+    url: '/getDown',
+    method: 'post',
+    data: data
   })
 }
 

jydocs-mobile/src/components/RechargeHave.vue

@@ -84,7 +84,7 @@ export default class extends Vue {
     }
 
     exchange () {
-      this.$router.push({path: '/purchase', query: {id: this.detailData.docId}})
+      this.$router.push({ path: '/purchase', query: { id: this.detailData.docId } })
     }
 }
 </script>

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

@@ -64,7 +64,7 @@ export default class extends Vue {
   getDetails: any
   getCoin: any
   getShow: any
-  docIds: string = ''
+  docIds = ''
   coins: any = []
   conts: any = []
   getAdd: any

jydocs-pc/src/api/index.js

@@ -1,6 +1,5 @@
 import axios from 'axios'
 import qs from 'qs'
-
 console.log('[debug]当前环境:', process.env)
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API

jydocs-pc/src/api/modules/detail.js

@@ -1,16 +1,13 @@
 import httpRequest from '@/api'
-// import mockRequest from '@/api/mock'
-import service from '@/api/index'
-// import qs from 'qs'
+import mockRequest from '@/api/mock'
 
 let request = httpRequest
 if (process.env.NODE_ENV === 'development' && process.env.VUE_APP_MOCK === 'true') {
   // @ts-ignore
-  request = service
+  request = mockRequest
 }
 
 export function getDetails (data) {
-//   data = qs.stringify(data)
   return request({
     url: '/detail',
     method: 'post',
@@ -28,9 +25,9 @@ export function getShow (data) {
 
 export function getDown (data) {
   return request({
-      url: '/getDown',
-      method: 'post',
-      data: data
+    url: '/getDown',
+    method: 'post',
+    data: data
   })
 }
 

jydocs-pc/src/views/Content.vue

@@ -87,8 +87,6 @@
 
 <script>
 import { Button, Tooltip, Divider, Message } from 'element-ui'
-import Pdfh5 from 'pdfh5'
-import "pdfh5/css/pdfh5.css"
 import { getDetails, getShow, getShare, getDown, getAdverse, getCoin, getAdd, getRemove } from '../api/modules/detail'
 export default {
   components: {
@@ -124,9 +122,6 @@ export default {
     this.setTop()
   },
   mounted () {
-    this.pdfh5 = new Pdfh5("#pdfPage", {
-	  pdfurl: this.conts
-	})
     // 监听滚轮
     window.addEventListener('scroll', this.initHeight)
   },
@@ -233,7 +228,7 @@ export default {
         if (this.coinNum < this.datas.price) {
           window.location.href = '/page_points/recharge?id=' + this.detailData.docId
         } else {
-          this.$router.push({path: '/purchase', query: {id: this.detailData.docId}})
+          this.$router.push({ path: '/purchase', query: { id: this.detailData.docId } })
         }
       }
     },
@@ -283,13 +278,16 @@ export default {
           border-radius: 4px;
           h3 {
               display: flex;
-              align-items: center;
+              flex-direction: initial;
+            //   align-items: center;
               color: #1d1d1d;
               font-weight: 500;
               font-size: 24px;
               line-height: 36px;
               i {
+                  display: inline-flex;
                   margin-right: 8px;
+                  margin-top: 5px;
               }
           }
           .tips {

jydocs-pc/src/views/Home.vue

@@ -121,7 +121,6 @@
 </template>
 
 <script>
-import { ajaxGetTest } from '../api/modules/user'
 import { Button } from 'element-ui'
 import SearchInput from '../components/Search'
 import { getHomeActivity, getHomeHot } from '../api/modules/home'
@@ -241,13 +240,6 @@ export default {
         query: search
       })
     },
-    getTest () {
-      this.fullscreenLoading = true
-      ajaxGetTest().then(res => {
-        console.log(res)
-        this.fullscreenLoading = false
-      })
-    },
     getLoginStatus: function () {
       alert(loginflag)
     }

jydocs-pc/src/views/Keep.vue

@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import { ajaxGetTest } from '../api/modules/user'
 import { Button } from 'element-ui'
 
 export default {
@@ -20,13 +19,6 @@ export default {
     }
   },
   methods: {
-    getTest () {
-      this.fullscreenLoading = true
-      ajaxGetTest().then(res => {
-        console.log(res)
-        this.fullscreenLoading = false
-      })
-    },
     getLoginStatus: function () {
       alert(loginflag)
     }

jydocs-pc/src/views/Mine.vue

@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import { ajaxGetTest } from '../api/modules/user'
 import { Button } from 'element-ui'
 
 export default {
@@ -20,13 +19,6 @@ export default {
     }
   },
   methods: {
-    getTest () {
-      this.fullscreenLoading = true
-      ajaxGetTest().then(res => {
-        console.log(res)
-        this.fullscreenLoading = false
-      })
-    },
     getLoginStatus: function () {
       alert(loginflag)
     }