Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package2/shop/shopInfo.vue

@@ -28,11 +28,11 @@
 					<input type="text" placeholder="请输入副标题" v-model="shop.subtitle" style="height: 100rpx;line-height: 100rpx;" />
 				</view>
 			</view>
-			<view class="list-1">
+			<view class="list-1" style="height: auto;">
 				<view class="list-name">
 					店铺地址
 				</view>
-				<view class="list-right">
+				<view class="list-right" style="line-height: 20px;margin-top: 15px;">
 					{{shop.shopAddress}}
 				</view>
 			</view>
@@ -103,7 +103,7 @@
 			}
 		},
 		onLoad() {
-			this.shop = JSON.parse(uni.getStorageSync('shop'));
+			this.shop = uni.getStorageSync('schoolShop')[0];
 			this.shopImages = this.shop.shopImages.split('@@')
 			this.huanjing = JSON.parse(this.shopImages[3])[0]
 			
@@ -149,7 +149,7 @@
 				let that = this;
 				let hiver_token = uni.getStorageSync("hiver_token")
 				await uni.uploadFile({
-					url: getApp().globalData.mainurl + '/upload/file',
+					url: that.tui.interfaceUrl() + '/upload/file',
 					filePath: path,
 					name: 'file',
 					header: {

pages/index/index.vue

@@ -1060,16 +1060,12 @@
 						that.mallAds = res.result.mallAds
 						for(let i=0;i<that.mallAds.length;i++){
 							if(that.mallAds[i].position == 'home_top'){
-								
 								// 判断字符串中是否包含逗号
 								if (that.mallAds[i].adImage.indexOf(',') !== -1) {
 									// 有逗号：先按逗号分割，再过滤掉空字符串或纯空白字符串，最后映射为 {pic: url} 对象数组
-									that.adList = that.mallAds[i].adImage
-										.split(',')
-										.filter(item => item.trim() !== '') // 过滤掉空项
-										.map(url => ({
-											pic: url.trim()
-										}));
+									that.adList = that.mallAds[i].adImage.split(',').filter(item => item.trim() !== '').map(url => ({
+										pic: url.trim()
+									}));
 								} else {
 									// 没有逗号：整个字符串作为一个对象
 									that.adList = [{
@@ -1107,6 +1103,7 @@
 				}).catch((res) => {});
 			},
 			goAdPage(item) {
+				console.log('hahahahah',item)
 				uni.navigateTo({
 					url: item.linkUrl + item.linkParams
 				})