sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节优化

feat/task1-c-wallet
devil_gong 2019-05-28 11:04:31 +08:00
parent 22d18e62d4
commit 06ac05958d
18 changed files with 98 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/admin/controller/Goodscomments.php
View File

@ -85,8 +85,8 @@ class Goodscomments extends Common
// 静态数据
$this->assign('common_is_show_list', lang('common_is_show_list'));
$this->assign('common_is_text_list', lang('common_is_text_list'));
$this->assign('rating_list', GoodsCommentsService::$rating_list);
$this->assign('business_type_list', GoodsCommentsService::$business_type_list);
$this->assign('common_goods_comments_rating_list', lang('common_goods_comments_rating_list'));
$this->assign('common_goods_rating_business_type_list', lang('common_goods_rating_business_type_list'));
// 参数
$this->assign('params', $params);
@ -124,8 +124,8 @@ class Goodscomments extends Common
// 静态数据
$this->assign('common_is_show_list', lang('common_is_show_list'));
$this->assign('common_is_text_list', lang('common_is_text_list'));
$this->assign('rating_list', GoodsCommentsService::$rating_list);
$this->assign('business_type_list', GoodsCommentsService::$business_type_list);
$this->assign('common_goods_comments_rating_list', lang('common_goods_comments_rating_list'));
$this->assign('common_goods_rating_business_type_list', lang('common_goods_rating_business_type_list'));
// 参数
unset($params['id']);

8
application/admin/view/default/goodscomments/index.html
View File

@ -61,8 +61,8 @@
<span>类型：</span>
<select name="business_type" class="chosen-select" data-placeholder="业务类型...">
<option value="">业务类型...</option>
{{if !empty($business_type_list)}}
{{foreach $business_type_list as $k=>$v}}
{{if !empty($common_goods_rating_business_type_list)}}
{{foreach $common_goods_rating_business_type_list as $k=>$v}}
<option value="{{$k}}" {{if isset($params['business_type']) and $params['business_type'] eq $k}}selected{{/if}}>{{$v}}</option>
{{/foreach}}
{{/if}}
@ -143,7 +143,7 @@
</div>
</td>
<td class="am-hide-sm-only">
<span class="am-badge am-radius {{$rating_list[$v['rating']]['badge']}}">{{$v.rating_text}}</span>
<span class="am-badge am-radius {{$common_goods_comments_rating_list[$v['rating']]['badge']}}">{{$v.rating_text}}</span>
</td>
<td class="am-hide-sm-only">
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_reply'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/goodscomments/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_reply']}}" data-field="is_reply"></a>
@ -203,7 +203,7 @@
<dt>评分</dt>
<dd>
<span class="am-badge am-radius {{$rating_list[$v['rating']]['badge']}}">{{$v.rating_text}}</span>
<span class="am-badge am-radius {{$common_goods_comments_rating_list[$v['rating']]['badge']}}">{{$v.rating_text}}</span>
</dd>
<dt>是否匿名</dt>

8
application/admin/view/default/goodscomments/save_info.html
View File

@ -42,8 +42,8 @@
<div class="am-form-group">
<label>业务类型<span class="am-form-group-label-tips-must">必选</span></label>
<select name="business_type" class="chosen-select" data-placeholder="业务类型..." data-validation-message="请选择业务类型" required>
{{if !empty($business_type_list)}}
{{foreach $business_type_list as $k=>$v}}
{{if !empty($common_goods_rating_business_type_list)}}
{{foreach $common_goods_rating_business_type_list as $k=>$v}}
<option value="{{$k}}" {{if isset($data['business_type']) and $data['business_type'] eq $k}}selected{{/if}}>{{$v}}</option>
{{/foreach}}
{{/if}}
@ -68,8 +68,8 @@
<div class="am-form-group">
<label>评分<span class="am-form-group-label-tips-must">必选</span></label>
<select name="rating" class="chosen-select" data-placeholder="评分..." data-validation-message="请选择评分" required>
{{if !empty($business_type_list)}}
{{foreach $rating_list as $k=>$v}}
{{if !empty($common_goods_comments_rating_list)}}
{{foreach $common_goods_comments_rating_list as $k=>$v}}
<option value="{{$k}}" {{if isset($data['rating']) and $data['rating'] eq $k}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
{{/if}}

32
application/admin/view/default/orderaftersale/index.html
View File

@ -105,7 +105,7 @@
<td class="am-hide-sm-only">
<div class="goods-detail">
<a href="{{$v.order_data.items.goods_url}}" target="_blank">
<img src="{{$v.order_data.items.images}}">
<img src="{{$v.order_data.items.images}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$v.order_data.items.goods_url}}" target="_blank" class="goods-title">{{$v.order_data.items.title}}</a>
@ -127,7 +127,7 @@
类型：{{$v.type_text}}<br />
原因：{{$v.reason}}<br />
数量：{{$v.number}}<br />
金额：{{$v.price}}<br />
金额：<span class="am-text-warning">￥{{$v.price}}</span><br />
说明：{{$v.msg}}<br />
时间：{{$v.apply_time_time}}
</td>
@ -190,7 +190,7 @@
<dd>
<div class="goods-detail">
<a href="{{$v.order_data.items.goods_url}}" target="_blank">
<img src="{{$v.order_data.items.images}}">
<img src="{{$v.order_data.items.images}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$v.order_data.items.goods_url}}" target="_blank" class="goods-title">{{$v.order_data.items.title}}</a>
@ -214,7 +214,7 @@
类型：{{$v.type_text}}<br />
原因：{{$v.reason}}<br />
数量：{{$v.number}}<br />
金额：{{$v.price}}<br />
金额：<span class="am-text-warning">￥{{$v.price}}</span><br />
说明：{{$v.msg}}<br />
时间：{{$v.apply_time_time}}
</dd>
@ -321,15 +321,25 @@
<li class="email">邮箱：<span>...</span></li>
</ul>
</dd>
<dt>申请信息</dt>
<dd class="apply-info">
<ul>
<li class="type">类型：<span>...</span></li>
<li class="reason">原因：<span>...</span></li>
<li class="number">数量：<span>...</span></li>
<li class="price">金额：<span class="am-text-warning">...</span></li>
<li class="msg">说明：<span>...</span></li>
</ul>
</dd>
</dl>
<form class="am-form form-validation-audit" action="{{:MyUrl('admin/orderaftersale/audit')}}" method="POST" request-type="ajax-reload" enctype="multipart/form-data">
<div class="am-form-group">
<label class="am-block">退款方式</label>
{{if !empty($common_order_aftersale_refundment_list)}}
{{foreach $common_order_aftersale_refundment_list as $k=>$v}}
{{foreach $common_order_aftersale_refundment_list as $v}}
<label class="am-radio-inline am-success">
<input type="radio" name="refundment" value="{{$v.value}}" data-am-ucheck {{if $k eq 0}} data-validation-message="请选择退狂方式" required{{/if}} /> {{$v.name}}
<input type="radio" name="refundment" value="{{$v.value}}" data-am-ucheck data-validation-message="请选择退款方式" required /> {{$v.name}}
</label>
{{/foreach}}
{{/if}}
@ -363,6 +373,16 @@
<li class="email">邮箱：<span>...</span></li>
</ul>
</dd>
<dt>申请信息</dt>
<dd class="apply-info">
<ul>
<li class="type">类型：<span>...</span></li>
<li class="reason">原因：<span>...</span></li>
<li class="number">数量：<span>...</span></li>
<li class="price">金额：<span class="am-text-warning">...</span></li>
<li class="msg">说明：<span>...</span></li>
</ul>
</dd>
</dl>
<form class="am-form form-validation-refuse" action="{{:MyUrl('admin/orderaftersale/refuse')}}" method="POST" request-type="ajax-reload" enctype="multipart/form-data">

4
application/admin/view/default/public/footer.html
View File

@ -64,12 +64,12 @@
<!-- 应用插件公共js -->
{{if !empty($plugins_js)}}
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$plugins_js}}?v={{:MyC('home_static_cache_version')}}"></script>
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$plugins_js}}"></script>
{{/if}}
<!-- 当前控制器js -->
{{if !empty($module_js)}}
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_js}}?v={{:MyC('home_static_cache_version')}}"></script>
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_js}}"></script>
{{/if}}
<!-- js钩子 -->

4
application/index/view/default/order/detail.html
View File

