diff --git a/manifest.json b/manifest.json
index 031e988..3aa15a0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -123,6 +123,10 @@
"spotlight@3x" : "static/logo.png"
}
}
+ },
+ "splashscreen" : {
+ "androidStyle" : "default",
+ "iosStyle" : "storyboard"
}
}
},
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 8f77ff7..4f954b3 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -119,7 +119,7 @@
-
-
- 备注
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ 取消
+
+
+
@@ -250,6 +267,14 @@
export default {
data() {
return {
+ fuwuBtn: [
+ {'title':'请速回电确认服务时间地点'},
+ {'title':'到达后请先电话联系，切勿大声敲门'},
+ {'title':'时间紧张，请尽快到达服务位置'},
+ {'title':'直接来即可'},
+ ],
+ selected:[],
+ popupKj:false,
number:1,
startTime: '',
msTimeList: [],
@@ -357,6 +382,7 @@
this.youhuiF(this.couponId)
}
if(this.jishiName){
+ console.log('this.jishiName===',this.jishiName)
this.getMsTime(Time);
this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.jishiName.technicianTypeRate/100)))
}else{
@@ -406,6 +432,27 @@
// #endif
},
methods: {
+ quxiaoKj(){//快捷输入 取消
+ this.textareaData='';
+ this.selected=[];
+ this.popupKj=false;
+ },
+ kuaijie(){//快捷输入
+ this.popupKj=true;
+ },
+ gukeBtn(item) {
+ var index = this.selected.indexOf(item);
+ if (index === -1) {
+ this.selected.push(item);
+ } else {
+ this.selected.splice(index, 1);
+ }
+ var data = [];
+ for (var i = 0; i < this.selected.length; i++) {
+ data.push(this.selected[i].title)
+ }
+ this.textareaData = data.join(",")
+ },
goOrder() {//生成orderId
let that = this
let data = {
@@ -724,13 +771,18 @@
});
},
liliaoshi(){
+ let massageTypeId = this.orderXm.massageTypeId?this.orderXm.massageTypeId:this.orderXm.ordersMassageList[0].massageType.massageTypeId;
+ let longitude = this.longitude;
+ let latitude = this.latitude;
+ let classifyId= this.orderXm.classifyId?this.orderXm.classifyId:this.orderXm.ordersMassageList[0].massageType.classifyId;
+ let city=this.orderXm.city?this.orderXm.city:this.orderXm.ordersMassageList[0].massageType.city;
uni.setStorage({
key: 'taocanDd',
data: '修改',
success: function () {
- uni.navigateTo({
- url: '/pages/therapist/therapistDingdan'
- })
+ uni.navigateTo({
+ url: '/pages/therapist/therapistDingdan?massageTypeId='+massageTypeId+'&latitude='+latitude+'&longitude='+longitude+'&classifyId='+classifyId+'&city='+city
+ })
}
});
},
@@ -1369,6 +1421,63 @@