Merge remote-tracking branch 'origin/master'

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

@@ -68,7 +68,7 @@ export default class extends Vue {
     console.log(paydata)
     if (paydata) {
       paydata = JSON.parse(paydata)
-      this.payinfor.payTime = dateFormatter(paydata.payTime * 1000, 'yyyy-MM-dd HH:mm:ss')
+      this.payinfor.payTime = dateFormatter(paydata.payTime * 1000, 'yyyy-MM-dd')
       this.payinfor.payWay = paydata.payWay
       this.payinfor.code = paydata.code
     }

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

@@ -86,7 +86,6 @@ export default {
       checked: true,
       phoneChecked: true,
       btnChecked: true,
-      query: '',
       tel: '',
       setShow: false,
       response: {
@@ -98,17 +97,24 @@ export default {
         previewImgId: '',
         docSummary: '',
         channel: ''
+      },
+      sessioninfor: {
+        query: '',
+        balance: 0,
+        code: '',
+        payTime: '',
+        payWay: ""
       }
     }
   },
   created () {
-    this.query = location.href.split('/')[location.href.split('/').length - 1] // 获取id
+    this.sessioninfor.query = location.href.split('/')[location.href.split('/').length - 1] // 获取id
     this.getWordDetail()
   },
   methods: {
     // 文档信息
     async getWordDetail () {
-      getDetails({ docId: this.query, phone: this.tel }).then((res) => {
+      getDetails({ docId: this.sessioninfor.query, phone: this.tel }).then((res) => {
         console.log(res.data.data)
         if (res.data.data.error_msg !== '') {
           const item = res.data.data.detail
@@ -136,10 +142,14 @@ export default {
     },
     // 确定兑换
     setExhange () {
-      getDocPays({ docId: this.query, phone: this.tel }).then((res) => {
+      getDocPays({ docId: this.sessioninfor.query, phone: this.tel }).then((res) => {
         console.log(res)
         if (res.data.error_code === 0) {
-          sessionStorage.setItem('paydata', JSON.stringify(res.data))
+          this.sessioninfor.balance = res.data.balance
+          this.sessioninfor.code = res.data.code
+          this.sessioninfor.payTime = res.data.payTime
+          this.sessioninfor.payWay = res.data.payWay
+          sessionStorage.setItem('paydata', JSON.stringify(this.sessioninfor))
           this.$router.push('/purchasesuccess/' + this.response.price)
         }
       })

jydocs-pc/src/views/purchase/purchasesuccess.vue

@@ -33,7 +33,7 @@
             </li>
           </ul>
           <div class="now_download">
-            <button class="n_download_btn" id="n_download_btn">立即下载</button>
+            <button class="n_download_btn" id="n_download_btn" @click="runDownLoad()">立即下载</button>
           </div>
         </div>
       </div>
@@ -44,6 +44,7 @@
 <script>
 import { dateFormatter } from '../../utils/globalFunctions'
 import { checkbox } from 'element-ui'
+import { getDown } from '../../api/modules/detail'
 
 export default {
   name: 'purchasePage',
@@ -55,6 +56,7 @@ export default {
       checked: true,
       query: '',
       payinfor: {
+        docId: '',
         payTime: '',
         payWay: '',
         code: '',
@@ -72,11 +74,19 @@ export default {
       if (paydata) {
         paydata = JSON.parse(paydata)
         console.log(paydata)
-        this.payinfor.payTime = dateFormatter(paydata.data.payTime * 1000, 'yyyy-MM-dd HH:mm:ss')
-        this.payinfor.payWay = paydata.data.payWay
-        this.payinfor.code = paydata.data.code
-        this.payinfor.balance = paydata.data.balance
+        this.payinfor.docId = paydata.query
+        this.payinfor.payTime = dateFormatter(paydata.payTime * 1000, 'yyyy-MM-dd')
+        this.payinfor.payWay = paydata.payWay
+        this.payinfor.code = paydata.code
+        this.payinfor.balance = paydata.balance
       }
+    },
+    runDownLoad () {
+      getDown({ docId: this.payinfor.docIds }).then(res => {
+        if (res.data.error_code === 0) {
+          window.location.href = res.data.data
+        }
+      })
     }
   }
 }