From dd21625855098329c0a484e2c8078155eec97430 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 9 Oct 2019 18:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Order.php          |  57 ++++++++++++
 application/service/BuyService.php            |   2 +-
 public/appmini/old/alipay/app.acss            |  26 +++---
 public/appmini/old/alipay/pages/buy/buy.js    |   2 +-
 .../pages/goods-search/goods-search.axml      |   2 +-
 .../appmini/old/alipay/pages/index/index.js   |   2 +-
 .../old/alipay/pages/paytips/paytips.js       |   4 +-
 .../user-address-save/user-address-save.axml  |   2 +-
 .../pages/user-integral/user-integral.axml    |   2 +-
 .../old/alipay/pages/user-order/user-order.js |   2 +-
 .../user-orderaftersale-detail.axml           |  12 +--
 public/appmini/old/baidu/app.css              |  30 +++---
 public/appmini/old/baidu/app.js               |   2 +-
 public/appmini/old/baidu/pages/buy/buy.js     |   2 +-
 public/appmini/old/baidu/pages/cart/cart.css  |   2 +-
 public/appmini/old/baidu/pages/cart/cart.js   |  32 ++++---
 public/appmini/old/baidu/pages/cart/cart.swan |   2 +-
 .../pages/goods-search/goods-search.swan      |   2 +-
 public/appmini/old/baidu/pages/index/index.js |   2 +-
 .../appmini/old/baidu/pages/index/index.swan  |   2 +-
 .../old/baidu/pages/paytips/paytips.js        |   4 +-
 .../user-address-save/user-address-save.swan  |   2 +-
 .../pages/user-integral/user-integral.swan    |   2 +-
 .../old/baidu/pages/user-order/user-order.js  |   2 +-
 .../user-orderaftersale-detail.swan           |  10 +-
 public/appmini/old/weixin/app.js              |   1 +
 public/appmini/old/weixin/app.json            |   2 +-
 public/appmini/old/weixin/app.wxss            |  30 +++---
 .../images/default-xingxing-icon-active.png   | Bin 0 -> 2463 bytes
 .../weixin/images/default-xingxing-icon.png   | Bin 0 -> 2326 bytes
 public/appmini/old/weixin/pages/buy/buy.js    |   2 +-
 public/appmini/old/weixin/pages/cart/cart.js  |  34 ++++---
 .../appmini/old/weixin/pages/cart/cart.wxml   |   6 +-
 .../appmini/old/weixin/pages/cart/cart.wxss   |   2 +-
 .../pages/goods-search/goods-search.wxml      |   2 +-
 .../appmini/old/weixin/pages/index/index.js   |   2 +-
 .../appmini/old/weixin/pages/index/index.wxml |   2 +-
 .../old/weixin/pages/paytips/paytips.js       |   4 +-
 .../user-address-save/user-address-save.wxml  |   2 +-
 .../pages/user-integral/user-integral.wxml    |   2 +-
 .../user-order-comments.js                    |  88 ++++++++++++++++++
 .../user-order-comments.json                  |   3 +
 .../user-order-comments.wxml                  |  47 ++++++++++
 .../user-order-comments.wxss                  |  40 ++++++++
 .../old/weixin/pages/user-order/user-order.js |   2 +-
 .../user-orderaftersale-detail.wxml           |  12 +--
 46 files changed, 367 insertions(+), 125 deletions(-)
 create mode 100644 public/appmini/old/weixin/images/default-xingxing-icon-active.png
 create mode 100644 public/appmini/old/weixin/images/default-xingxing-icon.png
 create mode 100644 public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js
 create mode 100644 public/appmini/old/weixin/pages/user-order-comments/user-order-comments.json
 create mode 100644 public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxml
 create mode 100644 public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxss

diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php
index 0ec34935b..c5b9f23d0 100755
--- a/application/api/controller/Order.php
+++ b/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
diff --git a/application/service/BuyService.php b/application/service/BuyService.php
index 3b7cc9014..b0eb1fb7c 100755
--- a/application/service/BuyService.php
+++ b/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();
 
 
         // 数据处理
diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss
index 12a80ffaf..a02635967 100755
--- a/public/appmini/old/alipay/app.acss
+++ b/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;
 }
diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js
index 074c2a7e2..a0becfd1d 100755
--- a/public/appmini/old/alipay/pages/buy/buy.js
+++ b/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) {
diff --git a/public/appmini/old/alipay/pages/goods-search/goods-search.axml b/public/appmini/old/alipay/pages/goods-search/goods-search.axml
index 75d6526e4..87c6416c6 100755
--- a/public/appmini/old/alipay/pages/goods-search/goods-search.axml
+++ b/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>
diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js
index 2b3291ae2..627e16770 100644
--- a/public/appmini/old/alipay/pages/index/index.js
+++ b/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) {
diff --git a/public/appmini/old/alipay/pages/paytips/paytips.js b/public/appmini/old/alipay/pages/paytips/paytips.js
index be51ad1e3..878c885ab 100755
--- a/public/appmini/old/alipay/pages/paytips/paytips.js
+++ b/public/appmini/old/alipay/pages/paytips/paytips.js
@@ -49,13 +49,13 @@ Page({
         msg = '用户取消支付';
         break;
 
-      // 默认错误
+      // 默认错误
       default :
         msg = '其它异常错误';
     }
     options['msg'] = msg;
     
-    // 设置信息
+    // 设置信息
     this.setData({params: options});
   },
 
diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml b/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml
index 35d673bc4..849b4365d 100755
--- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml
+++ b/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}}">
diff --git a/public/appmini/old/alipay/pages/user-integral/user-integral.axml b/public/appmini/old/alipay/pages/user-integral/user-integral.axml
index c79dedc2d..2a19935d9 100755
--- a/public/appmini/old/alipay/pages/user-integral/user-integral.axml
+++ b/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>
diff --git a/public/appmini/old/alipay/pages/user-order/user-order.js b/public/appmini/old/alipay/pages/user-order/user-order.js
index 3916f3ea0..2b7b1477a 100755
--- a/public/appmini/old/alipay/pages/user-order/user-order.js
+++ b/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 });
   },
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
index 66a077622..c4c931806 100644
--- a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
+++ b/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}}">
diff --git a/public/appmini/old/baidu/app.css b/public/appmini/old/baidu/app.css
index 3b372c8dc..93c2bc256 100755
--- a/public/appmini/old/baidu/app.css
+++ b/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;
 }
diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js
index 41a59b863..d01c20754 100755
--- a/public/appmini/old/baidu/app.js
+++ b/public/appmini/old/baidu/app.js
@@ -249,7 +249,7 @@ App({
                     }
                 },
                 fail: function(res) {
-                  self.showToast("调用用户信息授权失败");
+                  self.showToast("调用用户信息授权失败");
                 }
               });
             } else {
diff --git a/public/appmini/old/baidu/pages/buy/buy.js b/public/appmini/old/baidu/pages/buy/buy.js
index 1fcdbd4e8..6e915fe10 100755
--- a/public/appmini/old/baidu/pages/buy/buy.js
+++ b/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) {
diff --git a/public/appmini/old/baidu/pages/cart/cart.css b/public/appmini/old/baidu/pages/cart/cart.css
index 9e570af6c..906e0c10d 100755
--- a/public/appmini/old/baidu/pages/cart/cart.css
+++ b/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;
 }
