diff --git a/App.vue b/App.vue
index 8941b45..525a679 100644
--- a/App.vue
+++ b/App.vue
@@ -4,11 +4,11 @@
 			// url: 'http://192.168.3.4:9301/crest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			url: 'https://pay.dctpay.com/crest',
-			imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
+			// url: 'https://pay.dctpay.com/crest',
+			// imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
 			//测试
-			// url: 'https://gratia-pay.dctpay.com/crest',
-			// imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
+			url: 'https://gratia-pay.dctpay.com/crest',
+			imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
 			userInfo: "",
 			openId: '',
 			h5code: '',
@@ -59,6 +59,21 @@
 	}
 </script>
 
+<script>
+	export default {
+		//#ifdef APP-PLUS
+		// 获取设备的唯一标识cid
+		uni.getPushClientId({
+			success: res => {
+				console.log(res.cid)
+			},
+			fail(err) {
+				console.log(err)
+			}
+		}) // 接受推送消息// "type": "click" 用户点击系统通知栏中的消息，APP启动或者激活到前台运行，触发click事件// "type": "receive" 客户端接收到透传消息时（在系统通知栏中不显示消息），触发receive事件uni.onPushMessage(res => {console.log(res)if(res.type === 'click'){console.log(res.data.payload)}if (res.type === 'receive') {// 如果你希望当应用在线时，也通过“通知栏消息”，可以创建通知栏消息来提醒用户// uni.createPushMessage({//   title: res.data.title,//   content: res.data.content,//   payload: res.data.payload// })}})//#endif},onShow: function () {},onHide: function () {}
+	}
+</script>
+
 <style lang="scss">
 	/*每个页面公共css */
 	@import "/static/iconfont/font.scss";
diff --git a/manifest.json b/manifest.json
index b3cff33..5286944 100644
--- a/manifest.json
+++ b/manifest.json
@@ -43,7 +43,39 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {},
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */
diff --git a/pages.json b/pages.json
index 9a9c281..113e358 100644
--- a/pages.json
+++ b/pages.json
@@ -4,23 +4,18 @@
 			"path": "pages/welcome/welcome",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/login/login",
 			"style": {
-				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "登录",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee",
+				"navigationBarTextStyle": "white"
 			}
 
 		}, {
@@ -28,12 +23,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "设备申请列表",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -41,12 +34,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "订单详情",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -54,12 +45,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "我的设备",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -67,38 +56,39 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "首页",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 		}, {
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 		}, {
 			"path": "pages/tabBar/user/user",
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "个人中心",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 		}, {
 			"path": "pages/index/merchant-list/merchant-list",
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "门店管理",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -106,11 +96,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户详情",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -118,11 +107,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户进件",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}
@@ -132,11 +120,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "消息中心",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -144,11 +131,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "经营品类",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -156,11 +142,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户管理",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -168,22 +153,20 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "门店信息",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 		}, {
 			"path": "pages/index/addStore/addStore",
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "添加门店",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -191,11 +174,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "收费记录",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -203,11 +185,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户类别",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -215,11 +196,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "收款记录",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -227,11 +207,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "门店管理",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -239,11 +218,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "绑定设备",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -251,11 +229,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "绑定设备",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -263,11 +240,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "绑定二维码",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -275,23 +251,20 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "二维码列表",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 		}, {
 			"path": "pages/index/salesOrderList/salesOrderList",
 			"style": {
 				"navigationBarTitleText": "设备订单",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -299,12 +272,10 @@
 			"style": {
 				"navigationBarTitleText": "选择支行",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -312,12 +283,10 @@
 			"style": {
 				"navigationBarTitleText": "开通分账",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -325,12 +294,10 @@
 			"style": {
 				"navigationBarTitleText": "绑定接收方",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -338,12 +305,10 @@
 			"style": {
 				"navigationBarTitleText": "绑定分账接收方",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -351,12 +316,10 @@
 			"style": {
 				"navigationBarTitleText": "接收方列表",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -364,12 +327,10 @@
 			"style": {
 				"navigationBarTitleText": "选择地址",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -377,12 +338,10 @@
 			"style": {
 				"navigationBarTitleText": "修改结算信息",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -390,12 +349,10 @@
 			"style": {
 				"navigationBarTitleText": "结算信息",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -403,12 +360,10 @@
 			"style": {
 				"navigationBarTitleText": "结算详情",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -416,12 +371,10 @@
 			"style": {
 				"navigationBarTitleText": "分配桌码",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -429,12 +382,10 @@
 			"style": {
 				"navigationBarTitleText": "权益活动",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}, {
@@ -442,46 +393,36 @@
 			"style": {
 				"navigationBarTitleText": "活动详情",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
+			}
+
+		}, {
+			"path": "pages/index/equity-activity-review/equity-activity-review",
+			"style": {
+				"navigationBarTitleText": "活动审核",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
+			}
+
+		}, {
+			"path": "pages/index/order-list-details/order-list-details",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#6fbdee",
+				"backgroundColorTop": "#6fbdee"
 			}
 
 		}
-	    ,{
-            "path" : "pages/index/equity-activity-review/equity-activity-review",
-            "style" :                                                                                    
-            {
-               "navigationBarTitleText": "活动审核",
-               "navigationBarTextStyle": "white",
-               "enablePullDownRefresh": false,
-			   "onReachBottomDistance": 50,
-               "app-plus": {
-               	"titleNView": false, //禁用原生导航栏
-               	"softinputNavBar": "none"
-               }
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/order-list-details/order-list-details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "订单详情",
-                "navigationBarTextStyle": "white",
-                "enablePullDownRefresh": false,
-				"onReachBottomDistance": 50,
-                "app-plus": {
-                	"titleNView": false, //禁用原生导航栏
-                	"softinputNavBar": "none"
-                }
-            }
-            
-        }
-    ],
+	],
 	"subpackages": [{
 		"root": "subPages",
 
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 9c93c9d..9e2ca1e 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -16,29 +16,31 @@
 			}
 		},
 		onLoad(options) {
-			let that = this;
-			// uni.reLaunch({
-			// 	url: '../tabBar/home/home'
-			// })
+			let that = this;
+			// #ifdef APP-PLUS
+			uni.reLaunch({
+				url: '/pages/login/login'
+			})
+			// #endif
 			// #ifdef H5
-			let arr1 = window.location.href;
-			let arr2 = arr1.split('=');
-			if (arr2[2]) {
-				var arr3 = arr2[2].split('&');
-				if (arr3[0] != undefined && arr3[0]) {
-					app.globalData.h5code = arr3[0];
-					uni.setStorage({
-						key: "h5code",
-						data: arr3[0]
-					})
-				}
-			} else {
+			// let arr1 = window.location.href;
+			// let arr2 = arr1.split('=');
+			// if (arr2[2]) {
+			// 	var arr3 = arr2[2].split('&');
+			// 	if (arr3[0] != undefined && arr3[0]) {
+			// 		app.globalData.h5code = arr3[0];
+			// 		uni.setStorage({
+			// 			key: "h5code",
+			// 			data: arr3[0]
+			// 		})
+			// 	}
+			// } else {
 				// 获取openid
-				that.jumpcdx();
-			}
-			if (app.globalData.h5code) {
-				that.getAccessToken();
-			}
+			// 	that.jumpcdx();
+			// }
+			// if (app.globalData.h5code) {
+			// 	that.getAccessToken();
+			// }
 			// #endif
 		},
 		methods: {