From 59d0bc07afb947a950df69362464580944508506 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 21 Feb 2019 16:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/view/default/public/error.html      | 24 +++++++++----------
 .../index/view/default/public/pay_error.html  | 24 +++++++++----------
 .../view/default/public/pay_success.html      | 24 +++++++++----------
 .../index/view/default/public/tips_error.html | 24 +++++++++----------
 .../view/default/user/modal_login_info.html   |  4 ++--
 5 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/application/index/view/default/public/error.html b/application/index/view/default/public/error.html
index 935b8f302..1b914021c 100755
--- a/application/index/view/default/public/error.html
+++ b/application/index/view/default/public/error.html
@@ -1,20 +1,20 @@
 {{include file="public/header" /}}
 
-<!-- nav start -->
-{{include file="public/nav" /}}
-<!-- nav end -->
+<!-- header nav start -->
+{{if isset($is_header) and $is_header eq 1}}
+    <!-- header top nav -->
+    {{include file="public/header_top_nav" /}}
 
-<!-- header top nav -->
-{{include file="public/header_top_nav" /}}
+    <!-- search -->
+    {{include file="public/nav_search" /}}
 
-<!-- search -->
-{{include file="public/nav_search" /}}
+    <!-- header nav -->
+    {{include file="public/header_nav" /}}
 
-<!-- header nav -->
-{{include file="public/header_nav" /}}
-
-<!-- goods category -->
-{{include file="public/goods_category" /}}
+    <!-- goods category -->
+    {{include file="public/goods_category" /}}
+{{/if}}
+<!-- header nav end -->
 
 <!-- content start -->
 <div class="am-g my-content">
diff --git a/application/index/view/default/public/pay_error.html b/application/index/view/default/public/pay_error.html
index f75f61ed0..a22b372ca 100755
--- a/application/index/view/default/public/pay_error.html
+++ b/application/index/view/default/public/pay_error.html
@@ -1,20 +1,20 @@
 {{include file="public/header" /}}
 
-<!-- nav start -->
-{{include file="public/nav" /}}
-<!-- nav end -->
+<!-- header nav start -->
+{{if isset($is_header) and $is_header eq 1}}
+    <!-- header top nav -->
+    {{include file="public/header_top_nav" /}}
 
-<!-- header top nav -->
-{{include file="public/header_top_nav" /}}
+    <!-- search -->
+    {{include file="public/nav_search" /}}
 
-<!-- search -->
-{{include file="public/nav_search" /}}
+    <!-- header nav -->
+    {{include file="public/header_nav" /}}
 
-<!-- header nav -->
-{{include file="public/header_nav" /}}
-
-<!-- goods category -->
-{{include file="public/goods_category" /}}
+    <!-- goods category -->
+    {{include file="public/goods_category" /}}
+{{/if}}
+<!-- header nav end -->
 
 <!-- conntent start  -->
 <div class="am-g my-content">
diff --git a/application/index/view/default/public/pay_success.html b/application/index/view/default/public/pay_success.html
index 5e61994bd..9936a8e6c 100755
--- a/application/index/view/default/public/pay_success.html
+++ b/application/index/view/default/public/pay_success.html
@@ -1,20 +1,20 @@
 {{include file="public/header" /}}
 
-<!-- nav start -->
-{{include file="public/nav" /}}
-<!-- nav end -->
+<!-- header nav start -->
+{{if isset($is_header) and $is_header eq 1}}
+    <!-- header top nav -->
+    {{include file="public/header_top_nav" /}}
 
-<!-- header top nav -->
-{{include file="public/header_top_nav" /}}
+    <!-- search -->
+    {{include file="public/nav_search" /}}
 
-<!-- search -->
-{{include file="public/nav_search" /}}
+    <!-- header nav -->
+    {{include file="public/header_nav" /}}
 
-<!-- header nav -->
-{{include file="public/header_nav" /}}
-
-<!-- goods category -->
-{{include file="public/goods_category" /}}
+    <!-- goods category -->
+    {{include file="public/goods_category" /}}
+{{/if}}
+<!-- header nav end -->
 
 <!-- conntent start  -->
 <div class="am-g my-content">
diff --git a/application/index/view/default/public/tips_error.html b/application/index/view/default/public/tips_error.html
index 14401388c..bb95bfc3c 100755
--- a/application/index/view/default/public/tips_error.html
+++ b/application/index/view/default/public/tips_error.html
@@ -1,20 +1,20 @@
 {{include file="public/header" /}}
 
-<!-- nav start -->
-{{include file="public/nav" /}}
-<!-- nav end -->
+<!-- header nav start -->
+{{if isset($is_header) and $is_header eq 1}}
+    <!-- header top nav -->
+    {{include file="public/header_top_nav" /}}
 
-<!-- header top nav -->
-{{include file="public/header_top_nav" /}}
+    <!-- search -->
+    {{include file="public/nav_search" /}}
 
-<!-- search -->
-{{include file="public/nav_search" /}}
+    <!-- header nav -->
+    {{include file="public/header_nav" /}}
 
-<!-- header nav -->
-{{include file="public/header_nav" /}}
-
-<!-- goods category -->
-{{include file="public/goods_category" /}}
+    <!-- goods category -->
+    {{include file="public/goods_category" /}}
+{{/if}}
+<!-- header nav end -->
 
 <!-- conntent start  -->
 <div class="am-g my-content">
diff --git a/application/index/view/default/user/modal_login_info.html b/application/index/view/default/user/modal_login_info.html
index 83c12be15..a0fab3339 100755
--- a/application/index/view/default/user/modal_login_info.html
+++ b/application/index/view/default/user/modal_login_info.html
@@ -6,11 +6,11 @@
         <!-- form start -->
         <form class="am-form form-validation" method="post" action="{{:MyUrl('index/user/login')}}" request-type="ajax-fun" request-value="ViewModalBack">
             <fieldset>
-                <if condition="in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))">
+                {{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))}}
                     <span class="">还没有帐号？</span>
                     <a href="{{:MyUrl('index/user/reginfo')}}" target="_blank" class="am-btn am-btn-secondary am-btn-xs am-radius">立即注册</a>
                     <hr />
-                </if>
+                {{/if}}
                 <label>手机/邮箱</label>
                 <div class="am-form-group">
                     <input type="text" name="accounts" class="am-radius" minlength="1" placeholder="手机/邮箱" data-validation-message="手机/邮箱格式有误" required />