Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote

Application/Base/Service/PromoteService.class.php

@@ -380,18 +380,9 @@ class PromoteService {
             return ['status' => false, 'msg' => '系统异常，修改用户推广员失败'];
         }
 
-        $status = M('user_play', 'tab_')->where($otherMap)->save($updateData);
-        if (!$status) {
-            $model->rollback();
-            return ['status' => false, 'msg' => '系统异常，修改玩家推广员失败'];
-        }
+        M('user_play', 'tab_')->where($otherMap)->save($updateData);
+        M('user_play_info', 'tab_')->where($otherMap)->save($updateData);
         
-        $status = M('user_play_info', 'tab_')->where($otherMap)->save($updateData);
-        if (!$status) {
-            $model->rollback();
-            return ['status' => false, 'msg' => '系统异常，修改角色推广员失败'];
-        }
-
         M('spend', 'tab_')->where($otherMap)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
         M('deposit', 'tab_')->where($otherMap)->save($updateData);
         M('bind_spend', 'tab_')->where($otherMap)->save($updateData);
@@ -923,7 +914,7 @@ class PromoteService {
     {
         $data = [
             'account'       => $params['account'],
-            'password'      => $this->password($params['password']),
+            'password'      => $this->password($params['password'], UC_AUTH_KEY),
             'nickname'      => $params['nickname'] ?? $params['account'],
             'second_pwd'    => $params['second_pwd'] ?? null,
             'real_name'     => $params['real_name'],

Application/Home/Controller/PromoteController.class.php

@@ -917,7 +917,7 @@ class PromoteController extends BaseController
         if (IS_POST) {
             $params = I('post.');
             $loginPromote = $this->getLoginPromote();
-
+            
             if ($params['promote_type'] == 0 && $loginPromote['level'] > 1) {
                 $this->ajaxReturn(['status' => 0, 'msg' => '无权限']);
             }

Application/Home/View/default/Promote/addPromote.html

@@ -15,6 +15,7 @@
         <div class="trunk-list list_normal">
           <form action="{:U('Promote/addPromote')}" novalidate="novalidate" method="post" class="base_info" id="form_reg">
             <table class="table2">
+              <input type="hidden" name="promote_type" value="{:I('promote_type', 0)}">
               <?php if($promotes != null):?>
               <tr>
                 <td class="l"><span class="req">*</span>{$parentTypeName}：</td>
@@ -107,6 +108,7 @@
         layer.msg('请选择所属上级');
         return
       }
+      console.log(promote_type)
       $.ajax({
         type:"POST",
         url:"{:U('addPromote')}",

Data/update.sql

@@ -368,4 +368,6 @@ ALTER TABLE `sys_shift_task` ADD COLUMN `remark` varchar(255) NOT NULL DEFAULT '
 ALTER TABLE `tab_withdraw` ADD COLUMN `transfer_proof` int(11) NOT NULL DEFAULT 0 COMMENT '汇款证明' AFTER `settlement_end_time`;
 
 -- 2019-11-08 cxj
-ALTER TABLE `sys_document_download` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '文档ID' FIRST;
+ALTER TABLE `sys_document_download` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '文档ID' FIRST;
+ALTER TABLE `tab_promote`
+	CHANGE COLUMN `ver_status` `ver_status` TINYINT(2) NULL DEFAULT '3' COMMENT '资质认证审核状态(1是审核成功，2审核失败，3未审核)' AFTER `child_game_permission`;

Public/Home/js/20170831/common.js

@@ -78,9 +78,9 @@ $(function(){
             $.get(target).success(function(data){
                 if (data.status==1) {
                     if (data.url) {
-                        updateAlert(data.info + ' 页面即将自动跳转~','alert-success');
+                        updateAlert(data.info + ' 页面即将自动跳转~',1,'alert-success');
                     }else{
-                        updateAlert(data.info,'alert-success');
+                        updateAlert(data.info,1,'alert-success');
                     }
                     setTimeout(function(){
                         if (data.url) {