From 96a6eb3e3f90a13ec03087518061b9e99a1b939f Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Tue, 16 Jul 2019 10:17:14 +0800
Subject: [PATCH] 6

---
 public/themes/simpleboot3/portal/personalcenter/withdrawal_subsidiary.html | 7 ++++++-
 simplewind/cmf/controller/WeChatBaseController.php                         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/themes/simpleboot3/portal/personalcenter/withdrawal_subsidiary.html b/public/themes/simpleboot3/portal/personalcenter/withdrawal_subsidiary.html
index d7efdf4..ccd0067 100755
--- a/public/themes/simpleboot3/portal/personalcenter/withdrawal_subsidiary.html
+++ b/public/themes/simpleboot3/portal/personalcenter/withdrawal_subsidiary.html
@@ -28,7 +28,12 @@
                 </div>
                 <div class="mention_con">
                     <p class="mention_Txt2">{$vo.create_time|date="Y-m-d H:i:s",###}</p>
-                    <p class="mention_Txt2">交易成功</p>
+                    <if condition="$vo.state eq 1">
+                        <p class="mention_Txt2">交易成功</p>
+                        <else/>
+                        <p class="mention_Txt2">交易失败</p>
+                    </if>
+
                 </div>
             </li>
         </volist>
diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php
index fd14663..a9178f2 100644
--- a/simplewind/cmf/controller/WeChatBaseController.php
+++ b/simplewind/cmf/controller/WeChatBaseController.php
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
     public function checkWeChatUserLogin()
     {
-        /*$user = Db::name('user')->where('id',27)->find();
+        /*$user = Db::name('user')->where('id',6)->find();
         cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
--
libgit2 0.24.0