完善

page_components/HM-dragSorts/HM-dragSorts.vue

@@ -52,8 +52,8 @@
 				<view class="card">
 					<view  class="card_left">
 						<view  class="txt" style="font-size: 28rpx;">
-							<text>{{row.name.length > 4 ? row.name.substring(0, 4) + '...' : row.name }}  </text>
+							<text>{{row.name}}  </text>
-							<text v-if="row.value != null">
+							<!-- <text v-if="row.value != null">
 								（通电时长：{{row.value}}
 								<text v-if="row.timeUnit == 1">日</text>
 								<text v-if="row.timeUnit == 2">时</text>
@@ -61,7 +61,20 @@
 								<text v-if="row.timeUnit == 4">秒</text>
                              ）</text> 
 							 <text v-else>(智能计时)</text>
-							<text>￥{{row.price}}</text>
+							<text>￥{{row.price}}</text> -->
+							<view class="">
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 1">计时收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 2">按量收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 3">分时段按量收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 4">分时段按时收费</text>
+								(<text style="margin-top: 10rpx;" v-if="row.feeMode == 1">单次收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeMode == 2">智能收费</text>)
+								<text style="width: 20rpx;display: inline-block;"></text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 3 || row.feeType == 4">押金{{row.price}}</text>
+								<text style="margin-top: 10rpx;" v-if="row.timeUnit == 2 && row.feeType != 3 && row.feeType != 4">{{row.value}}时 {{row.price}}元</text>
+								<text style="margin-top: 10rpx;" v-if="row.timeUnit == 3 && row.feeType != 3 && row.feeType != 4">{{row.value}}分 {{row.price}}元</text>
+								<text style="margin-top: 10rpx;" v-if="row.timeUnit == 4 && row.feeType != 3 && row.feeType != 4">{{row.value}}秒 {{row.price}}元</text>
+							</view>
 						</view>
 						<view class="ccc">
 							<view class="bumday" v-if="row.description == null">
@@ -685,7 +698,7 @@
 				font-family: Source Han Sans, Source Han Sans;
 				font-weight: 400;
 				color: #000000;
-				display: flex;
+				// display: flex;
 				justify-content: space-between;
 				width: 570rpx;
 			}

page_fenbao/HM-dragSorts/HM-dragSorts.vue

@@ -72,7 +72,11 @@
 							<image src="https://api.ccttiot.com/smartmeter/img/static/uEcvOWAyC2VCw8WSiyBe" mode="" @click.stop="del(row.storeId)"></image>
 						</view> -->
 						<view  :class="['txt', { activewz: tcidlist.includes(row.suitId) }]" style="font-size: 28rpx;">
-							<text>{{row.name.length > 4 ? row.name.substring(0, 4) + '...' : row.name }}   </text>
+							<view class="" style="display: flex;justify-content: space-between;width: 100%;">
+								<text>{{row.name}}</text>
+								<text v-if="tcidlist.includes(row.suitId)">已应用</text>
+								<text v-else>未应用</text>
+							</view>
 							<!-- <text>
 								（通电时长：{{row.value}}
 								<text v-if="row.timeUnit == 1">日</text>

page_fenbao/fenxiang.vue

