aa

2024-05-16 18:02:44 +08:00 · 2024-05-16 18:02:44 +08:00 · c21fc37b9c
commit c21fc37b9c
parent 1512ad95cc
51 changed files with 1026 additions and 155 deletions
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@ -1,6 +1,6 @@
 const install = (Vue, vm) => {
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.243:3100/dev-api',
+			baseUrl: 'http://192.168.2.17:3100/dev-api',
 			// baseUrl: 'https://znb.ccttiot.com',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
--- a/page_user/hezuo/index.vue
+++ b/page_user/hezuo/index.vue
@ -13,7 +13,7 @@
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uft7OxFUV7v09RCwhpfo" mode=""></image>
 				<view class="one">验证码</view>
 				<input type="text" placeholder="请输入验证码" />
-				<view class="hq">获取验证码</view>
+				<view class="hq" @click="hqyzm">{{yzm}}</view>
 			</view>
 			<view class="inp">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uft7OxFUV7v09RCwhpfo" mode=""></image>
@ -37,7 +37,7 @@
 					background: '#25CE88'
 				},
 				show: false,
-				tit:'请选择您的合作意向',
+				tit: '请选择您的合作意向',
 				list: [{
 						value: '1',
 						label: '成为充电合作商'
@ -51,16 +51,61 @@
 						label: '贴牌OEM'
 					}
 				],
+				yzm: '获取验证码',
+				countdown: 0, // 倒计时变量  
+				countdownInterval: null, // 倒计时间隔ID  
 			}
 		},
 		methods: {
 			btnxz() {
-                this.show = true
+				this.show = true
 			},
-			confirm(e){
+			confirm(e) {
 				this.tit = e[0].label
-			}
-		}
+			},
+			hqyzm() {
+                if(this.yzm == '获取验证码'){
+					uni.showToast({
+					    title: '验证码已发送',  
+					    icon: 'success',  
+					    duration: 2000 
+					});
+					// 清除之前的定时器
+					this.clearCountdown();
+					// 开始新的倒计时  
+					this.startCountdown();
+				}else{
+					uni.showToast({
+					    title: '验证码已发送',  
+					    icon: 'none',  
+					    duration: 2000 
+					});
+				}
+			},
+			startCountdown() {
+				this.yzm = '60秒';
+				this.countdown = 60;
+				this.countdownInterval = setInterval(() => {
+					if (this.countdown > 0) {
+						this.countdown--;
+						this.yzm = this.countdown + '秒';
+					} else {
+						this.clearCountdown();
+						this.yzm = '获取验证码';
+					}
+				}, 1000);
+			},
+			clearCountdown() {
+				if (this.countdownInterval) {
+					clearInterval(this.countdownInterval);
+					this.countdownInterval = null;
+				}
+			},
+		},
+		beforeDestroy() {
+			// 在组件销毁前清除定时器  
+			this.clearCountdown();
+		},
 	}
 </script>

--- a/page_user/shopedit.vue
+++ b/page_user/shopedit.vue
@ -2,43 +2,81 @@
 	<view class="page">
 		<u-navbar title="修改店铺" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
 			height='38'></u-navbar>
-        <view class="box">
-        	<view class="list">
-        		<view class="listval">
-        			<view class="tit"> 店铺名称</view> <view class="but"> <input type="text" placeholder="请输入店铺名称" /> </view>
-        		</view>
-				<view class="listvals">
-					<view class="tit"> 店铺类型</view> <view class="but"> <input disabled="false" type="text" placeholder="请选择店铺类型" /> <u-icon name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
+		<view class="box">
+			<view class="list">
+				<view class="listval">
+					<view class="tit"> 店铺名称</view>
+					<view class="but"> <input type="text" placeholder="请输入店铺名称" v-model="shopname" /> </view>
+				</view>
+				<view class="listvals" @click="btnlx">
+					<view class="tit"> 店铺类型</view>
+					<view class="but"> <input disabled="false" type="text" :placeholder="selectortext" /> <u-icon
+							name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
 				</view>
 				<view class="listval">
-					<view class="tit"> 营业时间</view> <view class="but"> <input type="text" placeholder="请输入营业时间" /> </view>
+					<view class="tit"> 营业时间</view>
+					<view class="but"
+						style="display: flex;justify-content: space-between;padding: 15rpx 26rpx;box-sizing: border-box;">
+						<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(1)">{{ksyy}}</view>
+						 -- 
+						 <view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(2)">{{jsyy}}</view>
+					</view>
 				</view>
-				<view class="listvals">
-					<view class="tit"> 省市区</view> <view class="but"> <input disabled="false" type="text" placeholder="请选择省市区" /> <u-icon name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
+				<view class="listvals" @click="btnregion">
+					<view class="tit"> 省市区</view>
+					<view class="but"> <input disabled="false" type="text" :placeholder="regiontext" /> <u-icon
+							name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
+				</view>
+				<view class="listval">
+					<view class="tit"> 联系人</view>
+					<view class="but"> <input type="text" placeholder="请输入联系人" v-model="lxname" /> </view>
+				</view>
+				<view class="listval">
+					<view class="tit"> 联系电话</view>
+					<view class="but"> <input type="text" placeholder="请输入联系电话" v-model="lxphone" /> </view>
 				</view>
-				
 				<view class="jinwei">
-					<view class="tit"> 经纬度</view> 
-					<view class="but" style="position:relative;">
-						<input type="text" placeholder="请选择经度" />
-						<input type="text" placeholder="请选择纬度" />
-						<u-icon name="map-fill" size="32" style="position: absolute;top: 44rpx;right: 22rpx;z-index: 99;"></u-icon>
+					<view class="tit"> 经纬度</view>
+					<view class="but">
+						<input type="text" :placeholder="latitude" disabled="true" />
+						<input type="text" :placeholder="longitude" disabled="true" />
+						<u-icon name="map-fill" style="position: absolute;top: 44rpx;right: 22rpx;z-index: 99;"
+							size="32" @click="btnjwd"></u-icon>
 					</view>
 				</view>
 				<view class="listval">
-					<view class="tit"> 详细地址</view> <view class="but"> <input type="text" placeholder="请输入详细地址" /> </view>
+					<view class="tit"> 详细地址</view>
+					<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
 				</view>
-				<view class="listval">
-					<view class="tit"> 联系人</view> <view class="but"> <input type="text" placeholder="请输入联系人" /> </view>
+				<view class="icon">
+					<view class="list_box">
+						<view class="lt">
+							<view class="tit">
+								上传门头照
+							</view>
+							<view class="wz">
+								门头照片必须清晰、方正、易于辨识
+							</view>
+						</view>
+						<view class="imgbox" @click="btn">
+							<image :src="imglist" mode=""
+								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
+						</view>
+					</view>
 				</view>
