From 6019afb30ed5de2cea87b441618233ebe4e9c9e7 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Sat, 15 Jun 2024 20:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=B2=A1=E7=94=A8?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
http/consistency-request.js | 1 -
http/request.js | 8 +-
my/vip/index.vue | 4 +-
pages.json | 29 +-
pages/index/index.vue | 120 +++--
pages/my/cureOderDrtail.vue | 8 +-
pages/my/curePackage.vue | 387 ---------------
pages/my/index.vue | 399 +++++++++++++--
pages/my/index1.vue | 5 +-
pages/my/onceCardOderDrtail.vue | 464 ------------------
pages/my/onceCardPackage.vue | 387 ---------------
pages/my/serviceOderDrtail.vue | 159 +++---
pages/my/servicePackage.vue | 156 +++---
pages/public/loginphone.vue | 4 +-
pages/therapist/orderDetail.vue | 187 ++++---
pages/therapist/therapist.vue | 151 +++---
.../z-tabs/components/z-tabs/z-tabs.vue | 4 +-
17 files changed, 816 insertions(+), 1657 deletions(-)
delete mode 100644 pages/my/curePackage.vue
delete mode 100644 pages/my/onceCardOderDrtail.vue
delete mode 100644 pages/my/onceCardPackage.vue
diff --git a/http/consistency-request.js b/http/consistency-request.js
index b29c00b..34a3722 100644
--- a/http/consistency-request.js
+++ b/http/consistency-request.js
@@ -11,7 +11,6 @@ function myQueryList(prarm, callback) {
request.queryList({
pageNo: prarm.pageNo,
pageSize: prarm.pageSize,
- type: prarm.type
}).then(res => {
const myData = {
data: {
diff --git a/http/request.js b/http/request.js
index b343b84..1112f84 100644
--- a/http/request.js
+++ b/http/request.js
@@ -35,12 +35,12 @@ function queryChatListLong(data) {
}
function _queryList(data, listCount, showNews = false ,random = false, showChat = false) {
- if (!data.pageNo || !data.pageSize) {
+ if (!data.page || !data.limit) {
return _callQueryResult([]);
}
- let pageNo = parseInt(data.pageNo);
- let pageSize = parseInt(data.pageSize);
- let type = data.type || 0;
+ let pageNo = parseInt(data.page);
+ let pageSize = parseInt(data.limit);
+ // let type = data.type || 0;
if (pageNo < 0 || pageSize <= 0) {
return _callQueryResult([]);
}
diff --git a/my/vip/index.vue b/my/vip/index.vue
index c5ea1dc..ba7f72b 100644
--- a/my/vip/index.vue
+++ b/my/vip/index.vue
@@ -159,8 +159,8 @@
this.getMemberList()
this.getMoney()
// this.getIsVip()
- this.vipData=this.$queue.getData('VipDetails')
- console.log("vipDatavipDatavipDatavipData",this.vipData)
+ this.vipData=this.$queue.getData('isVIP')
+ console.log("isVIP------------------->",this.vipData)
if(this.vipData.isVip=='1'){
this.vipShow=true;
}else{
diff --git a/pages.json b/pages.json
index 7966475..f2e01ac 100644
--- a/pages.json
+++ b/pages.json
@@ -181,37 +181,10 @@
"navigationStyle": "custom"
}
},
- {
- "path": "pages/my/curePackage",
- "style": {
- "navigationBarTitleText": "疗程套餐",
- "navigationBarBackgroundColor": "#096f4b",
- "navigationBarTextStyle": "white",
- "navigationStyle": "custom"
- }
- },
{
"path": "pages/my/cureOderDrtail",
"style": {
- "navigationBarTitleText": "疗程套餐详情",
- "navigationBarBackgroundColor": "#096f4b",
- "navigationBarTextStyle": "white",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/onceCardPackage",
- "style": {
- "navigationBarTitleText": "项目次卡",
- "navigationBarBackgroundColor": "#096f4b",
- "navigationBarTextStyle": "white",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/onceCardOderDrtail",
- "style": {
- "navigationBarTitleText": "项目次卡详情",
+ "navigationBarTitleText": "套餐详情订单",
"navigationBarBackgroundColor": "#096f4b",
"navigationBarTextStyle": "white",
"navigationStyle": "custom"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d2e3f00..99cf12b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -32,11 +32,7 @@
:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
>
-
-
- {{item.value}}
-
-
+
@@ -48,7 +44,7 @@
明星技师
Star technician
-
+
查看更多>
@@ -59,51 +55,51 @@
-
+
- 深谙逃禅
+ 盛安套餐
-
+
- 深谙逃禅
+ 盛安技师
-
+
- 深谙逃禅
+ 招聘合作
-
+
- 深谙逃禅
+ 会员中心
-
+
- 深谙逃禅
+ 充值赠送
-
+
- 深谙逃禅
+ 超值拼团
-
+
- 深谙逃禅
+ 超值套餐
-
+
- 深谙逃禅
+ 限时秒杀
-
+
- 深谙逃禅
+ 逛商城
-
+
- 深谙逃禅
+ 约到店
-
+
@@ -114,12 +110,12 @@
附近技师
- 更多
+ 更多
>>
-
+
@@ -140,7 +136,7 @@
-
+
{{item.name}}
{{item.content}}
@@ -344,12 +340,6 @@
starTechnician:[],//明星技师
nearbyTechnician:[],//附近技师
classifyId: '',
- value: 0,
- range: [
- { value: 0, text: "篮球" },
- { value: 1, text: "足球" },
- { value: 2, text: "游泳" },
- ],
//列表数据
goodsList: [
{
@@ -441,6 +431,61 @@
// that.myId = uni.getStorageSync('userId')
},
methods: {
+ tuijian(item){//推荐
+ if(item.id==4){
+ uni.navigateTo({
+ url:'/pages/my/serviceItems'
+ })
+ }
+
+ },
+ goNav(e){
+ if(e!=undefined){
+ uni.navigateTo({
+ url:e
+ })
+ }else{
+ uni.showToast({
+ title:'敬请期待！'
+ })
+ }
+
+ },
+ goOrder(e) {
+ console.log('授权', uni.getStorageSync('sendMsg'))
+ if (uni.getStorageSync('sendMsg')) {
+ console.log('授权+1')
+ wx.requestSubscribeMessage({
+ tmplIds: this.arr,
+ success(re) {
+ console.log(JSON.stringify(re), 'asdasdasdasddas')
+ var datas = JSON.stringify(re);
+ if (datas.indexOf("accept") != -1) {
+ console.log(re)
+ }
+ },
+ fail: (res) => {
+ console.log(res)
+ }
+ })
+ }
+ if (this.token) {
+ uni.navigateTo({
+ url: '/pages/therapist/orderDetail?artificerId=' + e.artificerId + "&classifyId=" + this
+ .tabIndex
+ });
+ } else {
+ uni.navigateTo({
+ url: '/pages/public/login'
+ });
+ }
+
+ },
+ gengduo(){
+ uni.reLaunch({
+ url:'/pages/therapist/therapist'
+ })
+ },
getCity(e) {
console.log("得到的城市-------------》",e[0].label);
this.city = e[0].label;
@@ -550,6 +595,7 @@
},
//点击某一个item 推荐明星
chooseItem(item){
+ this.goOrder(item);
console.log("推荐明星",item)
// 点击拿到整个当前点击的item 执行业务逻辑
},
@@ -1214,7 +1260,7 @@
}
.index-head{
width: 100%;
- height:240px;
+ height:190px;
background: linear-gradient(4deg,rgba(189, 247, 214,0),rgba(143, 233, 212, 0.3));
display: flex;
align-items: flex-start;
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index 8cf8a98..3709840 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -28,10 +28,6 @@
￥430
-
-
-
-