Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop

config/admin.php

@@ -327,7 +327,7 @@ return [
         'dark_mode_switch' => false,
 
         // bg-primary, bg-info, bg-warning, bg-success, bg-danger, bg-dark
-        'navbar_color' => '',
+        'navbar_color' => 'bg-primary',
     ],
 
     /*

config/app.php

@@ -80,7 +80,7 @@ return [
     |
     */
 
-    'locale' => 'zh-cn',
+    'locale' => 'zh-CN',
 
     /*
     |--------------------------------------------------------------------------

resources/lang/zh-CN/ims-cjdc-market.php

@@ -1,17 +1,17 @@
 <?php 
 return [
     'labels' => [
-        'ImsCjdcMarket' => 'ImsCjdcMarket',
+        'ImsCjdcMarket' => '市场管理',
     ],
     'fields' => [
-        'name' => '市场名称',
-        'logo' => '市场logo',
+        'name' => '名称',
+        'logo' => 'logo',
         'introduce' => '介绍',
-        'imgs' => '市场图片，多张用英文逗号（,）隔开',
-        'addtime' => 'addtime',
-        'sort' => '排序，数值越大越靠前',
-        'status' => '状态，0禁用，1正常',
-        'coordinates' => '坐标，经纬度',
+        'imgs' => '图片',
+        'addtime' => '创建时间',
+        'sort' => '排序',
+        'status' => '状态',
+        'coordinates' => '经纬度',
         'remark' => '备注',
         'address' => '详细地址',
         'poundage' => '外卖手续费',
@@ -19,7 +19,7 @@ return [
         'dm_poundage' => '当面手续费',
         'yd_poundage' => '预约手续费',
         'dada_number' => '达达配送 门店编号',
-        'is_open_dada' => '是否开启达达配送，1开启，2关闭',
+        'is_open_dada' => '是否开启达达配送',
         'loudspeaker_imei' => '喇叭终端的机器码IMEI码',
         'dishes_menu_intro' => '市场菜谱简介',
         'create_time' => '测试用时间',

resources/lang/zh-CN/lanzu-mm-info.php

@@ -1,7 +1,7 @@
 <?php 
 return [
     'labels' => [
-        'LanzuMmInfo' => 'LanzuMmInfo',
+        'LanzuMmInfo' => '市场经理',
     ],
     'fields' => [
         'name' => '名称',
@@ -10,7 +10,7 @@ return [
         'id_back' => '身份证反面',
         'id_number' => '身份证号',
         'admin_user_id' => '系统登陆帐号',
-        'status' => '状态 /1/-1 正常/禁用',
+        'status' => '状态',
         'is_del' => '是否删除',
     ],
     'options' => [

resources/lang/zh-CN/lanzu-mm-withdraw.php

@@ -1,12 +1,12 @@
 <?php 
 return [
     'labels' => [
-        'LanzuMmWithdraw' => 'LanzuMmWithdraw',
+        'LanzuMmWithdraw' => '市场经理提现',
     ],
     'fields' => [
         'mm_id' => '关联的市场经理id',
         'money' => '提现金额',
-        'status' => '提现状态 0/1/-1    待审核/已同意/已拒绝',
+        'status' => '提现状态',
     ],
     'options' => [
     ],

resources/lang/zh-CN/lanzu-mp-info.php

@@ -1,7 +1,7 @@
 <?php 
 return [
     'labels' => [
-        'LanzuMpInfo' => 'LanzuMpInfo',
+        'LanzuMpInfo' => '服务商管理',
     ],
     'fields' => [
         'name' => '名称',
@@ -13,7 +13,7 @@ return [
         'id_back' => '身份证反面',
         'id_number' => '身份证号',
         'admin_user_id' => '系统登陆帐号',
-        'status' => '状态 0/1/2 未审核/已审核',
+        'status' => '状态',
     ],
     'options' => [
     ],

resources/lang/zh-CN/lanzu-mp-withdraw.php

@@ -1,7 +1,7 @@
 <?php 
 return [
     'labels' => [
-        'LanzuMpWithdraw' => 'LanzuMpWithdraw',
+        'LanzuMpWithdraw' => '服务商提现',
     ],
     'fields' => [
         'mp_id' => '关联的服务商id',