Merge branch '0813-v3.3.7' of https://gitee.com/zwyjjc/tl_estate into 0813-v3.3.7

be262f41 · clone · d643ab73 · 4c96f67a · be262f41 · be262f41
Commit be262f41 authored Aug 22, 2019 by clone
33 changed files
--- a/application/index/controller/CostParameter.php
+++ b/application/index/controller/CostParameter.php
@@ -640,7 +640,6 @@ class CostParameter extends Basic
            $field = 'a.id,a.store_name';
            $store_data_res = $this->m_store->getStoreCostParameter($field, $f_params);
-            big_log($store_data_res);
            if (!$store_data_res) {
                if(!$v['store_id'])
                    continue;

--- 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.735e381f1c78bf0e412af4de3e077e57.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.e7cc7b16dfb54c1cefae.js></script><script type=text/javascript src=./static/js/app.3a570729f77710e7ae46.js></script></body></html>
+			})(document, window);</script><link href=./static/css/app.980fef8e836aed3bb723a12a84f9488f.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.e7cc7b16dfb54c1cefae.js></script><script type=text/javascript src=./static/js/app.d0d67a1bd5d4664fe818.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.11090a898b5368015eb17b61062bc4ed.css
+++ b/public/app/dist/static/css/app.11090a898b5368015eb17b61062bc4ed.css
--- a/public/app/dist/static/css/app.2de187d205b256a43fe1eaef7f96e1a4.css
+++ b/public/app/dist/static/css/app.2de187d205b256a43fe1eaef7f96e1a4.css
--- a/public/app/dist/static/css/app.2e04ae265dac36dde446e3199c0b39ad.css
+++ b/public/app/dist/static/css/app.2e04ae265dac36dde446e3199c0b39ad.css
--- a/public/app/dist/static/css/app.43a7e9e976452e18dc745c777136e8e7.css
+++ b/public/app/dist/static/css/app.43a7e9e976452e18dc745c777136e8e7.css
--- a/public/app/dist/static/css/app.4609d62f458951e079b5d3c1e6284092.css
+++ b/public/app/dist/static/css/app.4609d62f458951e079b5d3c1e6284092.css
--- a/public/app/dist/static/css/app.46bf201a6eed25a5cf96751d75ee9efa.css
+++ b/public/app/dist/static/css/app.46bf201a6eed25a5cf96751d75ee9efa.css
--- a/public/app/dist/static/css/app.5cb5715b436b82370afc5d1213d58af9.css
+++ b/public/app/dist/static/css/app.5cb5715b436b82370afc5d1213d58af9.css
--- a/public/app/dist/static/css/app.83e0f5257c1da57e0abc11b96352ea93.css
+++ b/public/app/dist/static/css/app.83e0f5257c1da57e0abc11b96352ea93.css
--- a/public/app/dist/static/css/app.90561ba687a7cd63519c75aeb7bb5580.css
+++ b/public/app/dist/static/css/app.90561ba687a7cd63519c75aeb7bb5580.css
--- a/public/app/dist/static/css/app.980fef8e836aed3bb723a12a84f9488f.css
+++ b/public/app/dist/static/css/app.980fef8e836aed3bb723a12a84f9488f.css
--- a/public/app/dist/static/css/app.a4f37ae85b322bc70cdb5b7db589b41b.css
+++ b/public/app/dist/static/css/app.a4f37ae85b322bc70cdb5b7db589b41b.css
--- a/public/app/dist/static/js/app.27b9c10dbdcef6cdc133.js
+++ b/public/app/dist/static/js/app.27b9c10dbdcef6cdc133.js
--- a/public/app/dist/static/js/app.3f033b9952133a8bf759.js
+++ b/public/app/dist/static/js/app.3f033b9952133a8bf759.js
--- a/public/app/dist/static/js/app.431f7a3c4d41da77deac.js
+++ b/public/app/dist/static/js/app.431f7a3c4d41da77deac.js
--- a/public/app/dist/static/js/app.4ea453cf50778469a10d.js
+++ b/public/app/dist/static/js/app.4ea453cf50778469a10d.js
--- a/public/app/dist/static/js/app.6709da24f34ceaf7e0b9.js
+++ b/public/app/dist/static/js/app.6709da24f34ceaf7e0b9.js
--- a/public/app/dist/static/js/app.7a2a617bf05137533286.js
+++ b/public/app/dist/static/js/app.7a2a617bf05137533286.js
--- a/public/app/dist/static/js/app.9de1b4228d00f0458924.js
+++ b/public/app/dist/static/js/app.9de1b4228d00f0458924.js
--- a/public/app/dist/static/js/app.b3a26f5e610a07f43992.js
+++ b/public/app/dist/static/js/app.b3a26f5e610a07f43992.js
--- a/public/app/dist/static/js/app.bdd07dd583ffcf8c6462.js
+++ b/public/app/dist/static/js/app.bdd07dd583ffcf8c6462.js
--- a/public/app/dist/static/js/app.d0d67a1bd5d4664fe818.js
+++ b/public/app/dist/static/js/app.d0d67a1bd5d4664fe818.js
--- a/public/app/dist/static/js/app.e78c4d2e8e4b96249e0f.js
+++ b/public/app/dist/static/js/app.e78c4d2e8e4b96249e0f.js
--- a/public/app/dist/static/js/app.e8ac3aad2ac98694616d.js
+++ b/public/app/dist/static/js/app.e8ac3aad2ac98694616d.js
--- a/public/app/dist/static/js/app.ecb4ded0ab157ddaf997.js
+++ b/public/app/dist/static/js/app.ecb4ded0ab157ddaf997.js
--- a/public/appnew/src/components/achieveMain/achieveForkLiNew.vue
+++ b/public/appnew/src/components/achieveMain/achieveForkLiNew.vue
--- a/public/appnew/src/components/eval/eval_function.vue
+++ b/public/appnew/src/components/eval/eval_function.vue
--- a/public/appnew/src/components/eval/eval_list.vue
+++ b/public/appnew/src/components/eval/eval_list.vue
--- a/public/appnew/src/components/eval/eval_sz.vue
+++ b/public/appnew/src/components/eval/eval_sz.vue
--- a/public/appnew/src/components/eval/eval_table.vue
+++ b/public/appnew/src/components/eval/eval_table.vue
--- a/public/appnew/src/components/receive/receiveDetail.vue
+++ b/public/appnew/src/components/receive/receiveDetail.vue
--- a/public/appnew/src/router/index.js
+++ b/public/appnew/src/router/index.js