订单评论

application/api/controller/Order.php

@@ -98,6 +98,11 @@ class Order extends Common
         // 参数
         $params = $this->data_post;
         $params['user'] = $this->user;
+        $params['user_type'] = 'user';
+        if(empty($params['id']))
+        {
+            return DataReturn('参数有误', -1);
+        }
 
         // 条件
         $where = OrderService::OrderListWhere($params);
@@ -116,6 +121,58 @@ class Order extends Common
         return DataReturn('数据不存在或已删除', -100);
     }
 
+    /**
+     * 评价页面
+     * @author   Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2018-10-08
+     * @desc    description
+     */
+    public function Comments()
+    {
+        // 参数
+        $params = $this->data_post;
+        $params['user'] = $this->user;
+        $params['user_type'] = 'user';
+        if(empty($params['id']))
+        {
+            return DataReturn('参数有误', -1);
+        }
+
+        // 条件
+        $where = OrderService::OrderListWhere($params);
+
+        // 获取列表
+        $data_params = array(
+            'm'         => 0,
+            'n'         => 1,
+            'where'     => $where,
+        );
+        $data = OrderService::OrderList($data_params);
+        if(!empty($data['data'][0]))
+        {
+            return DataReturn('success', 0, $data['data'][0]);
+        }
+        return DataReturn('没有相关数据', -100);
+    }
+
+    /**
+     * 评价保存
+     * @author   Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2018-10-09
+     * @desc    description
+     */
+    public function CommentsSave()
+    {
+        $params = $this->data_post;
+        $params['user'] = $this->user;
+        $params['business_type'] = 'order';
+        return GoodsCommentsService::Comments($params);
+    }
+
     /**
      * 订单支付
      * @author   Devil

application/service/BuyService.php

@@ -193,7 +193,7 @@ class BuyService
         $where['c.user_id'] = $params['user']['id'];
 
         $field = 'c.*, g.inventory_unit, g.is_shelves, g.is_delete_time, g.buy_min_number, g.buy_max_number, g.model';
-        $data = Db::name('Cart')->alias('c')->join(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->select();
+        $data = Db::name('Cart')->alias('c')->join(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->order('c.id desc')->select();
 
 
         // 数据处理

public/appmini/old/alipay/app.acss

@@ -271,37 +271,37 @@ textarea {
 /**
  * 表单
  */
