接入商品评论数据

pages/mall/merchant/shop-edit.uvue

@@ -135,9 +135,6 @@
 					}
 				})
 			},
-<<<<<<< HEAD
-			
-=======
 
 			async uploadImageToSupa(localPath: string): Promise<string> {
 				if (localPath.startsWith('http://') || localPath.startsWith('https://')) {
@@ -173,22 +170,12 @@
 				}
 			},
 
->>>>>>> local-backup-root-cyj
 			async saveShop() {
 				if (!this.shop.shop_name) {
 					uni.showToast({ title: '请输入店铺名称', icon: 'none' })
 					return
 				}
 				
-<<<<<<< HEAD
-				uni.showLoading({ title: '保存中...' })
-				
-				try {
-					const shopData = {
-						shop_name: this.shop.shop_name,
-						shop_logo: this.shop.shop_logo,
-						shop_banner: this.shop.shop_banner,
-=======
 				uni.showLoading({ title: '正在上传图片...' })
 
 				try {
@@ -208,7 +195,6 @@
 						shop_name: this.shop.shop_name,
 						shop_logo: finalLogo,
 						shop_banner: finalBanner,
->>>>>>> local-backup-root-cyj
 						description: this.shop.description,
 						contact_name: this.shop.contact_name,
 						contact_phone: this.shop.contact_phone,