Merge branch 'test'

9d01a1e1 · zw · 52ff464a · abae6107 · 9d01a1e1 · 9d01a1e1
Commit 9d01a1e1 authored Mar 20, 2019 by zw
5 changed files
--- a/public/app/dist/index.html
+++ b/public/app/dist/index.html
@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><link href=./static/css/app.54541c055ae1c7d7d44b9d68247b2596.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.134f726fb701517042ba.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><link href=./static/css/app.9484d58794268174400945428257aad0.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.699733b35fef18da5ecb.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.54541c055ae1c7d7d44b9d68247b2596.css
+++ b/public/app/dist/static/css/app.54541c055ae1c7d7d44b9d68247b2596.css
--- a/public/app/dist/static/js/app.134f726fb701517042ba.js
+++ b/public/app/dist/static/js/app.134f726fb701517042ba.js
--- a/public/app/dist/static/js/app.699733b35fef18da5ecb.js
+++ b/public/app/dist/static/js/app.699733b35fef18da5ecb.js
--- a/public/appnew/src/components/priceReport/priceReport.vue
+++ b/public/appnew/src/components/priceReport/priceReport.vue
@@ -221,6 +221,7 @@
 					'store_id': that.urlParams.store_id,
 					'is_store': that.urlParams.is_store,
 					'daily_data': that.time
+
 				};
 				that.axios({
 					method: 'get',
@@ -294,19 +295,23 @@
 			//生成中介费数组数据
 			initAgencyList : function(list){
 				let that = this  ; 
+				if(list[0]){
 					if(list[0].type_ext == 0){//由中介费类型 判断类型
                	that.typeExtLiu0 = 0.7;
                	that.receivedMoneyLiu0 = list[0].received_money*1;
                    };
+				};
+                if(list[1]){
                	if(list[1].type_ext == 0){
                	that.typeExtLiu1 = 0.7;
                	that.receivedMoneyLiu1 = list[1].received_money*1;
-                	
                   };
+                };
+                if(list[2]){
                	if(list[2].type_ext == 0){
                	that.typeExtLiu2 = 0.7;
                	that.receivedMoneyLiu2 = list[2].received_money*1
-                	
+                  };
                };

 				var listArray = [{