浏览代码

Merge branch 'dev/v2.4.41.2_wmh' of jianyu/qmx_page_admin into hotfix/v2.4.41.2

wenmenghao 8 月之前
父节点
当前提交
906326597a
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      src/views/order/components/details.vue
  2. 1 1
      src/views/order/myOrderList.vue
  3. 1 1
      src/views/order/orderList.vue

+ 1 - 1
src/views/order/components/details.vue

@@ -1565,7 +1565,7 @@ export default {
             return val.toLocaleString('zh', { style: 'currency', currency: 'CNY' })
             return val.toLocaleString('zh', { style: 'currency', currency: 'CNY' })
         },
         },
         getRealmoney(r,f){
         getRealmoney(r,f){
-            if (f.source == 'qmx' || this.orderType == '0') {
+            if (f.source == 'qmx' || this.orderType == '0' || r.is_backstage_order == '1') {
               return r.pay_money / 100
               return r.pay_money / 100
             } else {
             } else {
               return r.order_money
               return r.order_money

+ 1 - 1
src/views/order/myOrderList.vue

@@ -744,7 +744,7 @@ export default {
                     align: 'center',
                     align: 'center',
                     render: (h, { row }) => {
                     render: (h, { row }) => {
                         const lines = JSON.parse(row.filter)
                         const lines = JSON.parse(row.filter)
-                        if (lines.source == 'qmx' || row.product_type == '中标必听课') {
+                        if (lines.source == 'qmx' || row.product_type == '中标必听课' || row.is_backstage_order == '1') {
                             return h('span', row.pay_money ? this.localed(row.pay_money / 100) : this.localed(0))
                             return h('span', row.pay_money ? this.localed(row.pay_money / 100) : this.localed(0))
                         } else {
                         } else {
                             return h('span', row.order_money ? this.localed(row.order_money / 100) : this.localed(0))
                             return h('span', row.order_money ? this.localed(row.order_money / 100) : this.localed(0))

+ 1 - 1
src/views/order/orderList.vue

@@ -558,7 +558,7 @@ export default {
           align: 'center',
           align: 'center',
           render: (h, {row}) => {
           render: (h, {row}) => {
             const lines = JSON.parse(row.filter)
             const lines = JSON.parse(row.filter)
-            if (lines.source == 'qmx' || row.product_type == '中标必听课') {
+            if (lines.source == 'qmx' || row.product_type == '中标必听课' || row.is_backstage_order == '1') {
               return h('span', row.pay_money ? this.localed(row.pay_money / 100) : this.localed(0))
               return h('span', row.pay_money ? this.localed(row.pay_money / 100) : this.localed(0))
             } else {
             } else {
               return h('span', row.order_money ? this.localed(row.order_money / 100) : this.localed(0))
               return h('span', row.order_money ? this.localed(row.order_money / 100) : this.localed(0))