From 8e1553a8dcb6f04097d3b897c5899d608c23fc12 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Mon, 24 May 2021 22:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=9D=E7=AB=A0=E4=B8=BE?=
 =?UTF-8?q?=E6=8A=A5=EF=BC=8C=E5=AE=89=E5=85=A8=E6=B8=85=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  17 ++---
 app.json                         |   6 +-
 pages/bind/binduser.js           |  15 +++--
 pages/images/safelist.svg        |   1 +
 pages/index/index.wxml           |  13 ++++
 pages/inspect/add.js             |   2 +
 pages/inspect/add.wxml           |  70 +++++++++++--------
 pages/main/main.js               |  14 ++--
 pages/main/main.wxss             |   4 +-
 pages/offence/add.js             |   2 +-
 pages/offence/index.wxml         |   4 +-
 pages/safefeedback/add.js        | 107 +++++++++++++++++++++++++++++
 pages/safefeedback/add.json      |   4 ++
 pages/safefeedback/add.wxml      |  72 ++++++++++++++++++++
 pages/safefeedback/add.wxss      |   4 ++
 pages/safefeedback/index.js      | 107 +++++++++++++++++++++++++++++
 pages/safefeedback/index.json    |   5 ++
 pages/safefeedback/index.wxml    |  21 ++++++
 pages/safefeedback/index.wxss    |  14 ++++
 pages/safelist/index.js          | 111 +++++++++++++++++++++++++++++++
 pages/safelist/index.json        |   3 +
 pages/safelist/index.wxml        |  43 ++++++++++++
 pages/safelist/index.wxss        |   1 +
 pages/user/chose.js              |  66 ++++++++++++++++++
 pages/user/chose.json            |   3 +
 pages/user/chose.wxml            |   2 +
 pages/user/chose.wxss            |   1 +
 pages/user/userdetail.js         |   2 +-
 pages/userSelect/userSelect.js   |  17 +++++
 pages/userSelect/userSelect.wxml |   8 +--
 30 files changed, 677 insertions(+), 62 deletions(-)
 create mode 100644 pages/images/safelist.svg
 create mode 100644 pages/safefeedback/add.js
 create mode 100644 pages/safefeedback/add.json
 create mode 100644 pages/safefeedback/add.wxml
 create mode 100644 pages/safefeedback/add.wxss
 create mode 100644 pages/safefeedback/index.js
 create mode 100644 pages/safefeedback/index.json
 create mode 100644 pages/safefeedback/index.wxml
 create mode 100644 pages/safefeedback/index.wxss
 create mode 100644 pages/safelist/index.js
 create mode 100644 pages/safelist/index.json
 create mode 100644 pages/safelist/index.wxml
 create mode 100644 pages/safelist/index.wxss
 create mode 100644 pages/user/chose.js
 create mode 100644 pages/user/chose.json
 create mode 100644 pages/user/chose.wxml
 create mode 100644 pages/user/chose.wxss

diff --git a/app.js b/app.js
index 00ed519..4a016d6 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,7 @@
 App({
   onLaunch: function () {
     var that = this
-    that.mplogin()
+    //that.mplogin()
     setInterval(that.reflesh,10*60*1000)
   },
   mplogin: function () {
@@ -69,15 +69,16 @@ App({
                 url: '/pages/main/main',
               })
             } else {
+              wx.hideLoading()
               wx.showToast({
                 title: '未绑定账号,请手动登录',
                 icon:'none'
               })
-              wx.hideLoading()
+              
               that.globalData.userInfo.mpopenid = res.data.mpopenid
-              wx.reLaunch({
-                url: '/pages/bind/binduser?mpopenid=' + res.data.mpopenid,
-              })
+              // wx.reLaunch({
+              //   url: '/pages/bind/binduser?mpopenid=' + res.data.mpopenid,
+              // })
             }
           },
         })
@@ -93,9 +94,9 @@ App({
         'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
-        if(res.data.code!=1){
-          that.mplogin()
-        }
+        // if(res.data.code!=1){
+        //   that.mplogin()
+        // }
       }
     })
   },
diff --git a/app.json b/app.json
index a474985..b73b90a 100644
--- a/app.json
+++ b/app.json
@@ -91,7 +91,11 @@
     "pages/troublefollow/detail",
     "pages/offence/index",
     "pages/offence/add",
