From 2995302cfcf95d4ec62a7bb495548cbf3407a300 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 9 Oct 2024 10:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=97=E9=93=BA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=20=20=E4=BF=AE=E6=94=B9=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_components/peizhi.vue                    | 650 ++++++++++++++++++
 page_fenbao/editshenhe.vue                    |  11 +-
 .../statulist/myshop/editshop/index.vue       |  11 +-
 .../statulist/myshop/shopdetail/index.vue     |  16 +-
 pages.json                                    |   9 +
 5 files changed, 681 insertions(+), 16 deletions(-)
 create mode 100644 page_components/peizhi.vue

diff --git a/page_components/peizhi.vue b/page_components/peizhi.vue
new file mode 100644
index 0000000..9df6367
--- /dev/null
+++ b/page_components/peizhi.vue
@@ -0,0 +1,650 @@
+<template>
+	<view class="page">
+		<u-navbar title="店铺配置" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
+			title-size='36' height='50'></u-navbar>
+		<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"
+						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" @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"> -->
+						<!-- <input type="text" v-model="latitude" disabled="true" style="color: #666;" />
+						<input type="text" v-model="longitude" disabled="true" style="color: #666;" /> -->
+						<!-- <input type="text" placeholder="请输入详细地址" v-model="xqdz" />
+						<u-icon name="map-fill" style="position: absolute;top: 20rpx;right: 22rpx;z-index: 99;"
+							size="32" @click="btnjwd"></u-icon>
+					</view>
+				</view> -->
+				<view class="listval">
+					<view class="tit"> 是否展示店铺</view>
+					 <u-switch v-model="checked" active-color="#8883F0"></u-switch> 
+				</view>
+				<view class="listval">
+					<view class="tit"> 是否允许在非营业时间使用</view>
+					 <u-switch v-model="checkeds" active-color="#8883F0"></u-switch> 
+				</view>
+				<!-- <view class="listval">
+					<view class="tit"> 详细地址</view>
+					<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
+				</view> -->
+				<!-- <view class="icon">
+					<view class="list_box">
+						<view class="lt">
+							<view class="tit">
+								上传门头照
+							</view>
+							<view class="wz">
+								门头照片必须清晰、方正、易于辨识
+							</view>
+						</view>
+						<view class="imgbox">
+					
+								style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"
+								 @click="getImage">
+								<image :src="imglist" mode=""></image>
+							</button>
+                            <ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024" :url="url"
+                            	@cancel="oncancel" @ok="onok"></ksp-cropper>
+						</view>
+					</view>
+				</view> -->
+				<view class="baocun" @click="btncreat">
+					配置
+				</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" default-time="00:00" :params="params" @confirm="btnyy"></u-picker>
+             
+			 <view v-if="btnmsk" style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #000;opacity: .1;z-index: 999;"></view>
+			 
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				btnmsk:false,
+				checked:false,
+				params: {
+					hour: true,
+					minute: true,
+				},
+				show: false,
+				checkeds: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: '',
+				url:'',
+				jtdz:''
+			}
+		},
+		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
+			this.checked = this.listobj.show
+			this.checkeds = this.listobj.useOutTime
+			if (this.selectorvalue == 1) {
+				this.selectortext = '商场'
+				this.updateTime = this.listobj.updateTime
+			} 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()
+		},
+		// 分享到好友（会话）
+		  onShareAppMessage: function () {  
+		    return {  
+		      title: '创想物联',  
+		      path: '/pages/shouye/index'  
+		    }  
+		  },  
+		  
+		  // 分享到朋友圈  
+		  onShareTimeline: function () {  
+		    return {  
+		      title: '创想物联',  
+		      query: '',  
+		      path: '/pages/shouye/index'  
+		    }  
+		  },
+		methods: {
+			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
+						_this.imglist = _this.userImgs
+						_this.imgflag = false
+					}
+				})
+			},
+			oncancel() {
+				// url设置为空，隐藏控件
+				this.url = ""
+			},
+			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 data = {
+					storeId:this.storeId,
+					businessTimeStart: this.ksyy,
+					businessTimeEnd: this.jsyy,
+					show:this.checked,
+					useOutTime:this.checkeds
+				}
+				this.$u.put("/app/store/config", data).then(res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '配置成功',
+							icon: 'success',
+							duration: 1000
+						})
+						setTimeout(() => {
+							this.btnmsk = false
+							uni.navigateBack({
+								delta: 2
+							})
+						}, 1000)
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 1000
+						})
+					}
+				})
+			},
+			// 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.lxname == '') {
+			// 		uni.showToast({
+			// 			title: '请输入联系人',
+			// 			icon: 'none',
+			// 			duration: 1000
+			// 		})
+			// 	} else if (this.lxphone == '') {
+			// 		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 {
+			// 		this.btnmsk = true
+			// 		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.jtdz,
+			// 			contactName: this.lxname,
+			// 			contactMobile: this.lxphone,
+			// 			type: this.selectorvalue,
+			// 			storeId: this.storeId,
+			// 			show:this.checked,
+			// 			useOutTime:this.checkeds
+			// 		}
+			// 		this.$u.put("/app/store", data).then(res => {
+			// 			if (res.code == 500) {
+			// 				uni.showToast({
+			// 					title: res.msg,
+			// 					icon: 'success',
+			// 					duration: 1000
+			// 				})
+			// 				this.btnmsk = false
+			// 			} else {
+			// 				uni.showToast({
+			// 					title: '提交修改成功',
+			// 					icon: 'success',
+			// 					duration: 1000
+			// 				})
+			// 				setTimeout(() => {
+			// 					this.btnmsk = false
+			// 					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;
+						this.xqdz = res.name
+						this.jtdz = res.address
+					},
+					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">
+	/deep/ .panel{
+		position: fixed;
+		    width: 100%;
+		    height: 100%;
+		    top: 0;
+		    bottom: 0;
+		    left: 0;
+		    z-index: 99 !important;
+		    overflow: hidden;
+	}
+	/deep/ .u-title {
+		padding-bottom: 22rpx;
+	}
+
+	/deep/ .u-icon__icon {
+		padding-bottom: 22rpx;
+	}
+
+	page {
+		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
+	}
+
+	.page {
+		width: 750rpx;
+		position: fixed;
+		top: 0;
+		left: 0;
+		color: #666;
+
+		.box {
+			width: 750rpx;
+			height: 1440rpx;
+			background: #F4F5F7;
+			border-radius: 0rpx 0rpx 0rpx 0rpx;
+			padding-top: 40rpx;
+
+			.list {
+				width: 680rpx;
+				height: 400rpx;
+				background: #FFFFFF;
+				border-radius: 24rpx 24rpx 24rpx 24rpx;
+				margin: auto;
+				padding-top: 44rpx;
+				padding-left: 38rpx;
+				padding-right: 38rpx;
+				box-sizing: border-box;
+
+				.baocun {
+					width: 584rpx;
+					height: 90rpx;
+					background: linear-gradient(90deg, #8883F0 0%, #A29EFF 100%);
+					border-radius: 54rpx 54rpx 54rpx 54rpx;
+					margin: auto;
+					text-align: center;
+					line-height: 90rpx;
+					position: fixed;
+					left: 50%;
+					transform: translateX(-50%);
+					bottom: 60rpx;
+					font-weight: 500;
+					font-size: 40rpx;
+					color: #FFFFFF;
+				}
+
+				.icon {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: center;
+					margin-top: 40rpx;
+					width: 680rpx;
+
+					.list_box {
+						width: 100%;
+						display: flex;
+						justify-content: space-between;
+                        padding-right: 45rpx;
+						.lt {
+							padding-top: 40rpx;
+
+							.tit {
+								font-size: 32rpx;
+								color: #3D3D3D;
+							}
+
+							.wz {
+								font-size: 26rpx;
+								color: #3D3D3D;
+								margin-top: 20rpx;
+							}
+						}
+
+						.imgbox {
+							width: 33%;
+                         
+							image {
+								width: 142rpx;
+								height: 142rpx;
+							}
+						}
+					}
+				}
+
+				.jinwei {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 34rpx;
+				
+					.tit {
+						margin-top: 10rpx;
+						font-size: 32rpx;
+						color: #3D3D3D;
+					}
+				
+					.but {
+						width: 462rpx;
+						height: 70rpx;
+						background: #F0F0F0;
+						border-radius: 12rpx 12rpx 12rpx 12rpx;
+						position: relative;
+				
+						input {
+							height: 70rpx;
+							line-height: 70rpx;
+							padding-left: 22rpx;
+							padding-right: 72rpx;
+						}
+					}
+				}
+
+				.listvals {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 34rpx;
+
+					.tit {
+						margin-top: 12rpx;
+						font-size: 32rpx;
+						color: #3D3D3D;
+					}
+
+					.but {
+						width: 462rpx;
+						height: 70rpx;
+						background: #F0F0F0;
+						border-radius: 12rpx 12rpx 12rpx 12rpx;
+						position: relative;
+
+						input {
+							height: 70rpx;
+							line-height: 70rpx;
+							padding-left: 22rpx;
+						}
+					}
+				}
+
+				.listval {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 34rpx;
+
+					.tit {
+						margin-top: 12rpx;
+						font-size: 32rpx;
+						color: #3D3D3D;
+					}
+
+					.but {
+						width: 462rpx;
+						height: 70rpx;
+						background: #F0F0F0;
+						border-radius: 12rpx 12rpx 12rpx 12rpx;
+
+						input {
+							height: 70rpx;
+							line-height: 70rpx;
+							padding-left: 22rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/page_fenbao/editshenhe.vue b/page_fenbao/editshenhe.vue
index 8e9b03b..3756cfa 100644
--- a/page_fenbao/editshenhe.vue
+++ b/page_fenbao/editshenhe.vue
@@ -15,16 +15,15 @@
 					<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="listval">
 					<view class="tit"> 营业时间</view>
 					<view class="but"
 						style="display: flex;justify-content: space-between;padding: 15rpx 26rpx;box-sizing: border-box;">
-						<!-- <input type="text" placeholder="请输入营业时间" v-model="yetime" /> @click="btnyinye(1)" @click="btnyinye(2)"-->
 						<view class="" style="font-size: 28rpx;color: #666;">{{ksyy}}</view>
 						--
 						<view class="" style="font-size: 28rpx;color: #666;">{{jsyy}}</view>
 					</view>
-				</view>
+				</view> -->
 				<!-- @click="btnregion" -->
 				<!-- <view class="listvals">
 					<view class="tit"> 省市区</view>
@@ -52,14 +51,14 @@
 						<!-- @click="btnjwd" -->
 					</view>
 				</view>
-				<view class="listval">
+				<!-- <view class="listval">
 					<view class="tit"> 是否展示店铺</view>
 					<u-switch v-model="checked" active-color="#8883F0" disabled="false"></u-switch>
 				</view>
 				<view class="listval">
 					<view class="tit"> 是否允许在非营业时间使用</view>
 					 <u-switch v-model="checkeds" active-color="#8883F0" disabled="false"></u-switch> 
-				</view>
+				</view> -->
 				<!-- <view class="listval">
 					<view class="tit"> 详细地址</view>
 					<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
@@ -305,7 +304,7 @@
 
 			.list {
 				width: 680rpx;
-				height: 1080rpx;
+				height: 800rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index 91c8378..6ae5183 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -13,16 +13,15 @@
 					<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="listval">
 					<view class="tit"> 营业时间</view>
 					<view class="but"
 						style="display: flex;justify-content: space-between;padding: 15rpx 26rpx;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> -->
 			<!-- 	<view class="listvals" @click="btnregion">
 					<view class="tit"> 省市区</view>
 					<view class="but"> <input disabled="false" type="text" :placeholder="regiontext" /> <u-icon
@@ -46,14 +45,14 @@
 							size="32" @click="btnjwd"></u-icon>
 					</view>
 				</view>
-				<view class="listval">
+				<!-- <view class="listval">
 					<view class="tit"> 是否展示店铺</view>
 					 <u-switch v-model="checked" active-color="#8883F0"></u-switch> 
 				</view>
 				<view class="listval">
 					<view class="tit"> 是否允许在非营业时间使用</view>
 					 <u-switch v-model="checkeds" active-color="#8883F0"></u-switch> 
-				</view>
+				</view> -->
 				<!-- <view class="listval">
 					<view class="tit"> 详细地址</view>
 					<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
@@ -475,7 +474,7 @@
 
 			.list {
 				width: 680rpx;
-				height: 1080rpx;
+				height: 800rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index b51d0d9..b112cd6 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/index.vue
@@ -32,16 +32,20 @@
 					<u-icon name="arrow-right" color="#000" size="28"></u-icon>
 				</view>
 			</view>
-			<view class="icons">
+			<view class="icons" style="border-radius: 24rpx 24rpx 0 0;">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uDNcSwmkeciv4fHv4JdJ" mode=""
 					@click="show = true"></image>
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uCaV3mfjN1LUrW1gPPzQ" mode=""
 					@click="btnpag(1)"></image>
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uoyO7psgUNmNuhPDoOmH" mode=""
-					@click="btnpag(2)"></image>
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uu7AtppWYWNucDPLkcFu" mode=""
 					@click="btnpag(3)"></image>
 			</view>
+			<view class="icons" style="margin-top: 0;border-radius: 0 0 24rpx 24rpx;padding-top: 0;height: 130rpx;">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uoyO7psgUNmNuhPDoOmH" mode=""
+					@click="btnpag(2)"></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/u9IYNLl7G83pOXtQbaYj" mode=""
+					@click="btnpag(4)"></image>
+			</view>
 		</view>
 
 		<u-select v-model="show" :list="list" title='添加方式' @confirm="confirm"></u-select>
@@ -195,6 +199,10 @@
 							}
 						}
 					})
+				}else if(num == 4){
+					uni.navigateTo({
+						url:'/page_components/peizhi?obj=' + JSON.stringify(this.listobj)
+					})
 				}
 			},
 
@@ -542,7 +550,7 @@
 				padding-right: 50rpx;
 				box-sizing: border-box;
 				width: 680rpx;
-				height: 170rpx;
+				height: 150rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
diff --git a/pages.json b/pages.json
index e6fad84..8d2f01d 100644
--- a/pages.json
+++ b/pages.json
@@ -549,6 +549,15 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "peizhi",
+					"style": {
+						"navigationBarTitleText": "添加设备",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#3996FD",
+						"navigationBarTextStyle": "#FFFFFF",
+						"navigationStyle": "custom"
+					}
 				},{
 					"path": "eletj",
 					"style": {