Merge branch '7_30' into develop

6 years ago · 886f5d8ef5
parent 61884d34fc 07b0241aed
commit 886f5d8ef5
2 changed files with 4 additions and 4 deletions
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@ -180,10 +180,10 @@
                            </div>
                            <div class="col-sm-2 col-xs-6">
                                <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/wechatpay_sign.png"/>JD Pay</div>
+                                    <div class="description-header text-bold"><img src="/static/images/jd_sign.png"/>JD Pay</div>
                                    <div class="description-text text-red">
                                        <label class="description-text"
-                                               ng-bind="totalChannelAmount.wechatPayAmount|currency: ' $ '"></label>
+                                               ng-bind="totalChannelAmount.jdPayAmount|currency: ' $ '"></label>
                                    </div>

                                </div>
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@ -140,10 +140,10 @@
                            </div>
                            <div class="col-sm-2 col-xs-6">
                                <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/wechatpay_sign.png"/>JD Pay</div>
+                                    <div class="description-header text-bold"><img src="/static/images/jd_sign.png"/>JD Pay</div>
                                    <div class="description-text">
                                        <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.wechatPayAmount|currency: ' $ '"></label>
+                                               ng-bind="totalChannelAmount.jdPayAmount|currency: ' $ '"></label>
                                    </div>

                                </div>