From 765d42adaacbb31ef667b0690a8aad666a5e69ff Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 15 Oct 2024 17:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http.interceptor.js | 4 +-
page_components/fuwu/index.vue | 2 +-
page_components/shiming.vue | 6 +-
.../statulist/myorder/detailxq/index.vue | 4 +-
page_user/mapditu/orderxq.vue | 18 +---
page_user/switchs.vue | 2 +-
pages/shouye/index.vue | 82 +++++++++++++++++--
7 files changed, 88 insertions(+), 30 deletions(-)
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 38e7a67..7e687a1 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -19,8 +19,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
- baseUrl: 'http://192.168.2.106:10002',
- // baseUrl: 'https://kg.chuangtewl.com/prod-api',
+ // baseUrl: 'http://192.168.2.15:10002',
+ baseUrl: 'https://kg.chuangtewl.com/prod-api',
// loadingText: '努力加载中~',
// loadingTime: 1000,
// 设置自定义头部content-type
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index d1bcd74..bfc1493 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -641,7 +641,7 @@
})
} else {
if (this.ver_data == '') {
- this.czflag = true
+ this.czflag = true
uni.showLoading({
title: '蓝牙连接中'
})
diff --git a/page_components/shiming.vue b/page_components/shiming.vue
index 446af1e..6d03d62 100644
--- a/page_components/shiming.vue
+++ b/page_components/shiming.vue
@@ -12,10 +12,6 @@
身份证号
-
- 手机号
-
-
@@ -85,7 +81,7 @@
let data = {
realName: this.name,
realIdCard: this.names,
- realPhone: this.tel
+ // realPhone: this.tel
}
this.$u.put('/app/user/realName', data).then(res => {
if (res.code == 200) {
diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue
index 4c291a9..66b587c 100644
--- a/page_fenbao/statulist/myorder/detailxq/index.vue
+++ b/page_fenbao/statulist/myorder/detailxq/index.vue
@@ -54,9 +54,9 @@
分时段计时收费
- 使用度数{{Number(detailobj.suitEndEle) - Number(detailobj.suitStartEle)}}度
+ 使用度数{{Number(detailobj.suitEndEle).toFixed(2) - Number(detailobj.suitStartEle).toFixed(2)}}度
-
+
套餐时长{{detailobj.suitTime == undefined ? '--' : detailobj.suitTime}}
天 时 分钟 秒
diff --git a/page_user/mapditu/orderxq.vue b/page_user/mapditu/orderxq.vue
index 33015cf..a45d0fb 100644
--- a/page_user/mapditu/orderxq.vue
+++ b/page_user/mapditu/orderxq.vue
@@ -35,6 +35,9 @@
用户{{detailobj.userName == undefined ? '--' : detailobj.userName}}
+
+ 用户手机{{detailobj.userMobile == undefined ? '--' : detailobj.userMobile}}
+
设备名称{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}
@@ -58,7 +61,7 @@
分时段计时收费
- 使用度数{{Number(detailobj.suitEndEle) - Number(detailobj.suitStartEle)}}度
+ 使用度数{{Number(detailobj.suitEndEle).toFixed(2) - Number(detailobj.suitStartEle),toFixed(2)}}度
套餐时长{{detailobj.suitTime == undefined ? '--' : detailobj.suitTime}}
@@ -96,9 +99,6 @@
margin-top: 30rpx;align-items: center;">
退款
-
@@ -128,7 +128,6 @@
return {
billId:'',
detailobj:{},
- imgad:'',
maskflag:false,
inptext:'',
userType:{},
@@ -141,7 +140,6 @@
if(option.billId){
this.billId = option.billId
this.getlist()
- // this.getad()
}
},
// 分享到好友（会话）
@@ -218,9 +216,6 @@
},
btntz(){
this.maskflag = true
- // uni.navigateTo({
- // url:'/page_user/sbdetail?id=' + this.detailobj.deviceId + '&flag=' + true
- // })
},
getlist(){
this.$u.get(`/app/bill/${this.billId}`).then((res) => {
@@ -285,9 +280,6 @@
.page {
width: 750rpx;
- // position: fixed;
- // top: 0;
- // left: 0;
.tanc {
width: 594rpx;
@@ -334,9 +326,7 @@
.shuzhi {
display: flex;
align-items: center;
- // justify-content: space-between;
justify-content: center;
- // padding: 0 60rpx;
margin-top: 50rpx;
box-sizing: border-box;
diff --git a/page_user/switchs.vue b/page_user/switchs.vue
index 8fc6790..5d37903 100644
--- a/page_user/switchs.vue
+++ b/page_user/switchs.vue
@@ -37,7 +37,7 @@
- 用户手机：{{item.userName == null ? '--' : item.userName}}
+ 用户：{{item.userName == null ? '--' : item.userName}}
订单费用：{{item.money == null ? '--' : item.money}}元
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 13d1abb..c6f72d9 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -101,8 +101,21 @@
+
+
+
+
+ x
+
+
+ 请先获取手机号再进入商家中心
+
+
+
+
+
@@ -110,6 +123,7 @@
export default {
data() {
return {
+ huoqutelflag:false,
weiflag: false,
listflag: false,
params: {
@@ -143,7 +157,8 @@
sylist: [],
networkInterval: null,
wangluo: true,
- billNo: ''
+ billNo: '',
+ phonenumber:''
};
},
onLoad(option) {
@@ -473,9 +488,13 @@
duration: 2000
})
}else{
- uni.switchTab({
- url: '/pages/index/index'
- })
+ if(this.phonenumber == ''){
+ this.huoqutelflag = true
+ }else{
+ uni.switchTab({
+ url: '/pages/index/index'
+ })
+ }
}
} else if (res.code == 401) {
uni.reLaunch({
@@ -502,7 +521,23 @@
})
}
},
-
+ // 商户获取手机号
+ getPhoneNumber(e){
+ this.$u.put(`/app/user/bindWxMobile?mobileCode=${e.detail.code}`).then(res =>{
+ if(res.code == 200){
+ this.huoqutelflag = false
+ uni.switchTab({
+ url: '/pages/index/index'
+ })
+ }else{
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 1000
+ })
+ }
+ })
+ },
// 点击 地图回到自身最中心点
onControltap(control) {
this.setMapScale()
@@ -681,6 +716,7 @@
uni.setStorageSync('userType', res.data)
this.userType = res.data.userType
this.deviceCount = res.data.deviceCount
+ this.phonenumber = res.data.phonenumber
} else {
this.jmlogin()
}
@@ -741,6 +777,42 @@