From 9e277c90594666bd632fe316f129a0d94c82c5d7 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Mon, 9 Sep 2024 18:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http.interceptor.js | 4 +-
components/blufi/xBlufi-wx-impl.js | 2 +-
page_user/changsuo.vue | 2 +-
page_user/changsuoxq.vue | 2 +-
page_user/deviceedit.vue | 2 +-
page_user/devicelist.vue | 16 +-
page_user/fuwu.vue | 685 +++++++++++++++++++++++++----
page_user/mydetail.vue | 4 +-
page_user/orderdetail.vue | 2 +-
page_user/orderlist.vue | 18 +-
pages/nearbystores/index.vue | 2 +-
11 files changed, 641 insertions(+), 98 deletions(-)
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index ee180eb..134b800 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
- // baseUrl: 'http://192.168.2.223:3302',
- baseUrl: 'https://kang.chuangtewl.com/prod-api',
+ baseUrl: 'http://192.168.2.81:3302',
+ // baseUrl: 'https://kang.chuangtewl.com/prod-api',
loadingText: '努力加载中~',
loadingTime: 800,
// 设置自定义头部content-type
diff --git a/components/blufi/xBlufi-wx-impl.js b/components/blufi/xBlufi-wx-impl.js
index 73a0452..b0a5566 100644
--- a/components/blufi/xBlufi-wx-impl.js
+++ b/components/blufi/xBlufi-wx-impl.js
@@ -1145,7 +1145,7 @@ function init() {
// && devices.devices[0].name != 'SMART_R2XS'
// && devices.devices[0].name != 'SMART_R2XS'
// )
- if (devices.devices[0].name.indexOf("CTKG") != -1 || devices.devices[0].name.indexOf("CTPO") != -1){
+ if (devices.devices[0].name.indexOf("CTKG") != -1 || devices.devices[0].name.indexOf("CTPO") != -1 || devices.devices[0].name.indexOf("BBLE") != -1){
// console.log("跳过",devices.devices[0].name)
// isnotexist = false;
isnotexist = true;
diff --git a/page_user/changsuo.vue b/page_user/changsuo.vue
index 054473e..80047ff 100644
--- a/page_user/changsuo.vue
+++ b/page_user/changsuo.vue
@@ -69,7 +69,7 @@
{{item.contactMobile}}
- 详细地址：
+ 详细地址：
{{item.address}}
diff --git a/page_user/changsuoxq.vue b/page_user/changsuoxq.vue
index 887a749..79209c9 100644
--- a/page_user/changsuoxq.vue
+++ b/page_user/changsuoxq.vue
@@ -41,7 +41,7 @@
{{obj.businessTimeStart == undefined ? '' : obj.businessTimeStart}}~{{obj.businessTimeEnd == undefined ? '' : obj.businessTimeEnd}}
- 详细地址：
+ 详细地址：
{{obj.address}}
diff --git a/page_user/deviceedit.vue b/page_user/deviceedit.vue
index bc21878..1c44051 100644
--- a/page_user/deviceedit.vue
+++ b/page_user/deviceedit.vue
@@ -55,7 +55,7 @@
{{obj.storeName == undefined ? '--' : obj.storeName}}
- 经营地址：
+ 经营地址：
{{obj.storeAddress == undefined ? '--' : obj.storeAddress}}
diff --git a/page_user/devicelist.vue b/page_user/devicelist.vue
index 963d997..ff2cd35 100644
--- a/page_user/devicelist.vue
+++ b/page_user/devicelist.vue
@@ -40,15 +40,18 @@
未绑定
- 经营地址
+ 经营地址
{{item.storeAddress == undefined ? '--' : item.storeAddress}}
-
+
所在房间
-
+
修改
+
+ 所在房间
+ {{item.room}}
+
设备状态
@@ -191,6 +194,9 @@
url: '/page_user/deviceedit?deviceId=' + deviceId
})
},
+ change(room){
+ this.room = room
+ },
// 修改房间号
btnedit(deviceId) {
let data = {
@@ -469,7 +475,7 @@
}
.zong {
- margin-top: 36rpx;
+ margin-top: 14rpx;
display: flex;
justify-content: space-between;
text-align: center;
diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue
index 5b164b8..19e0237 100644
--- a/page_user/fuwu.vue
+++ b/page_user/fuwu.vue
@@ -18,70 +18,153 @@
-
-
-
-
-
- {{item.name}} {{item.usePoint}}%用户选择
-
-
-
- ￥{{item.price}}
-
-
- 可使用{{item.value}} {{item.timeUnit == 3 ? '分钟' : '小时'}}
-
-
-
-
-
-
-
- 设备规格
-
-
- 尺寸：{{obj.size == undefined ? '--' : obj.size}}
-
-
- 面料：{{obj.fabric == undefined ? '--' : obj.fabric}}
-
-
- 填充物：{{obj.fill == undefined ? '--' : obj.fill}}
-
-
- 设备地址：{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
-
-
-
-
-
-
-
- 我已同意
- 《用户服务协议》
-
-
- 立即支付
-
-
- 立即支付
-
-
+
+
+
+
+
+
+
+
+
+ {{item.name}} {{item.usePoint}}%用户选择
+
+
+
+ ￥{{item.price}}
+
+
+ 可使用{{item.value}} {{item.timeUnit == 3 ? '分钟' : '小时'}}
+
+
+
+
+
+
+
+ 设备规格
+
+
+ 尺寸：{{obj.size == undefined ? '--' : obj.size}}
+
+
+ 面料：{{obj.fabric == undefined ? '--' : obj.fabric}}
+
+
+ 填充物：{{obj.fill == undefined ? '--' : obj.fill}}
+
+
+ 设备地址：{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
+
+
+
+
+
+
+
+ 我已同意
+ 《用户服务协议》
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+
+ 请选择您要联系的客服
+
+
+ 我们根据选择为您提供服务
+
+
+
+
+
+
+
+ 官方客服
+ 13850396941
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+ 正在充值中,请稍后
+
+
+ {{progress}} %
+
+
+
+
@@ -325,21 +722,161 @@
.actives {
background-color: #fff !important;
- // color: #fff !important;
}
/deep/ .u-title {
padding-bottom: 15rpx;
}
-
- // /deep/ .u-icon__icon {
- // padding-bottom: 15rpx;
- // }
-
+ .czdh{
+ width: 100%;
+ height: 100vh;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background-color: rgba(0, 0, 0, .5);
+ padding-top: 700rpx;
+ .bj{
+ width: 500rpx;
+ height: 300rpx;
+ background-color: #fff;
+ margin: auto;
+ border-radius: 20rpx;
+ .tittop{
+ width: 100%;
+ text-align: center;
+ padding-top: 50rpx;
+ box-sizing: border-box;
+ }
+ .bfb{
+ width: 100%;
+ text-align: center;
+ padding-top: 50rpx;
+ box-sizing: border-box;
+ font-size: 50rpx;
+ }
+ }
+ }
+ .kflist{
+ width: 590rpx;
+ height: 874rpx;
+ background: #FFFFFF;
+ border-radius: 28rpx 28rpx 28rpx 28rpx;
+ position: fixed;
+ top: 326rpx;
+ left: 50%;
+ transform: translateX(-50%);
+ z-index: 1;
+ padding-top: 48rpx;
+ box-sizing: border-box;
+ .qx{
+ width: 436rpx;
+ height: 68rpx;
+ background: #A29EFF;
+ border-radius: 40rpx 40rpx 40rpx 40rpx;
+ text-align: center;
+ line-height: 68rpx;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ margin: auto;
+ margin-top: 52rpx;
+ }
+ .kftit{
+ font-size: 40rpx;
+ color: #3D3D3D;
+ font-size: 500;
+ width: 100%;
+ text-align: center;
+ }
+ .kfwz{
+ font-size: 28rpx;
+ color: #3D3D3D;
+ margin-top: 16rpx;
+ width: 100%;
+ text-align: center;
+ }
+ .kfshuzu{
+ .item_val{
+ display: flex;
+ align-items: center;
+ padding-left: 30rpx;
+ box-sizing: border-box;
+ width: 528rpx;
+ height: 144rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0,0,0,0.1);
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+ margin: auto;
+ margin-top: 42rpx;
+ .lt{
+ margin-right: 34rpx;
+ image{
+ width: 76rpx;
+ height: 78rpx;
+ }
+ }
+ .rt{
+ font-size: 32rpx;
+ color: #3D3D3D;
+ }
+ }
+ }
+ }
+ .mask{
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100vh;
+ background-color: #000;
+ opacity: .5;
+ }
page {
background-color: #F7FAFE;
overflow: hidden;
}
+ .shibai {
+ margin-top: 50rpx;
+ text-align: center;
+ padding-bottom: 600rpx;
+ height: 100vh;
+ overflow: scroll;
+
+ .jxcz {
+ width: 563rpx;
+ height: 100rpx;
+ background: #8883F0;
+ border-radius: 60rpx 60rpx 60rpx 60rpx;
+ text-align: center;
+ line-height: 100rpx;
+ font-size: 45rpx;
+ color: #FFFFFF;
+ position: fixed;
+ bottom: 62rpx;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ .top {
+ font-size: 40rpx;
+ color: #3D3D3D;
+ }
+
+ .tishi {
+ font-size: 31rpx;
+ color: #3D3D3D;
+ margin-top: 50rpx;
+ }
+
+ .li {
+ margin-top: 50rpx;
+ font-size: 31rpx;
+ color: #3D3D3D;
+
+ image {
+ margin-top: 30rpx;
+ }
+ }
+ }
.pages {
width: 750rpx;
diff --git a/page_user/mydetail.vue b/page_user/mydetail.vue
index 2a01a11..b1a6f36 100644
--- a/page_user/mydetail.vue
+++ b/page_user/mydetail.vue
@@ -14,7 +14,7 @@
- {{detailobj.suitTime == undefined ? '--' : detailobj.suitTime}}{{detailobj.timeUnit == 3 ? '分钟' : '小时'}}
+ {{detailobj.suitTime == undefined ? '--' : detailobj.suitTime}}{{detailobj.suitTimeUnit == 3 ? '分钟' : '小时'}}
套餐时长
@@ -67,7 +67,7 @@
- 租借店铺：
+ 经营场所：
{{detailobj.storeName == undefined ? '--' : detailobj.storeName}}
diff --git a/page_user/orderdetail.vue b/page_user/orderdetail.vue
index 436d73a..be3083b 100644
--- a/page_user/orderdetail.vue
+++ b/page_user/orderdetail.vue
@@ -24,7 +24,7 @@
{{obj.storeName == undefined ? '--' : obj.storeName}}
- 经营地址
+ 经营地址
{{obj.storeAddress == undefined ? '--' : obj.storeAddress}}
diff --git a/page_user/orderlist.vue b/page_user/orderlist.vue
index ce9a875..76d98ff 100644
--- a/page_user/orderlist.vue
+++ b/page_user/orderlist.vue
@@ -29,15 +29,15 @@
进行中
已完成
- 未支付
- 支付成功
- 已退款
- 用户取消
- 系统超时取消
- 支付中
- 退款中
- 押金未支付
- 押金已支付
+ 未支付
+ 支付成功
+ 已退款
+ 用户取消
+ 系统超时取消
+ 支付中
+ 退款中
+ 押金未支付
+ 押金已支付
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index d20c0ec..21656ba 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -423,7 +423,7 @@
box-sizing: border-box;
height: 40vh;
overflow-y: scroll;
- padding-bottom: 400rpx;
+ padding-bottom: 100rpx;
.moshi {
position: absolute;