wayne преди 6 години
родител
ревизия
3c307cecbf
променени са 2 файла, в които са добавени 36 реда и са изтрити 5 реда
  1. 1 1
      package.json
  2. 35 4
      pages/wo/coin.vue

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
     "cross-env": "^5.2.0",
     "css-loader": "^2.1.1",
     "dayjs": "^1.8.15",
-    "element-ui": "^2.4.11",
+    "element-ui": "^2.12.0",
     "hljs": "^6.2.3",
     "jquery": "^3.4.1",
     "mint-ui": "^2.2.13",

+ 35 - 4
pages/wo/coin.vue

@@ -52,7 +52,22 @@
               </thead>
               <tbody id="J_Logs">
                 <tr v-for="item in orderList" :key="item.id">
-                  <td>{{item.product_title}}</td>
+                  <td>{{item.product_title}} 
+                    <span class="order-state" v-if="item.status === '0'">订单创建</span>
+                    <span class="order-state" v-else-if="item.status === '100'">待审核</span>
+                    <span class="order-state" v-else-if="item.status === '101'">审核中</span>
+                    <span class="order-state" v-else-if="item.status === '102'">订单审核成功</span>
+                    <span class="order-state" v-else-if="item.status === '200'">订单开始处理</span>
+                    <span class="order-state" v-else-if="item.status === '201'">订单处理中</span>
+                    <span class="order-state" v-else-if="item.status === '202'">订单已处理</span>
+                    <span class="order-state" v-else-if="item.status === '300'">订单成功</span>
+                    <span class="order-state" v-else-if="item.status === '301'">订单部分退款</span>
+                    <span class="order-state" v-else-if="item.status === '302'">订单已失败</span>
+                    <span class="order-state" v-else-if="item.status === '303'">订单全额退款</span>
+                    <span class="order-state" v-else-if="item.status === '400'">订单支付中</span>
+                    <span class="order-state" v-else-if="item.status === '401'">订单支付成功</span>
+                    <span class="order-state" v-else-if="item.status === '402'">订单支付失败</span>
+                  </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>
@@ -61,20 +76,23 @@
                   <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>
+                  <td>{{timeFormat(item.created_at)}}</td>
+                  <td class="public-comment" :title="item.public_comment">{{item.public_comment.length > 10 ? item.public_comment.substring(0, 8) + '..' : item.public_comment}}</td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="loading J_Loading" style="display: none;">加载中...</div>
+        <el-pagination background layout="prev, pager, next" :total="1000" @current-change="handleCurrentChange"></el-pagination>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import { Pagination } from 'element-ui'
+import moment from 'moment'
+
 export default {
   data() {
     return {
@@ -95,6 +113,13 @@ export default {
       if(res) {
         this.orderList = res.data
       }
+    },
+    timeFormat (el) {
+      return moment.unix(el).format('YYYY-MM-DD hh:mm')
+    },
+    handleCurrentChange(val) {
+      this.page = val
+      this.getOrders()
     }
   },
 }
@@ -651,4 +676,10 @@ body {
   font-family: tahoma, Helvetica, Arial, "Hiragino Sans GB", "Microsoft Yahei",
     "\5FAE\8F6F\96C5\9ED1", "\5b8b\4f53", sans-serif;
 }
+
+.order-state {
+  display: inline-block;
+  padding: 2px;
+  border: 1px solid #000000;
+}
 </style>