Merge branch 'master' of http://git.dgtis.com/qxp/dorm-manager

.idea/workspace.xml

@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="f5deea9c-9428-4e1b-a432-6064341c1bb8" name="Default Changelist" comment="更新代码10-28">
+    <list default="true" id="f5deea9c-9428-4e1b-a432-6064341c1bb8" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/utils/api.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/utils/api.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/student/menu/menu.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/student/menu/menu.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposal/proposal.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposal/proposal.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposalDetails/proposalDetails.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposalDetails/proposalDetails.wxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxss" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/user/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/user/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dorm-manager-wx/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/project.config.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/dorm-manager-db/target/" />
@@ -17,54 +24,12 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DefaultGradleProjectSettings">
-    <option name="testRunner" value="GRADLE" />
-    <option name="delegatedBuild" value="true" />
+    <option name="isMigrated" value="true" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application-prod.properties">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="19">
-              <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/java/com/dgtis/dorm/manager/wx/web/HomeController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="133">
-              <caret line="19" selection-start-line="19" selection-end-line="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/java/com/dgtis/dorm/manager/wx/WxApplication.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/resources/application-prod.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="266">
-              <caret line="14" column="39" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application-dev.properties">
+        <entry file="file://$PROJECT_DIR$/dorm-manager-wx/utils/api.js">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
@@ -103,7 +68,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -114,81 +79,19 @@
             <path>
               <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
               <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wx" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wx" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="target" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
-              <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="target" type="462c0819:PsiDirectoryNode" />
-              <item name="classes" type="462c0819:PsiDirectoryNode" />
+              <item name="dorm-manager-wx" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
               <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
-              <item name="dorm-manager-wx-api" type="462c0819:PsiDirectoryNode" />
-              <item name="target" type="462c0819:PsiDirectoryNode" />
-              <item name="generated-sources" type="462c0819:PsiDirectoryNode" />
+              <item name="dorm-manager-wx" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -255,6 +158,17 @@
       <workItem from="1572427502853" duration="582000" />
       <workItem from="1572428159348" duration="152000" />
       <workItem from="1572431440878" duration="1274000" />
+      <workItem from="1573784433629" duration="794000" />
+      <workItem from="1574046903312" duration="1302000" />
+      <workItem from="1574129825155" duration="325000" />
+      <workItem from="1574132620821" duration="2113000" />
+      <workItem from="1574213723306" duration="645000" />
+      <workItem from="1574304363285" duration="1327000" />
+      <workItem from="1574746479519" duration="2859000" />
+      <workItem from="1574763686937" duration="130000" />
+      <workItem from="1574839358293" duration="1295000" />
+      <workItem from="1574932561099" duration="1219000" />
+      <workItem from="1575257478262" duration="239000" />
     </task>
     <task id="LOCAL-00001" summary="更新代码10-28">
       <created>1572234111796</created>
@@ -263,16 +177,74 @@
       <option name="project" value="LOCAL" />
       <updated>1572234111796</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="整合学生端和教师端">
+      <created>1573610772721</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1573610772721</updated>
+    </task>
+    <task id="LOCAL-00003" summary="整合学生端和教师端">
+      <created>1574130146440</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1574130146440</updated>
+    </task>
+    <task id="LOCAL-00004" summary="整合学生端和教师端">
+      <created>1574304484248</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1574304484248</updated>
+    </task>
+    <task id="LOCAL-00005" summary="整合学生端和教师端">
+      <created>1574746807429</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1574746807429</updated>
+    </task>
+    <task id="LOCAL-00006" summary="整合学生端和教师端">
+      <created>1574751757409</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1574751757409</updated>
+    </task>
+    <task id="LOCAL-00007" summary="整合学生端和教师端">
+      <created>1574754443410</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1574754443410</updated>
+    </task>
+    <task id="LOCAL-00008" summary="整合学生端和教师端">
+      <created>1574763820456</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1574763820456</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10817000" />
+    <option name="totallyTimeSpent" value="23921000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28668684" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22087745" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -287,15 +259,15 @@
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49924356" weight="0.3295082" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.3295082" />
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.3295082" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.3295082" />
       <window_info anchor="bottom" id="Database Changes" order="12" />
-      <window_info anchor="bottom" id="Version Control" order="13" weight="0.31311476" />
-      <window_info active="true" anchor="bottom" id="JRebel Console" order="14" side_tool="true" visible="true" weight="0.3295082" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="13" sideWeight="0.49092284" visible="true" weight="0.42786884" />
+      <window_info anchor="bottom" id="JRebel Console" order="14" sideWeight="0.50907713" side_tool="true" visible="true" weight="0.42786884" />
       <window_info anchor="bottom" id="JRebel Executor" order="15" />
       <window_info anchor="bottom" id="Messages" order="16" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -356,7 +328,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="更新代码10-28" />
