diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 191d706..e0fb47c 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -361,7 +361,7 @@ Page({
}
})
- if(frozenQuan){
+ if (frozenQuan && arr[ind].quan_list){
arr[ind].quan_list=th.check_is_frozenQuan(arr[ind].quan_list,frozenQuan);
}
@@ -446,7 +446,7 @@ Page({
}
})
- if(frozenQuan){
+ if (frozenQuan && quanlist){
quanlist=th.check_is_frozenQuan(quanlist,frozenQuan);
}
@@ -493,7 +493,7 @@ Page({
}
})
- if(frozenQuan){
+ if (frozenQuan && quanlist){
quanlist=th.check_is_frozenQuan(quanlist,frozenQuan);
}
}
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 95529d2..84fae37 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -305,7 +305,6 @@ Page({
if (!user) return false;
clearInterval(ti);
-
if(user.card_field ){
var str = user['card_expiredate'].replace(/-/g, '/');
var end = new Date(str);
@@ -1573,7 +1572,7 @@ Page({
}
var goods_list = this.selectComponent("#goods_list"); //组件的id
- goods_list.get_list();
+ if (goods_list) goods_list.get_list();
},
//--------检查是否活动，活动是否开始，或者是否结束-------
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 86f83c8..b26cc8c 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -566,25 +566,8 @@
推荐
-
-
-
-
-
-
-
-
-
- ￥
- {{item.shop_price}}
-
- 原价￥{{item.market_price}}
-
- {{item.goods_name}}
-
-
-
-
+
+
diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 14dd47e..5bc4d53 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -47,23 +47,6 @@ Page({
},
//控制备注输入
check_text: function() {
- wx.requestSubscribeMessage({
- tmplIds: ['Jg7Tj-wPlDfsairz_EHBQdoQnzLLF4nVhT1weCBEmTE'],
- success(res) {
- console.log("222222222222222222222222222222");
- },
-
- fail(res) {
-
- console.log('fail 失败')
-
- console.log(res)
-
- logger.warn('订阅消息fail', res)
-
- }
- })
-
var th = this;
var is_textea = th.data.is_textea;
th.setData({
@@ -77,11 +60,13 @@ Page({
if (store) {
th.setData({
store: 0,
+ is_textea: 1
})
} else {
th.setData({
beautician: 0,
store: 1,
+ is_textea: 0
})
if (th.data.store_list.length < 1) {
wx.showLoading({
@@ -101,148 +86,220 @@ Page({
//提交成功及发送模版代码
success: function() {
var th = this;
- th.setData({
- is_textea: 0
+ var store = th.data.store_name; //门店名称
+ var bea_name = th.data.beautician_name; //美容师名称
+ var time = th.data.time; //预约时间
+ var is_sub = th.data.is_sub; //是否重复提交
+ var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径
+ var serviceId = th.data.itemId; //服务id
+ var beauticianID = th.data.beauticianID; //美容师id
+ var buyType = th.data.buyType; //服务项目类型
+ var storeId = a.stoid; //商家id
+ var storageId = th.data.storageId; //门店id
+ var userId = d.user_id; //用户id
+ var remarks = th.data.remarks; //用户备注
+ var project_id = th.data.project_id; //项目id
+ var validay = th.data.validay;
+ var json = {
+ "arrangeTime": time + ":00",
+ "beauticianId": beauticianID,
+ "buyType": buyType,
+ "effectiveDay": "",
+ "number": "",
+ "projectId": project_id,
+ "remark": remarks,
+ "serviceId": serviceId,
+ "states": 0,
+ "storageId": storageId,
+ "storeId": storeId,
+ "userId": userId,
+ "validay": validay
+ }
+ var data = JSON.stringify(json);
+ wx.request({
+ url: url,
+ data: json,
+ method: 'post',
+ header: {
+ 'content-type': 'application/json'
+ }, // 设置请求的 header
+ success: function(res) {
+ th.setData({
+ is_sub: 0
+ })
+ wx.hideLoading();
+ if (res.data.code == 0) {
+ getApp().my_warnning("预约成功", 1, th);
+ var store_name = th.data.store_name; //预约门店
+ var number = res.data.data.Number;
+ var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口
+ var userinfo = getApp().globalData.userInfo;
+ var name = d.userInfo.nickname;
+ var json = {
+ // "formId": formid,
+ "keyWord": [{
+ "keyword": res.data.data.ServiceName
+ },
+ {
+ "keyword": time.substring(0, 16)
+ }, {
+ "keyword": res.data.data.BeauticianName
+ }, {
+ "keyword": res.data.data.StorageName
+ }, {
+ "keyword": res.data.data.Address
+ }
+ ],
+ "page": "/pages/user/my_service/tment_details?number=" + number,
+ "storeId": a.stoid,
+ "typeId": "1011",
+ "userId": d.user_id
+ };
+ var data = JSON.stringify(json);
+ //调用发送预约成功模版接口
+ wx.request({
+ url: th.data.inurl + temp_url,
+ data: data,
+ method: 'post',
+ header: {
+ 'content-type': 'application/json'
+ }, // 设置请求的 header
+ success: function(data) {}
+ })
+ setTimeout(function() {
+ wx.redirectTo({
+ url: "/pages/user/my_service/tment_details?number=" + number
+ });
+ }, 1000);
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ th.settime();
+ }
+ }
})
+
+ },
+ //定时显示texteat
+ settime: function() {
+ var th = this;
+ setTimeout(function() {
+ th.setData({
+ is_textea: 1
+ })
+ }, 2000);
+ },
+ //提交预约
+ sub_success: function(e) {
+ var th = this;
+ var temp_url = th.data.inurl + "/api/wx/weappSendlist/page";
+ var template_id = "";
+ if (th.data.is_sub == 1) {
+ return false;
+ }
var store = th.data.store_name; //门店名称
var bea_name = th.data.beautician_name; //美容师名称
var time = th.data.time; //预约时间
var is_sub = th.data.is_sub; //是否重复提交
+ th.setData({
+ is_textea: 0,
+ is_sub: 1
+ })
//提交预约前的判断
if (store == "") {
getApp().my_warnning("请选择服务门店", 0, th);
+ th.setData({
+ is_sub: 0
+ })
+ th.settime();
return false;
} else if (bea_name == "") {
getApp().my_warnning("请选择美容师", 0, th);
+ th.setData({
+ is_sub: 0
+ })
+ th.settime();
return false;
- } else if (time == "") {
+ } else if (time == undefined || time == '') {
getApp().my_warnning("请选择预约时间", 0, th);
+ th.setData({
+ is_sub: 0
+ })
+ th.settime();
return false;
} else {
- if (is_sub == 0) {
- th.setData({
- is_sub: 1
- })
- var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径
- var serviceId = th.data.itemId; //服务id
- var beauticianID = th.data.beauticianID; //美容师id
- var buyType = th.data.buyType; //服务项目类型
- var storeId = a.stoid; //商家id
- var storageId = th.data.storageId; //门店id
- var userId = d.user_id; //用户id
- var remarks = th.data.remarks; //用户备注
- var project_id = th.data.project_id; //项目id
- var validay = th.data.validay;
- var json = {
- "arrangeTime": time,
- "beauticianId": beauticianID,
- "buyType": buyType,
- "effectiveDay": "",
- "number": "",
- "projectId": project_id,
- "remark": remarks,
- "serviceId": serviceId,
- "states": 0,
- "storageId": storageId,
- "storeId": storeId,
- "userId": userId,
- "validay": validay
+ var version ="";
+ //判断微信版本是否达到预约成功订阅的要求
+ wx.getSystemInfo({
+ success(res) {
+ version = res.version;
}
- var data = JSON.stringify(json);
- wx.request({
- url: url,
- data: json,
- method: 'post',
- header: {
- 'content-type': 'application/json'
- }, // 设置请求的 header
- success: function(res) {
- th.setData({
- is_sub: 0
+ })
+ wx.showLoading({
+ title: '加载中',
+ })
+ if (th.ver(version, '7.0.4') >= 0) {
+ //获取模版id
+ getApp().request.promiseGet(temp_url, {
+ data: {
+ store_id: a.stoid,
+ typeid: "1011"
+ }
+ }).then(res => {
+ if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+ template_id = res.data.data.pageData[0].template_id;
+ // //授权订阅
+ wx.requestSubscribeMessage({
+ tmplIds: [template_id],
+ success(res) {
+ th.success();
+ },
+ fail(res) {
+ th.success();
+ }
})
- if (res.data.code == 0) {
- getApp().my_warnning("预约成功", 1, th);
- var store_name = th.data.store_name; //预约门店
- var number = res.data.data.Number;
- var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口
- var userinfo = getApp().globalData.userInfo;
- var name = d.userInfo.nickname;
- var json = {
- // "formId": formid,
- "keyWord": [{
- "keyword": res.data.data.ServiceName
- },
- {
- "keyword": time
- }, {
- "keyword": res.data.data.BeauticianName
- }, {
- "keyword": res.data.data.StorageName
- }, {
- "keyword": res.data.data.Address
- }
- ],
- "page": "/pages/user/my_service/tment_details?number=" + number,
- "storeId": a.stoid,
- "typeId": "1011",
- "userId": d.user_id
- };
- var data = JSON.stringify(json);
- //调用发送预约成功模版接口
- wx.request({
- url: th.data.inurl + temp_url,
- data: data,
- method: 'post',
- header: {
- 'content-type': 'application/json'
- }, // 设置请求的 header
- success: function(data) {}
- })
- setTimeout(function() {
- wx.redirectTo({
- url: "/pages/user/my_service/tment_details?number=" + number
- });
- }, 1000);
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
- th.setData({
- is_sub: 0
- })
- }
+ } else {
+ th.success();
}
})
+ } else {
+ // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
+ wx.showModal({
+ title: '提示',
+ content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+ })
+ th.setData({
+ is_sub: 0
+ })
}
+
}
},
- //提交预约
- sub_success: function(e) {
- var th = this;
- var temp_url = "/api/wx/weappSendlist/page";
- var template_id = "";
- //获取模版id
- getApp().request.promiseGet(temp_url, {
- data: {
- store_id: a.stoid,
- typeid: "1011"
+ //版本判断
+ ver:function(v1,v2){
+ v1 = v1.split('.')
+ v2 = v2.split('.')
+ var num1 = "" ;
+ var num2 = "";
+ var len = Math.max(v1.length, v2.length)
+
+ while (v1.length < len) {
+ v1.push('0')
}
- }).then(res => {
- if (res.data.code == 0) {
- template_id = res.data.data.pageData[0].template_id;
- // //授权订阅
- wx.requestSubscribeMessage({
- tmplIds: [template_id],
- success(res) {
- th.success();
- },
- fail(res) {
- th.success();
- }
- })
- }else{
- th.success();
+ while (v2.length < len) {
+ v2.push('0')
}
- })
+ for (let i = 0; i < len; i++) {
+ num1 = parseInt(v1[i])
+ num2 = parseInt(v2[i])
+
+ if (num1 > num2) {
+ return 1
+ } else if (num1 < num2) {
+ return -1
+ }
+ }
+ return 0
},
goto: function(e) {
var th = this;
@@ -252,9 +309,14 @@ Page({
})
if (th.data.store_name == "") {
getApp().my_warnning("请选择服务门店", 0, th);
+ th.settime();
} else if (th.data.beautician_name == "") {
getApp().my_warnning("请选择美容师", 0, th);
+ th.settime();
} else {
+ th.setData({
+ is_textea: 1
+ })
var url = e.currentTarget.dataset.url;
getApp().goto(url);
}
@@ -285,7 +347,8 @@ Page({
th.setData({
store: 0,
store_name: store_name,
- storageId: Id
+ storageId: Id,
+ is_textea: 1
})
},
onReachBottom: function() {
@@ -340,6 +403,7 @@ Page({
}
} else {
getApp().my_warnning(res.data.msg, 0, th);
+ th.settime();
}
})
},
@@ -351,6 +415,7 @@ Page({
})
if (th.data.store_name == "") {
getApp().my_warnning("请选择服务门店", 0, th);
+ th.settime();
} else {
wx.showLoading({
title: '加载中',
@@ -373,6 +438,7 @@ Page({
})
if (res.data.data.pageData.length < 1) {
getApp().my_warnning("暂无美容师", 0, th);
+ th.settime();
} else {
if (th.data.beautician == 0) {
th.setData({
@@ -385,7 +451,8 @@ Page({
}
}
} else {
- getApp().my_warnning("暂无美容师", 0, th);
+ getApp().my_warnning(res.data.msg, 0, th);
+ th.settime();
}
})
}
@@ -402,7 +469,7 @@ Page({
beauticianID: BeauticianID,
time: "",
tment_count: "",
- is_textea: 0
+ is_textea: 1
})
},
@@ -431,7 +498,6 @@ Page({
nav_bea: function() {
var th = this;
th.setData({
- is_textea: 0,
beautician: 0
})
var storageId = th.data.storageId; //线下门店id
@@ -439,10 +505,15 @@ Page({
var project_id = th.data.project_id;
if (storageId == "") {
getApp().my_warnning("请选择服务门店", 0, th);
+ th.settime();
} else {
+ th.setData({
+ is_textea: 1
+ })
wx.navigateTo({
url: "/pages/user/my_service/cosmetology_list?" + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id
});
+
}
},
/**
@@ -473,6 +544,7 @@ Page({
});
if (th.data.is_gps == 0) {
getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ th.settime();
}
} else {
th.setData({
@@ -509,6 +581,7 @@ Page({
})
} else {
getApp().my_warnning(res.data.msg, 0, th);
+ th.settime();
}
})
@@ -522,6 +595,10 @@ Page({
if (seekTime != "") {
th.query_more();
}
+ th.setData({
+ time: th.data.time.substring(0, 16),
+ is_textea: 1
+ })
th.query_project();
},
//获取单个服务项目信息
@@ -542,6 +619,7 @@ Page({
})
} else {
getApp().my_warnning(res.data.msg, 0, th);
+ th.settime();
}
})
},
diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml
index 9621fce..8c16bd2 100644
--- a/pages/user/my_service/appment_main.wxml
+++ b/pages/user/my_service/appment_main.wxml
@@ -36,7 +36,7 @@
- {{item.StaffName}}
+ {{item.StaffName}}
@@ -69,12 +69,12 @@
注
-
+
- {{remarks==''?'填写备注':remarks}}
+
diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss
index e2ca36d..ba5d2c1 100644
--- a/pages/user/my_service/appment_main.wxss
+++ b/pages/user/my_service/appment_main.wxss
@@ -14,7 +14,9 @@
font-size: 26rpx;
color: rgb(142, 142, 142);
}
-
+.StaffName{
+ max-width: 350rpx;
+}
.angler {
transform: rotate(227deg);
margin-bottom: 0rpx;
diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index 6903b70..b9d08e7 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -47,8 +47,7 @@ Page({
itemId: options.itemId,
modify: options.modify,
hours: hours,
- projectId: options.projectId,
- StaffName: options.StaffName
+ projectId: options.projectId
})
if (options.url != undefined) {
th.setData({
@@ -65,6 +64,11 @@ Page({
iscos: options.iscos
})
}
+ if (options.StaffName!=undefined){
+ th.setData({
+ StaffName: options.StaffName
+ })
+ }
th.query_beatea();
th.query_aweek();
},
@@ -78,8 +82,6 @@ Page({
// var date = myDate.getHours(); //获取当前小时数(0-23);
let str = myDate.toTimeString(); //"10:55:24 GMT+0800 (中国标准时间)"
let date = str.substring(0, 8); // '10:55:24'
-
- // console.log("当前时间", date);
th.setData({
hours: date
});
diff --git a/pages/user/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js
index c826005..6147a7e 100644
--- a/pages/user/my_service/cosmetology_list.js
+++ b/pages/user/my_service/cosmetology_list.js
@@ -74,6 +74,7 @@ Page({
if (_Img != undefined) {
var _errObj = {};
_errObj[_errImg] = "/miniapp/images/no-head.jpg";
+ console.log(_errObj,"zzzzzzz");
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
}
},
diff --git a/pages/user/my_service/cosmetology_list.wxml b/pages/user/my_service/cosmetology_list.wxml
index 5f35a18..02f99a7 100644
--- a/pages/user/my_service/cosmetology_list.wxml
+++ b/pages/user/my_service/cosmetology_list.wxml
@@ -2,33 +2,26 @@
-
+
-
+
-
+
{{item.StaffName}}
-
+
-
-
- {{item}}
+
+
+ {{it.LabelName}}
-
- {{item}}
-
-
- {{item}}
-
-
@@ -50,7 +43,7 @@
-
+
到底了
diff --git a/pages/user/my_service/cosmetology_list.wxss b/pages/user/my_service/cosmetology_list.wxss
index f036161..4a8fb7b 100644
--- a/pages/user/my_service/cosmetology_list.wxss
+++ b/pages/user/my_service/cosmetology_list.wxss
@@ -32,7 +32,10 @@ page{
height: 25rpx;
margin-right: 7rpx;
}
-
+.Labels{
+ width: 100%;
+ margin-top: 15rpx;
+}
.Label {
margin-top: 25rpx;
}
@@ -42,7 +45,8 @@ page{
height: 30rpx;
border-radius: 20rpx;
line-height: 30rpx;
- margin-right: 14rpx;
+ margin-right: 10rpx;
+ padding:0rpx 9rpx;
}
.itone {
diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml
index 5d290d0..2e8cb8e 100644
--- a/pages/user/my_service/hist_service.wxml
+++ b/pages/user/my_service/hist_service.wxml
@@ -39,6 +39,7 @@
+ 未服务
已服务
已过期
已取消
diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index 6796f87..54d868b 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -86,7 +86,9 @@ Page({
}),
wx.stopPullDownRefresh(); //停止下拉刷新
} else {
- getApp().my_warnning(res.data.msg, 0, th);
+ th.setData({
+ is_service_read: 1
+ })
}
})
},
diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js
index c4da462..46c8c97 100644
--- a/pages/user/my_service/tment_eval.js
+++ b/pages/user/my_service/tment_eval.js
@@ -1,4 +1,4 @@
-var e = getApp(),
+ var e = getApp(),
a = e.globalData.setting,
os = a,
t = e.request,
@@ -21,37 +21,37 @@ Page({
beautician: "", //美容师信息
fromType: "服务评价", //评价来源
arrangeTime: "", //服务日期
- is_evaluate:0,//是否评价
- EvaluateDatetime:"",//评价时间
+ is_evaluate: 0, //是否评价
+ EvaluateDatetime: "", //评价时间
},
//点击星级
check_stars: function(e) {
var th = this;
- var is_evaluate = th.data.is_evaluate;//0可点击
- if (is_evaluate==0){
- var index = e.currentTarget.dataset.index;
- var stars_index = th.data.stars_index;
- if (index != stars_index) {
- var url = "/api/weshop/marketing/reservation/star/label/list";
- getApp().request.promiseGet(url, {
- data: {
- Star: index+1,
- storeId: a.stoid
- }
- }).then(res => {
- if (res.data.code == 0) {
- th.setData({
- labels: res.data.data
- })
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
- return;
- }
- })
- th.setData({
- stars_index: index
- })
- }
+ var is_evaluate = th.data.is_evaluate; //0可点击
+ if (is_evaluate == 0) {
+ var index = e.currentTarget.dataset.index;
+ var stars_index = th.data.stars_index;
+ if (index != stars_index) {
+ var url = "/api/weshop/marketing/reservation/star/label/list";
+ getApp().request.promiseGet(url, {
+ data: {
+ Star: index + 1,
+ storeId: a.stoid
+ }
+ }).then(res => {
+ if (res.data.code == 0) {
+ th.setData({
+ labels: res.data.data
+ })
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ return;
+ }
+ })
+ th.setData({
+ stars_index: index
+ })
+ }
}
},
//输入评价意见和建议
@@ -63,31 +63,32 @@ Page({
})
},
//图片失败，默认图片
- bind_bnerr1: function(e) {
+ bind_bnerr1: function (e) {
+ var th = this;
var _errImg = e.target.dataset.errorimg;
var _Img = e.target.dataset.img;
if (_Img != undefined) {
var _errObj = {};
_errObj[_errImg] = "/miniapp/images/no-head.jpg";
- this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
}
},
//选择标签
check_label: function(e) {
var th = this;
- var evaluate = th.data.is_evaluate;//0为未评价，未评价才可点击标签
- if (evaluate==0){
- var index = e.currentTarget.dataset.index;
- var label_id = th.data.labels[index].check;
- var labels = 'labels[' + index + '].check';
- if (label_id) {
- label_id = 0
- } else {
- label_id = 1
- }
- th.setData({
- [labels]: label_id
- })
+ var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签
+ if (evaluate == 0) {
+ var index = e.currentTarget.dataset.index;
+ var label_id = th.data.labels[index].check;
+ var labels = 'labels[' + index + '].check';
+ if (label_id) {
+ label_id = 0
+ } else {
+ label_id = 1
+ }
+ th.setData({
+ [labels]: label_id
+ })
}
},
//查询美容师信息
@@ -106,7 +107,7 @@ Page({
var data = res.data.data.pageData;
var arrangeTime = data[0].ArrangeTime;
th.setData({
- beautician: data[0],
+ beautician: data,
arrangeTime: arrangeTime
})
} else {
@@ -118,22 +119,22 @@ Page({
evaluate_get: function() {
var th = this;
var url = "/api/weshop/evaluation/evaluate/get";
- getApp().request.promiseGet(url,{
+ getApp().request.promiseGet(url, {
data: {
number: th.data.number,
storeId: a.stoid
}
}).then(res => {
- if(res.data.code == 0){
- th.setData({
- stars_index: res.data.data.Star,
- labels: res.data.data.EvaluationList,
- proposal: res.data.data.Remark,
- EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0,19)
- })
- }else{
- getApp().my_warnning(res.data.msg,0,th);
- }
+ if (res.data.code == 0) {
+ th.setData({
+ stars_index: res.data.data.Star-1,
+ labels: res.data.data.EvaluationList,
+ proposal: res.data.data.Remark,
+ EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19)
+ })
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ }
})
},
//提交评价
@@ -145,10 +146,13 @@ Page({
if (stars < 0) {
getApp().my_warnning("请进行评分", 0, th);
return false;
- } else if (proposal==""){
+ } else if (proposal == "") {
getApp().my_warnning("给点建议呗", 0, th);
return false;
}
+ wx.showLoading({
+ title: '加载中',
+ })
var labels = th.data.labels; //星级标签数组
var evaLabList = []; //用户选择的评价标签
// 查询评价标签
@@ -178,15 +182,14 @@ Page({
'content-type': 'application/json'
}, // 设置请求的 header
success: function(res) {
+ wx.hideLoading();
if (res.data.code == 0) {
- th.setData({
- sub_evaluate: 1
- })
+ getApp().my_warnning("评价成功", 1, th);
setTimeout(function() {
wx.redirectTo({
url: "/pages/user/my_service/tment_order_list"
});
- }, 1500);
+ }, 2000);
} else {
getApp().my_warnning(res.data.msg, 0, th);
}
@@ -196,12 +199,14 @@ Page({
},
//图片失败，默认图片
bind_bnerr1: function(e) {
+ var th = this;
var _errImg = e.target.dataset.errorimg;
var _Img = e.target.dataset.img;
if (_Img != undefined) {
+
var _errObj = {};
- _errObj[_errImg] = "/miniapp/images/no-head.jpg";
- this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg";
+ th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
}
},
/**
@@ -222,8 +227,8 @@ Page({
onShow: function() {
var th = this;
var is_evaluate = th.data.is_evaluate;
- if (is_evaluate==1){
+ if (is_evaluate == 1) {
th.evaluate_get();
- }
+ }
},
})
\ No newline at end of file
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
index 502fc30..20dd053 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -1,28 +1,29 @@
-
+
-
+
+
-
+
服务美容师：
- {{beautician.BeauticianName}}
+ {{it.BeauticianName}}
服务项目：
- {{beautician.StorageName}}
+ {{it.ServiceName}}
服务时间：
- {{arrangeTime}}
+ {{it.WriteTime}}
@@ -35,7 +36,7 @@
@@ -61,7 +62,7 @@
-
+
{{item.LabelName}}
@@ -85,8 +86,8 @@
-
-
+
+
确认提交
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index f246ffc..6e0134e 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -101,6 +101,9 @@ Page({
var arr1 = th.data.tm_order_list;
var arr2 = res.data.data.pageData;
var arr3 = [...arr1, ...arr2];
+ for(var i = 0;i更改时间
发表评价
重新预约
- 查看评价
+ 评价详情
diff --git a/pages/user/my_service/tment_order_list.wxss b/pages/user/my_service/tment_order_list.wxss
index 43094a5..2219dee 100644
--- a/pages/user/my_service/tment_order_list.wxss
+++ b/pages/user/my_service/tment_order_list.wxss
@@ -69,6 +69,8 @@ page {
width: 190rpx;
height: 190rpx;
margin-right: 20rpx;
+ border-radius: 50%;
+ border: 1px solid #eee;
}
.details {