Skip to content

ShopXO
ShopXO

jcy2004x / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

体验新版 GitCode，发现更多精彩内容 >>

提交 5d33d37d 编写于 作者: D devil_gong
浏览文件
操作

评论新增支持图片

上级 a1fd5d17
隐藏空白更改
内联 并排
Showing with 106 addition and 64 deletion
application/admin/view/default/goodscomments/index.html
浏览文件 @ 5d33d37d
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<th class="am-hide-md-down">用户信息</th> <th class="am-hide-md-down">用户信息</th>
<th class="am-hide-sm-only">业务类型</th> <th class="am-hide-sm-only">业务类型</th>
<th>评论内容</th> <th>评论内容</th>
<th class="am-hide-sm-only">评论图片</th>
<th class="am-hide-sm-only">评分</th> <th class="am-hide-sm-only">评分</th>
<th class="am-hide-sm-only">回复</th> <th class="am-hide-sm-only">回复</th>
<th class="am-hide-sm-only">匿名</th> <th class="am-hide-sm-only">匿名</th>
...@@ -142,6 +143,21 @@ ...@@ -142,6 +143,21 @@
{{$v.content}} {{$v.content}}
</div> </div>
</td> </td>
<td class="am-hide-sm-only">
{{if !empty($v['images'])}}
<div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{&quot;directionNav&quot;:false, slideshow:false}' >
<ul class="am-slides">
{{foreach $v.images as $img}}
<li>
<a href="{{$img}}" target="_blank">
<img src="{{$img}}" />
</a>
</li>
{{/foreach}}
</ul>
</div>
{{/if}}
</td>
<td class="am-hide-sm-only"> <td class="am-hide-sm-only">
<span class="am-badge am-radius {{$common_goods_comments_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>
...@@ -201,6 +217,17 @@ ...@@ -201,6 +217,17 @@
<dt>评论内容</dt> <dt>评论内容</dt>
<dd>{{$v.content}}</dd> <dd>{{$v.content}}</dd>
<dt>评论图片</dt>
<dd>
{{if !empty($v['images'])}}
{{foreach $v.images as $img}}
<a href="{{$img}}" target="_blank">
<img src="{{$img}}" class="am-img-thumbnail" width="80" height="80" />
</a>
{{/foreach}}
{{/if}}
</dd>
<dt>评分</dt> <dt>评分</dt>
<dd> <dd>
<span class="am-badge am-radius {{$common_goods_comments_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>
......
application/admin/view/default/orderaftersale/index.html
浏览文件 @ 5d33d37d
...@@ -137,7 +137,9 @@ ...@@ -137,7 +137,9 @@
<ul class="am-slides"> <ul class="am-slides">
{{foreach $v.images as $img}} {{foreach $v.images as $img}}
<li> <li>
<img src="{{$img}}" /> <a href="{{$img}}" target="_blank">
<img src="{{$img}}" />
</a>
</li> </li>
{{/foreach}} {{/foreach}}
</ul> </ul>
......
application/index/controller/Common.php
浏览文件 @ 5d33d37d
...@@ -299,7 +299,7 @@ class Common extends Controller ...@@ -299,7 +299,7 @@ class Common extends Controller
$this->assign('common_bottom_nav_list', NavigationService::BottomNavigation(['user'=>$this->user])); $this->assign('common_bottom_nav_list', NavigationService::BottomNavigation(['user'=>$this->user]));
// 编辑器文件存放地址 // 编辑器文件存放地址
$this->assign('editor_path_type', empty($this->user['id']) ? 'public' : 'user_'.$this->user['id']); $this->assign('editor_path_type', empty($this->user['id']) ? 'public' : 'user-'.$this->user['id']);
} }
/** /**
......
application/index/controller/Order.php
浏览文件 @ 5d33d37d
...@@ -171,6 +171,9 @@ class Order extends Common ...@@ -171,6 +171,9 @@ class Order extends Common
{ {
$this->assign('referer_url', empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/order/index') : $_SERVER['HTTP_REFERER']); $this->assign('referer_url', empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/order/index') : $_SERVER['HTTP_REFERER']);
$this->assign('data', $data['data'][0]); $this->assign('data', $data['data'][0]);
// 编辑器文件存放地址
$this->assign('editor_path_type', 'order_comments-'.$this->user['id'].'-'.$data['data'][0]['id']);
return $this->fetch(); return $this->fetch();
} else { } else {
$this->assign('msg', '没有相关数据'); $this->assign('msg', '没有相关数据');
......
application/index/view/default/goods/index.html
浏览文件 @ 5d33d37d
...@@ -490,22 +490,24 @@ ...@@ -490,22 +490,24 @@
<div class="am-progress am-fr"> <div class="am-progress am-fr">
{{if isset($goods_score['avg']) and $goods_score['avg'] gt 0 and !empty($goods_score['rating'])}} {{if isset($goods_score['avg']) and $goods_score['avg'] gt 0 and !empty($goods_score['rating'])}}
{{foreach $goods_score.rating as $score}} {{foreach $goods_score.rating as $score}}
<div class="am-progress-bar {{if $score.portion gt 0}}
{{switch score.rating}} <div class="am-progress-bar
{{case 1}} {{switch score.rating}}
am-progress-bar-danger {{case 1}}
{{/case}} am-progress-bar-danger
{{case 2}} {{/case}}
am-progress-bar-warning {{case 2}}
{{/case}} am-progress-bar-warning
{{case 3}} {{/case}}
am-progress-bar-secondary {{case 3}}
{{/case}} am-progress-bar-secondary
{{case 5}} {{/case}}
am-progress-bar-success {{case 5}}
{{/case}} am-progress-bar-success
{{/switch}}" {{/case}}
style="width: {{$score.portion}}%">{{$score.name}}({{$score.portion}}%)</div> {{/switch}}"
style="width: {{$score.portion}}%">{{$score.name}}({{$score.portion}}%)</div>
{{/if}}
{{/foreach}} {{/foreach}}
{{else /}} {{else /}}
没有评分数据 没有评分数据
......
application/index/view/default/order/comments.html
浏览文件 @ 5d33d37d
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{foreach $data.items as $goods}} {{foreach $data.items as $key=>$goods}}
<tr id="data-list-{{$goods.id}}" data-id="{{$goods.id}}" data-goods-id="{{$goods.goods_id}}" class="am-form-group business-form-block"> <tr id="data-list-{{$goods.id}}" data-id="{{$goods.id}}" data-goods-id="{{$goods.goods_id}}" class="am-form-group business-form-block">
<td class="base"> <td class="base">
<div class="goods-detail"> <div class="goods-detail">
...@@ -76,11 +76,17 @@ ...@@ -76,11 +76,17 @@
<li><i class="am-icon-star-o am-icon-md"></i></li> <li><i class="am-icon-star-o am-icon-md"></i></li>
<li><i class="am-icon-star-o am-icon-md"></i></li> <li><i class="am-icon-star-o am-icon-md"></i></li>
<li><i class="am-icon-star-o am-icon-md"></i></li> <li><i class="am-icon-star-o am-icon-md"></i></li>
<li class="tips-text"></li>
</ul> </ul>
<input type="text" name="rating[]" value="" class="input-rating" data-validation-message="请选择评分" required /> <input type="text" name="rating[]" value="" class="input-rating" data-validation-message="请选择评分" required />
</div> </div>
<textarea name="content[]" class="am-radius" rows="4" minlength="6" maxlength="230" data-validation-message="评论内容 6~230 个字符之间" required></textarea> <textarea name="content[]" class="am-radius" placeholder="宝贝满足你的期待吗？说说它的优点和美中不足的地方吧" rows="4" minlength="6" maxlength="230" data-validation-message="评论内容 6~230 个字符之间" required></textarea>
<input type="hidden" name="goods_id[]" value="{{$goods.goods_id}}" /> <input type="hidden" name="goods_id[]" value="{{$goods.goods_id}}" />
<ul class="plug-file-upload-view goods-images-view-{{$key}}" data-form-name="images[{{$key}}][]" data-max-number="3" data-dialog-type="images">
</ul>
<div class="plug-file-upload-submit" data-view-tag="ul.goods-images-view-{{$key}}">+上传图片</div>
<span class="am-form-group-label-tips">最多上传3张图片</span>
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}
...@@ -90,7 +96,7 @@ ...@@ -90,7 +96,7 @@
{{/if}} {{/if}}
<div class="am-form-group business-form-block"> <div class="am-form-group business-form-block">
<label class="block">是否匿名</label> <label class="block">是否匿名<span class="am-form-group-label-tips">开启后你写的评论会以匿名的形式展现</span></label>
<input name="is_anonymous" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch /> <input name="is_anonymous" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch />
</div> </div>
......
application/service/BuyService.php
浏览文件 @ 5d33d37d
...@@ -830,14 +830,10 @@ class BuyService ...@@ -830,14 +830,10 @@ class BuyService
$address = $buy['data']['base']['address']; $address = $buy['data']['base']['address'];
} }
// 店铺
$shop_id = 0;
// 订单写入 // 订单写入
$order = [ $order = [
'order_no' => date('YmdHis').GetNumberCode(6), 'order_no' => date('YmdHis').GetNumberCode(6),
'user_id' => $params['user']['id'], 'user_id' => $params['user']['id'],
'shop_id' => $shop_id,
'receive_address_id' => $address['id'], 'receive_address_id' => $address['id'],
'receive_name' => $address['name'], 'receive_name' => $address['name'],
'receive_tel' => $address['tel'], 'receive_tel' => $address['tel'],
...@@ -888,7 +884,6 @@ class BuyService ...@@ -888,7 +884,6 @@ class BuyService
$detail = [ $detail = [
'order_id' => $order_id, 'order_id' => $order_id,
'user_id' => $params['user']['id'], 'user_id' => $params['user']['id'],
'shop_id' => $shop_id,
'goods_id' => $v['goods_id'], 'goods_id' => $v['goods_id'],
'title' => $v['title'], 'title' => $v['title'],
'images' => $v['images_old'], 'images' => $v['images_old'],
......
application/service/GoodsCommentsService.php
浏览文件 @ 5d33d37d
...@@ -133,7 +133,7 @@ class GoodsCommentsService ...@@ -133,7 +133,7 @@ class GoodsCommentsService
// 获取订单信息 // 获取订单信息
$order_id = intval($params['id']); $order_id = intval($params['id']);
$where = ['id'=>$order_id, 'user_id'=>$params['user']['id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0]; $where = ['id'=>$order_id, 'user_id'=>$params['user']['id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0];
$order = Db::name('Order')->where($where)->field('id,status,shop_id,user_is_comments')->find(); $order = Db::name('Order')->where($where)->field('id,status,user_is_comments')->find();
if(empty($order)) if(empty($order))
{ {
return DataReturn('资源不存在或已被删除', -1); return DataReturn('资源不存在或已被删除', -1);
...@@ -155,7 +155,6 @@ class GoodsCommentsService ...@@ -155,7 +155,6 @@ class GoodsCommentsService
{ {
$data = [ $data = [
'user_id' => $params['user']['id'], 'user_id' => $params['user']['id'],
'shop_id' => $order['shop_id'],
'order_id' => $order_id, 'order_id' => $order_id,
'goods_id' => $goods_id, 'goods_id' => $goods_id,
'business_type' => $params['business_type'], 'business_type' => $params['business_type'],
......
config/shopxo.sql
浏览文件 @ 5d33d37d
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
public/appmini/old/alipay/pages/goods-comment/goods-comment.axml
浏览文件 @ 5d33d37d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<view class="progress fr tc"> <view class="progress fr tc">
<block a:if="{{goods_score.avg > 0}}"> <block a:if="{{goods_score.avg > 0}}">
<block a:for="{{goods_score.rating}}"> <block a:for="{{goods_score.rating}}">
<view class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view> <view a:if="{{item.portion > 0}}" class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view>
</block> </block>
</block> </block>
<text a:else class="cr-888">暂无评分</text> <text a:else class="cr-888">暂无评分</text>
......
public/appmini/old/baidu/pages/goods-comment/goods-comment.swan
浏览文件 @ 5d33d37d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<view class="progress fr tc"> <view class="progress fr tc">
<block s-if="goods_score.avg > 0"> <block s-if="goods_score.avg > 0">
<block s-for="item, index in goods_score.rating" s-key="key"> <block s-for="item, index in goods_score.rating" s-key="key">
<view class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view> <view s-if="item.portion > 0" class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view>
</block> </block>
</block> </block>
<text s-else class="cr-888">暂无评分</text> <text s-else class="cr-888">暂无评分</text>
......
public/appmini/old/weixin/pages/goods-comment/goods-comment.wxml
浏览文件 @ 5d33d37d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<view class="progress fr tc"> <view class="progress fr tc">
<block wx:if="{{goods_score.avg > 0}}"> <block wx:if="{{goods_score.avg > 0}}">
<block wx:for="{{goods_score.rating}}" wx:key="key"> <block wx:for="{{goods_score.rating}}" wx:key="key">
<view class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view> <view wx:if="{{item.portion > 0}}" class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view>
</block> </block>
</block> </block>
<text wx:else class="cr-888">暂无评分</text> <text wx:else class="cr-888">暂无评分</text>
......
public/static/admin/default/css/goodscomments.css
浏览文件 @ 5d33d37d
...@@ -56,6 +56,13 @@ ...@@ -56,6 +56,13 @@
.content-right table.am-table .view-operation { .content-right table.am-table .view-operation {
width: 85px; width: 85px;
} }
.content-right table.am-table .am-slider {
width: 100px;
max-height: 108px;
overflow: hidden;
box-shadow: none;
-webkit-box-shadow: none;
}
/** /**
......
public/static/index/default/css/order.comments.css
浏览文件 @ 5d33d37d
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
overflow: hidden; overflow: hidden;
margin-bottom: 2px; margin-bottom: 2px;
padding: 3px 5px; padding: 3px 5px;
line-height: 22px;
} }
.user-content-body ul.rating li { .user-content-body ul.rating li {
float: left; float: left;
...@@ -19,6 +20,9 @@ ...@@ -19,6 +20,9 @@
.user-content-body ul.rating li i.am-icon-star { .user-content-body ul.rating li i.am-icon-star {
color: #d13b49; color: #d13b49;
} }
.user-content-body ul.rating li.tips-text {
width: 38px;
}
.user-content-body .rating-items { .user-content-body .rating-items {
margin-bottom: 0; margin-bottom: 0;
} }
......
public/static/index/default/js/order.js
浏览文件 @ 5d33d37d
...@@ -57,10 +57,12 @@ $(function() ...@@ -57,10 +57,12 @@ $(function()
{ {
$(this).parent().find('li i').removeClass('am-icon-star').addClass('am-icon-star-o'); $(this).parent().find('li i').removeClass('am-icon-star').addClass('am-icon-star-o');
var index = $(this).index(); var index = $(this).index();
var rating_msg = ['非常差', '差', '一般', '好', '非常好'];
for(var i=0; i<=index; i++) for(var i=0; i<=index; i++)
{ {
$(this).parent().find('li').eq(i).find('i').removeClass('am-icon-star-o').addClass('am-icon-star'); $(this).parent().find('li').eq(i).find('i').removeClass('am-icon-star-o').addClass('am-icon-star');
} }
$(this).parent().find('li.tips-text').text(rating_msg[index]);
$(this).parents('td').find('input.input-rating').val(index+1).trigger('blur'); $(this).parents('td').find('input.input-rating').val(index+1).trigger('blur');
$(this).parent().removeClass('not-selected'); $(this).parent().removeClass('not-selected');
}); });
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或