2021-3-19-17

App.vue

@@ -15,14 +15,11 @@
 	html {
 		box-sizing: border-box;
 		font-size: 28rpx;
-<<<<<<< HEAD
-=======
 	}
 
 	.status_bar {
 		height: 88rpx;
 		width: 100%;
->>>>>>> a42ee056f94476589573c3821db9815e9f9872e2
 	}
 
 	.status_bar {

pages/equipList/index.vue

@@ -53,7 +53,6 @@
 				page:1,
 				size:10,
 				images: [{
-<<<<<<< HEAD
 						path: "../../static/image/fourMoodBase/3.png",//
 						id: 2
 					},
@@ -69,27 +68,8 @@
 					}, {
 						path: "../../static/image/fourMoodBase/2.png",
 						id: 6
-					}, {
+					},{
 						path: "../../static/image/fourMoodBase/4.png",
-=======
-						path: "../../static/image/fourMoodBase/scd.png",
-						id: 2
-					},
-					{
-						path: "../../static/image/fourMoodBase/cbd.png",
-						id: 3
-					}, {
-						path: "../../static/image/fourMoodBase/xycb.png",
-						id: 4
-					}, {
-						path: "../../static/image/fourMoodBase/qxz.png",
-						id: 5
-					}, {
-						path: "../../static/image/fourMoodBase/jk.png",
-						id: 6
-					}, {
-						path: "../../static/image/fourMoodBase/bzy.png",
->>>>>>> a42ee056f94476589573c3821db9815e9f9872e2
 						id: 7
 					}
 				],

pages/fourBase/allocation.vue

@@ -47,7 +47,6 @@
 				current: 0,
 				assignment_items: [],
 				images: [{
-<<<<<<< HEAD
 					path: "../../static/image/fourMoodBase/1.png",
 					id: 3
 				}, {
@@ -58,20 +57,8 @@
 					id: 6
 				}, {
 					path: "../../static/image/fourMoodBase/4.png",
-=======
-					path: "../../static/image/fourMoodBase/cbd.png",
-					id: 3
-				}, {
-					path: "../../static/image/fourMoodBase/qxz.png",
-					id: 5
-				}, {
-					path: "../../static/image/fourMoodBase/jk.png",
-					id: 6
-				}, {
-					path: "../../static/image/fourMoodBase/bzy.png",
->>>>>>> a42ee056f94476589573c3821db9815e9f9872e2
 					id: 7
-				}],
+				},],
 				src: '',
 				obj: {},
 				addtype: []

pages/fourBase/basefacility.vue

@@ -32,7 +32,6 @@
 				base_id: "",
 				assignments: [],
 				images: [{
-<<<<<<< HEAD
 					path: "../../static/image/fourMoodBase/1.png",
 					id: 3
 				}, {
@@ -43,8 +42,6 @@
 					id: 6
 				}, {
 					path: "../../static/image/fourMoodBase/4.png",
-=======
-					path: "../../static/image/fourMoodBase/cbd.png",
 					id: 3
 				}, {
 					path: "../../static/image/fourMoodBase/qxz.png",
@@ -54,7 +51,6 @@
 					id: 6
 				}, {
 					path: "../../static/image/fourMoodBase/bzy.png",
->>>>>>> a42ee056f94476589573c3821db9815e9f9872e2
 					id: 7
 				}],
 				tishiTF: false

pages/fourBase/index.vue

@@ -28,15 +28,9 @@
 					</view>
 					<u-icon name="more-dot-fill" class="bases_list_xiangqing" @click.native.stop="XQclick(items)"></u-icon>
 					<view class="photoshow">
-<<<<<<< HEAD
 						<image src="../../static/image/fourMoodBase/1.png" mode=""></image>
 						<image src="../../static/image/fourMoodBase/3.png" mode=""></image>
 						<image src="../../static/image/fourMoodBase/5.png" mode=""></image>
-=======
-						<image src="../../static/image/fourMoodBase/cbd.png" mode=""></image>
-						<image src="../../static/image/fourMoodBase/scd.png" mode=""></image>
-						<image src="../../static/image/fourMoodBase/qxz.png" mode=""></image>
->>>>>>> a42ee056f94476589573c3821db9815e9f9872e2
 						<view class="photoshow_num">
 							{{items.num}}+
 						</view>