1557492053 1 gadu atpakaļ
vecāks
revīzija
0d15ac478e

+ 2 - 2
application/admin/controller/Area.php

@@ -76,13 +76,13 @@ class Area extends Backend
         $admin = $this->auth->getUserInfo();
         if ($admin) {
             if (\E_IDENTITY_TYPE::Agency === $admin["type"]) {
-                array_push($where, ["area_code", "in", explode(",", $admin["city_codes"])]);
+                $where[] = ["area_code", "in", explode(",", $admin["city_codes"])];
             }
         }
         return $this->c_selectpage($where);
     }
 
-    public function indexv2()
+    public function commonselect()
     {
         return parent::selectpage();
     }

+ 2 - 2
application/admin/controller/service/Service.php

@@ -85,7 +85,7 @@ class Service extends Backend
         }
         $params = $this->preExcludeFields($params);
 
-        $area = Area::get($params['p_code']);
+        $area = Area::get(['area_code' => $params['p_code']]);
         if (!$area) {
             $this->error('所属省份选择错误');
         }
@@ -136,7 +136,7 @@ class Service extends Backend
         }
         $params = $this->preExcludeFields($params);
 
-        $area = Area::get($params['p_code']);
+        $area = Area::get(['area_code' => $params['p_code']]);
         if (!$area) {
             $this->error('所属省份选择错误');
         }

+ 4 - 5
application/admin/view/service/service/add.html

@@ -3,19 +3,18 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" class="form-control" name="row[name]" type="text" value="">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">所属省份:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-p_code" data-rule="required" data-source="area/indexv2"
-                   class="form-control selectpage" data-params='{"custom[level]": "1"}' name="row[p_code]" type="text" value="">
+            <input id="c-p_code" data-rule="required" data-source="area/commonselect"
+                   class="form-control selectpage" data-params='{"custom[level]": "1"}' data-primary-key="area_code" name="row[p_code]" type="text" value="">
         </div>
     </div>
 
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('星级')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -51,7 +50,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Real_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-real_price" class="form-control" step="0.01" name="row[real_price]" type="number">
+            <input id="c-real_price" data-rule="required" class="form-control" step="0.01" name="row[real_price]" type="number">
         </div>
     </div>
     <div class="form-group">

+ 9 - 0
application/admin/view/service/service/edit.html

@@ -6,6 +6,15 @@
             <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">所属省份:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-p_code" data-rule="required" data-source="area/commonselect"
+                   class="form-control selectpage" data-params='{"custom[level]": "1"}' data-primary-key="area_code" name="row[p_code]" type="text" value="{$row.p_code|htmlentities}">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('星级')}:</label>
         <div class="col-xs-12 col-sm-8">