From 73ebcc1465bd203e556a3157e8139fa916d14ba2 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 31 十月 2025 12:15:25 +0800
Subject: [PATCH] 1
---
pages.json | 211 +++++-----------------------------------------------
1 files changed, 22 insertions(+), 189 deletions(-)
diff --git a/pages.json b/pages.json
index 9b372bb..cbf250d 100644
--- a/pages.json
+++ b/pages.json
@@ -562,7 +562,6 @@
"navigationBarTitleText": "涓嬫ā鍗�"
}
},
-<<<<<<< .mine
{
"path": "pages/MJGL/mujudianjianjiludan/table",
"style": {
@@ -570,7 +569,6 @@
"enablePullDownRefresh": true
}
},
-=======
{
"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
"style": {
@@ -578,7 +576,6 @@
"enablePullDownRefresh": true
}
},
->>>>>>> .theirs
{
"path": "pages/MJGL/mujudianjianjiludan/form",
"style": {
@@ -591,37 +588,28 @@
"navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
}
},
-<<<<<<< .mine
{
"path": "pages/MJGL/mujubaoyangjiludan/table",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�",
"enablePullDownRefresh": true
}
- },
-=======
- },
- {
+ },{
"path": "pages/shengchanbuliaojiaoyan/form",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
}
- },
->>>>>>> .theirs
- {
+ },{
"path": "pages/MJGL/mujubaoyangjiludan/form",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
}
- },
-<<<<<<< .mine
- {
+ },{
"path": "pages/MJGL/mujubaoyangjiludan/table_son",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
}
- },
- {
+ },{
"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
@@ -751,7 +739,6 @@
"style": {
"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
}
-=======
},
{
"path": "pages/xiaoshouchukujiaoyan/form",
@@ -870,8 +857,7 @@
"navigationBarTitleText": "鍏朵粬鍏ュ簱",
"enablePullDownRefresh": true
}
- },
- {
+ },{
"path": "pages/qitaruku_v2/form",
"style": {
"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
@@ -884,11 +870,11 @@
"enablePullDownRefresh": true
}
},
- {
- "path": "pages/qitachuku_v2/form",
- "style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
->>>>>>> .theirs
+ {
+ "path": "pages/qitachuku_v2/form",
+ "style": {
+ "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+ }
},
{
"path": "pages/shengchanbuliao/table",
@@ -896,13 +882,8 @@
"navigationBarTitleText": "鐢熶骇琛ユ枡",
"enablePullDownRefresh": true
}
-<<<<<<< .mine
},
- {
-=======
- },
{
->>>>>>> .theirs
"path": "pages/shengchanbuliao/form",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
@@ -926,7 +907,6 @@
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱",
"enablePullDownRefresh": true
-<<<<<<< .mine
}
},
{
@@ -934,16 +914,13 @@
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
}
-=======
},
{
"path": "pages/tiaomaguanli/table",
"style": {
"navigationBarTitleText": "鏉＄爜绠＄悊"
}
- },
->>>>>>> .theirs
- }, {
+ },{
"path": "pages/weiwairuku/table",
"style": {
"navigationBarTitleText": "濮斿鍏ュ簱",
@@ -976,16 +953,16 @@
}
},
{
- "path": "pages/tiaomaguanli/table",
- "style": {
- "navigationBarTitleText": "鏉＄爜绠＄悊"
- }
- },
- {
- "path": "pages/tiaomaguanli/table_son",
- "style": {
- "navigationBarTitleText": "鏉＄爜鐢熸垚"
- }
+ "path": "pages/tiaomaguanli/table",
+ "style": {
+ "navigationBarTitleText": "鏉＄爜绠＄悊"
+ }
+ },{
+ "path": "pages/weiwairuku/table",
+ "style": {
+ "navigationBarTitleText": "濮斿鍏ュ簱",
+ "enablePullDownRefresh": true
+ }
},
{
"path": "pages/quyangdan/table",
@@ -994,7 +971,6 @@
"enablePullDownRefresh": true
}
},
-<<<<<<< .mine
{
"path": "pages/quyangdan/form",
"style": {
@@ -1096,147 +1072,4 @@
"pageOrientation": "default"
},
"uniIdRouter": {}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
- }
- },
- {
- "path" : "pages/zutuosaoma/table",
- "style" :
- {
- "navigationBarTitleText" : "缁勬墭鎵爜缂撳瓨"
- }
- },
- {
- "path" : "pages/chaituosaoma/form",
- "style" :
- {
- "navigationBarTitleText" : "鎷嗘墭鎵爜"
- }
- },
- {
- "path" : "pages/shengchantuiliao/table",
- "style" :
- {
- "navigationBarTitleText" : "鐢熶骇閫�鏂�"
- }
- },
- {
- "path" : "pages/shengchantuiliao/form",
- "style" :
- {
- "navigationBarTitleText" : "鐢熶骇閫�鏂欏崟"
- }
- },
- {
- "path" : "pages/weixiujilu/table",
- "style" :
- {
- "navigationBarTitleText" : "缁翠慨璁板綍",
- "enablePullDownRefresh": true
- }
- },
- {
- "path" : "pages/weixiujilu/form",
- "style" :
- {
- "navigationBarTitleText" : "缁翠慨璁板綍鍗�"
- }
- },
- {
- "path" : "pages/qijvguzhangdengji/table",
- "style" :
- {
- "navigationBarTitleText" : "鍣ㄥ叿鏁呴殰鐧昏"
-
- }
- },
- {
- "path" : "pages/qijvguzhangdengji/form",
- "style" :
- {
- "navigationBarTitleText" : "鍣ㄥ叿鏁呴殰鐧昏鍗�"
- }
- },
- {
- "path": "pages/jishikucunchaxun/table",
- "style" :
- {
- "navigationBarTitleText" : "ERP鍗虫椂搴撳瓨鏌ヨ"
- }
- },
- {
- "path" : "pages/ZLGL/shoujianjianyan/table",
- "style" :
- {
- "navigationBarTitleText" : "棣栦欢妫�楠屽崟缁存姢"
- }
- },
- {
- "path" : "pages/ZLGL/shoujianjianyan/form",
- "style" :
- {
- "navigationBarTitleText" : "棣栦欢妫�楠屽崟"
- }
- }
- ],
- "tabBar": {
- "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
- "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
- "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
- "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
- "list": [{
- "pagePath": "pages/index/index",
- "iconPath": "static/tabBar/home.png",
- "selectedIconPath": "static/tabBar/home-default.png",
- "text": "浠撳偍绠＄悊"
- },
- {
- "pagePath": "pages/index/tab1",
- "iconPath": "static/tabBar/icon1.png",
- "selectedIconPath": "static/tabBar/icon1-default.png",
- "text": "杞﹂棿宸ュ簭"
- },
- {
- "pagePath": "pages/index/tab2",
- "iconPath": "static/tabBar/icon2.png",
- "selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "鍗曟嵁鍒楄〃"
- },
- {
- "pagePath": "pages/index/mine",
- "iconPath": "static/tabBar/user.png",
- "selectedIconPath": "static/tabBar/user-default.png",
- "text": "鎴戠殑"
- }
- ]
- },
- "globalStyle": {
- "navigationBarTextStyle": "white",
- "navigationBarTitleText": "璁惧绠＄悊",
- "navigationBarBackgroundColor": "#3A78FF",
- "backgroundColor": "#F8F8F8",
- "pageOrientation": "default"
- },
- "uniIdRouter": {}
->>>>>>> .theirs
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1