diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index f697511..ac79d9c 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -5,7 +5,7 @@
- {{ city }}
+ {{ cityname }}
",location)
+ console.log("location========>",add)
}
that.getKTCityList();
that.getTpCount();
@@ -733,8 +735,8 @@ import permision from "@/components/permission.js";
let township = response.data.regeocode.addressComponent.township;
let streetNumber = response.data.regeocode.addressComponent.streetNumber.street;
let number = response.data.regeocode.addressComponent.streetNumber.number;
- that.city = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
- // that.city=that.latadd
+ that.cityname = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
+ that.city=city
that.page = 1
that.getlist()
that.getKTCityList();
diff --git a/pages/therapist/therapistList.vue b/pages/therapist/therapistList.vue
index 7d55714..ac79d9c 100644
--- a/pages/therapist/therapistList.vue
+++ b/pages/therapist/therapistList.vue
@@ -1,377 +1,251 @@
-
-
-
-
-
- {{city}}
+
+
+
+
+
+ {{ cityname }}
-
- 列表
- 地图
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 更多照片
-
-
-
-
-
- {{item.artificerName}}
-
-
-
-
-
-
- {{item.distance}}
-
-
-
- 可服务
- 可预约
- 休息中
-
-
-
-
-
- {{item.ordersScore}}.0
-
-
-
-
-
-
-
- {{item.commentCount ? item.commentCount : 0}}
-
-
-
-
-
- {{item.collectCount ? item.collectCount : 0}}
-
-
-
-
-
-
- 商家
-
-
-
-
- 最早可约{{item.time}}
-
-
-
- 免出行费
-
-
-
- 立即预约
-
-
- 立即预约
-
-
-
-
-
-
- 可用余额：{{item.money ? item.money : 0}}
-
-
-
-
- 为TA充值
-
-
-
-
- 立即预约
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 更多照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.artificerName }}
+
+
+
+ {{item.status == 1?"可服务":"休息中"}}
+ {{item.time}}
+
+
+
+
+
-
-
-
-
- {{getOrderByCurrentMarkerIndex().artificerName}}
-
-
-
-
-
- {{getOrderByCurrentMarkerIndex().distance}}
-
-
- 可服务
- 可预约
-
- 休息中
-
-
-
-
-
- {{getOrderByCurrentMarkerIndex().ordersScore}}.0
-
-
-
-
- 免出行费
-
-
-
-
- {{getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0}}
-
-
-
-
-
- {{getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0}}
-
-
-
-
-
-
- 商家
-
-
-
-
- 最早可约：{{getOrderByCurrentMarkerIndex().time}}
-
-
-
-
- 立即预约
-
-
+
+ {{item.content}}
+
+
+
+ 评论
+
+ {{ item.commentCount ? item.commentCount : 0 }}
+
+
+
+
+ 收藏
+
+ {{ item.collectCount ? item.collectCount : 0 }}
+
-
-
-
-
-
- 可用余额：{{getOrderByCurrentMarkerIndex().money ? getOrderByCurrentMarkerIndex().money : 0}}
+
+
+
+ {{item.consortiaName}}
-
-
-
-
- 为TA充值
-
-
-
-
- 立即预约
+
+
+ {{ item.distance }}
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getOrderByCurrentMarkerIndex().artificerName }}
+
+
+
+ {{getOrderByCurrentMarkerIndex().state == 1?"可服务":getOrderByCurrentMarkerIndex().state == 2?"今日可约":"休息中"}}
+
+ {{ getOrderByCurrentMarkerIndex().time}}
+
+
+
+
+
+
+
+
+
+
+ 评论
+
+ {{ getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0 }}
+
+
+
+
+
+ 收藏
+
+ {{ getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0 }}
+
+
+
+
+
+
+
+
+ {{getOrderByCurrentMarkerIndex().consortiaName}}
+
+
+
+
+ 立即预约
+
+
+ 立即预约
+
+
+
+
+
+
+
+
+
+
- {{tpCount}}人已投票
+ {{
+ tpCount }}人已投票
投票
已投票
-
-
-
-
-
-
-
+
+
-
-
\ No newline at end of file
diff --git a/pages/therapist/therapistList1.vue b/pages/therapist/therapistList1.vue
new file mode 100644
index 0000000..7d55714
--- /dev/null
+++ b/pages/therapist/therapistList1.vue
@@ -0,0 +1,1843 @@
+
+
+
+
+
+
+ {{city}}
+
+
+ 列表
+ 地图
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 更多照片
+
+
+
+
+
+ {{item.artificerName}}
+
+
+
+
+
+
+ {{item.distance}}
+
+
+
+ 可服务
+ 可预约
+ 休息中
+
+
+
+
+
+ {{item.ordersScore}}.0
+
+
+
+
+
+
+
+ {{item.commentCount ? item.commentCount : 0}}
+
+
+
+
+
+ {{item.collectCount ? item.collectCount : 0}}
+
+
+
+
+
+
+ 商家
+
+
+
+
+ 最早可约{{item.time}}
+
+
+
+ 免出行费
+
+
+
+ 立即预约
+
+
+ 立即预约
+
+
+
+
+
+
+ 可用余额：{{item.money ? item.money : 0}}
+
+
+
+
+ 为TA充值
+
+
+
+
+ 立即预约
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 更多照片
+
+
+
+
+
+ {{getOrderByCurrentMarkerIndex().artificerName}}
+
+
+
+
+
+ {{getOrderByCurrentMarkerIndex().distance}}
+
+
+ 可服务
+ 可预约
+
+ 休息中
+
+
+
+
+
+ {{getOrderByCurrentMarkerIndex().ordersScore}}.0
+
+
+
+
+ 免出行费
+
+
+
+
+ {{getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0}}
+
+
+
+
+
+ {{getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0}}
+
+
+
+
+
+
+ 商家
+
+
+
+
+ 最早可约：{{getOrderByCurrentMarkerIndex().time}}
+
+
+
+
+ 立即预约
+
+
+
+
+
+
+
+
+
+
+ 可用余额：{{getOrderByCurrentMarkerIndex().money ? getOrderByCurrentMarkerIndex().money : 0}}
+
+
+
+
+
+ 为TA充值
+
+
+
+
+ 立即预约
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{tpCount}}人已投票
+ 投票
+ 已投票
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue
index a8d5e1e..5c3abc4 100644
--- a/pages/videoCircle/index.vue
+++ b/pages/videoCircle/index.vue
@@ -371,9 +371,10 @@
setTimeout(() => this.getPingL(this.videoID), 500);
this.showPopup==true;
uni.hideLoading();
+ this.dataList[this.k].pls++
// callback(this.videoID);
} else {
- uni.hideLoading();
+ uni.hideLoading();
uni.showToast({
title: res.msg,
icon: 'none'