diff --git a/public/appmini/old/baidu/pages/cart/cart.js b/public/appmini/old/baidu/pages/cart/cart.js
index 8fba30dd8..f0483caa7 100755
--- a/public/appmini/old/baidu/pages/cart/cart.js
+++ b/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: () => {
diff --git a/public/appmini/old/baidu/pages/cart/cart.swan b/public/appmini/old/baidu/pages/cart/cart.swan
index ee2acdb74..7a2a915bf 100755
--- a/public/appmini/old/baidu/pages/cart/cart.swan
+++ b/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>
 
       
diff --git a/public/appmini/old/baidu/pages/goods-search/goods-search.swan b/public/appmini/old/baidu/pages/goods-search/goods-search.swan
index e41f897b1..63bd2e4bc 100755
--- a/public/appmini/old/baidu/pages/goods-search/goods-search.swan
+++ b/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>
diff --git a/public/appmini/old/baidu/pages/index/index.js b/public/appmini/old/baidu/pages/index/index.js
index 2793de485..13d438859 100755
--- a/public/appmini/old/baidu/pages/index/index.js
+++ b/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) {
diff --git a/public/appmini/old/baidu/pages/index/index.swan b/public/appmini/old/baidu/pages/index/index.swan
index 9131226f9..6b9e81786 100755
--- a/public/appmini/old/baidu/pages/index/index.swan
+++ b/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>
 
 <!-- 导航 -->
diff --git a/public/appmini/old/baidu/pages/paytips/paytips.js b/public/appmini/old/baidu/pages/paytips/paytips.js
index d4ab957ca..a0ae275f5 100755
--- a/public/appmini/old/baidu/pages/paytips/paytips.js
+++ b/public/appmini/old/baidu/pages/paytips/paytips.js
@@ -47,13 +47,13 @@ Page({
         msg = '用户取消支付';
         break;
 
-      // 默认错误
+      // 默认错误
       default:
         msg = '其它异常错误';
     }
     options['msg'] = msg;
 
-    // 设置信息
+    // 设置信息
     this.setData({ params: options });
   },
 
diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan b/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan
index 63f867fcb..87b2eac84 100755
--- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan
+++ b/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
diff --git a/public/appmini/old/baidu/pages/user-integral/user-integral.swan b/public/appmini/old/baidu/pages/user-integral/user-integral.swan
index 3a92b7138..7fdf8383f 100755
--- a/public/appmini/old/baidu/pages/user-integral/user-integral.swan
+++ b/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>
diff --git a/public/appmini/old/baidu/pages/user-order/user-order.js b/public/appmini/old/baidu/pages/user-order/user-order.js
index 17bf1c21d..6729a34d2 100755
--- a/public/appmini/old/baidu/pages/user-order/user-order.js
+++ b/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 });
   },
