['解决冲突']

pages/equity/search.vue

@@ -50,7 +50,6 @@
 				nameVal: '',
 				searchArr: [],
 				marketType: 'asc', // 排序
-<<<<<<< HEAD
 				pvType:'asc',
 				categoryArr: [], // 分类数组--企业
 				companyId: '', // 分类数组--企业id
@@ -71,21 +70,11 @@
 			let wechaUrl = '' // 定义接口来源名称
 			if (this.searchType == '0') wechaUrl = 'mall/randgoods' //商品关键字
 			if (this.searchType == '1') wechaUrl = 'companies/rand' //商品关键字
-			randgoodsUrl(wechaUrl, {
-=======
-				// 分页
-				pageStatus: '',
-				goodsPage: 1
-			}
-		},
-		onLoad() {
 			randgoodsUrl('mall/randgoods', {
->>>>>>> 72a3d53a17d6eb8e9823c8383c6eb07b896d9c4a
 				type: 1
 			}).then(res => {
 				this.nameVal = res.name
 			})
-<<<<<<< HEAD
 
 			// 企业分类数据
 			if (this.searchType == '1') {
@@ -93,9 +82,6 @@
 					this.categoryArr = res
 				})
 			}
-			
-=======
->>>>>>> 72a3d53a17d6eb8e9823c8383c6eb07b896d9c4a
 		},
 		methods: {
 			getShopSelf(){
@@ -237,7 +223,7 @@
 				font-size: $title-size-m;
 				color: $text-gray;
 				.activess{
-					color: $main-color;
+					color: $mian-color;
 				}
 				.icon {
 					width: 32rpx;