vuex

common/api/user.js

@@ -302,11 +302,11 @@ export default {
 			delMessage({ type }) {
 				return vm.$u.post('/message/readMessage', { type });
 			},
-<<<<<<< HEAD
+
 			// 已读消息
 			refreshToken({  }) {
 				return vm.$u.post('/Auth/refreshToken', { });
-=======
+			},
 			// 屏蔽列表
 			articlShieldList() {
 				return vm.$u.post('/Article/articlShieldList');
@@ -314,7 +314,6 @@ export default {
 			// 取消屏蔽
 			articleDelShield({ id }) {
 				return vm.$u.post('article/articleDelShield', { member_id: id });
->>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
 			},
         }
     }

package.json

@@ -11,13 +11,9 @@
     "url": "http://git.luyuan.tk/luyuan/deming.git"
   },
   "author": "",
-  "license": "ISC",
+  "license": "ISC", 
   "dependencies": {
-<<<<<<< HEAD
-    "uview-ui": "^1.5.0",
+    "uview-ui": "^1.5.0", 
     "vuex": "^3.5.1"
-=======
-	"uview-ui": "^1.5.0"
->>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
   }
 }

pageA/register/register.vue

@@ -418,7 +418,7 @@
 		// line-height: 36px;
 	}
 	
-	.pact>view:first-child {
+	.pact>view:first-child { 
 		float: left;
 	
 	}