diff --git a/pages/admin/shopInfo/index.vue b/pages/admin/shopInfo/index.vue
index 632d722..b034e34 100644
--- a/pages/admin/shopInfo/index.vue
+++ b/pages/admin/shopInfo/index.vue
@@ -37,7 +37,7 @@
 					<view class="popup_group_item_label">商户入住时间</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
-							<text v-if="shopInfo.create_time" class="popup_group_item_message_value line1">{{ shopInfo.create_time }}</text>
+							<text v-if="shopInfo.create_time" class="popup_group_item_message_value line1">{{ shopInfo.create_time.split(' ')[0] }}</text>
 							<text v-else>请填写商户入住时间</text>
 						</view>
 					</view>
@@ -72,24 +72,28 @@
 						</view>
 					</view>
 				</view>
-				<!-- <view class="popup_group_item" >
+				<view class="popup_group_item" style="display: flex;flex-direction: column;">
+					<view class="popup_group_item_label" style="width: 100%;">提货点营业日期</view>
+					<view class="" style="margin-top: 14px;">
+						<checkbox-group @change="checkboxChange" style="display: flex;flex-direction: row;flex-wrap: wrap;grid-row-gap: 8px;grid-column-gap: 35px;">
+							<label v-for="(item,index) in week">
+								<checkbox :value="item.value+''"  />{{item.name}}
+							</label>
+						</checkbox-group>
+					</view>
+				</view>
+				<view class="popup_group_item" >
 					<view class="popup_group_item_label">提货点营业时间</view>
 					<view class="popup_group_item_value">
-						<view class="popup_group_item_message" style="display: flex;">
-							<input style="text-align: center;" v-model="shopInfo.mer_take_time[0]" type="text" placeholder="请填写详细地址" />-<input  style="text-align: center;" v-model="shopInfo.mer_take_time[1]" type="text" placeholder="请填写详细地址" />
-						</view>
-						<view><span class="iconfont">&#xe6bd;</span></view>
+						<picker mode="time" style="min-width: 50px;height: 20px;text-align:center;"  :value="time" start="09:01" end="21:01" @change="bindTimeChange">
+							<view class="uni-input">{{time}}</view>
+						</picker>
+						至
+						<picker mode="time" style="min-width: 50px;height: 20px;text-align:center;"  :value="time2" start="09:01" end="21:01" @change="bindTimeChange2">
+							<view class="uni-input">{{time2}}</view>
+						</picker>
 					</view>
-				</view> -->
-				<!-- <view class="popup_group_item" >
-					<view class="popup_group_item_label">提货点营业日期</view>
-					<view class="popup_group_item_value">
-						<view class="popup_group_item_message">
-							<input v-model="shopInfo.mer_address" type="text" placeholder="请填写详细地址" />
-						</view>
-						<view><span class="iconfont">&#xe6bd;</span></view>
-					</view>
-				</view> -->
+				</view>
 				<view class="popup_group_item"  >
 					<view class="popup_group_item_label">客服电话</view>
 					<view class="popup_group_item_value">
@@ -102,22 +106,20 @@
 				</view>
 			</view>
 			<view class="popup_group">
-				<view class="popup_group_item"  >
-					<view class="popup_group_item_label">商户信息</view>
-					<view class="popup_group_item_value" style="overflow: scroll;">
-						<view class="popup_group_item_message" v-if="shopInfo.detail">
-							<textarea v-model="shopInfo.detail.detail" type="text" placeholder="商户信息" />
-							<!-- <span v-else>去设置</span> -->
-						</view>
-						<!-- <view><span class="iconfont">&#xe6bd;</span></view> -->
+				<view class="popup_group_item"  style="flex-direction: column;">
+					<view class="popup_group_item_label" style="width: 100%;">商户信息</view>
+				</view>
+				<view class="popup_group_item"  style="flex-direction: column;">
+					<view class="popup_group_item_value" v-if="shopInfo.detail">
+							<textarea style="font-size: 14px;color: #666;" maxlength="-1" v-model="shopInfo.detail.detail" type="text" placeholder="商户信息" />
 					</view>
 				</view>
