fix:单页

application/admin/controller/shop/Page.php

@@ -23,7 +23,7 @@ class Page extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\shop\Page;
-        $this->view->assign("flagList", $this->model->getFlagList());
+        // $this->view->assign("flagList", $this->model->getFlagList());
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 

application/admin/model/shop/Page.php

@@ -21,7 +21,7 @@ class Page extends Model
 
     // 追加属性
     protected $append = [
-        'flag_text',
+        // 'flag_text',
         'status_text',
         'url'
     ];
@@ -56,13 +56,13 @@ class Page extends Model
     {
         return $value;
         //替换卡片信息
-        return \addons\shop\library\Service::replaceSourceTpl($value);
+        return \app\common\library\Service::replaceSourceTpl($value);
     }
 
     public function getContentAttr($value, $data)
     {
         //组装卡片信息
-        return \addons\shop\library\Service::formatSourceTpl($value);
+        return \app\common\library\Service::formatSourceTpl($value);
     }
 
     public function getUrlAttr($value, $data)
@@ -87,7 +87,7 @@ class Page extends Model
             ':month'   => date("m", $time),
             ':day'     => date("d", $time)
         ];
-        return addon_url('shop/page/index', $vars, static::$config['urlsuffix'], $domain);
+        return addon_url('shop/page/index', $vars,'', $domain);
     }
 
     public function getStatusList()
@@ -102,19 +102,19 @@ class Page extends Model
         return $list[$value] ?? '';
     }
 
-    public function getFlagList()
-    {
-        $config = get_addon_config('shop');
-        return $config['flagtype'];
-    }
-
-    public function getFlagTextAttr($value, $data)
-    {
-        $value = $value ? $value : $data['flag'];
-        $valueArr = explode(',', $value);
-        $list = $this->getFlagList();
-        return implode(',', array_intersect_key($list, array_flip($valueArr)));
-    }
+    // public function getFlagList()
+    // {
+    //     $config = get_addon_config('shop');
+    //     return $config['flagtype'];
+    // }
+
+    // public function getFlagTextAttr($value, $data)
+    // {
+    //     $value = $value ? $value : $data['flag'];
+    //     $valueArr = explode(',', $value);
+    //     $list = $this->getFlagList();
+    //     return implode(',', array_intersect_key($list, array_flip($valueArr)));
+    // }
 
     public static function getArrayData($data)
     {

application/admin/view/shop/page/add.html

@@ -13,20 +13,7 @@
             <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
         </div>
     </div>
-    <div class="form-group">
-        <label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-
-            <!--@formatter:off-->
-            <select  id="c-flag" data-rule="" class="form-control selectpicker" multiple="" name="row[flag][]">
-                {foreach name="flagList" item="vo"}
-                    <option value="{$key|htmlentities}" {in name="key" value=""}selected{/in}>{$vo|htmlentities}</option>
-                {/foreach}
-            </select>
-            <!--@formatter:on-->
-
-        </div>
-    </div>
+   
     <div class="form-group">
         <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -45,9 +32,9 @@
         <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
             <textarea id="c-content" data-rule="" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
-            <div style="margin-top:5px;">
+            <!-- <div style="margin-top:5px;">
                 <a href="javascript:" class="btn btn-xs btn-success btn-card">{:__('插入卡片')}</a>
-            </div>
+            </div> -->
         </div>
     </div>
     <div class="form-group">

application/admin/view/shop/page/edit.html

@@ -14,18 +14,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-
-            <select id="c-flag" data-rule="" class="form-control selectpicker" multiple="" name="row[flag][]">
-                {foreach name="flagList" item="vo"}
-                <option value="{$key|htmlentities}" {in name="key" value="$row.flag" }selected{/in}>{$vo|htmlentities}</option>
-                {/foreach}
-            </select>
-
-        </div>
-    </div>
-    <div class="form-group">
         <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
@@ -43,9 +31,9 @@
         <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
             <textarea id="c-content" data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
-            <div style="margin-top:5px;">
+            <!-- <div style="margin-top:5px;">
                 <a href="javascript:" class="btn btn-xs btn-success btn-card">{:__('插入卡片')}</a>
-            </div>
+            </div> -->
         </div>
     </div>
     <div class="form-group">

application/admin/view/shop/page/index.html

@@ -14,7 +14,7 @@
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh,add,edit,del')}
+                        {:build_toolbar('refresh,add,del')}
                         <a class="btn btn-success btn-recyclebin btn-dialog" href="shop/page/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
 
                         <div class="dropdown btn-group {:$auth->check('shop/page/multi')?'':'hide'}">

public/assets/js/backend/shop/page.js

@@ -30,7 +30,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', sortable: true, title: __('Id')},
                         {field: 'type', title: __('Type'), formatter: Table.api.formatter.search, searchList: Config.typeList},
                         {field: 'title', title: __('Title'), operate: 'like'},
-                        {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
                         {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'views', sortable: true, title: __('Views'), operate: 'BETWEEN'},
                         {