Merge branch 'master' of http://alisz.titanera.com:3000/titan/CRM

normand/frontend/frontend/views/layouts/main.php

@@ -67,9 +67,9 @@ use yii\helpers\Html;
 <div class="mobile1-download" id="mobile1-download" style="display: none;">
     <div class="iPhone_">
         <div>
-            <img id="download_ewm_android" src="<?= STATIC_URL ?>/static/fxm/images/master.jpg"   >
-		    <img id="download_ewm_android3" src="<?= STATIC_URL ?>/static/fxm/images/spare.jpg" >
             <span id="download_ewm_android4"></span>
+            <img id="download_ewm_android3" src="<?= STATIC_URL ?>/static/fxm/images/spare.jpg" >
+            <img id="download_ewm_android" src="<?= STATIC_URL ?>/static/fxm/images/master.jpg"   >
         </div>
         <div style="width: 100px;font-size: 20px;box-sizing: inherit;">第一个主要下载码,其他为辅助下载码</div>
         <img class="closeButton1" id="closeButton1" src="<?= STATIC_URL ?>/static/fxm/images/closeButton.png">

normandcrm/admin/backend/web/str1.txt

@@ -0,0 +1 @@
+member_id=1app_oauth#^A3lopM5*$%TUa@wtC467^

normandcrm/service/backend/controllers/DepositController.php

@@ -75,7 +75,7 @@ class DepositController extends BaseController
 
 
         $query->leftJoin('crm_mt4_deposit_log l','crm_deposit.id = l.log_id');
-        $query->where("l.mt4_order_id != ''");
+//        $query->where("l.mt4_order_id != ''");
         $query->select('crm_deposit.*,l.mt4_order_id');
 
 

normandcrm/service/backend/controllers/WithdrawController.php

@@ -379,7 +379,7 @@ class WithdrawController extends BaseController
              $result = json_decode($result,true);
              $tt = print_r($result,true);
              file_put_contents('mt1.txt',$tt);
-             if(!$result['ret']){
+             if($result['ret'] == 0){
                  $result2 = $api->fixbalance($login);
                  if(empty($result2)){
                      return $this->outJson(0, [], '更新失败');
@@ -387,7 +387,7 @@ class WithdrawController extends BaseController
                  $res2 = json_decode($result2,true);
                  $tt = print_r($res2,true);
                  file_put_contents('mt2.txt',$tt);
-                 if(!$res2['ret']){
+                 if($res2['ret'] == 0){
                      $res3 = Withdraw::updateAll(['mt4_status' => 0], "id = $id");    //更新出金表的状态(mt4未扣减)
                      if($res3){
                          return $this->outJson(1, [], '操作成功');

normandcrm/service/backend/web/str1.txt

@@ -0,0 +1 @@
+member_id=1app_oauth#^A3lopM5*$%TUa@wtC467^

normandcrm/service/backend/web/test.txt

@@ -0,0 +1 @@
+{"ip":"127.0.0.1","password":"123456","type":"99","username":"admin","token":"6bf46044553c27e3122b7893c6d5b3ba"}