From 80190b66939256bc768e7d32c902c085efc70cb5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 11 Jun 2021 16:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9logo=E5=92=8C=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   |   2 +-
 app.json                 |   2 +-
 pages/bind/binduser.wxml |  13 +++++--------
 pages/examtest/rate.js   |   6 +++---
 pages/examtest/rate.json |   3 ++-
 pages/examtest/rate.wxml |   2 +-
 pages/images/logo.jpg    | Bin 0 -> 9340 bytes
 pages/main/main.js       |  15 ++++++++++-----
 pages/main/main.wxml     |  21 ++++++++++++---------
 project.config.json      |   2 +-
 10 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 pages/images/logo.jpg

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 0000000000000000000000000000000000000000..98eed1b794ad6f3ac55007863da83ee611e3f225
GIT binary patch
literal 9340
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
Rz4yQR>j4SwTRR}!@_ztReHj1%

literal 0
HcmV?d00001

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",