-				<view class="listval">
-					<view class="tit"> 联系电话</view> <view class="but"> <input type="text" placeholder="请输入联系电话" /> </view>
+				<view class="baocun" @click="btncreat">
+					确定修改
 				</view>
-				<view class="baocun">
-					保存修改
-				</view>
-        	</view>
-        </view>
+			</view>
+
+			<!-- 店铺类型 -->
+			<u-select v-model="selectorshow" :list="selector" @confirm="btnselector"></u-select>
+			<!-- 选择省市区 -->
+			<u-picker v-model="regionshow" mode="region" @confirm="btnregions"></u-picker>
+			<!-- 营业时间 -->
+			<u-picker mode="time" v-model="show" :params="params" @confirm="btnyy"></u-picker>
+
+		</view>
 	</view>
 </template>

@ -46,18 +84,291 @@
 	export default {
 		data() {
 			return {
-
+				params: {
+					hour: true,
+					minute: true,
+				},
+				show: false,
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				selectorshow: false,
+				selectortext: '请选择商铺类型',
+				selectorvalue: '',
+				regionshow: false,
+				regiontext: '请选择省市区',
+				regionvalue: '',
+				selector: [{
+						value: 1,
+						label: '商场'
+					},
+					{
+						value: 2,
+						label: '学校'
+					},
+					{
+						value: 3,
+						label: '娱乐场所'
+					},
+					{
+						value: 4,
+						label: '出租房'
+					},
+					{
+						value: 5,
+						label: '其他'
+					},
+				],
+				latitude: '请输入纬度',
+				longitude: '请输入经度',
+				shopname: '',
+				yetime: '',
+				lxname: '',
+				lxphone: '',
+				xqdz: '',
+				ksyy:'开始营业时间',
+				jsyy:'结束营业时间',
+				yynum:0,
+				province:'',
+				city:'',
+				area:'',
+				listobj:{},
+				storeId:''
 			}
 		},
+		onLoad(option) {
+			let obj = JSON.parse(option.obj)
+			this.listobj = obj
+			console.log(this.listobj);
+			this.shopname = this.listobj.name
+		    this.ksyy = this.listobj.businessTimeStart
+			this.jsyy = this.listobj.businessTimeEnd
+			this.regiontext = this.listobj.province + this.listobj.city + this.listobj.county
+			this.lxname = this.listobj.contactName
+			this.lxphone = this.listobj.contactMobile
+			this.latitude = this.listobj.lat
+			this.longitude = this.listobj.lng
+			this.xqdz = this.listobj.address
+			this.selectorvalue = this.listobj.type
+			this.imglist = this.listobj.picture
+			this.province = this.listobj.province
+			this.city = this.listobj.city
+			this.area = this.listobj.county
+			this.storeId = this.listobj.storeId
+			if(this.selectorvalue == 1){
+				this.selectortext = '商场'
+			}else if(this.selectorvalue == 2){
+				this.selectortext = '学校'
+			}else if(this.selectorvalue == 3){
+				this.selectortext = '娱乐场所'
+			}else if(this.selectorvalue == 4){
+				this.selectortext = '出租房'
+			}else{
+				this.selectortext = '其他'
+			}
+			this.getQiniuToken()
+		},
 		methods: {
+			btnyinye(num){
+				this.show = true
+				this.yynum = num
+			},
+			btnyy(e){
+				if(this.yynum == 1){
+					this.ksyy = e.hour + ':' + e.minute
+				}else{
+					this.jsyy = e.hour + ':' + e.minute
+				}
+			},
+			btncreat() {
+				let phoneRegex = /^1[3-9]\d{9}$/ //判断手机号码格式
+				if (this.shopname == '') {
+					uni.showToast({
+						title: '请输入店铺名称',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.selectortext == '请选择商铺类型') {
+					uni.showToast({
+						title: '请选择商铺类型',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.ksyy == '开始营业时间') {
+					uni.showToast({
+						title: '请选择开始营业时间',
+						icon: 'none',
+						duration: 2000
+					});
+				} else if (this.jsyy == '结束营业时间') {
+					uni.showToast({
+						title: '请选择结束营业时间',
+						icon: 'none',
+						duration: 2000
+					});
+				} else if (this.regiontext == '请选择省市区') {
+					uni.showToast({
+						title: '请选择省市区',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.lxname == '') {
+					uni.showToast({
+						title: '请输入联系人',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.lxphone == '') {
+					uni.showToast({
+						title: '请输入联系电话',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.latitude == '请输入纬度') {
+					uni.showToast({
+						title: '请输入纬度',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.longitude == '请输入经度') {
+					uni.showToast({
+						title: '请输入经度',
+						icon: 'none',
+						duration: 1000
+					});
+				}else if (this.xqdz == '') {
+					uni.showToast({
+						title: '请输入详细地址',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.imglist == '') {
+					uni.showToast({
+						title: '请上传一张商铺门面照',
+						icon: 'none',
+						duration: 1000
+					});
+				} else {
+					let data = {
+						name: this.shopname,
+						picture: this.imglist,
+						address: this.xqdz,
+						lng: this.longitude,
+						lat: this.latitude,
+                        businessTimeStart:this.ksyy,
+						businessTimeEnd:this.jsyy,
+						province:this.province,
+						city:this.city,
+						county:this.area,
+						specificAddress:this.xqdz,
+						contactName:this.lxname,
+						contactMobile:this.lxphone,
+						type:this.selectorvalue,
+						storeId:this.storeId
+					}
+					this.$u.put("/app/store",data).then(res => {
+						if (res.code == 500) {
+							uni.showToast({
+								title: 'res.msg',
+								icon: 'success',
+								duration: 1000
+							})
+						}else{
+							uni.showToast({
+								title: '修改成功',
+								icon: 'success',
+								duration: 1000
+							})
+							setTimeout(()=>{
+								uni.navigateBack({
+									delta: 2 
+								})
+							},1000)
+						}
+					})
+				}
+			},

+			btnlx() {
+				this.selectorshow = true
+			},
+			btnselector(e) {
+				this.selectorvalue = e[0].value
+				this.selectortext = e[0].label
+			},
+			btnregion() {
+				this.regionshow = true
+			},
+			btnregions(e) {
+				this.regiontext = e.province.label + e.city.label + e.area.label
+				this.province = e.province.label
+				this.city = e.city.label
+				this.area = e.area.label
+			},
+			btnjwd() {
+				uni.chooseLocation({
+					success: (res) => {
+						this.latitude = res.latitude;
+						this.longitude = res.longitude;
+					},
+					fail: function(err) {
+						console.log('选择位置失败', err);
+					},
+					complete: (res) => {
+						if (res.errMsg === 'chooseLocation:ok') {
+						} else if (res.errMsg.indexOf('chooseLocation:cancel') === 0) {
+							uni.showToast({
+								title: '您取消了位置选择',
+								icon: 'none'
+							});
+						}
+					}
+				});
+			},
+
+
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				});
+			},
+			btn() {
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				uni.chooseImage({
+					count: 1,
+					type: 'all',
+					success(res) {
+						const tempFilePaths = res.tempFiles
+						wx.uploadFile({
+							url: 'https://up-z2.qiniup.com',
+							name: 'file',
+							filePath: tempFilePaths[0].path,
+							formData: {
+								token: _this.token, //后端返回的token
+								key: 'smartmeter/img/' + math
+							},
+							success: function(res) {
+								let str = JSON.parse(res.data)
+								console.log(str.key)
+								_this.userImgs = 'https://api.ccttiot.com/' + str.key
+								_this.imglist = _this.userImgs
+								_this.imgflag = false
+							}
+						});
+					}
+				})
+			},
 		}
 	}
 </script>

 <style lang="scss">
 	page {
-		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
 	}

 	.page {
@ -65,15 +376,17 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		.box{
+
+		.box {
 			width: 750rpx;
 			height: 1440rpx;
 			background: #F4F5F7;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			padding-top: 40rpx;
-			.list{
+
+			.list {
 				width: 680rpx;
-				height: 1154rpx;
+				height: 1254rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
@ -81,77 +394,132 @@
 				padding-left: 38rpx;
 				padding-right: 38rpx;
 				box-sizing: border-box;
-				.baocun{
+
+				.baocun {
 					width: 584rpx;
 					height: 90rpx;
-					background: linear-gradient( 270deg, #54DAA1 0%, #19CD82 100%);
+					background: linear-gradient(90deg, #8883F0 0%, #A29EFF 100%);
 					border-radius: 54rpx 54rpx 54rpx 54rpx;
+					margin: auto;
 					text-align: center;
 					line-height: 90rpx;
-					margin-top: 82rpx;
+					position: fixed;
+					left: 50%;
+					transform: translateX(-50%);
+					bottom: 60rpx;
 					font-weight: 500;
 					font-size: 40rpx;
 					color: #FFFFFF;
 				}
-				.jinwei{
+
+				.icon {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: center;
+					margin-top: 40rpx;
+					width: 680rpx;
+
+					.list_box {
+						width: 100%;
+						display: flex;
+						justify-content: space-between;
+
+						.lt {
+							padding-top: 40rpx;
+
+							.tit {
+								font-size: 32rpx;
+								color: #3D3D3D;
+							}
+
+							.wz {
+								font-size: 24rpx;
+								color: #3D3D3D;
+								margin-top: 20rpx;
+							}
+						}
+
+						.imgbox {
+							width: 33%;
+
+							image {
+								width: 142rpx;
+								height: 142rpx;
+							}
+						}
+					}
+				}
+
+				.jinwei {
 					display: flex;
 					justify-content: space-between;
 					margin-top: 34rpx;
-					.tit{
+
+					.tit {
 						margin-top: 40rpx;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.but{
+
+					.but {
 						width: 462rpx;
 						height: 140rpx;
 						background: #F0F0F0;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
-						input{
+						position: relative;
+
+						input {
 							height: 70rpx;
 							line-height: 70rpx;
 							padding-left: 22rpx;
 						}
 					}
 				}
-				.listvals{
+
+				.listvals {
 					display: flex;
 					justify-content: space-between;
 					margin-top: 34rpx;
-					
-					.tit{
+
+					.tit {
 						margin-top: 12rpx;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.but{
+
+					.but {
 						width: 462rpx;
 						height: 70rpx;
 						background: #F0F0F0;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
 						position: relative;
-						input{
+
+						input {
 							height: 70rpx;
 							line-height: 70rpx;
 							padding-left: 22rpx;
 						}
 					}
 				}
-				.listval{
+
+				.listval {
 					display: flex;
 					justify-content: space-between;
 					margin-top: 34rpx;
-					.tit{
+
+					.tit {
 						margin-top: 12rpx;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.but{
+
+					.but {
 						width: 462rpx;
 						height: 70rpx;
 						background: #F0F0F0;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
-						input{
+
+						input {
 							height: 70rpx;
 							line-height: 70rpx;
 							padding-left: 22rpx;
--- a/page_user/yajin/index.vue
+++ b/page_user/yajin/index.vue
@ -34,7 +34,7 @@
 					点击即同意<text>《委托扣款授权书》</text>
 				</view>
 			</view>
-			<image src="../../static/image/a5.png" mode="" class="pic"></image>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uQq0ENieLfArog8TQQVN" mode="" class="pic"></image>
 		</view>
 		<!-- 遮罩层 -->
 		<u-mask :show="show" @click="show = false"></u-mask>
--- a/page_user/yunying/gongdan/mingxi.vue
+++ b/page_user/yunying/gongdan/mingxi.vue
@ -17,7 +17,8 @@
 				<view class="bh">
 					<text style="margin-top: 8rpx;" class="bhtit">柜机编号:</text>
 					<view style="display: flex;justify-content: space-between;width: 480rpx;"><view>SDFGA5452168437113123 &nbsp;&nbsp; <u-icon name="file-text" size="38"></u-icon> </view> 
-					<view @click="btnnav"> <text class="yuan"></text><text class="yuan"></text><text class="yuan"></text> </view></view>
+					<!-- <view @click="btnnav"> <text class="yuan"></text><text class="yuan"></text><text class="yuan"></text> </view> -->
+					</view>
 				</view>
 				<view class="bh">
 					<text class="bhtit">店铺名称:</text> <text>嵛山阿财（海岛山羊肉）</text>
--- a/pages/abbr/index.vue
+++ b/pages/abbr/index.vue
@ -31,7 +31,7 @@
 				</view>
 			</view>
 			<view class="huan">
-				<image src="../../static/image/lx.png" mode=""></image> 换一换
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uH9hJJuhEDQw4JBGy9kS" mode=""></image> 换一换
 			</view>
 		</view>

--- a/pages/agentpages/devicemanagement/failure/index.vue
+++ b/pages/agentpages/devicemanagement/failure/index.vue
@ -12,6 +12,19 @@
 					<u-tabs :list="list" :is-scroll="false" active-color="#1DBE7B" :current="current" @change="change"></u-tabs>
 				</view>
 			</view>
+			
+			<view class="list">
+				<view class="list_val">
+					<view class="wz">设备编号</view> <view class="gl">1023</view>
+				</view>
+				<view class="list_val">
+					<view class="wz">故障原因</view> <view class="gl">弹出失败</view>
+				</view>
+				<view class="list_val">
+					<view class="wz">备注</view> <view class="gl">设备没有弹出 点击没有反应啊实打实大啊实打实大所阿达阿达是的阿达阿达是的啊实打实大师大师大阿达阿达是的</view>
+				</view>
+			</view>
+			
 		</view>
 	</view>
 </template>
@ -62,6 +75,32 @@
 			width: 750rpx;
 			height: 1624rpx;
 			background: #F4F5F7;
+			.list{
+				width: 680rpx;
+				padding: 20rpx 40rpx;
+				box-sizing: border-box;
+				background-color: #fff;
+				margin: auto;
+				margin-top: 30rpx;
+				border-radius: 24rpx;
+				padding-bottom: 40rpx !important;
+				.list_val{
+					display: flex;
+					margin-top: 20rpx;
+					.wz{
+						font-size: 28rpx;
+						color: #3D3D3D;
+						width: 120rpx;
+						margin-right: 30rpx;
+					}
+					.gl{
+						width: 500rpx;
+						font-size: 28rpx;
+						color: #808080;
+						flex-wrap: wrap;
+					}
+				}
+			}
 			.nav{
 				width: 750rpx;
 				height: 180rpx;
--- a/pages/agentpages/devicemanagement/failure/yichang/index.vue
+++ b/pages/agentpages/devicemanagement/failure/yichang/index.vue
@ -6,26 +6,26 @@
 			<view class="list">
 				<view class="sbbh">
 					<view class="onr">
-						<image src="../../../../../static/image/xing.png" mode=""></image> 设备编号：
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uTo0sMNT1u6dyEgpvraQ" mode=""></image> 设备编号：
 					</view>
 					<view class="inp">
-						<input type="text" />
+						<input type="text" placeholder="请输入编号" style="color: #C9CDD4;padding-left: 30rpx;"/>
 					</view>
 					<view class="sm">
-						<image src="../../../../../static/image/sm.png" mode=""></image>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uwtCTFeo0LULdRKL6wHG" mode=""></image>
 					</view>
 				</view>
 				<view class="gzyy">
 					<view class="">
 						故障原因：
 					</view>
-					<view class="tcsb" @click="btntc">
+					<view class="tcsb" @click="btntc" style="color: #999;padding-left: 30rpx;">
 						{{text}}
 					</view>
 				</view>
 				<view class="bz">
 					<view class="tit">
-						<image src="../../../../../static/image/xing.png" mode=""></image>备&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;注：
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uTo0sMNT1u6dyEgpvraQ" mode=""></image>备&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;注：
 					</view>
 					<view class="wb">
 						<textarea name="" placeholder="请输入备注" id="" cols="30" rows="10"></textarea>
@ -129,7 +129,7 @@
 						image{
 							width: 52rpx;
 							height: 52rpx;
-							background-color: #ccc;
+							// background-color: #ccc;
 						}
 					}
 				}
@ -141,7 +141,7 @@
 					color: #3D3D3D;
 					padding-left: 24rpx;
 					.tcsb{
-						width: 412rpx;
+						width: 430rpx;
 						height: 50rpx;
 						line-height: 50rpx;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
@ -166,7 +166,7 @@
 						}
 					}
 					.wb{
-						width: 412rpx;
+						width: 430rpx;
 						height: 150rpx;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
 						border: 2rpx solid #C9CDD4;
--- a/pages/agentpages/devicemanagement/index.vue
+++ b/pages/agentpages/devicemanagement/index.vue
@ -181,7 +181,22 @@
 					uni.navigateTo({
 						url:'/pages/agentpages/devicemanagement/xiajilist/index'
 					})
-				}else if(num == 4){
+				}else if(num == 3){
+					uni.scanCode({
+						onlyFromCamera: true,
+						scanType: ['qrCode'],
+						success: res => {
+							console.log('扫描结果：', res);
+						},
+						fail: err => {
+							console.error('扫描失败：', err);
+							uni.showToast({
+								title: '扫描失败',
+								icon: 'none'
+							});
+						}
+					});
+				} else if(num == 4){
 					uni.navigateTo({
 						url:'/pages/agentpages/devicemanagement/failure/index'
 					})
@ -189,7 +204,22 @@
 					uni.navigateTo({
 						url:'/pages/agentpages/devicemanagement/repairapplication/index'
 					})
-				}else if(num == 7){
+				}else if(num == 6){
+					uni.scanCode({
+						onlyFromCamera: true,
+						scanType: ['qrCode'],
+						success: res => {
+							console.log('扫描结果：', res);
+						},
+						fail: err => {
+							console.error('扫描失败：', err);
+							uni.showToast({
+								title: '扫描失败',
+								icon: 'none'
+							});
+						}
+					});
+				} else if(num == 7){
 					uni.navigateTo({
 						url:'/pages/agentpages/devicemanagement/lnstallation/index'
 					})
--- a/pages/agentpages/devicemanagement/repairapplication/index.vue
+++ b/pages/agentpages/devicemanagement/repairapplication/index.vue
@ -7,9 +7,24 @@
 				<view class="top">
 					<u-search placeholder="搜索" input-align="center" v-model="keyword"></u-search>
 					<view class="yc" @click="btnyc">维修申报</view>
-				</view>
-				
+				</view>	
 			</view>
+			
+			<view class="list">
+				<view class="list_val">
+					<view class="wz">寄件地址</view> <view class="gl">太姥山周驰店183号</view>
+				</view>
+				<view class="list_val">
+					<view class="wz">姓名</view> <view class="gl">王先生</view>
+				</view>
+				<view class="list_val">
+					<view class="wz">电话</view> <view class="gl">15566562256</view>
+				</view>
+				<view class="list_val">
+					<view class="wz">维修原因</view> <view class="gl">设备没有弹出 点击没有反应啊实打实大啊实打实大所阿达阿达是的阿达阿达是的啊实打实大师大师大阿达阿达是的</view>
+				</view>
+			</view>
+			
 		</view>
 	</view>
 </template>
@ -45,6 +60,32 @@
 			width: 750rpx;
 			height: 1624rpx;
 			background: #F4F5F7;
+			.list{
+				width: 680rpx;
+				padding: 20rpx 40rpx;
+				box-sizing: border-box;
+				background-color: #fff;
+				margin: auto;
+				margin-top: 30rpx;
+				border-radius: 24rpx;
+				padding-bottom: 40rpx !important;
+				.list_val{
+					display: flex;
+					margin-top: 20rpx;
+					.wz{
+						font-size: 28rpx;
+						color: #3D3D3D;
+						width: 120rpx;
+						margin-right: 30rpx;
+					}
+					.gl{
+						width: 500rpx;
+						font-size: 28rpx;
+						color: #808080;
+						flex-wrap: wrap;
+					}
+				}
+			}
 			.nav{
 				width: 750rpx;
 				height: 130rpx;
--- a/pages/agentpages/index/index.vue
+++ b/pages/agentpages/index/index.vue
@ -77,28 +77,28 @@
 			</view>
 			<view class="gongneng">
 				<view class="icons" @click="btnnav(1)">
-					<image src="../../../static/image/sbgl.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uzF1ga4MCbbHR31bxirs" mode=""></image>
 				</view>
 				<view class="icons" @click="btnnav(2)">
-					<image src="../../../static/image/dpgl.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ukmYnCKd7yhDcJ2AuIFk" mode=""></image>
 				</view>
 				<view class="icons" @click="btnnav(3)">
-					<image src="../../../static/image/yygl.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uD92bC1MehbLW7zJEfQv" mode=""></image>
 				</view>
 				<view class="icons" @click="btnnav(4)">
-					<image src="../../../static/image/dlgl.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uJbzJa6eZQJXB5duNMCS" mode=""></image>
 				</view>
 				<view class="icons" @click="btnnav(5)">
-					<image src="../../../static/image/ddgl.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uncmyIJG3jBulHFD5yFx" mode=""></image>
 				</view>
 				<!-- <view class="icons" @click="btnnav(6)">
-					<image src="../../../static/image/hydp.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uJBvN2bcWx0x9eMGlFJ7" mode=""></image>
 				</view> -->
 				<view class="icons" @click="btnnav(7)">
-					<image src="../../../static/image/sjfx.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uWTuwYZaqodiuO5wmcKW" mode=""></image>
 				</view>
 				<view class="icons" @click="btnnav(8)">
-					<image src="../../../static/image/a1.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/u9QWVWIpUsXIK1Avpt3k" mode=""></image>
 				</view>
 			</view>

--- a/pages/agentpages/shopguanli/discipleshop/index.vue
+++ b/pages/agentpages/shopguanli/discipleshop/index.vue
@ -10,17 +10,17 @@
 			<view class="list">
 				<view class="listitem" v-for="(item,index) in 10" :key="index">
 					<view class="toptit">
-						<u-icon name="calendar-fill"></u-icon>
+						<u-icon name="calendar-fill" size="36"></u-icon>
 						 <view class="tit">
 							星途自助台球棋 牌室
 						</view>
-						<view class="bd">
+						<!-- <view class="bd">
 							绑定设备
-						</view>
-						<view class="bd">
+						</view> -->
+						<view class="bd" @click="btnjif">
 							计费规则
 						</view>
-						<view class="yuan">
+						<view class="yuan" @click="btnxq">
 							<text style="width: 9rpx;height: 9rpx;border-radius: 50%;margin-right: 5rpx;background-color: #000;display: inline-block;"></text>
 							<text style="width: 9rpx;height: 9rpx;border-radius: 50%;margin-right: 5rpx;background-color: #000;display: inline-block;"></text>
 							<text style="width: 9rpx;height: 9rpx;border-radius: 50%;margin-right: 5rpx;background-color: #000;display: inline-block;"></text>
@ -64,7 +64,16 @@
 			}
 		},
 		methods: {
-
+            btnjif(){
+				uni.navigateTo({
+					url:'/page_user/jifei'
+				})
+			},
+			btnxq(){
+				uni.navigateTo({
+					url:'/page_user/shopdetail'
+				})
+			}
 		}
 	}
 </script>
@ -164,7 +173,7 @@
 						padding-bottom: 12rpx;
 						box-sizing: border-box;
 						.tit{
-							width: 236rpx;
+							width: 350rpx;
 							background: #DBFAED;
 							border-radius: 16rpx 16rpx 16rpx 16rpx;
 							font-weight: 600;
@ -174,7 +183,7 @@
 							box-sizing: border-box;
 						}
 						.bd{
-							margin-top: 28rpx;
+							margin-top: 18rpx;
 							height:100%;
 							font-size: 20rpx;
 							color: #FFFFFF;
@ -184,7 +193,7 @@
 							border-radius: 6rpx 6rpx 6rpx 6rpx;
 						}
 						.yuan{
-							margin-top: 20rpx;
+							margin-top: 10rpx;
 						}
 					}
 				}
--- a/pages/agentpages/shopguanli/index.vue
+++ b/pages/agentpages/shopguanli/index.vue
@ -33,12 +33,12 @@
        	</view>
 			
 			<view class="tulist">
-				<image src="../../../static/image/dp1.png" mode="" @click="btnshop(1)"></image>
-				<image src="../../../static/image/ap2.png" mode="" @click="btnshop(2)"></image>
-				<!-- <image src="../../../static/image/ap3.png" mode="" @click="btnshop(3)"></image> -->
-				<image src="../../../static/image/ap4.png" mode="" @click="btnshop(4)"></image>
-				<image src="../../../static/image/ap5.png" mode="" style="margin-right: 0rpx;" @click="btnshop(5)"></image>
-				<!-- <image src="../../../static/image/ap6.png" mode="" style="margin-top: 48rpx;" @click="btnshop(6)"></image> -->
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uEe8bioY36T7Lj1W7Kmo" mode="" @click="btnshop(1)"></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/u8zYZnkgVcRu8YBO2Inj" mode="" @click="btnshop(2)"></image>
+				<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/u41CSZ4ADL7JvGJgsjdg" mode="" @click="btnshop(3)"></image> -->
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uWMlWM7Dw5CeiuCLBPvr" mode="" @click="btnshop(4)"></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uaJ2Gl13fH3XJOUcaDsA" mode="" style="margin-right: 0rpx;" @click="btnshop(5)"></image>
+				<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/ugUDKiQ4dZUIjKv2xneY" mode="" style="margin-top: 48rpx;" @click="btnshop(6)"></image> -->
 			</view>
        </view>
 	</view>
--- a/pages/agentpages/shopguanli/setupshop/index.vue
+++ b/pages/agentpages/shopguanli/setupshop/index.vue
@ -2,43 +2,86 @@
 	<view class="page">
 		<u-navbar title="创建店铺" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
 			height='38'></u-navbar>
-        <view class="box">
-        	<view class="list">
-        		<view class="listval">
-        			<view class="tit"> 店铺名称</view> <view class="but"> <input type="text" placeholder="请输入店铺名称" /> </view>
-        		</view>
-				<view class="listvals">
-					<view class="tit"> 店铺类型</view> <view class="but"> <input disabled="false" type="text" placeholder="请选择店铺类型" /> <u-icon name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
+		<view class="box">
+			<view class="list">
+				<view class="listval">
+					<view class="tit"> 店铺名称</view>
+					<view class="but"> <input type="text" placeholder="请输入店铺名称" v-model="shopname" /> </view>
+				</view>
+				<view class="listvals" @click="btnlx">
+					<view class="tit"> 店铺类型</view>
+					<view class="but"> <input disabled="false" type="text" :placeholder="selectortext" /> <u-icon
+							name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
 				</view>
 				<view class="listval">
-					<view class="tit"> 营业时间</view> <view class="but"> <input type="text" placeholder="请输入营业时间" /> </view>
+					<view class="tit"> 营业时间</view>
+					<view class="but"
+						style="display: flex;justify-content: space-between;padding: 15rpx 10rpx;box-sizing: border-box;">
+						<!-- <input type="text" placeholder="请输入营业时间" v-model="yetime" /> -->
+						<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(1)">{{ksyy}}</view>
+						--
+						<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(2)">{{jsyy}}</view>
+					</view>
 				</view>
-				<view class="listvals">
-					<view class="tit"> 省市区</view> <view class="but"> <input disabled="false" type="text" placeholder="请选择省市区" /> <u-icon name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
+				<view class="listvals" @click="btnregion">
+					<view class="tit"> 省市区</view>
+					<view class="but"> <input disabled="false" type="text" :placeholder="regiontext" /> <u-icon
+							name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon> </view>
+				</view>
+				<view class="listval">
+					<view class="tit"> 联系人</view>
+					<view class="but"> <input type="text" placeholder="请输入联系人" v-model="lxname" /> </view>
+				</view>
+				<view class="listval">
+					<view class="tit"> 联系电话</view>
+					<view class="but"> <input type="text" placeholder="请输入联系电话" v-model="lxphone" /> </view>
 				</view>
-				
 				<view class="jinwei">
-					<view class="tit"> 经纬度</view> 
-					<view class="but" style="position:relative;">
-						<input type="text" placeholder="请选择经度" />
-						<input type="text" placeholder="请选择纬度" />
-						<u-icon name="map-fill" size="32" style="position: absolute;top: 44rpx;right: 22rpx;z-index: 99;"></u-icon>
+					<view class="tit"> 经纬度</view>
+					<view class="but">
+						<input type="text" v-model="latitude" disabled="true" style="color: #666;" />
+						<input type="text" v-model="longitude" disabled="true" style="color: #666;" />
+						<u-icon name="map-fill" style="position: absolute;top: 44rpx;right: 22rpx;z-index: 99;"
+							size="32" @click="btnjwd"></u-icon>
 					</view>
 				</view>
 				<view class="listval">
-					<view class="tit"> 详细地址</view> <view class="but"> <input type="text" placeholder="请输入详细地址" /> </view>
+					<view class="tit"> 详细地址</view>
+					<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
 				</view>
-				<view class="listval">
-					<view class="tit"> 联系人</view> <view class="but"> <input type="text" placeholder="请输入联系人" /> </view>
+				<view class="icon">
+					<view class="list_box">
+						<view class="lt">
+							<view class="tit">
+								上传门头照
+							</view>
+							<view class="wz">
+								门头照片必须清晰、方正、易于辨识
+							</view>
+						</view>
+						<view class="imgbox" @click="btn">
+							<image v-if="imgflag"
+								src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="">
+							</image>
+							<image v-else :src="imglist" mode=""
+								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
+
+						</view>
+					</view>
 				</view>
-				<view class="listval">
-					<view class="tit"> 联系电话</view> <view class="but"> <input type="text" placeholder="请输入联系电话" /> </view>
+				<view class="baocun" @click="btncreat">
+					创建
 				</view>
-				<view class="baocun">
-					保存
-				</view>
-        	</view>
-        </view>
+			</view>
+
+			<!-- 店铺类型 -->
+			<u-select v-model="selectorshow" :list="selector" @confirm="btnselector"></u-select>
+			<!-- 选择省市区 -->
+			<u-picker v-model="regionshow" mode="region" @confirm="btnregions"></u-picker>
+			<!-- 营业时间 -->
+			<u-picker mode="time" v-model="show" :params="params" @confirm="btnyy"></u-picker>
+
+		</view>
 	</view>
 </template>

@ -46,18 +89,253 @@
 	export default {
 		data() {
 			return {
+				params: {
+					hour: true,
+					minute: true,
+				},
+				show: false,
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				selectorshow: false,
+				selectortext: '请选择商铺类型',
+				selectorvalue: '',
+				regionshow: false,
+				regiontext: '请选择省市区',
+				regionvalue: '',
+				selector: [{
+						value: 1,
+						label: '商场'
+					},
+					{
+						value: 2,
+						label: '学校'
+					},
+					{
+						value: 3,
+						label: '娱乐场所'
+					},
+					{
+						value: 4,
+						label: '出租房'
+					},
+					{
+						value: 5,
+						label: '其他'
+					},
+				],
+				latitude: '请输入纬度',
+				longitude: '请输入经度',
+				shopname: '',
+				yetime: '',
+				lxname: '',
+				lxphone: '',
+				xqdz: '',
+				ksyy: '开始营业时间',
+				jsyy: '结束营业时间',
+				yynum: 0,
+				province: '',
+				city: '',
+				area: ''

 			}
 		},
+		onLoad() {
+			this.getQiniuToken()
+		},
 		methods: {
+			btnyinye(num) {
+				this.show = true
+				this.yynum = num
+			},
+			btnyy(e) {
+				if (this.yynum == 1) {
+					this.ksyy = e.hour + ':' + e.minute
+				} else {
+					this.jsyy = e.hour + ':' + e.minute
+				}
+			},
+			btncreat() {
+				let phoneRegex = /^1[3-9]\d{9}$/ //判断手机号码格式
+				if (this.shopname == '') {
+					uni.showToast({
+						title: '请输入店铺名称',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.selectortext == '请选择商铺类型') {
+					uni.showToast({
+						title: '请选择商铺类型',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.ksyy == '开始营业时间') {
+					uni.showToast({
+						title: '请选择开始营业时间',
+						icon: 'none',
+						duration: 2000
+					});
+				} else if (this.jsyy == '结束营业时间') {
+					uni.showToast({
+						title: '请选择结束营业时间',
+						icon: 'none',
+						duration: 2000
+					});
+				} else if (this.regiontext == '请选择省市区') {
+					uni.showToast({
+						title: '请选择省市区',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.lxname == '') {
+					uni.showToast({
+						title: '请输入联系人',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.lxphone == '') {
+					uni.showToast({
+						title: '请输入联系电话',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.latitude == '请输入纬度') {
+					uni.showToast({
+						title: '请输入纬度',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.longitude == '请输入经度') {
+					uni.showToast({
+						title: '请输入经度',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.xqdz == '') {
+					uni.showToast({
+						title: '请输入详细地址',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if (this.imglist == '') {
+					uni.showToast({
+						title: '请上传一张商铺门面照',
+						icon: 'none',
+						duration: 1000
+					});
+				} else {
+					let data = {
+						name: this.shopname,
+						picture: this.imglist,
+						address: this.xqdz,
+						lng: this.longitude,
+						lat: this.latitude,
+						businessTimeStart: this.ksyy,
+						businessTimeEnd: this.jsyy,
+						province: this.province,
+						city: this.city,
+						county: this.area,
+						specificAddress: this.xqdz,
+						contactName: this.shopname,
+						contactMobile: this.lxphone,
+						type: this.selectorvalue
+					}
+					this.$u.post("/app/store", data).then(res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '创建成功',
+								icon: 'success',
+								duration: 1000
+							})
+							setTimeout(() => {
+								uni.navigateBack()
+							}, 1000)
+						}
+					})
+				}
+			},

+			btnlx() {
+				this.selectorshow = true
+			},
+			btnselector(e) {
+				this.selectorvalue = e[0].value
+				this.selectortext = e[0].label
+			},
+			btnregion() {
+				this.regionshow = true
+			},
+			btnregions(e) {
+				this.regiontext = e.province.label + e.city.label + e.area.label
+				this.province = e.province.label
+				this.city = e.city.label
+				this.area = e.area.label
+			},
+			btnjwd() {
+				uni.chooseLocation({  
+					success: (res) => {  
+						this.latitude = res.latitude;  
+						this.longitude = res.longitude;  
+						console.log(this.latitude, this.longitude);  
+					},  
+					fail: function(err) {  
+						// 检查错误消息，看是否是用户取消了位置选择  
+						if (err.errMsg && err.errMsg.indexOf('chooseLocation:cancel') === 0) {  
+							uni.showToast({  
+								title: '您取消了位置选择',  
+								icon: 'none'  
+							});  
+						} else {  
+							console.log('选择位置失败', err);  
+							// 处理其他失败情况  
+						}  
+					},  
+				});
+			},
+
+
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				});
+			},
+			btn() {
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				uni.chooseImage({
+					count: 1,
+					type: 'all',
+					success(res) {
+						const tempFilePaths = res.tempFiles
+						wx.uploadFile({
+							url: 'https://up-z2.qiniup.com',
+							name: 'file',
+							filePath: tempFilePaths[0].path,
+							formData: {
+								token: _this.token, //后端返回的token
+								key: 'smartmeter/img/' + math
+							},
+							success: function(res) {
+								let str = JSON.parse(res.data)
+								console.log(str.key)
+								_this.userImgs = 'https://api.ccttiot.com/' + str.key
+								_this.imglist = _this.userImgs
+								_this.imgflag = false
+							}
+						});
+					}
+				})
+			},
 		}
 	}
 </script>

 <style lang="scss">
 	page {
-		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+		background: linear-gradient(180deg, #19CD82 0%, rgba(255, 255, 255, 0) 100%);
 	}

 	.page {
@ -65,15 +343,17 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		.box{
+
+		.box {
 			width: 750rpx;
 			height: 1440rpx;
 			background: #F4F5F7;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			padding-top: 40rpx;
-			.list{
+
+			.list {
 				width: 680rpx;
-				height: 1154rpx;
+				height: 1254rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
@ -81,77 +361,132 @@
 				padding-left: 38rpx;
 				padding-right: 38rpx;
 				box-sizing: border-box;
-				.baocun{
+
+				.baocun {
 					width: 584rpx;
 					height: 90rpx;
-					background: linear-gradient( 270deg, #54DAA1 0%, #19CD82 100%);
+					background: linear-gradient(90deg, #19CD82 0%, #19CD82 100%);
 					border-radius: 54rpx 54rpx 54rpx 54rpx;
+					margin: auto;
 					text-align: center;
 					line-height: 90rpx;
-					margin-top: 82rpx;
+					position: fixed;
+					left: 50%;
+					transform: translateX(-50%);
+					bottom: 60rpx;
 					font-weight: 500;
 					font-size: 40rpx;
 					color: #FFFFFF;
 				}
-				.jinwei{
+
+				.icon {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: center;
+					margin-top: 40rpx;
+					width: 680rpx;
+
+					.list_box {
+						width: 100%;
+						display: flex;
+						justify-content: space-between;
+
+						.lt {
+							padding-top: 40rpx;
+
+							.tit {
+								font-size: 32rpx;
+								color: #3D3D3D;
+							}
+
+							.wz {
+								font-size: 24rpx;
+								color: #3D3D3D;
+								margin-top: 20rpx;
+							}
+						}
+
+						.imgbox {
+							width: 33%;
+
+							image {
+								width: 142rpx;
+								height: 142rpx;
+							}
+						}
+					}
+				}
+
+				.jinwei {
 					display: flex;
 					justify-content: space-between;
 					margin-top: 34rpx;
-					.tit{
+
+					.tit {
 						margin-top: 40rpx;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.but{
+
+					.but {
 						width: 462rpx;
 						height: 140rpx;
 						background: #F0F0F0;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
-						input{
+						position: relative;
+
+						input {
 							height: 70rpx;
 							line-height: 70rpx;
 							padding-left: 22rpx;
 						}
 					}
 				}
-				.listvals{
+
+				.listvals {
 					display: flex;
 					justify-content: space-between;
 					margin-top: 34rpx;
-					
-					.tit{
+
+					.tit {
 						margin-top: 12rpx;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.but{
+
+					.but {
 						width: 462rpx;
 						height: 70rpx;
 						background: #F0F0F0;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
 						position: relative;
-						input{
+
+						input {
 							height: 70rpx;
 							line-height: 70rpx;
 							padding-left: 22rpx;
 						}
 					}
 				}
-				.listval{
+
+				.listval {
 					display: flex;
 					justify-content: space-between;
 					margin-top: 34rpx;
-					.tit{
+
+					.tit {
 						margin-top: 12rpx;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.but{
+
+					.but {
 						width: 462rpx;
 						height: 70rpx;
 						background: #F0F0F0;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
-						input{
+
+						input {
 							height: 70rpx;
 							line-height: 70rpx;
 							padding-left: 22rpx;
--- a/pages/agentpages/user/index.vue
+++ b/pages/agentpages/user/index.vue
@ -36,7 +36,7 @@
 			<view class="daili">
 				<view class="grlist" @click="btnpage(1)" >
 					<view class="">
-						<image src="../../../static/image/dlkf.png" mode=""></image> <text class="wz">联系客服</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uNyjr8WYfr5ZsIGgCE5Y" mode=""></image> <text class="wz">联系客服</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -44,7 +44,7 @@
 				</view>
 				<view class="grlist" @click="btnpage(2)">
 					<view class="">
-						<image src="../../../static/image/dldp.png" mode=""></image> <text class="wz">我的店铺</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u3paGSrAWzshFb0mTiUB" mode=""></image> <text class="wz">我的店铺</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -52,7 +52,7 @@
 				</view>
 				<!-- <view class="grlist" @click="btnpage(3)" style="border: 0;">
 					<view class="">
-						<image src="../../../static/image/dlwx.png" mode=""></image> <text class="wz">绑定微信</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/upI4Pg1UeT6Zlqj1e3yl" mode=""></image> <text class="wz">绑定微信</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
--- a/pages/detail/detailed/index.vue
+++ b/pages/detail/detailed/index.vue
@ -100,7 +100,7 @@
 				<view class="">
 					图片:
 				</view>
-				<image src="../../../static/image/lx.png" mode=""></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uH9hJJuhEDQw4JBGy9kS" mode=""></image>
 			</view>
 		</view>
 		
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -14,28 +14,28 @@
 				</view>
 				<view class="tubiao">
 					<view class="gr" @click="btnindex(1)">
-						<image src="../../static/image/a1.png" mode="" style="width: 96rpx;height:98rpx;"></image>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u9QWVWIpUsXIK1Avpt3k" mode="" style="width: 96rpx;height:98rpx;"></image>
 						<!-- 个人中心 -->
 					</view>
 					<view class="gr" @click="btnindex(2)">
-						<image src="../../static/image/a2.png" mode="" style="width: 96rpx;height:102rpx;"></image>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uTiL5UkPc0jHlCrEg43v" mode="" style="width: 96rpx;height:102rpx;"></image>
 						<!-- 我的订单 -->
 					</view>
 					<view class="gr" @click="btnindex(3)">
-						<image src="../../static/image/a3.png" mode="" style="width: 96rpx;height:98rpx;"></image>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uxi72kKTEFRd5aX3r4Lk" mode="" style="width: 96rpx;height:98rpx;"></image>
 						<!-- 附近门店 -->
 					</view>
 					<view class="gr" @click="btnindex(4)">
-						<image src="../../static/image/a4.png" mode="" style="width: 96rpx;height:94rpx;"></image>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uWT7I8JchvWR0adEuDE5" mode="" style="width: 96rpx;height:94rpx;"></image>
 						<!-- 联系客服 -->
 					</view>
 				</view>
 				<view class="guangg">
-					<image src="../../static/image/a5.png" mode=""></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uQq0ENieLfArog8TQQVN" mode=""></image>
 				</view>
 				<view class="saoma" @click="scanQRCode">
 					<view>
-						<image src="../../static/image/sm.png" mode=""></image>扫码充电
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uPapXlAygHNzrml29Bhv" mode=""></image>扫码充电
 					</view>
 				</view>
 			</view>
@ -63,6 +63,9 @@
 				jinweidu: ''
 			};
 		},
+		onShow() {
+			this.jmlogin()
+		},
 		methods: {
 			scanQRCode() {
 				uni.navigateTo({
--- a/pages/personal/index.vue
+++ b/pages/personal/index.vue
@ -27,7 +27,7 @@
 			<view class="bdlist">
 				<view class="grlist" @click="btnpage(1)" style="margin-top: 0;">
 					<view class="">
-						<image src="../../static/image/icon5.png" mode=""></image> <text class="wz">押金</text> <text
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u4ShKzt0cAXXEJScC9tJ" mode=""></image> <text class="wz">押金</text> <text
 							class="cz">未充值</text>
 					</view>
 					<view class="">
@ -36,7 +36,7 @@
 				</view>
 				<view class="grlist" @click="btnpage(2)">
 					<view class="">
-						<image src="../../static/image/icon6.png" mode=""></image> <text class="wz">我的订单</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u3cvPoqBH0tT6AuOpZRh" mode=""></image> <text class="wz">我的订单</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -44,7 +44,7 @@
 				</view>
 				<view class="grlist" @click="btnpage(3)">
 					<view class="">
-						<image src="../../static/image/icon3.png" mode=""></image> <text class="wz">用户协议</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uhvHT4OPl2R3VJF9V9tS" mode=""></image> <text class="wz">用户协议</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -52,7 +52,7 @@
 				</view>
 				<view class="grlist" @click="btnpage(4)">
 					<view class="">
-						<image src="../../static/image/icon4.png" mode=""></image> <text class="wz">隐私政策</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uMRvWCHDoBFzMHy9jhIt" mode=""></image> <text class="wz">隐私政策</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -60,7 +60,7 @@
 				</view>
 				<view class="grlist" @click="btnpage(5)">
 					<view class="">
-						<image src="../../static/image/icon2.png" mode=""></image> <text class="wz">关于我们</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uR2bLipB4EN2ymkWxldI" mode=""></image> <text class="wz">关于我们</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -68,7 +68,7 @@
 				</view>
 				<view class="grlist" @click="btnpage(6)" style="border: 0;">
 					<view class="">
-						<image src="../../static/image/icon4.png" mode=""></image> <text class="wz">合作加盟</text>
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uAd7FaUVsKB4bvmvQNKK" mode=""></image> <text class="wz">合作加盟</text>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right"></u-icon>
@ -77,7 +77,7 @@
 			</view>

 			<view class="bdpic">
-				<image src="../../static/image/a5.png" mode=""></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uQq0ENieLfArog8TQQVN" mode=""></image>
 			</view>

 			<view class="anniu">
--- a/static/image/a1.png
+++ b/static/image/a1.png
--- a/static/image/a2.png
+++ b/static/image/a2.png
--- a/static/image/a3.png
+++ b/static/image/a3.png
--- a/static/image/a4.png
+++ b/static/image/a4.png
--- a/static/image/a5.png
+++ b/static/image/a5.png
--- a/static/image/ap2.png
+++ b/static/image/ap2.png
--- a/static/image/ap3.png
+++ b/static/image/ap3.png
--- a/static/image/ap4.png
+++ b/static/image/ap4.png
--- a/static/image/ap5.png
+++ b/static/image/ap5.png
--- a/static/image/ap6.png
+++ b/static/image/ap6.png
--- a/static/image/ddgl.png
+++ b/static/image/ddgl.png
--- a/static/image/dldp.png
+++ b/static/image/dldp.png
--- a/static/image/dlgl.png
+++ b/static/image/dlgl.png
--- a/static/image/dlkf.png
+++ b/static/image/dlkf.png
--- a/static/image/dlwx.png
+++ b/static/image/dlwx.png
--- a/static/image/dp1.png
+++ b/static/image/dp1.png
--- a/static/image/dpgl.png
+++ b/static/image/dpgl.png
--- a/static/image/hydp.png
+++ b/static/image/hydp.png
--- a/static/image/icon1.png
+++ b/static/image/icon1.png
--- a/static/image/icon2.png
+++ b/static/image/icon2.png
--- a/static/image/icon3.png
+++ b/static/image/icon3.png
--- a/static/image/icon4.png
+++ b/static/image/icon4.png
--- a/static/image/icon5.png
+++ b/static/image/icon5.png
--- a/static/image/icon6.png
+++ b/static/image/icon6.png
--- a/static/image/icon7.png
+++ b/static/image/icon7.png
--- a/static/image/lx.png
+++ b/static/image/lx.png
--- a/static/image/nt20.jfif
+++ b/static/image/nt20.jfif
--- a/static/image/sbgl.png
+++ b/static/image/sbgl.png
--- a/static/image/sjfx.png
+++ b/static/image/sjfx.png
--- a/static/image/sm.png
+++ b/static/image/sm.png
--- a/static/image/tb.png
+++ b/static/image/tb.png
--- a/static/image/xing.png
+++ b/static/image/xing.png
--- a/static/image/yygl.png
+++ b/static/image/yygl.png