xinyi/kaiguan-zfb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aaa

Browse Source
This commit is contained in:
3321822538@qq.com 2024-07-10 18:01:40 +08:00
parent d589d35782
commit 0953423479
8 changed files with 994 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/http.interceptor.js
View File

@ -20,8 +20,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
baseUrl: 'http://124.221.246.124:2290',
// baseUrl: 'https://kg.chuantewulian.cn/prod-api',
// baseUrl: 'http://124.221.246.124:2290',
baseUrl: 'https://kg.chuantewulian.cn/prod-api',
loadingText: '努力加载中~',
loadingTime: 1000,
// 设置自定义头部content-type

1046
page_components/eletj.vue
View File

File diff suppressed because it is too large Load Diff

69
page_components/fuwu/index.vue
View File

@ -80,8 +80,7 @@
id="myTextarea"
cols="30"
rows="10"
style="pointer-events: none;"
></textarea>
style="pointer-events: none;"></textarea>
<!-- <textarea name="" v-model="item.description == null ? '无' : item.description" id="" cols="30" rows="10"></textarea> -->
</view>
@ -100,8 +99,6 @@
<view class="mask" v-if="czflag"></view>
</view>
</view>
@ -392,29 +389,29 @@
})
if (this.ver_data == '') {
let that = this
xBlufi.initXBlufi(1);
xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
'isStart': true
})
setTimeout(() => {
xBlufi.notifyStartDiscoverBle({
'isStart': false
})
if (that.devicesList.length > 0) {
xBlufi.notifyConnectBle({
isStart: true,
deviceId: that.deviceId,
name: that.name
})
}
}, 2000)
uni.showModal({
title: '提示',
content: '支付失败，支付的时候请靠近设备,并打开蓝牙',
title: '温馨提示',
content: '支付失败,支付的时候需要靠近设备,并打开蓝牙',
success: function(res) {
if (res.confirm) {
xBlufi.initXBlufi(1);
xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
'isStart': true
})
setTimeout(() => {
xBlufi.notifyStartDiscoverBle({
'isStart': false
})
if (that.devicesList.length > 0) {
xBlufi.notifyConnectBle({
isStart: true,
deviceId: that.deviceId,
name: that.name
})
}
}, 2000)
} else if (res.cancel) {
console.log('用户点击了取消');
}
@ -451,10 +448,11 @@
url: '/pages/shouye/index'
})
uni.setStorageSync('time', that.expireTimeStr)
},
fail(err) {
this.czflag = false
uni.hideLoading()
},fail(err) {
setTimeout(()=>{
this.czflag = false
uni.hideLoading()
},500)
// 支付失败逻辑
uni.showToast({
title: '支付失败',
@ -469,6 +467,8 @@
uni.reLaunch({
url: '/pages/login/login'
})
}else{
this.czflag = false
}
})
}
@ -497,7 +497,7 @@
if (device.name == this.mac) {
this.deviceId = device.deviceId
this.name = device.name
console.log(device.name,this.mac,'222');
// console.log(device.name,this.mac,'222');
this.devicesList.push(device);
let uniqueDevicesList = Array.from(new Set(this.devicesList));
// 将去重后的数组重新赋值给 this.devicesList
@ -521,11 +521,10 @@
break;
case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
this.ver_data = this.parseCustomData(options.data)
console.log("1收到设备发来的自定义数据结果：", this.ver_data);
this.czflag = false
uni.hideLoading()
console.log("1收到设备发来的自定义数据结果：", this.ver_data);
break;
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
if (options.result) {
@ -533,17 +532,7 @@
let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) === "CTKG");
// 将过滤后的数组重新赋值给 this.devicesList
this.devicesList = filteredDevices;
filteredDevices.forEach(device => {
// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
let macFromName = device.name.substring(device.name.length - 12);
console.log(macFromName);
// 与 this.mac 进行比较
if (macFromName == this.mac) {
this.ishave = true;
}
})
}
this.searching = false
break;
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
if (!options.result) {

37
page_fenbao/statulist/myorder/detailxq/index.vue
View File

@ -24,6 +24,9 @@
<text class="qian" v-if="detailobj.status == 6">
支付中
</text>
<text class="qian" v-if="detailobj.status == 7">
退款中
</text>
</view>
<view class="nav">
<text class="shen">设备编号</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
@ -34,6 +37,9 @@
<view class="nav">
<text class="shen">用户</text><text class="qian">{{detailobj.userName == undefined ? '--' : detailobj.userName}}</text>
</view>
<view class="nav">
<text class="shen">收款人手机号</text><text class="qian" @click="call">{{detailobj.mchName == undefined ? '--' : detailobj.mchName}}</text>
</view>
<view class="nav">
<text class="shen">消费时间</text><text class="qian">{{detailobj.createTime == undefined ? '--' : detailobj.createTime}}</text>
</view>
@ -58,7 +64,7 @@
<text class="shen">共计</text><text class="qian">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
</view>
</view>
<view class="sb" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
margin: auto;
padding: 32rpx 24rpx;
@ -103,10 +109,13 @@
detailobj:{},
imgad:'',
maskflag:false,
inptext:''
inptext:'',
userType:{},
userflag:false
}
},
onLoad(option) {
this.userType = uni.getStorageSync('userType')
if(option.billId){
this.billId = option.billId
this.getlist()
@ -114,6 +123,23 @@
}
},
methods: {
call() {
let phoneNumber = this.detailobj.mchName
uni.makePhoneCall({
phoneNumber: phoneNumber,
success: function(res) {
console.log('拨打电话成功', res);
},
fail: function(err) {
console.error('拨打电话失败', err);
uni.showToast({
title: '拨打电话失败',
icon: 'none'
})
}
})
},
btnqd(){
if(this.inptext > this.detailobj.money){
uni.showToast({
@ -131,7 +157,7 @@
if (res.code == 200) {
uni.showToast({
title: '操作成功',
icon: 'none',
icon: 'success',
duration: 3000
})
}else{
@ -159,6 +185,11 @@
this.$u.get(`/app/bill/${this.billId}`).then((res) => {
if (res.code == 200) {
this.detailobj = res.data
if(res.data.mchId == this.userType.userId){
this.userflag = true
}else{
this.userflag = false
}
}
})
},

3
page_fenbao/statulist/myorder/index.vue
View File

@ -30,6 +30,9 @@
<view class="top" v-if="item.status == 6">
支付中 <u-icon name="arrow-right" color="#808080" size="20" style="margin-left: 10rpx;"></u-icon>
</view>
<view class="top" v-if="item.status == 7">
退款中 <u-icon name="arrow-right" color="#808080" size="20" style="margin-left: 10rpx;"></u-icon>
</view>
<view class="je" style="text-align: right;">
{{item.money}}元
</view>

2
page_user/cbRecord.vue
View File

@ -7,7 +7,7 @@
<view class="list_val">
<view class="lt">
<view class="tit">{{item.deviceName}}</view>
<view class="wz">地点：{{item.storeName}}</view>
<view class="wz">地点：{{item.storeName == null ? '--' : item.storeName}}</view>
<view class="wz">订单号：{{item.billNo}}</view>
<view class="wz">消费时间：{{item.createTime}}</view>
</view>

2
page_user/sbdetail.vue
View File

@ -182,7 +182,7 @@
deviceInfo: {},
loadings: false,
info: '',
tittxt: "设备列表",
tittxt: "设备详情",
titlist: [
"全部",
"电表",

250
pages/shouye/index.vue
View File

@ -9,6 +9,23 @@
<map class='map' id="map" :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
:show-location="true" :markers="covers" :scale="mapScale" />
</view>
<!-- 正在进行中的订单 -->
<!-- <view class="ongoing_order">
<view class="order_top">
<view class="order_lt">
<image src="https://api.ccttiot.com/smartmeter/img/static/uFNuOet0fB5Bwe1c26sk" mode=""></image>
<text>您有正在使用中的设备...</text>
</view>
<image @click="btnorder" v-if="!listflag" src="https://api.ccttiot.com/smartmeter/img/static/ublEB3HEjyfZbnKS2Ai9" mode=""></image>
<image @click="btnorders" v-if="listflag" style="transform: rotate(180deg);margin-top: 20rpx;" src="https://api.ccttiot.com/smartmeter/img/static/ublEB3HEjyfZbnKS2Ai9" mode=""></image>
</view>
<view class="order_list" v-for="(item,index) in 3" :key="index" v-if="listflag" @click="btnitem">
<text>共享洗衣机001</text> <image src="https://api.ccttiot.com/smartmeter/img/static/uZoBXJ0MLrGUSBFk5lGp" mode=""></image>
</view>
</view> -->
<!-- 正在进行中的订单结束 --><!-- 正在进行中的订单结束 -->
<view class="fujin">
<image src="https://api.ccttiot.com/smartmeter/img/static/uqv3e5ThWL8DqrRNBfoA" mode=""
@click="btnindex(5)"></image>
@ -74,6 +91,7 @@
export default {
data() {
return {
listflag:false,
params: {
year: true,
month: true,
@ -101,13 +119,13 @@
bgc: {
backgroundColor: "#8883F0",
},
deviceobj:{},
deviceCount:0
deviceobj: {},
deviceCount: 0
};
},
onLoad(option) {
if (option.flag) {
let id = option.id
let id = option.id
this.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
if (res.code == 200) {
this.deviceobj = res.data;
@ -125,14 +143,15 @@
that.$u.put("/app/device/bind", data).then(res => {
if (res.code == 200) {
uni.navigateTo({
url: '/page_user/sbdetail?id=' +that.deviceobj.deviceId
url: '/page_user/sbdetail?id=' + that.deviceobj
.deviceId
})
}else {
if(res.msg == '设备未录入'){
} else {
if (res.msg == '设备未录入') {
uni.navigateTo({
url:'/page_fenbao/zhuce?sn=' + id
url: '/page_fenbao/zhuce?sn=' + id
})
}else{
} else {
uni.showToast({
title: res.msg,
icon: 'none',
@ -167,6 +186,19 @@
}
},
methods: {
btnitem(){
uni.navigateTo({
url:'/page_components/eletj'
})
},
// 点击显示使用中设备
btnorder(){
this.listflag = true
},
btnorders(){
this.listflag = false
},
btnad() {
this.$u.get("/app/ad").then((res) => {
if (res.code == 200) {
@ -183,7 +215,7 @@
})
},
calculateAnchorX(name) {
let chineseLength = 0
let englishLength = 0
@ -309,11 +341,12 @@
this.longitude = Number(res.longitude.toFixed(5)) + 0.005
this.setMapScale()
// 请求附近的店铺
this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(res => {
this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
res => {
if (res.code == 200) {
this.listmap = res.data
res.data.forEach(item => {
if (item.deviceCount !== null && item.deviceCount > 0){
if (item.deviceCount !== null && item.deviceCount > 0) {
const shopCover = {
id: parseFloat(item.storeId),
latitude: item.lat,
@ -326,27 +359,33 @@
anchorX: (() => {
if (item.name.length <= 2) {
return -12
} else if (item.name.length <= 3) {
} else if (item.name.length <=
3) {
return -20
} else if (item.name.length <= 4) {
} else if (item.name.length <=
4) {
return -25
} else if (item.name.length <= 5) {
} else if (item.name.length <=
5) {
return -30
} else if (item.name.length <= 6) {
} else if (item.name.length <=
6) {
return -35
} else if (item.name.length <= 8) {
} else if (item.name.length <=
8) {
return -40
} else if (item.name.length <=
10) {
return -45
} else {
return -item.name.length * 6
return -item.name.length *
6
}
})(),
fontWeight: 700,
color: '#8883F0',
borderColor:'#fff',
borderRadius:5,
borderColor: '#fff',
borderRadius: 5,
bgColor: '#fff'
}
}
@ -378,46 +417,46 @@
},
addMarkersWithoutLabels() {
this.listmap.forEach((item) => {
if (item.deviceCount !== null && item.deviceCount > 0){
if (item.deviceCount !== null && item.deviceCount > 0) {
const shopCover = {
id: parseFloat(item.storeId),
latitude: item.lat,
longitude: item.lng,
width: 25,
height: 30,
iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
borderColor:'#fff',
borderRadius:5,
bgColor: '#fff'
};
this.covers.push(shopCover);
id: parseFloat(item.storeId),
latitude: item.lat,
longitude: item.lng,
width: 25,
height: 30,
iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
borderColor: '#fff',
borderRadius: 5,
bgColor: '#fff'
};
this.covers.push(shopCover);
}
});
},
addMarkersWithLabels() {
this.listmap.forEach((item) => {
if (item.deviceCount !== null && item.deviceCount > 0){
if (item.deviceCount !== null && item.deviceCount > 0) {
const shopCover = {
id: parseFloat(item.storeId),
latitude: item.lat,
longitude: item.lng,
width: 25,
height: 30,
iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
label: {
content: item.name,
anchorX: this.calculateAnchorX(item.name),
fontWeight: 700,
color: '#8883F0',
textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
borderColor:'#fff',
borderRadius:5,
bgColor: '#fff'
id: parseFloat(item.storeId),
latitude: item.lat,
longitude: item.lng,
width: 25,
height: 30,
iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
label: {
content: item.name,
anchorX: this.calculateAnchorX(item.name),
fontWeight: 700,
color: '#8883F0',
textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
borderColor: '#fff',
borderRadius: 5,
bgColor: '#fff'
}
}
this.covers.push(shopCover);
}
this.covers.push(shopCover);
}
});
},
@ -429,37 +468,37 @@
},
logins() {
if (uni.getStorageSync('userType')) {
this.userType = uni.getStorageSync('userType')
this.userType = '01'
if (this.userType == '01') {
this.getDeviceList()
} else if (this.userType == '00') {
this.getdevice()
}
} else {
// if (uni.getStorageSync('userType')) {
// this.userType = uni.getStorageSync('userType')
// this.userType = '01'
// if (this.userType == '01') {
// this.getDeviceList()
// } else if (this.userType == '00') {
// this.getdevice()
// }
// } else {
}
// }
this.getuserinfo()
},
getuserinfo() {
this.$u.get("/app/user/userInfo").then((res) => {
if (res.code == 200) {
this.isMch = res.data.isMch
uni.setStorageSync('userType', res.data.userType)
uni.setStorageSync('userType', res.data)
this.userType = res.data.userType
this.deviceCount = res.data.deviceCount
if (this.userType == '01') {
this.getDeviceList()
} else if (this.userType == '00') {
this.getdevice()
}
// if (this.userType == '01') {
// this.getDeviceList()
// } else if (this.userType == '00') {
// this.getdevice()
// }
} else {
this.jmlogin()
}
})
},
jmlogin() {
let taht = this
wx.login({
@ -530,7 +569,8 @@
.dateactive {
background: #E1F3ED;
}
.mask{
.mask {
width: 100%;
height: 100vh;
position: fixed;
@ -539,7 +579,7 @@
transform: translateX(-50%);
background-color: #000;
opacity: .6;
}
}
page {
background: linear-gradient(180deg, #8883F0 10%, rgba(255, 255, 255, 0) 100%);
@ -835,6 +875,68 @@
padding-top: 16rpx;
position: relative;
.ongoing_order {
width: 622rpx;
max-height: 100%;
background-color: rgba(0, 0, 0, 0.4);
border-radius: 40rpx 40rpx 40rpx 40rpx;
// opacity: 0.6;
position: absolute;
top: 48rpx;
left: 34rpx;
.order_list{
width: 100%;
height: 110rpx;
// background-color: rgba(0, 0, 0, 0.6);
border-radius: 40rpx 40rpx 40rpx 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 36rpx;
color: #FFFFFF;
padding: 0 38rpx;
padding-right: 56rpx;
box-sizing: border-box;
line-height: 110rpx;
animation: fadeInDown .5s ease-out forwards;
image{
width: 17rpx;
height: 34rpx;
}
}
.order_top {
width: 622rpx;
height: 94rpx;
background: rgba(0, 0, 0, 0.6);
box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0,0,0,0.3);
border-radius: 40rpx 40rpx 40rpx 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 18rpx 42rpx;
box-sizing: border-box;
font-weight: 400;
font-size: 36rpx;
color: #FFFFFF;
.order_lt {
display: flex;
align-items: center;
image {
width: 44rpx;
height: 62rpx;
margin-right: 20rpx;
}
}
image{
width: 47rpx;
height: 47rpx;
padding-bottom: 10rpx;
box-sizing: border-box;
}
}
}
.fujin {
position: absolute;
top: 730rpx;
@ -877,4 +979,14 @@
}
}
}
@keyframes fadeInDown {
from {
opacity: 0;
transform: translateY(-20px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
</style>