diff --git a/app/admin/controller/Answer.php b/app/admin/controller/Answer.php deleted file mode 100755 index 905927b54..000000000 --- a/app/admin/controller/Answer.php +++ /dev/null @@ -1,147 +0,0 @@ - MyConst('common_is_show_list'), - 'common_is_text_list' => MyConst('common_is_text_list'), - ]; - // 数据 - $data = $this->data_detail; - if(!empty($data)) - { - // 内容 - if(!empty($data['content'])) - { - $data['content'] = str_replace('
', "\n", $data['content']); - } - - // 回复内容 - if(!empty($data['reply'])) - { - $data['reply'] = str_replace('
', "\n", $data['reply']); - } - } - $assign['data'] = $data; - - // 参数 - $params = $this->data_request; - unset($params['id']); - $assign['params'] = $params; - - // 数据赋值 - MyViewAssign($assign); - return MyView(); - } - - /** - * 保存 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-25T22:36:12+0800 - */ - public function Save() - { - $params = $this->data_request; - return ApiService::ApiDataReturn(AnswerService::AnswerSave($params)); - } - - /** - * 问答删除 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-15T11:03:30+0800 - */ - public function Delete() - { - $params = $this->data_request; - $params['user_type'] = 'admin'; - return ApiService::ApiDataReturn(AnswerService::AnswerDelete($params)); - } - - /** - * 问答回复处理 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2018-03-28T15:07:17+0800 - */ - public function Reply() - { - $params = $this->data_request; - return ApiService::ApiDataReturn(AnswerService::AnswerReply($params)); - } - - /** - * 状态更新 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-01-12T22:23:06+0800 - */ - public function StatusUpdate() - { - $params = $this->data_request; - return ApiService::ApiDataReturn(AnswerService::AnswerStatusUpdate($params)); - } -} -?> \ No newline at end of file diff --git a/app/admin/controller/Qrcode.php b/app/admin/controller/Qrcode.php new file mode 100644 index 000000000..0f7cf569a --- /dev/null +++ b/app/admin/controller/Qrcode.php @@ -0,0 +1,56 @@ +data_request['content'])) + { + MyViewAssign('msg', MyLang('content_params_empty_tips')); + return MyView('public/tips_error'); + } + (new \base\Qrcode())->View($this->data_request); + } + + /** + * 二维码下载 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-04-16T21:52:18+0800 + */ + public function Download() + { + $ret = (new \base\Qrcode())->Download($this->data_request); + if(!empty($ret) && isset($ret['code']) && $ret['code'] != 0) + { + MyViewAssign('msg', $ret['msg']); + return MyView('public/tips_error'); + } + } +} +?> \ No newline at end of file diff --git a/app/admin/controller/Site.php b/app/admin/controller/Site.php index 17a3eaea5..2c53d24f0 100755 --- a/app/admin/controller/Site.php +++ b/app/admin/controller/Site.php @@ -216,6 +216,14 @@ class Site extends Base // 导航类型 switch($this->nav_type) { + // 基础 + case 'base' : + $field_list[] = 'home_site_logo'; + $field_list[] = 'home_site_logo_wap'; + $field_list[] = 'home_site_logo_app'; + $field_list[] = 'home_site_logo_square'; + break; + // 用户注册 case 'register' : $field_list[] = 'home_user_reg_type'; @@ -244,6 +252,9 @@ class Site extends Base // 站点类型 case 'sitetype' : + // 站点类型 + $params['common_site_type'] = empty($params['common_site_type']) ? '' : (is_array($params['common_site_type']) ? json_encode($params['common_site_type'], JSON_UNESCAPED_UNICODE) : $params['common_site_type']); + // 自提地址处理 if(!empty($params['common_self_extraction_address'])) { @@ -312,7 +323,7 @@ class Site extends Base case 'cache' : // session是否使用缓存 // 数据是否使用缓存 - if((isset($params['common_session_is_use_cache']) && $params['common_session_is_use_cache'] == 1) || (isset($params['common_data_is_use_cache']) && $params['common_data_is_use_cache'] == 1)) + if((isset($params['common_session_is_use_cache']) && $params['common_session_is_use_cache'] == 1) || (isset($params['common_data_is_use_redis_cache']) && $params['common_data_is_use_redis_cache'] == 1)) { // 连接测试 $ret = SiteService::RedisCheckConnectPing($params['common_cache_data_redis_host'], $params['common_cache_data_redis_port'], $params['common_cache_data_redis_password']); diff --git a/app/admin/form/Goods.php b/app/admin/form/Goods.php index e65af6f0f..5f11fb00d 100644 --- a/app/admin/form/Goods.php +++ b/app/admin/form/Goods.php @@ -81,10 +81,11 @@ class Goods 'is_sort' => 1, 'sort_field' => 'title', 'search_config' => [ - 'form_type' => 'input', - 'form_name' => 'title|simple_desc|seo_title|seo_keywords|seo_keywords', - 'where_type' => 'like', - 'placeholder' => '请输入商品名称/简述/SEO信息' + 'form_type' => 'input', + 'form_name' => 'id', + 'where_type_custom' => 'in', + 'where_value_custom' => 'WhereValueGoodsInfo', + 'placeholder' => $lang['info_placeholder'], ], ], [ @@ -311,6 +312,29 @@ class Goods ]; } + /** + * 商品信息条件处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-30 + * @desc description + * @param [string] $value [条件值] + * @param [array] $params [输入参数] + */ + public function WhereValueGoodsInfo($value, $params = []) + { + if(!empty($value)) + { + // 获取商品 id + $ids = Db::name('Goods')->alias('g')->join('goods_spec_base gb', 'g.id=gb.goods_id')->where('g.title|g.simple_desc|g.seo_title|g.seo_keywords|g.seo_keywords|gb.coding|gb.barcode', 'like', '%'.$value.'%')->column('g.id'); + + // 避免空条件造成无效的错觉 + return empty($ids) ? [0] : $ids; + } + return $value; + } + /** * 商品分类条件处理 * @author Devil diff --git a/app/admin/form/Goodsspectemplate.php b/app/admin/form/Goodsspectemplate.php index c91a631fa..a7b205889 100644 --- a/app/admin/form/Goodsspectemplate.php +++ b/app/admin/form/Goodsspectemplate.php @@ -87,7 +87,7 @@ class GoodsSpecTemplate ], ], [ - 'label' => $lang['category_id'], + 'label' => $lang['name'], 'view_type' => 'field', 'view_key' => 'name', 'is_sort' => 1, diff --git a/app/admin/lang/cht.php b/app/admin/lang/cht.php index e2ead7b04..342e25aca 100644 --- a/app/admin/lang/cht.php +++ b/app/admin/lang/cht.php @@ -364,28 +364,6 @@ return [ ], ], - // 问答 - 'answer' => [ - 'base_nav_title' => '問答', - 'user_info_title' => '用戶資訊', - // 动态表格 - 'form_table' => [ - 'user' => '用戶資訊', - 'user_placeholder' => '請輸入用戶名/昵稱/手機/郵箱', - 'name' => '連絡人', - 'tel' => '聯繫電話', - 'title' => '標題', - 'content' => '內容', - 'reply' => '回復內容', - 'is_show' => '是否顯示', - 'is_reply' => '是否回復', - 'reply_time_time' => '回復時間', - 'access_count' => '訪問次數', - 'add_time_time' => '創建時間', - 'upd_time_time' => '更新時間', - ], - ], - // 仓库管理 'warehouse' => [ 'base_nav_title' => '倉庫', @@ -587,6 +565,7 @@ return [ 'form_table' => [ 'id' => '商品ID', 'info' => '商品資訊', + 'info_placeholder' => '請輸入商品名稱/簡述/編碼/條碼/SEO資訊', 'category_text' => '商品分類', 'brand_name' => '品牌', 'price' => '銷售價格（元）', @@ -1505,13 +1484,6 @@ return [ 'data_index' => [ 'name' => '資料管理', 'item' => [ - 'answer_index' => '問答留言', - 'answer_reply' => '問答留言回復', - 'answer_delete' => '問答留言删除', - 'answer_statusupdate' => '問答留言狀態更新', - 'answer_saveinfo' => '問答添加/編輯頁面', - 'answer_save' => '問答添加/編輯', - 'answer_detail' => '問答留言詳情', 'message_index' => '消息管理', 'message_delete' => '消息删除', 'message_detail' => '消息詳情', diff --git a/app/admin/lang/en.php b/app/admin/lang/en.php index d7c873678..36db9ed29 100644 --- a/app/admin/lang/en.php +++ b/app/admin/lang/en.php @@ -365,28 +365,6 @@ return [ ], ], - // 问答 - 'answer' => [ - 'base_nav_title' => 'Q&A', - 'user_info_title' => 'User Info', - // 动态表格 - 'form_table' => [ - 'user' => 'User Info', - 'user_placeholder' => 'Please enter user name/nickname/mobile phone/email', - 'name' => 'Contacts', - 'tel' => 'Contact Number', - 'title' => 'Title', - 'content' => 'Content', - 'reply' => 'Reply Content', - 'is_show' => 'Show or not', - 'is_reply' => 'Reply or not', - 'reply_time_time' => 'Reply Time', - 'access_count' => 'Access Count', - 'add_time_time' => 'Creation Time', - 'upd_time_time' => 'Update Time', - ], - ], - // 仓库管理 'warehouse' => [ 'base_nav_title' => 'Warehouse', @@ -588,6 +566,7 @@ return [ 'form_table' => [ 'id' => 'Goods ID', 'info' => 'Goods Info', + 'info_placeholder' => 'Please enter product name/brief description/code/barcode/SEO information', 'category_text' => 'Category', 'brand_name' => 'Brand', 'price' => 'Sales Price(yuan)', @@ -1520,13 +1499,6 @@ return [ 'data_index' => [ 'name' => 'Data Admin', 'item' => [ - 'answer_index' => 'Q&A message', - 'answer_reply' => 'Q&A message reply', - 'answer_delete' => 'Q&A message delete', - 'answer_statusupdate' => 'Update message status', - 'answer_saveinfo' => 'Q&A add/edit page', - 'answer_save' => 'Q&A add/edit', - 'answer_detail' => 'Q&A message details', 'message_index' => 'Message log', 'message_delete' => 'Message delete', 'message_detail' => 'Message details', diff --git a/app/admin/lang/spa.php b/app/admin/lang/spa.php index d262f4c3a..1e7644fc3 100644 --- a/app/admin/lang/spa.php +++ b/app/admin/lang/spa.php @@ -364,28 +364,6 @@ return [ ], ], - // 问答 - 'answer' => [ - 'base_nav_title' => 'Preguntas y respuestas', - 'user_info_title' => 'Información del usuario', - // 动态表格 - 'form_table' => [ - 'user' => 'Información del usuario', - 'user_placeholder' => 'Introduzca su nombre de usuario / apodo / teléfono móvil / buzón', - 'name' => 'Contactos', - 'tel' => 'Número de teléfono de contacto', - 'title' => 'Título', - 'content' => 'Contenido', - 'reply' => 'Contenido de la respuesta', - 'is_show' => 'Si se muestra', - 'is_reply' => 'Si responder', - 'reply_time_time' => 'Tiempo de respuesta', - 'access_count' => 'Número de visitas', - 'add_time_time' => 'Tiempo de creación', - 'upd_time_time' => 'Tiempo de actualización', - ], - ], - // 仓库管理 'warehouse' => [ 'base_nav_title' => 'Almacén', @@ -587,6 +565,7 @@ return [ 'form_table' => [ 'id' => 'Identificación de la mercancía', 'info' => 'Información sobre productos básicos', + 'info_placeholder' => 'Introduzca el nombre del producto / descripción / código / código de barras / información seo', 'category_text' => 'Clasificación de mercancías', 'brand_name' => 'Marca', 'price' => 'Precio de venta (yuan)', @@ -1505,13 +1484,6 @@ return [ 'data_index' => [ 'name' => 'Gestión de datos', 'item' => [ - 'answer_index' => 'Preguntas y respuestas mensajes', - 'answer_reply' => 'Preguntas y respuestas respuesta al mensaje', - 'answer_delete' => 'Eliminar mensajes de preguntas y respuestas', - 'answer_statusupdate' => 'Actualización del Estado de los mensajes de preguntas y respuestas', - 'answer_saveinfo' => 'Preguntas y respuestas añadir / editar Página', - 'answer_save' => 'Preguntas y respuestas añadir / editar', - 'answer_detail' => 'Detalles del mensaje de preguntas y respuestas', 'message_index' => 'Gestión de mensajes', 'message_delete' => 'Eliminación de mensajes', 'message_detail' => 'Detalles del mensaje', diff --git a/app/admin/lang/zh.php b/app/admin/lang/zh.php index 2848a74a1..ac002d9b9 100755 --- a/app/admin/lang/zh.php +++ b/app/admin/lang/zh.php @@ -364,28 +364,6 @@ return [ ], ], - // 问答 - 'answer' => [ - 'base_nav_title' => '问答', - 'user_info_title' => '用户信息', - // 动态表格 - 'form_table' => [ - 'user' => '用户信息', - 'user_placeholder' => '请输入用户名/昵称/手机/邮箱', - 'name' => '联系人', - 'tel' => '联系电话', - 'title' => '标题', - 'content' => '内容', - 'reply' => '回复内容', - 'is_show' => '是否显示', - 'is_reply' => '是否回复', - 'reply_time_time' => '回复时间', - 'access_count' => '访问次数', - 'add_time_time' => '创建时间', - 'upd_time_time' => '更新时间', - ], - ], - // 仓库管理 'warehouse' => [ 'base_nav_title' => '仓库', @@ -587,6 +565,7 @@ return [ 'form_table' => [ 'id' => '商品ID', 'info' => '商品信息', + 'info_placeholder' => '请输入商品名称/简述/编码/条码/SEO信息', 'category_text' => '商品分类', 'brand_name' => '品牌', 'price' => '销售价格(元)', @@ -1505,13 +1484,6 @@ return [ 'data_index' => [ 'name' => '数据管理', 'item' => [ - 'answer_index' => '问答留言', - 'answer_reply' => '问答留言回复', - 'answer_delete' => '问答留言删除', - 'answer_statusupdate' => '问答留言状态更新', - 'answer_saveinfo' => '问答添加/编辑页面', - 'answer_save' => '问答添加/编辑', - 'answer_detail' => '问答留言详情', 'message_index' => '消息管理', 'message_delete' => '消息删除', 'message_detail' => '消息详情', diff --git a/app/admin/view/default/answer/detail.html b/app/admin/view/default/answer/detail.html deleted file mode 100644 index 06eeee457..000000000 --- a/app/admin/view/default/answer/detail.html +++ /dev/null @@ -1,2 +0,0 @@ - -{{extend name="public/module/detail" /}} \ No newline at end of file diff --git a/app/admin/view/default/answer/index.html b/app/admin/view/default/answer/index.html deleted file mode 100755 index 459ea5197..000000000 --- a/app/admin/view/default/answer/index.html +++ /dev/null @@ -1,54 +0,0 @@ - -{{extend name="public/module/form" /}} - - -{{block name="form_operate_top"}} - {{:MyLang('add_title')}} - - {__block__} -{{/block}} - - -{{block name="form_extend"}} - -
-
-
-

