waynexu17 6 年 前
コミット
4e29a2a929
4 ファイル変更10282 行追加5 行削除
  1. 10261 0
      package-lock.json
  2. 1 0
      package.json
  3. 15 5
      pages/wo/coin.vue
  4. 5 0
      yarn.lock

ファイルの差分が大きいため隠しています
+ 10261 - 0
package-lock.json


+ 1 - 0
package.json

@@ -21,6 +21,7 @@
     "hljs": "^6.2.3",
     "jquery": "^3.4.1",
     "mint-ui": "^2.2.13",
+    "moment": "^2.24.0",
     "node-sass": "^4.12.0",
     "nuxt": "^2.6.3",
     "qs": "^6.7.0",

+ 15 - 5
pages/wo/coin.vue

@@ -51,10 +51,16 @@
                 </tr>
               </thead>
               <tbody id="J_Logs">
-                <tr>
-                  <td>整包协作开发者认证费用,订单名称最多输入25个字呀</td>
-                  <td>+99.00</td>
-                  <td>余额支付</td>
+                <tr v-for="item in orderList" :key="item.id">
+                  <td>{{item.product_title}}</td>
+                  <td>{{Number(item.price) ? '+' + item.price : item.price}}</td>
+                  <td v-if="item.channel === 'alipay'">支付宝支付</td>
+                  <td v-else-if="item.wxpay === 'balance'">微信支付</td>
+                  <td v-else-if="item.channel === 'balance'">余额支付</td>
+                  <td v-else-if="item.gongmall === 'balance'">工猫支付</td>
+                  <td v-else-if="item.bank === 'balance'">银行支付</td>
+                  <td v-else-if="item.admin_confirm === 'balance'">人工支付</td>
+                  <td v-else-if="item.apple_pay === 'balance'">苹果支付</td>
                   <td>2019-08-23 13:00</td>
                   <td>默认最多显示十个字</td>
                 </tr>
@@ -72,6 +78,7 @@
 export default {
   data() {
     return {
+      page: 1,
       orderList: []
     }
   },
@@ -80,7 +87,10 @@ export default {
   },
   methods: {
     async getOrders() {
-      let res = await this.$axios.$post('/api/account/get_orders')
+      let res = await this.$axios.$post('/api/account/get_orders', {
+        page: this.page,
+        page_size: 15,
+      })
       console.log(res)
       if(res) {
         this.orderList = res.data

+ 5 - 0
yarn.lock

@@ -4890,6 +4890,11 @@ mixin-object@^2.0.1:
   dependencies:
     minimist "0.0.8"
 
+moment@^2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"