修改密码页,设置页,分享功能

app.json

@@ -7,7 +7,9 @@
         "pages/information/information",
         "pages/mine/mine",
         "pages/webView/webView",
-        "pages/statistics/statistics"
+        "pages/statistics/statistics",
+        "pages/setup/setup",
+        "pages/resetPassword/resetPassword"
     ],
     "subPackages": [
         {

pages/login/login.wxml

@@ -1,7 +1,7 @@
 <!--pages/register/register.wxml-->
 <view class="header">
         <image src="../../images/login/hi.png" mode=""/>
-        <view->欢迎加入亿星社区</view->
+        <view->欢迎加入e联社区</view->
 </view>
 <view class="login">
         <view class="input_box">

pages/mine/mine.wxml

@@ -32,7 +32,7 @@
             </view>
             <view class="item" bind:tap="toFollowUpList"> 
                 <view class="left">
-                    <image src="../../images/mine/hf.png" mode=""/>
+                    <image src="../../images/mine/sqmp.png" mode=""/>
                     <view>我摸排的诉求</view>
                 </view>
                 <view class="right"> <image src="../../images/right.png" mode=""/></view>

pages/resetPassword/resetPassword.js

@@ -0,0 +1,66 @@
+// pages/resetPassword/resetPassword.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

pages/resetPassword/resetPassword.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

pages/resetPassword/resetPassword.wxml

@@ -0,0 +1,2 @@
+<!--pages/resetPassword/resetPassword.wxml-->
+<text>pages/resetPassword/resetPassword.wxml</text>

pages/resetPassword/resetPassword.wxss

@@ -0,0 +1 @@
+/* pages/resetPassword/resetPassword.wxss */

pages/setup/setup.js

@@ -0,0 +1,66 @@
+// pages/setup/setup.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

pages/setup/setup.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

pages/setup/setup.wxml

@@ -0,0 +1,2 @@
+<!--pages/setup/setup.wxml-->
+<text>pages/setup/setup.wxml</text>

pages/setup/setup.wxss

@@ -0,0 +1 @@
+/* pages/setup/setup.wxss */

pages/work/work.js

@@ -1,6 +1,7 @@
 // pages/work/work.js
 const app = getApp()
 import {getSituation,getInspRecord} from '../../utils/api'
+import { $wuxActionSheet } from '../../components/dist/index'
 Page({
     /**
      * 页面的初始数据
@@ -113,6 +114,21 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
+        return {
+            title: '亿星社区',
+            path: ''
+           
+          }
+    },
+    onShareTimeline(){
+        return {
+            title: "亿星社区",
+            query: {
+                    key: "1"
+                   },
+            imageUrl: ""
+        }
+   
     },
     handelTab(e){
         console.log(e);
@@ -122,10 +138,11 @@ Page({
     },
     handelBlurKeyWord(e){
         this.setData({
-            keyWord: e.detail.value
+            keyWord: e.detail.value.replace(/\s+/g, '')
           })
-          app.globalData.keyWord = e.detail.value
+          app.globalData.keyWord = e.detail.value.replace(/\s+/g, '')
     },
+ 
     handelClickSearch(e){
         if(!this.data.keyWord) {
             wx.showToast({
@@ -134,7 +151,6 @@ Page({
             })
             return
         }
-        app.globalData.keyWord = this.data.keyWord
         wx.navigateTo({
           url: `/subpages/searchResult/pages/searchResult/searchResult?type=${this.data.setlectVal}`,
         })
@@ -184,20 +200,14 @@ Page({
     },
     toWebView(){
         wx.navigateTo({
-          url: `/pages/webView/webView?url=${this.data.communitySelfInspTop.questionnaireUrl}`,
+            url: '/subpages/communitySelfInsp/pages/synthesis/synthesis',
         })
     },
     handelClickCopy() {
-        wx.setClipboardData({
-          data: this.data.communitySelfInspTop.questionnaireUrl,
-          success: function(res) {
-            wx.showToast({
-              title: '已将链接复制至剪切板',
-              duration: 2000,
-              icon:'none'
-            });
-          }
-        });
+        wx.showShareImageMenu({
+          menus:['shareAppMessage', 'shareTimeline']
+        })
+   
     },
     toDemandCheck(){
         wx.navigateTo({

pages/work/work.json

@@ -1,7 +1,9 @@
 {
     "navigationStyle": "custom",
     "usingComponents": {
-        "custom-tab-bar":"../../components/custom-tab-bar"
+        "custom-tab-bar":"../../components/custom-tab-bar",
+        "wux-button": "../../components/dist/button",
+        "wux-actionsheet": "../../components/dist/actionsheet/index"
      },
      "enablePullDownRefresh": true,
      "backgroundColor": "#f8f8f8",

pages/work/work.wxml

@@ -68,7 +68,7 @@
                 <view class="bg_left">
                     <view class="h2" bind:tap="toWebView" >{{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查</view>
                     <view class="submit">已提交 <b>{{communitySelfInspTop.personQty?communitySelfInspTop.personQty:'--'}}</b> 人</view>
-                    <view class="btn_Box"> <view class="btn_fx" bind:tap="handelClickCopy">一键分享</view> <view class="btn_tj" bind:tap="toSynthesis">查看统计</view>
+                    <view class="btn_Box"> <button class="btn_fx" bind:tap="handelClickCopy" open-type="share" >一键分享</button> <view class="btn_tj" bind:tap="toSynthesis">查看统计</view>
                  </view>
                 </view>
                 <view class="bg_right">
@@ -90,4 +90,5 @@
         </view>
     </view>
 </view>
-<custom-tab-bar></custom-tab-bar>
+<custom-tab-bar></custom-tab-bar>
+<wux-actionsheet id="wux-actionsheet" />

pages/work/work.wxss

@@ -383,12 +383,15 @@ page {
  }
  .body .bto .content .bg_box .bg_left .btn_Box .btn_fx{
     width: 160rpx;
+    font-size: 28rpx;
     height: 56rpx;
     background: #FF783C;
     border-radius: 28rpx;
     text-align: center;
     line-height: 56rpx;
     margin-right:31rpx ;
+    padding: 0 !important;
+    color: #fff;
  }
  .body .bto .content .bg_box .bg_left .btn_Box .btn_tj{
     width: 160rpx;

subpages/communitySelfInsp/pages/historyQuery/historyQuery.js

@@ -77,7 +77,15 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
-
+      return{
+        title:'问卷调查',
+        path:'/pages/webView/webView?url=' + this.data.url
+      }
+    },
+    share(e){
+      this.setData({
+        url:e.currentTarget.dataset.url
+      })
     },
     getTable(){
         this.setData({

subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml

@@ -18,7 +18,7 @@
                 </view>
                 <view class="right">
                     <view wx:if="{{item.status == 1}}" class="bule">
-                       <image src="../../../../images/share.png" mode=""/> 分享
+                       <image src="../../../../images/share.png" mode=""/> <button open-type="share" bind:tap="share" data-url="{{item.questionnaireUrl}}">分享</button>
                     </view>
                     <view wx:else class="score">
                         <b>{{item.synthesisScore}}</b>分

subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss

@@ -130,7 +130,8 @@ page {
     border-radius: 25rpx;
     box-sizing: border-box;
     display: flex;
-    align-items: center; 
+    align-items: center;
+    overflow: hidden; 
 }
 .list_card .right .score{
     color: #999;
@@ -142,24 +143,19 @@ page {
     font-weight: bold;
     color: #FF783C;
 }
+.right button{
+    font-size: 28rpx;
+    color: #fff;
+    width: fit-content;
+    background-color:#3a80e7;
+    padding: 0 !important;
+}
 .list_card .right image{
     width: 25rpx;
     height: 25rpx;
+    margin-right: 10rpx;
 }
-button{
-    width: 360rpx;
-    height: 76rpx;
-    background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%);
-    border-radius: 76rpx !important;
-    font-size: 32rpx;
-    font-weight: 400 !important;
-    font-family: PingFang SC;
-    color: #FFFFFF;
-    position: fixed;
-    bottom: 63rpx;
-    left: 50%;
-    transform: translateX(-180rpx);
-}
+
 .fixed_btn{
     position: fixed;
     bottom: 30rpx;

subpages/gatherInformation/pages/gatherInformation/gatherInformation.js

@@ -7,7 +7,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        selectList:[['全部信息','居民信息采集','房屋信息采集'],['','新增','修改','删除']],
+        selectList:[['全部信息','居民信息采集','房屋信息采集']],
         selectValue:['全部信息',''],
         pageSize:10,
         pageNo:1,

utils/api.js

@@ -33,7 +33,8 @@ module.exports = {
   getInspResult,
   getFollowUpList,
   followUpSave,
-  followUpDelete
+  followUpDelete,
+  logout
 }
 // 消息列表
 function getIntelligentMessage(param){
@@ -48,10 +49,15 @@ function clearMessage () {
 function userLoginlog (para) {
   return fly.post('auth/gov/loginbypassword', para)
 }
+
 // 获取token
 function getToken (para) {
     return fly.post('auth/gov/loginwxmp/loginbywxcode', para)
 }
+// 退出登录
+function logout () {
+    return fly.post('auth/login/logout', )
+}
 // 居民查询
 function getResidentBaseInfo (para) {
     return fly.post('actual/base/residentBaseInfo/residentSearch', para)

utils/request.js

@@ -30,6 +30,7 @@ const request =  function (url, options) {
             reject(response.data)
           }
         }else if(response.statusCode === 10007 || response.statusCode == 1024 || response.statusCode == 2003){
+          console.log('进不来?');
             wx.redirectTo({
               url: '/pages/login/login',
             })