Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/Health/IndexController.php

@@ -183,10 +183,10 @@ class IndexController extends Controller
             ->paginate($perpage);
 
         foreach ($list as $k => $v){
-            if($v->sex == 0){
-                $list[$k]['sex'] = '女';
-            }else{
+            if($v->sex == 1){
                 $list[$k]['sex'] = '男';
+            }else{
+                $list[$k]['sex'] = '女';
             }
             if($v->fresh == 0){
                 $list[$k]['fresh'] = '否';
@@ -237,10 +237,10 @@ class IndexController extends Controller
             $v->native_place_cn = get_district_cn($v->native_place);
             $v->education = get_category($v->education);
             $v->pro_type = get_category_major($v->pro_type);
-            if($v->sex == 0){
-                $list[$k]['sex'] = '女';
-            }else{
+            if($v->sex == 1){
                 $list[$k]['sex'] = '男';
+            }else{
+                $list[$k]['sex'] = '女';
             }
             if($v->status == 0){
                 $list[$k]['status'] = '未下载';
@@ -350,10 +350,10 @@ class IndexController extends Controller
         foreach ($list as $k => $v){
             $v->native_place_cn = get_district_cn($v->native_place);
             $v->education = get_category($v->education);
-            if($v->sex == 0){
-                $list[$k]['sex'] = '女';
-            }else{
+            if($v->sex == 1){
                 $list[$k]['sex'] = '男';
+            }else{
+                $list[$k]['sex'] = '女';
             }
             if($v->status == 0){
                 $list[$k]['status'] = '未下载';

app/Http/Controllers/Mobile/Lottery/LotteryController.php

@@ -148,12 +148,6 @@ class LotteryController extends MobileBaseController
         if (!empty($log)) {
             return response()->json(['status' => 0, 'msg' => '您已抽过奖！']);
         }
-        LotteryLog::create([
-            'create_time' => $date,
-            'type'        => $data['type'],
-            'number'      => 1,
-            'open_id'     => $data['open_id'],
-        ]);
 
         //奖品列表
         $model     = new LotteryPrize();
@@ -162,6 +156,17 @@ class LotteryController extends MobileBaseController
         foreach ($prize_arr as $key => $val) {
             $arr[$val['id']] = $val['prize_odds'] * 100;
         }
+        if (array_sum($arr) == 0) {
+            return response()->json(['status' => 0, 'msg' => '奖品已全部抽完，请联系管理员！']);
+        }
+
+        //增加抽奖记录
+        LotteryLog::create([
+            'create_time' => $date,
+            'type'        => $data['type'],
+            'number'      => 1,
+            'open_id'     => $data['open_id'],
+        ]);
         $rid = $this->_get_rand($arr); //根据概率获取奖项id
 
         //增加奖品
@@ -190,7 +195,6 @@ class LotteryController extends MobileBaseController
         $result = '';
         //概率数组的总概率精度
         $proSum  = array_sum($proArr);
-        $randNum = mt_rand(1, $proSum);
         //概率数组循环
         foreach ($proArr as $key => $proCur) {
             $randNum = mt_rand(1, $proSum);

public/themes/default/views/app/index.blade.php

@@ -132,7 +132,7 @@
                 {{--<a href="{{route('mien')}}">人才风采</a>
                 <a href="{{route('feature')}}">特色人才</a>--}}
                 <a href="{{route(url_rewrite('AIX_help'))}}">帮助中心</a>
-                <a href="/jjrl.html" target="_blank">零工人才矩阵</a>
+                <a href="/jjrl.html" target="_blank">晋爱人才</a>
                 <div class="clear"></div>
             </div>
             <div class="clear"></div>

public/themes/default/views/mobile/app/active/spring.blade.php

@@ -353,8 +353,7 @@
                     return;
                 }
 
-                turnplate.number--;
-                $('#number').html(turnplate.number);
+                // $('#number').html(turnplate.number);
 
                 if (turnplate.bRotate) return;
                 turnplate.bRotate = !turnplate.bRotate;
@@ -365,6 +364,7 @@
                     _token: "{{csrf_token()}}"
                 }, function (json) {
                     if (json.status) {
+                        turnplate.number--;
                         var item = 0;
                         for (var i = 0; i < turnplate.ids.length; i++) {
                             if (turnplate.ids[i] == json.id) {
@@ -376,6 +376,7 @@
                         rotateFn(item, json.msg);
                     } else {
                         alert(json.msg);
+                        turnplate.bRotate = !turnplate.bRotate;
                     }
                 }, 'json');
 

public/themes/default/views/mobile/app/active/spring_special_jkq.blade.php

@@ -433,8 +433,7 @@
                     return;
                 }
 
-                turnplate.number--;
-                $('#number').html(turnplate.number);
+                // $('#number').html(turnplate.number);
 
                 if (turnplate.bRotate) return;
                 turnplate.bRotate = !turnplate.bRotate;
@@ -445,6 +444,7 @@
                     _token: "{{csrf_token()}}"
                 }, function (json) {
                     if (json.status) {
+                        turnplate.number--;
                         var item = 0;
                         for (var i = 0; i < turnplate.ids.length; i++) {
                             if (turnplate.ids[i] == json.id) {
@@ -456,6 +456,7 @@
                         rotateFn(item, json.msg);
                     } else {
                         alert(json.msg);
+                        turnplate.bRotate = !turnplate.bRotate;
                     }
                 }, 'json');
 

public/themes/default/views/mobile/app/health/recruit/apply.blade.php

@@ -54,7 +54,7 @@
                     </div>
                     <div class="radio-cell">
                         <label for="radio5">女</label>
-                        <input id="radio5" name="sex" type="radio" value="0" title="女">
+                        <input id="radio5" name="sex" type="radio" value="2" title="女">
                     </div>
                     <div class="clear"></div>
                 </div>

public/themes/default/views/mobile/app/health/recruit/quanji.blade.php

@@ -52,7 +52,7 @@
                     </div>
                     <div class="radio-cell">
                         <label for="radio5">女</label>
-                        <input id="radio5" name="sex" type="radio" value="0" title="女">
+                        <input id="radio5" name="sex" type="radio" value="2" title="女">
                     </div>
                     <div class="clear"></div>
                 </div>

public/themes/default/views/mobile/app/health/recruit/will.blade.php

@@ -52,7 +52,7 @@
                 </div>
                 <div class="radio-cell">
                     <label for="radio5">女</label>
-                    <input id="radio5" name="sex" type="radio" value="0" title="女">
+                    <input id="radio5" name="sex" type="radio" value="2" title="女">
                 </div>
                 <div class="clear"></div>
             </div>

public/themes/default/views/mobile/app/health/teach/index.blade.php

@@ -65,7 +65,7 @@
                     </div>
                     <div class="radio-cell">
                         <label for="radio5">女</label>
-                        <input id="radio5" name="sex" type="radio" value="0" title="女">
+                        <input id="radio5" name="sex" type="radio" value="2" title="女">
                     </div>
                     <div class="clear"></div>
                 </div>

public/themes/default/views/module/section/nav_header.blade.php

@@ -16,7 +16,7 @@
 {{--                <li class="nli J_hoverbut @if(strripos( url($current_url), route('knowall')) !== false) select  @endif"><a href="{{route('knowall')}}">网上办事</a></li>--}}
                 <li class="nli J_hoverbut @if(strripos( url($current_url), route('policy.list',['id'=>72])) !== false) select  @endif"><a href="{{route('policy.list',['id'=>72])}}">晋江政策</a></li>
                 <li class="nli J_hoverbut @if(strripos( url($current_url), route('help')) !== false) select  @endif"><a href="{{route(url_rewrite('AIX_help'))}}">帮助中心</a></li>
-                <li class="nli J_hoverbut"><a href="/jjrl.html" target="_blank">零工人才矩阵</a></li>
+                <li class="nli J_hoverbut"><a href="/jjrl.html" target="_blank">晋爱人才</a></li>
             </ul>
         </div>
         <div class="tr"></div>