{{:MyLang('reply_title')}}

- × -
-
-
-
{{:MyLang('answer.user_info_title')}}
- -
- -
-
- - -
-
- - - -
-
-
-
-
-{{/block}} \ No newline at end of file diff --git a/app/admin/view/default/answer/module/content.html b/app/admin/view/default/answer/module/content.html deleted file mode 100644 index 03f11382e..000000000 --- a/app/admin/view/default/answer/module/content.html +++ /dev/null @@ -1,4 +0,0 @@ - -{{if !empty($module_data) and !empty($module_data['content'])}} -
{{$module_data.content|raw}}
-{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/answer/module/operate.html b/app/admin/view/default/answer/module/operate.html deleted file mode 100644 index 8190aefe3..000000000 --- a/app/admin/view/default/answer/module/operate.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {{:MyLang('edit_title')}} - -{{if $module_data['is_reply'] eq 0}} - -{{/if}} - \ No newline at end of file diff --git a/app/admin/view/default/answer/module/reply.html b/app/admin/view/default/answer/module/reply.html deleted file mode 100644 index c24ffc539..000000000 --- a/app/admin/view/default/answer/module/reply.html +++ /dev/null @@ -1,4 +0,0 @@ - -{{if !empty($module_data) and isset($module_data['is_reply']) and $module_data['is_reply'] eq 1 and !empty($module_data['reply'])}} -
{{$module_data.reply|raw}}
-{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/answer/save_info.html b/app/admin/view/default/answer/save_info.html deleted file mode 100644 index e0ddf69be..000000000 --- a/app/admin/view/default/answer/save_info.html +++ /dev/null @@ -1,107 +0,0 @@ -{{include file="public/header" /}} - - -
-
- -
- - {{:MyLang('answer.base_nav_title')}}{{if empty($data['id'])}}{{:MyLang('created_title')}}{{else /}}{{:MyLang('edit_title')}}{{/if}} - {{:MyLang('retreat_title')}} - - - -
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
- - -
-
-
- -
- - - - - {{:MyLang('retreat_title')}} - - -
-
- -
-
- - - -{{include file="public/footer" /}} - \ No newline at end of file diff --git a/app/admin/view/default/appconfig/app.html b/app/admin/view/default/appconfig/app.html index bcab824e4..087688240 100644 --- a/app/admin/view/default/appconfig/app.html +++ b/app/admin/view/default/appconfig/app.html @@ -85,15 +85,6 @@ -
- - -
-
+ + -
- - -
diff --git a/app/admin/view/default/site/attachment/index.html b/app/admin/view/default/site/attachment/index.html index d6033645b..5dcc921a4 100644 --- a/app/admin/view/default/site/attachment/index.html +++ b/app/admin/view/default/site/attachment/index.html @@ -13,27 +13,21 @@
- - - + B
- - - + B
- - - + B
diff --git a/app/admin/view/default/site/base/index.html b/app/admin/view/default/site/base/index.html index 40a1d6c73..f2115eeef 100755 --- a/app/admin/view/default/site/base/index.html +++ b/app/admin/view/default/site/base/index.html @@ -21,11 +21,12 @@
-
diff --git a/app/admin/view/default/site/extends/index.html b/app/admin/view/default/site/extends/index.html index 5ac462dee..ea64777ce 100644 --- a/app/admin/view/default/site/extends/index.html +++ b/app/admin/view/default/site/extends/index.html @@ -9,23 +9,6 @@
- -
-
-

{{:MyLang('base_config_title')}}

-
-
-
- - -
-
-
-
@@ -40,9 +23,7 @@
- - - + {{:MyLang('minute_title')}}
{{:MyUrl('api/crontab/orderclose')}} @@ -53,9 +34,7 @@
- - - + {{:MyLang('minute_title')}}
{{:MyUrl('api/crontab/ordersuccess')}} @@ -66,9 +45,7 @@
- - - + {{:MyLang('minute_title')}}
{{:MyUrl('api/crontab/paylogorderclose')}} @@ -79,9 +56,7 @@
- - - + {{:MyLang('minute_title')}}
{{:MyUrl('api/crontab/goodsgiveintegral')}} diff --git a/app/admin/view/default/site/orderaftersale/index.html b/app/admin/view/default/site/orderaftersale/index.html index 9a82c264e..569fe7f6e 100644 --- a/app/admin/view/default/site/orderaftersale/index.html +++ b/app/admin/view/default/site/orderaftersale/index.html @@ -45,9 +45,7 @@
- - - + {{:MyLang('day_title')}}
diff --git a/app/admin/view/default/site/siteset/goods.html b/app/admin/view/default/site/siteset/goods.html index 4fc833afa..74de74945 100644 --- a/app/admin/view/default/site/siteset/goods.html +++ b/app/admin/view/default/site/siteset/goods.html @@ -35,9 +35,7 @@
- - - + {{:MyLang('level_title')}}
{{if is_array(MyLang('site.goods_tips_list'))}}
diff --git a/app/admin/view/default/site/siteset/index.html b/app/admin/view/default/site/siteset/index.html index 2fd0b4671..b9c4815bc 100644 --- a/app/admin/view/default/site/siteset/index.html +++ b/app/admin/view/default/site/siteset/index.html @@ -110,12 +110,7 @@
-
- - - - -
+ {{if is_array(MyLang('site.goods_auto_mode_max_count_tips_list'))}}
diff --git a/app/admin/view/default/site/siteset/search.html b/app/admin/view/default/site/siteset/search.html index adb66645c..0ac48c5e2 100644 --- a/app/admin/view/default/site/siteset/search.html +++ b/app/admin/view/default/site/siteset/search.html @@ -38,9 +38,7 @@
- - - + {{:MyLang('strip_title')}}
diff --git a/app/admin/view/default/site/sitetype/index.html b/app/admin/view/default/site/sitetype/index.html index 770e0f6d3..ac93e13b7 100644 --- a/app/admin/view/default/site/sitetype/index.html +++ b/app/admin/view/default/site/sitetype/index.html @@ -14,22 +14,31 @@

{{:MyLang('base_config_title')}}

-
+
{{if is_array(MyLang('site.sitetype_top_tips_list'))}} -
+

{{:implode('

', MyLang('site.sitetype_top_tips_list'))}}

{{/if}} -
+
- {{foreach $common_site_type_list as $v}} - + {{foreach $common_platform_type as $v}} +
+ + + + +
{{/foreach}}
diff --git a/app/admin/view/default/site/verify/index.html b/app/admin/view/default/site/verify/index.html index a243306b0..d36ed0f9c 100644 --- a/app/admin/view/default/site/verify/index.html +++ b/app/admin/view/default/site/verify/index.html @@ -13,18 +13,14 @@
- - - + {{:MyLang('second_title')}}
- - - + {{:MyLang('second_title')}}
diff --git a/app/admin/view/default/warehousegoods/index.html b/app/admin/view/default/warehousegoods/index.html index 92d3bf4be..1f70c5c72 100644 --- a/app/admin/view/default/warehousegoods/index.html +++ b/app/admin/view/default/warehousegoods/index.html @@ -49,7 +49,10 @@ {{/if}} - +
diff --git a/app/api/controller/Answer.php b/app/api/controller/Answer.php deleted file mode 100755 index 08137e6fe..000000000 --- a/app/api/controller/Answer.php +++ /dev/null @@ -1,139 +0,0 @@ -IsLogin(); - - // 参数 - $params = $this->data_request; - $params['user'] = $this->user; - - // 条件 - $where = AnswerService::AnswerListWhere($params); - - // 获取总数 - $total = AnswerService::AnswerTotal($where); - $page_total = ceil($total/$this->page_size); - $start = intval(($this->page-1)*$this->page_size); - - // 获取列表 - $data_params = [ - 'm' => $start, - 'n' => $this->page_size, - 'where' => $where, - ]; - $data = AnswerService::AnswerList($data_params); - - // 返回数据 - $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], - ]; - return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result)); - } - - /** - * 用户留言添加 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2018-07-17 - * @desc description - */ - public function Add() - { - // 登录校验 - $this->IsLogin(); - - $params = $this->data_request; - $params['user'] = $this->user; - return ApiService::ApiDataReturn(AnswerService::AnswerSave($params)); - } - - /** - * 公共留言广场列表 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2018-07-17 - * @desc description - */ - public function Square() - { - // 参数 - $params = $this->data_request; - $params['is_more'] = 1; - $params['is_show'] = 1; - - // 条件 - $where = AnswerService::AnswerListWhere($params); - - // 获取总数 - $total = AnswerService::AnswerTotal($where); - $page_total = ceil($total/$this->page_size); - $start = intval(($this->page-1)*$this->page_size); - - // 获取列表 - $data_params = [ - 'm' => $start, - 'n' => $this->page_size, - 'where' => $where, - ]; - $data = AnswerService::AnswerList($data_params); - - // 返回数据 - $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], - ]; - return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result)); - } -} -?> \ No newline at end of file diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php index 10bf5c56e..7f0cb93f9 100755 --- a/app/api/controller/Order.php +++ b/app/api/controller/Order.php @@ -80,10 +80,11 @@ class Order extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], - 'payment_list' => $payment_list, + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], + 'payment_list' => $payment_list, + 'default_payment_id' => PaymentService::BuyDefaultPayment($params), ]; return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result)); } diff --git a/app/common.php b/app/common.php index f8e066ed0..2f45983ef 100755 --- a/app/common.php +++ b/app/common.php @@ -664,7 +664,7 @@ function GetHttpCode($url, $timeout = 5) */ function IsUrl($value) { - return empty($value) ? false : in_array(substr($value, 0, 6), ['http:/', 'https:']); + return (empty($value) || is_array($value)) ? false : in_array(substr($value, 0, 6), ['http:/', 'https:']); } /** @@ -941,7 +941,7 @@ function IsWeixinEnv() } /** - * 是否微信环境 + * 是否钉钉环境 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -982,6 +982,34 @@ function IsAlipayEnv() return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'AlipayClient') !== false); } +/** + * 是否百度环境 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-08-26 + * @desc description + * @return [boolean] [否false, 是true] + */ +function IsBaiduEnv() +{ + return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'baiduboxapp') !== false); +} + +/** + * 是否快手环境 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-08-26 + * @desc description + * @return [boolean] [否false, 是true] + */ +function IsKuaishouEnv() +{ + return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'Kwai') !== false); +} + /** * 是否新浪微博环境 * @author Devil @@ -996,6 +1024,111 @@ function IsWeiboEnv() return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'Weibo') !== false); } +/** + * web环境 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-10-24 + * @desc description + */ +function WebEnv() +{ + // 微信 + if(IsWeixinEnv()) + { + return 'weixin'; + } + + // 支付宝 + if(IsAlipayEnv()) + { + return 'alipay'; + } + + // 百度 + if(IsBaiduEnv()) + { + return 'baidu'; + } + + // 快手 + if(IsKuaishouEnv()) + { + return 'kuaishou'; + } + + // 钉钉 + if(IsDingdingEnv()) + { + return 'dingding'; + } + + // QQ + if(IsQQEnv()) + { + return 'qq'; + } + + // 微博 + if(IsWeiboEnv()) + { + return 'weibo'; + } + + return null; +} + +/** + * 判断当前是否小程序环境中 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-06-29T22:21:44+0800 + */ +function MiniAppEnv() +{ + if(!empty($_SERVER['HTTP_USER_AGENT'])) + { + // 微信小程序 miniProgram + // QQ小程序 miniProgram + if(stripos($_SERVER['HTTP_USER_AGENT'], 'miniProgram') !== false) + { + // 是否QQ小程序 + if(stripos($_SERVER['HTTP_USER_AGENT'], 'QQ') !== false) + { + return 'qq'; + } + return 'weixin'; + } + + // 支付宝客户端 AlipayClient + if(stripos($_SERVER['HTTP_USER_AGENT'], 'AlipayClient') !== false) + { + return 'alipay'; + } + + // 百度小程序 swan-baiduboxapp + if(stripos($_SERVER['HTTP_USER_AGENT'], 'swan-baiduboxapp') !== false) + { + return 'baidu'; + } + + // 头条小程序 ToutiaoMicroApp + if(stripos($_SERVER['HTTP_USER_AGENT'], 'ToutiaoMicroApp') !== false) + { + return 'toutiao'; + } + + // 快手小程序 AllowKsCallApp + if(stripos($_SERVER['HTTP_USER_AGENT'], 'AllowKsCallApp') !== false) + { + return 'kuaishou'; + } + } + return null; +} + /** * 笛卡尔积生成规格 * @author Devil @@ -1230,15 +1363,28 @@ function FormModulePath($params = []) $controller = empty($params['pluginscontrol']) ? 'index' : $params['pluginscontrol']; $action = empty($params['pluginsaction']) ? 'index' : $params['pluginsaction']; - // 是否定义模块组 - $path = '\app\plugins\\'.$params['pluginsname'].'\form\\'.$group.'\\'.ucfirst($controller); + // 是否定义模块组、是否存在控制住+方法的form文件 + $path = '\app\plugins\\'.$params['pluginsname'].'\form\\'.$group.'\\'.ucfirst($controller.$action); if(!class_exists($path)) { - $path = '\app\plugins\\'.$params['pluginsname'].'\form\\'.ucfirst($controller); + $path = '\app\plugins\\'.$params['pluginsname'].'\form\\'.$group.'\\'.ucfirst($controller); + if(!class_exists($path)) + { + $path = '\app\plugins\\'.$params['pluginsname'].'\form\\'.ucfirst($controller.$action); + if(!class_exists($path)) + { + $path = '\app\plugins\\'.$params['pluginsname'].'\form\\'.ucfirst($controller); + } + } } } } else { - $path = '\app\\'.$group.'\form\\'.ucfirst($controller); + // 是否存在控制住+方法的form文件 + $path = '\app\\'.$group.'\form\\'.ucfirst($controller.$action); + if(!class_exists($path)) + { + $path = '\app\\'.$group.'\form\\'.ucfirst($controller); + } } return [ @@ -1247,6 +1393,77 @@ function FormModulePath($params = []) ]; } +/** + * 获取动态表格数据 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2022-10-08 + * @desc description + * @param [array] $params [输入参数] + */ +function FormModuleData($params = []) +{ + $data = []; + if(!empty($params['control']) && !empty($params['id'])) + { + // 模块组、默认前端 + $group = empty($params['group']) ? 'index' : $params['group']; + // 控制器 + $control = strtolower($params['control']); + // 方法、默认详情 + $action = empty($params['action']) ? 'detail' : strtolower($params['action']); + + // 请求参数 + $request_params = [ + // 数据id + 'id' => $params['id'], + // 详情数据key + 'detail_dkey' => empty($params['detail_dkey']) ? 'id' : $params['detail_dkey'], + // 详情额外参数 + 'detail_where' => empty($params['where']) ? [] : $params['where'], + ]; + + // 是否插件 + if(empty($params['plugins'])) + { + // 模块地址 + $module = '\app\\'.$group.'\form\\'.ucfirst($control); + // 模块参数 + $request_params['module_name'] = $group; + $request_params['controller_name'] = $control; + $request_params['action_name'] = $action; + } else { + // 模块地址 + $module = '\app\plugins\\'.$params['plugins'].'\form\\'.$group.'\\'.ucfirst($control); + // 模块参数 + $request_params['pluginsname'] = $params['plugins']; + $request_params['pluginscontrol'] = $control; + $request_params['pluginsaction'] = $action; + } + + // 模块运行方法 + $run = empty($params['run']) ? 'Run' : $params['run']; + + // 调用模块获取数据 + $ret = (new app\module\FormHandleModule())->Run($module, $run, $request_params); + if($ret['code'] == 0 && !empty($ret['data']) && is_array($ret['data'])) + { + // 全部数据 + if(empty($params['data_type']) || $params['data_type'] == 'all') + { + $data = $ret['data']; + } else { + if(array_key_exists($params['data_type'], $ret['data'])) + { + $data = $ret['data'][$params['data_type']]; + } + } + } + } + return $data; +} + /** * 模块视图动态加载方法 * @author Devil @@ -1473,56 +1690,6 @@ function CallPluginsServiceMethod($plugins, $service, $method, $params = null) return DataReturn(MyLang('common_function.plugins_class_no_exist_tips').'['.$plugins.'-'.$service.']', -1); } -/** - * 判断当前是否小程序环境中 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-06-29T22:21:44+0800 - */ -function MiniAppEnv() -{ - if(!empty($_SERVER['HTTP_USER_AGENT'])) - { - // 微信小程序 miniProgram - // QQ小程序 miniProgram - if(stripos($_SERVER['HTTP_USER_AGENT'], 'miniProgram') !== false) - { - // 是否QQ小程序 - if(stripos($_SERVER['HTTP_USER_AGENT'], 'QQ') !== false) - { - return 'qq'; - } - return 'weixin'; - } - - // 支付宝客户端 AlipayClient - if(stripos($_SERVER['HTTP_USER_AGENT'], 'AlipayClient') !== false) - { - return 'alipay'; - } - - // 百度小程序 swan-baiduboxapp - if(stripos($_SERVER['HTTP_USER_AGENT'], 'swan-baiduboxapp') !== false) - { - return 'baidu'; - } - - // 头条小程序 ToutiaoMicroApp - if(stripos($_SERVER['HTTP_USER_AGENT'], 'ToutiaoMicroApp') !== false) - { - return 'toutiao'; - } - - // 快手小程序 AllowKsCallApp - if(stripos($_SERVER['HTTP_USER_AGENT'], 'AllowKsCallApp') !== false) - { - return 'kuaishou'; - } - } - return null; -} - /** * RGB 转 十六进制 * @author Devil @@ -1953,6 +2120,12 @@ function CurrentScriptName() */ function MyUrl($path, $params = []) { + // 空或数组则返回空字符串 + if(empty($path) || is_array($path)) + { + return ''; + } + // 当前脚本名称 $script_name = CurrentScriptName(); diff --git a/app/index/controller/Answer.php b/app/index/controller/Answer.php deleted file mode 100755 index e00c251b7..000000000 --- a/app/index/controller/Answer.php +++ /dev/null @@ -1,90 +0,0 @@ - $this->data_detail, - 'is_header' => 0, - 'is_footer' => 0, - ]; - MyViewAssign($assign); - return MyView(); - } - - /** - * 问答/提问保存 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2020-06-30 - * @desc description - */ - public function Save() - { - $params = $this->data_request; - $params['user'] = $this->user; - return ApiService::ApiDataReturn(AnswerService::AnswerSave($params)); - } -} -?> \ No newline at end of file diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 786b4e1bd..d8da15af8 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -241,7 +241,7 @@ class Common extends BaseController $assign['common_customer_store_email'] = MyC('common_customer_store_email'); $assign['common_customer_store_address'] = MyC('common_customer_store_address'); $assign['common_customer_store_qrcode'] = AttachmentPathViewHandle(MyC('common_customer_store_qrcode')); - + // 主题 $default_theme = strtolower(MyC('common_default_theme', 'default', true)); $assign['default_theme'] = $default_theme; @@ -717,6 +717,10 @@ class Common extends BaseController 'plugins_view_header_navigation_top_right_begin', // 公共顶部小导航钩子-右侧后面 'plugins_view_header_navigation_top_right_end', + // 用户登录容器内顶部钩子 + 'plugins_view_user_login_content_inside_top', + // 用户登录容器内底部钩子 + 'plugins_view_user_login_content_inside_bottom', // 用户登录页面顶部钩子 'plugins_view_user_login_info_top', // 用户登录内底部钩子 diff --git a/app/index/controller/Goods.php b/app/index/controller/Goods.php index 573ff727e..0f9e45b09 100755 --- a/app/index/controller/Goods.php +++ b/app/index/controller/Goods.php @@ -277,33 +277,33 @@ class Goods extends Common return ApiService::ApiDataReturn(DataReturn(MyLang('params_error_tips'), -1)); } - // 分页 - $number = 10; - $page = max(1, isset($params['page']) ? intval($params['page']) : 1); - // 条件 $where = [ - 'goods_id' => $params['goods_id'], - 'is_show' => 1, + 'goods_id' => $params['goods_id'], + 'is_show' => 1, ]; // 获取总数 $total = GoodsCommentsService::GoodsCommentsTotal($where); - $page_total = ceil($total/$number); - $start = intval(($page-1)*$number); + $page_total = ceil($total/$this->page_size); + $start = intval(($this->page-1)*$this->page_size); // 获取列表 - $data_params = array( - 'm' => $start, - 'n' => $number, - 'where' => $where, - 'is_public' => 1, - ); - $data = GoodsCommentsService::GoodsCommentsList($data_params); + $data = []; + if($total > 0) + { + $data_params = [ + 'm' => $start, + 'n' => $this->page_size, + 'where' => $where, + 'is_public' => 1, + ]; + $data = GoodsCommentsService::GoodsCommentsList($data_params); + } // 返回数据 $result = [ - 'number' => $number, + 'number' => $this->page_size, 'total' => $total, 'page_total' => $page_total, 'data' => MyView('', ['data'=>$data['data']]), @@ -369,6 +369,18 @@ class Goods extends Common // 商品页面tabs顶部钩子 'plugins_view_goods_detail_tabs_content', + // 商品页面tabs内评价顶部钩子 + 'plugins_view_goods_detail_tabs_comments_top', + + // 商品页面tabs内评价底部钩子 + 'plugins_view_goods_detail_tabs_comments_bottom', + + // 商品页面tabs内猜你喜欢顶部钩子 + 'plugins_view_goods_detail_tabs_guess_like_top', + + // 商品页面tabs内猜你喜欢底部钩子 + 'plugins_view_goods_detail_tabs_guess_like_bottom', + // 商品页面tabs内容钩子 'plugins_view_goods_detail_tabs_bottom', @@ -384,9 +396,15 @@ class Goods extends Common // 商品页面基础信息标题里面钩子 'plugins_view_goods_detail_title', + // 商品页面基础信息面板原价顶部钩子 + 'plugins_view_goods_detail_panel_original_price_top', + // 商品页面基础信息面板售价顶部钩子 'plugins_view_goods_detail_panel_price_top', + // 商品页面基础信息面板售价底部钩子 + 'plugins_view_goods_detail_panel_price_bottom', + // 商品页面基础信息购买小导航内部前面钩子 'plugins_view_goods_detail_base_buy_nav_min_inside_begin', diff --git a/app/index/controller/User.php b/app/index/controller/User.php index 5e69ec31b..40fdb13b8 100755 --- a/app/index/controller/User.php +++ b/app/index/controller/User.php @@ -45,46 +45,6 @@ class User extends Center parent::__construct(); } - /** - * 获取上一个页面地址 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2021-03-04 - * @desc description - */ - private function GetrefererUrl() - { - // 上一个页面, 空则用户中心 - $referer_url = empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/user/index') : htmlentities($_SERVER['HTTP_REFERER']); - if(!empty($_SERVER['HTTP_REFERER'])) - { - // 是否是指定页面，则赋值用户中心 - $all = ['login', 'regster', 'forget', 'logininfo', 'reginfo', 'smsreginfo', 'emailreginfo', 'forgetpwdinfo']; - $status = false; - foreach($all as $v) - { - if(strpos($_SERVER['HTTP_REFERER'], $v) !== false) - { - $referer_url = MyUrl('index/user/index'); - $status = true; - break; - } - } - - // 未匹配到指定页面 - if(!$status) - { - // 非商城域名，则赋值用户中心 - if(GetUrlHost($referer_url) != GetUrlHost(__MY_URL__)) - { - $referer_url = MyUrl('index/user/index'); - } - } - } - return $referer_url; - } - /** * 用户中心 * @author Devil @@ -255,7 +215,7 @@ class User extends Center // 模板数据 $assign = [ // 返回地址 - 'referer_url' => $this->GetrefererUrl(), + 'referer_url' => UserService::UserLoginOrRegBackRefererUrl(), // 注册背景图片 'user_register_bg_images' => MyC('home_site_user_register_bg_images'), // 注册背景色 @@ -293,7 +253,7 @@ class User extends Center // 模板数据 $assign = [ // 返回地址 - 'referer_url' => $this->GetrefererUrl(), + 'referer_url' => UserService::UserLoginOrRegBackRefererUrl(), // 注册背景图片 'user_login_left_data' => empty($left_data['data']) ? [] : $left_data['data'][array_rand($left_data['data'], 1)], // 浏览器名称 @@ -333,7 +293,7 @@ class User extends Center $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(MyLang('user.user_login_browser_seo_title'), 1); // 返回地址 - $assign['referer_url'] = $this->GetrefererUrl(); + $assign['referer_url'] = UserService::UserLoginOrRegBackRefererUrl(); MyViewAssign($assign); return MyView(); } diff --git a/app/index/form/Answer.php b/app/index/form/Answer.php deleted file mode 100644 index 920d0755e..000000000 --- a/app/index/form/Answer.php +++ /dev/null @@ -1,154 +0,0 @@ -condition_base[] = ['user_id', '=', $params['system_user']['id']]; - } - } - - /** - * 入口 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2020-06-30 - * @desc description - * @param [array] $params [输入参数] - */ - public function Run($params = []) - { - $lang = MyLang('answer.form_table'); - return [ - // 基础配置 - 'base' => [ - 'key_field' => 'id', - 'is_search' => 1, - ], - // 表单配置 - 'form' => [ - [ - 'label' => $lang['name'], - 'view_type' => 'field', - 'view_key' => 'name', - 'is_sort' => 1, - 'search_config' => [ - 'form_type' => 'input', - 'where_type' => 'like', - ], - ], - [ - 'label' => $lang['tel'], - 'view_type' => 'field', - 'view_key' => 'tel', - 'is_sort' => 1, - 'search_config' => [ - 'form_type' => 'input', - 'where_type' => 'like', - ], - ], - [ - 'label' => $lang['title'], - 'view_type' => 'field', - 'view_key' => 'title', - 'is_sort' => 1, - 'search_config' => [ - 'form_type' => 'input', - 'where_type' => 'like', - ], - ], - [ - 'label' => $lang['content'], - 'view_type' => 'module', - 'view_key' => 'answer/module/content', - 'grid_size' => 'lg', - 'search_config' => [ - 'form_type' => 'input', - 'form_name' => 'content', - 'where_type' => 'like', - ], - ], - [ - 'label' => $lang['reply'], - 'view_type' => 'module', - 'view_key' => 'answer/module/reply', - 'grid_size' => 'lg', - 'search_config' => [ - 'form_type' => 'input', - 'form_name' => 'reply', - 'where_type' => 'like', - ], - ], - [ - 'label' => $lang['reply_time_time'], - 'view_type' => 'field', - 'view_key' => 'reply_time_time', - 'is_sort' => 1, - 'search_config' => [ - 'form_type' => 'datetime', - 'form_name' => 'reply_time', - ], - ], - [ - 'label' => $lang['add_time_time'], - 'view_type' => 'field', - 'view_key' => 'add_time_time', - 'is_sort' => 1, - 'search_config' => [ - 'form_type' => 'datetime', - 'form_name' => 'add_time', - ], - ], - [ - 'label' => MyLang('operate_title'), - 'view_type' => 'operate', - 'view_key' => 'answer/module/operate', - 'align' => 'center', - 'fixed' => 'right', - ], - ], - // 数据配置 - 'data' => [ - 'table_name' => 'Answer', - 'data_handle' => 'AnswerService::AnswerListHandle', - 'is_page' => 1, - ], - ]; - } -} -?> \ No newline at end of file diff --git a/app/index/lang/cht.php b/app/index/lang/cht.php index 1e5d15715..1fa58bbe3 100644 --- a/app/index/lang/cht.php +++ b/app/index/lang/cht.php @@ -299,6 +299,7 @@ return [ 'browser_seo_title' => '訂單售後', 'detail_browser_seo_title' => '訂單售後詳情', 'view_orderaftersale_enter_name' => '查看售後訂單', + 'orderaftersale_apply_name' => '申請售後', 'operate_delivery_name' => '立即退貨', 'goods_list_thead_base' => '商品資訊', 'goods_list_thead_price' => '單價', diff --git a/app/index/lang/en.php b/app/index/lang/en.php index 96c1d6a09..370b512ab 100644 --- a/app/index/lang/en.php +++ b/app/index/lang/en.php @@ -299,6 +299,7 @@ return [ 'browser_seo_title' => 'Order AfterSales', 'detail_browser_seo_title' => 'Order AfterSales Detail', 'view_orderaftersale_enter_name' => 'View after-sales orders', + 'orderaftersale_apply_name' => 'Apply for after-sales service', 'operate_delivery_name' => 'Return immediately', 'goods_list_thead_base' => 'Goods Info', 'goods_list_thead_price' => 'Price', diff --git a/app/index/lang/spa.php b/app/index/lang/spa.php index 8be6e8df0..2142c634a 100644 --- a/app/index/lang/spa.php +++ b/app/index/lang/spa.php @@ -299,6 +299,7 @@ return [ 'browser_seo_title' => 'Posventa de pedidos', 'detail_browser_seo_title' => 'Detalles de la posventa del pedido', 'view_orderaftersale_enter_name' => 'Ver pedidos post - venta', + 'orderaftersale_apply_name' => 'Solicitar posventa', 'operate_delivery_name' => 'Devolución inmediata', 'goods_list_thead_base' => 'Información sobre productos básicos', 'goods_list_thead_price' => 'Precio unitario', diff --git a/app/index/lang/zh.php b/app/index/lang/zh.php index f5775d5ab..167fb0808 100755 --- a/app/index/lang/zh.php +++ b/app/index/lang/zh.php @@ -299,6 +299,7 @@ return [ 'browser_seo_title' => '订单售后', 'detail_browser_seo_title' => '订单售后详情', 'view_orderaftersale_enter_name' => '查看售后订单', + 'orderaftersale_apply_name' => '申请售后', 'operate_delivery_name' => '立即退货', 'goods_list_thead_base' => '商品信息', 'goods_list_thead_after_base_title' => '售后商品', diff --git a/app/index/view/default/answer/detail.html b/app/index/view/default/answer/detail.html deleted file mode 100644 index 06eeee457..000000000 --- a/app/index/view/default/answer/detail.html +++ /dev/null @@ -1,2 +0,0 @@ - -{{extend name="public/module/detail" /}} \ No newline at end of file diff --git a/app/index/view/default/answer/index.html b/app/index/view/default/answer/index.html deleted file mode 100755 index 41c0c2e11..000000000 --- a/app/index/view/default/answer/index.html +++ /dev/null @@ -1,49 +0,0 @@ - -{{extend name="public/module/user_form" /}} - - -{{block name="form_operate_top"}} - {{:MyLang('add_title')}} - - {__block__} -{{/block}} - - -{{block name="form_extend"}} - -
-
-
-

{{:MyLang('answer.form_title')}}

- × -
-
- -
- -
-
- -
-
- -
-
- - -
-
- - -
- -
-
-
-{{/block}} \ No newline at end of file diff --git a/app/index/view/default/answer/module/content.html b/app/index/view/default/answer/module/content.html deleted file mode 100644 index 03f11382e..000000000 --- a/app/index/view/default/answer/module/content.html +++ /dev/null @@ -1,4 +0,0 @@ - -{{if !empty($module_data) and !empty($module_data['content'])}} -
{{$module_data.content|raw}}
-{{/if}} \ No newline at end of file diff --git a/app/index/view/default/answer/module/operate.html b/app/index/view/default/answer/module/operate.html deleted file mode 100644 index 69cee16d7..000000000 --- a/app/index/view/default/answer/module/operate.html +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/app/index/view/default/answer/module/reply.html b/app/index/view/default/answer/module/reply.html deleted file mode 100644 index c24ffc539..000000000 --- a/app/index/view/default/answer/module/reply.html +++ /dev/null @@ -1,4 +0,0 @@ - -{{if !empty($module_data) and isset($module_data['is_reply']) and $module_data['is_reply'] eq 1 and !empty($module_data['reply'])}} -
{{$module_data.reply|raw}}
-{{/if}} \ No newline at end of file diff --git a/app/index/view/default/cart/index.html b/app/index/view/default/cart/index.html index 57ac1f8c4..332b38c58 100755 --- a/app/index/view/default/cart/index.html +++ b/app/index/view/default/cart/index.html @@ -305,7 +305,7 @@
-
+