From 01a5b434572fe61f1757a06581fe38993bb730e9 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 10 Jul 2024 15:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/config.js | 8 +-
common/queue.js | 4 +-
my/order/payModifyDd.vue | 2 +-
package/pages/zysc/my/myList.vue | 4 +-
pages/cooperate/hehuo.vue | 30 +-
pages/cooperate/index.vue | 2 +-
pages/index/index.vue | 16 +-
pages/my/cooperation.vue | 11 +-
pages/my/index.vue | 2 +-
pages/shop/index.vue | 94 ++-
pages/shop/yueDaoDianDrtail.vue | 617 ++----------------
pages/therapist/orderDetail.vue | 13 +-
.../liu-goods-swiper/liu-goods-swiper.vue | 9 +
uview-ui/libs/request/index.js | 2 +-
14 files changed, 180 insertions(+), 634 deletions(-)
diff --git a/common/config.js b/common/config.js
index f3d97cf..311e402 100644
--- a/common/config.js
+++ b/common/config.js
@@ -2,9 +2,9 @@
// const ROOTPATH1 = "http://120.46.52.165/sqx_fast";
// const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/";
-// const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/";
-// const ROOTPATH = "http://192.168.2.222:8187/sqx_fast";
-// const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast";
+// const ROOTPATH3 = "wss://192.168.2.15:8187/wss/websocket/";
+// const ROOTPATH = "http://192.168.2.15:8187/sqx_fast";
+// const ROOTPATH1 = "http://192.168.2.15:8187/sqx_fast";
// const ROOTPATH3 = "wss://1.92.152.160/wss/websocket/";
// const ROOTPATH = "http://1.92.152.160/sqx_fast";
@@ -57,7 +57,7 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6';
//ws基础连接地址
// const WS_BASE_PATH = 'ws://47.75.182.93:8090/sqx_fast/';
-// const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/';
+// const WS_BASE_PATH = 'ws://192.168.2.15:8187/sqx_fast/';
const WS_BASE_PATH = 'ws://sausers.blxinchuang.com/sqx_fast/';
// const WS_BASE_PATH = 'ws://1.92.152.160/sqx_fast/';
// const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/';
diff --git a/common/queue.js b/common/queue.js
index 5d184ca..7466c14 100644
--- a/common/queue.js
+++ b/common/queue.js
@@ -20,7 +20,7 @@ module.exports = {
publicYuMing() {
// return 'https://admin.sjajk.com'//生产需替换
// return 'http://120.46.52.165'1.92.152.160
- // return 'http://192.168.2.222:8187'
+ // return 'http://192.168.2.15:8187'
return 'https://sausers.blxinchuang.com'
// return 'http://1.92.152.160'
// return 'http://47.75.182.93:8090:8187'
@@ -31,7 +31,7 @@ module.exports = {
// return 'http://120.46.52.165'
return 'https://sausers.blxinchuang.com'
// return 'http://1.92.152.160'
- // return 'http://192.168.2.222:8187'
+ // return 'http://192.168.2.15:8187'
// return 'http://47.75.182.93:8090:8187'
},
logout() {
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index a4ca8e6..19d0d40 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -684,7 +684,7 @@
// that.showpay = true;
that.paySel = 1;
uni.navigateTo({
- url:'/my/order/paydingDd?ordersId='+ res.data.ordersId
+ url:'/my/order/payding?ordersId='+ res.data.ordersId
})
} else {
that.$queue.showToast(res.msg)
diff --git a/package/pages/zysc/my/myList.vue b/package/pages/zysc/my/myList.vue
index e468f83..4fa1228 100644
--- a/package/pages/zysc/my/myList.vue
+++ b/package/pages/zysc/my/myList.vue
@@ -14,7 +14,7 @@
-
+
@@ -409,7 +409,7 @@
/* #endif */
/* #ifdef H5 */
position: fixed;
- top: 44px;
+ top: 0;
left: 0;
z-index: 999;
/* #endif */
diff --git a/pages/cooperate/hehuo.vue b/pages/cooperate/hehuo.vue
index c7deb64..08e2e7f 100644
--- a/pages/cooperate/hehuo.vue
+++ b/pages/cooperate/hehuo.vue
@@ -62,9 +62,9 @@
备注
-
+
-
+
提交申请
@@ -98,11 +98,11 @@
checked: 'true'
},
{
- value: '200',
+ value: '50到200平米',
name: '50到200平米'
},
{
- value: '平米以上',
+ value: '200平米以上',
name: '200平米以上'
},
],
@@ -121,7 +121,7 @@
name: '15-20人'
},
{
- value: '人以上',
+ value: '20人以上',
name: '20人以上'
},
],
@@ -147,8 +147,22 @@
xiangmuData:'',
}
},
+ mounted() {
+ },
methods: {
save() {
+ if(!this.mendianData){
+ this.mendianData=this.jingying[0].value
+ }
+ if(!this.mianjiData){
+ this.mianjiData=this.mianji[0].value
+ }
+ if(!this.tuanduiData){
+ this.tuanduiData=this.tuandui[0].value
+ }
+ if(!this.xiangmuData){
+ this.xiangmuData=this.xiangmu[0].value
+ }
if (this.userName === '') {
this.$queue.showToast('请输入姓名')
return;
@@ -256,9 +270,10 @@
margin-top: 180rpx;
/* #endif */
}
-
- /deep/.uni-textarea-textarea{
+ .uni-textarea-compute{
+ }
+ /deep/.uni-textarea-textarea{
border-radius: 8rpx;
margin-top: 20rpx;
}
@@ -328,6 +343,7 @@
border-radius: 10px;
padding: 20px;
margin-top: 20rpx;
+ margin-bottom: 50px;
}
.send-msg{
padding: 0 30rpx;
diff --git a/pages/cooperate/index.vue b/pages/cooperate/index.vue
index bdbbc0d..17c42f9 100644
--- a/pages/cooperate/index.vue
+++ b/pages/cooperate/index.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1334dcf..2898a5c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -101,7 +101,7 @@
-
+
@@ -127,7 +127,6 @@
{{item.artificerName}}
-
@@ -240,6 +239,10 @@
-
+
+
+
+
+
+
+
+ {{item.consortiaName}}
+
+
+ {{item.consortiaContent}}
+
+
+ {{tag}}
+
+
+
+
+ 预约
+
+
+
+
+
@@ -93,11 +115,14 @@
titleNmae:'',
classifyId:'',
getName:'',
+ getText:'',
+ tagsData:[]
}
},
onLoad(e){
this.typeData=e.type
this.getName=e.name;
+ this.getText=e.text
this.myId = uni.getStorageSync('userId')
this.getData()
},
@@ -131,8 +156,9 @@
},
getData(){
var that=this;
- that.$Request.get("/app/massage/package/findPage", {
- type:that.typeData,
+ if(that.getText=='企业'){
+ that.$Request.get("/app/artificer/selectMassageTypeQyPage", {
+ city:'长春',
page:that.page,
limit:that.limit,
title:that.searchValue
@@ -145,6 +171,25 @@
}
}
});
+ }else{//约到店
+ that.$Request.get("/app/consortia/selectConsortiaList", {
+ page:that.page,
+ limit:that.limit,
+ title:that.searchValue
+ }).then(res => {
+ if (res.code == 0) {
+ if (res.data) {
+ if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+ this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
+ for(var i=0;i
-
-
+