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

有待修改

Browse Source
This commit is contained in:
3321822538@qq.com 2024-05-25 18:05:40 +08:00
parent 2ad7e0ea61
commit f514616b96
4 changed files with 111 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
page_fenbao/device/index.vue
View File

@ -186,21 +186,33 @@
duration: 2000 duration: 2000
}); });
uni.removeStorageSync('mac'); uni.removeStorageSync('mac');
let systemInfo = uni.getSystemInfoSync();
if (systemInfo.platform === 'android') { let vm = this
// 当前设备是 Android uni.showModal({
uni.navigateTo({ title: '提示',
url: '/page_components/wifilist/index?deviceId=' + options content: '你已绑定成功,需前去配网吗？',
.data.deviceId + '&name=' + options.data.name success: function (res) {
}) if (res.confirm) {
} else if (systemInfo.platform === 'ios') { let systemInfo = uni.getSystemInfoSync();
// 当前设备是 iOS if (systemInfo.platform === 'android') {
uni.navigateTo({ // 当前设备是 Android
url: '/page_fenbao/device/wifivideo?deviceId=' + options uni.navigateTo({
.data.deviceId + '&name=' + options.data.name url: '/page_components/wifilist/index?deviceId=' + options
}) .data.deviceId + '&name=' + options.data.name
} })
} else if (systemInfo.platform === 'ios') {
// 当前设备是 iOS
uni.navigateTo({
url: '/page_fenbao/device/wifivideo?deviceId=' + options
.data.deviceId + '&name=' + options.data.name
})
}
} else if (res.cancel) {
console.log('用户点击了取消');
}
}
})
} else { } else {
uni.showToast({ uni.showToast({
title: '该设备已被绑定', title: '该设备已被绑定',

39
page_fenbao/statulist/myshop/shopdetail/index.vue
View File

@ -265,20 +265,31 @@
}); });
uni.hideLoading(); uni.hideLoading();
uni.removeStorageSync('mac'); uni.removeStorageSync('mac');
let systemInfo = uni.getSystemInfoSync(); let vm = this
if (systemInfo.platform === 'android') { uni.showModal({
// 当前设备是 Android title: '提示',
uni.navigateTo({ content: '你已绑定成功,需前去配网吗？',
url: '/page_components/wifilist/index?deviceId=' + success: function (res) {
options.data.deviceId + '&name=' + options.data.name if (res.confirm) {
}) let systemInfo = uni.getSystemInfoSync();
} else if (systemInfo.platform === 'ios') { if (systemInfo.platform === 'android') {
// 当前设备是 iOS // 当前设备是 Android
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/device/wifivideo?deviceId=' + url: '/page_components/wifilist/index?deviceId=' + options
options.data.deviceId + '&name=' + options.data.name .data.deviceId + '&name=' + options.data.name
}) })
} } else if (systemInfo.platform === 'ios') {
// 当前设备是 iOS
uni.navigateTo({
url: '/page_fenbao/device/wifivideo?deviceId=' + options
.data.deviceId + '&name=' + options.data.name
})
}
} else if (res.cancel) {
console.log('用户点击了取消');
}
}
})
}else if(res.code == 500){ }else if(res.code == 500){
uni.showToast({ uni.showToast({

88
page_user/sbdetail.vue
View File

@ -32,17 +32,23 @@
</view> </view>
</view> </view>
<view class="bot"> <view class="bot">
<view class="bot_left"> <!-- <view class="bot_left">
<view class="echarts"> <view class="echarts">
<!-- <mpvue-echarts id="main" ref="pieChart" :echarts="echarts" @onInit="initChart" /> -->
<l-echart ref="chart" @finished="initChart"></l-echart> <l-echart ref="chart" @finished="initChart"></l-echart>
<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas" <uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas"
canvas-id="uni-ec-canvas" :ec="ec"> canvas-id="uni-ec-canvas" :ec="ec">
</uni-ec-canvas> </uni-ec-canvas>
</view> </view>
</view> </view> -->
<view class="bot_right"> <view class="bot_right">
<view class="cont" style="text-align: center;">
<view class="tit">
{{deviceInfo.orderAmount == null ? 0 : deviceInfo.orderAmount}}
</view>
<view class="txt">
订单金额
</view>
</view>
<view class="cont" style="text-align: center;"> <view class="cont" style="text-align: center;">
<view class="tit"> <view class="tit">
{{deviceInfo.orderCount == null ? 0 : deviceInfo.orderCount}} {{deviceInfo.orderCount == null ? 0 : deviceInfo.orderCount}}
@ -51,7 +57,7 @@
订单数 订单数
</view> </view>
</view> </view>
<view class="cont" style="margin-left: 100rpx;text-align: center;"> <view class="cont" style="text-align: center;">
<view class="tit"> <view class="tit">
{{timeday}} {{timeday}}
</view> </view>
@ -190,9 +196,9 @@
} }
}, },
onLoad(option) { onLoad(option) {
setTimeout(() => { // setTimeout(() => {
this.$refs.canvas.init(this.initChart) // this.$refs.canvas.init(this.initChart)
}, 1000) // }, 1000)
let id = option.id let id = option.id
this.id = id this.id = id
this.getDevice(id) this.getDevice(id)
@ -354,7 +360,7 @@
this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60))); this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60)));
} }
this.loadings = true this.loadings = true
this.initChart() // this.initChart()
} }
}); });
@ -449,7 +455,9 @@
// url: '/page_fenbao/device/lianjie?mac=' + this.deviceInfo.mac + '&storeId=' + this // url: '/page_fenbao/device/lianjie?mac=' + this.deviceInfo.mac + '&storeId=' + this
// .deviceInfo.storeId // .deviceInfo.storeId
// }) // })
uni.showLoading({
title: '加载中...'
});
xBlufi.initXBlufi(1); xBlufi.initXBlufi(1);
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
@ -519,23 +527,33 @@
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
uni.hideLoading(); uni.hideLoading();
uni.removeStorageSync('mac'); uni.removeStorageSync('mac');
let systemInfo = uni.getSystemInfoSync(); let vm = this
if (systemInfo.platform === 'android') { uni.showModal({
// 当前设备是 Android title: '提示',
uni.navigateTo({ content: '你已绑定成功,需前去配网吗？',
url: '/page_components/wifilist/index?deviceId=' + success: function (res) {
options.data.deviceId + '&name=' + options.data.name if (res.confirm) {
}) let systemInfo = uni.getSystemInfoSync();
} else if (systemInfo.platform === 'ios') { if (systemInfo.platform === 'android') {
// 当前设备是 iOS // 当前设备是 Android
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/device/wifivideo?deviceId=' + url: '/page_components/wifilist/index?deviceId=' + options
options.data.deviceId + '&name=' + options.data.name .data.deviceId + '&name=' + options.data.name
}) })
} } else if (systemInfo.platform === 'ios') {
// 当前设备是 iOS
uni.navigateTo({
url: '/page_fenbao/device/wifivideo?deviceId=' + options
.data.deviceId + '&name=' + options.data.name
})
}
} else if (res.cancel) {
console.log('用户点击了取消');
}
}
})
}else if(res.code == 500){ }else if(res.code == 500){
uni.showToast({ uni.showToast({
title: '该设备已被绑定', title: '该设备已被绑定',
@ -628,7 +646,7 @@
.card1 { .card1 {
padding: 34rpx 0 0 40rpx; padding: 34rpx 0 0 40rpx;
width: 670rpx; width: 670rpx;
height: 583rpx; height: 470rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1); box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
border-radius: 28rpx 28rpx 28rpx 28rpx; border-radius: 28rpx 28rpx 28rpx 28rpx;
@ -700,13 +718,15 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 19rpx; margin-left: 19rpx;
width: 38rpx; // width: 38rpx;
height: 23rpx; // height: 23rpx;
padding: 5rpx 10rpx;
box-sizing: border-box;
background: rgba(204, 204, 204, 0); background: rgba(204, 204, 204, 0);
opacity: 1; opacity: 1;
border: 2rpx solid #8883F0; border: 2rpx solid #8883F0;
border-radius: 40rpx; border-radius: 40rpx;
font-size: 14rpx; font-size: 24rpx;
font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
font-weight: 400; font-weight: 400;
color: #8883F0; color: #8883F0;
@ -742,8 +762,12 @@
.bot_right { .bot_right {
// margin-top: 50rpx; // margin-top: 50rpx;
display: flex; display: flex;
flex-wrap: nowrap; // flex-wrap: nowrap;
width: 100%;
justify-content: space-between;
padding-left: 80rpx;
padding-right: 120rpx;
box-sizing: border-box;
.cont { .cont {
.tit { .tit {
font-size: 28rpx; font-size: 28rpx;

6
pages/index/index.vue
View File

@ -23,12 +23,12 @@
<view class="fd" > <view class="fd" >
<view class="fd_top"> <view class="fd_top">
<view class="fd_da"> <view class="fd_da">
<view class="fd_lt" :style="{ transform: `translateX(${-curtitidx * 140}rpx)` }"> <view class="fd_lt" :style="{ transform: `translateX(${-curtitidx * 100}rpx)`}">
<view class="fd_tit" v-for="(item,index) in groupLists" :key="index" <view class="fd_tit" v-for="(item,index) in groupLists" :key="index"
:class="index==curtitidx?'act1':''" @click="changeidx(index)"> :class="index==curtitidx?'act1':''" @click="changeidx(index)">
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<!-- <view class="fd_set" @click="show = true"> <!-- <view class="fd_set" @click="show = true">
@ -1277,7 +1277,7 @@
// width: 40%; // width: 40%;
text-align: center; text-align: center;
// width: 100%; // width: 100%;
padding: 0 30rpx; padding: 0 10rpx;
box-sizing: border-box; box-sizing: border-box;
// margin-right: 20rpx; // margin-right: 20rpx;
font-size: 36rpx; font-size: 36rpx;