Commit f6499c4810e6d83dda756ccaa35ee03e9dc4f63f

Authored by yvan.ni
1 parent d2ca0f8c

订单详情退款中的显示

pages/user/choice_guide/choice_guide.js
... ... @@ -13,12 +13,14 @@ Page({
13 13 isload:0,
14 14 show_pop:0,
15 15 sele_item:null,
16   -
  16 + input_val:null,
17 17 },
18 18 //------初始化加载----------
19 19 onLoad: function(t) {},
20 20  
21 21 onShow: function() {
  22 + this.data.ismore=0;this.data.isload=0;
  23 + this.setData({list:null});
22 24 this.get_list();
23 25 },
24 26  
... ... @@ -35,18 +37,11 @@ Page({
35 37 pageSize: th.data.pageSize
36 38 };
37 39  
38   - if(th.data.datet!="" && th.data.datet){
39   - r_data.Sdate=th.data.datet;
40   - }
41   - if(th.data.dates!="" && th.data.dates){
42   - r_data.Edate=th.data.dates;
43   - }
44   - if(th.data.input_val!="" && th.data.input_val){
45   - r_data.MobileTel=th.data.input_val;
46   - }
47   - if(getApp().globalData.userInfo.pickup_id){
48   - r_data.pickupId=getApp().globalData.userInfo.pickup_id;
  40 + //关键字搜索
  41 + if(this.data.input_val){
  42 + r_data.KeyWord= encodeURIComponent(this.data.input_val);
49 43 }
  44 +
50 45 getApp().request.promiseGet("/api/weshop/users/staff/page", {
51 46 data:r_data
52 47 }).then(res => {
... ... @@ -60,6 +55,7 @@ Page({
60 55 var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面
61 56 var ismore = 0;
62 57 if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断
  58 +
63 59 th.setData({
64 60 list: arr3,
65 61 total: res.data.data.total,
... ... @@ -104,6 +100,17 @@ Page({
104 100 img_err:function (e) {
105 101 var txt=e.currentTarget.dataset.err_img;
106 102 this.setData({[txt]:this.data.iurl+'/miniapp/images/no-head.jpg'});
  103 + },
  104 +
  105 + get_input_val:function(e){
  106 + var value=e.detail.value;
  107 + this.data.input_val=value;
  108 + },
  109 + sear:function(){
  110 + this.data.ismore=0;this.data.page=1;
  111 + this.setData({isload:0});
  112 + this.setData({list:null});
  113 + this.get_list();
107 114 }
108 115  
109 116  
... ...
pages/user/choice_guide/choice_guide.wxml
... ... @@ -3,9 +3,9 @@
3 3 <view class="flex sear_all">
4 4 <view class="inp_div flex" style="position: relative">
5 5 <image class="find_img" src="{{iurl}}/miniapp/images/search.png"></image>
6   - <input class="fs32" placeholder="请输入关键字" />
  6 + <input bindinput="get_input_val" class="fs32" placeholder="请输入关键字" />
7 7 </view>
8   - <view class="sear_btn" onclick="sear()">查询</view>
  8 + <view class="sear_btn" bindtap="sear">查询</view>
9 9 </view>
10 10 </view>
11 11  
... ... @@ -19,7 +19,7 @@
19 19 <view><image class="head_pic" src="{{item.PhotoUrl?item.PhotoUrl:iurl+'/miniapp/images/no-head.jpg'}}" binderror="img_err" data-err_img="list[{{index}}].PhotoUrl" ></image></view>
20 20 <view style="margin-left: 30rpx; margin-top: 20rpx">
21 21 <view class="fs35">{{item.StaffName}}</view>
22   - <view class="fs28 ellipsis-3">{{item.Remark1}}</view>
  22 + <view class="fs28 ellipsis-3">{{item.Remark1?item.Remark1:'暂无介绍'}}</view>
23 23 </view>
24 24 </view>
25 25 <!-- 右边 -->
... ... @@ -31,12 +31,12 @@
31 31 </view>
32 32  
33 33 <!-- 没有明细 -->
34   -<view class="empty_order" wx:if="{{isload && list.length<=0}}">
35   - <view class="flex-level">
36   - <image src="{{url}}miniapp/images/order/empty_order.png"></image>
  34 +<view class="empty_order" wx:if="{{(!list || list.length<=0) && isload}}">
  35 + <view class="flex-level" style="margin-top: 150rpx">
  36 + <image src="{{iurl}}miniapp/images/order/empty_order.png" style="width: 260rpx; height: 260rpx"></image>
37 37 </view>
38   - <view class="flex-level fs30 xc-ash">暂无顾问明细</view>
39   - <view class="flex-level">
  38 + <view class="flex-level fs30 xc-ash" style="margin-top: 10rpx">暂无顾问明细</view>
  39 + <view class="flex-level" style="margin-top: 10rpx">
40 40 <navigator bindtap="back">
41 41 <view class="flex-center fs30 white">返回</view>
42 42 </navigator>
... ...
pages/user/order_detail/order_detail.js
... ... @@ -68,17 +68,13 @@ Page({
68 68 rq.get("/api/weshop/ordergoods/list",{
69 69 data: { store_id: os.stoid, order_id: oid},
70 70 success:async function (eb) {
71   - r.order_goods=eb.data.data.pageData;
72   -
73   - var glist = r.order_goods;
74   - for(var i in glist){
  71 + r.order_goods=eb.data.data.pageData;
  72 + var glist = r.order_goods;
  73 + for(var i in glist){
75 74 if(glist[i].is_gift){
76 75 r.is_prom=1;
77 76 }
78   - }
79   -
80   -
81   -
  77 + }
82 78  
83 79 //------------对比一下有没有退款记录------------
84 80 await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
... ... @@ -107,6 +103,8 @@ Page({
107 103 //--------整单退--------
108 104 if (ttd.data.data.pageData[0]['goods_id_list'] != null
109 105 && ttd.data.data.pageData[0]['goods_id_list'] != ''){
  106 +
  107 +
110 108 var eea = ttd.data.data.pageData[0];
111 109 //1.退款正在进行中,
112 110 //2.退款被拒绝就要显示可以退款
... ... @@ -118,8 +116,10 @@ Page({
118 116 switch (eea.status) {
119 117 case 0:
120 118 case 1:
  119 + r.order_status_detail="退款中";
121 120 r['return_btn'] = 2; break;
122 121 case 2:
  122 + r.order_status_detail="退款完成";
123 123 r['return_btn'] = 4; break;
124 124 case 3:
125 125 r['return_btn'] = 3; break;
... ...