Merge branch 'master' of http://git.dongerkj.com:9095/derkj/NN2020042801

app/index/controller/JiamengController.php

@@ -236,6 +236,11 @@ class JiamengController extends HomeBaseController
 
         unset($supports[0]);
         $info['jm_support'] = $jmSupport? $jmSupport : $supports;
+        $areaList = config('params.areaList');
+        $areaId = isset($info['area_id'])? intval($info['area_id']) : '-1';
+        $area = isset($areaList[$areaId])? $areaList[$areaId] : '';
+        $info['area'] = $info['area']? $info['area'] : $area;
+        
         $catinfo = Db::name('category')->where('id',$info['catid'])->find();
         
         $parinfo = Db::name('category')->where('id',$catinfo['parent_id'])->find();