diff --git a/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan b/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
index ffbceb240..970101a60 100644
--- a/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
+++ b/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">
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 93fc68015..429bdac69 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -59,6 +59,7 @@ App({
       "goods_comment": "商品评论",
       "user_orderaftersale": "退款/售后",
       "user_orderaftersale_detail": "订单售后",
+      "user_order_comments": "订单评论",
     },
 
     // 请求地址
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index b1f27f610..f333b0e70 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,5 +1,5 @@
 {
-  "pages": [    
+  "pages": ["pages/user-order-comments/user-order-comments",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
diff --git a/public/appmini/old/weixin/app.wxss b/public/appmini/old/weixin/app.wxss
index 617995166..533e8a8dc 100755
--- a/public/appmini/old/weixin/app.wxss
+++ b/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;
 }
diff --git a/public/appmini/old/weixin/images/default-xingxing-icon-active.png b/public/appmini/old/weixin/images/default-xingxing-icon-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..162d78ab5998b5d129b3571da8b2a60ffb66cb60
GIT binary patch
literal 2463
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

literal 0
HcmV?d00001

diff --git a/public/appmini/old/weixin/images/default-xingxing-icon.png b/public/appmini/old/weixin/images/default-xingxing-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2ee84c5e023c6918202cdaae50f600ec2a84f56
GIT binary patch
literal 2326
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

literal 0
HcmV?d00001

diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js
index bd3f3c2b6..d85e6c67f 100755
--- a/public/appmini/old/weixin/pages/buy/buy.js
+++ b/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) {
diff --git a/public/appmini/old/weixin/pages/cart/cart.js b/public/appmini/old/weixin/pages/cart/cart.js
index bd4525c0d..3c579ddd0 100755
--- a/public/appmini/old/weixin/pages/cart/cart.js
+++ b/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: () => {
diff --git a/public/appmini/old/weixin/pages/cart/cart.wxml b/public/appmini/old/weixin/pages/cart/cart.wxml
index 25ab41ebe..907deed6c 100755
--- a/public/appmini/old/weixin/pages/cart/cart.wxml
+++ b/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>
 
diff --git a/public/appmini/old/weixin/pages/cart/cart.wxss b/public/appmini/old/weixin/pages/cart/cart.wxss
index 9e570af6c..906e0c10d 100755
--- a/public/appmini/old/weixin/pages/cart/cart.wxss
+++ b/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;
 }
diff --git a/public/appmini/old/weixin/pages/goods-search/goods-search.wxml b/public/appmini/old/weixin/pages/goods-search/goods-search.wxml
index 26441dd4e..ca4d1eccf 100755
--- a/public/appmini/old/weixin/pages/goods-search/goods-search.wxml
+++ b/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>
diff --git a/public/appmini/old/weixin/pages/index/index.js b/public/appmini/old/weixin/pages/index/index.js
index fc3ef6da1..2009f1c61 100755
--- a/public/appmini/old/weixin/pages/index/index.js
+++ b/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) {
diff --git a/public/appmini/old/weixin/pages/index/index.wxml b/public/appmini/old/weixin/pages/index/index.wxml
index cee67d7ef..fd3579b57 100755
--- a/public/appmini/old/weixin/pages/index/index.wxml
+++ b/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>
 
 <!-- 导航 -->
diff --git a/public/appmini/old/weixin/pages/paytips/paytips.js b/public/appmini/old/weixin/pages/paytips/paytips.js
index 3da3696d3..b1a4f1c0c 100755
--- a/public/appmini/old/weixin/pages/paytips/paytips.js
+++ b/public/appmini/old/weixin/pages/paytips/paytips.js
@@ -49,13 +49,13 @@ Page({
         msg = '用户取消支付';
         break;
 
-      // 默认错误
+      // 默认错误
       default :
         msg = '其它异常错误';
     }
     options['msg'] = msg;
     
-    // 设置信息
+    // 设置信息
     this.setData({params: options});
   },
 
diff --git a/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml b/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml
index 779064dde..0c61143f3 100755
--- a/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml
+++ b/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
diff --git a/public/appmini/old/weixin/pages/user-integral/user-integral.wxml b/public/appmini/old/weixin/pages/user-integral/user-integral.wxml
index 42809b1b1..f59b55c0c 100755
--- a/public/appmini/old/weixin/pages/user-integral/user-integral.wxml
+++ b/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>
diff --git a/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js
new file mode 100644
index 000000000..c3b0f4b91
--- /dev/null
+++ b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js
@@ -0,0 +1,88 @@
+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();
+  },
+
+});
diff --git a/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.json b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.json
new file mode 100644
index 000000000..331ad4f3d
--- /dev/null
+++ b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.json
@@ -0,0 +1,3 @@
+{
+  "enablePullDownRefresh": true
+}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxml b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxml
new file mode 100644
index 000000000..e0624626a
--- /dev/null
+++ b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxml
@@ -0,0 +1,47 @@
+<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
diff --git a/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxss b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxss
new file mode 100644
index 000000000..b8b453aaa
--- /dev/null
+++ b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxss
@@ -0,0 +1,40 @@
+.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
diff --git a/public/appmini/old/weixin/pages/user-order/user-order.js b/public/appmini/old/weixin/pages/user-order/user-order.js
index 86c5a670d..fbe2b67ba 100755
--- a/public/appmini/old/weixin/pages/user-order/user-order.js
+++ b/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 });
   },
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
index f759ddc6f..a414121a9 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
+++ b/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}}">
-- 
GitLab