Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

# Conflicts:
#	vendor/composer/autoload_files.php
#	vendor/composer/autoload_static.php

.gitignore

@@ -15,9 +15,14 @@ Desktop.ini
 */.idea
 /.idea/*
 
-#composer.json
+.vscode
 
 #App
 common/config/config.php
 vender
-frontendApi/web/pdfs/
+frontendApi/web/pdfs/
+#composer.json
+composer.lock
+
+frontendApi/web/index.php
+backendApi/web/index.php

backendApi/web/.gitignore

@@ -2,4 +2,5 @@
 /test.php
 upload
 /upload/excelExport
-/upload/excel_export
+/upload/excel_export
+index.php

common/models/forms/WithdrawForm.php

@@ -377,29 +377,30 @@ class WithdrawForm extends Model {
             $this->addError('add', '不存在该用户');
             return -1;
         }
-        if( !$user['ID_CARD'] ) {
-            $this->addError('add', '完善身份信息后才可以提现');
-            return -1;
-        }
-
-        $response = LingYunGongApi::hasIdCardInfo($user['ID_CARD']);
-        if( !$response ) {
-            $this->addError('add', '接口网络错误');
-            return -1;
-        }
-
-        if( !isset($response['has']) ) {
-            $this->addError('add', '接口格式错误');
-            return -1;
-        }
-
-
-        if( $response['has'] === true ) {
-            return 0;
-        }else {
-            $this->addError('add', $response['err_msg']['msg']);
-            return -2;
-        }
+//        if( !$user['ID_CARD'] ) {
+//            $this->addError('add', '完善身份信息后才可以提现');
+//            return -1;
+//        }
+//
+//        $response = LingYunGongApi::hasIdCardInfo($user['ID_CARD']);
+//        if( !$response ) {
+//            $this->addError('add', '接口网络错误');
+//            return -1;
+//        }
+//
+//        if( !isset($response['has']) ) {
+//            $this->addError('add', '接口格式错误');
+//            return -1;
+//        }
+//
+//
+//        if( $response['has'] === true ) {
+//            return 0;
+//        }else {
+//            $this->addError('add', $response['err_msg']['msg']);
+//            return -2;
+//        }
+        return 0;
     }
 
     /**

frontendApi/web/.gitignore

@@ -1,2 +1,3 @@
 /index-test.php
-/test.php
+/test.php
+index.php

frontendEle/src/views/shop/index.vue

@@ -119,6 +119,11 @@
                 console.log(val);
             },
             goToAccounts() {
+                if (this.multipleSelection.length <= 0) {
+                  this.$message.error('Please choose the products.')
+                  return false
+                }
+
                 this.is_go_order=true;
                 // this.multipleSelection.map((item,index)=>{
                 //     item.chose_num = parseInt(item.chose_num);