Merge branch 'master' of http://114.215.101.231:8099/lihan/integral into lilijuan

@@ -18,12 +18,13 @@ class FriendController extends HomeBaseController
     public function friendGiveLog()
     public function friendGiveLog()
     {
     {
         $data = Db::name('friendship')->alias('f')
         $data = Db::name('friendship')->alias('f')
-            ->field('f.total,u.user_nickname,u.avatar')
+            ->field('f.friend_uid as friend_id,f.total,u.user_nickname,u.avatar')
             ->join('user u', 'u.id=f.friend_uid')
             ->join('user u', 'u.id=f.friend_uid')
             ->where(['f.uid' => session('user.id')])
             ->where(['f.uid' => session('user.id')])
             ->select()->toArray();
             ->select()->toArray();
         return $this->fetch(':friend_give_log', [
         return $this->fetch(':friend_give_log', [
-            'list' => $data
+            'list' => $data,
+            'balance' => Db::name('user')->where(['id' => session('user.id')])->value('balance')
         ]);
         ]);
     }
     }
 
 

@@ -10,7 +10,7 @@
 // [ 入口文件 ]
 // [ 入口文件 ]
 
 
 // 调试模式开关
 // 调试模式开关
-define("APP_DEBUG", false);
+define("APP_DEBUG", true);
 
 
 // 定义CMF根目录,可更改此目录
 // 定义CMF根目录,可更改此目录
 define('CMF_ROOT', __DIR__ . '/../');
 define('CMF_ROOT', __DIR__ . '/../');

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <link rel="stylesheet" href="https://at.alicdn.com/t/font_834805_0ml90wdq5hzm.css">
     <link rel="stylesheet" href="https://at.alicdn.com/t/font_834805_0ml90wdq5hzm.css">
+    <link rel="stylesheet" href="https://at.alicdn.com/t/font_750594_itt4qc4xfcg.css">
     <link rel="stylesheet" href="__INDEX__/css/base.css">
     <link rel="stylesheet" href="__INDEX__/css/base.css">
     <link rel="stylesheet" href="__INDEX__/css/swiper.min.css">
     <link rel="stylesheet" href="__INDEX__/css/swiper.min.css">
     <script type="text/javascript" src="__INDEX__/js/base.js"></script>
     <script type="text/javascript" src="__INDEX__/js/base.js"></script>
@@ -246,7 +247,7 @@
 <div class="container">
 <div class="container">
     <div class="friendlist">
     <div class="friendlist">
         <volist name="list" id="vo">
         <volist name="list" id="vo">
-        <div class="fri_list">
+        <div class="fri_list" data-id="{$vo.friend_id}">
             <p class="friend_img">
             <p class="friend_img">
                 <img src="{$vo.avatar}" alt="">
                 <img src="{$vo.avatar}" alt="">
             </p>
             </p>
@@ -263,10 +264,15 @@
         搜索添加好友
         搜索添加好友
     </div>
     </div>
 </div>
 </div>
+<input type="tel" id="pwd" maxlength="6" style="display: block;" pattern="[0-9]*"  onkeyup="this.value = this.value.replace(/[^\d]/g, '')"/>
+
 </body>
 </body>
 <script type="text/javascript" src="__INDEX__/js/jquery.min.js"></script>
 <script type="text/javascript" src="__INDEX__/js/jquery.min.js"></script>
 <script>
 <script>
+
+    var friend_id = '';
     $(".fri_list").click(function(){
     $(".fri_list").click(function(){
+        friend_id=$(this).attr('data-id');
         $(".sendwrapper").css("display","block");
         $(".sendwrapper").css("display","block");
     })
     })
 
 
@@ -342,6 +348,7 @@
                             $(".pleaseenter").val("");
                             $(".pleaseenter").val("");
                             $('#pwd').val("")
                             $('#pwd').val("")
                             alert(data.msg);
                             alert(data.msg);
+                            window.location.reload();
                         }else {
                         }else {
                             alert(data.msg);
                             alert(data.msg);
                         }
                         }