修改冲突内容

pages/shop/Evaluations/EvaluationDetail/index.vue

@@ -122,21 +122,10 @@
 					<view class="">分享</view>
 				</view> -->
 			</view>
-			<view class="btn" @click="goGoodsDetail">立即购买</view>
+			<view class="btn" @click="goGoodsDetail">立即购买</view>
-<<<<<<< HEAD
 		</view>
 	</view>
 </template>
-
-=======
-		</view>
-		
-		
-		
-	</view>
-</template>
-
->>>>>>> sxx
 <script>
 	import { getEvaluationDetail,getUserCollection,delUserCollection} from '@/api/store'
 	export default {
@@ -148,17 +137,13 @@
 				id: 0,
 				info: {},
 				feelCurrent: 0,
-				accessibilityCurrent: 0,
+				accessibilityCurrent: 0,
-<<<<<<< HEAD
 				editableTabs:[],
 				tagStyle: {
 					p: 'text-indent:2em;font-family: PingFang SC;font-size:28rpx;text-indent: 42rpx;',
 					img: 'padding:0;margin:0;font-size:0;display:block;'
 				}
 			};
-=======
-			};
->>>>>>> sxx
 		},
 		onLoad() {
 			this.id = this._route.query.id