Merge branch 'master' into dev

app/controller/api/store/merchant/Taskorderguquan.php

@@ -18,53 +18,58 @@ class Taskorderguquan
     {
 
         /**
-        13231658486周行体500
-        13333069689魏惠新500
-        13959100621周金花300
+        补贴下面人员
+        13231658486周行体600
+        13333069689魏惠新600
+        13959100621周金花500
         13701061395李素红300
-        17501006833邢艳丽300
+        17501006833邢艳丽400
+        15631982690魏震洪300
+        18603401312黄金花200
         13521438652徐立苹300
         15832971815孟晓玮300
         18600200909陈冠霖300
         15810064711 王   玲 300
-        18001316701闫旭300
         13932925303会强300
+        13901074090陈玉刚300
+        13381085923王建军50
         13601071082隋彩云200
         13161909228刘银霞50
-        18603401312黄金花 50
-        18760167163刘春梅 50
+        18760167163刘春梅50
         18911752386魏利琴50
         13215917919李小秋50
+        15321221558李伟50
         15332507711张传莲50
-        15960349661吕丽娣50
-        13381085923王建军50
-        13683609309李长生50
-        13601179856陈瑞元50
-        13901074090陈玉刚200
+        15960349667吕丽娣50
+        18612051372李金俭50
         18715313601大饼400
+        其余部分做分红
         */
         $data = [
-            '13231658486' => 500,
-            '13333069689' => 500,
-            '13959100621' => 300,
+            '13231658486' => 600,
+            '13333069689' => 600,
+            '13959100621' => 500,
             '13701061395' => 300,
-            '17501006833' => 300,
-            '13521438652' => 200,
+            '17501006833' => 400,
+            '15631982690' => 300,
+            '18603401312' => 200,
+            '13521438652' => 300,
             '15832971815' => 300,
-            '18600200909' => 200,
-            '15810064711' => 200,
-            '18001316701' => 200,
-            '13601071082' => 100,
+            '18600200909' => 300,
+            '15810064711' => 300,
+            '13932925303' => 300,
+            '13901074090' => 300,
+            '13381085923' => 50,
+            '13601071082' => 200,
             '13161909228' => 50,
-            '18603401312' => 300,
             '18760167163' => 50,
             '18911752386' => 50,
             '13215917919' => 50,
+            '15321221558' => 50,
             '15332507711' => 50,
-            '15960349661' => 50,
-            '13901074090' => 200,
+            '15960349667' => 50,
             '18612051372' => 50,
-            '18715313601' => 350
+            '18715313601' => 400
         ];
 
 

app/controller/api/user/UserExtract.php

@@ -80,7 +80,7 @@ class UserExtract extends BaseController
 
         $sms_code = $this->request->param('sms_code');
 
-        // if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '9527'){
+        // if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '6865'){
         //     return app('json')->fail('验证码不正确');
         // }