From 98249f462ae20dd2ae4a7f2d7771926c69a61a73 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 17:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/UserController.class.php       |  8 ++---
 Application/Mobile/View/User/login.html       | 32 ++++++++++++++++---
 Application/Mobile/View/User/userset.html     | 29 +----------------
 .../Sdk/View/default/Spend/pay_success.html   |  5 ++-
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index fe9d28fdd..334fef288 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -1007,10 +1007,10 @@ class UserController extends BaseController
                 if (!$invidcard) {
                     $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码填写不正确', 'url' => U('User/userauth')));
                 }
-                $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find();
-                if ($cardd) {
-                    $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
-                }
+                // $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find();
+                // if ($cardd) {
+                //     $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
+                // }
             }
 
             if (C('tool_age.status') == 0) {
diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index 26a9b2d4c..7ba63d50c 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -42,15 +42,39 @@
     </div>
   <input type="hidden" id="from" name="from" value="{$from}">
     <div class="popmsg pop-dialog" style="font-size: .28rem"></div>
+    <!-- 底部导航 -->
+  <div class="foot_tabbar">
+    <div class="foot_tabbar_box">
+      <div class="foot_info ">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+          <span>首页</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+          <span>企业简介</span></a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+          <span>招商合作</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+          <span>我的</span>
+        </a>
+      </div>
+    </div>
+  </div>
   </body>
     <script src="__JS__/pop.lwx.min.js"></script>
     <script src="__JS__/lwx.js"></script>
     <script src="__JS__/common.js"></script>
     <script>
-
-        $(document).ready(function(){
-          $('.foot_tabbar').hide()
-        });
       $(document).keyup(function(event){
         if(event.keyCode == 13){ 
           $('.submit').click(); 
diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html
index a423563cf..fb9891378 100644
--- a/Application/Mobile/View/User/userset.html
+++ b/Application/Mobile/View/User/userset.html
@@ -138,34 +138,7 @@
       </div>
     </div>
   </div>
-  <!-- 底部导航 -->
-  <div class="foot_tabbar">
-    <div class="foot_tabbar_box">
-      <div class="foot_info ">
-        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
-          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
-          <span>首页</span>
-        </a>
-      </div>
-      <div class="foot_info ">
-        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
-          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
-          <span>企业简介</span></a>
-      </div>
-      <div class="foot_info ">
-        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
-          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
-          <span>招商合作</span>
-        </a>
-      </div>
-      <div class="foot_info ">
-        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
-          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
-          <span>我的</span>
-        </a>
-      </div>
-    </div>
-  </div>
+  
 
 
   <div class="popmsg pop-dialog" style="font-size: .28rem;"></div>
diff --git a/Application/Sdk/View/default/Spend/pay_success.html b/Application/Sdk/View/default/Spend/pay_success.html
index 2e07525ba..ff5dcfbab 100644
--- a/Application/Sdk/View/default/Spend/pay_success.html
+++ b/Application/Sdk/View/default/Spend/pay_success.html
@@ -146,12 +146,11 @@ $("#back_success").click(function() {
     }else{
           <if condition="get_wx_type() neq 1">
          
-          window.location.href = Scheme+"://1&back";
-          
+          window.location.href = '/mobile.php?s=/User/index.html';
           
           <else/>
 
-          window.location.href = "mengchuang://showWapPayResult_btnType_?1&back";
+        //   window.location.href  = '/mobile.php?s=/User/index.html';
         </if>
        
     }