wxd / MShopWeApp

Merged
Merge Request #22 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 10 changed files
pages/goods/categoryList/categoryList.js
  Edit  View file @b131abf
... ... @@ -94,7 +94,7 @@ Page({
94 94 requestFirstCategoris: function() {
95 95 var t = this;
96 96 e.get("/api/weshop/goodscategory/page", {
97   - data: { store_id: oo.stoid,pageSize:600},
  97 + data: { store_id: oo.stoid,pageSize:600,is_show:1},
98 98 success: function(e) {
99 99 var arr=new Array();
100 100 var dda = e.data.data.pageData;
... ...
pages/order/refund_order/refund_order.js
  View file @b131abf
... ... @@ -12,28 +12,32 @@ Page({
12 12 order_sn:"",
13 13 back_money: 0,
14 14 reasonSelect: 0,
15   - reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ]
  15 + reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ],
  16 + return_type:0,
16 17 },
17 18 onLoad: function(t) {
18   - var th = this;
19   - e.getUserInfo(function(e) {
20   - console.log('onload');
21   - console.log(e);
22   - th.setData({
23   - orderId: t.order_id,
24   - user: e
25   - }),
26   - rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{
27   - success:function(ed){
28   - var bm = ed.data.data.order_amount + ed.data.data.user_money
29   - + ed.data.data.pt_tail_money
30   - th.setData({
31   - order_sn: ed.data.data.order_sn,
32   - back_money: bm
33   - })
34   - }
35   - })
36   - });
  19 + var th=this;
  20 + getApp().getConfig2(function (em) {
  21 + th.data.return_type = em.return_type;
  22 + e.getUserInfo(function(e) {
  23 + console.log('onload');
  24 + console.log(e);
  25 + th.setData({
  26 + orderId: t.order_id,
  27 + user: e,
  28 + }),
  29 + rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{
  30 + success:function(ed){
  31 + var bm = ed.data.data.order_amount + ed.data.data.user_money
  32 + + ed.data.data.pt_tail_money
  33 + th.setData({
  34 + order_sn: ed.data.data.order_sn,
  35 + back_money: bm
  36 + })
  37 + }
  38 + })
  39 + });
  40 + })
37 41 },
38 42  
39 43 //------提交退款申请-------
... ... @@ -63,6 +67,7 @@ Page({
63 67 goods_id_list: glist,
64 68 addtime: ut.gettimestamp(),
65 69 type:2,
  70 + return_type: th.data.return_type,
66 71 },
67 72 success: function (e) {
68 73 wx.showToast({
... ...
pages/team/team_ping/team_ping.wxml
  View file @b131abf
... ... @@ -33,20 +33,9 @@
33 33 <view class="flex">
34 34 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
35 35 <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
36   - <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价：</text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view>
  36 + <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view>
37 37 </view>
38   - <view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}">
39   - <block wx:if="{{item.ct_num-item.tx.length>0}}">
40   - 还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团
41   - </block>
42   - <block wx:elif="{{item.max_ct_num-item.tx.length>0}}">
43   - 还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最低价
44   - </block>
45   - <block wx:else>
46   - 您已经可以享受最低价
47   - </block>
48   -
49   - </view>
  38 +
50 39 <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">
51 40 <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
52 41 </view>
... ... @@ -54,15 +43,27 @@
54 43 <image src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image></view>
55 44 </view>
56 45  
  46 +<view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}">
  47 + <block wx:if="{{item.ct_num-item.tx.length>0}}">
  48 + 还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团
  49 + </block>
  50 + <block wx:elif="{{item.max_ct_num-item.tx.length>0}}">
  51 + 还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最价</block>
  52 + <block wx:else>您已经可以享受最低价</block>
  53 + </view>
  54 +
  55 +
57 56 </view>
  57 +
58 58 </view>
59   -
  59 +
60 60 </view>
61 61 <!--foot-->
62 62 <view style='width:100%;border-bottom:10rpx solid #eee; '>
63 63 <view class='pd-list-foot'>
64   - <view class='foot-left'>
  64 + <view class='foot-left flex'>
65 65 共{{item.order_goods[0].goods_num}}件,
  66 + <view class="t-c">
66 67 <block wx:if="{{item.is_zsorder==4}}">
67 68 <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
68 69 金额：<text class="xc-wc">￥</text>
... ... @@ -80,6 +81,7 @@
80 81 金额：<text class="xc-wc">￥</text>
81 82 <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
82 83 </block>
  84 + </view>
83 85 </view>
84 86  
85 87 <view class='foot-right'>
... ...
pages/team/team_ping/team_ping.wxss
  View file @b131abf
... ... @@ -361,7 +361,7 @@ height:86rpx;
361 361  
362 362 }
363 363 .xc-still-bad{
364   -line-height:100rpx;
  364 +line-height:10rpx;
365 365 }
366 366 .xc-ellipsis{
367 367 line-height:121rpx;
... ... @@ -374,5 +374,5 @@ margin-left:5rpx;
374 374 color: #e4374d;
375 375 font-weight: normal;
376 376 margin-top:-40rpx;
377   - margin-left:78rpx
  377 +
378 378 }
379 379 \ No newline at end of file
... ...
pages/team/team_show/team_show.wxml
  Edit  View file @b131abf
... ... @@ -186,7 +186,7 @@
186 186 <view class='buy-top'>
187 187 <view class='buy-image mimg'>
188 188 <image src='{{image}}'></image>
189   - <view style='float:left'>
  189 + <view>
190 190 <view>
191 191 <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
192 192 </view>
... ...
pages/user/add_comment/add_comment.js
  View file @b131abf
1   -var t = getApp(),oo=t.globalData, a = t.globalData.setting,os=a, e = t.request, s = require("../../../utils/util.js"), i = require("../../../utils/selectFiles.js");
  1 +var t = getApp(),oo=t.globalData, a = t.globalData.setting,os=a, e = t.request, s = require("../../../utils/util.js"),
  2 + i = require("../../../utils/selectFiles.js");
  3 +var regeneratorRuntime = require('../../../utils/runtime.js');
2 4  
3 5 Page({
4 6 data: {
... ... @@ -18,12 +20,16 @@ Page({
18 20 isLongPress: !1,
19 21 userinfo:null,
20 22 },
21   - onLoad: function(a) {
  23 + onLoad:async function(a) {
22 24 var th=this;
23   -
24 25 console.log('onLoad');
25 26 console.log(a);
26 27  
  28 + await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+a.goods_id,{1:1}).then(res=>{
  29 + a.img=th.data.iurl+res.data.data.original_img
  30 + })
  31 +
  32 +
27 33 this.setData({options: a});
28 34 t.getUserInfo(function(e){
29 35 console.log(e);
... ...
pages/user/order_detail/order_detail.wxml
  Edit  View file @b131abf
... ... @@ -107,8 +107,8 @@
107 107 <view class="item-line"></view>
108 108 <view class="item" wx:if="{{order.user_money>0}}">
109 109 <view>使用余额</view>
110   - <view wx:if="{{order.tail_pay_type==1}}">￥ {{order.user_money+order.pt_tail_money}}元</view>
111   - <view wx:else>￥ {{order.user_money}}元</view>
  110 + <view wx:if="{{order.tail_pay_type==1}}">￥ {{filters.toFix(order.user_money+order.pt_tail_money,2)}}元</view>
  111 + <view wx:else>￥ {{filters.toFix(order.user_money,2)}}元</view>
112 112 </view>
113 113 </view>
114 114  
... ...
pages/user/order_list/order_list.wxml
  Edit  View file @b131abf
... ... @@ -60,10 +60,13 @@
60 60  
61 61 </view>
62 62 </view>
63   - <view class="check-btn">
  63 +
  64 + </view>
  65 +
  66 + <view class="check-btn">
64 67 <navigator url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}"
65 68 class="order-btn order-btn-pay" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
66   - <navigator bindtap="jumpToCart4" class="order-btn order-btn-pay" data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
  69 + <navigator bindtap="jumpToCart4 white red-b" class="order-btn order-btn-pay " data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
67 70 <view class="order-btn" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3 }}">已取消</view>
68 71 <view bindtap="cancelOrder" class="order-btn" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}"
69 72 hidden="{{!(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
... ... @@ -80,14 +83,14 @@
80 83 </block>
81 84  
82 85  
83   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
84   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
85   - <navigator redirect class="order-btn" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
  86 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
  87 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
  88 + <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
86 89 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
87 90 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
88 91  
89 92 </view>
90   - </view>
  93 +
91 94 </view>
92 95 <view class="no-data" wx:if="{{ (!orderList||orderList.length==0) && is_get}}">
93 96 <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
... ...
pages/user/order_list/order_list.wxss
  Edit  View file @b131abf
... ... @@ -40,6 +40,8 @@
40 40 margin-bottom: 20rpx;
41 41 font-size: 28rpx;
42 42 border-bottom: 1rpx solid #eee;
  43 + padding-bottom: 25rpx;
  44 +
43 45 }
44 46  
45 47 .goods-title {
... ... @@ -108,7 +110,7 @@
108 110  
109 111 .goods-tips {
110 112 height: 60rpx;
111   - padding: 50rpx 0;
  113 + padding: 10rpx 0;
112 114 display: flex;
113 115 justify-content: space-between;
114 116 align-items: center;
... ... @@ -127,14 +129,14 @@
127 129 }
128 130  
129 131 .order-btn {
130   - width: 125rpx;
131   - height: 60rpx;
132   - line-height: 60rpx;
  132 + width: 150rpx;
  133 + height: 50rpx;
  134 + line-height: 50rpx;
133 135 text-align: center;
134 136 border: 1px solid #eee;
135 137 margin-left: 10rpx;
136 138 float: right;
137   - border-radius: 5rpx;
  139 + border-radius: 15rpx;
138 140 }
139 141  
140 142 .order-btn-pay {
... ... @@ -143,3 +145,6 @@
143 145 border-color: #f23030;
144 146 }
145 147 .return-btn.co-red{color: #e02e24}
  148 +.check-btn{
  149 + margin-bottom: 20rpx;
  150 +}
146 151 \ No newline at end of file
... ...
pages/user/return_goods/return_goods.js
  View file @b131abf
... ... @@ -21,18 +21,25 @@ Page({
21 21 causeList: [ "订单不能按预计时间送达", "操作有误（商品、地址等选错）", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了" ],
22 22 checkCauseIndex: -1,
23 23 popState: !0,
24   - description: ""
  24 + description: "",
  25 + return_type:0,
25 26 },
26 27 onLoad: function(e) {
27 28 var a = this;
  29 +
  30 + getApp().getConfig2(function (em) {
  31 + a.data.return_type = em.return_type;
  32 + });
  33 +
28 34 this.setData({
29 35 recId: e.rec_id
30 36 }), this.requestReturnGoods(e), t.getConfig(function(t) {
31 37 a.setData({
32   - "config.address": t.store_address,
33   - "config.phone": t.store_tel,
  38 + "config.address": t.store_address,
  39 + "config.phone": t.store_tel,
34 40 });
35 41 });
  42 +
36 43 },
37 44 requestReturnGoods: function(t) {
38 45 var e = this;
... ... @@ -147,6 +154,7 @@ Page({
147 154 goods_id: th.data.order.goods_id,
148 155 addtime: ut.gettimestamp(),
149 156 type:2,
  157 + return_type: th.data.return_type,
150 158 },
151 159 success: function(t) {
152 160 wx.showToast({
... ...