Commit 43533492 authored by liyadong's avatar liyadong

Merge branch 'test' of http://gitlab.cccwangluo.com/zhoujun/uc_card into test

parents 90eff95f 61f0466b
...@@ -379,15 +379,15 @@ class CardController extends Controller ...@@ -379,15 +379,15 @@ class CardController extends Controller
$data['roleScore'] = $roleScore; $data['roleScore'] = $roleScore;
$data['jobImg'] = $jobInco[$info->job] ?? ''; $data['jobImg'] = $jobInco[$info->job] ?? '';
if($info->mercenary_score == 1){ if($info->mercenary_score == 2){
$data['ybImg'] = 'img-B'; $data['ybImg'] = 'img-B';
}elseif($info->mercenary_score == 2){
$data['ybImg'] = 'img-A';
}elseif($info->mercenary_score == 3){ }elseif($info->mercenary_score == 3){
$data['ybImg'] = 'img-S'; $data['ybImg'] = 'img-A';
}elseif($info->mercenary_score == 4){ }elseif($info->mercenary_score == 4){
$data['ybImg'] = 'img-SS'; $data['ybImg'] = 'img-S';
}elseif($info->mercenary_score == 5){ }elseif($info->mercenary_score == 5){
$data['ybImg'] = 'img-SS';
}elseif($info->mercenary_score == 6){
$data['ybImg'] = 'img-SSS'; $data['ybImg'] = 'img-SSS';
}else{ }else{
$data['ybImg'] = 'img-C'; $data['ybImg'] = 'img-C';
......
...@@ -194,7 +194,6 @@ class UtilService ...@@ -194,7 +194,6 @@ class UtilService
public static function getIsWx($httpUserAgent) public static function getIsWx($httpUserAgent)
{ {
return true;
if (strpos($httpUserAgent, 'MicroMessenger') !== false) { if (strpos($httpUserAgent, 'MicroMessenger') !== false) {
return true; return true;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment