Merge branch 'dev' of http://git.hchyun.com/feashow/pupil into dev

2022-12-18 13:29:01 +08:00
parent 9d1526a28e 204149745e
commit 99b39f3eed
98 changed files with 4169 additions and 23 deletions
--- a/pages.json
+++ b/pages.json
@@ -7,7 +7,8 @@
 		  "^customer-(.*)": "@/components/uni-$1.vue" // 匹配components目录内的vue文件
 		}
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "食瞳",
@@ -16,7 +17,7 @@
 				//导航栏取消
 				// "navigationStyle": "custom",
 				//是否开启下拉刷新
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -42,6 +43,65 @@
 			"style": {
 				"navigationBarTitleText": "我的",
 				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/report/news/news",
+			"style": {
+				"navigationBarTitleText": "行内新闻",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/report/certifiedCj/certifiedCj",
+			"style": {
+				"navigationBarTitleText": "认证厂家",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/detail/xwDetail/xwDetail",
+			"style": {
+				"navigationBarTitleText": "行业新闻详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/detail/productsDetail/productsDetail",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/detail/certifiedCjDetail/certifiedCjDetail",
+			"style": {
+				"navigationBarTitleText": "厂家信息",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/bindCompony/bindCompony",
+			"style": {
+				"navigationBarTitleText": "绑定公司",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/browseHistory/browseHistory",
+			"style": {
+				"navigationBarTitleText": "浏览记录",
+				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
@@ -64,6 +124,14 @@
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
+				}
+		}, {
+			"path": "pages/my/memberCenter/memberCenter",
+			"style": {
+				"navigationBarTitleText": "会员中心",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
 			}
 		}
 	],