@@ -0,0 +1,388 @@
+<template>
+	<view class="page">
+		<u-navbar title="分享二维码" :border-bottom="false" :background="bgc" back-icon-color="#000" title-color='#000'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+        
+		<view class="tishi">
+			<text>微信“扫一扫” 使用小程序</text>
+			<text>选择您所需要的用电套餐</text>
+		</view>
+
+		<!-- 展示二维码 -->
+		<view class="imgewm" @longpress="saveCanvas">
+			<canvas canvas-id="qrcode" style="height: 100%;margin: 0 auto;" />
+			<view class="" style="width: 100%;text-align: center;margin-top: 20rpx;">
+				SN:{{deviceNo}}
+			</view>
+			<view class="btn"
+				@click="saveCanvas">
+				保存二维码
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	import uQRCode from '@/common/uqrcode.js'
+	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
+	import * as echarts from '@/components/uni-ec-canvas/echarts'
+	let chart = null
+	export default {
+		components: {
+			uniEcCanvas
+		},
+		data() {
+			return {
+				suitSurplus:'',
+				showflag: false,
+				imgflag: false,
+				wemflag: false,
+				btnmsk: false,
+				bluetoothflag: false,
+				shibaiflag: false,
+				danwei: '',
+				listdanwei: [{
+					value: 2,
+					label: '小时'
+				}, {
+					value: 3,
+					label: '分钟'
+				}, {
+					value: 4,
+					label: '秒钟'
+				}, {
+					value: 0,
+					label: '度'
+				}],
+				bgc: {
+					backgroundColor: "#F9F8FF ",
+				},
+				ec: {
+					lazyLoad: true
+				},
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				checked: false,
+				tittxt: "设备详情",
+				titlist: [],
+				tdtxt: '开启',
+				curtitidx: 0,
+				id: '',
+				focus: false,
+				timeday: '',
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				mac: "",
+				name: '',
+				deviceId: '',
+				storeId: '',
+				qrResult: '',
+				devicesList: [],
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: true,
+				timer: null,
+				url: "",
+				deviceNo: '',
+				modelId: [],
+				damweiid: '',
+				intervalId: null,
+				sklist:{},
+				sklistflag:false,
+			}
+		},
+		onLoad(option) {
+			this.deviceNo = option.id
+			this.qrFun()
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.drawCanvas()
+		},
+		methods: {
+
+			capture() {
+				var pages = getCurrentPages(); //获取当前页面信息
+				var page = pages[pages.length - 1];
+				var bitmap = null;
+				var currentWebview = page.$getAppWebview();
+				bitmap = new plus.nativeObj.Bitmap('amway_img');
+				// 将webview内容绘制到Bitmap对象中
+				currentWebview.draw(bitmap, function() {
+					// console.log('截屏绘制图片成功');
+					//这里我将文件名用四位随机数拼接了，不然会出现当前图片替换上一张图片只能保存一张图片的问题
+					let rand = Math.floor(Math.random() * 10000)
+					let saveUrl = '_doc/' + rand + 'a.jpg'
+					bitmap.save(saveUrl, {}, function(i) {
+						// console.log('保存图片成功：' + JSON.stringify(i));
+						uni.saveImageToPhotosAlbum({
+							filePath: i.target,
+							success: function() {
+								// bitmap.clear(); //销毁Bitmap图片
+								uni.showToast({
+									title: '保存图片成功',
+									mask: false,
+									duration: 1500
+								});
+							}
+						});
+					}, function(e) {
+						console.log('保存图片失败：' + JSON.stringify(e));
+					});
+				}, function(e) {
+					console.log('截屏绘制图片失败：' + JSON.stringify(e));
+				});
+				//currentWebview.append(amway_bit);
+			},
+
+
+			drawCanvas() {
+				const ctx = uni.createCanvasContext('qrcode', this);
+				ctx.setFillStyle('#fff');
+				ctx.fillRect(10, 10, 250, 250);
+				ctx.draw();
+			},
+			// 长按保存二维码
+			saveCanvas() {
+				uni.canvasToTempFilePath({
+					canvasId: 'qrcode',
+					success: (res) => {
+						console.log(res.tempFilePath); // 打印图片路径  
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function() {
+								uni.showToast({
+									title: '保存成功',
+									icon: 'success'
+								});
+							}
+						});
+					},
+					fail: (err) => {
+						console.error(err);
+					}
+				});
+			},
+			//**生成二维码**//
+			qrFun: function() {
+				this.wemflag = true
+				uQRCode.make({
+					canvasId: 'qrcode',
+					// componentInstance: this,
+					text: 'https://kg.chuantewulian.cn/w?s=' + this.deviceNo,
+					size: 250,
+					margin: 0,
+					backgroundColor: '#ffffff',
+					foregroundColor: '#000000',
+					fileType: 'jpg',
+					errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+				})
+			},
+			ewmyc() {
+				this.wemflag = false
+			},
+
+			btnlyqx() {
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
+
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				});
+			},
+
+
+			btnpic() {
+				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,
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						// console.log(res);
+						let str = JSON.parse(res.data)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						_this.imglist = _this.userImgs
+						// console.log(_this.imglist,'_this.imglist_this.imglist')
+						let data = {
+							deviceId: _this.id,
+							customPicture: _this.imglist
+						}
+						_this.putdevice(data)
+					}
+				})
+			},
+			oncancel() {
+				// url设置为空，隐藏控件
+				this.url = ""
+			},
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+
+			opendevice() {
+				let stause = 0
+				if (this.deviceInfo.powerStatus == 1) {
+					stause = 0
+				} else {
+					stause = 1
+				}
+				// console.log(stause, 'stausestause');
+				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
+					if (res.code == 200) {
+						// this.groupList=res.rows
+						setTimeout(() => {
+							this.getDevice(this.id)
+						}, 2000)
+
+						// this.loadings=true
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			opendevices() {
+
+			},
+			swiperchange(e) {
+				this.curtitidx = e.detail.current
+				// console.log(e, 'aaaa');
+			},
+			changeidx(index) {
+				this.curtitidx = index
+			},
+
+			toydfx() {
+				uni.navigateTo({
+					url: "/page_components/eletj?id=" + this.id
+				})
+			},
+			
+	
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .panel {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 99 !important;
+		overflow: hidden;
+	}
+    .btn{
+		width:100%;
+		height: 94rpx;
+		background: #8883F0;
+		border-radius: 47rpx 47rpx 47rpx 47rpx;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 94rpx;
+		margin-top: 184rpx;
+	}
+	.imgewmflag {
+		width: 750rpx;
+		height: 100vh;
+		background: #fff;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.imgewm {
+		width: 250px;
+		height:250px;
+		margin: auto;
+		margin-top: 104rpx;
+		// position: fixed;
+		// top:400rpx;
+		// left: 50%;
+		// transform: translateX(-50%);
+		z-index: 2;
+	}
+    .tishi{
+		width: 620rpx;
+		height: 180rpx;
+		background: rgba(217,216,255,0.3294);
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		text-align: center;
+		padding: 36rpx 92rpx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 104rpx;
+		text{
+			margin-top: 16rpx;
+			display: block;
+			font-size: 36rpx;
+			color: #3D3D3D;
+		}
+	}
+</style>

page_fenbao/zhuce.vue

@@ -4,6 +4,7 @@
 			back-icon-color="#fff" height='50'></u-navbar>
 		<view class="title">
 			<text>设备录入列表</text>
+			<text style="font-size: 28rpx;width: 160rpx;height: 60rpx;border-radius: 20rpx;background-color: #8883F0;text-align: center;color: #fff;line-height: 60rpx;margin-top: 20rpx;" @click="btnkzt">控制台</text>
 		</view>
 
 		<view class="dblist" v-for="(item, index) in devicesLists" :key="index">
@@ -138,6 +139,11 @@
 			// this.videoContext = uni.createVideoContext('myVideo', this)
 		},
 		methods: {
+			btnkzt(){
+				uni.navigateTo({
+					url:'/page_user/wifijoint/index' 
+				})
+			},
 			// 扫码sn
 			scanQRCode(item) {
 				this.snname = item.name
@@ -613,7 +619,8 @@
 	.title {
 		margin-bottom: 84rpx;
 		margin-top: 50rpx;
-
+        display: flex;
+		justify-content: space-between;
 		image {
 			display: inline-block;
 			width: 48rpx;

page_user/sbdetail.vue

@@ -98,6 +98,28 @@
                 </view>
 			</view>
 			
+			<view class="card2" style="padding-bottom: 40rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">设备剩余</view>
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.surplusEle == null ? '--' : deviceInfo.surplusEle}}
+						</view>
+						<view class="txt">
+							剩余度数
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{formattedTime}}
+						</view>
+						<view class="txt">
+							剩余时长
+						</view>
+					</view>
+				</view>
+			</view>
+			
 			<!-- 当前订单 -->
 			<view v-if="sklistflag" @click="btnshdd" class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 20rpx;">
 				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;display: flex;justify-content: space-between;padding-right: 40rpx;margin-bottom: 20rpx;">当前订单 <text style="color: #8883F0;font-size: 32rpx;font-weight: 400;">查看</text> </view>
@@ -142,8 +164,8 @@
 					<view class="">
 						<view class="cont" @click="topage(0)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/ucprXYT39GKWEVHlAaAb" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u2ALEsvAJrHnW7nhrTVD" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 40rpx;"></image>
 									<view class="bot">充值记录</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
@@ -151,7 +173,7 @@
 						<view class="cont" @click="topage(3)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/uJmpaxyrv34a1EW5lWQv" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 44rpx;"></image>
 									<view class="bot">收费方式</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
@@ -159,14 +181,14 @@
 						<view class="cont" @click="topage(1)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 44rpx;"></image>
 									<view class="bot">归零</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
 						</view>
 						<view class="cont" @click="topage(6)">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/u9vzIeLLorfYuoZnxBDZ" mode="">
 								</image>
 								<view class="bot">充值</view>
@@ -178,7 +200,7 @@
 						
 						<view class="cont" @click="topage(5)" v-if="modelId.some(tag => tag == 2)">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/ule3wEEDaXzfXCUCM1Ks" mode="">
 								</image>
 								<view class="bot">配网</view>
@@ -187,7 +209,7 @@
 						</view>
 						<view class="cont" @click="qrFun">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/uMdtTPOmGVJqcYIQvnUj" mode="">
 								</image>
 								<view class="bot">分享</view>
@@ -197,14 +219,14 @@
 						<view class="cont" @click="topage(2)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 40rpx;"></image>
 									<view class="bot">上报异常</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
 						</view>
 						<view class="cont" @click="topage(4)">
 							<view class="top" style="border: 0;">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/uOUM2aclDz2ZnRxOll9g" mode="">
 								</image>
 								<view class="bot">设置</view>
@@ -300,6 +322,7 @@
 		},
 		data() {
 			return {
+				suitSurplus:'',
 				showflag: false,
 				imgflag: false,
 				wemflag: false,
@@ -472,6 +495,7 @@
 						}else{
 							this.sklistflag = true
 							this.sklist = res.rows[0]
+							this.suitSurplus = res.rows[0].surplusEle
 						}
 						
 					}else{
@@ -581,18 +605,21 @@
 			},
 			//**生成二维码**//
 			qrFun: function() {
-				this.wemflag = true
+				uni.navigateTo({
-				uQRCode.make({
+					url:'/page_fenbao/fenxiang?id=' + this.deviceNo
-					canvasId: 'qrcode',
-					// componentInstance: this,
-					text: 'https://kg.chuantewulian.cn/w?s=' + this.deviceNo,
-					size: 250,
-					margin: 0,
-					backgroundColor: '#ffffff',
-					foregroundColor: '#000000',
-					fileType: 'jpg',
-					errorCorrectLevel: uQRCode.errorCorrectLevel.H,
 				})
+				// this.wemflag = true
+				// uQRCode.make({
+				// 	canvasId: 'qrcode',
+				// 	// componentInstance: this,
+				// 	text: 'https://kg.chuantewulian.cn/w?s=' + this.deviceNo,
+				// 	size: 250,
+				// 	margin: 0,
+				// 	backgroundColor: '#ffffff',
+				// 	foregroundColor: '#000000',
+				// 	fileType: 'jpg',
+				// 	errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+				// })
 			},
 			ewmyc() {
 				this.wemflag = false

page_user/wifijoint/index.vue

@@ -50,7 +50,7 @@
 				</view>
 			</view>
 			<view class="fanhui" @click="btnfh">
-				返回录入
+				返回
 			</view>
 		</view>
 		
@@ -72,8 +72,10 @@
 			}
 		},
 		onLoad(options) {
+			if(options.sn){
 				this.storeId = options.sn
 				this.getsn()
+			}
 		},
 		// 分享到好友（会话）
 		  onShareAppMessage: function () {  
@@ -150,9 +152,7 @@
 			 
 			 // 返回录入
 			 btnfh(){
-				uni.navigateBack({
+				uni.navigateBack()
-					delta:2
-				})
 			 },
 			 
 			 // 开启

pages.json

@@ -303,6 +303,16 @@
 						"navigationBarTextStyle": "#FFFFFF",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "fenxiang",
+					"style": {
+						"navigationBarTitleText": "添加设备",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#3996FD",
+						"navigationBarTextStyle": "#FFFFFF",
+						"navigationStyle": "custom"
+					}
 				},{
 					"path": "webview",
 					"style": {

pages/tj.vue

@@ -17,7 +17,7 @@
 						name="arrow-down-fill"></u-icon>
 				</view>
 				<view class="tit">
-					本月收入{{recharge}}（元） 累计收入{{totalRecharge}}（元）
+					本月收入{{recharge.toFixed(2)}}（元） 累计收入{{totalRecharge.toFixed(2)}}（元）
 				</view>
 
 				<view class="echarts" >