9 months ago · cde04b22f0
--- a/config/index.js
+++ b/config/index.js
@@ -3,8 +3,8 @@
 
				 // see http://vuejs-templates.github.io/webpack for documentation.
			
 
				 
			
 
				 const path = require('path')
			
 
				-const proxyUrl = 'https://dev.dayaedu.com'
			
 
				-// const proxyUrl = 'https://test.dayaedu.com'
			
 
				+// const proxyUrl = 'https://dev.dayaedu.com'
			
 
				+const proxyUrl = 'https://test.dayaedu.com'
			
 
				 
			
 
				 module.exports = {
			
 
				   dev: {
			
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,4 +7,4 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.b6c4e846792de267555969877cfc9ba9.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.290448dcd62c50620b1f.js></script><script type=text/javascript src=./static/js/vendor.e1f19ba9387f34e746e9.js></script><script type=text/javascript src=./static/js/app.5f9cbea6ffaa1dd62f7e.js></script></body></html>
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.0864106bf42e9f805f412e27850ee0e4.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.da1a814f2373921b6c3d.js></script><script type=text/javascript src=./static/js/vendor.e1f19ba9387f34e746e9.js></script><script type=text/javascript src=./static/js/app.5f9cbea6ffaa1dd62f7e.js></script></body></html>
			
--- a/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css
+++ b/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css
--- a/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css.map
+++ b/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css.map
--- a/dist/static/js/6.6f086bc156fc6b9872d0.js
+++ b/dist/static/js/6.6f086bc156fc6b9872d0.js
--- a/dist/static/js/6.6f086bc156fc6b9872d0.js.map
+++ b/dist/static/js/6.6f086bc156fc6b9872d0.js.map
--- a/dist/static/js/6.7018ce17571e7972ff02.js
+++ b/dist/static/js/6.7018ce17571e7972ff02.js
--- a/dist/static/js/6.7018ce17571e7972ff02.js.map
+++ b/dist/static/js/6.7018ce17571e7972ff02.js.map
--- a/dist/static/js/manifest.da1a814f2373921b6c3d.js
+++ b/dist/static/js/manifest.da1a814f2373921b6c3d.js
--- a/dist/static/js/manifest.da1a814f2373921b6c3d.js.map
+++ b/dist/static/js/manifest.da1a814f2373921b6c3d.js.map
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -170,9 +170,14 @@
 
				           <template slot-scope="scope">￥{{ scope.row.totalAmount }}</template>
			
 
				         </el-table-column>
			
 
				         <el-table-column label="支付方式" width="120" align="center">
			
 
				-          <template slot-scope="scope">{{
			
 
				+          <template slot-scope="scope">
			
 
				+          <span v-if="scope.row.sourceType != 2 && scope.row.sourceType != 3  && scope.row.sourceType != 4 ">
			
 
				+            {{
			
 
				             scope.row.payType | formatPayType
			
 
				-          }}</template>
			
 
				+          }}
			
 
				+          </span>
			
 
				+          <span v-else>-</span>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column label="订单来源" width="120" align="center">
			
 
				           <template slot-scope="scope">{{