@ -60,7 +60,7 @@
{{/if}}
</div>
</li>
<li class="{{if $data['status'] GT 3}}steps-success{{/if}} {{if $data['status'] EQ 4}} current{{/if}}">
<li class="{{if $data['status'] GT 3}}steps-success{{/if}} {{if $data['status'] EQ 4 and $data['user_is_comments'] EQ 0}} current{{/if}}">
<i class="step"></i>
<p class="digital">
{{if $data['status'] GT 3}}<i class="am-icon-check"></i>{{else /}}4{{/if}}
@ -257,7 +257,7 @@
<td class="base">
<div class="goods-detail">
<a href="{{$goods.goods_url}}" target="_blank">
<img src="{{$goods.images}}" />
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$goods.goods_url}}" target="_blank" class="goods-title">{{$goods.title}}</a>

2
application/index/view/default/order/index.html
View File

@ -155,7 +155,7 @@
<td class="base row-content">
<div class="goods-detail">
<a href="{{$goods.goods_url}}" target="_blank" class="goods-images">
<img src="{{$goods.images}}" alt="{{$goods.title}}" />
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$goods.goods_url}}" target="_blank" class="goods-title">{{$goods.title}}</a>

4
application/index/view/default/orderaftersale/index.html
View File

@ -110,7 +110,7 @@
<td class="am-hide-sm-only">
<div class="goods-detail">
<a href="{{$v.order_data.items.goods_url}}" target="_blank">
<img src="{{$v.order_data.items.images}}">
<img src="{{$v.order_data.items.images}}" alt="{{$v.order_data.items.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$v.order_data.items.goods_url}}" target="_blank" class="goods-title">{{$v.order_data.items.title}}</a>
@ -132,7 +132,7 @@
类型：{{$v.type_text}}<br />
原因：{{$v.reason}}<br />
数量：{{$v.number}}<br />
金额：{{$v.price}}<br />
金额：<span class="am-text-warning">￥{{$v.price}}</span><br />
说明：{{$v.msg}}<br />
时间：{{$v.apply_time_time}}
</td>

8
application/index/view/default/user/index.html
View File

@ -150,7 +150,7 @@
{{if $key eq 0}}
<div class="goods-detail">
<a href="{{:MyUrl('index/order/detail', ['id'=>$order['id']])}}" target="_blank">
<img src="{{$goods.images}}" />
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{:MyUrl('index/order/detail', ['id'=>$order['id']])}}" target="_blank" class="goods-title am-text-truncate">{{$goods.title}}</a>
@ -209,7 +209,7 @@
{{if $key lt 3}}
<div class="goods-detail">
<a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank">
<img src="{{$goods.images}}" />
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank" class="goods-title am-text-truncate">{{$goods.title}}</a>
@ -253,7 +253,7 @@
<li>
<div class="am-gallery-item">
<a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank">
<img src="{{$goods.images}}" alt="{{$goods.title}}" />
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
<h3 class="am-gallery-title">{{$goods.title}}</h3>
<div class="am-gallery-desc line-price">￥{{$goods.price}}</div>
</a>
@ -291,7 +291,7 @@
<li>
<div class="am-gallery-item">
<a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank">
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-circle" />
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-circle" />
<h3 class="am-gallery-title">{{$goods.title}}</h3>
</a>
<div class="am-gallery-desc line-price">￥{{$goods.price}}</div>

2
application/index/view/default/userfavor/goods.html
View File

@ -50,7 +50,7 @@
<td>
<div class="goods-detail">
<a href="{{$v.goods_url}}" target="_blank">
<img src="{{$v.images}}">
<img src="{{$v.images}}" alt="{{$v.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$v.goods_url}}" target="_blank" class="goods-title">{{$v.title}}</a>

2
application/index/view/default/usergoodsbrowse/index.html
View File

@ -50,7 +50,7 @@
<td>
<div class="goods-detail">
<a href="{{$v.goods_url}}" target="_blank">
<img src="{{$v.images}}">
<img src="{{$v.images}}" alt="{{$v.title}}" class="am-img-thumbnail am-radius" />
</a>
<div class="goods-base">
<a href="{{$v.goods_url}}" target="_blank" class="goods-title">{{$v.title}}</a>

15
application/lang/zh-cn.php
View File

