From 3c5fecfa13ac047584b4aad92925c3955369e6a2 Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Fri, 21 Jun 2019 08:54:01 +0800
Subject: [PATCH] 4

---
 public/themes/simpleboot3/portal/index/salesman_goods.html | 2 ++
 simplewind/cmf/controller/WeChatBaseController.php         | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/themes/simpleboot3/portal/index/salesman_goods.html b/public/themes/simpleboot3/portal/index/salesman_goods.html
index 5e68ea6..a7cfe36 100755
--- a/public/themes/simpleboot3/portal/index/salesman_goods.html
+++ b/public/themes/simpleboot3/portal/index/salesman_goods.html
@@ -29,6 +29,7 @@
                     <div class="in_hotName txt-cut">{$vo.book_name}</div>
                     <div class="in_cam_shopPrice">
                         <div class="in_hotPrice1">¥<span>{$vo.price0}</span>.{$vo.price1}</div>
+                        <div class="in_cam_shopY">¥{$vo.pricing}</div>
                     </div>
                 </div>
             </a>
@@ -44,6 +45,7 @@
                     <div class="in_hotName txt-cut">{$vo.book_name}</div>
                     <div class="in_cam_shopPrice">
                         <div class="in_hotPrice1">¥<span>{$vo.price0}</span>.{$vo.price1}</div>
+                        <div class="in_cam_shopY">¥{$vo.pricing}</div>
                     </div>
                 </div>
             </a>
diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php
index a1b65a7..ca80600 100644
--- a/simplewind/cmf/controller/WeChatBaseController.php
+++ b/simplewind/cmf/controller/WeChatBaseController.php
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
      */
     public function checkWeChatUserLogin()
     {
-       $user = Db::name('user')->where('id',5)->find();
-       cmf_update_current_user($user);
+      /* $user = Db::name('user')->where('id',5)->find();
+       cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
             $config = [
--
libgit2 0.24.0