1.0.0.5
This commit is contained in:
parent
c9d35bb92e
commit
764c01290e
|
|
@ -64,16 +64,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="li" @click="btnwifi">
|
||||
<view class="tit">
|
||||
WiFi配网
|
||||
</view>
|
||||
<view class="info">
|
||||
<view class="txt">
|
||||
<view class="iconfont icon-xiangyou1"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="li" @click="btntc">
|
||||
<view class="tit">
|
||||
套餐设置
|
||||
|
|
@ -95,7 +86,17 @@
|
|||
<view class="iconfont icon-xiangyou1"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="li" @click="btnwifi">
|
||||
<view class="tit">
|
||||
WiFi配网
|
||||
</view>
|
||||
<view class="info">
|
||||
<view class="txt">
|
||||
{{listobj.wifi == null ? '' : listobj.wifi}}
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou1"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-mask :show="showloading"></u-mask>
|
||||
<u-mask :show="showfz"></u-mask>
|
||||
|
|
@ -290,13 +291,15 @@
|
|||
let id = option.id
|
||||
this.id = id
|
||||
this.getDevice(id)
|
||||
this.getlistobj(id)
|
||||
|
||||
this.gettanc()
|
||||
},
|
||||
onShow() {
|
||||
this.setMode == null
|
||||
this.taocan = ''
|
||||
this.getQiniuToken()
|
||||
this.getgroup()
|
||||
this.getlistobj(this.id)
|
||||
this.getuserinfo()
|
||||
this.getao()
|
||||
},
|
||||
|
|
|
|||
|
|
@ -140,79 +140,187 @@
|
|||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
if (option.q) {
|
||||
function getQueryParam(url, paramName) {
|
||||
let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
|
||||
let results = regex.exec(url);
|
||||
return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null;
|
||||
}
|
||||
let sceneValue = option.q
|
||||
let decodedValue = decodeURIComponent(sceneValue);
|
||||
this.id = getQueryParam(decodedValue, 's')
|
||||
this.$u.get(`/app/device/${this.id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.mac = 'CTKG-' + res.data.mac
|
||||
this.onlineStatus = res.data.onlineStatus
|
||||
this.$u.get("/app/user/userInfo").then((res) => {
|
||||
if (res.code == 200) {
|
||||
if (option.q) {
|
||||
function getQueryParam(url, paramName) {
|
||||
let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
|
||||
let results = regex.exec(url);
|
||||
return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null;
|
||||
}
|
||||
let sceneValue = option.q
|
||||
let decodedValue = decodeURIComponent(sceneValue);
|
||||
this.id = getQueryParam(decodedValue, 's')
|
||||
|
||||
if (this.onlineStatus == 0) {
|
||||
// 一开始搜索设备
|
||||
xBlufi.initXBlufi(1)
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
})
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
})
|
||||
if (this.devicesList.length > 0) {
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
})
|
||||
}
|
||||
}, 2000)
|
||||
let that = this
|
||||
let data = {
|
||||
deviceNo: that.id
|
||||
}
|
||||
}
|
||||
})
|
||||
this.startTimer()
|
||||
this.gettaoc()
|
||||
// this.getmac()
|
||||
|
||||
} else {
|
||||
this.id = option.id
|
||||
this.$u.get(`/app/device/${this.id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.mac = 'CTKG-' + res.data.mac
|
||||
this.onlineStatus = res.data.onlineStatus
|
||||
if (this.onlineStatus == 0) {
|
||||
// 一开始搜索设备
|
||||
xBlufi.initXBlufi(1)
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
})
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
that.$u.get(`/app/device/isBind?deviceNo=${that.id}`).then(res => {
|
||||
if (res.data == 2) {
|
||||
that.$u.get(`/app/device/${that.id}/withSuitList`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
that.$u.get(`/app/device/${that.id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
that.mac = 'CTKG-' + res.data.mac
|
||||
that.onlineStatus = res.data.onlineStatus
|
||||
if (that.onlineStatus == 0) {
|
||||
// 一开始搜索设备
|
||||
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)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
if (this.devicesList.length > 0) {
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
})
|
||||
}
|
||||
}, 2000)
|
||||
} else if (res.data == 1) {
|
||||
console.log(111);
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '该设备未绑定,你需进行绑定吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
that.$u.put("/app/device/bind", data).then(res => {
|
||||
if(res.code == 200){
|
||||
that.$u.get(`/app/device/${that.id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
uni.navigateTo({
|
||||
url: '/page_components/bindsz?id=' + res.data.deviceId
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
} else if (res.data == 0) {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '该设备未录入,你需进行录入吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
uni.navigateTo({
|
||||
url: '/page_fenbao/zhuce?sn=' + that.id
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
this.startTimer()
|
||||
this.gettaoc()
|
||||
// this.getmac()
|
||||
|
||||
} else {
|
||||
this.id = option.id
|
||||
|
||||
let that = this
|
||||
let data = {
|
||||
deviceNo: that.id
|
||||
}
|
||||
that.$u.get(`/app/device/isBind?deviceNo=${that.id}`).then(res => {
|
||||
if (res.data == 2) {
|
||||
that.$u.get(`/app/device/${that.id}/withSuitList`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
that.$u.get(`/app/device/${that.id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
that.mac = 'CTKG-' + res.data.mac
|
||||
that.onlineStatus = res.data.onlineStatus
|
||||
if (that.onlineStatus == 0) {
|
||||
// 一开始搜索设备
|
||||
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.data == 1) {
|
||||
console.log(222);
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '该设备未绑定,你需进行绑定吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
that.$u.put("/app/device/bind", data).then(res => {
|
||||
if(res.code == 200){
|
||||
that.$u.get(`/app/device/${that.id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
uni.navigateTo({
|
||||
url: '/page_components/bindsz?id=' + res.data.deviceId
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
} else if (res.data == 0) {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '该设备未录入,你需进行录入吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
uni.navigateTo({
|
||||
url: '/page_fenbao/zhuce?sn=' + that.id
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
this.startTimer()
|
||||
this.gettaoc()
|
||||
// this.getmac()
|
||||
}
|
||||
})
|
||||
this.startTimer()
|
||||
this.gettaoc()
|
||||
// this.getmac()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/login/login?id=' + 1
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
||||
|
|
@ -234,7 +342,7 @@
|
|||
}
|
||||
},
|
||||
onShow() {
|
||||
this.getuserinfo()
|
||||
// this.getuserinfo()
|
||||
if (this.orderno) {
|
||||
// this.gethuidaio()
|
||||
}
|
||||
|
|
@ -312,7 +420,7 @@
|
|||
|
||||
gettrue() {
|
||||
this.$u.get("/app/device/isBind?deviceNo=" + this.id).then((res) => {
|
||||
if (res.data == false) {
|
||||
if (res.data == 0 || res.data == 1) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/shouye/index?flag=' + true + '&id=' + this.id
|
||||
})
|
||||
|
|
@ -322,7 +430,7 @@
|
|||
getuserinfo() {
|
||||
this.$u.get("/app/user/userInfo").then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.gettrue()
|
||||
// this.gettrue()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/login/login?id=' + 1
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
<view class="flex-row items-center flex-1 group" style="display: flex;justify-content: space-between;align-items: center;">
|
||||
<view class="text_3 ml-3">请选择您需要连接的2.4GwiFi名称</view>
|
||||
<view class="text_3 ml-3" style="color: #8883F0;display: flex;justify-content: space-between;align-items: center;" @click="btnwifi">
|
||||
<image style="width: 34rpx;height: 34rpx;vertical-align: middle; margin-right: 10rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uhhg02VV44LLPaDJDJO2" mode=""></image> <text>刷新</text> </view>
|
||||
<image class="sximg" src="https://api.ccttiot.com/smartmeter/img/static/uhhg02VV44LLPaDJDJO2" mode="" :style="{ transform: 'rotate(' + rotateDegree + 'deg)' }" ></image>
|
||||
<text>刷新</text> </view>
|
||||
</view>
|
||||
|
||||
<!-- wifi列表 -->
|
||||
|
|
@ -44,7 +45,7 @@
|
|||
</view>
|
||||
|
||||
<view class="content">
|
||||
<view class="bt">{{item.SSID}}</view>
|
||||
<view class="bt">{{item.SSID == '' ? 'CMCC-eaca' : item.SSID}}</view>
|
||||
<!-- <view class="wz" style="color: #8883F0 ;">{{item.BSSID}}</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -63,28 +64,38 @@
|
|||
<!-- 蒙层 -->
|
||||
<view class="mask" v-if="maskflag"></view>
|
||||
<!-- 点击WiFi连接弹窗 -->
|
||||
<view class="lianjie" v-if="maskflag">
|
||||
<view class="lianjie" style="height:380rpx;" v-if="maskflag">
|
||||
<view class="wifitop">
|
||||
连接网络
|
||||
</view>
|
||||
<view class="wifiname">
|
||||
{{ssid}}
|
||||
</view>
|
||||
<view class="" v-if="passmm == true">
|
||||
<view class="" style="position: relative;" v-if="passmm == true">
|
||||
<input class="uni-input" v-model="password" type="text" placeholder="输入WiFi密码" />
|
||||
<u-icon name="eye-fill" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = false"></u-icon>
|
||||
<u-icon name="eye-fill" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = false" size="50"></u-icon>
|
||||
</view>
|
||||
<view class="" v-if="passmm == false">
|
||||
<view class="" style="position: relative;" v-if="passmm == false">
|
||||
<input class="uni-input" v-model="password" type="password" placeholder="输入WiFi密码" />
|
||||
<u-icon name="eye-off" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = true"></u-icon>
|
||||
<u-icon name="eye-off" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = true" size="50"></u-icon>
|
||||
</view>
|
||||
<view class="butlj">
|
||||
<view class="btnljqx" @click="btnmaskflag">
|
||||
<view class="butlj" style="border-top: 1px solid #ccc;">
|
||||
<view class="btnljqx" @click="btnmaskflag" style="border-right: 1px solid #ccc;">
|
||||
取消
|
||||
</view>
|
||||
<view class="btnljqx" @click="content_wf" :class="textwifi == '连接中...' ? actives : ''">
|
||||
{{textwifi}}
|
||||
<view
|
||||
v-if="textwifi == '连接'"
|
||||
class="btnljqx"
|
||||
@click="content_wf"
|
||||
:class="{ 'actives': textwifi === '连接中...' }">
|
||||
连接
|
||||
</view>
|
||||
<view v-else class="btnljqx" :class="{ 'actives': textwifi === '连接中...' }" style="display: flex; justify-content: center; align-items: center;">
|
||||
<text>连接中</text>
|
||||
<view class="" style="width: 36rpx;">
|
||||
<text v-for="n in 3" :key="n" v-if="currentIndex >= n">.</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -96,29 +107,36 @@
|
|||
手动添加
|
||||
</view>
|
||||
<input class="uni-input" v-model="ssid" type="text" placeholder="输入WiFi名称" />
|
||||
<view class="" v-if="passmm == true">
|
||||
<view class="" style="position: relative;" v-if="passmm == true">
|
||||
<input class="uni-input" v-model="password" type="text" placeholder="输入WiFi密码" />
|
||||
<u-icon name="eye-fill" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = false"></u-icon>
|
||||
<u-icon name="eye-fill" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = false" size="50"></u-icon>
|
||||
</view>
|
||||
<view class="" v-if="passmm == false">
|
||||
<view class="" style="position: relative;" v-if="passmm == false">
|
||||
<input class="uni-input" v-model="password" type="password" placeholder="输入WiFi密码" />
|
||||
<u-icon name="eye-off" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = true"></u-icon>
|
||||
<u-icon name="eye-off" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = true" size="50"></u-icon>
|
||||
</view>
|
||||
<view class="butlj">
|
||||
<view class="btnljqx" @click="btnsdmaskflag">
|
||||
<view class="butlj" style="border-top: 1px solid #ccc;">
|
||||
<view class="btnljqx" @click="btnsdmaskflag" style="border-right: 1px solid #ccc;">
|
||||
取消
|
||||
</view>
|
||||
<view
|
||||
v-if="textwifi == '连接'"
|
||||
class="btnljqx"
|
||||
@click="content_wf"
|
||||
:class="{ 'actives': textwifi === '连接中...' }">
|
||||
{{ textwifi }}
|
||||
连接
|
||||
</view>
|
||||
<view v-else class="btnljqx" :class="{ 'actives': textwifi === '连接中...' }" style="display: flex; justify-content: center; align-items: center;">
|
||||
<text>连接中</text>
|
||||
<view class="" style="width: 36rpx;">
|
||||
<text v-for="n in 3" :key="n" v-if="currentIndex >= n">.</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 没有WiFi -->
|
||||
<view class="bluetoothbox" v-if="list.length == 0">
|
||||
<!-- <view class="bluetoothbox" v-if="list.length == 0">
|
||||
<image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uZH5T5qPm6VjuJbGbCpj" mode=""></image>
|
||||
<view class="one">
|
||||
发现网络失败
|
||||
|
|
@ -134,7 +152,7 @@
|
|||
重新发现
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
|
||||
</view>
|
||||
|
|
@ -178,7 +196,14 @@
|
|||
bgc: {
|
||||
backgroundColor: "#8883f0",
|
||||
},
|
||||
textwifi:'连接'
|
||||
textwifi:'连接',
|
||||
|
||||
rotateDegree: 0, // 图片的旋转角度
|
||||
rotationInterval: null, // 定时器的引用
|
||||
isRotating: false, // 标志位，控制是否正在旋转
|
||||
|
||||
currentIndex: 0, // 控制当前应该显示到哪个点
|
||||
dotShowInterval: null,
|
||||
};
|
||||
},
|
||||
|
||||
|
|
@ -313,19 +338,70 @@
|
|||
},
|
||||
onUnload: function() {
|
||||
console.log("unload返回 ");
|
||||
if (this.dotShowInterval) {
|
||||
clearInterval(this.dotShowInterval);
|
||||
}
|
||||
let that = this;
|
||||
wx.closeBLEConnection({
|
||||
deviceId: that.objlist.deviceId,
|
||||
})
|
||||
},
|
||||
mounted() {
|
||||
// 开始闪烁动画
|
||||
this.startDotShow()
|
||||
},
|
||||
methods: {
|
||||
// 开始旋转图片
|
||||
|
||||
// 模拟异步请求
|
||||
simulateRequest() {
|
||||
// 使用setTimeout来模拟异步操作
|
||||
setTimeout(() => {
|
||||
// 假设请求完成
|
||||
console.log('请求完成');
|
||||
this.stopRotation();
|
||||
}, 3000);
|
||||
},
|
||||
// 停止旋转图片
|
||||
stopRotation() {
|
||||
this.isRotating = false;
|
||||
clearInterval(this.rotationInterval); // 清除定时器
|
||||
},
|
||||
|
||||
startDotShow() {
|
||||
this.dotShowInterval = setInterval(() => {
|
||||
if (this.currentIndex < 3) {
|
||||
this.currentIndex++;
|
||||
} else {
|
||||
// 如果需要循环显示，可以重置currentIndex
|
||||
this.currentIndex = 0; // 重启动画
|
||||
}
|
||||
}, 500); // 每500毫秒更新currentIndex
|
||||
},
|
||||
|
||||
|
||||
btnmaskflag(){
|
||||
this.textwifi = '连接'
|
||||
this.maskflag = false
|
||||
this.password = ''
|
||||
},
|
||||
btnsdmaskflag(){
|
||||
this.textwifi = '连接'
|
||||
this.sdmaskflag = false
|
||||
this.password = ''
|
||||
},
|
||||
// 点击重新获取wifi
|
||||
btnwifi(){
|
||||
if (!this.isRotating) {
|
||||
this.isRotating = true;
|
||||
this.rotationInterval = setInterval(() => {
|
||||
if (this.isRotating) {
|
||||
this.rotateDegree = (this.rotateDegree + 5) % 360; // 每次增加5度，并循环
|
||||
}
|
||||
}, 10); // 每100毫秒旋转一次
|
||||
// 假设这里发起一个异步请求
|
||||
this.simulateRequest();
|
||||
}
|
||||
var that = this
|
||||
wx.startWifi({
|
||||
success: function() {
|
||||
|
|
@ -426,6 +502,7 @@
|
|||
// mask: true
|
||||
// })
|
||||
this.textwifi = '连接中...'
|
||||
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: "ssid@" + this.ssid + "pass@" + this.password
|
||||
})
|
||||
|
|
@ -485,9 +562,19 @@
|
|||
content: `连接成功`,
|
||||
showCancel: false,
|
||||
success: function(res) {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
})
|
||||
// uni.switchTab({
|
||||
// url: '/pages/index/index'
|
||||
// })
|
||||
let systemInfo = uni.getSystemInfoSync();
|
||||
if (systemInfo.platform == 'android') {
|
||||
// 当前设备是 Android
|
||||
uni.navigateBack()
|
||||
} else if (systemInfo.platform == 'ios') {
|
||||
// 当前设备是 iOS
|
||||
uni.navigateBack({
|
||||
delta:2
|
||||
})
|
||||
}
|
||||
// let ids = that.$store.state.user.deviceId
|
||||
wx.closeBLEConnection({
|
||||
deviceId: this.objlist.deviceId,
|
||||
|
|
@ -502,6 +589,7 @@
|
|||
}
|
||||
})
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
|
||||
|
|
@ -521,17 +609,32 @@
|
|||
console.log('初始化成功');
|
||||
} else {
|
||||
console.log('初始化失败');
|
||||
wx.closeBLEConnection({
|
||||
deviceId: this.objlist.deviceId,
|
||||
})
|
||||
uni.showModal({
|
||||
title: '温馨提示',
|
||||
content: `设备初始化失败,请重新连接`,
|
||||
showCancel: false,
|
||||
//是否显示取消按钮
|
||||
success: function(res) {
|
||||
uni.switchTab({
|
||||
url:'/pages/index/index'
|
||||
})
|
||||
let systemInfo = uni.getSystemInfoSync();
|
||||
if (systemInfo.platform == 'android') {
|
||||
// 当前设备是 Android
|
||||
uni.navigateBack()
|
||||
} else if (systemInfo.platform == 'ios') {
|
||||
// 当前设备是 iOS
|
||||
uni.navigateBack({
|
||||
delta:2
|
||||
})
|
||||
}
|
||||
|
||||
// uni.switchTab({
|
||||
// url:'/pages/index/index'
|
||||
// })
|
||||
}
|
||||
});
|
||||
})
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -650,6 +753,12 @@
|
|||
.actives{
|
||||
opacity: .5 !important;
|
||||
}
|
||||
.sximg{
|
||||
width: 34rpx;
|
||||
height: 34rpx;
|
||||
vertical-align: middle;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
//wifi信号强度显示
|
||||
.wifiactive {
|
||||
background-color: limegreen !important;
|
||||
|
|
@ -693,15 +802,16 @@
|
|||
}
|
||||
}
|
||||
.annius{
|
||||
position: fixed;
|
||||
// position: fixed;
|
||||
align-items: center;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
bottom: 50rpx;
|
||||
// left: 50%;
|
||||
// transform: translateX(-50%);
|
||||
// bottom: 50rpx;
|
||||
border-radius: 52rpx 52rpx 52rpx 52rpx;
|
||||
// font-weight: 700;
|
||||
font-size: 38rpx;
|
||||
width: 90%;
|
||||
width: 100%;
|
||||
margin-top: 20rpx;
|
||||
view{
|
||||
height: 96rpx;
|
||||
border-radius: 30rpx;
|
||||
|
|
@ -718,8 +828,8 @@
|
|||
|
||||
|
||||
.lianjie{
|
||||
width: 520rpx;
|
||||
height: 320rpx;
|
||||
width: 620rpx;
|
||||
height: 425rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 30rpx;
|
||||
position: fixed;
|
||||
|
|
@ -734,15 +844,20 @@
|
|||
}
|
||||
.wifiname{
|
||||
font-size: 30rpx;
|
||||
color: #ccc;
|
||||
color: #000;
|
||||
margin-top: 30rpx;
|
||||
}
|
||||
input{
|
||||
width: 79%;
|
||||
width: 100%;
|
||||
margin-top: 30rpx;
|
||||
color: #000;
|
||||
font-size: 30rpx;
|
||||
margin-left: 30rpx;
|
||||
// margin-left: 30rpx;
|
||||
padding-left: 30rpx;
|
||||
box-sizing: border-box;
|
||||
background-color: #efefef;
|
||||
border-radius: 10rpx;
|
||||
height: 80rpx;
|
||||
}
|
||||
.butlj{
|
||||
display: flex;
|
||||
|
|
@ -755,6 +870,8 @@
|
|||
color: #8883F0;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
height: 95rpx;
|
||||
line-height: 95rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,53 +184,79 @@
|
|||
}
|
||||
},
|
||||
scanQRCode() {
|
||||
uni.scanCode({
|
||||
onlyFromCamera: true,
|
||||
scanType: ['qrCode'],
|
||||
success: res => {
|
||||
// console.log('扫描结果：', res);
|
||||
function getQueryParam(url, paramName) {
|
||||
let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
|
||||
let results = regex.exec(url);
|
||||
return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null;
|
||||
}
|
||||
let sceneValue = res.result
|
||||
let decodedValue = decodeURIComponent(sceneValue);
|
||||
let id = getQueryParam(decodedValue, 's')
|
||||
this.$u.get(`/app/device/${id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.macs = res.data.mac
|
||||
this.qrResult = 'CTKG-' + res.data.mac
|
||||
xBlufi.initXBlufi(1);
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
});
|
||||
// 停止蓝牙搜索
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
});
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
});
|
||||
}, 2000)
|
||||
uni.showLoading({
|
||||
title: '连接中...'
|
||||
});
|
||||
}
|
||||
})
|
||||
},
|
||||
fail: err => {
|
||||
console.error('扫描失败：', err);
|
||||
uni.showToast({
|
||||
title: '扫描失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
});
|
||||
uni.scanCode({
|
||||
onlyFromCamera: true,
|
||||
scanType: ['qrCode'],
|
||||
success: res => {
|
||||
function getQueryParam(url, paramName) {
|
||||
let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
|
||||
let results = regex.exec(url);
|
||||
return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
|
||||
}
|
||||
let sceneValue = res.result
|
||||
let decodedValue = decodeURIComponent(sceneValue)
|
||||
let id = getQueryParam(decodedValue, 's')
|
||||
// console.log(res, id)
|
||||
let that = this
|
||||
let data = {
|
||||
deviceNo: id
|
||||
}
|
||||
that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
|
||||
if (res.data == 2) {
|
||||
that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
uni.navigateTo({
|
||||
url: '/page_components/fuwu/index?id=' + id
|
||||
})
|
||||
}
|
||||
})
|
||||
} else if (res.data == 1) {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '该设备未绑定,你需进行绑定吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
that.$u.put("/app/device/bind", data).then(res => {
|
||||
if(res.code == 200){
|
||||
that.$u.get(`/app/device/${id}/bySn`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
uni.navigateTo({
|
||||
url: '/page_components/bindsz?id=' + res.data.deviceId
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
} else if (res.data == 0) {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '该设备未录入,你需进行录入吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
uni.navigateTo({
|
||||
url: '/page_fenbao/zhuce?sn=' + id
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
fail: err => {
|
||||
console.error('扫描失败：', err)
|
||||
uni.showToast({
|
||||
title: '扫描失败',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
funListenDeviceMsgEvent: function(options) {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,25 @@
|
|||
<u-navbar title="设置" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
|
||||
height='50'></u-navbar>
|
||||
<view class="card">
|
||||
|
||||
<view class="icon">
|
||||
<view class="imgbox" v-if="userImgs">
|
||||
<button style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;" @click="getImage">
|
||||
<image style="border-radius: 10rpx;" :src="userImgs" mode="aspectFit"></image>
|
||||
</button>
|
||||
</view>
|
||||
<view class="imgbox" v-else>
|
||||
<button style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;" @click="getImage">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="aspectFit"></image>
|
||||
</button>
|
||||
</view>
|
||||
<!-- 截图 -->
|
||||
<ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024" :url="url"
|
||||
@cancel="oncancel" @ok="onok"></ksp-cropper>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<view class="li" @click.stop="sremakemc()">
|
||||
<view class="tit">
|
||||
设备名称
|
||||
|
|
@ -209,12 +228,17 @@
|
|||
pagesize: 10,
|
||||
isLoading: false,
|
||||
noMoreData: false,
|
||||
total: 0
|
||||
total: 0,
|
||||
|
||||
userImgs:'',
|
||||
url:'',
|
||||
token:''
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
let id = option.id
|
||||
this.id = id
|
||||
this.getQiniuToken()
|
||||
this.getDevice(id)
|
||||
this.getlistobj(id)
|
||||
this.gettanc()
|
||||
|
|
@ -239,6 +263,60 @@
|
|||
this.getgroup()
|
||||
},
|
||||
methods: {
|
||||
getQiniuToken() {
|
||||
this.$u.get("/common/qiniu/uploadInfo").then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.token = res.token
|
||||
}
|
||||
})
|
||||
},
|
||||
getImage() {
|
||||
uni.chooseImage({
|
||||
count: 1,
|
||||
success: (rst) => {
|
||||
this.url = rst.tempFilePaths[0];
|
||||
}
|
||||
})
|
||||
},
|
||||
onok(ev) {
|
||||
this.url = "";
|
||||
this.path = ev.path;
|
||||
let _this = this
|
||||
let math = 'static/' + _this.$u.guid(20)
|
||||
wx.uploadFile({
|
||||
url: 'https://up-z2.qiniup.com',
|
||||
name: 'file',
|
||||
filePath: _this.path,
|
||||
formData: {
|
||||
token: _this.token, //后端返回的token
|
||||
key: 'smartmeter/img/' + math
|
||||
},
|
||||
success: function(res) {
|
||||
let str = JSON.parse(res.data)
|
||||
_this.userImgs = 'https://api.ccttiot.com/' + str.key
|
||||
let data = {
|
||||
deviceId:_this.id,
|
||||
customPicture:_this.userImgs
|
||||
}
|
||||
_this.$u.put('/app/device', data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
// this.getDevice()
|
||||
uni.showToast({
|
||||
title: '操作成功',
|
||||
icon: 'success',
|
||||
duration: 2000
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
oncancel() {
|
||||
// url设置为空，隐藏控件
|
||||
this.url = ""
|
||||
},
|
||||
|
||||
|
||||
sremakes() {
|
||||
this.showshop = true
|
||||
},
|
||||
|
|
@ -353,7 +431,7 @@
|
|||
if (res.code == 200) {
|
||||
uni.showToast({
|
||||
title: '解除成功',
|
||||
icon: 'none',
|
||||
icon: 'success',
|
||||
duration: 2000
|
||||
});
|
||||
uni.navigateBack({
|
||||
|
|
@ -397,7 +475,7 @@
|
|||
this.getDevice()
|
||||
uni.showToast({
|
||||
title: '修改成功',
|
||||
icon: 'none',
|
||||
icon: 'success',
|
||||
duration: 2000
|
||||
});
|
||||
|
||||
|
|
@ -431,7 +509,12 @@
|
|||
console.log(this.deviceInfo, 'resres');
|
||||
this.price = this.deviceInfo.price
|
||||
this.remake = this.deviceInfo.remark
|
||||
// this.loadings=true
|
||||
if(this.deviceInfo.customPicture == null){
|
||||
this.userImgs = this.deviceInfo.picture
|
||||
}else{
|
||||
this.userImgs = this.deviceInfo.customPicture
|
||||
}
|
||||
// this.loadings=true
|
||||
// this.initChart()
|
||||
}
|
||||
});
|
||||
|
|
@ -477,7 +560,7 @@
|
|||
bottom: 230rpx;
|
||||
width: 632rpx;
|
||||
height: 90rpx;
|
||||
background-color: red;
|
||||
background-color: #ccc;
|
||||
text-align: center;
|
||||
line-height: 90rpx;
|
||||
font-size: 36rpx;
|
||||
|
|
@ -687,4 +770,28 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
.icon {
|
||||
// display: flex;
|
||||
// flex-wrap: wrap;
|
||||
// align-items: center;
|
||||
margin-top: 40rpx;
|
||||
margin-bottom: 30rpx;
|
||||
.imgbox {
|
||||
// width: 33%;
|
||||
image {
|
||||
width: 142rpx;
|
||||
height: 142rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
/deep/ .panel{
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 99 !important;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<view class="pages">
|
||||
<u-navbar title="提现记录" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
|
||||
height='50'></u-navbar>
|
||||
<view class="cards" v-for="(item,index) in list" :key="index" @click="btntx(item.billId)">
|
||||
<view class="cards" v-for="(item,index) in list" :key="index" @click="btntx(item.billId)" @scrolltolower="onReachBottom">
|
||||
<view class="card_left">
|
||||
<view class="top">提现
|
||||
<text style="color: rgb(233, 178, 116);" v-if="item.status == 11">(审核中)</text>
|
||||
|
|
@ -23,6 +23,12 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="jlflag" class="" style="font-size: 28rpx;color: red;margin-top: 30rpx;width: 100%;text-align: center;">-没有更多记录了-</view>
|
||||
<view class="" v-if="showflag" style="width: 100%;height: 200rpx;margin: auto;margin-top: 170rpx;text-align: center;">
|
||||
<image style="width: 200rpx;height: 200rpx;"
|
||||
src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image>
|
||||
<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;">暂无更多提现记录...</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
|
@ -37,7 +43,14 @@
|
|||
bgc: {
|
||||
backgroundColor: "#8883f0",
|
||||
},
|
||||
list:''
|
||||
list:[],
|
||||
jlflag:false,
|
||||
pagenum: 1,
|
||||
pagesize: 10, // 一页多少数据
|
||||
isLoading: false, // 是否正在加载数据
|
||||
noMoreData: false, // 是否没有更多数据
|
||||
total: 0,
|
||||
showflag: false,
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
|
|
@ -60,17 +73,37 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
onReachBottom() {
|
||||
if (this.list.length < this.total) {
|
||||
this.getDeviceList(); // 上拉加载更多
|
||||
} else {
|
||||
this.jlflag = true
|
||||
}
|
||||
},
|
||||
btntx(billId){
|
||||
uni.navigateTo({
|
||||
url:'/page_user/mapditu/withdraw_xq?billId=' + billId
|
||||
})
|
||||
},
|
||||
getDeviceList(){
|
||||
this.$u.get("/app/bill/withdrawList?pageNum=1&pageSize=10").then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.list = res.rows
|
||||
console.log(this.list,'000');
|
||||
}
|
||||
this.$u.get(`/app/bill/withdrawList?$pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.total = res.total
|
||||
if (this.total > 0) {
|
||||
this.showflag = false
|
||||
} else {
|
||||
this.showflag = true
|
||||
}
|
||||
if (res.rows.length > 0) {
|
||||
// 有数据，追加到列表
|
||||
this.list = this.list.concat(res.rows)
|
||||
this.pagenum++
|
||||
} else {
|
||||
// 没有更多数据
|
||||
this.noMoreData = true;
|
||||
}
|
||||
this.isLoading = false;
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
|
|
@ -91,7 +124,8 @@
|
|||
|
||||
.pages {
|
||||
width: 750rpx;
|
||||
|
||||
padding-bottom: 100rpx;
|
||||
box-sizing: border-box;
|
||||
.tops {
|
||||
margin-top: 20rpx;
|
||||
display: flex;
|
||||
|
|
@ -127,7 +161,6 @@
|
|||
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
|
||||
margin: 18rpx auto;
|
||||
border-radius: 30rpx;
|
||||
|
||||
.card_left {
|
||||
margin-left: 50rpx;
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,8 @@
|
|||
<view class="iconfont icon-xiangyou1"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="li" style="border-bottom: #fff solid 2rpx;" @click="btnwz(3)">
|
||||
|
||||
<view class="li" style="border-bottom: #ccc solid 2rpx;" @click="btnwz(3)">
|
||||
<view class="tit">
|
||||
个人信息收集清单
|
||||
</view>
|
||||
|
|
@ -56,6 +57,17 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="li" style="border-bottom: #fff solid 2rpx;" @click="btnwz(4)">
|
||||
<view class="tit">
|
||||
秘钥管理
|
||||
</view>
|
||||
<view class="info">
|
||||
|
||||
<view class="iconfont icon-xiangyou1"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="card" style="margin-top: 26rpx;" v-if='false'>
|
||||
<view class="li">
|
||||
|
|
@ -175,6 +187,10 @@
|
|||
uni.navigateTo({
|
||||
url:'/page_components/wentdetail?type=' + this.type
|
||||
})
|
||||
}else if(num == 4){
|
||||
uni.navigateTo({
|
||||
url:'/page_components/miyao'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -24,15 +24,15 @@
|
|||
￥
|
||||
</view>
|
||||
<view class="ipt">
|
||||
<u-input v-model="money" @input="change" placeholder='输入自定义金额' placeholder-style='font-size: 24rpx;'/>
|
||||
<u-input v-model="money" type="number" @input="change" placeholder='输入自定义金额' placeholder-style='font-size: 24rpx;'/>
|
||||
</view>
|
||||
<view class="altx" @click="all()">
|
||||
全部提现
|
||||
</view>
|
||||
</view>
|
||||
<view class="" style="color: red;font-size: 24rpx;padding-top: 30rpx;box-sizing: border-box;">
|
||||
提现服务费为 ￥{{serviceRates}}
|
||||
</view>
|
||||
提现服务费为 ￥{{roundToTwoDecimalsTraditional(this.serviceRates)}}
|
||||
</view>
|
||||
<view class="tit">
|
||||
<view class="" style="display: flex;">
|
||||
<view class="tit_line" style="margin-top: 4rpx;">
|
||||
|
|
@ -40,17 +40,26 @@
|
|||
</view>
|
||||
提现方式
|
||||
</view>
|
||||
</view>
|
||||
<view class="pay_type">
|
||||
<view class="type_box" @click="pay(0,'1')">
|
||||
</view>
|
||||
<view class="pay_type" style="width: 100%;">
|
||||
<view class="type_box" v-if="listflag" v-for="(item,index) in txlist" :key="index" @click="pay(index,item.channelId)">
|
||||
<view class="box_left">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/unexnRfQ1HxdA3GuVgfX" mode=""></image>
|
||||
<image :src="item.picture" mode=""></image>
|
||||
<view class="text">
|
||||
微信提现
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="box_right" :class="currentindex==0?'act1':''">
|
||||
<span v-if="currentindex==0" style="color: #fff;"> <u-icon style="margin-top: 22rpx;" name="checkbox-mark" color="#fff" size="28"></u-icon> </span>
|
||||
<view class="box_right" :class="currentindex==index?'act1':''">
|
||||
<span v-if="currentindex==index" style="color: #fff;"> <u-icon style="margin-top: 22rpx;" name="checkbox-mark" color="#fff" size="28"></u-icon> </span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="!listflag" class="wutx" style="width: 100%;margin-top: 230rpx;text-align: center;">
|
||||
<view class="" style="font-size: 32rpx;">
|
||||
当前暂无提现方式
|
||||
</view>
|
||||
<view class="addtj" @click="btnadd">
|
||||
去添加
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -90,7 +99,7 @@
|
|||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="btn" @click="sub()">
|
||||
<view class="btn" v-if="listflag" @click="sub()">
|
||||
确认提现
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -108,17 +117,22 @@
|
|||
idnum:'',
|
||||
money:'',
|
||||
infoList:{},
|
||||
currentindex:0,
|
||||
currentindex:-1,
|
||||
payType:1,
|
||||
accountNo:'',
|
||||
userinfo:{},
|
||||
serviceType:'',
|
||||
serviceRate:'',
|
||||
serviceRates:'',
|
||||
sjmeoey:''
|
||||
sjmeoey:'',
|
||||
txlist:'',
|
||||
channelId:'',
|
||||
|
||||
listflag:true
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.gettxlist()
|
||||
this.getfuwu()
|
||||
this.getinfo()
|
||||
this.getuserinfo()
|
||||
|
|
@ -140,17 +154,42 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
// 添加提现方式
|
||||
btnadd(){
|
||||
uni.navigateTo({
|
||||
url:'/page_user/skzh'
|
||||
})
|
||||
},
|
||||
// 获取提现渠道列表
|
||||
gettxlist(){
|
||||
this.$u.get('/app/channel/recharge/enabledWithdrawList').then(res => {
|
||||
if(res.code == 200){
|
||||
if(res.data.length > 0){
|
||||
this.listflag = true
|
||||
this.txlist = res.data
|
||||
}else{
|
||||
this.listflag = false
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
change(){
|
||||
if(this.serviceType == 2){
|
||||
this.serviceRates = this.serviceRate
|
||||
this.sjmeoey = Number(this.money) - Number(this.serviceRates)
|
||||
}else{
|
||||
let qian = this.money * this.serviceRate / 100
|
||||
this.serviceRates = qian
|
||||
this.serviceRates = qian
|
||||
this.sjmeoey = Number(this.money) - Number(this.serviceRates)
|
||||
}
|
||||
|
||||
},
|
||||
// 计算小数
|
||||
roundToTwoDecimalsTraditional(num) {
|
||||
return Math.round(num * 100) / 100;
|
||||
},
|
||||
// 跳转到提现记录
|
||||
btntxrecord(){
|
||||
uni.navigateTo({
|
||||
|
|
@ -160,19 +199,14 @@
|
|||
getinfo(){
|
||||
this.$u.get('/app/account' ).then((res) => {
|
||||
if (res.code == 200) {
|
||||
console.log(res)
|
||||
// console.log(res)
|
||||
this.infoList=res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
pay(index,type,id){
|
||||
pay(index,id){
|
||||
this.channelId = id
|
||||
this.currentindex=index
|
||||
this.payType=type
|
||||
if(type==3){
|
||||
this.accountNo=id
|
||||
}else{
|
||||
this.accountNo=''
|
||||
}
|
||||
},
|
||||
all(){
|
||||
this.money=this.userinfo.balance
|
||||
|
|
@ -212,12 +246,18 @@
|
|||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}else{
|
||||
}else if(this.currentindex == -1){
|
||||
uni.showToast({
|
||||
title: '请选择提现方式',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
})
|
||||
} else{
|
||||
let data ={
|
||||
money:this.money,
|
||||
arrivalAmount:this.sjmeoey,
|
||||
serviceCharge:this.serviceRates,
|
||||
channelId:1,
|
||||
arrivalAmount:this.roundToTwoDecimalsTraditional(Number(this.money) - Number(this.roundToTwoDecimalsTraditional(this.serviceRates))),
|
||||
serviceCharge:this.roundToTwoDecimalsTraditional(this.serviceRates),
|
||||
channelId:this.channelId,
|
||||
serviceRate:this.serviceRate , //服务费
|
||||
serviceType:this.serviceType //服务费收取方式
|
||||
}
|
||||
|
|
@ -228,7 +268,8 @@
|
|||
title: '提现成功',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
})
|
||||
this.serviceRates = 0
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -260,6 +301,18 @@
|
|||
page{
|
||||
background: #F7FAFE;
|
||||
}
|
||||
.addtj{
|
||||
margin-top: 44rpx;
|
||||
width: 646rpx;
|
||||
height: 88rpx;
|
||||
background: #E4E3FB;
|
||||
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
text-align: center;
|
||||
line-height: 88rpx;
|
||||
font-size: 36rpx;
|
||||
color: #8883F0;
|
||||
}
|
||||
.cont{
|
||||
display: flex;
|
||||
// justify-content: center;
|
||||
|
|
|
|||
|
|
@ -138,51 +138,66 @@
|
|||
// this.deviceobj = res.data
|
||||
// }
|
||||
// })
|
||||
|
||||
// let that = this
|
||||
// let data = {
|
||||
// deviceNo: id
|
||||
// }
|
||||
// that.$u.put("/app/device/bind", data).then(res => {
|
||||
// if (res.code == 200) {
|
||||
// uni.showModal({
|
||||
// title: '提示',
|
||||
// content: '该设备未绑定,你需进行绑定吗？',
|
||||
// success: function(res) {
|
||||
// if (res.confirm) {
|
||||
// uni.navigateTo({
|
||||
// url: '/page_components/bindsz?id=' + that.deviceobj.deviceId
|
||||
// })
|
||||
// } else if (res.cancel) {
|
||||
|
||||
// }
|
||||
// let that = this
|
||||
// let data = {
|
||||
// deviceNo: id
|
||||
// }
|
||||
// that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
|
||||
// if (res.data == 2) {
|
||||
// that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
|
||||
// if (res.code == 200) {
|
||||
// uni.navigateTo({
|
||||
// url: '/page_components/fuwu/index?id=' + id
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// } else if (res.data == 1) {
|
||||
// uni.showModal({
|
||||
// title: '提示',
|
||||
// content: '该设备未绑定,你需进行绑定吗？',
|
||||
// success: function(res) {
|
||||
// if (res.confirm) {
|
||||
// that.$u.put("/app/device/bind", data).then(res => {
|
||||
// if(res.code == 200){
|
||||
// that.$u.get(`/app/device/${id}/bySn`).then((res) => {
|
||||
// if (res.code == 200) {
|
||||
// uni.navigateTo({
|
||||
// url: '/page_components/bindsz?id=' + res.data.deviceId
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// } else if (res.cancel) {
|
||||
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// } else if (res.data == 0) {
|
||||
// uni.showModal({
|
||||
// title: '提示',
|
||||
// content: '该设备未录入,你需进行录入吗？',
|
||||
// success: function(res) {
|
||||
// if (res.confirm) {
|
||||
// uni.navigateTo({
|
||||
// url: '/page_fenbao/zhuce?sn=' + id
|
||||
// })
|
||||
// } else if (res.cancel) {
|
||||
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// } else {
|
||||
// if (res.msg == '设备未录入') {
|
||||
// uni.showModal({
|
||||
// title: '提示',
|
||||
// content: '该设备未录入,你需进行录入吗？',
|
||||
// success: function(res) {
|
||||
// if (res.confirm) {
|
||||
// uni.navigateTo({
|
||||
// url: '/page_fenbao/zhuce?sn=' + id
|
||||
// })
|
||||
// } else if (res.cancel) {
|
||||
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// } else {
|
||||
// uni.showToast({
|
||||
// title: res.msg,
|
||||
// icon: 'none',
|
||||
// duration: 1000
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
},
|
||||
// 分享到好友（会话）
|
||||
onShareAppMessage: function() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user