diff --git a/app.js b/app.js
index 01b05f9..0061caa 100644
--- a/app.js
+++ b/app.js
@@ -123,7 +123,7 @@ App({
       perms:[],
       openid:null
     },
-    serverUrl: 'https://safeyun.ctcshe.com/',
+    serverUrl: 'http://cbma.ctc-gz.com/',
     //serverUrl: 'http://127.0.0.1:8000/',
     //serverUrl: 'http://10.21.28.148:8000/',
     //serverUrl: 'http://192.168.0.103:8000/',
diff --git a/app.json b/app.json
index 3b1c6da..2d055c4 100644
--- a/app.json
+++ b/app.json
@@ -100,7 +100,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "安全生产管理工具",
+    "navigationBarTitleText": "安全环保专题网络考评",
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
diff --git a/pages/bind/binduser.wxml b/pages/bind/binduser.wxml
index 388477c..57a845c 100644
--- a/pages/bind/binduser.wxml
+++ b/pages/bind/binduser.wxml
@@ -1,12 +1,9 @@
 <view class="page">
-  <view class="page__hd">
-    <view class="page__title">登陆安全生产管理工具</view>
-    <view class="page__desc">首次使用需要绑定账号</view>
-    <view class="page__desc">请输入账号密码</view>
-    <view class="page__desc">PC端请访问safeyun.ctcshe.com</view>
+  <view style="text-align:center;margin-top:12px">
+    <image src="/pages/images/logo.jpg" mode="aspectFit" style="width: 200px; height: 200px;"></image>
   </view>
   <view class="page__bd">
-    <view class="weui-cells__title">登陆</view>
+    <view class="weui-cells__title" style="text-align:center">登陆</view>
     <view class="weui-cells_desc" wx:if="{{!isExists}}" style="color:red">{{msg}}</view>
     <view class="weui-cells_desc" wx:if="{{isExists}}" style="text-align:center">
       <span style="color:orange;font-weight:bold">{{name}}</span>
@@ -30,7 +27,7 @@
   </view>
   <button class="weui-btn" type="primary" open-type="getUserInfo" bindgetuserinfo="onGetInfo">授权并绑定登陆</button>
   <view style="text-align:center;color:gray" bindtap="showPw">账号错误或忘记密码?</view>
-  <view  style="text-align:center;color:gray">获取测试账户请致电15810169371</view>
+  <!-- <view  style="text-align:center;color:gray">获取测试账户请致电15810169371</view> -->
   <!-- <button class="weui-btn"  bindtap="denglu2">测试账户登录</button> -->
 </view>
 <view class="weui-footer weui-footer_fixed-bottom">
@@ -38,5 +35,5 @@
                 <navigator url="" class="weui-footer__link">WeUI首页</navigator>
             </view> -->
     <view class="weui-footer__text" bindtap="intro">点击下载系统/小程序文档介绍</view>
-    <view class="weui-footer__text">Copyright © 2018-2020 国检集团</view>
+    <view class="weui-footer__text">Copyright © 2018-2021 中存大数据</view>
 </view>
\ No newline at end of file
diff --git a/pages/examtest/rate.js b/pages/examtest/rate.js
index 4f5d6f2..0976922 100644
--- a/pages/examtest/rate.js
+++ b/pages/examtest/rate.js
@@ -66,9 +66,9 @@ Page({
    */
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
-    // this.data.page = this.data.page + 1;
-    // this.getRatelist();
-    // wx.stopPullDownRefresh();
+    this.data.page = this.data.page + 1;
+    this.getRatelist();
+    wx.stopPullDownRefresh();
   },
 
   /**
diff --git a/pages/examtest/rate.json b/pages/examtest/rate.json
index ff1efdf..f60ef79 100644
--- a/pages/examtest/rate.json
+++ b/pages/examtest/rate.json
@@ -1,4 +1,5 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "考试排名"
+  "navigationBarTitleText": "考试排名",
+  "onReachBottomDistance": 50
 }
\ No newline at end of file
diff --git a/pages/examtest/rate.wxml b/pages/examtest/rate.wxml
index 949e92f..45580f1 100644
--- a/pages/examtest/rate.wxml
+++ b/pages/examtest/rate.wxml
@@ -1,6 +1,6 @@
 <view class="page">
 <view class="head" style="font-weight:bold;font-size:24px">{{examtestname}}</view>
-<view class="head">已有{{total}}人参与,前10名如下</view>
+<view class="head">已有{{total}}人参与</view>
   <block wx:for="{{ratelist}}" wx:key="unique">
     <view class="weui-panel__bd">
       <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
diff --git a/pages/images/logo.jpg b/pages/images/logo.jpg
new file mode 100644
index 0000000..98eed1b
Binary files /dev/null and b/pages/images/logo.jpg differ
diff --git a/pages/main/main.js b/pages/main/main.js
index 592458d..e9ebb9b 100644
--- a/pages/main/main.js
+++ b/pages/main/main.js
@@ -19,7 +19,7 @@ Page({
     sbtodonum:0,
     yhgznum:0,
     serverUrl: getApp().globalData.serverUrl,
-    isGjjt:false,
+    showAll:false,
     // Banner数据
     images: [],
     // 是否显示面板指示点
@@ -39,7 +39,7 @@ Page({
     // 后边距，可用于露出后一项的一小部分，接受 px 和 rpx 值
     nextMargin: 0,
     msgList: [
-      { title: "欢迎使用安全生产管理工具!" },{title:"每晚10-11点不定期更新,请尽量不在此时间使用"}]
+      { title: "欢迎参加安全环保专题网络考评!" },{title:"每晚10-11点不定期更新,请尽量不在此时间使用"}]
   },
 
   /**
@@ -61,7 +61,7 @@ Page({
     var that = this;
     if (getApp().globalData.userInfo.companyid == 2681) {
       this.setData({
-        isGjjt: true,
+        showAll: true,
         user__name:getApp().globalData.userInfo.name,
       })
     }
@@ -101,7 +101,7 @@ Page({
     }
       if (getApp().globalData.userInfo.companyid == 2681) {
         this.setData({
-          isGjjt: true,
+          showAll: true,
           user__name: getApp().globalData.userInfo.name,
           msgList: [
             { title: "知识竞赛火热进行中!" },]
@@ -416,7 +416,7 @@ Page({
     }
   },
   tapexercise: function () {
-    if (this.data.isGjjt) { //练习功能
+    if (this.data.showAll) { //练习功能
       wx.showModal({
         content: '本次活动该功能不便访问!',
         showCancel: false
@@ -440,6 +440,11 @@ Page({
       })
     }
   },
+  open: function(e){
+    this.setData({
+      showAll:e.detail.value
+    })
+  },
   tapinspect: function () {
     if (getApp().globalData.userInfo.perms != undefined) {
       if (getApp().globalData.userInfo.perms.indexOf(35) != -1) {//设备巡检
diff --git a/pages/main/main.wxml b/pages/main/main.wxml
index 7ac0eb8..4bc7c6d 100644
--- a/pages/main/main.wxml
+++ b/pages/main/main.wxml
@@ -17,8 +17,11 @@
 				</swiper-item>
 			</block>
 		</swiper>
-		<!-- <view class="weui-cells__title" wx:if="{{!isGjjt}}">数据采集</view> -->
-		<view class="weui-grids" wx:if="{{!isGjjt}}">
+		<view style="margin-top:4px;margin-bottom:4px;text-align:right;margin-right:4px">
+		<switch bindchange="open">打开全部功能</switch>
+		</view>
+		<!-- <view class="weui-cells__title" wx:if="{{!showAll}}">数据采集</view> -->
+		<view class="weui-grids" wx:if="{{showAll}}">
 			<navigator url="/pages/checkjob/index" class="weui-grid" hover-class="weui-grid_active">
 				<image class="weui-grid__icon" src="../images/task.png" />
 				<view class="weui-grid__label">检查任务</view>
@@ -43,7 +46,7 @@
 				<!-- <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{yhgznum!=0}}">{{yhgznum}}</view> -->
 			</navigator>
 		</view>
-		<view class="weui-grids">
+		<view class="weui-grids" wx:if="{{showAll}}">
 			<navigator url="/pages/observe/observe" class="weui-grid" hover-class="weui-grid_active">
 				<image class="weui-grid__icon" src="../images/watch.png" />
 				<view class="weui-grid__label">行为观察</view>
@@ -60,7 +63,7 @@
 				<view class="weui-grid__label">合理化建议</view>
 			</navigator>
 		</view>
-		<view class="weui-grids">
+		<view class="weui-grids" wx:if="{{showAll}}">
 			<navigator url="/pages/public/public" class="weui-grid" hover-class="weui-grid_active">
 				<image class="weui-grid__icon" src="../images/public.png" />
 				<view class="weui-grid__label">公告</view>
@@ -81,7 +84,7 @@
 			</navigator>
 
 		</view>
-    <view class="weui-grids">
+    <view class="weui-grids" wx:if="{{showAll}}">
 			<navigator url="/pages/operation/operation" class="weui-grid" hover-class="weui-grid_active">
 				<image class="weui-grid__icon" src="../images/operation.png" />
 				<view class="weui-grid__label">作业许可</view>
@@ -98,8 +101,8 @@
 			</navigator>
     </view>
 		<!-- <view class="weui-cells__title">
-			<span wx:if="{{!isGjjt}}">学习园地</span>
-			<view wx:if="{{isGjjt}}">
+			<span wx:if="{{!showAll}}">学习园地</span>
+			<view wx:if="{{showAll}}">
 				<span style="color:orange;font-weight:bold">{{user__name}}</span>
 				,进入在线考试答题吧！
 			</view>
@@ -115,7 +118,7 @@
 				<view class="weui-grid__label">在线考试</view>
 				<view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{dknum!=0}}">{{dknum}}</view>
 			</view>
-			<navigator class="weui-grid" hover-class="weui-grid_active" url="../totalrate/index" wx:if="{{isGjjt}}">
+			<navigator class="weui-grid" hover-class="weui-grid_active" url="../totalrate/index">
 				<image class="weui-grid__icon" src="../images/rate.png" />
 				<view class="weui-grid__label">实时总排名</view>
 			</navigator>
@@ -124,7 +127,7 @@
 				<view class="weui-grid__label">线下培训</view>
 				<view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{dqdnum!=0}}">{{dqdnum}}</view>
 			</navigator>
-			<view class="weui-grid" hover-class="weui-grid_active" bindtap='tapexercise' wx:if="{{!isGjjt}}">
+			<view class="weui-grid" hover-class="weui-grid_active" bindtap='tapexercise' wx:if="{{showAll}}">
 				<image class="weui-grid__icon" src="../images/exercise.png" />
 				<view class="weui-grid__label">模拟练习</view>
 			</view>
diff --git a/project.config.json b/project.config.json
index 24cf091..2004947 100644
--- a/project.config.json
+++ b/project.config.json
@@ -37,7 +37,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.9.4",
-  "appid": "wx5c39b569f01c27db",
+  "appid": "wx8cc62edbfed029b9",
   "projectname": "aqyj",
   "isGameTourist": false,
   "simulatorType": "wechat",