-    "pages/offence/detail"
+    "pages/offence/detail",
+    "pages/user/chose",
+    "pages/safelist/index",
+    "pages/safefeedback/index",
+    "pages/safefeedback/add"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/pages/bind/binduser.js b/pages/bind/binduser.js
index 94dd2a6..2c481ff 100644
--- a/pages/bind/binduser.js
+++ b/pages/bind/binduser.js
@@ -19,14 +19,18 @@ Page({
   },
   denglu: function(){
     var that=this
-     console.log(that.data)
+     var postdata = {
+       username: that.data.username,
+       password: that.data.password,
+       mpopenid: getApp().globalData.userInfo.mpopenid
+     }
     wx.request({
       url: getApp().globalData.serverUrl + 'bindmp',
       header: {
         'content-type': 'application/json', // 
       },
       method: 'POST',
-      data:that.data,
+      data: postdata,
       success: res => {
         if (res.statusCode === 200) {
           if (res.data.code == 1) {
@@ -40,7 +44,8 @@ Page({
               companyid: '',
               perms: [],
               openid:null
-            } //重置globaldata和session
+            } 
+            //重置globaldata和session
             getApp().mplogin()
             // wx.switchTab({
             //   url: '/pages/main/main',
@@ -136,9 +141,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.setData({
-      mpopenid:getApp().globalData.userInfo.mpopenid
-    })
+    getApp().mplogin()
   },
 
   /**
diff --git a/pages/images/safelist.svg b/pages/images/safelist.svg
new file mode 100644
index 0000000..e6ef12b
--- /dev/null
+++ b/pages/images/safelist.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1621750327664" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2023" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css"></style></defs><path d="M823.929824 238.554164l-304.259632-108.529809c-6.122441-3.213181-12.127202-3.213181-18.275225 0L196.995141 238.694357c-12.270465 6.288217-21.325701 19.167548-21.325701 31.894408l0 220.247216c0 44.61001 9.197476 89.349981 24.39869 127.672798 42.653449 111.727641 137.00842 169.207773 225.222531 226.685859 24.397666 12.868075 48.65514 28.809139 69.981864 44.751227 6.122441 3.222391 12.129248 6.438643 18.275225 6.438643 6.122441 0 12.107759-3.216251 15.180747-6.438643 24.373107-16.108886 45.581128-28.810163 69.958328-44.751227 88.2356-57.478086 182.592618-114.959242 225.242997-226.685859 15.344476-38.321794 24.39869-79.70839 24.39869-127.672798L848.328513 270.426059C848.328513 257.697153 839.131037 244.982574 823.929824 238.554164zM803.521005 489.732857c0 41.020252-6.522554 78.768995-19.424398 112.892163-38.85289 95.659687-123.07713 150.299121-213.679637 208.528314-19.423375 13.628392-38.84982 23.965831-58.274218 37.582967-19.425422-13.617136-38.84982-23.953551-58.275241-37.582967-90.607624-54.617945-174.830841-109.431342-213.704197-208.528314-12.902868-34.286897-19.425422-71.871911-19.425422-112.892163L220.737892 277.756001l291.40486-102.382808 291.379277 102.382808L803.522028 489.732857zM265.547447 492.619604c0 35.119869 5.513574 67.297732 16.445554 96.65741 32.869618 84.845387 104.140849 131.767046 180.808996 178.535209 16.447601 11.67183 32.870642 20.514219 49.315172 32.17684L512.117169 223.456305l-246.570745 87.660502L265.546424 492.619604z" p-id="2024" fill="#13227a"></path></svg>
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8ded766..a2da864 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -19,6 +19,19 @@
   <view class="weui-panel">
     <view class="weui-panel__hd">资料管理</view>
     <view class="weui-panel__bd">
+      <view class="weui-media-box weui-media-box_small-appmsg">
+        <view class="weui-cells weui-cells_in-small-appmsg">
+          <navigator url="../safelist/index" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+            <view class="weui-cell__hd">
+              <image src="../images/safelist.svg" style="width: 20px;height: 20px;margin-right: 5px" />
+            </view>
+            <view class="weui-cell__bd weui-cell_primary">
+              <view>我的安全清单</view>
+            </view>
+            <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+          </navigator>
+        </view>
+      </view>
       <view class="weui-media-box weui-media-box_small-appmsg">
         <view class="weui-cells weui-cells_in-small-appmsg">
           <navigator url="../socert/socert" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
diff --git a/pages/inspect/add.js b/pages/inspect/add.js
index 6bc59b2..ac6a32e 100644
--- a/pages/inspect/add.js
+++ b/pages/inspect/add.js
@@ -14,6 +14,8 @@ Page({
     selected:false,
             selected1:true,
     csry:"",
+    todouser:"",
+    todouser_name:"请选择",
     isok:true
             },
         selected:function(e){
diff --git a/pages/inspect/add.wxml b/pages/inspect/add.wxml
index 8455af7..a4c28fa 100644
--- a/pages/inspect/add.wxml
+++ b/pages/inspect/add.wxml
@@ -4,7 +4,8 @@
     <view class="weui-cell__bd">设备编号</view>
     <view class="weui-cell__ft">{{equipment.num}}</view>
   </view>
-  <navigator url="/pages/equipment/detail?id={{equipment.id}}" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+  <navigator url="/pages/equipment/detail?id={{equipment.id}}" class="weui-cell weui-cell_access"
+    hover-class="weui-cell_active">
     <view class="weui-cell__bd">设备名称</view>
     <view class="weui-cell__ft weui-cell__ft_in-access" style="color:green">{{equipment.name}}</view>
   </navigator>
@@ -34,16 +35,16 @@
 <view class="{{selected1?'show':'hidden'}}">
 
   <view class="weui-cells weui-cells_after-title">
-      <view class="weui-cell weui-cell_select">
-        <view class="weui-cell__hd weui-cell__hd_in-select-after">
-          <view class="weui-label">巡检类型</view>
-        </view>
-        <view class="weui-cell__bd">
-          <picker bindchange="bindjclxChange" value="{{jclxIndex}}" range="{{jclxArray}}" range-key="text">
-            <view class="weui-select">{{jclxArray[jclxIndex].text}}</view>
-          </picker>
-        </view>
+    <view class="weui-cell weui-cell_select">
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view class="weui-label">巡检类型</view>
       </view>
+      <view class="weui-cell__bd">
+        <picker bindchange="bindjclxChange" value="{{jclxIndex}}" range="{{jclxArray}}" range-key="text">
+          <view class="weui-select">{{jclxArray[jclxIndex].text}}</view>
+        </picker>
+      </view>
+    </view>
     <block wx:for="{{itemscheck}}" wx:key="unique">
       <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
         <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
@@ -54,7 +55,8 @@
         </view>
         <view class="weui-panel__ft">
           <radio-group class="radio-group" bindchange="radioChange2" data-index='{{index}}'>
-            <radio class="radio" wx:for-items="{{items}}" wx:key="name" value="{{item.name}}" checked="{{item.checked}}">
+            <radio class="radio" wx:for-items="{{items}}" wx:key="name" value="{{item.name}}"
+              checked="{{item.checked}}">
               <text>{{item.value}}</text>
             </radio>
           </radio-group>
@@ -62,33 +64,45 @@
       </view>
       <view wx:if="{{item.state=='异常待处理'}}" class="weui-flex" style="height:120px">
         <view class="weui-flex__item" style="padding:4px">
-          <image src="{{item.img}}" data-src="{{item.img}}" data-index='{{index}}' style="width:100px;height:100px" wx:if="{{item.img}}" bindtap="previewImage" bindlongpress="deleteImage"></image>
+          <image src="{{item.img}}" data-src="{{item.img}}" data-index='{{index}}' style="width:100px;height:100px"
+            wx:if="{{item.img}}" bindtap="previewImage" bindlongpress="deleteImage"></image>
           <view class="weui-uploader__input-box" wx:else>
-                <view class="weui-uploader__input" bindtap="chooseImage" data-index='{{index}}' ></view>
-              </view>
+            <view class="weui-uploader__input" bindtap="chooseImage" data-index='{{index}}'></view>
+          </view>
         </view>
         <view class="weui-flex__item">
-          <textarea placeholder="请描述异常情况" style="height:100px" maxlength="-1" bindinput="descChange" data-index='{{index}}'></textarea>
+          <textarea placeholder="请描述异常情况" style="height:100px" maxlength="-1" bindinput="descChange"
+            data-index='{{index}}'></textarea>
         </view>
       </view>
     </block>
     <view class="weui-cell weui-cell_select" wx:if="{{!isok}}">
-        <view class="weui-cell__hd weui-cell__hd_in-select-after">
-          <view class="weui-label">抄送给</view>
-        </view>
-        <view class="weui-cell__bd">
-          <navigator url="/pages/userSelect/userSelect">
-            <view class="weui-select">请选择</view>
-          </navigator>
-        </view>
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view class="weui-label">提交给</view>
       </view>
-      <view class="weui-cell weui-cell_access" style="height: 5.3em" wx:if="{{!isok}}">
-        {{csryname}}
+      <view class="weui-cell__bd">
+        <navigator url="/pages/userSelect/userSelect?type=radio">
+          <view class="weui-select">{{todouser_name}}</view>
+        </navigator>
       </view>
+    </view>
+    <view class="weui-cell weui-cell_select" wx:if="{{!isok}}">
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view class="weui-label">抄送给</view>
+      </view>
+      <view class="weui-cell__bd">
+        <navigator url="/pages/userSelect/userSelect">
+          <view class="weui-select">请选择</view>
+        </navigator>
+      </view>
+    </view>
+    <view class="weui-cell weui-cell_access" style="height: 5.3em" wx:if="{{!isok}}">
+      {{csryname}}
+    </view>
+  </view>
+  <view class="btn-area ">
+    <button class="weui-btn" type="primary" bindtap="submit3">提交</button>
   </view>
-<view class="btn-area ">
-  <button class="weui-btn" type="primary" bindtap="submit3" >提交</button>
-</view>
 </view>
 
 <!-- <view class="weui-cells__title ">巡检记录</view>
diff --git a/pages/main/main.js b/pages/main/main.js
index 521683f..8f1751c 100644
--- a/pages/main/main.js
+++ b/pages/main/main.js
@@ -46,11 +46,11 @@ Page({
    */
   onLoad: function (options) {
     var that = this
+    var ts = new Date().getTime()
     let images = [
-      that.data.serverUrl + 'media/banner/1.jpg',
-      that.data.serverUrl + 'media/banner/2.jpg',
-      that.data.serverUrl + 'media/banner/3.jpg',
-      that.data.serverUrl + 'media/banner/4.jpg',
+      that.data.serverUrl + 'media/banner/1.jpg?'+ts,
+      that.data.serverUrl + 'media/banner/2.jpg?'+ts,
+      that.data.serverUrl + 'media/banner/3.jpg?'+ts,
     ]
     that.setData({
       images: images
@@ -96,12 +96,6 @@ Page({
   onShow: function () {
     var that = this
     that.getNew()
-    // if ((getApp().globalData.sessionId != null) && (getApp().globalData.sessionId.indexOf('sessionid') != -1)) {
-    //     that.getNew()
-    //   }
-    //   else {
-    //     getApp().mplogin()
-    //   }
       if (getApp().globalData.userInfo.companyid == 2681) {
         this.setData({
           isGjjt: true,
diff --git a/pages/main/main.wxss b/pages/main/main.wxss
index 294975c..c6c9a1c 100644
--- a/pages/main/main.wxss
+++ b/pages/main/main.wxss
@@ -26,10 +26,10 @@ text-overflow: ellipsis;
 white-space: nowrap;
 }
 .weui-grids {
-  border-top:none;
+  /* border-top:none; */
 }
 .weui-grid {
   width: 25%;
-  border-right:none;
+  /* border-right:none; */
   border-bottom:none;
 }
\ No newline at end of file
diff --git a/pages/offence/add.js b/pages/offence/add.js
index c764d3f..064bc13 100644
--- a/pages/offence/add.js
+++ b/pages/offence/add.js
@@ -8,7 +8,7 @@ Page({
   data: {
     offencetype:'公司员工',
     offencetime: '',
-    offenceqy:'',
+    offenceqy:0,
     offenceplace: '',
     offenceimg: [],
     offencepost:"",
diff --git a/pages/offence/index.wxml b/pages/offence/index.wxml
index 92fc555..0bd0b85 100644
--- a/pages/offence/index.wxml
+++ b/pages/offence/index.wxml
@@ -6,7 +6,9 @@
       <navigator url="detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
         <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
           <view class="weui-media-box__title">{{tools.sub(item.description)}}</view>
-          <view class="weui-media-box__desc">{{item.type}} {{item.dept}} {{item.post}} {{item.area__name}}</view>
+          <view class="weui-media-box__desc">{{item.type}} {{item.dept}} {{item.post}} 
+          <text wx:if="{{item.area__name}}">{{item.area__name}}  </text>
+          <text wx:if="{{item.place}}">{{item.place}}</text></view>
           <view class="weui-media-box__desc">提交时间:{{item.createtime}}</view>
         </view>
         <view class="weui-panel__ft weui-cell__ft_in-access">
diff --git a/pages/safefeedback/add.js b/pages/safefeedback/add.js
new file mode 100644
index 0000000..a764337
--- /dev/null
+++ b/pages/safefeedback/add.js
@@ -0,0 +1,107 @@
+// pages/safefeedback/add.js
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    form:{
+      content: "",
+      isdone:1
+    },
+    typeIndex:1,
+    typeArray:['未完成', '已完成']
+  },
+  bindcontentInput: function (e) {
+    this.data.form.content = e.detail.value
+  },
+  bindtypeChange: function (e) {
+    this.setData({
+      typeIndex: e.detail.value,  
+    })
+    this.data.form.isdone = thhs.data.typeIndex
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var pages = getCurrentPages()
+    var prePage = pages[pages.length-3]
+    var item = prePage.data.selectedItem;
+    this.setData({
+      item:item
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  Tap1: function (x) {
+    wx.showModal({
+      title: "系统提示",
+      content: x,
+      showCancel: false,
+      confirmText: "确定"
+    })
+  },
+  submit: function(){
+    var that = this
+    if (that.data.form.content == '') {
+      that.Tap1('请输入反馈描述！')
+      return
+    }
+    that.data.form.safeitem = that.data.item.id
+    api.request('api/safefeedback/?a=add', 'POST', that.data.form).then(res => {
+      wx.navigateBack({
+        delta: 0,
+      })
+    }
+    )
+  }
+})
\ No newline at end of file
diff --git a/pages/safefeedback/add.json b/pages/safefeedback/add.json
new file mode 100644
index 0000000..3337be1
--- /dev/null
+++ b/pages/safefeedback/add.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "新增反馈"
+}
\ No newline at end of file
diff --git a/pages/safefeedback/add.wxml b/pages/safefeedback/add.wxml
new file mode 100644
index 0000000..b0648d4
--- /dev/null
+++ b/pages/safefeedback/add.wxml
@@ -0,0 +1,72 @@
+<!--pages/safefeedback/add.wxml-->
+<view class="page">
+  <view class="page__bd">
+    <view class="weui-toptips weui-toptips_warn" wx:if="{{showTopTips}}">错误提示</view>
+
+
+    <view class="weui-cells__title">清单条目信息</view>
+    <view class="weui-cells weui-cells_after-title">
+      <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>条目类型</view>
+    </view>
+    <view class="weui-cell__ft">
+      <text wx:if="{{item.type==1}}" style="color:blue">责任清单</text>
+      <text wx:if="{{item.type==2}}" style="color:red">履职清单</text>
+    </view>
+  </view>
+      <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>条目内容</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{item.name}}
+    </view>
+  </view>
+    </view>
+    <view class="weui-cells__title">反馈描述</view>
+    <view class="weui-cells weui-cells_after-title">
+      <view class="weui-cell weui-cell_select">
+        <view class="weui-cell__hd weui-cell__hd_in-select-after">
+          <view class="weui-label">完成情况</view>
+        </view>
+        <view class="weui-cell__bd">
+          <picker bindchange="bindtypeChange" value="{{typeIndex}}" range="{{typeArray}}">
+            <view class="weui-select">{{typeArray[typeIndex]}}</view>
+          </picker>
+        </view>
+      </view>
+      <view class="weui-cell">
+        <view class="weui-cell__bd">
+          <textarea  class="weui-textarea" placeholder="请输入反馈描述" style="height: 4.6em" bindinput="bindcontentInput" maxlength="-1" />
+        </view>
+      </view>
+    </view>
+    <!-- <view class="weui-cells__title">现场图片(如有)</view>
+    <view class="weui-cells weui-cells_after-title">
+      <view class="weui-cell">
+        <view class="weui-cell__bd weui-cell_primary">
+          <view class="weui-uploader">
+            <view class="weui-uploader__bd">
+              <view class="weui-uploader__files">
+                <block wx:for="{{offenceimg}}" wx:for-item="image" wx:key="unique">
+                  <view class="weui-uploader__file">
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
+                  </view>
+                </block>
+              </view>
+              <view class="weui-uploader__input-box">
+                <view class="weui-uploader__input" bindtap="chooseImage"></view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view> -->
+
+    <view class="btn-area">
+      <button class="weui-btn" type="primary" bindtap="submit">提交</button>
+    </view>
+  </view>
+</view>
+
diff --git a/pages/safefeedback/add.wxss b/pages/safefeedback/add.wxss
new file mode 100644
index 0000000..48edeaa
--- /dev/null
+++ b/pages/safefeedback/add.wxss
@@ -0,0 +1,4 @@
+/* pages/safefeedback/add.wxss */
+.btn-area{
+  margin:5px
+}
\ No newline at end of file
diff --git a/pages/safefeedback/index.js b/pages/safefeedback/index.js
new file mode 100644
index 0000000..b29e0db
--- /dev/null
+++ b/pages/safefeedback/index.js
@@ -0,0 +1,107 @@
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page:1,
+    serverUrl: getApp().globalData.serverUrl,
+    feedbacklist:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.data.itemid = options.item
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var that = this;
+    that.onPullDownRefresh();
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+ 
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onPullDownRefresh: function () {
+    var that = this;
+    that.getfeedbacklist(1);
+    wx.stopPullDownRefresh();
+    this.data.page = 1;
+  },
+  onReachBottom: function () {
+    //上拉分页,将页码加1，然后调用分页函数
+    this.data.page = this.data.page + 1;
+    this.getfeedbacklist();
+
+  },
+  getfeedbacklist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.page }
+    api.request('api/safefeedback/?a=listall', 'GET', {safeitem: this.data.itemid}).then(res => {
+      if (res.rows.length == 0) {
+        if (page == 1) {
+          this.setData({
+            total: 0,
+            feedbacklist: []
+          })
+        }
+        else {
+          wx.showModal({
+            content: "已经到底啦!",
+            showCancel: false,
+            confirmText: "确定",
+          })
+        }
+      } else {
+        let list
+        if (page == 1) {
+          list = res.rows
+        } else {
+          list = this.data.feedbacklist.concat(res.rows)
+        }
+        this.setData({
+          total: res.total,
+          feedbacklist: list
+        })
+      } 
+     })
+  },
+})
\ No newline at end of file
diff --git a/pages/safefeedback/index.json b/pages/safefeedback/index.json
new file mode 100644
index 0000000..b579c78
--- /dev/null
+++ b/pages/safefeedback/index.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "安全清单反馈记录",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/pages/safefeedback/index.wxml b/pages/safefeedback/index.wxml
new file mode 100644
index 0000000..3d7dbd4
--- /dev/null
+++ b/pages/safefeedback/index.wxml
@@ -0,0 +1,21 @@
+<!--pages/safefeedback/index.wxml-->
+<wxs src="../../wxs/subutil.wxs" module="tools" />
+
+  <view class="head">该项目有{{total}}条反馈</view>
+  <view class="weui-cells weui-cells_after-title">
+    <block wx:for="{{feedbacklist}}" wx:key="unique">
+      <view url="detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg">
+        <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+          <view class="weui-media-box__title">{{tools.sub(item.content)}}</view>
+          <view class="weui-media-box__desc">{{item.content}}</view>
+          <view class="weui-media-box__desc">提交时间:{{item.createtime}}</view>
+        </view>
+      </view>
+    </block>
+  </view>
+
+<view style="position:fixed; bottom:0;width:100%;">
+  <navigator url="/pages/safefeedback/add" hover-class="navigator-hover">
+    <button class="weui-btn" type="primary">新增反馈</button>
+  </navigator>
+</view>
diff --git a/pages/safefeedback/index.wxss b/pages/safefeedback/index.wxss
new file mode 100644
index 0000000..0783216
--- /dev/null
+++ b/pages/safefeedback/index.wxss
@@ -0,0 +1,14 @@
+/* pages/safefeedback/index.wxss */
+.weui-btn{
+  width:auto;
+  margin: 5px;
+}
+.container {
+  background-color: #fff;  
+  color: #939393; 
+}
+.head{
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/pages/safelist/index.js b/pages/safelist/index.js
new file mode 100644
index 0000000..96d6896
--- /dev/null
+++ b/pages/safelist/index.js
@@ -0,0 +1,111 @@
+// pages/safelist/index.js
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var url = 'api/safelist/?a=my'
+    if(options.id){
+      url = 'api/safelist/?a=detail&id='+options.id
+    }
+    api.request(url, 'GET').then(res => {
+      if(res.code==1){
+        this.setData(res)
+      }else{
+        wx.showToast({
+          title: res.msg,
+          icon:"none"
+        })
+      }
+      
+    }).catch(res=>{
+    })
+
+  },
+  gofeedback: function (e){
+    var item = e.currentTarget.dataset.item;
+    this.data.selectedItem = item;
+    wx.navigateTo({
+      url: '/pages/safefeedback/index?item='+item.id,
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  scan: function () {
+    wx.scanCode({
+      onlyFromCamera: true,
+      success(res) {
+        if (res.result.indexOf("safelist") != -1) {
+          let id = res.result.split('=')[1]
+          wx.redirectTo({
+            url: 'index?id=' + id,
+          })
+        } else {
+          wx.showModal({
+            title: "系统提示",
+            content: '请扫清单二维码!',
+            showCancel: false,
+            confirmText: "确定"
+          })
+        }
+
+      }
+    })
+  },
+})
\ No newline at end of file
diff --git a/pages/safelist/index.json b/pages/safelist/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/safelist/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/safelist/index.wxml b/pages/safelist/index.wxml
new file mode 100644
index 0000000..96e06c9
--- /dev/null
+++ b/pages/safelist/index.wxml
@@ -0,0 +1,43 @@
+<!--pages/safelist/index.wxml-->
+<wxs src="../../wxs/subutil.wxs" module="tools" />
+<view>
+<view class="page__bd">
+<view class="weui-panel weui-panel_access">
+    <view class="weui-panel__bd">
+        <view class="weui-media-box weui-media-box_text">
+          <view class="weui-media-box__title">
+          {{name}}
+          </view>
+          <view class="weui-media-box__desc">
+            责任人:<text style="color:darkblue">{{user__name}}</text>
+          </view>
+          <view class="weui-media-box__desc">
+            创建日期:{{createtime}}--修改日期:{{updatetime}}
+          </view>
+        </view>
+    </view>
+</view>
+<button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="scan">扫一扫清单二维码</button>
+<view class="weui-panel">
+			<view class="weui-panel__hd">清单项目</view>
+			<view class="weui-panel__bd" >
+				<view class="weui-media-box weui-media-box_text" wx:for="{{items}}" wx:key="unique">
+					<h4 class="weui-media-box__title">{{tools.sub(item.name)}}</h4>
+					<view class="weui-media-box__desc">{{item.name}}</view>
+					<view class="weui-media-box__info">
+						<view class="weui-media-box__info__meta">
+              <text wx:if="{{item.type==1}}" style="color:blue">责任清单</text>
+              <text wx:if="{{item.type==2}}" style="color:red">履职清单</text>
+            </view>
+						<view class="weui-media-box__info__meta">
+            </view>
+						<!-- <view class="weui-media-box__info__meta weui-media-box__info__meta_extra">其它信息</view> -->
+          </view>
+          <view style="text-align:right">
+            <button type="primary" size="mini" wx:if="{{item.type==2}}" bindtap="gofeedback" data-item="{{item}}">反馈记录</button>
+          </view>
+				</view>
+			</view>
+		</view>
+</view>
+</view>
diff --git a/pages/safelist/index.wxss b/pages/safelist/index.wxss
new file mode 100644
index 0000000..fa79274
--- /dev/null
+++ b/pages/safelist/index.wxss
@@ -0,0 +1 @@
+/* pages/safelist/index.wxss */
\ No newline at end of file
diff --git a/pages/user/chose.js b/pages/user/chose.js
new file mode 100644
index 0000000..49b1f88
--- /dev/null
+++ b/pages/user/chose.js
@@ -0,0 +1,66 @@
+// pages/user/chose.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/user/chose.json b/pages/user/chose.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/user/chose.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/user/chose.wxml b/pages/user/chose.wxml
new file mode 100644
index 0000000..7d7fa3f
--- /dev/null
+++ b/pages/user/chose.wxml
@@ -0,0 +1,2 @@
+<!--pages/user/chose.wxml-->
+<text>pages/user/chose.wxml</text>
diff --git a/pages/user/chose.wxss b/pages/user/chose.wxss
new file mode 100644
index 0000000..327e921
--- /dev/null
+++ b/pages/user/chose.wxss
@@ -0,0 +1 @@
+/* pages/user/chose.wxss */
\ No newline at end of file
diff --git a/pages/user/userdetail.js b/pages/user/userdetail.js
index 38ba02e..15f354c 100644
--- a/pages/user/userdetail.js
+++ b/pages/user/userdetail.js
@@ -129,7 +129,7 @@ Page({
               if (res.statusCode === 200) {
                 
                 if (res.data.code == 1) {
-                  
+                  getApp().globalData.sessionId = null;
                   wx.showToast({})
                   wx.reLaunch({
                     url: '../bind/binduser',
diff --git a/pages/userSelect/userSelect.js b/pages/userSelect/userSelect.js
index 212bed7..7abb46c 100644
--- a/pages/userSelect/userSelect.js
+++ b/pages/userSelect/userSelect.js
@@ -11,9 +11,16 @@ Page({
     selectList: [],  //已选择的元素列表
     originalList: [], //最原始的数据列表
     indexList: [],  //存储目录层级的数组，用于准确的返回上一层
+    type:'multiple'
   },
 
   onLoad: function (options) {
+    console.log(options)
+    if(options.type){
+      this.setData({
+        type:options.type
+      })
+    }
     wx.setNavigationBarTitle({
       title: '选择人员'
     })
@@ -79,6 +86,16 @@ Page({
 
       this.setLastTimeSelectList();
       
+    }else{
+      if(this.data.type=='radio'){
+        var pages = getCurrentPages();
+        var prevPage = pages[pages.length - 2];
+        prevPage.setData({
+          todouser: item.id,
+          todouser_name:item.name
+        })
+        wx.navigateBack()
+      }
     }
   },
 
diff --git a/pages/userSelect/userSelect.wxml b/pages/userSelect/userSelect.wxml
index f4340e3..6e99198 100644
--- a/pages/userSelect/userSelect.wxml
+++ b/pages/userSelect/userSelect.wxml
@@ -5,9 +5,9 @@
   <view class='people-wrapper'>
     <scroll-view scroll-y class='scrollview'>
       <checkbox-group bindchange="checkChange">
-        <view class='item' wx:for='{{currentList}}' wx:key='index'>
-          <checkbox checked='{{item.checked}}' value='{{item.id + "," + item.name}}' wx:if='{{item.isPeople}}'> </checkbox>
-          <view id='{{index}}' class='item-content' bindtap='clickItem'>
+        <view class='item' wx:for='{{currentList}}' wx:key="index">
+          <checkbox checked='{{item.checked}}' value='{{item.id + "," + item.name}}' wx:if="{{item.isPeople && type == 'multiple'}}"> </checkbox>
+          <view id='{{index}}' class='item-content' bindtap='clickItem' >
             <image class='img' wx:if='{{!item.isPeople}}' src='../images/part.png'></image>
             <image class='avatar' wx:if='{{item.isPeople}}' src='../images/man.png'></image>
             <text class='itemtext'>{{item.name}}</text> </view>
@@ -16,7 +16,7 @@
       <view class='no-data' wx:if='{{currentList.length===0}}'>暂无数据</view>
     </scroll-view>
   </view>
-  <view class='footer'>
+  <view class='footer' wx:if="{{type=='multiple'}}">
     <footer list='{{selectList}}' binddelete='footerDelete' bindsubmit="submitData" /> 
   </view>
 </view>
\ No newline at end of file