Ver código fonte

管理后台:支付方式新增

panyong 3 anos atrás
pai
commit
3310d46be1

+ 1 - 1
htmldev/dashboard/src/mixin/orderPay.js

@@ -4,7 +4,7 @@ import { platform } from '../utils/platform'
 export default {
 export default {
   data () {
   data () {
     return {
     return {
-      order_pay_type: 2 // 支付方式(1微信2支付宝)
+      order_pay_type: 2 // 支付方式(1微信2支付宝3现场支付4美团支付5赠送)
     }
     }
   },
   },
   methods: {
   methods: {

+ 1 - 1
htmldev/dashboard/src/views/common/payment/index.vue

@@ -46,7 +46,7 @@ export default {
   name: 'index',
   name: 'index',
   data () {
   data () {
     return {
     return {
-      order_pay_type: 2 // 支付方式(1微信2支付宝)
+      order_pay_type: 2 // 支付方式(1微信2支付宝3现场支付4美团支付5赠送)
     }
     }
   },
   },
   created () {
   created () {

BIN
htmldev/dashboard/src/views/order/list/image/icon-meituan.png


BIN
htmldev/dashboard/src/views/order/list/image/icon-zengsong.png


+ 12 - 2
htmldev/dashboard/src/views/order/list/index.vue

@@ -24,9 +24,9 @@
         <div class="content">
         <div class="content">
           <p class="amount">¥{{ item.order_price | fen2Yuan }}</p>
           <p class="amount">¥{{ item.order_price | fen2Yuan }}</p>
           <p class="time">下单时间:{{ item.created_at }}</p>
           <p class="time">下单时间:{{ item.created_at }}</p>
-          <!--order_pay_type: 支付方式(1微信2支付宝3POS机支付)-->
+          <!--order_pay_type: 1微信2支付宝3现场支付4美团支付5赠送-->
           <i
           <i
-            :class="'icon-' + ['', 'wx', 'alipay', 'pos'][item.order_pay_type]"
+            :class="'icon-' + ['', 'wx', 'alipay', 'pos', 'meituan', 'zengsong'][item.order_pay_type]"
             class="icon"></i>
             class="icon"></i>
           <div class="btn-box">
           <div class="btn-box">
             <div
             <div
@@ -233,6 +233,16 @@ export default {
       background-size: cover;
       background-size: cover;
     }
     }
 
 
+    .icon-meituan {
+      background: url("./image/icon-meituan.png") 0 0 no-repeat;
+      background-size: cover;
+    }
+
+    .icon-zengsong {
+      background: url("./image/icon-zengsong.png") 0 0 no-repeat;
+      background-size: cover;
+    }
+
     .amount {
     .amount {
       font-size: 24px;
       font-size: 24px;
       font-weight: 500;
       font-weight: 500;

+ 2 - 1
htmldev/dashboard/src/views/orderDetail/index.vue

@@ -24,7 +24,8 @@
       <div class="row"><span class="label">桌号:</span><span class="value-1">{{place_number}}</span></div>
       <div class="row"><span class="label">桌号:</span><span class="value-1">{{place_number}}</span></div>
       <div class="row"><span class="label">创建时间:</span><span class="value">{{created_at}}</span></div>
       <div class="row"><span class="label">创建时间:</span><span class="value">{{created_at}}</span></div>
       <div class="row"><span class="label">支付时间:</span><span class="value">{{order_pay_time}}</span></div>
       <div class="row"><span class="label">支付时间:</span><span class="value">{{order_pay_time}}</span></div>
-      <div class="row"><span class="label">支付方式:</span><span class="value">{{order_pay_type == 1 ? '微信' : '支付宝'}}</span>
+      <div class="row"><span class="label">支付方式:</span><span
+        class="value">{{ ['', '微信', '支付宝', '现场支付', '美团支付', '赠送'][order_pay_type] }}</span>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>

+ 1 - 1
htmldev/dashboard/src/views/sell/pay/index.vue

@@ -302,7 +302,7 @@ export default {
         place_number: this.placeNum, // 桌号
         place_number: this.placeNum, // 桌号
         order_prepare_id: this.curAdvance.id || 0, // 预约订单款ID(0代表无预约款)
         order_prepare_id: this.curAdvance.id || 0, // 预约订单款ID(0代表无预约款)
         coupon_id: this.curCoupon.id || 0, // 优惠券ID(0代表无优惠券)
         coupon_id: this.curCoupon.id || 0, // 优惠券ID(0代表无优惠券)
-        order_pay_type: this.order_pay_type // 支付方式(1微信2支付宝3现场支付)
+        order_pay_type: this.order_pay_type // 支付方式(1微信2支付宝3现场支付4美团支付5赠送)
       }
       }
       try {
       try {
         this.booLock = true
         this.booLock = true