diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php
index 0ec34935b565d1b85c14c4f7fac78c8f1ec8de82..c5b9f23d06d7ea5ccb53a1234e3bc3c4e11c7d4b 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 3b7cc9014150e4610895deef594478f44427862b..b0eb1fb7cdbe6a949998ccdad2bfc71b4d117489 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 12a80ffafd2c5cd7db97ef7a40671e8812bea9bf..a02635967176ff7f321811e9a4d5621b573c53e3 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 074c2a7e255779f34dc7d786a87c555b7edd06f1..a0becfd1dc9b5bba5e4729d0e54d621847fb35a0 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 75d6526e418f5cad6e10cfd1b4416a3d6af03b4a..87c6416c6793a90bbec087cb2469a61df1db9892 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 @@
关键字
-
+
diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js
index 2b3291ae21651f3535b580fb2087d2682a9a852c..627e16770a770c9487081a3cd619cb8c5918724d 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 be51ad1e3deb6e3d2205c5ad7af138a632ed811b..878c885ab79ab3a91f4bfc9f95c44abf8cb93daf 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 35d673bc4bea82f007c8fa67fefa6be5be9294ad..849b4365dec9fbed2b737d3dfde13267a97b7afb 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 @@
-
+
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 c79dedc2dab9cae907dfbb17ca080e0a4db797c7..2a19935d9d27b0f7b7229fc138ecd44fe7d2cbcb 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 @@
原始 {{item.original_integral}}
- 最新 {{item.new_integral}}
+ 最新 {{item.new_integral}}
{{item.msg}}
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 3916f3ea057e182697984f380a4add789669b31d..2b7b1477a1c799dbdacbd5f0b9e4590622201c75 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 66a0776227e65d447e4245d554b2f2afd8231a2e..c4c931806984da510c2bfc5a6d43ff3b16f29bc3 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 @@
-
-
+
+
退款原因必选
@@ -105,22 +105,22 @@
-
+
商品件数不能大于{{returned_data.returned_quantity}}数量
-
+
退款金额不能大于{{returned_data.refund_price}}元
-
+
退款说明必填
-
+
上传凭证最多上传3张图片
diff --git a/public/appmini/old/baidu/app.css b/public/appmini/old/baidu/app.css
index 3b372c8dc19a75b36030a46d8d3e4c4427824492..93c2bc256911758a975cb3a881007ab4ec9c3005 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 41a59b863f9b4d3df42becec6529d747b3fa2ed3..d01c207547d66e350b66d6eb543c872552757e04 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 1fcdbd4e839d04b9086c31569c1438bbdd08f135..6e915fe10a478ad2b93fc44ef2eaeffac7732214 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 9e570af6c5b6e913c216c2cc89a88046f93d2972..906e0c10d4228bdaa56c13bac9519d2657af5151 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 8fba30dd8524016ec6f49c09079ba8fb024395f4..f0483caa72ca451627d09c25b88edad645c97015 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 ee2acdb7419e0d4a9019b0fea96ecde4f88b4757..7a2a915bf4289e7ac506f56b1b35c904e7b26ffc 100755
--- a/public/appmini/old/baidu/pages/cart/cart.swan
+++ b/public/appmini/old/baidu/pages/cart/cart.swan
@@ -34,7 +34,7 @@
x{{item.stock}}
- 删除
+ 移除
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 e41f897b14a48ebf4580480dea15d09b4a21243a..63bd2e4bcf5530fd086cc1dd6985a812e3c06728 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 @@
关键字
-
+
diff --git a/public/appmini/old/baidu/pages/index/index.js b/public/appmini/old/baidu/pages/index/index.js
index 2793de485fa583e33269ff56a97fd9987a04ae4b..13d43885951d397b3c4981d6abbaa4eec89a98ff 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 9131226f999074c3256e9b04d8b7269d3b26ee1b..6b9e817868ec42b9b61a67d548371763ff868cbf 100755
--- a/public/appmini/old/baidu/pages/index/index.swan
+++ b/public/appmini/old/baidu/pages/index/index.swan
@@ -12,7 +12,7 @@
{{common_shop_notice}}
-
+
diff --git a/public/appmini/old/baidu/pages/paytips/paytips.js b/public/appmini/old/baidu/pages/paytips/paytips.js
index d4ab957ca67d6c8fedc5e2108aeac5a1fa2cb7b3..a0ae275f5cc6246d53274d291218a37c53bc11d8 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 63f867fcb3674fdc41bd7daae203a362f863afee..87b2eac84780cbc6e9f8fa030dc9f0f81bf63059 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 @@
-
+
\ 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 3a92b713888e77885d7c206fe10db1f13a57aafe..7fdf8383f7e05d822a3a57abb9edbc6441aa3494 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 @@
原始 {{item.original_integral}}
- 最新 {{item.new_integral}}
+ 最新 {{item.new_integral}}
{{item.msg}}
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 17bf1c21d800b7d68678b41b9459b5b5c2725202..6729a34d27dec0a4fb2c8302c911bb5a174e1126 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 ffbceb24085326313c73b4d19728c15f6e80e2f6..970101a602c096178839a32dfcafc72a154975a7 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 @@
-
+
退款原因必选
@@ -105,22 +105,22 @@
-
+
商品件数不能大于{{returned_data.returned_quantity}}数量
-
+
退款金额不能大于{{returned_data.refund_price}}元
-
+
退款说明必填
-
+
上传凭证最多上传3张图片
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 93fc680154d82cb645b0c63b0e22d9bd39425e93..429bdac690cf097623504134e25dfa039a8e4352 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 b1f27f61032e067f0ba5b713f997c22515e11801..f333b0e70fbbb9c80c90ad7a7c5739387eef7066 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 617995166de6ae1c81ceb53e4ea164c08337f5dc..533e8a8dc879716bcead0eaa5d6a6dff78255b1c 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
Binary files /dev/null and b/public/appmini/old/weixin/images/default-xingxing-icon-active.png differ
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
Binary files /dev/null and b/public/appmini/old/weixin/images/default-xingxing-icon.png differ
diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js
index bd3f3c2b67e62395714c3730676ad2007c15f321..d85e6c67ffa866ca3ce329e1152c4378fd57cf27 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 bd4525c0decb87d242b4b35a772c4187867bb7ac..3c579ddd07dba2bef5948d33352aa5f627db7700 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 25ab41ebebe67168f871e620fd93c1c28e2d8991..907deed6c2b0451838664cea7608590429789080 100755
--- a/public/appmini/old/weixin/pages/cart/cart.wxml
+++ b/public/appmini/old/weixin/pages/cart/cart.wxml
@@ -33,11 +33,9 @@
¥{{item.original_price}}
x{{item.stock}}
-
- 删除
+
+ 移除
-
-
diff --git a/public/appmini/old/weixin/pages/cart/cart.wxss b/public/appmini/old/weixin/pages/cart/cart.wxss
index 9e570af6c5b6e913c216c2cc89a88046f93d2972..906e0c10d4228bdaa56c13bac9519d2657af5151 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 26441dd4ede98f3867beac3904cbbd8dc2d20ca8..ca4d1eccf8d5c069eda807bc871642b29e154f58 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 @@
关键字
-
+
diff --git a/public/appmini/old/weixin/pages/index/index.js b/public/appmini/old/weixin/pages/index/index.js
index fc3ef6da1c1ea94bc5bfd4fd3dfeca21150eb5cc..2009f1c61a088a06dee593047be3c61231200721 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 cee67d7efcbcf1f1b25d6d2d8db36ecee2aa7570..fd3579b57666027b503e2f7a2612b78d38ba3dfa 100755
--- a/public/appmini/old/weixin/pages/index/index.wxml
+++ b/public/appmini/old/weixin/pages/index/index.wxml
@@ -12,7 +12,7 @@
{{common_shop_notice}}
-
+
diff --git a/public/appmini/old/weixin/pages/paytips/paytips.js b/public/appmini/old/weixin/pages/paytips/paytips.js
index 3da3696d3eef63b5d8f6a13209b57823e64a5cd7..b1a4f1c0cf2835310f5cb5660716bd57a7eed16f 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 779064dde86fd4a8d035f29ac65b3847a7cd10e7..0c61143f31728b85ce9c3d6f977ea12f81ae83ed 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 @@
-
+
\ 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 42809b1b14b06c1258975f8ff667b8aa0e4381c6..f59b55c0cd5e985a63dbc95ad2b5f7d9f569c076 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 @@
原始 {{item.original_integral}}
- 最新 {{item.new_integral}}
+ 最新 {{item.new_integral}}
{{item.msg}}
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 0000000000000000000000000000000000000000..c3b0f4b9159385ea7163e961822e35076b2518e3
--- /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 0000000000000000000000000000000000000000..331ad4f3d98660918818a7657404ac8cb0a6f312
--- /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 0000000000000000000000000000000000000000..e0624626a9d99c5d84f4b4e26bc954846631e10f
--- /dev/null
+++ b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.wxml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
\ 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 0000000000000000000000000000000000000000..b8b453aaa9228cffa863c5d11f1802cd0a5323c4
--- /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 86c5a670d9f872f531ecf325bbb0f7be7b757105..fbe2b67ba925922c8d7c329c87a676e4bb1050f9 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 f759ddc6fa77ff31072bbab1d67caf5f34f3c91a..a414121a91916ae443f5b950ffd98a8ff029008a 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 @@
-
-
+
+
退款原因必选
@@ -105,22 +105,22 @@
-
+
商品件数不能大于{{returned_data.returned_quantity}}数量
-
+
退款金额不能大于{{returned_data.refund_price}}元
-
+
退款说明必填
-
+
上传凭证最多上传3张图片