订单添加标签备注 地图找人
This commit is contained in:
parent
a1b700b025
commit
e29de593da
|
|
@ -219,7 +219,6 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
selectedString:'',
|
||||
startTime: '',
|
||||
msTimeList: [],
|
||||
msTimeDate: 0,
|
||||
|
|
@ -271,7 +270,6 @@
|
|||
birthDate: '',
|
||||
age: '',
|
||||
showpay: false,
|
||||
popupKj:false,
|
||||
openLists: [],
|
||||
openWay: 1,
|
||||
closeable: true,
|
||||
|
|
@ -302,7 +300,9 @@
|
|||
number:1,
|
||||
qyMinNum:'',
|
||||
technicianRate:'',
|
||||
popupKj:false,
|
||||
selected:[],
|
||||
selectedString:'',
|
||||
fuwuBtn: [
|
||||
{'title':'请速回电确认服务时间地点'},
|
||||
{'title':'到达后请先电话联系，切勿大声敲门'},
|
||||
|
|
@ -1371,21 +1371,11 @@
|
|||
// color: #049F89;
|
||||
}
|
||||
.huiBtn {
|
||||
// background: #f6f6f6;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.lanBtn {
|
||||
// background-color: #049F89;
|
||||
color: #049F89;
|
||||
}
|
||||
.guke{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
margin-top: 20px;
|
||||
flex-direction: column;
|
||||
background-color: #fff;
|
||||
}
|
||||
.guke-btn {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
|
|
|
|||
|
|
@ -107,11 +107,12 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="margin-top-xl pay-ding">
|
||||
<view class="d-title">备注</view>
|
||||
<view class="header-view header-padd header-margin">
|
||||
<view class="d-title">
|
||||
<span>给技师捎句话</span>
|
||||
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
|
||||
</view>
|
||||
<view class="list-pay">
|
||||
<view class="textarea-pay-list">
|
||||
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
|
||||
|
|
@ -119,30 +120,7 @@
|
|||
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="margin-top-xl pay-ding">
|
||||
<view class="d-title" style="margin-bottom: 5px;">服务保障</view>
|
||||
<view class="list-pay">
|
||||
<view class="list-pay-text">
|
||||
<span>*每单保险</span>
|
||||
<span>赠送意外险，每单保障您的人身及财产安全</span>
|
||||
</view>
|
||||
<view class="list-pay-text">
|
||||
<span>*迟到补偿</span>
|
||||
<span>调理师迟到，按迟到时长规则补偿一定金额给客户</span>
|
||||
</view>
|
||||
<view class="list-pay-text">
|
||||
<span>*不满意退全款</span>
|
||||
<span>服务不满意，可在订单结束48小时内向平台提出异议</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="checkbox-data">
|
||||
<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<view class="pay_btn" style="margin-top: 10px;" @click="openpay()">去支付</view>
|
||||
|
||||
</view>
|
||||
|
|
@ -209,6 +187,20 @@
|
|||
</scroll-view>
|
||||
</view>
|
||||
</u-popup>
|
||||
<!-- 快捷输入 -->
|
||||
<u-popup v-model="popupKj" mode="bottom">
|
||||
<view>
|
||||
<scroll-view scroll-y="true" style="background: #f7f7f7;">
|
||||
<view class="guke-list">
|
||||
<view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item) }"
|
||||
@click="gukeBtn(item)" v-for="(item,index) in fuwuBtn" :key="index">
|
||||
{{item.title}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="kuaijie-btn" @click="quxiaoKj">取消</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</u-popup>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
|
@ -296,6 +288,15 @@
|
|||
couponDataList:'',
|
||||
orderXm:[],
|
||||
number:1,
|
||||
popupKj:false,
|
||||
selected:[],
|
||||
selectedString:'',
|
||||
fuwuBtn: [
|
||||
{'title':'请速回电确认服务时间地点'},
|
||||
{'title':'到达后请先电话联系，切勿大声敲门'},
|
||||
{'title':'时间紧张，请尽快到达服务位置'},
|
||||
{'title':'直接来即可'},
|
||||
],
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
|
|
@ -368,6 +369,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 = {
|
||||
|
|
@ -1324,6 +1346,59 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.header-margin{
|
||||
// margin: 26rpx;
|
||||
}
|
||||
.header-padd{
|
||||
padding: 36rpx;
|
||||
}
|
||||
.header-view-text{
|
||||
width: 170rpx;
|
||||
font-size: 29rpx;
|
||||
color: #222222;
|
||||
}
|
||||
.header-view{
|
||||
background-color: #fff;
|
||||
border-radius: 11px;
|
||||
}
|
||||
.kuaijie-btn{
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
margin-top: 10px;
|
||||
background: #fff;
|
||||
// color: #049F89;
|
||||
}
|
||||
.huiBtn {
|
||||
color: #333333;
|
||||
}
|
||||
.lanBtn {
|
||||
color: #049F89;
|
||||
}
|
||||
.guke-btn {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
margin-left: 5px;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
border-radius: 6px;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
.guke-list {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
box-sizing: border-box;
|
||||
background-color: #fff;
|
||||
}
|
||||
.head-bottom{
|
||||
width: 68%;
|
||||
display: flex;
|
||||
|
|
@ -1665,6 +1740,9 @@
|
|||
padding: 29rpx;
|
||||
}
|
||||
.d-title{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
|
|
@ -1687,7 +1765,7 @@
|
|||
}
|
||||
.list-pay{
|
||||
width: 100%;
|
||||
padding: 0px 29rpx;
|
||||
// padding: 0px 29rpx;
|
||||
}
|
||||
.pay-ding-top{
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -95,7 +95,10 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="header-view header-padd header-margin">
|
||||
<view class="d-title title-font">备注</view>
|
||||
<view class="d-title title-font">
|
||||
<span>给技师捎句话</span>
|
||||
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
|
||||
</view>
|
||||
<view class="list-pay">
|
||||
<view class="textarea-pay-list">
|
||||
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
|
||||
|
|
@ -170,6 +173,20 @@
|
|||
</scroll-view>
|
||||
</view>
|
||||
</u-popup>
|
||||
<!-- 快捷输入 -->
|
||||
<u-popup v-model="popupKj" mode="bottom">
|
||||
<view>
|
||||
<scroll-view scroll-y="true" style="background: #f7f7f7;">
|
||||
<view class="guke-list">
|
||||
<view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item) }"
|
||||
@click="gukeBtn(item)" v-for="(item,index) in fuwuBtn" :key="index">
|
||||
{{item.title}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="kuaijie-btn" @click="quxiaoKj">取消</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</u-popup>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
|
@ -258,6 +275,15 @@
|
|||
orderXm:[],
|
||||
detailData:[],
|
||||
number:1,
|
||||
popupKj:false,
|
||||
selected:[],
|
||||
selectedString:'',
|
||||
fuwuBtn: [
|
||||
{'title':'请速回电确认服务时间地点'},
|
||||
{'title':'到达后请先电话联系，切勿大声敲门'},
|
||||
{'title':'时间紧张，请尽快到达服务位置'},
|
||||
{'title':'直接来即可'},
|
||||
],
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
|
|
@ -345,6 +371,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(",")
|
||||
},
|
||||
openpay() {//验证
|
||||
if(this.jishiName==''){
|
||||
uni.showToast({
|
||||
|
|
@ -1334,6 +1381,44 @@
|
|||
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.kuaijie-btn{
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
margin-top: 10px;
|
||||
background: #fff;
|
||||
// color: #049F89;
|
||||
}
|
||||
.huiBtn {
|
||||
color: #333333;
|
||||
}
|
||||
.lanBtn {
|
||||
color: #049F89;
|
||||
}
|
||||
.guke-btn {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
margin-left: 5px;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
border-radius: 6px;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
.guke-list {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
box-sizing: border-box;
|
||||
background-color: #fff;
|
||||
}
|
||||
.textarea-pay-list{
|
||||
width: 100%;
|
||||
height: 126rpx;
|
||||
|
|
@ -1831,6 +1916,9 @@
|
|||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.checkbox-data{
|
||||
padding: 0px 11px;
|
||||
|
|
|
|||
|
|
@ -1714,7 +1714,7 @@
|
|||
}
|
||||
.textarea-pay-list{
|
||||
width: 100%;
|
||||
height: 126rpx;
|
||||
// height: 126rpx;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.textarea-pay{
|
||||
|
|
|
|||
|
|
@ -24,15 +24,10 @@
|
|||
<view class="liebiao" v-show="current === 0">
|
||||
<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
|
||||
<view class="margin-bottom-sm radius touxiang-left">
|
||||
<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index'
|
||||
@click="goOrder(item)">
|
||||
<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)">
|
||||
<view class="touxiang-left-content">
|
||||
<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'"
|
||||
@click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
|
||||
<image class="touxiang-left-content-img" v-if="item.isHot == 1"
|
||||
src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png">
|
||||
</image>
|
||||
|
||||
<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
|
||||
<image class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>
|
||||
<image class="touxiang-frame" :src="technicianType=='3'?'../../static/vip/grade1-1.gif':technicianType=='4'?'../../static/vip/grade2-1.gif':'../../static/vip/grade3-1.gif'"></image>
|
||||
</view>
|
||||
<view class="list-right">
|
||||
|
|
@ -82,11 +77,11 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<empty v-if="orderList.length == 0&¤t == 0"></empty>
|
||||
<empty v-if="orderList.length == 0"></empty>
|
||||
</view>
|
||||
<view v-show="current === 1">
|
||||
<view class="flex text-center flex-wrap"
|
||||
|
|
@ -290,7 +285,7 @@ import permision from "@/components/permission.js";
|
|||
|
||||
myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '',
|
||||
//地图相关
|
||||
latitude: '43.86487',
|
||||
latitude: '',
|
||||
longitude: '',
|
||||
address: '',
|
||||
mapScale: 16, // 地图默认放大倍数
|
||||
|
|
@ -338,7 +333,6 @@ import permision from "@/components/permission.js";
|
|||
that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude));
|
||||
}
|
||||
that.page = 1;
|
||||
that.getTypeList();
|
||||
that.selectCity(that.longitude,that.latitude)
|
||||
},
|
||||
fail: function(e) {
|
||||
|
|
@ -373,7 +367,6 @@ import permision from "@/components/permission.js";
|
|||
},
|
||||
onShow() {
|
||||
let that = this
|
||||
that.getKTCityList();
|
||||
that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
|
||||
var add=uni.getStorageSync('cityTherapist');
|
||||
if(add!=''){
|
||||
|
|
@ -383,8 +376,9 @@ import permision from "@/components/permission.js";
|
|||
that.latitude = location[1]
|
||||
that.componentKey++
|
||||
that.initMap();
|
||||
|
||||
console.log("location========>",location)
|
||||
}
|
||||
that.getKTCityList();
|
||||
that.getTpCount();
|
||||
that.getTpMy();
|
||||
that.userId = uni.getStorageSync('userId')
|
||||
|
|
@ -397,6 +391,7 @@ import permision from "@/components/permission.js";
|
|||
if (uni.getStorageSync('token')) {
|
||||
if (that.latitude && that.longitude) {
|
||||
that.page = 1
|
||||
// that.selectCity(that.latitude,that.longitude)
|
||||
that.getlist()
|
||||
} else {
|
||||
uni.getLocation({
|
||||
|
|
@ -409,7 +404,7 @@ import permision from "@/components/permission.js";
|
|||
that.longitude = res.longitude
|
||||
that.page = 1
|
||||
that.getTypeList();
|
||||
that.getlist()
|
||||
// that.getlist()
|
||||
},
|
||||
fail: function() {
|
||||
console.log('获取地址失败2')
|
||||
|
|
@ -456,6 +451,9 @@ import permision from "@/components/permission.js";
|
|||
longitude: that.longitude,
|
||||
city: that.city
|
||||
}
|
||||
console.log("that.city=======",that.city)
|
||||
console.log("that.current=======",that.current)
|
||||
console.log("that.page=======",that.page)
|
||||
that.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
|
||||
that.loading = false;
|
||||
if (res.code == 0) {
|
||||
|
|
@ -738,6 +736,7 @@ import permision from "@/components/permission.js";
|
|||
that.city = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
|
||||
// that.city=that.latadd
|
||||
that.page = 1
|
||||
that.getlist()
|
||||
that.getKTCityList();
|
||||
} else {
|
||||
console.log('逆地理编码失败', response.data);
|
||||
|
|
|
|||
Loading…
Reference in New Issue