From f12cdea4086b0066fed87f052a4eb69e78e80730 Mon Sep 17 00:00:00 2001
From: zhaojie01 <zhaojie01@wealthgrow.cn>
Date: Fri, 25 Dec 2020 15:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=A8=A1=E6=9D=BF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/v2/monthReportV2.1.html | 22 ++++++++++------------
 app/utils/jinjia2html_v2.py           |  4 +++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/templates/v2/monthReportV2.1.html b/app/templates/v2/monthReportV2.1.html
index 1ae3482..3f7124b 100644
--- a/app/templates/v2/monthReportV2.1.html
+++ b/app/templates/v2/monthReportV2.1.html
@@ -942,11 +942,11 @@
         </div>
         <div class="dcell">
           <div class="cover_text">
-            {{brand_name}}
+<!--            {{brand_name}}-->
           </div>
         </div>
       </div>
-      <img src={{cover_back}} alt="" class="cover_back fr">
+      <img src={{sh}} alt="" class="cover_back fr">
       <div class="cover_title dtable">
         <div class="cover_people">
           <span class="cover_pre">
@@ -956,10 +956,10 @@
             {{customer_name}}
           </span>
           <span class="cover_sir">
-            客户
+
           </span>
         </div>
-        <img class="cover_img" src="./img/red-rect.png" >
+        <img class="cover_img" src={{red_rect}} >
         <div class="cover_title_text dcell">
           资产<br>
           存续报告
@@ -1068,13 +1068,6 @@
               </td>
             </tr>
             <tr>
-              <td>
-                {%if (now_yield|float)>=0%}
-                成立以来累计收益率:<span class="red">{{now_yield}}%</span>
-                {%else%}
-                成立以来累计收益率:<span class="green">{{now_yield}}%</span>
-                {%endif%}
-              </td>
               <td>
                 {%if (now_annualised_return|float)>=0%}
                 年化收益率:<span class="red">{{now_annualised_return}}%</span>
@@ -1089,7 +1082,12 @@
                 最大回撤:<span class="green">{{now_withdrawal}}%</span>
                 {%endif%}
               </td>
-              <td>
+              <td colspan="2">
+                {%if (now_yield|float)>=0%}
+                成立以来累计收益率:<span class="red">{{now_yield}}%</span>
+                {%else%}
+                成立以来累计收益率:<span class="green">{{now_yield}}%</span>
+                {%endif%}
               </td>
             </tr>
           </table>
diff --git a/app/utils/jinjia2html_v2.py b/app/utils/jinjia2html_v2.py
index a248555..ac03ee0 100644
--- a/app/utils/jinjia2html_v2.py
+++ b/app/utils/jinjia2html_v2.py
@@ -246,9 +246,11 @@ class DataIntegrate:
                 'logo': template_folder + '/v2/img/logo.png',
                 'scene': template_folder + '/v2/img/scene.png',
                 'team': template_folder + '/v2/img/default-user.png',
+                'red_rect': template_folder + '/v2/img/red-rect.png',
+                'sh': template_folder + '/v2/img/sh.png',
                 # 全局数据
                 'customer_name': self.customer_name,
-                'year_month': self.user_customer.month_start_date.strftime("%Y{}%m{}").format("年", "月"),
+                'year_month': self.user_customer.month_start_date.strftime("%Y-%m"),
                 'month': self.user_customer.month_start_date.strftime("%m"),
                 'start_date': self.user_customer.start_date.strftime("%Y-%m-%d"),
                 'latest_worth_day': self.user_customer.last_nav_date,
-- 
2.18.1