afa пре 9 месеци
родитељ
комит
360ca75280

+ 5 - 42
application/admin/controller/product/Lists.php

@@ -76,7 +76,7 @@ class Lists extends Backend
     public function add()
     {
         if (false === $this->request->isPost()) {
-            $this->assignconfig('areaData', []);
+          
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');
@@ -96,15 +96,10 @@ class Lists extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
                 $this->model->validateFailException()->validate($validate);
             }
-            if(!empty($params['is_area'])){
-                $areaArr    = json_decode($params['product_area'], true);
-                $areaArrTxt = json_decode($params['product_area_txt'], true);
-                if(empty($areaArr) || empty($areaArrTxt)) throw new ValidateException('请添加商品关联区域');
-            }
-            unset($params['product_area'], $params['product_area_txt']);
+           
             //商品
             $result   = $this->model->create($params);
-            if(!empty($params['is_area'])) $result= self::setEqualArea($result->id, $areaArr, $areaArrTxt, 0);
+            //if(!empty($params['is_area'])) $result= self::setEqualArea($result->id, $areaArr, $areaArrTxt, 0);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();
@@ -134,32 +129,6 @@ class Lists extends Backend
             $this->error(__('You have no permission'));
         }
         if (false === $this->request->isPost()) {
-            $area = $this->productArea::where('product_id', $ids)->select();
-            $areaData = array();
-            $areaCode = array();
-            $areaTxt  = array();
-            foreach ($area as $key =>$item) {
-                if($item->province > 0){
-                    $areaData[$key]    = $item->province;
-                    $areaCode[$key][0] = $item->province;
-                } 
-                if($item->city > 0){
-                    $areaData[$key]        = $item->city;
-                    $areaCode[$key][1] = $item->city;
-                }
-                if($item->area > 0) {
-                    $areaData[$key]        = $item->area;
-                    $areaCode[$key][2] = $item->area;
-                }
-                if($item->county > 0)  {
-                    $areaData[$key]        = $item->county;
-                    $areaCode[$key][3] = $item->county;
-                }
-                $areaTxt[]  = [$item->address];
-            }
-            $this->assignconfig('areaData', json_encode($areaData));
-            $this->view->assign('areaTxt', json_encode($areaTxt, JSON_UNESCAPED_UNICODE));
-            $this->view->assign('areaCode', json_encode($areaCode));
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
@@ -177,15 +146,9 @@ class Lists extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                 $row->validateFailException()->validate($validate);
             }
-            if(!empty($params['is_area'])){
-                $areaArr    = json_decode($params['product_area'], true);
-                $areaArrTxt = json_decode($params['product_area_txt'], true);
-                if(empty($areaArr) || empty($areaArrTxt)) throw new ValidateException('请添加商品关联区域');
-            }
-            unset($params['product_area'], $params['product_area_txt']);
+      
             $result=$row->allowField(true)->save($params);
-            //更新地区
-            if(!empty($params['is_area'])) $result= self::setEqualArea($ids, $areaArr, $areaArrTxt, 1);
+       
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();

+ 11 - 36
application/admin/view/product/lists/add.html

@@ -3,15 +3,12 @@
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
-        <div class="col-xs-12 col-sm-2">
+        <div class="col-xs-12 col-sm-3">
             <input id="c-type_id" data-rule="required" data-source="product/products/index" data-field="zh_title" class="form-control selectpage" name="row[type_id]" type="text" value="">
         </div>
-        <label class="control-label col-xs-12 col-sm-1">{:__('关联区域')}:</label>
-        <div class="col-xs-12 col-sm-2">
-            {:build_radios('row[is_area]', ['0'=>__('否'), '1'=>__('关联')])}
-        </div>
-        <label class="control-label col-xs-12 col-sm-1">{:__('Weigh')}:</label>
-        <div class="col-xs-12 col-sm-2">
+  
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <div class="col-xs-12 col-sm-3">
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
         </div>
     </div>
@@ -25,7 +22,12 @@
             <input id="c-en_name" data-rule="required" class="form-control" name="row[en_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">
+            {:build_radios('row[is_area]', ['0'=>__('否'), '1'=>__('关联')])}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Thum')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -56,31 +58,6 @@
     </div>
    
 
-    <div class="form-group" id="app">
-        <label class="control-label col-xs-12 col-sm-2">{:__('关联区域')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="block">
-            <treeselect
-            valueFormat="value"
-            :multiple="true"
-            :options="options"
-            :flat="true"
-            :default-expand-level="1"
-            :sort-value-by="sortValueBy"
-            placeholder="选择关联区域"
-            v-model="data"
-            @input="handleChange"
-            ref="treeselect"/>
-            <template v-slot:value-label="{ node }">
-              <span>{{ getNode(node) }}</span>
-            </template>
-          </treeselect>
-            </div>
-            <input id="c-product_area" class="form-control" name="row[product_area]" type="hidden" value="">
-            <input id="c-product_area_txt" class="form-control" name="row[product_area_txt]" type="hidden" value="">
-        </div>    
-    </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Details')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -97,7 +74,5 @@
     </div>
 </div>
 </form>
-<script src="__CDN__/assets/libs/vue/vue.js"></script>
-<script src="__CDN__/assets/libs/treeselect/treeselect.js"></script>
-<link href="__CDN__/assets/libs/treeselect/treeselect.css" rel="stylesheet">
+
 

+ 9 - 8
application/admin/view/product/lists/edit.html

@@ -3,15 +3,11 @@
     <div class="form-horizontal">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
-        <div class="col-xs-12 col-sm-2">
+        <div class="col-xs-12 col-sm-3">
             <input id="c-type_id" data-rule="required" data-source="product/products/index" class="form-control selectpage" data-field="zh_title" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
         </div>
-        <label class="control-label col-xs-12 col-sm-1">{:__('关联区域')}:</label>
-        <div class="col-xs-12 col-sm-2">
-            {:build_radios('row[is_area]', ['0'=>__('否'), '1'=>__('关联')], $row['is_area'])}
-        </div>
-        <label class="control-label col-xs-12 col-sm-1">{:__('Weigh')}:</label>
-        <div class="col-xs-12 col-sm-2">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <div class="col-xs-12 col-sm-3">
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
         </div>
     </div>
@@ -26,7 +22,12 @@
             <input id="c-en_name" data-rule="required" class="form-control" name="row[en_name]" type="text" value="{$row.en_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">
+            {:build_radios('row[is_area]', ['0'=>__('否'), '1'=>__('关联')], $row['is_area'])}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Thum')}:</label>
         <div class="col-xs-12 col-sm-8">