Merge remote-tracking branch 'origin/wx0604' into wx0604

application/api/controller/Register.php

@@ -104,9 +104,9 @@ class Register extends Basic
     public function removeBinding()
     {
         $params      = $this->params;
-       /* $params      = array(
-            "buyer_id" => 1,
-            "user_id"  => 12,
+    /*    $params      = array(
+            "buyer_id" => 5,
+            "user_id"  => 25983,
         );*/
         $checkResult = $this->validate($params, "RegisterValidate.removeBind");
         if (true !== $checkResult) {

application/api/controller/Sublet.php

@@ -11,6 +11,7 @@ namespace app\api\controller;
  */
 use app\api\extend\Basic;
 use app\model\SubletModel;
+use think\Exception;
 use think\Request;
 
 class Sublet extends Basic
@@ -29,12 +30,12 @@ class Sublet extends Basic
      */
     public function subletList()
     {
-        $params  = $this->params;
-     /*   $params  = array(
-            "user_id"   => 1,
-            "page_no"   => 1,
-            "page_size" => 15
-        );*/
+        $params = $this->params;
+        /*   $params  = array(
+               "user_id"   => 1,
+               "page_no"   => 1,
+               "page_size" => 15
+           );*/
         $user_id = $params["user_id"];
         if (!$user_id) {
             return $this->response("101", "用户id不能为空");
@@ -45,11 +46,19 @@ class Sublet extends Basic
 
         $fields = 'id,manage_type,address_detail,FORMAT(expected_rent/100,2) as expected_rent,create_time,status,house_id';
 
-        $result = $this->subletMode->getSublet($pageNo, $pageSize, "id desc", $fields, $select_);
-        if (count($result) > 0)
-            return $this->response("200", "success", $result);
+        try {
+            $result = $this->subletMode->getSublet($pageNo, $pageSize, "id desc", $fields, $select_);
+            if (count($result) > 0) {
+                return $this->response("200", "success", $result);
+            } else {
+                return $this->response("200", "request null");
+            }
+
+        } catch (Exception $exception) {
+            return $this->response("101", "请求异常,请稍后再试");
+        }
+
 
-        return $this->response("101", "请求异常,请稍后再试");
     }
 
     public function addSublet()

application/api/untils/MessageUntils.php

@@ -166,11 +166,7 @@ class MessageUntils
             $noteLog->save();
             //todo 存code
             $redis_ = RedisExt::getRedis();
-            if ($redis_) {
-                $redis_->set($device_id, $_code, 300);
-            } else {
-                Session::set($device_id, $_code);
-            }
+            $redis_->set($device_id, $_code, 300);
             return "true";
         } else {
             $noteLog->is_success = 2;
@@ -185,15 +181,16 @@ class MessageUntils
      * @param $code
      * @return bool
      */
-    public function verifyCode(string $device_id, int $code) : bool
+    public function verifyCode(string $device_id, int $code): bool
     {
         $redis_ = RedisExt::getRedis();
-        if ($redis_) {
+
+        $service_code = 0;
+        if ($redis_)
             $service_code = $redis_->get($device_id);
-        } else {
-            $service_code = Session::get($device_id);
-        }
+
         if ($code == $service_code) {
+            $redis_->delete($device_id);
             return true;
         } else {
             return false;

application/index/view/evaluation/evaluation_list.html

@@ -102,7 +102,7 @@
         </div>
     </div>
 </div>
-<!--时间轴-->
+<!--删除-->
 <div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -120,6 +120,24 @@
         </div><!-- /.modal-content -->
     </div><!-- /.modal -->
 </div>
+<!--时间轴-->
+<div class="modal fade" id="modal-time2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+                <h4 class="modal-title">
+                    时间轴
+                </h4>
+            </div>
+            <div class="modal-body" class="iframe-div-parent">
+                <iframe class="iframe-time-line"></iframe>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal -->
+</div>
 
 
 

application/model/Users.php

@@ -652,14 +652,13 @@ class Users extends Model
      */
     public function unbundlingWx($params)
     {
-
         $where_ = [];
-        if (!isset($params["buyer_id"])) {
+        if (isset($params["buyer_id"])) {
             $where_["buyer_id"] = $params["buyer_id"];
         }else{//防止传入错误参数修改掉大面积数据此字段必填
             return 0;
         }
-        if (!isset($params["user_id"])) {
+        if (isset($params["user_id"])) {
             $where_["id"] = $params["user_id"];
         }
         return $this->where($where_)->setField("buyer_id", 0);

application/route.php

@@ -317,7 +317,7 @@ Route::group('api', [
 
     'sendCode'   => [ 'api/Register/registerSendCode', [ 'method' => 'POST' ] ],
     'userVerify' => [ 'api/Register/registerVerify', [ 'method' => 'POST' ] ],
-    'removeBind' => [ 'api/Register/removeBinding', [ 'method' => 'POST' ] ],
+    'removeBind' => [ 'api/Register/removeBinding', [ 'method' => 'POST|GET' ] ],
 
 
 ]);

public/app/dist/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.32769812f4333e70049b1824f32be8bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.9bc169c9e5196c1dad63.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.82eb696bded57a88838ba154829c7d4c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.d046dfac338e9e34e539.js></script></body></html>
\ No newline at end of file