diff --git a/app/admin/controller/Cache.php b/app/admin/controller/Cache.php index e60a1c158..6c14df405 100755 --- a/app/admin/controller/Cache.php +++ b/app/admin/controller/Cache.php @@ -11,6 +11,7 @@ namespace app\admin\controller; use app\service\CacheService; +use app\service\AdminPowerService; /** * 缓存管理 @@ -51,7 +52,6 @@ class Cache extends Common { // 缓存类型 MyViewAssign('cache_type_list', CacheService::AdminCacheTypeList()); - return MyView(); } @@ -72,7 +72,10 @@ class Cache extends Common // 缓存操作清除 \think\facade\Cache::clear(); - return $this->success('更新成功'); + // 初始化菜单 + AdminPowerService::PowerMenuInit($this->admin); + + return DataReturn('更新成功', 0); } /** @@ -88,7 +91,7 @@ class Cache extends Common \base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp'); \base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'temp'); - return $this->success('更新成功'); + return DataReturn('更新成功', 0); } /** @@ -100,7 +103,7 @@ class Cache extends Common */ public function ModuleUpdate() { - return $this->success('更新成功'); + return DataReturn('更新成功', 0); } /** @@ -116,7 +119,7 @@ class Cache extends Common \base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'log'); \base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'log'); - return $this->success('更新成功'); + return DataReturn('更新成功', 0); } } ?> \ No newline at end of file diff --git a/app/admin/view/default/cache/index.html b/app/admin/view/default/cache/index.html index bc428cbb4..f88089849 100755 --- a/app/admin/view/default/cache/index.html +++ b/app/admin/view/default/cache/index.html @@ -8,7 +8,7 @@ {{if $v['is_enable'] eq 1}}
{{$v.name}}
- +
{{$v.desc}}
diff --git a/app/admin/view/default/goods/detail.html b/app/admin/view/default/goods/detail.html index 4b8aec2b5..a08880464 100644 --- a/app/admin/view/default/goods/detail.html +++ b/app/admin/view/default/goods/detail.html @@ -56,12 +56,13 @@ {{foreach $specifications.type as $line_k=>$line_v}} {{$line_v.name}} {{/foreach}} - 销售金额 + 销售价(元) + 原价(元) 库存 - 重量 + 重量(kg) + 体积(m³) 编码 条形码 - 原价 @@ -75,12 +76,15 @@ {{/case}} {{case base}} - {{$v.data.price}} - {{$v.data.inventory}} - {{if $v['data']['weight'] gt 0}}{{$v.data.weight}}{{/if}} - {{$v.data.coding}} - {{$v.data.barcode}} - {{if $v['data']['original_price'] gt 0}}{{$v.data.original_price}}{{/if}} + {{if isset($v['data']['price'])}}{{$v.data.price}}{{/if}} + {{if isset($v['data']['original_price']) and $v['data']['original_price'] gt 0}}{{$v.data.original_price}}{{/if}} + {{if isset($v['data']['inventory'])}}{{$v.data.inventory}}{{/if}} + {{if isset($v['data']['weight']) and $v['data']['weight'] + gt 0}}{{$v.data.weight}}{{/if}} + {{if isset($v['data']['volume']) and $v['data']['volume'] + gt 0}}{{$v.data.volume}}{{/if}} + {{if isset($v['data']['coding'])}}{{$v.data.coding}}{{/if}} + {{if isset($v['data']['barcode'])}}{{$v.data.barcode}}{{/if}} {{/case}} {{/switch}} {{/if}} diff --git a/app/admin/view/default/goods/spec.html b/app/admin/view/default/goods/spec.html index cee3c2a70..3a7a1c77c 100644 --- a/app/admin/view/default/goods/spec.html +++ b/app/admin/view/default/goods/spec.html @@ -3,11 +3,11 @@
-

1. 快捷操作可以快速创建商品SKU，大量节省SKU编辑时间，快捷操作数据不影响SKU数据，仅生成的时候重新覆盖SKU。

+

1. 批量添加规格可以快速创建商品SKU，大量节省SKU编辑时间，快捷操作数据不影响SKU数据，仅生成的时候重新覆盖SKU。

2. 商品添加成功后，仓库管理->仓库商品中添加并配置库存

- +快捷操作 - 生成规格 + + 批量添加规格 + 生成规格
@@ -34,7 +34,7 @@ {{/foreach}} {{/if}} -
+添加规格值 +
+ 添加规格值
@@ -47,7 +47,7 @@
- +添加规格 + + 添加规格值 高级批量设置
@@ -68,22 +68,26 @@ 价格(元) +
+ - @@ -94,18 +98,21 @@ - - - + + + + - - - + + + + '; html += ''; html += ''; diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index aa70bc0de..d0a3d351c 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -662,6 +662,15 @@ button.colorpicker-submit img { box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.3); } +/** + * 表格头部美化 + */ +.table-thead-beautify thead th { + background-color: #f5f7fa; + position: relative; + border-bottom: 0 !important; +} + /** * 表格-相关样式 */ diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html index 58f416bac..8a6259b1c 100755 --- a/public/static/common/lib/ueditor/dialogs/map/map.html +++ b/public/static/common/lib/ueditor/dialogs/map/map.html @@ -4,7 +4,7 @@ - + - +
+ 原价(元) + + 重量(kg) - 规格编码 + 体积(m³) + + + 编码 条形码 - 原价(元) - - 扩展 操作
- - - - - - + + + + + + + + 编辑 @@ -133,20 +140,23 @@ {{case base}} - - - - - - - + + + + + + + + + 编辑 @@ -212,13 +222,21 @@
- +
- + + +
+
+
+
+ + +
@@ -227,13 +245,11 @@
-
- - -
+
+
diff --git a/app/admin/view/default/public/nav.html b/app/admin/view/default/public/nav.html index b971c8edc..80de2435a 100755 --- a/app/admin/view/default/public/nav.html +++ b/app/admin/view/default/public/nav.html @@ -10,8 +10,17 @@
'; html += '
'; - html += '+添加规格值'; + html += '+ 添加规格值'; html += '
'; html += '