-				<view class="upload">
-					<text class="item-title">请上传商户轮播图</text>
-					<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
+				<view class="upload" style="padding-left: 15px;">
+					<text class="item-title" style="width: 100%;">请上传商户轮播图</text>
+					<text class="item-desc" style="width: 100%;">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
 					<view class="update-list">
 						<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index" @click="getPhotoClickIdx">
-							<image :src='item.img'></image>
+							<image :src='item.img' style="border-radius: 4px;"></image>
 							<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
 						</view>
 						<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 10">
@@ -145,6 +147,14 @@ export default {
 			mer_id:'',
 			detail:'',
 			pics:[],
+			time:'',
+			time2:'',
+			day:[],
+			// week: [ "周一", "周二", "周三", "周四", "周五", "周六","周日"],
+			week:[{name:'周一',value:1},{name:'周二',value:2},
+			{name:'周三',value:3},{name:'周四',value:4},
+			{name:'周五',value:5},{name:'周六',value:6},
+			{name:'周日',value:7}]
 		};
 	},
 	onLoad(option){
@@ -155,10 +165,22 @@ export default {
 		this.getInfo()
 	},
 	methods:{
+		checkboxChange (e) {
+			this.day = e.detail.value.map(Number);
+		},
+		bindTimeChange(e) {
+			this.time = e.detail.value
+		},
+		bindTimeChange2(e) {
+			this.time2 = e.detail.value
+		},
 		getInfo(){
 			getAdminInfo(this.mer_id).then((res)=>{
 				if(res){
 					this.shopInfo=res.data;
+					this.time=res.data.mer_take_time[0];
+					this.time2=res.data.mer_take_time[1];
+					this.pics=res.data.detail.images;
 				}
 			})
 		},
@@ -167,6 +189,9 @@ export default {
 				detail:this.shopInfo.detail.detail,
 				promise:this.shopInfo.detail.promise,
 				images:this.pics,
+				mer_take_phone:this.shopInfo.mer_take_phone,
+				mer_take_day:this.day,
+				mer_take_time:[this.shopInfo.mer_take_time[0],this.shopInfo.mer_take_time[1]],
 				services:['wifi','免费停车']
 			}
 				
@@ -225,6 +250,10 @@ export default {
 	padding-top: 20rpx;
 	padding-bottom: 156rpx;
 }
+/deep/ .uni-checkbox-input.uni-checkbox-input-checked{
+	    border: 1px solid #2291F8 !important;
+	    background-color: #2291F8 !important;
+}
 .pictrue {
 		width: 130rpx;
 		height: 130rpx;
@@ -267,7 +296,7 @@ export default {
 .tip {
 	padding: 16rpx 0 0 40rpx;
 	font-size: 22rpx;
-	color: #e93323;
+	color: #2291f8;
 	display: flex;
 	align-items: center;
 	margin-bottom: 40rpx;
@@ -293,7 +322,6 @@ export default {
 		margin-top: 20rpx;
 		padding: 20rpx 0;
 		justify-content: center;
-		flex-direction: column;
 		align-items: center;
 	}
 	.item-desc {
@@ -305,6 +333,9 @@ export default {
 	}
 	.update-list{
 		display: flex;
+		    flex-direction: row;
+		    grid-gap: 12px;
+		    flex-wrap: wrap;
 	}
 .popup_group {
 	background: #fff;
@@ -357,7 +388,7 @@ export default {
 	&_button {
 		width: 690rpx;
 		height: 86rpx;
-		background: #e93323;
+		background: #2291f8;
 		border-radius: 43px;
 		display: flex;
 		align-items: center;
@@ -524,7 +555,7 @@ export default {
 		}
 
 		.select {
-			background: #e93323;
+			background: #2291f8;
 			border: none;
 			.iconfont {
 				color: #fff;