panyong 3 rokov pred
rodič
commit
4abd76e437

+ 6 - 3
htmldev/cps/src/App.vue

@@ -27,9 +27,12 @@ export default {
     }
   },
   async created () {
-    platform.isWeixin && WxConfig()
-    this.$store.dispatch('common/getUserInfo')
-    this.$store.dispatch('common/getOrdertype')
+    const { name } = this.$route
+    if (name !== 'PaymentCode') {
+      platform.isWeixin && WxConfig()
+      this.$store.dispatch('common/getUserInfo')
+      this.$store.dispatch('common/getOrdertype')
+    }
   }
 }
 </script>

+ 1 - 1
htmldev/cps/src/api/request.js

@@ -53,7 +53,7 @@ request.interceptors.request.use(request => {
 
   // 因为微信开发者工具重复授权,本地开发时写死
   if (/^(0|192|10|localhost)/.test(domain)) {
-    request.headers.wechatToken = '059c8aecf908987667c5d34977d36bce'
+    request.headers.wechatToken = '9ad12f0a41c02d49516dd14d22fc8fdc'
   } else {
     request.headers.wechatToken = getCookieValue('fanbutingwechatToken')
   }

+ 1 - 2
htmldev/cps/src/views/bill/child/main.vue

@@ -18,12 +18,11 @@
             class="van-loading__text">下拉刷新</span>
         </div>
       </li>
-      <!--TODO 流水ID-->
       <li
         v-for="(item, index) in list"
         :key="index"
         class="list-item border-bottom-1px"
-        @click="$emit('fetchBillDetail', item.finance_number)">
+        @click="$emit('fetchBillDetail', item.id)">
         <div class="wrap">
           <p class="label">{{ ['', '收入', '支出'][item.finance_type] }}金额</p>
           <p class="money">{{ item.finance_type === 1 ? '+' : '-' }}¥{{ item.finance_balance | fen2Yuan }}</p>

+ 3 - 3
htmldev/cps/src/views/bill/index.vue

@@ -44,7 +44,7 @@
         </p>
         <p>
           <span class="label">订单号:</span>
-          <span class="value">todo</span>
+          <span class="value">{{ objBillDetail.order_number }}</span>
         </p>
         <p>
           <span class="label">交易单号:</span>
@@ -54,7 +54,7 @@
           <span class="label">备注:</span>
           <span class="value">{{ objBillDetail.finance_remark }}</span>
         </p>
-        <p class="amont">+¥{{ objBillDetail.finance_balance }}</p>
+        <p class="amont">+¥{{ objBillDetail.finance_balance | fen2Yuan }}</p>
       </div>
     </van-popup>
   </div>
@@ -98,7 +98,7 @@ export default {
     async fetchBillDetail (id) {
       try {
         this.showDetail = true
-        const { status, data, msg } = apiBillDetail(id)
+        const { status, data, msg } = await apiBillDetail(id)
         if (status) {
           this.objBillDetail = data
         } else {