aaa
This commit is contained in:
		
							parent
							
								
									e0cc3c7cf4
								
							
						
					
					
						commit
						1db163f689
					
				|  | @ -20,8 +20,8 @@ const install = (Vue, vm) => { | |||
| 	// 	},
 | ||||
| 	// }); 
 | ||||
| 	Vue.prototype.$u.http.setConfig({ | ||||
| 			baseUrl: 'http://192.168.2.143:10002', | ||||
| 			// baseUrl: 'https://kg.chuantewulian.cn/prod-api',
 | ||||
| 			// baseUrl: 'http://192.168.2.143:10002',
 | ||||
| 			baseUrl: 'https://kg.chuantewulian.cn/prod-api', | ||||
| 			loadingText: '努力加载中~', | ||||
| 			loadingTime: 1000, | ||||
| 			// 设置自定义头部content-type
 | ||||
|  | @ -108,20 +108,19 @@ const install = (Vue, vm) => { | |||
| 				        if (res.code) { | ||||
| 				            console.log('登录!', res); | ||||
| 				            let data = { | ||||
| 				                wxOpenId: res.code, | ||||
| 				                 | ||||
| 				            }; | ||||
| 				                loginCode: res.code, | ||||
| 				            } | ||||
| 							vm.$u.post('/app/auth/wxLogin',data).then(res=>{ | ||||
| 				        		if (res.code == 10003) { | ||||
| 				        			uni.navigateTo({ | ||||
| 				        				url:'/pages/login/login' | ||||
| 				        			}) | ||||
| 				        			// uni.navigateTo({
 | ||||
| 				        			// 	url:'/pages/login/login'
 | ||||
| 				        			// })
 | ||||
| 				        			 | ||||
| 				        		} else if (res.code == 200) { | ||||
| 				        			// console.log("老用户登录",res.data)
 | ||||
| 				        			uni.switchTab({ | ||||
| 				        				url:'/pages/index/index' | ||||
| 				        			}) | ||||
| 				        			// uni.switchTab({
 | ||||
| 				        			// 	url:'/pages/index/index'
 | ||||
| 				        			// })
 | ||||
| 				        			 | ||||
| 				        		} | ||||
| 				        	}); | ||||
|  |  | |||
|  | @ -47,7 +47,7 @@ | |||
| 				<view class="bot_right"> | ||||
| 					<view class="cont" style="text-align: center;"> | ||||
| 						<view class="txt"> | ||||
| 							剩余时长:{{ setMode == null ? timeday : setMode}}  | ||||
| 							剩余时长:{{ setMode == null ? timeday : setMode}} 分钟 | ||||
| 						</view> | ||||
| 					</view> | ||||
| 				</view> | ||||
|  | @ -625,7 +625,7 @@ | |||
| 						// flex-wrap: nowrap; | ||||
| 						width: 100%; | ||||
| 						justify-content: space-between; | ||||
| 						padding-left: 80rpx; | ||||
| 						padding-left: 210rpx; | ||||
| 						padding-right: 80rpx; | ||||
| 						box-sizing: border-box; | ||||
| 
 | ||||
|  | @ -654,7 +654,7 @@ | |||
| 				// flex-wrap: nowrap; | ||||
| 				width: 100%; | ||||
| 				justify-content: space-between; | ||||
| 				padding-left: 45rpx; | ||||
| 				padding-left: 220rpx; | ||||
| 				padding-right: 80rpx; | ||||
| 				box-sizing: border-box; | ||||
| 				.cont { | ||||
|  |  | |||
|  | @ -372,6 +372,7 @@ | |||
| 												clearInterval(this.timer); | ||||
| 												that.timer = null; | ||||
| 											} | ||||
| 											that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {}) | ||||
| 											// 支付成功逻辑 | ||||
| 											uni.reLaunch({ | ||||
| 												url: '/pages/shouye/index' | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
| 			height='50'></u-navbar> | ||||
|         <view class="box"> | ||||
|         	<view class="title"> | ||||
|         		{{listobj.title}} | ||||
|         		{{listobj.title == undefined ? '' : listobj.title}} | ||||
|         	</view> | ||||
| 			<view class="cont" v-html="listobj.content"> | ||||
|                  | ||||
|  | @ -58,7 +58,8 @@ | |||
| 		left: 0; | ||||
| 		.box{ | ||||
| 			width: 750rpx; | ||||
| 			height: 1440rpx; | ||||
| 			height: 90vh; | ||||
| 			overflow: scroll; | ||||
| 			background: #F4F5F7; | ||||
| 			border-radius: 0rpx 0rpx 0rpx 0rpx; | ||||
| 			padding: 40rpx; | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
| 			height='50'></u-navbar> | ||||
|         <view class="box"> | ||||
|         	<view class="title"> | ||||
|         		{{obj.title}} | ||||
|         		{{obj.title == undefined ? '' : obj.title}} | ||||
|         	</view> | ||||
| 		 | ||||
| 			<view class="js" v-html="obj.content"> | ||||
|  |  | |||
|  | @ -343,7 +343,7 @@ | |||
| 			} | ||||
| 			.listxq{ | ||||
| 				width: 680rpx; | ||||
| 				height: 760rpx;  | ||||
| 				height: 780rpx;  | ||||
| 				background: #FFFFFF; | ||||
| 				border-radius: 20rpx 20rpx 20rpx 20rpx; | ||||
| 				margin: auto; | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
| 			height='50'></u-navbar> | ||||
|         <view class="box"> | ||||
|         	<view class="title"> | ||||
|         		{{listobj.title}} | ||||
|         		{{listobj.title == undefined ? '' : listobj.title}} | ||||
|         	</view> | ||||
| 			<view class="cont"> | ||||
| 				{{listobj.content}} | ||||
|  |  | |||
|  | @ -66,7 +66,7 @@ | |||
| 					</view> | ||||
| 					<view class="cont" style="text-align: center;"> | ||||
| 						<view class="tit"> | ||||
| 							{{ setMode == null ? timeday : setMode}}  | ||||
| 							{{ setMode == null ? timeday : setMode}} 分钟 | ||||
| 							<!-- sb:{{setMode}} --> | ||||
| 						</view> | ||||
| 						<view class="txt"> | ||||
|  | @ -81,21 +81,21 @@ | |||
| 				<view class="tit">其他</view> | ||||
| 				<view class="cont_box" style="display: block;"> | ||||
| 					<view class="" style="display: flex;"> | ||||
| 						<view class="cont" style="width: 120rpx;margin-right: 50rpx;" @click="topage(0)"> | ||||
| 						<view class="cont"  @click="topage(0)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode="" | ||||
| 									style="width: 58rpx;height: 56rpx;"></image> | ||||
| 							</view> | ||||
| 							<view class="bot">充值记录</view> | ||||
| 						</view> | ||||
| 						<view class="cont" style="width: 60rpx;" @click="topage(1)"> | ||||
| 						<view class="cont"  @click="topage(1)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/uaS4iFmD786AtBt2tKFs" mode="" | ||||
| 									style="width: 58rpx;height: 58rpx;"></image> | ||||
| 							</view> | ||||
| 							<view class="bot">归零</view> | ||||
| 						</view> | ||||
| 						<view class="cont" style="width: 60rpx;" @click="topage(2)"> | ||||
| 						<view class="cont"  @click="topage(2)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/ue0X00T1C3fh7TCgjopm" mode="" | ||||
| 									style="width: 58rpx;height: 60rpx;"></image> | ||||
|  | @ -109,7 +109,7 @@ | |||
| 							</view> | ||||
| 							<view class="bot">用电分析</view> | ||||
| 						</view> --> | ||||
| 						<view class="cont" style="width: 120rpx;" @click="topage(6)"> | ||||
| 						<view class="cont"  @click="topage(6)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/uAnBmmayp3tVGwXntdaM" mode=""></image> | ||||
| 							</view> | ||||
|  | @ -117,23 +117,23 @@ | |||
| 						</view> | ||||
| 					</view> | ||||
| 					<view class="" style="display: flex;margin-top: 20rpx;"> | ||||
| 						<view class="cont" style="width: 120rpx;margin-right: 50rpx;" @click="topage(3)"> | ||||
| 						<view class="cont" @click="topage(3)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode="" | ||||
| 									style="width: 58rpx;height: 60rpx;"></image> | ||||
| 							</view> | ||||
| 							<view class="bot">收费方式</view> | ||||
| 						</view> | ||||
| 						<view class="cont" style="width: 66rpx;" @click="topage(4)"> | ||||
| 						<view class="cont"  @click="topage(4)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/u2Uco0iXf8aure0H2ihz" mode=""> | ||||
| 								</image> | ||||
| 							</view> | ||||
| 							<view class="bot">设置</view> | ||||
| 						</view> | ||||
| 						<view class="cont" style="width: 60rpx;" @click="topage(5)"> | ||||
| 						<view class="cont"  @click="topage(5)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/uXdBHA7pzOv2LYL7stJp" mode=""> | ||||
| 								<image  src="https://api.ccttiot.com/smartmeter/img/static/uXdBHA7pzOv2LYL7stJp" mode=""> | ||||
| 								</image> | ||||
| 							</view> | ||||
| 							<view class="bot">配网</view> | ||||
|  | @ -150,7 +150,7 @@ | |||
|           | ||||
| 		 <view class="tanc" v-if="vipflag"> | ||||
| 		 	<view class="tit">请输入您需要充值的时长(分钟)</view> | ||||
| 		 	<input type="text" v-model="cztime" /> | ||||
| 		 	<input type="number" :focus="focus" v-model="cztime" /> | ||||
| 		 	<view class="xian"></view> | ||||
| 		 	<view class="anniu"> | ||||
| 		 		<text @click="btnqx">取消</text> <text style="border-left: 1px solid #D8D8D8;color: #8883F0;" | ||||
|  | @ -191,6 +191,7 @@ | |||
| 				], | ||||
| 				curtitidx: 0, | ||||
| 				id: '', | ||||
| 				focus:false, | ||||
| 				timeday: '', | ||||
| 				imglist: '', | ||||
| 				token: '', | ||||
|  | @ -549,11 +550,11 @@ | |||
| 										duration: 2000 | ||||
| 									}); | ||||
| 								} else { | ||||
| 									uni.showToast({ | ||||
| 										title: res.msg, | ||||
| 										icon: 'none', | ||||
| 										duration: 2000 | ||||
| 									}); | ||||
| 									// uni.showToast({ | ||||
| 									// 	title: res.msg, | ||||
| 									// 	icon: 'none', | ||||
| 									// 	duration: 2000 | ||||
| 									// }); | ||||
| 									// uni.navigateBack() | ||||
| 								} | ||||
| 							}) | ||||
|  | @ -605,8 +606,9 @@ | |||
| 							} | ||||
| 						}) | ||||
| 					} | ||||
| 				}else if(num == 6){ | ||||
| 				}else if (num == 6){ | ||||
| 					this.vipflag = true | ||||
| 					this.focus = true | ||||
| 				} | ||||
| 			}, | ||||
| 			trueje(){ | ||||
|  | @ -1094,7 +1096,7 @@ | |||
| 						text-align: center; | ||||
| 
 | ||||
| 						.top { | ||||
| 							width: 110rpx; | ||||
| 							width: 100%; | ||||
| 							font-size: 32rpx; | ||||
| 							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; | ||||
| 							font-weight: 400; | ||||
|  | @ -1145,12 +1147,13 @@ | |||
| 					} | ||||
| 
 | ||||
| 					.cont { | ||||
| 						width: 112rpx; | ||||
| 						display: flex; | ||||
| 						flex-wrap: wrap; | ||||
| 						align-items: center; | ||||
| 						justify-content: center; | ||||
| 						margin-right: 80rpx; | ||||
| 						width: 25%; | ||||
| 						text-align: center; | ||||
| 						// display: flex; | ||||
| 						// flex-wrap: wrap; | ||||
| 						// align-items: center; | ||||
| 						// justify-content: center; | ||||
| 						// margin-right: 80rpx; | ||||
| 
 | ||||
| 						.top { | ||||
| 							image { | ||||
|  |  | |||
|  | @ -499,8 +499,8 @@ | |||
| 					font-size: 32rpx; | ||||
| 					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; | ||||
| 					font-weight: 400; | ||||
| 					color: #FFFFFF; | ||||
| 					background-color: #2A82E4; | ||||
| 					color: #000; | ||||
| 					background-color: #fff; | ||||
| 				} | ||||
| 
 | ||||
| 				.btn1 { | ||||
|  | @ -511,8 +511,8 @@ | |||
| 					font-size: 32rpx; | ||||
| 					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; | ||||
| 					font-weight: 400; | ||||
| 					color: #000; | ||||
| 					background-color: #fff; | ||||
| 					color: #fff; | ||||
| 					background-color: #8883f0; | ||||
| 					border: 1rpx solid #ccc; | ||||
| 				} | ||||
| 			} | ||||
|  |  | |||
|  | @ -100,14 +100,14 @@ | |||
| 										<view class="sta_txt" v-if="item.status==1" style="color:seagreen;"> | ||||
| 											空闲 | ||||
| 										</view> | ||||
| 										<view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu" style="border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;width: 200rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-left: 20rpx;"> | ||||
| 										<view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu" style="border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;width: 180rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-left: 20rpx;"> | ||||
| 											未分配店铺 | ||||
| 										</view> | ||||
| 									</view> | ||||
| 									<view class="card_left_no" @click="todetail(item.deviceId)"> | ||||
| 										S/N码:{{item.deviceNo}} | ||||
| 									</view> | ||||
| 									<view v-if="curtitidx==0" style="color: #ccc;margin-top: 20rpx;"> | ||||
| 									<view v-if="curtitidx==0" style="color: #ccc;margin-top: 20rpx;" @click="todetail(item.deviceId)"> | ||||
| 									   归属店铺:	{{item.storeName == null ? '--' : item.storeName}} | ||||
| 									</view> | ||||
| 									<!-- <view @click="sremakes(item)" v-else class="dianpu" style="border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;width: 200rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-top: 20rpx;"> | ||||
|  |  | |||
|  | @ -106,7 +106,7 @@ | |||
| 					if(this.id == 1){ | ||||
| 						uni.navigateBack() | ||||
| 					}else{ | ||||
| 						uni.navigateTo({ | ||||
| 						uni.reLaunch({ | ||||
| 							url: '/pages/shouye/index' | ||||
| 						}) | ||||
| 					} | ||||
|  | @ -114,7 +114,7 @@ | |||
| 			}, | ||||
| 			 | ||||
| 			btnbudl(){ | ||||
| 				uni.navigateTo({ | ||||
| 				uni.reLaunch({ | ||||
| 					url: '/pages/shouye/index' | ||||
| 				}) | ||||
| 			} | ||||
|  |  | |||
|  | @ -11,7 +11,7 @@ | |||
| 				</view> | ||||
| 
 | ||||
| 				<!-- 正在进行中的订单 --> | ||||
| 				<view class="ongoing_order"> | ||||
| 				<view class="ongoing_order" v-if="sylist.length > 0"> | ||||
| 					<view class="order_top"> | ||||
| 						<view class="order_lt"> | ||||
| 							<image src="https://api.ccttiot.com/smartmeter/img/static/uFNuOet0fB5Bwe1c26sk" mode=""></image> | ||||
|  | @ -20,7 +20,7 @@ | |||
| 						<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 sylist" :key="index" v-if="listflag" @click="btnitem"> | ||||
| 					<view class="order_list" v-for="(item,index) in sylist" :key="index" v-if="listflag" @click="btnitem(item.deviceId)"> | ||||
| 						<text>{{item.deviceName}}</text> <image src="https://api.ccttiot.com/smartmeter/img/static/uZoBXJ0MLrGUSBFk5lGp" mode=""></image> | ||||
| 					</view> | ||||
| 				</view> | ||||
|  | @ -29,31 +29,33 @@ | |||
| 				<view class="fujin"> | ||||
| 					<image src="https://api.ccttiot.com/smartmeter/img/static/uqv3e5ThWL8DqrRNBfoA" mode="" | ||||
| 						@click="btnindex(5)"></image> | ||||
| 					<image src="https://api.ccttiot.com/smartmeter/img/static/u7yxUJZqgPzESeI4tmiz" mode="" | ||||
| 						@click="btnindex(6)" v-if="deviceCount > 0"></image> | ||||
| 					<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/u7yxUJZqgPzESeI4tmiz" mode="" | ||||
| 						@click="btnindex(6)" v-if="deviceCount > 0"></image> --> | ||||
| 					<image @click="onControltap" style="width: 76rpx;height: 76rpx;position: absolute;right: 40rpx;" | ||||
| 						src="https://api.ccttiot.com/smartmeter/img/static/uOS9p7Sy1K9WpVQgD3b9" mode=""></image> | ||||
| 				</view> | ||||
| 				<view class="tubiao"> | ||||
| 					<view class="gr" @click="btnindex(1)"> | ||||
| 						<image src="https://api.ccttiot.com/smartmeter/img/static/uJBKoGWpRH2lM1NpQU0I" mode="" | ||||
| 							style="width: 96rpx;height:98rpx;"></image> | ||||
| 							style="width: 96rpx;height:94rpx;"></image> | ||||
| 						<!-- 个人中心 --> | ||||
| 					</view> | ||||
| 					<view class="gr" @click="btnindex(2)"> | ||||
| 						<image src="https://api.ccttiot.com/smartmeter/img/static/u8rWtdPtHabALkII23Zr" mode="" | ||||
| 							style="width: 96rpx;height:102rpx;"></image> | ||||
| 							style="width: 96rpx;height:94rpx;"></image> | ||||
| 						<!-- 我的订单 --> | ||||
| 					</view> | ||||
| 					<view class="gr" @click="btnindex(3)"> | ||||
| 						<image src="https://api.ccttiot.com/smartmeter/img/static/uphoDfOVnT6VEyj6glfF" mode="" | ||||
| 							style="width: 96rpx;height:98rpx;"></image> | ||||
| 							style="width: 96rpx;height:94rpx;"></image> | ||||
| 						<!-- 附近门店 --> | ||||
| 					</view> | ||||
| 					<view class="gr" @click="btnindex(4)"> | ||||
| 					<view class="gr" @click="btnindex(4)" v-if="isMch == false"> | ||||
| 						<image src="https://api.ccttiot.com/smartmeter/img/static/uBN46m7mPVlbbPth80FC" mode="" | ||||
| 							style="width: 96rpx;height:94rpx;"></image> | ||||
| 						<!-- 联系客服 --> | ||||
| 					</view> | ||||
| 					<view class="gr" @click="btnindex(6)" v-else> | ||||
| 						<image src="https://api.ccttiot.com/smartmeter/img/static/u3NDAI21OIGQH0Exdmdd" mode="" style="width: 96rpx;height:94rpx;"></image> | ||||
| 					</view> | ||||
| 				</view> | ||||
| 				<view class="guangg" @click="btnad"> | ||||
|  | @ -215,9 +217,9 @@ | |||
| 			 | ||||
| 			 | ||||
| 			 | ||||
| 			btnitem(){ | ||||
| 			btnitem(deviceId){ | ||||
| 				uni.navigateTo({ | ||||
| 					url:'/page_components/eletj' | ||||
| 					url:'/page_components/eletj?id=' + deviceId | ||||
| 				}) | ||||
| 			}, | ||||
| 			// 点击显示使用中设备 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user