-.form-gorup {
-  padding: 30rpx 10rpx;
+.form-container .form-gorup {
+  padding: 20rpx 10rpx;
+  margin-bottom: 20rpx;
 }
-.form-gorup-title {
+.form-container .form-gorup-title {
   margin-bottom: 5rpx;
   font-weight: 500;
 }
-.form-group-tips,
-.form-group-tips-must {
+.form-container .form-group-tips,
+.form-container .form-group-tips-must {
   margin-left: 20rpx;
   font-size: 24rpx;
   color: #ccc;
 }
-.form-group-tips-must {
+.form-container .form-group-tips-must {
   color: #f00;
 }
-.form-gorup input,
-.form-gorup textarea,
-.form-gorup picker view.picker {
-  border-bottom: 1px solid #eee;
+.form-container .form-gorup input,
+.form-container .form-gorup textarea,
+.form-container .form-gorup picker view.picker {
   border-radius: 0;
   width: 100%;
   box-sizing: border-box;
   padding: 0 10rpx;
 }
-.form-gorup input,
-.form-gorup picker view.picker {
+.form-container .form-gorup input,
+.form-container .form-gorup picker view.picker {
   height: 70rpx;
   line-height: 70rpx;
 }
-.form-gorup textarea {
+.form-container .form-gorup textarea {
   padding: 0;
   min-height: 70rpx;
 }

public/appmini/old/alipay/pages/buy/buy.js

@@ -192,7 +192,7 @@ Page({
     this.init();
   },
 
-  // 支付方式数据处理
+  // 支付方式数据处理
   payment_list_data(data) {
     if (this.data.payment_id != 0) {
       for (var i in data) {

public/appmini/old/alipay/pages/goods-search/goods-search.axml

@@ -50,7 +50,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
+      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>

public/appmini/old/alipay/pages/index/index.js

@@ -84,7 +84,7 @@ Page({
     });
   },
 
-  // 搜索事件
+  // 搜索事件
   search_input_event(e) {
     var keywords = e.detail.value || null;
     if (keywords == null) {

public/appmini/old/alipay/pages/paytips/paytips.js

@@ -49,13 +49,13 @@ Page({
         msg = '用户取消支付';
         break;
 
-      // 默认错误
+      // 默认错误
       default :
         msg = '其它异常错误';
     }
     options['msg'] = msg;
     
-    // 设置信息
+    // 设置信息
     this.setData({params: options});
   },
 

public/appmini/old/alipay/pages/user-address-save/user-address-save.axml

@@ -28,7 +28,7 @@
         <input name="address" class="addressee-address" type="text" value="{{address}}" placeholder="详细地址" />
     </view>
 
-    <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
+    <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
 </form>
 
 <view a:if="{{data_list_loding_status != 0}}">

public/appmini/old/alipay/pages/user-integral/user-integral.axml

@@ -8,7 +8,7 @@
       </view>
       <view class="data-value">
         <text class="cr-666">原始 {{item.original_integral}}</text>
-        <text class="cr-main">最新 {{item.new_integral}}</text>
+        <text class="cr-main">最新 {{item.new_integral}}</text>
       </view>
       <view class="data-detail">{{item.msg}}</view>
     </view>

public/appmini/old/alipay/pages/user-order/user-order.js

@@ -202,7 +202,7 @@ Page({
     });
   },
 
-  // 支付弹窗关闭
+  // 支付弹窗关闭
   payment_popup_event_close(e) {
     this.setData({ is_show_payment_popup: false });
   },

public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml

@@ -95,8 +95,8 @@
     </view>
 
     <!-- 表单 -->
-    <view a:if="{{form_type != -1}}" class="form-container bg-white spacing-mb oh">
-      <view class="form-gorup">
+    <view a:if="{{form_type != -1}}" class="form-container spacing-mb oh">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款原因<text class="form-group-tips-must">必选</text></view>
         <picker onChange="form_reason_event" value="{{form_reason_index}}" range="{{reason_data_list}}">
           <view class="picker {{form_reason_index == -1 ? 'cr-ccc' : 'cr-666'}} arrow-right">
@@ -105,22 +105,22 @@
         </picker>
       </view>
 
-      <view a:if="{{form_type == 1}}" class="form-gorup">
+      <view a:if="{{form_type == 1}}" class="form-gorup bg-white">
         <view class="form-gorup-title">商品件数<text class="form-group-tips">不能大于{{returned_data.returned_quantity}}数量</text></view>
         <slider onChange="form_number_event" min="0" max="{{returned_data.returned_quantity}}" step="1" value="{{returned_data.returned_quantity}}" show-value />
       </view>
 
-      <view class="form-gorup">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款金额<text class="form-group-tips">不能大于{{returned_data.refund_price}}元</text></view>
         <input type="digit" onInput="form_price_event" placeholder-class="cr-ccc" class="cr-666" placeholder="请输入退款金额" value="{{form_price}}" />
       </view>
 
-      <view class="form-gorup">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款说明<text class="form-group-tips-must">必填</text></view>
         <textarea onInput="form_msg_event" placeholder-class="cr-ccc" class="cr-666" placeholder="退款说明 5~200 个字符之间" maxlength="200" auto-height="{{true}}" value="{{form_msg}}" />
       </view>
 
-      <view class="form-gorup form-container-upload oh">
+      <view class="form-gorup bg-white form-container-upload oh">
         <view class="form-gorup-title">上传凭证<text class="form-group-tips">最多上传3张图片</text></view>
         <view class="form-upload-data fl">
           <block a:if="{{form_images_list.length > 0}}">

public/appmini/old/baidu/app.css

@@ -91,7 +91,7 @@ textarea {
 .br-l { border-left: solid 1px #efefef; }
 .br-r { border-right: solid 1px #efefef; }
 
-/* 虚线边框 */
+/* 虚线边框 */
 .br-b-dashed { border-bottom: dashed 1px #efefef; }
 .br-t-dashed { border-top: dashed 1px #efefef; }
 .br-l-dashed { border-left: dashed 1px #efefef; }
@@ -156,7 +156,7 @@ textarea {
 }
 
 
-/* 没有数据状态/处理错误/加载中 */
+/* 没有数据状态/处理错误/加载中 */
 .no-data-box {
     padding: 80rpx 0;
 }
@@ -339,37 +339,37 @@ button[disabled].bg-primary {
 /**
  * 表单
  */
-.form-gorup {
-  padding: 30rpx 10rpx;
+.form-container .form-gorup {
+  padding: 20rpx 10rpx;
+  margin-bottom: 20rpx;
 }
-.form-gorup-title {
+.form-container .form-gorup-title {
   margin-bottom: 5rpx;
   font-weight: 500;
 }
-.form-group-tips,
-.form-group-tips-must {
+.form-container .form-group-tips,
+.form-container .form-group-tips-must {
   margin-left: 20rpx;
   font-size: 24rpx;
   color: #ccc;
 }
-.form-group-tips-must {
+.form-container .form-group-tips-must {
   color: #f00;
 }
-.form-gorup input,
-.form-gorup textarea,
-.form-gorup picker view.picker {
-  border-bottom: 1px solid #eee;
+.form-container .form-gorup input,
+.form-container .form-gorup textarea,
+.form-container .form-gorup picker view.picker {
   border-radius: 0;
   width: 100%;
   box-sizing: border-box;
   padding: 0 10rpx;
 }
-.form-gorup input,
-.form-gorup picker view.picker {
+.form-container .form-gorup input,
+.form-container .form-gorup picker view.picker {
   height: 70rpx;
   line-height: 70rpx;
 }
-.form-gorup textarea {
+.form-container .form-gorup textarea {
   padding: 0;
   min-height: 70rpx;
 }

public/appmini/old/baidu/app.js

@@ -249,7 +249,7 @@ App({
                     }
                 },
                 fail: function(res) {
-                  self.showToast("调用用户信息授权失败");
+                  self.showToast("调用用户信息授权失败");
                 }
               });
             } else {

public/appmini/old/baidu/pages/buy/buy.js

@@ -185,7 +185,7 @@ Page({
     this.init();
   },
 
-  // 支付方式数据处理
+  // 支付方式数据处理
   payment_list_data(data) {
     if (this.data.payment_id != 0) {
       for (var i in data) {

public/appmini/old/baidu/pages/cart/cart.css

@@ -38,7 +38,7 @@
 .goods-item .selected {
   margin-top: 60rpx;
 }
-.goods-item .delete {
+.goods-item .remove {
   color: #e00303;
   margin-right: 10rpx;
 }

public/appmini/old/baidu/pages/cart/cart.js

@@ -174,8 +174,8 @@ Page({
     });
   },
 
-  // 收藏事件
-  goods_favor_event(id, goods_id, type) {
+  // 收藏+删除
+  goods_favor_delete(id, goods_id, type) {
     swan.request({
       url: app.get_request_url('favor', 'goods'),
       method: 'POST',
@@ -194,18 +194,22 @@ Page({
     });
   },
 
-  // 删除操作事件
-  cart_delete_event(e) {
+  // 移除操作事件
+  cart_remove_event(e) {
     var id = e.currentTarget.dataset.id || null;
+    var index = e.currentTarget.dataset.index || 0;
+    var goods_id = e.currentTarget.dataset.goodsid || 0;
+    var self = this;
     if (id !== null) {
-      swan.showModal({
-        title: '温馨提示',
-        content: '删除后不可恢复，确定继续吗?',
-        confirmText: '确认',
-        cancelText: '暂不',
-        success: result => {
-          if (result.confirm) {
-            this.cart_delete(id, 'delete');
+      self.setData({ swipe_index: index})
+      swan.showActionSheet({
+        itemList: ['加入收藏', '删除'],
+        success(res) {
+          if (res.tapIndex == 0)
+          {
+            self.goods_favor_delete(id, goods_id, 'favor')
+          } else {
+            self.cart_delete(id, 'delete');
           }
         }
       });
@@ -231,9 +235,9 @@ Page({
             data_list_loding_status: temp_data_list.length == 0 ? 0 : this.data.data_list_loding_status
           });
 
-          app.showToast(type == 'delete' ? '删除成功' : '收藏成功', 'success');
+          app.showToast(type == 'delete' ? '删除成功' : '收藏成功', 'success');
         } else {
-          app.showToast(type == 'delete' ? '删除失败' : '收藏失败');
+          app.showToast(type == 'delete' ? '删除失败' : '收藏失败');
         }
       },
       fail: () => {

public/appmini/old/baidu/pages/cart/cart.swan

@@ -34,7 +34,7 @@
         <text class="buy-number cr-888">x{{item.stock}}</text>
 
         <!-- 删除操作 -->
-        <view class="fr delete" data-id="{{item.id}}" bindtap="cart_delete_event">删除</view>
+        <view class="fr remove" data-id="{{item.id}}" data-goodsid="{{item.goods_id}}" data-index="{{index}}" bindtap="cart_remove_event">移除</view>
       </view>
 
       

public/appmini/old/baidu/pages/goods-search/goods-search.swan

@@ -49,7 +49,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{=(params.keywords || '')=}" class="br" />
+      <input type="text" placeholder="关键字" name="keywords" value="{=(params.keywords || '')=}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>

public/appmini/old/baidu/pages/index/index.js

@@ -87,7 +87,7 @@ Page({
     });
   },
 
-  // 搜索事件
+  // 搜索事件
   search_input_event(e) {
     var keywords = e.detail.value || null;
     if (keywords == null) {

public/appmini/old/baidu/pages/index/index.swan

@@ -12,7 +12,7 @@
   <view class="tips">{{common_shop_notice}}</view>
 </view>
 
-<!-- 轮播 -->
+<!-- 轮播 -->
 <component-banner banner="{{banner_list}}"></component-banner>
 
 <!-- 导航 -->

public/appmini/old/baidu/pages/paytips/paytips.js

@@ -47,13 +47,13 @@ Page({
         msg = '用户取消支付';
         break;
 
-      // 默认错误
+      // 默认错误
       default:
         msg = '其它异常错误';
     }
     options['msg'] = msg;
 
-    // 设置信息
+    // 设置信息
     this.setData({ params: options });
   },
 

public/appmini/old/baidu/pages/user-address-save/user-address-save.swan

@@ -28,5 +28,5 @@
         <input name="address" class="addressee-address" type="text" value="{=address=}" placeholder="详细地址" />
     </view>
 
-    <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
+    <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
 </form>
\ No newline at end of file

public/appmini/old/baidu/pages/user-integral/user-integral.swan

@@ -8,7 +8,7 @@
       </view>
       <view class="data-value">
         <text class="cr-666">原始 {{item.original_integral}}</text>
-        <text class="cr-main">最新 {{item.new_integral}}</text>
+        <text class="cr-main">最新 {{item.new_integral}}</text>
       </view>
       <view class="data-detail">{{item.msg}}</view>
     </view>

public/appmini/old/baidu/pages/user-order/user-order.js

@@ -183,7 +183,7 @@ Page({
     });
   },
 
-  // 支付弹窗关闭
+  // 支付弹窗关闭
   payment_popup_event_close(e) {
     this.setData({ is_show_payment_popup: false });
   },

public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan

@@ -95,7 +95,7 @@
     </view>
 
     <!-- 表单 -->
-    <view s-if="form_type != -1" class="form-container bg-white spacing-mb oh">
+    <view s-if="form_type != -1" class="form-container spacing-mb oh">
       <view class="form-gorup">
         <view class="form-gorup-title">退款原因<text class="form-group-tips-must">必选</text></view>
         <picker bindchange="form_reason_event" value="{{form_reason_index}}" range="{{reason_data_list}}">
@@ -105,22 +105,22 @@
         </picker>
       </view>
 
-      <view s-if="form_type == 1" class="form-gorup">
+      <view s-if="form_type == 1" class="form-gorup bg-white">
         <view class="form-gorup-title">商品件数<text class="form-group-tips">不能大于{{returned_data.returned_quantity}}数量</text></view>
         <slider bindchange="form_number_event" min="0" max="{{returned_data.returned_quantity}}" step="1" value="{{returned_data.returned_quantity}}" show-value />
       </view>
 
-      <view class="form-gorup">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款金额<text class="form-group-tips">不能大于{{returned_data.refund_price}}元</text></view>
         <input type="digit" bindinput="form_price_event" placeholder-class="cr-ccc" class="cr-666" placeholder="请输入退款金额" value="{=form_price=}" />
       </view>
 
-      <view class="form-gorup">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款说明<text class="form-group-tips-must">必填</text></view>
         <textarea bindinput="form_msg_event" placeholder-class="cr-ccc" class="cr-666" placeholder="退款说明 5~200 个字符之间" maxlength="200" auto-height="{{true}}" value="{=form_msg=}" />
       </view>
 
-      <view class="form-gorup form-container-upload oh">
+      <view class="form-gorup bg-white form-container-upload oh">
         <view class="form-gorup-title">上传凭证<text class="form-group-tips">最多上传3张图片</text></view>
         <view class="form-upload-data fl">
           <block s-if="form_images_list.length > 0">

public/appmini/old/weixin/app.js

@@ -59,6 +59,7 @@ App({
       "goods_comment": "商品评论",
       "user_orderaftersale": "退款/售后",
       "user_orderaftersale_detail": "订单售后",
+      "user_order_comments": "订单评论",
     },
 
     // 请求地址

public/appmini/old/weixin/app.json

 {
-  "pages": [    
+  "pages": ["pages/user-order-comments/user-order-comments",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",

public/appmini/old/weixin/app.wxss

@@ -91,7 +91,7 @@ textarea {
 .br-l { border-left: solid 1px #efefef; }
 .br-r { border-right: solid 1px #efefef; }
 
-/* 虚线边框 */
+/* 虚线边框 */
 .br-b-dashed { border-bottom: dashed 1px #efefef; }
 .br-t-dashed { border-top: dashed 1px #efefef; }
 .br-l-dashed { border-left: dashed 1px #efefef; }
@@ -156,7 +156,7 @@ textarea {
 }
 
 
-/* 没有数据状态/处理错误/加载中 */
+/* 没有数据状态/处理错误/加载中 */
 .no-data-box {
     padding: 80rpx 0;
 }
@@ -339,37 +339,37 @@ button[disabled].bg-primary {
 /**
  * 表单
  */
-.form-gorup {
-  padding: 30rpx 10rpx;
+.form-container .form-gorup {
+  padding: 20rpx 10rpx;
+  margin-bottom: 20rpx;
 }
-.form-gorup-title {
+.form-container .form-gorup-title {
   margin-bottom: 5rpx;
   font-weight: 500;
 }
-.form-group-tips,
-.form-group-tips-must {
+.form-container .form-group-tips,
+.form-container .form-group-tips-must {
   margin-left: 20rpx;
   font-size: 24rpx;
   color: #ccc;
 }
-.form-group-tips-must {
+.form-container .form-group-tips-must {
   color: #f00;
 }
-.form-gorup input,
-.form-gorup textarea,
-.form-gorup picker view.picker {
-  border-bottom: 1px solid #eee;
+.form-container .form-gorup input,
+.form-container .form-gorup textarea,
+.form-container .form-gorup picker view.picker {
   border-radius: 0;
   width: 100%;
   box-sizing: border-box;
   padding: 0 10rpx;
 }
-.form-gorup input,
-.form-gorup picker view.picker {
+.form-container .form-gorup input,
+.form-container .form-gorup picker view.picker {
   height: 70rpx;
   line-height: 70rpx;
 }
-.form-gorup textarea {
+.form-container .form-gorup textarea {
   padding: 0;
   min-height: 70rpx;
 }

public/appmini/old/weixin/pages/buy/buy.js

@@ -191,7 +191,7 @@ Page({
     this.init();
   },
 
-  // 支付方式数据处理
+  // 支付方式数据处理
   payment_list_data(data) {
     if (this.data.payment_id != 0) {
       for (var i in data) {

public/appmini/old/weixin/pages/cart/cart.js

@@ -175,8 +175,8 @@ Page({
     });
   },
 
-  // 收藏事件
-  goods_favor_event(id, goods_id, type) {
+  // 收藏+删除
+  goods_favor_delete(id, goods_id, type) {
     wx.request({
       url: app.get_request_url('favor', 'goods'),
       method: 'POST',
@@ -195,20 +195,24 @@ Page({
     });
   },
 
-  // 删除操作事件
-  cart_delete_event(e) {
+  // 移除操作事件
+  cart_remove_event(e) {
     var id = e.currentTarget.dataset.id || null;
+    var index = e.currentTarget.dataset.index || 0;
+    var goods_id = e.currentTarget.dataset.goodsid || 0;
+    var self = this;
     if (id !== null) {
-      wx.showModal({
-        title: '温馨提示',
-        content: '删除后不可恢复，确定继续吗?',
-        confirmText: '确认',
-        cancelText: '暂不',
-        success: (result) => {
-          if (result.confirm) {
-            this.cart_delete(id, 'delete');
+      self.setData({ swipe_index: index})
+      wx.showActionSheet({
+        itemList: ['加入收藏', '删除'],
+        success(res) {
+          if (res.tapIndex == 0)
+          {
+            self.goods_favor_delete(id, goods_id, 'favor')
+          } else {
+            self.cart_delete(id, 'delete');
           }
-        },
+        }
       });
     } else {
       app.showToast("参数有误");
@@ -232,9 +236,9 @@ Page({
             data_list_loding_status: temp_data_list.length == 0 ? 0 : this.data.data_list_loding_status,
           });
 
-          app.showToast(((type == 'delete') ? '删除成功' : '收藏成功'), 'success');
+          app.showToast(((type == 'delete') ? '删除成功' : '收藏成功'), 'success');
         } else {
-          app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
+          app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
         }
       },
       fail: () => {

public/appmini/old/weixin/pages/cart/cart.wxml

@@ -33,11 +33,9 @@
         <text wx:if="{{item.original_price > 0}}" class="original-price">￥{{item.original_price}}</text>
         <text class="buy-number cr-888">x{{item.stock}}</text>
 
-        <!-- 删除操作 -->
-        <view class="fr delete" data-id="{{item.id}}" bindtap="cart_delete_event">删除</view>
+        <!-- 移除 -->
+        <view class="fr remove" data-id="{{item.id}}" data-goodsid="{{item.goods_id}}" data-index="{{index}}" bindtap="cart_remove_event">移除</view>
       </view>
-
-      
     </view>
   </view>
 

public/appmini/old/weixin/pages/cart/cart.wxss

@@ -38,7 +38,7 @@
 .goods-item .selected {
   margin-top: 60rpx;
 }
-.goods-item .delete {
+.goods-item .remove {
   color: #e00303;
   margin-right: 10rpx;
 }

public/appmini/old/weixin/pages/goods-search/goods-search.wxml

@@ -49,7 +49,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
+      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>

public/appmini/old/weixin/pages/index/index.js

@@ -87,7 +87,7 @@ Page({
     });
   },
 
-  // 搜索事件
+  // 搜索事件
   search_input_event(e) {
     var keywords = e.detail.value || null;
     if (keywords == null) {

public/appmini/old/weixin/pages/index/index.wxml

@@ -12,7 +12,7 @@
   <view class="tips">{{common_shop_notice}}</view>
 </view>
 
-<!-- 轮播 -->
+<!-- 轮播 -->
 <component-banner prop-data="{{banner_list}}"></component-banner>
 
 <!-- 导航 -->

public/appmini/old/weixin/pages/paytips/paytips.js

@@ -49,13 +49,13 @@ Page({
         msg = '用户取消支付';
         break;
 
-      // 默认错误
+      // 默认错误
       default :
         msg = '其它异常错误';
     }
     options['msg'] = msg;
     
-    // 设置信息
+    // 设置信息
     this.setData({params: options});
   },
 

public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml

@@ -28,5 +28,5 @@
         <input name="address" class="addressee-address" type="text" value="{{address}}" placeholder="详细地址" />
     </view>
 
-    <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
+    <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
 </form>
\ No newline at end of file

public/appmini/old/weixin/pages/user-integral/user-integral.wxml

@@ -8,7 +8,7 @@
       </view>
       <view class="data-value">
         <text class="cr-666">原始 {{item.original_integral}}</text>
-        <text class="cr-main">最新 {{item.new_integral}}</text>
+        <text class="cr-main">最新 {{item.new_integral}}</text>
       </view>
       <view class="data-detail">{{item.msg}}</view>
     </view>

public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js

+const app = getApp();
+Page({
+  data: {
+    data_list_loding_status: 1,
+    data_list_loding_msg: '',
+    params: null,
+
+    detail: null,
+    rating_list: [],
+    rating_msg: ['非常差', '差', '一般', '好', '非常好'],
+  },
+
+  onLoad(params) {
+    params['id'] = 3;
+    this.setData({ params: params });
+    this.init();
+  },
+
+  onShow() {
+    wx.setNavigationBarTitle({ title: app.data.common_pages_title.user_order_comments });
+  },
+
+  init() {
+    var self = this;
+    wx.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1
+    });
+
+    wx.request({
+      url: app.get_request_url("detail", "order"),
+      method: "POST",
+      data: {
+        id: this.data.params.id
+      },
+      dataType: "json",
+      success: res => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          var data = res.data.data;
+          self.setData({
+            detail: data,
+            data_list_loding_status: 3,
+            data_list_loding_msg: '',
+          });
+        } else {
+          self.setData({
+            data_list_loding_status: 2,
+            data_list_loding_msg: res.data.msg,
+          });
+          app.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        self.setData({
+          data_list_loding_status: 2,
+          data_list_loding_msg: '服务器请求出错',
+        });
+        app.showToast("服务器请求出错");
+      }
+    });
+  },
+
+  // 评分事件
+  rating_event(e) {
+    console.log(e.currentTarget.dataset)
+    var index = e.currentTarget.dataset.index;
+    var tx = e.currentTarget.dataset.tx;
+    var value = e.currentTarget.dataset.value;
+    var temp_list = this.data.rating_list;
+    temp_list[index] = value;
+    this.setData({ rating_list: temp_list});
+  },
+
+  // 表单
+  formSubmit(e) {
+    console.log(e.detail.value)
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.init();
+  },
+
+});

public/appmini/old/weixin/pages/user-order-comments/user-order-comments.json

+{
+  "enablePullDownRefresh": true
+}
\ No newline at end of file

public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxml

+<view wx:if="{{detail != null}}">
+  <form bindsubmit="formSubmit" class="form-container">
+      <view wx:for="{{detail.items}}" wx:key="item" class="form-gorup bg-white oh">
+        <view class="oh">
+          <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
+            <image class="goods-image fl br" src="{{item.images}}" mode="aspectFill" />
+          </navigator>
+          <view class="item-base">
+            <block wx:for="{{[1,2,3,4,5]}}" wx:key="tx" wx:for-index="tx">
+              <image class="xingxing-icon" src="/images/default-xingxing-icon{{rating_list[index] != undefined && rating_list[index] >= item ? '-active' : ''}}.png" mode="aspectFill" bindtap="rating_event" data-index="{{index}}" data-tx="{{tx}}" data-value="{{item}}" />
+            </block>
+            <text wx:if="{{rating_list[index] != undefined}}" class="msg-text cr-888">{{rating_msg[rating_list[index]-1]}}</text>
+          </view>
+        </view>
+        <view class="form-content">
+          <textarea name="content_{{index}}" placeholder-class="cr-ccc" class="cr-666" placeholder="退宝贝满足你的期待吗？说说它的有点和美中不足的地方吧" maxlength="230" value="{{form_msg}}" />
+          <view class="form-container-upload oh">
+            <view class="form-upload-data fl">
+              <block wx:if="{{form_images_list.length > 0}}">
+                <view wx:for="{{form_images_list}}" wx:key="item" class="item fl">
+                  <text class="delete-icon" bindtap="upload_delete_event" data-index="{{index}}">x</text>
+                  <image src="{{item}}" bindtap="upload_show_event" data-index="{{index}}" mode="aspectFill" />
+                </view>
+              </block>
+            </view>
+            <image class="upload-icon" src="/images/default-upload-icon.png" mode="aspectFill" bindtap="file_upload_event" />
+          </view>
+        </view>
+        
+      </view>
+
+      <view class="form-gorup bg-white anonymous">
+        <switch name="is_anonymous" checked="{{switch1Checked}}" bindchange="switch1Change"/>
+        <text class="cr-666">匿名</text>
+        <text class="fr cr-888 tips-text">公开的评论会展示在商品详情页面</text>
+      </view>
+
+      <view class="form-gorup">
+        <button formType="submit" class="bg-main submit-bottom" type="default" bindtap="form_submit_event" hover-class="none" disabled="{{form_button_disabled}}">提交</button>
+      </view>
+  </form>
+</view>
+
+<view wx:if="{{detail == null}}">
+    <import src="/pages/common/nodata.wxml" />
+    <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+</view>
\ No newline at end of file

public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxss

+.goods-image {
+    width: 80rpx;
+    height: 80rpx;
+    margin-right: 20rpx;
+}
+.item-base {
+  margin: 10rpx 0 0 100rpx;
+}
+.item-base .xingxing-icon {
+  width: 60rpx;
+  height: 60rpx;
+  margin: 0 15rpx;
+  vertical-align: middle;
+}
+.item-base .msg-text {
+  margin-left: 20rpx;
+}
+.form-content {
+  margin-top: 20rpx;
+}
+.form-content textarea {
+  height: 160rpx !important;
+  min-height: 160rpx !important;
+}
+.form-container-upload {
+  margin-top: 10rpx;
+}
+.form-container-upload .form-upload-data image {
+  width: 100rpx;
+  height: 100rpx;
+  padding: 5rpx;
+}
+.form-container-upload .upload-icon {
+  margin: 10rpx 0 0 10rpx;
+  width: 110rpx;
+  height: 110rpx;
+}
+.anonymous .tips-text {
+  margin-top: 10rpx;
+}
\ No newline at end of file

public/appmini/old/weixin/pages/user-order/user-order.js

@@ -195,7 +195,7 @@ Page({
     });
   },
 
-  // 支付弹窗关闭
+  // 支付弹窗关闭
   payment_popup_event_close(e) {
     this.setData({ is_show_payment_popup: false });
   },

public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml

@@ -95,8 +95,8 @@
     </view>
 
     <!-- 表单 -->
-    <view wx:if="{{form_type != -1}}" class="form-container bg-white spacing-mb oh">
-      <view class="form-gorup">
+    <view wx:if="{{form_type != -1}}" class="form-container spacing-mb oh">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款原因<text class="form-group-tips-must">必选</text></view>
         <picker bindchange="form_reason_event" value="{{form_reason_index}}" range="{{reason_data_list}}">
           <view class="picker {{form_reason_index == -1 ? 'cr-ccc' : 'cr-666'}} arrow-right">
@@ -105,22 +105,22 @@
         </picker>
       </view>
 
-      <view wx:if="{{form_type == 1}}" class="form-gorup">
+      <view wx:if="{{form_type == 1}}" class="form-gorup bg-white">
         <view class="form-gorup-title">商品件数<text class="form-group-tips">不能大于{{returned_data.returned_quantity}}数量</text></view>
         <slider bindchange="form_number_event" min="0" max="{{returned_data.returned_quantity}}" step="1" value="{{returned_data.returned_quantity}}" show-value />
       </view>
 
-      <view class="form-gorup">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款金额<text class="form-group-tips">不能大于{{returned_data.refund_price}}元</text></view>
         <input type="digit" bindinput="form_price_event" placeholder-class="cr-ccc" class="cr-666" placeholder="请输入退款金额" value="{{form_price}}" />
       </view>
 
-      <view class="form-gorup">
+      <view class="form-gorup bg-white">
         <view class="form-gorup-title">退款说明<text class="form-group-tips-must">必填</text></view>
         <textarea bindinput="form_msg_event" placeholder-class="cr-ccc" class="cr-666" placeholder="退款说明 5~200 个字符之间" maxlength="200" auto-height="{{true}}" value="{{form_msg}}" />
       </view>
 
-      <view class="form-gorup form-container-upload oh">
+      <view class="form-gorup bg-white form-container-upload oh">
         <view class="form-gorup-title">上传凭证<text class="form-group-tips">最多上传3张图片</text></view>
         <view class="form-upload-data fl">
           <block wx:if="{{form_images_list.length > 0}}">