Merge branch 'weekReport' into develop

# Conflicts:
#	src/db/modify.sql

src/db/modify.sql

@@ -185,10 +185,9 @@ CREATE TABLE `financial_agent_commission_detail` (
 
 alter table financial_partner_commission add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';
 alter table financial_partner_commission_detail add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';
+INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`)
 
 
-
-INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`)
 VALUES
 	(
 		'android_version_content' ,
@@ -207,4 +206,4 @@ VALUES
 	(
 		'android_update' ,
 		'true'
-	);
+	);

src/main/resources/templates/reports/week_report.html

@@ -151,8 +151,6 @@
                                 <div class="weui-cell__ft weui-flex__item"
                                      th:text="${thisweekData.order_count}"></div>
                             </div>
-                            #end
-
                         </div>
                     </div>
                 </div>
@@ -167,12 +165,12 @@
                         <div class="weui-cell__ft">
                             <span style="color: green"
                                   th:if="${report.transaction_report.sydney.thisweek.compare.direction>0}"
-                                  th:text="'↑'+${$report.transaction_report.sydney.thisweek.compare.value}"></span>
+                                  th:text="'↑'+${report.transaction_report.sydney.thisweek.compare.value}"></span>
                             <span style="color: red"
                                   th:if="${report.transaction_report.sydney.thisweek.compare.direction<0}"
-                                  th:text="'↓'+${$report.transaction_report.sydney.thisweek.compare.value}"></span>
+                                  th:text="'↓'+${report.transaction_report.sydney.thisweek.compare.value}"></span>
                             <span th:if="${report.transaction_report.sydney.thisweek.compare.direction==0}"
-                                  th:text="${$report.transaction_report.sydney.thisweek.compare.value}"></span>
+                                  th:text="${report.transaction_report.sydney.thisweek.compare.value}"></span>
                         </div>
                     </div>
                 </div>
@@ -226,51 +224,6 @@
                 </div>
             </div>
 
-            <div class="weui-panel">
-                <div class="weui-panel__hd">新增商户情况(Melbourne)</div>
-                <div class="weui-panel__bd">
-                    <div class="weui-media-box weui-media-box_small-appmsg">
-                        <div class="weui-cells">
-                            <div class="weui-cell"
-                                 th:each="dt : ${report.new_client_report.melbourne.daily.data}">
-                                <div class="weui-cell__bd weui-cell_primary"
-                                     th:text="${dt.datelist}"></div>
-                                <div class="weui-cell__ft" th:text="${dt.num}"></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="weui-panel__ft">
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd weui-cell_primary">新增总数</div>
-                        <div class="weui-cell__ft"
-                             th:text="${report.new_client_report.melbourne.daily.total}"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="weui-panel">
-                <div class="weui-panel__hd">新增商户情况(Sydney)</div>
-                <div class="weui-panel__bd">
-                    <div class="weui-media-box weui-media-box_small-appmsg">
-                        <div class="weui-cells">
-                            <div class="weui-cell"
-                                 th:each="dt : ${report.new_client_report.sydney.daily.data}">
-                                <div class="weui-cell__bd weui-cell_primary"
-                                     th:text="${dt.datelist}"></div>
-                                <div class="weui-cell__ft" th:text="${dt.num}"></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="weui-panel__ft">
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd weui-cell_primary">新增总数</div>
-                        <div class="weui-cell__ft"
-                             th:text="${report.new_client_report.sydney.daily.total}"></div>
-                    </div>
-                </div>
-            </div>
-
             <div class="weui-panel">
                 <div class="weui-panel__hd">商家自主申请情况</div>
                 <div class="weui-panel__bd">