冲突

pages.json

@@ -11,12 +11,12 @@
 		}
 	},
 	"pages": [
-		// {
-		// 	"path": "pages/test/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "测试"
-		// 	}
-		// },
+		{
+			"path": "pages/test/index",
+			"style": {
+				"navigationBarTitleText": "测试"
+			}
+		},
 		{
 			"path": "pages/index",
 			"style": {

pages/test/index.vue

@@ -47,7 +47,6 @@ const isRefreshing = ref(false)
 
 const list = [
     {
-<<<<<<< HEAD
         name: '申请资质认证',
         text: '在线上发起您的资质认证',
         key: 1
@@ -70,43 +69,6 @@ const list = [
 ]
 
 
-=======
-        name: '提现金额',
-        key: '1'
-    },
-    {
-        name: '服务费',
-        key: '1'
-    },
-    {
-        name: '申请时间',
-        key: '1'
-    },
-    {
-        name: '到账时间',
-        key: '1'
-    },
-    {
-        name: '提现银行',
-        key: '1'
-    },
-    {
-        name: '提现单号',
-        key: '1'
-    },
-]
-
-const onCustomRefresh = () => {
-    isRefreshing.value = true;
-
-    setTimeout(() => {
-        isRefreshing.value = false;
-    }, 1000);
-};
-const scrolltolower = () => {
-
-};
->>>>>>> 6a2d762 (账单详情)
 </script>
 <style lang="scss" scoped>
 @import "./index.scss";