分类样式修改

src/main/resources/static/linfeng-community-uniapp-ky/pages/post/add.vue

@@ -50,7 +50,7 @@
 			};
 		},
 		onLoad(options) {
-			if(!uni.getStorageSync("hasLogin")){
+			if (!uni.getStorageSync("hasLogin")) {
 				this.$u.toast('请先登录哦');
 			}
 		},
@@ -123,7 +123,7 @@
 		padding: 20rpx;
 		border-bottom: 1px solid #F5F5F5;
 
-	&:last-child {
+		&:last-child {
 			border: 0;
 		}
 

src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js

@@ -7,13 +7,9 @@ const shareH5Url = "https://www.linfeng.tech/#/"; //H5分享路径
 // const domain = 'http://' + baseUrl + "/app/"; 
 
 //线上环境配置
-<<<<<<< HEAD
 const baseUrl = "wxapi.linfeng.tech";
 const domain = 'https://' + baseUrl + "/app/"; 
-=======
-// const baseUrl = "";
-// const domain = 'https://' + baseUrl + "/app/"; 
->>>>>>> 85ba2abf696189e458edd77880b587e2e8b9d91c
+