diff --git a/components/my_confirm/my_confirm.js b/components/my_confirm/my_confirm.js
index 9716d77..de6129e 100644
--- a/components/my_confirm/my_confirm.js
+++ b/components/my_confirm/my_confirm.js
@@ -2,30 +2,43 @@ var t = getApp();
Component({
/*** 页面的初始数据***/
data: {
- yu_e_show:0,
- iurl:t.globalData.setting.imghost,
- width:0,
- success:null, //成功的回调
- cancle: null, //取消的回调
- title: null, //标题
- s_text:null, //确定的提示语
- c_text:null, //取消的提示语
+ yu_e_show: 0,
+ iurl: t.globalData.setting.imghost,
+ width: 0,
+ success: null, //成功的回调
+ cancle: null, //取消的回调
+ title: null, //标题
+ s_text: null, //确定的提示语
+ c_text: null, //取消的提示语
},
methods: {
- open: function (title,s_text,c_text,success,cancle) {
- this.setData({ title: title, s_text: s_text, c_text:c_text, yu_e_show: 1})
- this.data.success=success;this.data.cancle=cancle;
- },
- go_sure:function(){
- this.data.success();
- },
- go_cancle: function () {
- this.data.cancle();
- },
- close_yu_e:function(){
- this.setData({ yu_e_show: 0 })
- }
+ open: function(title, s_text, c_text, success, cancle) {
+ this.setData({
+ title: title,
+ s_text: s_text,
+ c_text: c_text,
+ yu_e_show: 1
+ })
+ this.data.success = success;
+ this.data.cancle = cancle;
+ },
+ open_cancel: function (yu_e_show){
+ this.setData({
+ yu_e_show: yu_e_show
+ })
+ },
+ go_sure: function() {
+ this.data.success();
+ },
+ go_cancle: function() {
+ this.data.cancle();
+ },
+ close_yu_e: function() {
+ this.setData({
+ yu_e_show: 0
+ })
+ }
}
-
+
})
\ No newline at end of file
diff --git a/components/my_confirm/my_confirm.wxml b/components/my_confirm/my_confirm.wxml
index ab4bc9f..00f519b 100644
--- a/components/my_confirm/my_confirm.wxml
+++ b/components/my_confirm/my_confirm.wxml
@@ -6,7 +6,7 @@
ⅹ
{{title}}
- {{s_text}}
+ {{s_text}}
{{c_text}}
diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss
index a0b8997..aa124ba 100644
--- a/components/my_confirm/my_confirm.wxss
+++ b/components/my_confirm/my_confirm.wxss
@@ -60,4 +60,7 @@
}
.flex {display: flex;}
.jc-center{ justify-content: center;}
-.ai-center{align-items: center;}
\ No newline at end of file
+.ai-center{align-items: center;}
+.color{
+ color: rgb(255,255,255);
+}
\ No newline at end of file
diff --git a/components/nav_b/nav_b.js b/components/nav_b/nav_b.js
new file mode 100644
index 0000000..3c068b2
--- /dev/null
+++ b/components/nav_b/nav_b.js
@@ -0,0 +1,35 @@
+var t = getApp(), os = t.globalData.setting;
+Component({
+ properties: {
+ },
+ data: {
+ isopen: 0,
+ iurl: os.imghost,
+ nav_left:"首页",//导航左边
+ nav_center:"预约",//导航中间
+ nav_right: "我的",//导航右边
+ nav_left_url: "/pages/index/index/index",//导航左边地址
+ nav_center_url:"/pages/user/my_service/tment_order_list",//导航中间地址
+ nav_right_url:"/pages/user/index/index",//导航右边地址
+ },
+
+ ready: function () {
+ },
+ methods: {
+ //--点击打开事件--
+ open_box: function () {
+ this.setData({ isopen: 1 });
+ },
+ //--关闭事件--
+ close_box: function () {
+ this.setData({ isopen: 0 });
+ },
+ //--跳转--
+ goto: function (e) {
+ var url = e.currentTarget.dataset.url;
+ getApp().goto(url);
+ }
+
+ }
+
+})
\ No newline at end of file
diff --git a/components/nav_b/nav_b.json b/components/nav_b/nav_b.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/nav_b/nav_b.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/nav_b/nav_b.wxml b/components/nav_b/nav_b.wxml
new file mode 100644
index 0000000..566122e
--- /dev/null
+++ b/components/nav_b/nav_b.wxml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ {{nav_left}}
+ {{nav_center}}
+ {{nav_right}}
+ ×
+
+
+
diff --git a/components/nav_b/nav_b.wxss b/components/nav_b/nav_b.wxss
new file mode 100644
index 0000000..ed01bf6
--- /dev/null
+++ b/components/nav_b/nav_b.wxss
@@ -0,0 +1,67 @@
+.box_main{
+ width:80rpx;
+ height:80rpx;
+ background:#272636;
+ transition:width 0.8s;
+ -moz-transition:width 0.8s; /* Firefox 4 */
+ -webkit-transition:width 0.8s; /* Safari and Chrome */
+ -o-transition:width 0.8s; /* Opera */
+ border-radius:50rpx ;
+ position: fixed;
+ right: 10rpx;
+ bottom:300rpx;
+ overflow: hidden;
+ z-index: 111;
+}
+
+.box_isopen{
+ width: 420rpx;
+}
+
+.box_main .dian{
+ text-align: center;
+width: 50rpx;
+height: 50rpx;
+color: #ffff;
+font-size: 50rpx;
+background: none;
+
+}
+
+.box_main .dian image{
+ width: 60rpx;
+height: 20rpx;
+margin: 30rpx 0 0 10rpx;
+}
+
+.box_main.box_isopen .dian{
+ display: none;
+}
+
+.box_main .cl_list{
+ display: none;
+}
+
+.box_main.box_isopen .cl_list{
+ display: block;
+ margin-left: 20rpx;
+}
+
+.box_main .cl_list .item{
+ display: inline-block;
+ width:100rpx;
+ height:80rpx;
+ text-align: center;
+ line-height: 80rpx;
+ color: #fff;
+ vertical-align: top;
+ font-size: 32rpx;
+
+}
+
+.box_main .cl_list .item.big{
+ font-size: 70rpx;
+line-height: 70rpx;
+
+}
+
diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 7976d7f..acdb181 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -469,5 +469,27 @@ Page({
if (seekTime != "") {
th.query_more();
}
+ th.query_project();
+ },
+ //获取单个服务项目信息
+ query_project:function(){
+ var th = this;
+ var url = "/api/weshop/marketing/reservation/sm/page";//获取服务项目接口
+ var project_id = th.data.project_id;//服务项目id
+ getApp().request.promiseGet(url,{
+ data:{
+ storeId:a.stoid,
+ userId:d.user_id,
+ projectId: project_id
+ }
+ }).then(res=>{
+ if(res.data.code==0){
+ th.setData({
+ validay: res.data.data.pageData[0].Validay
+ })
+ }else{
+ getApp().my_warnning(res.data.msg,0,th);
+ }
+ })
}
})
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss
index cbacb40..89bdad5 100644
--- a/pages/user/my_service/appment_main.wxss
+++ b/pages/user/my_service/appment_main.wxss
@@ -125,11 +125,14 @@ button {
width: 407rpx;
z-index: 3;
top: 45rpx;
- left: 0rpx;
+ left: -1rpx;
padding: 0rpx 5rpx;
border: 2rpx solid rgb(238, 238, 238);
background-color: rgb(255, 255, 255);
padding-bottom: 5rpx;
+ height: 279rpx;
+ overflow-x: scroll;
+ overflow-y: scroll;
}
.beautician {
diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index 7446993..0fcb709 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -37,11 +37,14 @@ Page({
*/
onLoad: function(options) {
var th = this;
+ var myDate = new Date();
+ var date = myDate.getHours() + ":00"; //获取当前小时数(0-23)
var beautician_id = options.BeauticianID;
th.setData({
beautician_id: beautician_id,
itemId: options.itemId,
modify: options.modify,
+ hours: date,
projectId: options.projectId
})
if (options.url != undefined) {
@@ -66,13 +69,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
- var th = this;
- var myDate = new Date();
- var date = myDate.getHours() + ":00"; //获取当前小时数(0-23)
- th.setData({
- hours:date
- })
- th.query_date();
+
},
//图片失败，默认图片
@@ -251,9 +248,8 @@ Page({
aweeks: arr,
weeks: weeks
})
- if (data.length > 0) {
- th.query_date();
- }
+ th.query_date();
+
} else {
getApp().my_warnning(res.data.msg, 0, th);
}
@@ -267,7 +263,7 @@ Page({
var date_id = th.data.date_id; //日期下标
var SeekTime = th.data.aweeks[date_id].time;
var val = th.data.aweeks[date_id].val;
- if (val != "") {
+
var url = "/api/weshop/marketing/reservation/staff/time/list";
getApp().request.promiseGet(url, {
data: {
@@ -279,21 +275,25 @@ Page({
}
}).then(res => {
if (res.data.code == 0) {
- var time_list = res.data.data;
- var time = th.data.time;
- var new_time = [];
- if (time_list != null) {
- for (var i = 0; i < time.length; i++) {
- for (var ii = 0; ii < time_list.length; ii++) {
- if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
- new_time[i] = time_list[ii].GroupHour.substring(0, 5);
- break;
- } else {
- new_time[i] = "";
+ console.log("也饿饿饿饿饿饿" + res.data.data[0].GroupHour);
+ if (res.data.data[0].GroupHour.length > 11) {
+ getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
+ }
+ var time_list = res.data.data;
+ var time = th.data.time;
+ var new_time = [];
+ if (time_list != null) {
+ for (var i = 0; i < time.length; i++) {
+ for (var ii = 0; ii < time_list.length; ii++) {
+ if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
+ new_time[i] = time_list[ii].GroupHour.substring(0, 5);
+ break;
+ } else {
+ new_time[i] = "";
+ }
}
}
}
- }
th.setData({
time_list: new_time
})
@@ -301,7 +301,7 @@ Page({
getApp().my_warnning(res.data.msg, 0, th);
}
})
- }
+
},
//更改预约时间
change_time: function() {
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
index 962bab6..4181742 100644
--- a/pages/user/my_service/beauty_deta.wxml
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -41,7 +41,7 @@
-
+
{{it}}
diff --git a/pages/user/my_service/hist_service.js b/pages/user/my_service/hist_service.js
index 05e61bf..6738a06 100644
--- a/pages/user/my_service/hist_service.js
+++ b/pages/user/my_service/hist_service.js
@@ -31,6 +31,7 @@ Page({
ismore: 0, //是否加载完毕
is_screen: 0, //是否通过筛选来选择历史服务
is_reset:0,//是否重复点击
+ is_nav:1,//是否显示导航栏
},
pickerShow: function() {
this.setData({
@@ -97,7 +98,9 @@ Page({
curpage: 1,
is_service_read: 0,
is_screen: 1,
- is_reset:1
+ is_reset:1,
+ beginDate: "",
+ endDate: "",
})
th.query_hist();
}
@@ -119,6 +122,9 @@ Page({
}
}).then(res => {
wx.hideLoading();
+ th.setData({
+ is_reset: 0
+ })
if (res.data.code == 0) {
th.data.curpage++;
var arr1 = th.data.hist_List;
@@ -131,7 +137,6 @@ Page({
total: res.data.data.total,
ismore: ismore,
is_service_read: 1,
- is_reset:0
}), wx.stopPullDownRefresh(); //停止下拉刷新
} else {
th.setData({
diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml
index 5f8b157..d76722b 100644
--- a/pages/user/my_service/hist_service.wxml
+++ b/pages/user/my_service/hist_service.wxml
@@ -1,6 +1,6 @@
-
+
-
+
共使用
{{total}}
diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index f0db0e1..d316bf7 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -22,6 +22,7 @@ Page({
total: 0,
ismore: 0, //是否加载完毕
userinfo: null,
+ is_sub: 0, //是否重复提交预约
},
/**
@@ -44,7 +45,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
-
+
},
onReachBottom: function() {
var th = this;
@@ -91,6 +92,10 @@ Page({
/*-- 打开服务项目 --*/
open_fw: function(e) {
var th = this;
+ var nav_b = th.selectComponent("#nav_b"); //组件的id
+ var url = e.currentTarget.dataset.url;
+ var service_id = e.currentTarget.dataset.service_id; //服务id
+ var project_id = e.currentTarget.dataset.project_id;
var ind = e.currentTarget.dataset.ind;
var item = this.data.service_List[ind];
var ewm = th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
@@ -99,7 +104,43 @@ Page({
th.data.qr_code_object.val = ewm;
th.data.qr_code_object.is_fw = 1;
var qc_com = th.selectComponent("#qc_com"); //组件的id
- qc_com.open(th.data.qr_code_object)
+ getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
+ data: {
+ serviceId: service_id,
+ storeId: a.stoid,
+ userId: d.user_id
+ }
+ }).then(res => {
+ th.setData({
+ is_sub: 0
+ })
+ if (res.data.data != null) {
+ var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+ my_confirm.open_cancel(1);
+ my_confirm.open(
+ "已有预约记录!",
+ "继续使用",
+ "预约详情",
+ function() {
+ nav_b.close_box();
+ my_confirm.open_cancel(0);
+ qc_com.open(th.data.qr_code_object)
+ },
+ function() {
+ nav_b.close_box();
+ my_confirm.open_cancel(0);
+ var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number;
+ wx.navigateTo({
+ url: deta_url
+ })
+ }
+ )
+
+ } else {
+ qc_com.open(th.data.qr_code_object)
+ }
+ })
+
},
//图片失败，默认图片
bind_bnerr1: function(e) {
@@ -130,37 +171,78 @@ Page({
//校正是否可预约
correcting: function(e) {
var th = this;
- var url = e.currentTarget.dataset.url;
- var service_id = e.currentTarget.dataset.service_id; //服务id
- var project_id = e.currentTarget.dataset.project_id;
- getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
- data: {
- serviceId: service_id,
- storeId: a.stoid,
- userId: d.user_id
- }
- }).then(res => {
- if (res.data.code == 0) {
- getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", {
- data: {
- projectId: project_id,
- serviceId: service_id,
- storeId: a.stoid,
- userId: d.user_id
- }
- }).then(res => {
- if (res.data.code == 0) {
+ var nav_b = th.selectComponent("#nav_b"); //组件的id
+ wx.showLoading({
+ title: '加载中',
+ })
+ if (th.data.is_sub == 0) {
+ th.setData({
+ is_sub: 1
+ })
+ var url = e.currentTarget.dataset.url;
+ var service_id = e.currentTarget.dataset.service_id; //服务id
+ var project_id = e.currentTarget.dataset.project_id;
+ getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
+ data: {
+ serviceId: service_id,
+ storeId: a.stoid,
+ userId: d.user_id
+ }
+ }).then(res => {
+ wx.hideLoading();
+ th.setData({
+ is_sub: 0
+ })
+ if (res.data.code == 0) {
+ if (res.data.data != null) {
+
+ var number = res.data.data.Number;
+ var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+ my_confirm.open_cancel(1);
+ my_confirm.open(
+ "已有预约记录!",
+ "继续预约",
+ "预约详情",
+ function() {
+ nav_b.close_box();
+ my_confirm.open_cancel(0);
+ getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", {
+ data: {
+ projectId: project_id,
+ serviceId: service_id,
+ storeId: a.stoid,
+ userId: d.user_id
+ }
+ }).then(res => {
+ if (res.data.code == 0) {
+ wx.navigateTo({
+ url: url
+ })
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ }
+ })
+ },
+ function() {
+ nav_b.close_box();
+ my_confirm.open_cancel(0);
+ var deta_url = "/pages/user/my_service/tment_details?number=" + number;
+ wx.navigateTo({
+ url: deta_url
+ })
+ }
+ )
+ } else {
wx.navigateTo({
- url: url
+ url: url,
})
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
}
- })
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
- }
- })
+
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ }
+ })
+ }
}
})
\ No newline at end of file
diff --git a/pages/user/my_service/i_service.json b/pages/user/my_service/i_service.json
index 88d15ea..516d6e0 100644
--- a/pages/user/my_service/i_service.json
+++ b/pages/user/my_service/i_service.json
@@ -2,6 +2,8 @@
"navigationBarTitleText": "服务项目",
"usingComponents": {
"qr_code": "/components/qr_code/qr_code",
- "warn": "/components/long_warn/long_warn"
+ "warn": "/components/long_warn/long_warn",
+ "my_confirm": "/components/my_confirm/my_confirm",
+ "nav_b": "/components/nav_b/nav_b"
}
}
\ No newline at end of file
diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index 16eb8c4..242b9a8 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -45,7 +45,7 @@
-
+
立即使用
@@ -79,7 +79,9 @@
-
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index b79f30b..8e0a1dc 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -85,13 +85,8 @@ Page({
wx.hideLoading();
if (res.data.code == 0) {
var data = res.data.data.pageData;
- var arrangeTime = data[0].ArrangeTime.substring(0, 11);
- var day = data[0].ArrangeTime.substring(12, 13);
- if (day < 12) {
- day = "上午"
- } else {
- day = "下午"
- }
+ var arrangeTime = data[0].ArrangeTime.substring(0, 11);
+ var day = data[0].ArrangeTime.substring(11, 16);
th.setData({
tment_details: data,
arrangeTime: arrangeTime,
diff --git a/pages/user/my_service/tment_details.json b/pages/user/my_service/tment_details.json
index 48013e7..2f3f3a8 100644
--- a/pages/user/my_service/tment_details.json
+++ b/pages/user/my_service/tment_details.json
@@ -2,6 +2,7 @@
"navigationBarTitleText": "预约详情",
"usingComponents": {
"qr_code": "/components/qr_code/qr_code",
- "warn": "/components/long_warn/long_warn"
+ "warn": "/components/long_warn/long_warn",
+ "nav_b": "/components/nav_b/nav_b"
}
}
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
index 0374bd3..4bccd78 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -20,7 +20,7 @@
-
+
预约门店:
@@ -114,6 +114,8 @@
+
+
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss
index 66f292e..88265ae 100644
--- a/pages/user/my_service/tment_details.wxss
+++ b/pages/user/my_service/tment_details.wxss
@@ -35,6 +35,7 @@ page {
.container {
padding: 0rpx 20rpx;
+ padding-bottom:85rpx;
}
.Subscriber {
@@ -79,6 +80,9 @@ page {
.subs {
padding: 0rpx 5rpx;
margin-bottom: 20rpx;
+ position: fixed;
+ width: 705rpx;
+ bottom:20rpx;
}
.sub {
diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js
index bf8927e..409e1b4 100644
--- a/pages/user/my_service/tment_eval.js
+++ b/pages/user/my_service/tment_eval.js
@@ -11,6 +11,7 @@ Page({
data: {
url: a.url, //接口网址
iurl: a.imghost,
+ defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
stars_index: -1, //当前点击的星星下标
labels: [], //星级标签数组
sub_evaluate: 0, //是否评价成功
@@ -19,7 +20,7 @@ Page({
number: "", //订单单号
beautician: "", //美容师信息
fromType: "服务评价", //评价来源
- arrangeTime:"",//服务日期
+ arrangeTime: "", //服务日期
},
//点击星级
check_stars: function(e) {
@@ -127,12 +128,12 @@ Page({
var proposal = th.data.proposal; //用户建议内容
var fromType = th.data.fromType; //评价来源
var json = {
- "storeId": a.stoid,
"evaLabList": evaLabList,
- "fromType": "预约评价",
- "posNo": posNo,
+ "fromType": 2,
+ "number": posNo,
"remark": proposal,
- "star": stars + 1
+ "star": stars + 1,
+ "storeId": a.stoid
};
var data = JSON.stringify(json); //转换成json格式
wx.request({
@@ -147,7 +148,7 @@ Page({
th.setData({
sub_evaluate: 1
})
- setTimeout(function () {
+ setTimeout(function() {
wx.redirectTo({
url: "/pages/user/my_service/tment_order_list"
});
@@ -159,6 +160,16 @@ Page({
})
},
+ //图片失败，默认图片
+ bind_bnerr1: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _Img = e.target.dataset.img;
+ if (_Img != undefined) {
+ var _errObj = {};
+ _errObj[_errImg] = "/miniapp/images/no_cate_def.png";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ }
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
index fcc1d86..7497199 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -2,7 +2,7 @@
-
+
diff --git a/pages/user/my_service/tment_eval.wxss b/pages/user/my_service/tment_eval.wxss
index d035ec3..7270b83 100644
--- a/pages/user/my_service/tment_eval.wxss
+++ b/pages/user/my_service/tment_eval.wxss
@@ -62,7 +62,6 @@ textarea {
}
.labels {
- margin-bottom: 25rpx;
display: inline-block;
max-height: 240rxp;
line-height: 50rpx;
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index cc985a8..4ffd083 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -39,8 +39,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
- var th = this;
- th.query_orderList();
+
},
changeTab: function(e) {
var th = this;
@@ -81,9 +80,6 @@ Page({
} else {
--state_index;
}
- wx.showLoading({
- title: '加载中',
- })
th.setData({
is_read: 0
})
@@ -156,7 +152,7 @@ Page({
[start]: 3
})
}
-
+ wx.stopPullDownRefresh(); //停止下拉刷新
} else {
getApp().my_warnning(res.data.msg, 0, th);
}
@@ -179,6 +175,13 @@ Page({
*/
onShow: function() {
var th = this;
+ th.setData({
+ curpage:1,
+ total:0,
+ ismore:0,
+ is_read:0,
+ tm_order_list:[]
+ })
th.query_orderList();
},
diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml
index 1980245..65e56d1 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -33,11 +33,11 @@
预约门店:
- {{item.ServiceName}}
+ {{item.StorageName}}
预约项目:
- {{item.StorageName}}
+ {{item.ServiceName}}
美容师: