|  | @@ -7,9 +7,9 @@
 | 
	
		
			
				|  |  |  					店铺标志
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  				<view class="image">
 | 
	
		
			
				|  |  | -					<image src="https://i.ringzle.com/file/20240224/2c5f3ed11f1a47519f0a68cb60f0d9a9.png" mode="">
 | 
	
		
			
				|  |  | +					<image :src="dto.shopSign">
 | 
	
		
			
				|  |  |  					</image>
 | 
	
		
			
				|  |  | -					<!-- <image :src="dto.headUrl" mode="aspectFill"></image> -->
 | 
	
		
			
				|  |  | +					<u-icon @click="more()" name="arrow-right" color="#AAA"></u-icon>
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  			</view>
 | 
	
		
			
				|  |  |  			<view class="one-realName">
 | 
	
	
		
			
				|  | @@ -18,7 +18,7 @@
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  				<!-- <u--input v-model="realName" border="none" pl ></u--input> -->
 | 
	
		
			
				|  |  |  				<view class="right">
 | 
	
		
			
				|  |  | -					<input type="text" v-model="dto.realName" border="none" placeholder="请输入昵称" />
 | 
	
		
			
				|  |  | +					<input type="text" v-model="dto.name" border="none" placeholder="请输入昵称" />
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  			</view>
 | 
	
		
			
				|  |  |  			<view class="one-mobile">
 | 
	
	
		
			
				|  | @@ -26,7 +26,7 @@
 | 
	
		
			
				|  |  |  					联系电话
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  				<view class="right">
 | 
	
		
			
				|  |  | -					<input type="text" v-model="dto.modifyPhone" border="none" placeholder="请输入手机号"
 | 
	
		
			
				|  |  | +					<input type="text" v-model="dto.phone" border="none" placeholder="请输入手机号"
 | 
	
		
			
				|  |  |  						style="height: 48rpx;" />
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  			</view>
 | 
	
	
		
			
				|  | @@ -35,7 +35,7 @@
 | 
	
		
			
				|  |  |  					商家地址
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  				<view class="right">
 | 
	
		
			
				|  |  | -					浙江省舟山市嵊泗县菜园镇东海路89号
 | 
	
		
			
				|  |  | +					{{dto.address}}
 | 
	
		
			
				|  |  |  				</view>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			</view>
 | 
	
	
		
			
				|  | @@ -63,8 +63,8 @@
 | 
	
		
			
				|  |  |  			<view class="title">
 | 
	
		
			
				|  |  |  				店铺照片
 | 
	
		
			
				|  |  |  			</view>
 | 
	
		
			
				|  |  | -			<view class="">
 | 
	
		
			
				|  |  | -				照片
 | 
	
		
			
				|  |  | +			<view class="pics">
 | 
	
		
			
				|  |  | +				<image :src='item' v-for="(item,index) in shopImgs" :key="index"></image>
 | 
	
		
			
				|  |  |  			</view>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		</view>
 | 
	
	
		
			
				|  | @@ -77,17 +77,16 @@
 | 
	
		
			
				|  |  |  			return {
 | 
	
		
			
				|  |  |  				h: uni.getSystemInfoSync().windowHeight - 87,
 | 
	
		
			
				|  |  |  				mt: uni.getSystemInfoSync().statusBarHeight + 44,
 | 
	
		
			
				|  |  | -				titleHeader: '个人信息',
 | 
	
		
			
				|  |  |  				fileList: [],
 | 
	
		
			
				|  |  |  				dto: {
 | 
	
		
			
				|  |  | -					realName: '黄沙村渔家乐', //昵称
 | 
	
		
			
				|  |  | -					modifyPhone: '18755113256', //手机号
 | 
	
		
			
				|  |  | -					headUrl: '', // 头像
 | 
	
		
			
				|  |  | +					name: '黄沙村渔家乐', //昵称
 | 
	
		
			
				|  |  | +					phone: '18755113256', //手机号
 | 
	
		
			
				|  |  | +					shopSign: '', // 头像
 | 
	
		
			
				|  |  |  					idCode: '', // 证件号
 | 
	
		
			
				|  |  | -					id: ''
 | 
	
		
			
				|  |  | +					id: '',
 | 
	
		
			
				|  |  | +					areaDetail:''
 | 
	
		
			
				|  |  |  				},
 | 
	
		
			
				|  |  | -				picList: [],
 | 
	
		
			
				|  |  | -				objList: {}
 | 
	
		
			
				|  |  | +				shopImgs:[],
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		},
 | 
	
		
			
				|  |  |  		onLoad() {
 | 
	
	
		
			
				|  | @@ -96,10 +95,18 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		methods: {
 | 
	
		
			
				|  |  |  			getInfo(){
 | 
	
		
			
				|  |  | -				this.$api.get('/merchant/merchantFisherman/home/').then(res=>{
 | 
	
		
			
				|  |  | +				this.$api.get('/merchant/merchantFisherman/home/'+uni.getStorageSync('merchantId'),{
 | 
	
		
			
				|  |  | +					
 | 
	
		
			
				|  |  | +				}).then(res=>{
 | 
	
		
			
				|  |  |  					console.log(res)
 | 
	
		
			
				|  |  |  					if(res.data.code==0){
 | 
	
		
			
				|  |  |  						this.dto=res.data.data;
 | 
	
		
			
				|  |  | +						if(!res.data.data.shopSign){
 | 
	
		
			
				|  |  | +							this.dto.shopSign='https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  | +						this.shopImgs=res.data.data.split(',');
 | 
	
		
			
				|  |  | +						
 | 
	
		
			
				|  |  | +						console.log(this.shopImgs)
 | 
	
		
			
				|  |  |  					}
 | 
	
		
			
				|  |  |  				})
 | 
	
		
			
				|  |  |  			},
 | 
	
	
		
			
				|  | @@ -117,9 +124,8 @@
 | 
	
		
			
				|  |  |  								token: wx.getStorageSync('access_token')
 | 
	
		
			
				|  |  |  							},
 | 
	
		
			
				|  |  |  							success: res => {
 | 
	
		
			
				|  |  | -								// uploadFile上传成功后,根据和后台的约定msgCode判断接口调用状态
 | 
	
		
			
				|  |  |  								let data = JSON.parse(res.data);
 | 
	
		
			
				|  |  | -								this.dto.headUrl = data.data.url
 | 
	
		
			
				|  |  | +								this.dto.shopSign = data.data.url
 | 
	
		
			
				|  |  |  							}
 | 
	
		
			
				|  |  |  						});
 | 
	
		
			
				|  |  |  					},
 | 
	
	
		
			
				|  | @@ -144,7 +150,11 @@
 | 
	
		
			
				|  |  |  		// padding-top: 150rpx;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +	.pics{
 | 
	
		
			
				|  |  | +		display: grid;
 | 
	
		
			
				|  |  | +		grid-template-columns: repeat(3, 1fr);
 | 
	
		
			
				|  |  | +		gap:12rpx
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  |  	.from-content {
 | 
	
		
			
				|  |  |  		.title {
 | 
	
		
			
				|  |  |  			margin: 40rpx 0 36rpx;
 | 
	
	
		
			
				|  | @@ -157,16 +167,16 @@
 | 
	
		
			
				|  |  |  		.one-image {
 | 
	
		
			
				|  |  |  			width: 100%;
 | 
	
		
			
				|  |  |  			display: flex;
 | 
	
		
			
				|  |  | +			align-items: center;
 | 
	
		
			
				|  |  |  			justify-content: space-between;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			.image {
 | 
	
		
			
				|  |  | -				width: 124rpx;
 | 
	
		
			
				|  |  | -				height: 124rpx;
 | 
	
		
			
				|  |  | -				border-radius: 100rpx;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +				display: flex;
 | 
	
		
			
				|  |  | +				align-items: center;
 | 
	
		
			
				|  |  |  				image {
 | 
	
		
			
				|  |  | -					width: 100%;
 | 
	
		
			
				|  |  | -					height: 100%;
 | 
	
		
			
				|  |  | +					width: 124rpx;
 | 
	
		
			
				|  |  | +					border-radius: 100rpx;
 | 
	
		
			
				|  |  | +					height: 124rpx;
 | 
	
		
			
				|  |  |  					border-radius: 100rpx;
 | 
	
		
			
				|  |  |  				}
 | 
	
		
			
				|  |  |  
 |