From 43299df8033db59dd4ccc349d77b4f89729ab039 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 27 May 2019 01:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/default/public/login_success.html}   |  0
 .../plugins/touristbuy/index/Index.php        |  2 +-
 .../index/public/success.html                 | 55 -------------------
 .../weixinwebauthorization/index/Auth.php     |  2 +-
 4 files changed, 2 insertions(+), 57 deletions(-)
 rename application/{plugins/view/touristbuy/index/index/success.html => index/view/default/public/login_success.html} (100%)
 mode change 100755 => 100644
 delete mode 100644 application/plugins/view/weixinwebauthorization/index/public/success.html

diff --git a/application/plugins/view/touristbuy/index/index/success.html b/application/index/view/default/public/login_success.html
old mode 100755
new mode 100644
similarity index 100%
rename from application/plugins/view/touristbuy/index/index/success.html
rename to application/index/view/default/public/login_success.html
diff --git a/application/plugins/touristbuy/index/Index.php b/application/plugins/touristbuy/index/Index.php
index 7bb4521dd..e5022927e 100755
--- a/application/plugins/touristbuy/index/Index.php
+++ b/application/plugins/touristbuy/index/Index.php
@@ -127,7 +127,7 @@ class Index extends Controller
             $this->assign('msg', $ret['msg']);
             $this->assign('data', $ret['data']);
             $this->assign('is_parent', isset($params['is_parent']) ? $params['is_parent'] : 0);
-            return $this->fetch('../../../plugins/view/touristbuy/index/index/success');
+            return $this->fetch('public/login_success');
         } else {
             $this->assign('msg', $ret['msg']);
             return $this->fetch('public/tips_error');
diff --git a/application/plugins/view/weixinwebauthorization/index/public/success.html b/application/plugins/view/weixinwebauthorization/index/public/success.html
deleted file mode 100644
index e462f9b55..000000000
--- a/application/plugins/view/weixinwebauthorization/index/public/success.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{{include file="public/header" /}}
-
-<!-- header nav start -->
-{{if isset($is_header) and $is_header eq 1}}
-    <!-- header top nav -->
-    {{include file="public/header_top_nav" /}}
-
-    <!-- search -->
-    {{include file="public/nav_search" /}}
-
-    <!-- goods category -->
-    {{include file="public/goods_category" /}}
-{{/if}}
-<!-- header nav end -->
-
-<!-- conntent start  -->
-<div class="am-g my-content">
-    <div class="am-u-md-6 am-u-sm-centered">
-        <div class="am-panel am-radius tips-success">
-            <div class="am-panel-bd">
-                <i class="am-icon-check-circle am-icon-sm"></i>
-                <span class="msg">{{$msg}}</span>
-                <div class="tips-nav">
-                    <a href="{{$Think.__MY_URL__}}" class="am-btn am-btn-secondary am-radius">回到首页</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- conntent end  -->
-
-{{include file="public/footer" /}}
-
-{{if !empty($data['body_html'])}}
-    {{$data.body_html|raw}}
-{{/if}}
-
-<script type="text/javascript">
-    {{if isset($is_parent) and $is_parent eq 1}}
-        setTimeout(function()
-        {
-            if(self.frameElement && self.frameElement.tagName == "IFRAME")
-            {
-                parent.location.reload();
-            }else{
-                window.location.href='{{$Think.__MY_URL__}}';
-            }
-        }, 1500);
-    {{else /}}
-        setTimeout(function()
-        {
-            window.location.href='{{$Think.__MY_URL__}}';
-        }, 1500);
-    {{/if}}
-</script>
\ No newline at end of file
diff --git a/application/plugins/weixinwebauthorization/index/Auth.php b/application/plugins/weixinwebauthorization/index/Auth.php
index ec76f7469..0d31d7215 100644
--- a/application/plugins/weixinwebauthorization/index/Auth.php
+++ b/application/plugins/weixinwebauthorization/index/Auth.php
@@ -164,7 +164,7 @@ class Auth extends Controller
             // 默认页面提示
             $this->assign('msg', $ret['msg']);
             $this->assign('data', $ret['data']);
-            return $this->fetch('../../../plugins/view/weixinwebauthorization/index/public/success');
+            return $this->fetch('public/login_success');
         } else {
             $this->assign('msg', $ret['msg']);
             return $this->fetch('public/tips_error');
-- 
GitLab