wesmiler

public/themes/admin_simpleboot3/admin/business/device_add.html

@@ -44,7 +44,7 @@
             <div class="col-md-6 col-sm-6">
                 <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号">
             </div>
-            <label style="height: 30px; line-height: 30px;" for="show_device_code"><input id="show_device_code" type="checkbox" value="" checked>显示设备号</label>
+            <label style="height: 30px; line-height: 30px;" for="show_device_code"><input id="show_device_code" name="show_device_code" type="checkbox" value="1" checked>显示设备号</label>
         </div>
         <div class="form-group">
             <label for="input-number" class="col-sm-2 control-label"><span class="form-required">*</span>编号</label>

public/themes/admin_simpleboot3/admin/business/device_edit.html

@@ -45,7 +45,7 @@
                 <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号" value="{$info.device_code|default=''}">
             </div>
             <label style="height: 30px; line-height: 30px;"
-                    for="show_device_code"><input id="show_device_code" type="checkbox" value="" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
+                    for="show_device_code"><input id="show_device_code" name="show_device_code" type="checkbox" value="1" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
         </div>
         <div class="form-group">
             <label for="input-number" class="col-sm-2 control-label"><span class="form-required">*</span>编号</label>

public/themes/admin_simpleboot3/admin/shop/device_add.html

@@ -44,7 +44,7 @@
             <div class="col-md-6 col-sm-6">
                 <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号">
             </div>
-            <label style="height: 30px; line-height: 30px;" for="show_device_code"><input id="show_device_code" type="checkbox" value="" checked>显示设备号</label>
+            <label style="height: 30px; line-height: 30px;" for="show_device_code"><input id="show_device_code" name="show_device_code" type="checkbox" value="1" checked>显示设备号</label>
         </div>
         <div class="form-group">
             <label for="input-number" class="col-sm-2 control-label"><span class="form-required">*</span>编号</label>
@@ -141,7 +141,6 @@
 
         mark.addEventListener("dragend", showInfo);
         mark.enableDragging();    //可拖拽
-        loadLocation();
         map.addEventListener("click",function(e){
             poi = new BMap.Point(e.point.lng, e.point.lat);
             mark = new BMap.Marker(poi);
@@ -150,6 +149,7 @@
 
 
         });
+        loadLocation();
 
         /**
          * 获取地址
@@ -207,7 +207,7 @@
                     $("#input-address").val(address);
 
                     setTimeout(function(){
-                        showMsg('您的城市：'+r.address.city);
+                        showMsg('您的城市：'+r.address.city+' '+r.address.district);
                     }, 500)
                 }
                 else {

public/themes/admin_simpleboot3/admin/shop/device_edit.html

@@ -45,7 +45,7 @@
                 <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号" value="{$info.device_code|default=''}">
             </div>
             <label style="height: 30px; line-height: 30px;"
-                   for="show_device_code"><input id="show_device_code" type="checkbox" value="" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
+                   for="show_device_code"><input id="show_device_code" type="checkbox" name="show_device_code" value="1" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
         </div>
         <div class="form-group">
             <label for="input-number" class="col-sm-2 control-label"><span class="form-required">*</span>编号</label>

public/themes/admin_simpleboot3/shop/devices/add.html

@@ -28,7 +28,7 @@
             <div class="col-md-6 col-sm-6">
                 <input type="text" class="form-control" id="input-api-key" name="api_key" placeholder="32位密钥">
             </div>
-            <label style="height: 30px; line-height: 30px;" for="show_device_code"><input id="show_device_code" type="checkbox" value="" checked>显示设备号</label>
+            <label style="height: 30px; line-height: 30px;" for="show_device_code"><input id="show_device_code" name="show_device_code" type="checkbox" value="1" checked>显示设备号</label>
         </div>
         <div class="form-group">
             <label for="input-device_code" class="col-sm-2 control-label"><span class="form-required">*</span>序列号</label>

public/themes/admin_simpleboot3/shop/devices/edit.html

@@ -35,7 +35,7 @@
                 <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号" value="{$info.device_code|default=''}">
             </div>
             <label style="height: 30px; line-height: 30px;"
-                   for="show_device_code"><input id="show_device_code" type="checkbox" value="" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
+                   for="show_device_code"><input id="show_device_code" type="checkbox" name="show_device_code" value="1" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
         </div>
         <div class="form-group">
             <label for="input-number" class="col-sm-2 control-label"><span class="form-required">*</span>编号</label>

vendor/thinkcmf/cmf-app/src/admin/controller/ShopController.php

@@ -995,6 +995,7 @@ class ShopController extends AdminBaseController
         $businessList = Db::name('user')->where(['user_type'=> 4,'user_status'=> 1])
             ->field('id,user_login,real_name')
             ->select();
+
         $this->assign('businessList', $businessList);
         $this->assign('info', $info);
         return $this->fetch();

vendor/thinkcmf/cmf/src/controller/AdminBaseController.php

@@ -21,6 +21,12 @@ class AdminBaseController extends BaseController
         hook('admin_init');
         parent::initialize();
         $sessionAdminId = session('ADMIN_ID');
+        $mapConfig = config('config.map');
+        $mapKey = isset($mapConfig['key'])? $mapConfig['key'] : '';
+        $format = config('config.versionFormat');
+        $format = $format? $format : 'Ymd';
+        $this->assign('version', date('YmdHis'));
+        $this->assign('mapKey', $mapKey);
         if (!empty($sessionAdminId)) {
             $user = Db::name('user')->where('id', $sessionAdminId)->find();