diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index dba5888..1860cbd 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -94,7 +94,7 @@ Page({
requestFirstCategoris: function() {
var t = this;
e.get("/api/weshop/goodscategory/page", {
- data: { store_id: oo.stoid,pageSize:600},
+ data: { store_id: oo.stoid,pageSize:600,is_show:1},
success: function(e) {
var arr=new Array();
var dda = e.data.data.pageData;
diff --git a/pages/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js
index 7adf67e..d35f385 100644
--- a/pages/order/refund_order/refund_order.js
+++ b/pages/order/refund_order/refund_order.js
@@ -12,28 +12,32 @@ Page({
order_sn:"",
back_money: 0,
reasonSelect: 0,
- reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ]
+ reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ],
+ return_type:0,
},
onLoad: function(t) {
- var th = this;
- e.getUserInfo(function(e) {
- console.log('onload');
- console.log(e);
- th.setData({
- orderId: t.order_id,
- user: e
- }),
- rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{
- success:function(ed){
- var bm = ed.data.data.order_amount + ed.data.data.user_money
- + ed.data.data.pt_tail_money
- th.setData({
- order_sn: ed.data.data.order_sn,
- back_money: bm
- })
- }
- })
- });
+ var th=this;
+ getApp().getConfig2(function (em) {
+ th.data.return_type = em.return_type;
+ e.getUserInfo(function(e) {
+ console.log('onload');
+ console.log(e);
+ th.setData({
+ orderId: t.order_id,
+ user: e,
+ }),
+ rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{
+ success:function(ed){
+ var bm = ed.data.data.order_amount + ed.data.data.user_money
+ + ed.data.data.pt_tail_money
+ th.setData({
+ order_sn: ed.data.data.order_sn,
+ back_money: bm
+ })
+ }
+ })
+ });
+ })
},
//------提交退款申请-------
@@ -63,6 +67,7 @@ Page({
goods_id_list: glist,
addtime: ut.gettimestamp(),
type:2,
+ return_type: th.data.return_type,
},
success: function (e) {
wx.showToast({
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index d250119..e235918 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -33,20 +33,9 @@
￥
{{item.order_goods[0].goods_price}}
- 零售价：￥{{item.order_goods[0].market_price}}
+ 零售价:￥{{item.order_goods[0].market_price}}
-
-
- 还差{{item.ct_num-item.tx.length}}人成团
-
-
- 还差{{item.max_ct_num-item.tx.length}}人享受最低价
-
-
- 您已经可以享受最低价
-
-
-
+
@@ -54,15 +43,27 @@
+
+
+ 还差{{item.ct_num-item.tx.length}}人成团
+
+
+ 还差{{item.max_ct_num-item.tx.length}}人享受最价
+ 您已经可以享受最低价
+
+
+
+
-
+