This commit is contained in:
Mr.jiang 2024-07-15 16:30:27 +08:00
parent 466f80ae06
commit a32ab9cbe3
9 changed files with 63 additions and 60 deletions

View File

@ -6,13 +6,13 @@
<view class="" style="font-size: 28rpx;color: #ffffff;margin-top: 10rpx;">你想咨询的问题都在这里</view>
</view>
<view class="uselist flex align-center" style="justify-content: space-evenly;">
<view class="" style="text-align: center;">
<view class="" style="text-align: center;" @click="goChat">
<view class=""><image src="../../static/jdskald.png" style="width: 74rpx;height: 60rpx;" ></image></view>
<view class="text-feedback" hover-class="hover" @click="goChat">联系客服</view>
<view class="text-feedback" hover-class="hover">联系客服</view>
</view>
<view class="" style="text-align: center;">
<view class="" style="text-align: center;" @click="toFeedback">
<view class=""><image src="../../static/bbn.png" style="width: 62rpx;height: 60rpx;" ></image></view>
<view class="text-feedback" hover-class="hover" @click="toFeedback">我要反馈</view>
<view class="text-feedback" hover-class="hover">我要反馈</view>
</view>
</view>
<view class="bg-list">

View File

@ -6,13 +6,13 @@
<view class="pay-title">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.ordersMassageList[0].massageType.massageImg"
<image :src="orderXm.ordersMassageList[0].massageType?orderXm.ordersMassageList[0].massageType.massageImg:orderXm.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right justify-between">
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.ordersMassageList[0].massageType.title}}
{{orderXm.entryName}}
</view>
<view class="zhuangtai">
<view v-if="orderXm.status ==1">待支付</view>
@ -31,7 +31,7 @@
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{orderXm.ordersMassageList[0].massageType.duration}}分钟
{{orderXm.duration}}分钟
</view>
</view>
@ -350,7 +350,7 @@
}else{
this.jishiName=this.orderXm;
}
console.log("this.jishiName===>",this.jishiName)
console.log("this.jishiName===>",this.orderXm)
this.couponId=this.$queue.getData('youhui');
if(this.couponId){
this.youhuiF(this.couponId)

View File

@ -67,7 +67,7 @@
{
"path": "pages/cooperate/hehuo",
"style": {
"navigationBarTitleText": "城市合伙人",
"navigationBarTitleText": "门店入驻",
"enablePullDownRefresh": true,
"navigationStyle": "custom",
"app-plus": {
@ -388,7 +388,7 @@
{
"path": "pages/my/cooperation",
"style": {
"navigationBarTitleText": "成为代理商",
"navigationBarTitleText": "城市合伙人",
"enablePullDownRefresh": false,
"app-plus": {
"bounce": "none",
@ -400,7 +400,7 @@
{
"path": "pages/my/hehuo",
"style": {
"navigationBarTitleText": "成为按摩师",
"navigationBarTitleText": "应聘技师",
"enablePullDownRefresh": false,
"app-plus": {
"bounce": "none",

View File

@ -25,19 +25,16 @@
</view>
<view class="padding-top-sm flex align-center index-mian">
<view v-if="XCXIsSelect != ''" class="flex align-center justify-between margin-right-sm"
@tap="Cityshow = true" style="line-height: 68rpx;">
style="line-height: 68rpx;">
<image src="../../static/liliao-1.png" class="dingwei-img"></image>
<view class="localName">{{ city }}</view>
</view>
<view class="flex align-center justify-between">
<selectSwitchDitu @change="switch1Change" :switchList="switchList"/>
<uni-search-bar placeholder="请输入项目名称" @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear">
</uni-search-bar>
<view class="search-btn" @click="searchBtn" >
搜索
</view>
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear">
</uni-search-bar>
<view class="search-btn" @click="searchBtn">
搜索
</view>
</view>
<view class="index-nav-bottom width">
@ -279,20 +276,16 @@
import commonConfig from 'common/config.js';
import * as webMap from 'utils/webMap.js';
import selectSwitchDitu from "@/components/xuan-switch/xuan-switch-ditu.vue";
import permision from "@/components/permission.js";
//
// #ifdef APP-PLUS
// import permision from "@/components/permission.js";
// #endif
export default {
components:{selectSwitchDitu},
data() {
return {
switchList:['技师','项目'],
current: 0,
serviceTrue:true,
changeSelectData:'技师',
cityList: [],
Cityshow: false,
artificerName: '',
@ -428,9 +421,33 @@
}
}
})
// 116.481488,39.990464
// 125.424295,43.878294
var dizhi={
key:'32c22db939160ba44394eb187f7897ae',
location:'116.481488,39.990464',
radius:'3000',
extensions:'base',
// poitype:'',
// roadlevel:'0'
}
uni.request({
url: 'https://restapi.amap.com/v3/geocode/regeo',
data:dizhi,
method:'GET',
success(re) {
if (re.status =='1') {
console.log("获取城市名称成功", re)
that.city = re ? re : '未知'
} else {
that.city ='请重试'
console.log("获取信息失败,请重试!")
}
}
});
uni.getLocation({
type: 'wgs84',
// geocode: true, //true
geocode: true, //true
success: function(res) {
console.log(res, '地理位置')
that.latitude = res.latitude
@ -440,7 +457,7 @@
// #ifdef APP-PLUS
that.city = res.address.city
that.selectCity(that.longitude, that.latitude);
// that.selectCity(that.longitude, that.latitude);
uni.setStorageSync('city', res.address.city)
// that.page = 1
// that.getorderlist('')
@ -448,7 +465,9 @@
// #endif
// #ifdef H5
that.selectCity(that.longitude, that.latitude);
// that.city = that.latitude+','+that.longitude
// that.selectCity(that.longitude, that.latitude);
// #endif
// #ifdef MP-WEIXIN
@ -536,29 +555,10 @@
// }
},
methods: {
switch1Change: function (e) {//
var num= Number(e)
if(e==false){
this.current = 1;
this.changeSelectData='项目';
uni.navigateTo({
url:'/pages/my/fuwuGengduo'
})
}else{
this.current = 0;
this.changeSelectData='技师';
}
},
searchBtn(){//
if(this.changeSelectData=='项目'){
uni.navigateTo({
url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue
})
}else{
uni.navigateTo({
url:'/pages/therapist/therapistShou?searchValue='+this.searchValue
})
}
uni.navigateTo({
url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue
})
},
input(res) {//
this.searchValue=res;
@ -980,7 +980,6 @@
// this.starTechnician[i].dingwei= distance.toFixed(1)
// console.log(`: ${distance.toFixed(1)} km`);
// }
console.log("starTechnician===>",this.starTechnician)
// this.classifyId = res.data[0].id;
// this.getorderlist('')
}
@ -1155,9 +1154,10 @@
flex-direction: row;
flex-flow: row-reverse;
position: relative;
justify-content: center;
}
/deep/.uni-searchbar{
width: 130px;
width:200px;
border-radius: 31rpx;
}

View File

@ -35,8 +35,8 @@
<view class="item-view-bottom-qian">
<span></span>
<span>{{item.price}}</span>
<span v-if="item.type!='104'">/{{item.serviceCount?item.serviceCount:''}}
{{item.type=='105'||item.type=='106'?'次':'元'}}
<span v-if="item.type!='104'">
/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'':''}}
</span>
<span v-if="item.type=='104'">/
</span>

View File

@ -149,9 +149,9 @@
XCXIsSelect: '否',
useList:[
{urlImg:'../../static/my-gong-1.png',text:'我的收藏',link:'/my/gird/shoucang'},
{urlImg:'../../static/my-gong-2.png',text:'成为技师',link:'/pages/my/hehuo'},
{urlImg:'../../static/my-gong-2.png',text:'应聘技师',link:'/pages/my/hehuo'},
{urlImg:'../../static/my-gong-3.png',text:'分享好友',link:'/pages/my/invitationUser'},
{urlImg:'../../static/my-gong-4.png',text:'成为代理商',link:'/pages/my/cooperation'},
{urlImg:'../../static/my-gong-4.png',text:'城市合伙人',link:'/pages/my/cooperation'},
{urlImg:'../../static/my-gong-5.png',text:'地址管理',link:'/my/address/address'},
{urlImg:'../../static/my-gong-6.png',text:'帮助中心',link:'/my/help/feedbackIndex'},
{urlImg:'../../static/my-gong-7.png',text:'设置中心',link:'/my/setting/index'},

View File

@ -79,7 +79,10 @@
this.typeData=e.type
this.getName=e.name;
this.myId = uni.getStorageSync('userId')
this.getData()
this.getData();
uni.setNavigationBarTitle({
title: this.typeData=='104'?'服务套餐':this.typeData=='105'?'项目次卡':'服务疗程',
})
},
onPullDownRefresh: function() {
this.page = 1;

View File

@ -165,7 +165,7 @@
this.$queue.setData("invitationCode", res.user.invitationCode);
this.$queue.setData("inviterCode", res.user.inviterCode);
uni.switchTab({
url: '/pages/my/index'
url: '/pages/index/index'
})
} else {
uni.navigateTo({
@ -215,7 +215,7 @@
this.$queue.setData("invitationCode", res.user.invitationCode);
this.$queue.setData("inviterCode", res.user.inviterCode);
uni.switchTab({
url: '/pages/my/index'
url: '/pages/index/index'
})
} else {
uni.navigateTo({
@ -243,7 +243,7 @@
this.$queue.setData("invitationCode", res.user.invitationCode);
this.$queue.setData("inviterCode", res.user.inviterCode);
uni.switchTab({
url: '/pages/my/index'
url: '/pages/index/index'
})
} else {
uni.navigateTo({

View File

@ -98,7 +98,7 @@
this.getIsVip('624')
uni.hideLoading();
uni.switchTab({
url: '/pages/my/index'
url: '/pages/index/index'
})
} else {
uni.hideLoading();