diff --git a/app/service/ArticleService.php b/app/service/ArticleService.php
index 9021292ed..db7bff757 100755
--- a/app/service/ArticleService.php
+++ b/app/service/ArticleService.php
@@ -542,7 +542,7 @@ class ArticleService
$data['id'] = $params['id'];
}
}
- return DataReturn(MyLang('common.operate_success'), 0, json_encode($data));
+ return DataReturn(MyLang('common.operate_success'), 0, $data);
}
/**
diff --git a/app/service/ExpressService.php b/app/service/ExpressService.php
index 6b29061f0..3acf5247b 100755
--- a/app/service/ExpressService.php
+++ b/app/service/ExpressService.php
@@ -194,7 +194,7 @@ class ExpressService
}
$res = self::DataHandle([$data]);
- return DataReturn(MyLang('common.operate_success'), 0, json_encode($res[0]));
+ return DataReturn(MyLang('common.operate_success'), 0, $res[0]);
}
/**
diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php
index 488ef9fff..2d9466f39 100755
--- a/app/service/GoodsService.php
+++ b/app/service/GoodsService.php
@@ -2647,7 +2647,7 @@ class GoodsService
MyCache(SystemService::CacheKey('shopxo.cache_goods_category_key'), null);
$res = self::GoodsCategoryDataHandle([$data]);
- return DataReturn(MyLang('common.operate_success'), 0, json_encode($res[0]));
+ return DataReturn(MyLang('common.operate_success'), 0, $res[0]);
}
/**
diff --git a/app/service/RegionService.php b/app/service/RegionService.php
index 8d6e3c84d..52e22ab96 100755
--- a/app/service/RegionService.php
+++ b/app/service/RegionService.php
@@ -175,7 +175,7 @@ class RegionService
$data['id'] = $params['id'];
}
}
- return DataReturn(MyLang('common.operate_success'), 0, json_encode($data));
+ return DataReturn(MyLang('common.operate_success'), 0, $data);
}
/**
diff --git a/app/service/ScreeningPriceService.php b/app/service/ScreeningPriceService.php
index eaed4298a..157cb39ff 100755
--- a/app/service/ScreeningPriceService.php
+++ b/app/service/ScreeningPriceService.php
@@ -103,7 +103,7 @@ class ScreeningPriceService
$data['id'] = $params['id'];
}
}
- return DataReturn(MyLang('common.operate_success'), 0, json_encode($data));
+ return DataReturn(MyLang('common.operate_success'), 0, $data);
}
/**
diff --git a/app/service/UserService.php b/app/service/UserService.php
index 4b6d3ffd0..b278890b6 100755
--- a/app/service/UserService.php
+++ b/app/service/UserService.php
@@ -2663,7 +2663,7 @@ class UserService
}
if(!empty($user_ids))
{
- $data = Db::name('User')->where(['id'=>$user_ids])->column('username,nickname,mobile,email,avatar,province,city', 'id');
+ $data = Db::name('User')->where(['id'=>$user_ids])->column('id,username,nickname,mobile,email,avatar,province,city', 'id');
}
// 数据处理
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 6a2783525..4a47fc45a 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -761,11 +761,11 @@ function TreeItemHtmlHandle(item, pid, level, is_delete_all)
// 新增
if(level < rank-1)
{
- html += '
';
+ html += '
';
}
// 编辑
- html += '
';
+ html += '
';
if(item.is_son != 'ok' || is_delete_all == 1)
{
// 是否需要删除子数据
@@ -802,23 +802,16 @@ function TreeFormSaveBackHandle(e)
// 数据处理
if((e.data || null) != null)
{
- var json = JSON.parse(decodeURIComponent(e.data));
+ if(typeof(e.data) == 'object')
+ {
+ var json = e.data;
+ var string = JSON.stringify(e.data);
+ } else {
+ var json = JSON.parse(decodeURIComponent(e.data));
+ var string = e.data;
+ }
if((json.id || null) != null)
{
- // 是否存在pid节点数据
- var pid_arr = [];
- if($popup.find('select[name="pid"]').length > 0)
- {
- $popup.find('select[name="pid"] option').each(function()
- {
- var value = $(this).val();
- if(value != '')
- {
- pid_arr.push(value);
- }
- });
- }
-
// 存在数据编辑、则添加
var $obj = $('#data-list-'+json.id);
if($obj.length > 0)
@@ -841,44 +834,7 @@ function TreeFormSaveBackHandle(e)
}
// 属性json数据更新
- $obj.find('.submit-edit').attr('data-json', encodeURIComponent(e.data));
-
- // pid改变后不可再次操作
- if(pid_arr.length > 0)
- {
- if(json_old.pid != json.pid)
- {
- // 移出操作项（由于修改父级后，数据可能已经不在当前节点下、禁止再次编辑）
- $obj.find('.submit').remove();
-
- // 更新记录样式
- $obj.addClass('tree-change-item');
-
- // 存在父节点数据则移出当前的元素option
- // 防止交叉关联导致造成垃圾数据残留在数据库中
- // 移出当前存在父节点中的数据
- $popup.find('select[name="pid"] option[value="'+json['id']+'"]').remove();
- // 多选插件事件更新
- if($('select.chosen-select').length > 0)
- {
- $('select.chosen-select').trigger('chosen:updated');
- }
- } else {
- // 是否未启用
- if(json.is_enable != 1)
- {
- $obj.find('.tree-submit-add-node').hide();
- } else {
- $obj.find('.tree-submit-add-node').show();
- }
-
- // 如果当前节点id不存在pid节点中则隐藏新增操作按钮
- if(pid_arr.indexOf(json.id) == -1)
- {
- $obj.find('.tree-submit-add-node').hide();
- }
- }
- }
+ $obj.find('.submit-edit').attr('data-json', encodeURIComponent(string));
} else {
// 存在pid直接拉取下级数据,则追加新数据
var is_delete_all = parseInt($('#tree').attr('data-is-delete-all') || 0);
@@ -894,10 +850,10 @@ function TreeFormSaveBackHandle(e)
var level = $('#data-list-'+json.pid).length > 0 ? parseInt($('#data-list-'+json.pid).attr('data-level') || 0)+1 : 0;
Tree(json.pid, $('#tree').data('node-url'), level, is_delete_all);
} else {
- json['json'] = e.data;
+ json['json'] = string;
// 拼接html数据
- var html = TreeItemHtmlHandle(json, 0, is_delete_all);
+ var html = TreeItemHtmlHandle(json, 0, 0, is_delete_all);
// 首次则增加table标签容器
if($('#tree table tbody').length > 0)
@@ -907,14 +863,6 @@ function TreeFormSaveBackHandle(e)
} else {
$('#tree').html('
');
}
- // 刚刚创建的数据不支持新增操作
- // 因为级数据还不在父级选择节点数据中
- // 需要刷新页面重新加载数据
- // 如果当前节点id不存在pid节点中则隐藏新增操作按钮
- if(pid_arr.indexOf(json.id) == -1)
- {
- $('#data-list-'+json.id).find('.tree-submit-add-node').hide();
- }
}
}
}
diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css
index f9e45e3c5..716790649 100755
--- a/public/static/index/default/css/buy.css
+++ b/public/static/index/default/css/buy.css
@@ -165,11 +165,9 @@ ul.address-list, .business-item ul { overflow: hidden; }
.goods-base { float: left; top: 0; margin-left: 85px; }
.goods-attr { margin-top: 5px; }
.goods-attr li { color: #888; line-height: 16px; }
-.original-price { color: #999; text-decoration: line-through; }
.am-table { margin-bottom: 10px; }
.am-table > tbody > tr > td { border-top: 1px solid #eee; }
.am-table > thead > tr > th { border-bottom: 1px solid #f5f5f5; }
-
@media only screen and (min-width:640px) {
.cart-content table tr .base { width: 40%; }
.cart-content table tr .price { width: 20%; }
diff --git a/public/static/index/default/css/cart.css b/public/static/index/default/css/cart.css
index 0d6c90efc..f024934c6 100755
--- a/public/static/index/default/css/cart.css
+++ b/public/static/index/default/css/cart.css
@@ -5,10 +5,7 @@
.goods-base { float: left; top: 0; margin-left: 85px; }
.goods-attr { margin-top: 5px; }
.goods-attr li { color: #888; line-height: 16px; }
-.original-price, .line-price { font-family: Verdana,Tahoma,arial; }
-.original-price { color: #9c9c9c; text-decoration: line-through; }
-.line-price { color: #3c3c3c; }
-.line-price, strong.total-price-content, .nav-total-price { font-weight: 700; }
+strong.total-price-content, .nav-total-price { font-weight: 700; }
.stock-tag { width: 100px; }
.stock-tag .am-form-field { padding: 3px; height: 25px; text-align: center; font-size: 14px !important; width: 80px; }
.stock-tag .am-input-group-label { line-height: 23px; height: 25px; font-size: 14px !important; padding: 0 10px; }
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index 804e95aba..f24c5628a 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -237,8 +237,23 @@ input.add,input.min{width:15px}
font-weight: bold;
}
-/* 价格颜色 */
-.price, .price strong {color: #c00; }
+/* 价格 */
+.original-price,
+.line-price {
+ font-family: Verdana,Tahoma,arial;
+}
+.original-price {
+ color: #888;
+ text-decoration:
+ line-through; }
+.line-price {
+ color: #3c3c3c;
+ font-weight: 700;
+}
+.price,
+.price strong {
+ color: #c00;
+}
/* 公共错误提示页面 */
.tips-error, .tips-success { margin: 10% 0; background: #fff; }
@@ -617,7 +632,6 @@ ul.am-dropdown-content > .am-active > a:focus,
* 弹窗
*/
.am-popup-bd {
- padding: 5px;
background: none;
}
diff --git a/public/static/index/default/css/order.comments.css b/public/static/index/default/css/order.comments.css
index 7350c73f0..7d5b8bf46 100755
--- a/public/static/index/default/css/order.comments.css
+++ b/public/static/index/default/css/order.comments.css
@@ -49,15 +49,9 @@
.goods-base {float: left; top: 0; margin-left: 85px; }
.goods-attr { margin-top: 5px; }
.goods-attr li { color: #888; line-height: 16px; }
-.original-price, .line-price { font-family: Verdana,Tahoma,arial; }
-.original-price { color: #9c9c9c; text-decoration: line-through; }
-.line-price { color: #3c3c3c; }
-.line-price, strong.total-price-content { font-weight: 700; }
-strong.total-price-content { color: #d2364c; font-size: 16px; }
.am-table { margin-bottom: 10px; }
.am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; }
.am-table > thead > tr > th { border-bottom: 1px solid #f7f7f7; }
-
@media only screen and (min-width:640px) {
.cart-content table tr .base { width: 40%; }
.cart-content table tr .price { width: 20%; }
diff --git a/public/static/index/default/css/order.css b/public/static/index/default/css/order.css
index 93fa5c79c..382e00f12 100755
--- a/public/static/index/default/css/order.css
+++ b/public/static/index/default/css/order.css
@@ -11,7 +11,6 @@ ul.progress li i.step {
display: block;
background-color: #e1e1e1;
}
-
ul.progress li .digital {
background-color: #f7f7f7;
border-radius: 50px;
@@ -23,16 +22,13 @@ ul.progress li .digital {
font-weight: 700;
border: 6px solid #e1e1e1;
}
-
ul.progress li .base .title {
font-weight: 500;
color: #666;
}
-
ul.progress li .base .date {
color: #999;
}
-
ul.progress li.steps-success .digital {
border: 6px solid #4CAF50;
color: #fff;
@@ -56,7 +52,6 @@ ul.progress li.current .title {
.base-right .icon-success {
color: #28801c;
}
-
@media only screen and (min-width: 641px) {
ul.progress {
overflow: hidden;
@@ -83,7 +78,6 @@ ul.progress li.current .title {
margin-top: 50px;
}
}
-
@media only screen and (max-width: 641px) {
ul.progress li i.step {
height: 60px;
@@ -101,7 +95,6 @@ ul.progress li.current .title {
}
}
-
/**
* 文本列表
*/
@@ -113,7 +106,6 @@ ul.progress li.current .title {
color: #666;
}
-
/**
* 订单详情基础
*/
@@ -169,7 +161,6 @@ ul.progress li.current .title {
}
}
-
/**
* 业务面板
*/
@@ -179,7 +170,6 @@ ul.progress li.current .title {
-webkit-box-shadow: none;
}
-
/**
* 支付弹窗
*/
@@ -199,14 +189,6 @@ ul.progress li.current .title {
.business-item ul li:nth-child(2n) { margin-right: 0; }
}
-
-/**
- * 商品列表
- */
-.original-price { color: #9c9c9c; text-decoration: line-through; }
-.line-price { color: #3c3c3c; }
-
-
/**
* 虚拟销售
*/
diff --git a/public/static/index/default/css/orderaftersale.index.css b/public/static/index/default/css/orderaftersale.index.css
index 8eec97732..57dc75e99 100644
--- a/public/static/index/default/css/orderaftersale.index.css
+++ b/public/static/index/default/css/orderaftersale.index.css
@@ -8,9 +8,6 @@
.user-content-body .goods-base {float: left; top: 0; margin-left: 85px; }
.user-content-body .goods-attr { margin-top: 5px; }
.user-content-body .goods-attr li { color: #888; line-height: 16px; }
-.user-content-body .original-price, .user-content-body .line-price { font-family: Verdana,Tahoma,arial; }
-.user-content-body .original-price { color: #9c9c9c; text-decoration: line-through; }
-.user-content-body .line-price { color: #3c3c3c; font-weight: 700; }
/**
* 列表
diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css
index 4aa7bd71f..bb63a5460 100755
--- a/public/static/index/default/css/search.css
+++ b/public/static/index/default/css/search.css
@@ -326,10 +326,6 @@
.search-list .items .sales-count {
color: #888;
}
-.items .original-price {
- text-decoration: line-through;
- color: #666;
-}
@media only screen and (min-width: 640px) {
.search-container ul li:hover .items {
-webkit-box-shadow: 0px 12px 12px -10px rgb(0 0 0 / 40%);
diff --git a/public/static/index/default/css/userfavor.css b/public/static/index/default/css/userfavor.css
deleted file mode 100755
index 72902a45f..000000000
--- a/public/static/index/default/css/userfavor.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 商品列表
- */
-.goods-detail img { width: 80px; height: 80px; }
-.goods-detail { position: relative; }
-.goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
-.goods-title:hover { text-decoration: underline; }
-.goods-base { position: absolute; top: 0; left: 85px; }
-.original-price, .line-price { font-family: Verdana,Tahoma,arial; }
-.original-price { color: #9c9c9c; text-decoration: line-through; }
-.line-price { color: #3c3c3c; font-weight: 700; }
-.am-table { margin-bottom: 10px; }
-.am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; }
-.am-table > thead > tr > th { border-bottom: 1px solid #f7f7f7; }
-
-@media only screen and (min-width:640px) {
- .data-list tr .base { width: 50%; }
- .data-list tr .price { width: 20%; }
- .data-list tr .operate { width: 10%; }
-}
-@media only screen and (max-width:640px) {
- .data-list tr .base { width: 65%; }
- .data-list tr .price { width: 15%; }
- .data-list tr .operate { width: 20%; }
- .goods-detail img { width: 50px; height: 50px; }
- .goods-base { left: 55px; }
-}
\ No newline at end of file
diff --git a/public/static/index/default/css/usergoodsbrowse.css b/public/static/index/default/css/usergoodsbrowse.css
deleted file mode 100755
index 72902a45f..000000000
--- a/public/static/index/default/css/usergoodsbrowse.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 商品列表
- */
-.goods-detail img { width: 80px; height: 80px; }
-.goods-detail { position: relative; }
-.goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
-.goods-title:hover { text-decoration: underline; }
-.goods-base { position: absolute; top: 0; left: 85px; }
-.original-price, .line-price { font-family: Verdana,Tahoma,arial; }
-.original-price { color: #9c9c9c; text-decoration: line-through; }
-.line-price { color: #3c3c3c; font-weight: 700; }
-.am-table { margin-bottom: 10px; }
-.am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; }
-.am-table > thead > tr > th { border-bottom: 1px solid #f7f7f7; }
-
-@media only screen and (min-width:640px) {
- .data-list tr .base { width: 50%; }
- .data-list tr .price { width: 20%; }
- .data-list tr .operate { width: 10%; }
-}
-@media only screen and (max-width:640px) {
- .data-list tr .base { width: 65%; }
- .data-list tr .price { width: 15%; }
- .data-list tr .operate { width: 20%; }
- .goods-detail img { width: 50px; height: 50px; }
- .goods-base { left: 55px; }
-}
\ No newline at end of file