diff --git a/pages/user/choice_guide/choice_guide.js b/pages/user/choice_guide/choice_guide.js
index d9a574d..8d19cf4 100644
--- a/pages/user/choice_guide/choice_guide.js
+++ b/pages/user/choice_guide/choice_guide.js
@@ -13,12 +13,14 @@ Page({
isload:0,
show_pop:0,
sele_item:null,
-
+ input_val:null,
},
//------初始化加载----------
onLoad: function(t) {},
onShow: function() {
+ this.data.ismore=0;this.data.isload=0;
+ this.setData({list:null});
this.get_list();
},
@@ -35,18 +37,11 @@ Page({
pageSize: th.data.pageSize
};
- if(th.data.datet!="" && th.data.datet){
- r_data.Sdate=th.data.datet;
- }
- if(th.data.dates!="" && th.data.dates){
- r_data.Edate=th.data.dates;
- }
- if(th.data.input_val!="" && th.data.input_val){
- r_data.MobileTel=th.data.input_val;
- }
- if(getApp().globalData.userInfo.pickup_id){
- r_data.pickupId=getApp().globalData.userInfo.pickup_id;
+ //关键字搜索
+ if(this.data.input_val){
+ r_data.KeyWord= encodeURIComponent(this.data.input_val);
}
+
getApp().request.promiseGet("/api/weshop/users/staff/page", {
data:r_data
}).then(res => {
@@ -60,6 +55,7 @@ Page({
var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面
var ismore = 0;
if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断
+
th.setData({
list: arr3,
total: res.data.data.total,
@@ -104,6 +100,17 @@ Page({
img_err:function (e) {
var txt=e.currentTarget.dataset.err_img;
this.setData({[txt]:this.data.iurl+'/miniapp/images/no-head.jpg'});
+ },
+
+ get_input_val:function(e){
+ var value=e.detail.value;
+ this.data.input_val=value;
+ },
+ sear:function(){
+ this.data.ismore=0;this.data.page=1;
+ this.setData({isload:0});
+ this.setData({list:null});
+ this.get_list();
}
diff --git a/pages/user/choice_guide/choice_guide.wxml b/pages/user/choice_guide/choice_guide.wxml
index 809ee48..e72b521 100644
--- a/pages/user/choice_guide/choice_guide.wxml
+++ b/pages/user/choice_guide/choice_guide.wxml
@@ -3,9 +3,9 @@
-
+
- 查询
+ 查询
@@ -19,7 +19,7 @@
{{item.StaffName}}
- {{item.Remark1}}
+ {{item.Remark1?item.Remark1:'暂无介绍'}}
@@ -31,12 +31,12 @@
-
-
-
+
+
+
- 暂无顾问明细
-
+ 暂无顾问明细
+
返回
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 084f4c2..beb7224 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -68,17 +68,13 @@ Page({
rq.get("/api/weshop/ordergoods/list",{
data: { store_id: os.stoid, order_id: oid},
success:async function (eb) {
- r.order_goods=eb.data.data.pageData;
-
- var glist = r.order_goods;
- for(var i in glist){
+ r.order_goods=eb.data.data.pageData;
+ var glist = r.order_goods;
+ for(var i in glist){
if(glist[i].is_gift){
r.is_prom=1;
}
- }
-
-
-
+ }
//------------对比一下有没有退款记录------------
await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
@@ -107,6 +103,8 @@ Page({
//--------整单退--------
if (ttd.data.data.pageData[0]['goods_id_list'] != null
&& ttd.data.data.pageData[0]['goods_id_list'] != ''){
+
+
var eea = ttd.data.data.pageData[0];
//1.退款正在进行中，
//2.退款被拒绝就要显示可以退款
@@ -118,8 +116,10 @@ Page({
switch (eea.status) {
case 0:
case 1:
+ r.order_status_detail="退款中";
r['return_btn'] = 2; break;
case 2:
+ r.order_status_detail="退款完成";
r['return_btn'] = 4; break;
case 3:
r['return_btn'] = 3; break;