diff --git a/my/help/feedbackIndex.vue b/my/help/feedbackIndex.vue
index 1f36891..5961acd 100644
--- a/my/help/feedbackIndex.vue
+++ b/my/help/feedbackIndex.vue
@@ -6,13 +6,13 @@
你想咨询的问题都在这里
-
+
- 联系客服
+ 联系客服
-
+
- 我要反馈
+ 我要反馈
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index c832a6d..c6defdf 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -6,13 +6,13 @@
服务项目
-
- {{orderXm.ordersMassageList[0].massageType.title}}
+ {{orderXm.entryName}}
待支付
@@ -31,7 +31,7 @@
- {{orderXm.ordersMassageList[0].massageType.duration}}分钟
+ {{orderXm.duration}}分钟
@@ -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)
diff --git a/pages.json b/pages.json
index 5134f5b..c37dd0a 100644
--- a/pages.json
+++ b/pages.json
@@ -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",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f192085..6fc77bf 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,19 +25,16 @@
+ style="line-height: 68rpx;">
{{ city }}
-
-
+
+
+
+ 搜索
-
-
-
- 搜索
-
@@ -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;
}
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 9637471..a5dc657 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -35,8 +35,8 @@
￥
{{item.price}}
- /{{item.serviceCount?item.serviceCount:''}}
- {{item.type=='105'||item.type=='106'?'次':'元'}}
+
+ /{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
/套
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 5dbf2e6..a0748e9 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -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'},
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index aa17d54..ffe01dc 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -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;
diff --git a/pages/public/login.vue b/pages/public/login.vue
index 75df64f..f4df2dc 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -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({
diff --git a/pages/public/loginphone.vue b/pages/public/loginphone.vue
index 8cfe4e3..a051758 100644
--- a/pages/public/loginphone.vue
+++ b/pages/public/loginphone.vue
@@ -98,7 +98,7 @@
this.getIsVip('624')
uni.hideLoading();
uni.switchTab({
- url: '/pages/my/index'
+ url: '/pages/index/index'
})
} else {
uni.hideLoading();