From c36536ffddb9bc723648042f5b0b5dbb9afd8ded Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Mon, 19 May 2025 18:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=88=86=E7=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.interceptor.js | 4 +- page_user/luru/bind_mac.vue | 2 +- pages/index/index.vue | 127 +++++++++++++++++++----------------- pages/myorder/index.vue | 56 ++++++++++------ 4 files changed, 106 insertions(+), 83 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index c185c0b..6abfcf5 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -16,10 +16,10 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - // baseUrl: 'http://192.168.0.100:4301', + // baseUrl: 'http://192.168.0.101:4301', baseUrl: 'https://bao.chuangtewl.com/prod-api', loadingText: '努力加载中~', - loadingTime: 800, + loadingTime: 800, // 设置自定义头部content-type header: { 'content-type': 'application/json;charset=UTF-8', diff --git a/page_user/luru/bind_mac.vue b/page_user/luru/bind_mac.vue index 2629e34..99f3394 100644 --- a/page_user/luru/bind_mac.vue +++ b/page_user/luru/bind_mac.vue @@ -160,7 +160,7 @@ } }, getlist() { - this.$u.get('/bst/hardwareVersion/all').then((res) => { + this.$u.get('/bst/model/list').then((res) => { if (res.code === 200) { this.Versionlist = res.data const hardwareVersionId = uni.getStorageSync('hardwareVersionId'); diff --git a/pages/index/index.vue b/pages/index/index.vue index e50bd93..06725d5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,16 +1,17 @@ @@ -19,17 +20,17 @@ export default { data() { return { - bgc: { - backgroundColor: "#000", - }, + bgc: { + backgroundColor: "#000", + }, } - }, + }, onLoad(option) { - console.log(option,uni.getStorageSync('type')); - if(uni.getStorageSync('type')){ + console.log(option, uni.getStorageSync('type')); + if (uni.getStorageSync('type')) { console.log(1); uni.removeStorageSync('type') - }else{ + } else { xBlufi.initXBlufi(1) } }, @@ -39,39 +40,40 @@ }) }, methods: { - // 点击提示暂无功能 - btnwu(){ - uni.showToast({ - title: '当前功能暂未开放', - icon: 'none', - duration: 2000 - }) - }, - // 点击跳转到爆灯 - btnbd(){ - this.$u.get(`/getInfo`).then(res => { - if (res.code == 200) { - uni.navigateTo({ - url:'/pages/myorder/index' - }) - }else if(res.code == 401){ - uni.showModal({ - title: '提示', - content: '你还未登录，是否去登录？', - success: function (res) { - if (res.confirm) { - console.log('用户点击确定') - uni.reLaunch({ - url:'/pages/login/login' - }) - } else if (res.cancel) { - console.log('用户点击取消') - } - } + // 点击提示暂无功能 + btnwu() { + uni.showToast({ + title: '当前功能暂未开放', + icon: 'none', + duration: 2000 + }) + }, + // 点击跳转到爆灯 + btnbd() { + this.$u.get(`/getInfo`).then(res => { + if (res.code == 200) { + uni.navigateTo({ + url: '/pages/myorder/index' }) - } - }) - }, + } else if (res.code == 401) { + uni.showModal({ + title: '提示', + content: '你还未登录，是否去登录？', + success: function(res) { + if (res.confirm) { + console.log('用户点击确定') + uni.reLaunch({ + url: '/pages/login/login' + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + } + }) + }, + } } @@ -81,35 +83,42 @@ background: #fff; border-radius: 0rpx 0rpx 0rpx 0rpx; } - /deep/ .u-line-1{ + + /deep/ .u-line-1 { padding-bottom: 14rpx; } - .boxpic{ - width: 660rpx; + + .boxpic { + width: 500rpx; margin: auto; margin-top: 460rpx; - .bdpic{ + + .bdpic { width: 580rpx; margin: auto; display: flex; justify-content: space-between; margin-top: 14rpx; - image{ + + image { width: 274rpx; height: 138rpx; } } - .bd{ - width: 660rpx; - height: 330rpx; + + .bd { + width: 500rpx; + height: 200rpx; + margin-top: 500rpx; } } - .bj{ - width: 100%; - height: 100vh; + + .bj { + width: 760rpx; + height: 110vh; position: fixed; top: 0; - left: 0; + left: -10rpx; z-index: -1; } \ No newline at end of file diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue index 27f9194..999be9e 100644 --- a/pages/myorder/index.vue +++ b/pages/myorder/index.vue @@ -3,7 +3,8 @@ - + + 记录 @@ -11,20 +12,20 @@ - 深度酒吧 + - 绑定桌号：{{yonghuobj.boothNo}} {{yonghuobj.boothName}} 未绑定 绑定桌号，即可解锁对应桌台的爆灯器 - + 解绑/换绑 @@ -37,20 +38,20 @@ 剩余爆灯次数：{{shengyuobj.number == null ? '0' : shengyuobj.number}}次 - + src="https://api.ccttiot.com/smartmeter/img/static/uw0QKoMF30vahW7o1YPU" mode=""> + src="https://api.ccttiot.com/smartmeter/img/static/u0piVrPcUak8yM6mMziR" mode=""> + src="https://api.ccttiot.com/smartmeter/img/static/u0piVrPcUak8yM6mMziR" mode=""> - {{countdown > 0 ? `请等待${countdown}秒后再点击` : '点击爆灯'}} @@ -67,7 +68,7 @@ 绑定桌号 - {{yonghuobj.boothNo}} + {{yonghuobj.boothName == null ? '--' : yonghuobj.boothName}} @@ -120,7 +121,6 @@ - @@ -165,6 +165,7 @@ const sceneValue = option.q const decodedValue = decodeURIComponent(sceneValue) this.kazuoid = getQueryParam(decodedValue, 'k') + console.log(this.kazuoid,option.q); if (!this.kazuoid) { uni.showModal({ title: '提示', @@ -268,7 +269,7 @@ mask: true }) that.$u.put( - `/app/booth/userChangeBind?usingBoothNo=${that.yonghuobj.boothNo}&changeBoothNo=${that.kazuoid}` + `/app/booth/userChangeBind?usingBoothId=${that.yonghuobj.boothId}&changeBoothId=${that.kazuoid}` ).then(res => { uni.hideLoading() if (res.code == 200) { @@ -326,7 +327,7 @@ success: function(res) { if (res.confirm) { console.log('用户点击确定') - that.$u.put(`/app/booth/${that.yonghuobj.boothNo}/unbind`).then(res => { + that.$u.put(`/app/booth/${that.yonghuobj.boothId}/unbind`).then(res => { uni.hideLoading() if (res.code == 200) { that.smflag = false @@ -631,6 +632,7 @@ const sceneValue = res.result const decodedValue = decodeURIComponent(sceneValue) this.kazuoid = getQueryParam(decodedValue, 'k') + console.log(this.kazuoid,res); if (!this.kazuoid) { uni.showModal({ title: '提示', @@ -693,6 +695,7 @@ } }) } + } } @@ -1170,11 +1173,12 @@ font-weight: 600; font-size: 44rpx; color: #3D3D3D; - padding-top: 94rpx; + padding-top: 64rpx; box-sizing: border-box; - padding-bottom: 62rpx; - box-sizing: border-box; - + image{ + width: 232rpx; + height: 138rpx; + } .neon-text { background: linear-gradient(90deg, #FF00FF, #00FFFF, #FF00FF, #00FFFF); background-size: 300% 100%; @@ -1183,6 +1187,7 @@ animation: neonGradient 3s linear infinite; text-shadow: 0 0 10rpx rgba(255, 0, 255, 0.5), 0 0 20rpx rgba(0, 255, 255, 0.5); + } } @@ -1219,14 +1224,23 @@ } .bj { - width: 100%; + width: 760rpx; height: 100vh; position: fixed; top: 0; - left: 0; - z-index: -1; + left: -10rpx; + z-index: -2; + + } + .bjmask{ + width: 100%; + height: 100vh; + position: fixed; + z-index: -1; + top: 0; + left: 0; + background-color: rgba(0, 0, 0, .3); } - .breathing-light { .breathing-image { animation: breathing 2s ease-in-out infinite;