@ -317,6 +317,21 @@ return array(
2 => array('value' => 2, 'name' => '手动处理'),
),
// 商品评分
'common_goods_comments_rating_list' => array(
0 => array('name'=>'未评分', 'badge'=>''),
1 => array('name'=>'1分', 'badge'=>'am-badge-danger'),
2 => array('name'=>'2分', 'badge'=>'am-badge-warning'),
3 => array('name'=>'3分', 'badge'=>'am-badge-secondary'),
4 => array('name'=>'4分', 'badge'=>'am-badge-primary'),
5 => array('name'=>'5分', 'badge'=>'am-badge-success'),
),
// 商品评分业务类型
'common_goods_rating_business_type_list' => array(
'order' => '订单',
),
// 色彩值
'common_color_list' => array(

25
application/service/GoodsCommentsService.php
View File

@ -23,21 +23,6 @@ use app\service\GoodsService;
*/
class GoodsCommentsService
{
// 业务类型
public static $business_type_list = [
'order' => '订单',
];
// 评分
public static $rating_list = [
0 => ['name'=>'未评分', 'badge'=>''],
1 => ['name'=>'1分', 'badge'=>'am-badge-danger'],
2 => ['name'=>'2分', 'badge'=>'am-badge-warning'],
3 => ['name'=>'3分', 'badge'=>'am-badge-secondary'],
4 => ['name'=>'4分', 'badge'=>'am-badge-primary'],
5 => ['name'=>'5分', 'badge'=>'am-badge-success'],
];
/**
* 订单评论
* @author Devil
@ -175,6 +160,8 @@ class GoodsCommentsService
if(!empty($data))
{
$common_is_text_list = lang('common_is_text_list');
$common_goods_comments_rating_list = lang('common_goods_comments_rating_list');
$common_goods_rating_business_type_list = lang('common_goods_rating_business_type_list');
foreach($data as &$v)
{
// 用户信息
@ -201,7 +188,7 @@ class GoodsCommentsService
$v['goods'] = isset($ret['data'][0]) ? $ret['data'][0] : [];
// 业务类型
$v['business_type_text'] = array_key_exists($v['business_type'], self::$business_type_list) ? self::$business_type_list[$v['business_type']] : null;
$v['business_type_text'] = array_key_exists($v['business_type'], $common_goods_rating_business_type_list) ? $common_goods_rating_business_type_list[$v['business_type']] : null;
$msg = null;
switch($v['business_type'])
{
@ -212,7 +199,7 @@ class GoodsCommentsService
$v['msg'] = empty($msg) ? null : $msg;
// 评分
$v['rating_text'] = self::$rating_list[$v['rating']]['name'];
$v['rating_text'] = $common_goods_comments_rating_list[$v['rating']]['name'];
// 是否
$v['is_reply_text'] = isset($common_is_text_list[$v['is_reply']]) ? $common_is_text_list[$v['is_reply']]['name'] : '';
@ -381,7 +368,7 @@ class GoodsCommentsService
[
'checked_type' => 'in',
'key_name' => 'business_type',
'checked_data' => array_keys(self::$business_type_list),
'checked_data' => array_keys(lang('common_order_aftersale_refundment_list')),
'error_msg' => '请选择业务类型',
],
[
@ -399,7 +386,7 @@ class GoodsCommentsService
[
'checked_type' => 'in',
'key_name' => 'rating',
'checked_data' => array_keys(self::$rating_list),
'checked_data' => array_keys(lang('common_goods_comments_rating_list')),
'error_msg' => '请选择评分',
],
];

2
public/static/admin/default/css/orderaftersale.css
View File

@ -1,7 +1,7 @@
/**
* 商品列表
*/
.content-right .goods-detail img { width: 80px; height: 80px; position: absolute; border: 1px solid #eee; }
.content-right .goods-detail img { width: 80px; height: 80px; position: absolute; }
.content-right .goods-detail { position: relative; min-height: 80px; }
.content-right .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
.content-right .goods-title:hover { text-decoration: underline; }

48
public/static/admin/default/js/orderaftersale.js
View File

@ -4,39 +4,35 @@ FromInit('form.form-validation-refuse');
$(function()
{
// 弹窗数据初始化
function PopupInit($popup, data)
{
// 用户信息
$popup.find('input[name="id"]').val(data.id);
$popup.find('.user-info img').attr('src', data.user.avatar || $popup.find('.user-info img').attr('src'));
$popup.find('.user-info .user-base .username span').html(data.user.username || '<span class="cr-ddd">未填写</span>');
$popup.find('.user-info .user-base .nickname span').html(data.user.nickname || '<span class="cr-ddd">未填写</span>');
$popup.find('.user-info .user-base .mobile span').html(data.user.mobile || '<span class="cr-ddd">未填写</span>');
$popup.find('.user-info .user-base .email span').html(data.user.email || '<span class="cr-ddd">未填写</span>');
// 申请信息
$popup.find('.apply-info .type span').html(data.type_text || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .reason span').html(data.reason || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .number span').html(data.number || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .price span').html('￥'+data.price || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .msg span').html(data.price || '<span class="cr-ddd">未填写</span>');
$popup.modal();
}
// 审核
$('table.am-table .submit-audit').on('click', function()
{
var $audit_popup = $('#order-audit-popup');
var json = $(this).data('json');
console.log(json);
// 用户信息
$audit_popup.find('input[name="id"]').val(json.id);
$audit_popup.find('.user-info img').attr('src', json.user.avatar || $audit_popup.find('.user-info img').attr('src'));
$audit_popup.find('.user-info .user-base .username span').html(json.user.username || '<span class="cr-ddd">未填写</span>');
$audit_popup.find('.user-info .user-base .nickname span').html(json.user.nickname || '<span class="cr-ddd">未填写</span>');
$audit_popup.find('.user-info .user-base .mobile span').html(json.user.mobile || '<span class="cr-ddd">未填写</span>');
$audit_popup.find('.user-info .user-base .email span').html(json.user.email || '<span class="cr-ddd">未填写</span>');
$audit_popup.modal();
PopupInit($('#order-audit-popup'), $(this).data('json'));
});
// 拒绝
$('table.am-table .submit-refuse').on('click', function()
{
var $refuse_popup = $('#order-refuse-popup');
var json = $(this).data('json');
console.log(json);
// 用户信息
$refuse_popup.find('input[name="id"]').val(json.id);
$refuse_popup.find('.user-info img').attr('src', json.user.avatar || $refuse_popup.find('.user-info img').attr('src'));
$refuse_popup.find('.user-info .user-base .username span').html(json.user.username || '<span class="cr-ddd">未填写</span>');
$refuse_popup.find('.user-info .user-base .nickname span').html(json.user.nickname || '<span class="cr-ddd">未填写</span>');
$refuse_popup.find('.user-info .user-base .mobile span').html(json.user.mobile || '<span class="cr-ddd">未填写</span>');
$refuse_popup.find('.user-info .user-base .email span').html(json.user.email || '<span class="cr-ddd">未填写</span>');
$refuse_popup.modal();
PopupInit($('#order-refuse-popup'), $(this).data('json'));
});
});

2
public/static/index/default/css/order.css
View File

@ -59,7 +59,7 @@ table.data-ongoing .base-operate { border-top: 1px dashed #fff1f5; }
* 商品列表
*/
.goods-detail { position: relative; min-height: 80px; }
.goods-detail img { width: 80px; height: 80px; position: absolute; left: 0; border: 1px solid #eee; }
.goods-detail img { width: 80px; height: 80px; position: absolute; left: 0; }
.goods-title { display: -webkit-box; max-height: 36px; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
.goods-title:hover { text-decoration: underline; }
.goods-base { float: left; top: 0; margin-left: 85px; }

2
public/static/index/default/css/orderaftersale.index.css
View File

@ -1,7 +1,7 @@
/**
* 商品列表
*/
.user-content-body .goods-detail img { width: 80px; height: 80px; position: absolute; border: 1px solid #eee; }
.user-content-body .goods-detail img { width: 80px; height: 80px; position: absolute; }
.user-content-body .goods-detail { position: relative; min-height: 80px; }
.user-content-body .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
.user-content-body .goods-title:hover { text-decoration: underline; }

2
route/route.config
View File

@ -24,7 +24,7 @@ Route::get('goods'.$ds.':id', 'index/goods/index');
// 搜索
Route::get('search'.$ds.'c'.$ds.':category_id', 'index/search/index');
Route::get('search'.$ds.'k'.$ds.':keywords', 'index/search/index');
Route::get('search'.$ds.'k'.$ds.':wd', 'index/search/index');
Route::rule('search', 'index/search/index', 'GET|POST');
// 分类