Home Explore Help
Sign In
jianyu
/
qmx_page_admin
12
0
Fork 0
Files Issues 0 Pull Requests 1 Wiki
Browse Source

Merge branch 'master' into dev2.3.9

lianbingjie 3 years ago
parent
cf7cf3e5d7 a44ebc8b10
commit
d3eac4ea28
9 changed files with 7 additions and 4 deletions
Split View Show Diff Stats
  1. 0 0
      qmx_page/css/app.3b01b274.css
  2. 0 0
      qmx_page/css/chunk-vendors.e08ff48e.css
  3. 1 1
      qmx_page/index.html
  4. 0 0
      qmx_page/js/app.1266f2ba.js
  5. 0 0
      qmx_page/js/app.cfae53ce.js
  6. 0 0
      qmx_page/js/chunk-vendors.2d3a05ef.js
  7. 0 0
      qmx_page/js/chunk-vendors.dbdfae2e.js
  8. 5 2
      src/views/order/components/details.vue
  9. 1 1
      src/views/order/orderList.vue

File diff suppressed because it is too large
+ 0 - 0
qmx_page/css/app.3b01b274.css


File diff suppressed because it is too large
+ 0 - 0
qmx_page/css/chunk-vendors.e08ff48e.css


+ 1 - 1
qmx_page/index.html
View File 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.c48f5fe2.css rel=preload as=style><link href=/css/chunk-vendors.146ef057.css rel=preload as=style><link href=/js/app.cfae53ce.js rel=preload as=script><link href=/js/chunk-vendors.dbdfae2e.js rel=preload as=script><link href=/css/chunk-vendors.146ef057.css rel=stylesheet><link href=/css/app.c48f5fe2.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.dbdfae2e.js></script><script src=/js/app.cfae53ce.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.3b01b274.css rel=preload as=style><link href=/css/chunk-vendors.e08ff48e.css rel=preload as=style><link href=/js/app.1266f2ba.js rel=preload as=script><link href=/js/chunk-vendors.2d3a05ef.js rel=preload as=script><link href=/css/chunk-vendors.e08ff48e.css rel=stylesheet><link href=/css/app.3b01b274.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.2d3a05ef.js></script><script src=/js/app.1266f2ba.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
qmx_page/js/app.1266f2ba.js


File diff suppressed because it is too large
+ 0 - 0
qmx_page/js/app.cfae53ce.js


File diff suppressed because it is too large
+ 0 - 0
qmx_page/js/chunk-vendors.2d3a05ef.js


File diff suppressed because it is too large
+ 0 - 0
qmx_page/js/chunk-vendors.dbdfae2e.js


+ 5 - 2
src/views/order/components/details.vue
View File 

@@ -25,7 +25,10 @@
 
                         <Button class="i-btn" type="primary" @click="inptSave" v-if="isSales">保存</Button>
 
                         <Button class="i-btn" type="primary" @click="inptBtn" v-else>编辑</Button>
 
                     </span>
 
-                    <span>
 
+                    <span v-if="orDetails.order_channel_new == '微信小商店'">
 
+                        <p>业绩统计时间：</p>--
 
+                    </span>
 
+                    <span v-else>
 
                         <p>业绩统计时间：</p>
 
                         <date-sigle 
                             ref="sigleRef3" 
@@ -362,7 +365,7 @@
 
                     <span><p>支付单号：</p><i v-if="orders">{{orders.transaction_id?orders.transaction_id:'--'}}</i></span>
 
                     <span><p>支付时间：</p><i v-if="orDetails">{{orDetails.pay_time?orDetails.pay_time:'--'}}</i></span>
 
                     <span><p>支付方式：</p><i v-if="orDetails">{{orDetails.pay_way?orDetails.pay_way:'--'}}</i></span>
 
-                    <span v-if="orderType == 7||orderType == 9||orderType == 10"><p>订单金额：</p>
 
+                    <span v-if="orderType == 0||orderType == 7||orderType == 9||orderType == 10"><p>订单金额：</p>
 
                         <i v-if="orDetails">{{orDetails.order_money?localed(orDetails.order_money):localed(0.00)}}</i>
 
                     </span>
 
                     <span v-if="orderType == 1"><p>实付数量：</p>

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

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

Some files were not shown because too many files changed in this diff