diff --git a/api/admin.js b/api/admin.js
index 0908c65..a86ab71 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -234,4 +234,10 @@ export function computeRefundPrice(merId,data) {
  */
 export function scanUpload(field,token,data) {
   return request.post(`scan_upload/image/${field}/${token}`,data, { login: true });
+}
+/**
+ * 查询商户信息
+ */
+export function getAdminInfo(merId) {
+  return request.get(`server/${merId}/store/info`, {}, { login: true });
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1de6754..5d5982c 100644
--- a/pages.json
+++ b/pages.json
@@ -673,6 +673,12 @@
 						"navigationBarTitleText": "商家管理"
 					}
 				},
+				{
+					"path": "shopInfo/index",
+					"style": {
+						"navigationBarTitleText": "商家信息"
+					}
+				},
 				{
 					"path": "orderDetail/index",
 					"style": {
diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 0181ee5..560ef46 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -74,7 +74,7 @@
 				if(this.service.is_goods){
 					list.push({
 						title: '基本信息',
-						url: '/pages/product/list/index?mer_id=' + merId,
+						url: '/pages/admin/shopInfo/index?mer_id=' + merId,
 						icon: 'haiyuefont haiyue-info'
 					});
 				}
diff --git a/pages/admin/shopInfo/index.vue b/pages/admin/shopInfo/index.vue
new file mode 100644
index 0000000..3f72053
--- /dev/null
+++ b/pages/admin/shopInfo/index.vue
@@ -0,0 +1,408 @@
+<template>
+	<view class="container">
+		<view class="step_one" >
+			
+			<view class="popup_group">
+				<view class="popup_group_item" >
+					<view class="popup_group_item_label">商户名称</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="shopInfo.mer_name" class="popup_group_item_message_value">{{ shopInfo.mer_name }}</span>
+							<span v-else>请填写商户名称</span>
+						</view>
+						<!-- <view><span class="iconfont">&#xe6bd;</span></view> -->
+					</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">
+							<span v-if="shopInfo.mer_take_phone" class="popup_group_item_message_value">{{ shopInfo.mer_take_phone }}</span>
+							<span v-else>请填写商户负责人手机号</span>
+						</view>
+						<!-- <view><span class="iconfont">&#xe6bd;</span></view> -->
+					</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">
+							<text v-if="shopInfo.mer_take_name" class="popup_group_item_message_value line1">{{ shopInfo.mer_take_name }}</text>
+							<text v-else>请填写商户负责人姓名</text>
+						</view>
+						<!-- <view><text class="iconfont">&#xe6bd;</text></view> -->
+					</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">
+							<text v-if="shopInfo.create_time" class="popup_group_item_message_value line1">{{ shopInfo.create_time }}</text>
+							<text v-else>请填写商户入住时间</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="popup_group">
+				<!-- <view class="radio">
+					<view class="radio_label ">规格选择</view>
+					<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
+						<label class="radio_select" v-for="(val, i) in specificationsRadioList" :key="val.value">
+							<view><radio :value="val.value" :checked="val.value == setFormData.spec_type" /></view>
+							<view>{{ val.name }}</view>
+						</label>
+					</radio-group>
+				</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>
+				</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 class="popup_group_item" @click="setSpecifica" >
+					<view class="popup_group_item_label">客服电话</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="shopInfo.mer_phone" class="popup_group_item_message_value">{{shopInfo.mer_phone}}</span>
+							<!-- <span v-else>去设置</span> -->
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
+			</view>
+			<view class="popup_group">
+				<view  class="radio">
+					<view class="radio_label ">商户地址</view>
+					<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+						<!-- <label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
+							<view><checkbox :value="val.value" :checked="setFormData.delivery_way.includes(val.value)" /></view>
+							<view>{{ val.name }}</view>
+						</label> -->
+					</checkbox-group>
+				</view>
+				
+			</view>
+			<view class="handle"><view class="handle_button" @click="handleNextStep">保存信息</view></view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import {getAdminInfo} from '@/api/admin.js'
+export default {
+	components: {
+	},
+	data() {
+		return {
+			shopInfo:{},
+			mer_id:'',
+			
+		};
+	},
+	onLoad(option){
+		this.mer_id = option.mer_id
+		
+	},
+	onShow() {
+		this.getInfo()
+	},
+	methods:{
+		getInfo(){
+			getAdminInfo(this.mer_id).then((res)=>{
+				if(res){
+					this.shopInfo=res.data;
+				}
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+// addGoodsFormData
+// singleSpecification -- 单规格
+// attrValue -- 多规格数据
+// modifyPriceData -- 多规格选择时，已经存储的数据
+.container {
+	padding-top: 20rpx;
+	padding-bottom: 156rpx;
+}
+
+.tip {
+	padding: 16rpx 0 0 40rpx;
+	font-size: 22rpx;
+	color: #e93323;
+	display: flex;
+	align-items: center;
+	margin-bottom: 40rpx;
+	.iconfont {
+		display: inline-block;
+		margin-right: 10rpx;
+	}
+}
+
+.popup_group {
+	background: #fff;
+	margin: 31rpx auto;
+	width: 710rpx;
+	font-size: 30rpx;
+	border-radius: 10rpx;
+	.popup_group_item {
+		padding: 32rpx 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.popup_group_item_value {
+			display: flex;
+			align-items: center;
+			.popup_group_item_message {
+				margin-right: 15rpx;
+				color: #bbbbbb;
+				max-width: 400rpx;
+				&_value {
+					display: inline-block;
+					max-width: 400rpx;
+					color: #000;
+				}
+			}
+			.iconfont {
+				color: #bbbbbb;
+			}
+			input {
+				text-align: right;
+			}
+		}
+	}
+	> view:not(:last-child) {
+		border-bottom: 1px solid #eeeeee;
+	}
+}
+
+.handle {
+	width: 100%;
+	height: 126rpx;
+	background: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	z-index: 10;
+	&_button {
+		width: 690rpx;
+		height: 86rpx;
+		background: #e93323;
+		border-radius: 43px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 32rpx;
+		color: #ffffff;
+	}
+}
+
+.input_content {
+	background: #fff;
+	padding: 20rpx 30rpx 40rpx 30rpx;
+	width: 710rpx;
+	margin: auto;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	&_textarea {
+		border-bottom: 1px solid #eeeeee;
+		padding-bottom: 19rpx;
+		textarea {
+			height: 114rpx;
+		}
+		> view {
+			text-align: right;
+			color: #666666;
+			font-size: 24rpx;
+		}
+	}
+
+	&_photo {
+		margin-top: 30rpx;
+		display: flex;
+		flex-wrap: wrap;
+		
+		&_adPh {
+			position: relative;
+			width: 210rpx;
+			height: 210rpx;
+			border: 1px solid #dddddd;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			border-radius: 8rpx;
+			margin-right: 10rpx;
+			margin-bottom: 10rpx;
+			box-sizing: border-box;
+			&:nth-child(3n){
+				margin-right: 0;
+			}
+			> view:nth-child(1) {
+				height: 37rpx;
+				margin-bottom: 16rpx;
+				display: flex;
+				justify-content: center;
+				image {
+					width: 45rpx;
+					display: block;
+				}
+			}
+
+			> view:nth-child(2) {
+				text-align: center;
+				color: #bbbbbb;
+				font-size: 24rpx;
+			}
+			.photos {
+				width: 206rpx;
+				// height: 208rpx;
+			}
+			&_jiao {
+				position: absolute;
+				top: -2rpx;
+				right: -1rpx;
+				width: 40rpx;
+				height: 40rpx;
+				background: rgba(0,0,0,.6);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-radius: 0 8rpx 0 8rpx;
+				image {
+					width: 16rpx;
+					height: 16rpx;
+				}
+			}
+		}
+	}
+	&_describe {
+		border-top: 1px solid #eeeeee;
+		padding-top: 30rpx;
+		padding-bottom: 47rpx;
+		border-bottom: 1px solid #eeeeee;
+		&_title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			&_msg {
+				color: #333333;
+				font-size: 30rpx;
+			}
+			&_num {
+				color: #666666;
+				font-size: 24rpx;
+			}
+		}
+
+		&_textarea {
+			border-radius: 10px;
+			margin-top: 20rpx;
+			height: 180rpx;
+			background: #f5f5f5;
+			padding: 20rpx;
+			textarea {
+				font-size: 28rpx;
+				height: 150rpx;
+			}
+		}
+	}
+
+	&_keyword {
+		padding-top: 32rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 30rpx;
+		&_value {
+			flex: 1;
+			margin-left: 30rpx;
+			input {
+				width: 100%;
+				text-align: right;
+			}
+		}
+	}
+}
+.photo_count{
+	margin-top: 28rpx;
+	.photo_size{
+		font-size: 24rpx;
+		color: #999999;
+	}
+}
+.radio {
+	padding: 30rpx;
+	&_label {
+		padding-left: 10rpx;
+		color: #333333;
+		font-size: 30rpx;
+		display: flex;
+		align-items: center;
+		.select_check {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 40rpx;
+			height: 40rpx;
+			border: 1px solid #cccccc;
+			border-radius: 50%;
+			margin-right: 20rpx;
+
+			.iconfont {
+				font-size: 24rpx;
+			}
+		}
+
+		.select {
+			background: #e93323;
+			border: none;
+			.iconfont {
+				color: #fff;
+			}
+		}
+	}
+	.select_group {
+		display: flex;
+	}
+	.flex_start {
+		padding: 0 10rpx;
+		margin-top: 40rpx;
+		justify-content: flex-start;
+	}
+
+	&_select {
+		display: flex;
+		margin-right: 110rpx;
+	}
+}
+
+.dobuButton {
+	padding: 0 30rpx;
+}
+
+.margin_right {
+	background: #FD6523;
+	margin-right: 30rpx;
+}
+</style>
+
+
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index b1684d9..f2eed5a 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -17,7 +17,7 @@
 			<!-- <cover-image src="../annex/static/vipBg.png" style="position: absolute;
 			top: -20px;"></cover-image> -->
 			<view class="type-item" v-for="(item,index) in tabList" :key="index" @click="goShopSearch(item)">
-				<image class="type-item-img" src="@/static/images/shop/tab1.png" mode=""></image>
+				<image class="type-item-img" :src="item.category_icon" mode=""></image>
 				<text class="type-item-text">{{item.category_name}}</text>
 			</view>
 		</view>
@@ -39,7 +39,6 @@
 							<view class="right-center-left">
 								<view class="center-left-score">
 									<text class="iconfont icon-shitixing"></text>
-									<!-- <text class="iconfont icon-kongxinxing">★</text> -->
 									<text>{{item.service_score}}分</text>
 								</view>
 								<view class="center-left-time" v-if="item.config&&item.config.mer_take_time">营业时间:{{item.config.mer_take_time.join('-')}}</view>