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

@@ -45,7 +45,7 @@ class FriendController extends HomeBaseController
             return $this->fetch(':friend_list', [
                 'keyword' => $keyword,
                 'list' => $list,
-                'balance' => Db::name('user')->where(['id'=>session('user.id')])->value('balance')
+                'balance' => Db::name('user')->where(['id' => session('user.id')])->value('balance')
             ]);
         } else {
             $this->error('查无此人');
@@ -60,8 +60,14 @@ class FriendController extends HomeBaseController
             Db::startTrans();
             $uid = session('user.id');
             $total = $request->param('total');
-            //获取赠送者角色、父级和当前积分
-            $info = Db::name('user')->field('role,parent_id,balance')->where(['id' => $uid])->find();
+            //获取赠送者角色、父级、当前积分和赠送密码
+            $info = Db::name('user')->field('role,parent_id,balance,integral_pwd')->where(['id' => $uid])->find();
+            $integral_pwd = $request->param('integral_pwd');
+            //判断密码是否正确
+            if (md5($integral_pwd) != $info['integral_pwd']) {
+                echo json_encode(['msg' => '密码错误', 'status' => false]);
+                exit();
+            } else {
                 //判断此人积分是否足够赠送，且是否能被500整除
                 if ($info['balance'] < $total && $total >= 0) {
                     echo json_encode(['msg' => '您的积分不足', 'status' => false]);
@@ -169,6 +175,7 @@ class FriendController extends HomeBaseController
                 }
             }
         }
+    }
 
     //密码管理验证码页面
     public function passwordManager()

@@ -361,7 +361,7 @@
         }
     })
 
-    var arr=[];
+
     var str=""
     var txts = wrap.getElementsByClassName("entercode");
     //输入的密码自动输入到下一个
@@ -370,22 +370,26 @@
         for(var i=0;i<txts.length;i++){
             $(txts[i]).val("")
         }
+
         for(var i = 0; i<txts.length;i++){
+
             var t = txts[i];
             t.index = i;
             if(t.index>0){
                 t.setAttribute("readonly", true);
             }
             t.onkeyup=function(){
-
+                var arr=[];
                 var regular = /\s+/g;
                 if(regular.test(this.value)){
                     $(this).focus();
                 }else if($(this).val()==""){
                     $(this).focus();
                 }else{
+
                     console.log($(this).val());
                     arr.push($(this).val());
+                    console.log(arr)
                     var next = this.index + 1;
                     if(next > txts.length - 1) return;
                     txts[next].removeAttribute("readonly");
@@ -399,6 +403,8 @@
                     str=arr[0]+arr[1]+arr[2]+arr[3]+arr[4]+arr[5];
                     console.log(str)
 
+
+
                     $.ajax({
                         url:"{:url('friendship/Friend/donateIntegral')}",
                         data:{
@@ -411,11 +417,16 @@
                         
                         success: function (data) {
                             if(data.status === true) {
+                                window.event.stopPropagation()
+                                $(".passwordwrap").css("display","none")
                                 alert(data.msg);
-                                window.location.reload();
                             }else {
                                 alert(data.msg);
                             }
+                            //清空数据
+                            for (var i = 0; i < txts.length; i++) {
+                                $(txts[i]).val("")
+                            }
                         }
                     })
                 }