yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:e29de593da6075505bae7a8d330b3c8a24e6a86b
Branches Tags
yangjun:master
..
compare: yangjun:79323512c8bcf3edcf269cee0c689b0d6314c25f
Branches Tags
yangjun:master

No commits in common. "e29de593da6075505bae7a8d330b3c8a24e6a86b" and "79323512c8bcf3edcf269cee0c689b0d6314c25f" have entirely different histories.
e29de593da ... 79323512c8

6 changed files with 51 additions and 302 deletions
Show Stats Expand all files Collapse all files

94
my/order/payModify.vue
View File

@ -120,14 +120,12 @@
</view> </view>
</view> </view>
<view class="header-view header-padd header-margin"> <view class="header-view header-padd header-margin">
<view class="d-title title-font"> <view class="d-title title-font">备注</view>
<span>给技师捎句话</span>
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
</view>
<view class="list-pay"> <view class="list-pay">
<view class="textarea-pay-list"> <view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea> <textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view> </view>
</view> </view>
</view> </view>
<view class="push-button"> <view class="push-button">
@ -197,20 +195,6 @@
</scroll-view> </scroll-view>
</view> </view>
</u-popup> </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> </view>
</template> </template>
@ -299,16 +283,7 @@
orderXm:[], orderXm:[],
number:1, number:1,
qyMinNum:'', qyMinNum:'',
technicianRate:'', technicianRate:''
popupKj:false,
selected:[],
selectedString:'',
fuwuBtn: [
{'title':'请速回电确认服务时间地点'},
{'title':'到达后请先电话联系，切勿大声敲门'},
{'title':'时间紧张，请尽快到达服务位置'},
{'title':'直接来即可'},
],
} }
}, },
onLoad(e) { onLoad(e) {
@ -388,27 +363,6 @@
// #endif // #endif
}, },
methods: { 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(",")
},
changeValue(value){ changeValue(value){
this.number=value this.number=value
}, },
@ -1359,44 +1313,7 @@
</script> </script>
<style lang="scss" scoped> <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;
}
.jusitify-line{ .jusitify-line{
height: 76rpx; height: 76rpx;
display: flex; display: flex;
@ -1763,9 +1680,6 @@
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
display: flex;
flex-direction: row;
justify-content: space-between;
} }
.checkbox-data{ .checkbox-data{
padding: 0px 11px; padding: 0px 11px;

134
my/order/payModifyJsDetail.vue
View File

@ -107,12 +107,11 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="header-view header-padd header-margin"> <view class="margin-top-xl pay-ding">
<view class="d-title"> <view class="d-title">备注</view>
<span>给技师捎句话</span>
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
</view>
<view class="list-pay"> <view class="list-pay">
<view class="textarea-pay-list"> <view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea> <textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
@ -120,7 +119,30 @@
</view> </view>
</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>
<view class="pay_btn" style="margin-top: 10px;" @click="openpay()">去支付</view> <view class="pay_btn" style="margin-top: 10px;" @click="openpay()">去支付</view>
</view> </view>
@ -187,20 +209,6 @@
</scroll-view> </scroll-view>
</view> </view>
</u-popup> </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> </view>
</template> </template>
@ -288,15 +296,6 @@
couponDataList:'', couponDataList:'',
orderXm:[], orderXm:[],
number:1, number:1,
popupKj:false,
selected:[],
selectedString:'',
fuwuBtn: [
{'title':'请速回电确认服务时间地点'},
{'title':'到达后请先电话联系，切勿大声敲门'},
{'title':'时间紧张，请尽快到达服务位置'},
{'title':'直接来即可'},
],
} }
}, },
onLoad(e) { onLoad(e) {
@ -369,27 +368,6 @@
// #endif // #endif
}, },
methods: { 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 goOrder() {//生成orderId
let that = this let that = this
let data = { let data = {
@ -1346,59 +1324,6 @@
</script> </script>
<style lang="scss" scoped> <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{ .head-bottom{
width: 68%; width: 68%;
display: flex; display: flex;
@ -1740,9 +1665,6 @@
padding: 29rpx; padding: 29rpx;
} }
.d-title{ .d-title{
display: flex;
flex-direction: row;
justify-content: space-between;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
@ -1765,7 +1687,7 @@
} }
.list-pay{ .list-pay{
width: 100%; width: 100%;
// padding: 0px 29rpx; padding: 0px 29rpx;
} }
.pay-ding-top{ .pay-ding-top{
width: 100%; width: 100%;

90
my/order/payModifyTcMy.vue
View File

@ -95,10 +95,7 @@
</view> </view>
</view> </view>
<view class="header-view header-padd header-margin"> <view class="header-view header-padd header-margin">
<view class="d-title title-font"> <view class="d-title title-font">备注</view>
<span>给技师捎句话</span>
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
</view>
<view class="list-pay"> <view class="list-pay">
<view class="textarea-pay-list"> <view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea> <textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
@ -173,20 +170,6 @@
</scroll-view> </scroll-view>
</view> </view>
</u-popup> </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> </view>
</template> </template>
@ -275,15 +258,6 @@
orderXm:[], orderXm:[],
detailData:[], detailData:[],
number:1, number:1,
popupKj:false,
selected:[],
selectedString:'',
fuwuBtn: [
{'title':'请速回电确认服务时间地点'},
{'title':'到达后请先电话联系，切勿大声敲门'},
{'title':'时间紧张，请尽快到达服务位置'},
{'title':'直接来即可'},
],
} }
}, },
onLoad(e) { onLoad(e) {
@ -371,27 +345,6 @@
// #endif // #endif
}, },
methods: { 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() {//验证 openpay() {//验证
if(this.jishiName==''){ if(this.jishiName==''){
uni.showToast({ uni.showToast({
@ -1381,44 +1334,6 @@
<style lang="scss" scoped> <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{ .textarea-pay-list{
width: 100%; width: 100%;
height: 126rpx; height: 126rpx;
@ -1916,9 +1831,6 @@
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
display: flex;
flex-direction: row;
justify-content: space-between;
} }
.checkbox-data{ .checkbox-data{
padding: 0px 11px; padding: 0px 11px;

2
my/order/payding.vue
View File

@ -1714,7 +1714,7 @@
} }
.textarea-pay-list{ .textarea-pay-list{
width: 100%; width: 100%;
// height: 126rpx; height: 126rpx;
margin-top: 10px; margin-top: 10px;
} }
.textarea-pay{ .textarea-pay{

29
pages/therapist/therapist.vue
View File

@ -24,10 +24,15 @@
<view class="liebiao" v-show="current === 0"> <view class="liebiao" v-show="current === 0">
<view v-if="orderList.length" class="flex text-center flex-wrap list-view"> <view v-if="orderList.length" class="flex text-center flex-wrap list-view">
<view class="margin-bottom-sm radius touxiang-left"> <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"> <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 style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'"
<image class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image> @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> <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>
<view class="list-right"> <view class="list-right">
@ -77,11 +82,11 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<empty v-if="orderList.length == 0"></empty> <empty v-if="orderList.length == 0&&current == 0"></empty>
</view> </view>
<view v-show="current === 1"> <view v-show="current === 1">
<view class="flex text-center flex-wrap" <view class="flex text-center flex-wrap"
@ -285,7 +290,7 @@ import permision from "@/components/permission.js";
myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '', myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '',
//地图相关 //地图相关
latitude: '', latitude: '43.86487',
longitude: '', longitude: '',
address: '', address: '',
mapScale: 16, // 地图默认放大倍数 mapScale: 16, // 地图默认放大倍数
@ -333,6 +338,7 @@ import permision from "@/components/permission.js";
that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude)); that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude));
} }
that.page = 1; that.page = 1;
that.getTypeList();
that.selectCity(that.longitude,that.latitude) that.selectCity(that.longitude,that.latitude)
}, },
fail: function(e) { fail: function(e) {
@ -367,6 +373,7 @@ import permision from "@/components/permission.js";
}, },
onShow() { onShow() {
let that = this let that = this
that.getKTCityList();
that.XCXIsSelect = this.$queue.getData("XCXIsSelect"); that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
var add=uni.getStorageSync('cityTherapist'); var add=uni.getStorageSync('cityTherapist');
if(add!=''){ if(add!=''){
@ -376,9 +383,8 @@ import permision from "@/components/permission.js";
that.latitude = location[1] that.latitude = location[1]
that.componentKey++ that.componentKey++
that.initMap(); that.initMap();
console.log("location========>",location)
} }
that.getKTCityList();
that.getTpCount(); that.getTpCount();
that.getTpMy(); that.getTpMy();
that.userId = uni.getStorageSync('userId') that.userId = uni.getStorageSync('userId')
@ -391,7 +397,6 @@ import permision from "@/components/permission.js";
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
if (that.latitude && that.longitude) { if (that.latitude && that.longitude) {
that.page = 1 that.page = 1
// that.selectCity(that.latitude,that.longitude)
that.getlist() that.getlist()
} else { } else {
uni.getLocation({ uni.getLocation({
@ -404,7 +409,7 @@ import permision from "@/components/permission.js";
that.longitude = res.longitude that.longitude = res.longitude
that.page = 1 that.page = 1
that.getTypeList(); that.getTypeList();
// that.getlist() that.getlist()
}, },
fail: function() { fail: function() {
console.log('获取地址失败2') console.log('获取地址失败2')
@ -451,9 +456,6 @@ import permision from "@/components/permission.js";
longitude: that.longitude, longitude: that.longitude,
city: that.city 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.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
that.loading = false; that.loading = false;
if (res.code == 0) { if (res.code == 0) {
@ -736,7 +738,6 @@ import permision from "@/components/permission.js";
that.city = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'') that.city = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
// that.city=that.latadd // that.city=that.latadd
that.page = 1 that.page = 1
that.getlist()
that.getKTCityList(); that.getKTCityList();
} else { } else {
console.log('逆地理编码失败', response.data); console.log('逆地理编码失败', response.data);

4
pages/therapist/therapistDingdan.vue
View File

@ -2,11 +2,11 @@
<view class="content"> <view class="content">
<view class="content-head"> <view class="content-head">
<view class="padding-top-sm flex align-center" style="padding-bottom: 9px;"> <view class="padding-top-sm flex align-center" style="padding-bottom: 9px;">
<!-- <view v-if="XCXIsSelect != '否'" class="flex align-center justify-between margin-right-sm" <view v-if="XCXIsSelect != '否'" class="flex align-center justify-between margin-right-sm"
@tap="showCityList" style="line-height: 68rpx;"> @tap="showCityList" style="line-height: 68rpx;">
<image src="../../static/liliao-1.png" class="dingwei-img"></image> <image src="../../static/liliao-1.png" class="dingwei-img"></image>
<view class="localName">{{ city }}</view> <view class="localName">{{ city }}</view>
</view> --> </view>
<u-search class="flex-sub" placeholder="请输入技师名字" :focus="false" shape="square" v-model="artificerName" <u-search class="flex-sub" placeholder="请输入技师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#f5f5f5" color="#1A1A1A" @search="onSearch()" :show-action="true" :animation="true" bg-color="#f5f5f5" color="#1A1A1A" @search="onSearch()"
action-text="搜索" @custom="onSearch()"></u-search> action-text="搜索" @custom="onSearch()"></u-search>