-    <option name="LAST_COMMIT_MESSAGE" value="更新代码10-28" />
+    <MESSAGE value="整合学生端和教师端" />
+    <option name="LAST_COMMIT_MESSAGE" value="整合学生端和教师端" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/resources/application-dev.properties">
@@ -379,16 +352,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application-prod.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application-prod.properties" />
+    <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application.properties" />
     <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/resources/application-prod.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
@@ -396,9 +361,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application-dev.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/target/classes/application-dev.properties" />
     <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/java/com/dgtis/dorm/manager/wx/web/HomeController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="133">
@@ -413,5 +376,15 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/dorm-manager-wx/pages/student/pass/pass.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="18" column="15" lean-forward="true" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dorm-manager-wx/utils/api.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
   </component>
 </project>

dorm-manager-wx/pages/student/menu/menu.js

@@ -43,6 +43,7 @@ Page({
         'title': '投诉建议',
         nav: 'tousu',
         url: 'proposal',
+        Url:'proposal',
         status: true
       },
       {

dorm-manager-wx/pages/student/proposal/proposal.js

@@ -27,7 +27,7 @@ Page({
     })
     wx.request({
       url: api.submitPropose,
-      data: { loginId: wx.getStorageSync('loginId'), title: e.detail.value.title, message: e.detail.value.text, messageTag: e.detail.value.messageTag},
+      data: { loginId: wx.getStorageSync('loginId'), title: e.detail.value.title, message: e.detail.value.text, messageTag: that.data.array[e.detail.value.messageTag]},
       success(res){
         wx.hideLoading()
         if(res.data.errno==0){

dorm-manager-wx/pages/student/proposalDetails/proposalDetails.wxml

@@ -6,7 +6,7 @@
       <view class="picker">
         <picker name='messageTag' disabled bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
             <view class="weui-input">
-              <view>{{array[data.messageTag?data.messageTag:0]}}</view>
+              <view>{{data.messageTag}}</view>
               <!-- <image src='/images/jiantou-bottom.png'></image> -->
             </view>
           </picker>

dorm-manager-wx/pages/test/test.js

@@ -1,99 +1,119 @@
-// pages/test/test.js
-Page({
+// pages/mine/mine.js
+var content = null;
+var touchs = [];
+var canvasw = 0;
+var canvash = 0;
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-  saoma:function(e){
-    wx.scanCode({
-      onlyFromCamera:true,
-      success(res){
-        console.log(res)
-      }
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    
-  },
-  start:function(){
-    let that=this
-    var plugin = requirePlugin("WechatSI")
-    let manager = plugin.getRecordRecognitionManager()
-    manager.onRecognize = function (res) {
-      console.log("current result", res.result)
-      that.setData({
-        text: res.result
-      })
-    }
-    manager.onStop = function (res) {
-      console.log("record file path", res.tempFilePath)
-      console.log("result", res.result)
-    }
-    manager.onStart = function (res) {
-      console.log("成功开始录音识别", res)
-    }
-    manager.onError = function (res) {
-      console.error("error msg", res.msg)
-    }
-    manager.start({ duration: 30000, lang: "zh_CN" })
-  },
-  stop:function(){
-    var plugin = requirePlugin("WechatSI")
-    let manager = plugin.getRecordRecognitionManager()
-    manager.stop()
+//获取系统信息
+wx.getSystemInfo({
+  success: function (res) {
+    canvasw = res.windowWidth;
+    canvash = canvasw * 9 / 16;
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+}),
 
-  },
+  Page({
+    /**
+    * 页面的初始数据
+    */
+    data: {
+      signImage: '',
+    },
+    // 画布的触摸移动开始手势响应
+    start: function (event) {
+      // console.log("触摸开始" + event.changedTouches[0].x)
+      // console.log("触摸开始" + event.changedTouches[0].y)
+      //获取触摸开始的 x,y
+      let point = { x: event.changedTouches[0].x, y: event.changedTouches[0].y }
+      touchs.push(point)
+    },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+    // 画布的触摸移动手势响应
+    move: function (e) {
+      let point = { x: e.touches[0].x, y: e.touches[0].y }
+      touchs.push(point)
+      if (touchs.length >= 2) {
+        this.draw(touchs)
+      }
+    },
 
-  },
+    // 画布的触摸移动结束手势响应
+    end: function (e) {
+      console.log("触摸结束" + e)
+      //清空轨迹数组
+      for (let i = 0; i < touchs.length; i++) {
+        touchs.pop()
+      }
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    },
 
-  },
+    // 画布的触摸取消响应
+    cancel: function (e) {
+      console.log("触摸取消" + e)
+    },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    // 画布的长按手势响应
+    tap: function (e) {
+      console.log("长按手势" + e)
+    },
 
-  },
+    error: function (e) {
+      console.log("画布触摸错误" + e)
+    },
+    /**
+    * 生命周期函数--监听页面加载
+    */
+    onLoad: function (options) {
+      //获得Canvas的上下文
+      content = wx.createCanvasContext('firstCanvas')
+      //设置线的颜色
+      content.setStrokeStyle("#00ff00")
+      //设置线的宽度
+      content.setLineWidth(5)
+      //设置线两端端点样式更加圆润
+      content.setLineCap('round')
+      //设置两条线连接处更加圆润
+      content.setLineJoin('round')
+    },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    /**
+    * 生命周期函数--监听页面初次渲染完成
+    */
+    onReady: function () {
+    },
 
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    //绘制
+    draw: function (touchs) {
+      let point1 = touchs[0]
+      let point2 = touchs[1]
+      touchs.shift()
+      content.moveTo(point1.x, point1.y)
+      content.lineTo(point2.x, point2.y)
+      content.stroke()
+      content.draw(true)
+    },
+    //清除操作
+    clearClick: function () {
+      //清除画布
+      content.clearRect(0, 0, canvasw, canvash)
+      content.draw(true)
+    },
+    //保存图片
+    saveClick: function () {
+      var that = this
+      wx.canvasToTempFilePath({
+        canvasId: 'firstCanvas',
 
-  },
+        success: function (res) {
+          //打印图片路径
+          console.log(res.tempFilePath)
+          //设置保存的图片
+          that.setData({
+            signImage: res.tempFilePath
+          })
+        }
+      })
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    }
 
-  }
-})
+  })

dorm-manager-wx/pages/test/test.wxml

@@ -1,7 +1,18 @@
-<button catchtap="start">start</button> 
-<button catchtap='stop'>stop</button>
-<view style="text-align:center;">{{text}}</view>
+<view class='content'>
 
-<ocr-navigator bind:onSuccess="success" certificateType="idCard" selectedOptions="{{['id','name','sex','birthday','homePlace']}}">
-  <button type="primary">身份证识别</button>
-</ocr-navigator>
+<canvas class='firstCanvas'
+canvas-id="firstCanvas"
+bindtouchmove='move'
+bindtouchstart='start'
+bindtouchend='end'
+bindtouchcancel='cancel'
+bindlongtap='tap'
+disable-scroll='true'
+binderror='error'>
+</canvas>
+
+<button bindtap='clearClick'>清除</button>
+<button bindtap='saveClick' >保存图片</button>
+<image id='signatureImg' src='{{signImage}}'></image>
+
+</view>

dorm-manager-wx/pages/test/test.wxss

@@ -1,30 +1,15 @@
-.scroll_display {
-  width: 50%;
-  height: 20rpx;
-  font-size: 35rpx;
-  vertical-align: middle;
-  padding-left: 60rpx;
-}
-.test_display {
-  width: 2100rpx;
-  font-size: 35rpx;
-  vertical-align: middle;
-  white-space:nowrap;
-}
-view input{
-  font-size: 29rpx;
-  color: #666666;
-  text-align: right;
-  overflow: scroll;
-  text-overflow: clip;
-  white-space: nowrap;
-  width: 70%;
-}
-
-.ocr-wrapper {
-  margin: 40rpx auto;
-  width: 375rpx;
-}
-.intro {
-  margin: 40rpx;
+.content {
+width: 100%;
+height: 500px;
+background-color: red;
+}
+.firstCanvas {
+background-color: blue;
+width: 100%;
+height: 200px;
+}
+image {
+width: 100%;
+height: 200px;
+background-color: orange;
 }

dorm-manager-wx/pages/user/index.js

@@ -39,10 +39,23 @@ Page({
   },
   onShow() {
     let userInfo = wx.getStorageSync('user')
+    for(let index in this.data.list){
+      if (userInfo.roleType == 10001){
+        if (!this.data.list[index].teacherurl) {
+          this.data.list.splice(index,1)
+        }
+      }else{
+        if (!this.data.list[index].studenturl) {
+          this.data.list.splice(index, 1)
+        }
+      }
+      
+    }
     this.setData({
       photo: userInfo.headImage ? api.total.split('.if')[0]+userInfo.headImage :'/images/default-urser.png',
       viewName: userInfo.userName,
-      roleType:wx.getStorageSync('user').roleType
+      roleType:wx.getStorageSync('user').roleType,
+      list: this.data.list
     })
     // if (!userInfo){
     //   let { viewName = '', photo = '' } = await getUserInfo()

dorm-manager-wx/project.config.json

@@ -41,6 +41,10 @@
 			"currentL": -1,
 			"list": []
 		},
+		"gamePlugin": {
+			"current": -1,
+			"list": []
+		},
 		"miniprogram": {
 			"current": 35,
 			"list": [
@@ -293,6 +297,28 @@
 					"id": -1,
 					"name": "我的信息",
 					"pathName": "pages/student/user/user",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "投诉建议",
+					"pathName": "pages/student/proposal/proposal",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 37,
+					"name": "投诉建议列表",
+					"pathName": "pages/student/proposalList/proposalList",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "投诉建议详情",
+					"pathName": "pages/student/proposalDetails/proposalDetails",
+					"query": "id=6",
 					"scene": null
 				}
 			]