冲突

config.js

@@ -1,9 +1,9 @@
 const base_url = {
-  // develop:'http://192.168.100.128:9527',//开发版
+  develop:'http://192.168.100.128:9527',//开发版
   // develop: 'https://yongc.top/prod-api',//开发版
   // develop: 'http://192.168.100.139:9527', //嵘哥
   // develop: 'https://yongc.top/prod-api',//体验版
-  develop: 'https://goldshulin.com/prod-api',//体验版
+  // develop: 'https://goldshulin.com/prod-api',//体验版
 
   trial: 'https://yongc.top/prod-api',//体验版
   release: 'https://goldshulin.com/prod-api',//正式版

pages.json

@@ -14,9 +14,7 @@
 		// {
 		// 	"path": "pages/test/index",
 		// 	"style": {
-		// 		"navigationBarTitleText": "测试",
-		// 		"navigationBarTextStyle": "white",
-		// 		"navigationBarBackgroundColor": "#FF6E51"
+		// 		"navigationBarTitleText": "测试"
 		// 	}
 		// },
 		{

pages/test/index.vue

@@ -47,6 +47,7 @@ const isRefreshing = ref(false)
 
 const list = [
     {
+<<<<<<< HEAD
         name: '申请资质认证',
         text: '在线上发起您的资质认证',
         key: 1
@@ -69,6 +70,43 @@ 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";