From 9db46c3a0d1f62e3878243fff0a28c084a7e64ed Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 06 Nov 2023 18:10:45 +0800
Subject: [PATCH] 新增公告列表、详情，便民热线，修改密码，网格员审核页面。登录页修改
---
pages/login/login-account.vue | 55 ++++++
pages/user/center.vue | 2
static/icon/tel.png | 0
subPackage/notice/detail.vue | 53 ++++++
subPackage/hotLine/index.vue | 37 ++++
pages/home/index.vue | 17 +-
pages.json | 50 ++++++
subPackage/notice/list.vue | 46 +++++
subPackage/user/clockIn/index.vue | 30 +++
subPackage/house/member/householdLabel.vue | 2
subPackage/user/password/index.vue | 90 +++++++---
subPackage/workbench/views/audit.vue | 96 ++++++++++++
12 files changed, 430 insertions(+), 48 deletions(-)
diff --git a/pages.json b/pages.json
index 80e4c34..3e72cfd 100644
--- a/pages.json
+++ b/pages.json
@@ -67,6 +67,47 @@
]
},
+ //公告
+ {
+ "root": "subPackage/notice",
+ "pages": [
+ {
+ "path": "list",
+ "style": {
+ "navigationBarTitleText": "公告",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "公告详情",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ }
+
+ ]
+ },
+ //便民热线
+ {
+ "root": "subPackage/hotLine",
+ "pages": [
+ {
+ "path": "index",
+ "style": {
+ "navigationBarTitleText": "便民热线",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ }
+ ]
+ },
+
//工作台
{
"root": "subPackage/workbench",
@@ -87,6 +128,15 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path":"views/audit",
+ "style": {
+ "navigationBarTitleText": "网格任务审核",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
}
]
},
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 5fc0e5c..1389d9d 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -87,7 +87,7 @@
</view>
</view>
<u-grid :border="false" col="4">
- <u-grid-item @click="navigatorPage(item)" v-for="(item, index) in jobList" :index="index"
+ <u-grid-item @click="navigatorPage(item.path)" v-for="(item, index) in jobList" :index="index"
:key="index" :customStyle="{paddingTop:20+'rpx'}">
<view class="grid-item flex f-d-c a-i-c" :style="{background:item.style.background}">
<u-icon :name="item.icon" width="60rpx" height="60rpx"></u-icon>
@@ -129,14 +129,14 @@
</view>
<view class="notic" v-if="roleType == 3">
- <view class="caption flex a-i-c j-c-s-b">
+ <view class="caption flex a-i-c j-c-s-b" @click="navigatorPage('/subPackage/notice/list')">
<view class="flex a-i-c">
<view class="line"></view>
<text class="f-32">通知公告</text>
</view>
<u-icon name="arrow-right"></u-icon>
</view>
- <view class="notic-list" v-for="i in 3">
+ <view class="notic-list" @click="navigatorPage('/subPackage/notice/detail')">
<view class="f-28 mb-30">
新业态新就业群体现状调查问卷
</view>
@@ -153,7 +153,6 @@
</view>
<text class="f-24 c-99">2023-08-21</text>
</view>
-
</view>
</view>
<u-picker :title="roleTypeName" :show="selectBoxShow" keyName="name" ref="uPicker" :columns="siteColumns"
@@ -189,7 +188,7 @@
{
icon: "/static/icon/nav-03.png",
text: "便民热线",
- path: ''
+ path: '/subPackage/hotLine/index'
},
],
navList: [{
@@ -241,7 +240,7 @@
style: {
background: 'linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)',
},
- path:""
+ path:"/subPackage/workbench/views/audit"
},
{
icon: "/static/icon/menu-05.png",
@@ -541,9 +540,9 @@
this.$u.func.globalNavigator(`/subPackage/bs/views/zhsb?houseCode=${this.curHouseCode}`, "navTo")
},
- navigatorPage(item) {
- if(item.path){
- this.$u.func.globalNavigator(item.path, "navTo")
+ navigatorPage(path) {
+ if(path){
+ this.$u.func.globalNavigator(path, "navTo")
}
},
diff --git a/pages/login/login-account.vue b/pages/login/login-account.vue
index 2c0ae82..264e40a 100644
--- a/pages/login/login-account.vue
+++ b/pages/login/login-account.vue
@@ -10,7 +10,27 @@
<image class="bg" src="/static/img/login-bg.png" :style="{height:screenHeight}" mode="aspectFill"></image>
- <view class="content">
+ <view class="content" v-if="!loginType">
+ <image class="title-img" src="/static/icon/login-title.png" mode="aspectFill"></image>
+ <view class="flex f-d-c a-i-c" style="margin-bottom:60rpx;">
+ <view class="f-28">登录后即可展示自己</view>
+ <view class="fw" style="font-size:56rpx;margin:40rpx 0 38rpx;">185****1647</view>
+ <view class="f-22">认证服务由中国移动提供</view>
+ </view>
+
+ <button class="submit-btn f-28">本机号码一键登录</button>
+ <button class="btn bgc-ff f-28 mt-30" @click="accountLogin()">账号登录</button>
+ <view class="agreement flex">
+ <u-checkbox-group v-model="isAgreement">
+ <u-checkbox shape="circle" size="16" ></u-checkbox>
+ </u-checkbox-group>
+
+ <view class="f-22">我已阅读并同意<text class="c-main">用户协议</text>和<text class="c-main">隐私政策</text>以及 <text class="c-main">《中国移动认证服务条款》</text>·同时登录并使用基层智治综合协同平台</view>
+ </view>
+ </view>
+
+
+ <view class="content" v-if="loginType == 1">
<image class="title-img" src="/static/icon/login-title.png" mode="aspectFill"></image>
@@ -33,7 +53,7 @@
</u-input>
</u-form-item>
</u-form>
- <button class="submit-btn" @click="submit" :disabled="disabled">登录</button>
+ <button class="submit-btn f-28 mt-190" @click="submit" :disabled="disabled">登录</button>
</view>
@@ -100,7 +120,9 @@
tenantId: '000000',
form: {
phone: "",
- password: ""
+ password: "",
+
+
},
rules: {
'phone': [{
@@ -130,7 +152,9 @@
passwordIcon: "eye-off",
passwordType: "password"
},
- screenHeight: ""
+ screenHeight: "",
+ loginType:"" ,//登录类型 1账号密码 2 一键登录
+ isAgreement:true
}
},
@@ -139,6 +163,15 @@
},
methods: {
+
+ accountLogin(){
+ // if(!this.isAgreement){
+
+ // }
+ console.log(111);
+ this.loginType = 1;
+ },
+
submit() {
const that = this
this.$refs.form.validate().then(res => {
@@ -411,7 +444,19 @@
background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
border-radius: 8rpx 8rpx 8rpx 8rpx;
color:#fff;
- font-size:36rpx;
+ }
+ .mt-190{
margin-top:190rpx;
}
+ .btn{
+ width:634rpx;
+ height:94rpx;
+ line-height: 94rpx;
+ margin-top:30rpx;
+
+ }
+ .agreement{
+ width:634rpx;
+ margin:37rpx auto 0;
+ }
</style>
\ No newline at end of file
diff --git a/pages/user/center.vue b/pages/user/center.vue
index 747c3f8..7461e08 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -45,7 +45,7 @@
{
icon:"/static/icon/menu-center-03.png",
title:"修改密码",
- url:""
+ url:"/subPackage/user/password/index"
},
{
icon:"/static/icon/menu-center-04.png",
diff --git a/static/icon/tel.png b/static/icon/tel.png
new file mode 100644
index 0000000..f0672b8
--- /dev/null
+++ b/static/icon/tel.png
Binary files differ
diff --git a/subPackage/hotLine/index.vue b/subPackage/hotLine/index.vue
new file mode 100644
index 0000000..4629cff
--- /dev/null
+++ b/subPackage/hotLine/index.vue
@@ -0,0 +1,37 @@
+<template>
+ <view class="list">
+ <view class="list-item flex j-c-s-b">
+ <text class="item-text f-28">信州公安局西市派出所信州公安局西市派出所信州公安局西市派出所信州公安局西市派出所</text>
+ <view class="flex a-i-c">
+ <text class="f-28 c-main mr-20">0793-8222830</text>
+ <u-icon name="/static/icon/tel.png" width="32rpx" height="32rpx"></u-icon>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default{
+ data(){
+ return {
+
+ }
+ },
+ methods:{
+
+ }
+ }
+</script>
+
+<style>
+ .list{
+ padding: 0 30rpx;
+ }
+ .list-item{
+ padding:30rpx 0;
+ border-bottom:1px solid #F5F5F5;
+ }
+ .item-text{
+ width:50%;
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index bdfa03e..5a047ca 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -22,7 +22,7 @@
<view v-for="(item, index) in labelBtnList" :key="index">
<box-title :title="item.name"></box-title>
<view class="mt-20 flex label-btn-box b-c-w">
- <view v-for="(item, index) in item.children" :key="index">
+ <view v-for="(item, k) in item.children" :key="k">
<u-button color="#000" size="mini" type="primary"
:style="{background: item.color}"
:plain="true" :text="item.name"
diff --git a/subPackage/notice/detail.vue b/subPackage/notice/detail.vue
new file mode 100644
index 0000000..f68d01a
--- /dev/null
+++ b/subPackage/notice/detail.vue
@@ -0,0 +1,53 @@
+<template>
+ <view class="container">
+ <view class="f-32">开展“争做合格父母、培养合格人才”家长学校活动开展“争做合格父母、培养合格人才”家</view>
+ <view class="row flex j-c-s-b a-i-c c-99">
+ <view class="flex">
+ <view class="flex a-i-c mr-40">
+ <u-icon name="thumb-up-fill" color="#CECECE"></u-icon>
+ <text class="f-22 ml-10">120</text>
+ </view>
+ <view class="flex a-i-c">
+ <u-icon name="eye-fill" color="#CECECE"></u-icon>
+ <text class="f-22 ml-10">120</text>
+ </view>
+ </view>
+ <text class="f-24">2023-08-21</text>
+ </view>
+ <view class="content f-28">
+ 为了弘扬良好家庭文化，提升家教水平、推进家风建设，有效提高广大家庭儿童家长的家庭教育水平，6月19日上午万达社区文明实践站开展了“争做合格父母、培养合格人才”家长学校活动。参加本次的家长们共计15人。
+ </view>
+ <view class="action flex flex_base">
+ <!-- <view class="action-item flex_base bgc-main">
+ <u-icon name="thumb-up-fill" size="22" color="#fff"></u-icon>
+ </view> -->
+ <view class="action-item flex_base bgc-gray">
+ <u-icon name="thumb-up-fill" size="22" color="#fff"></u-icon>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+</script>
+
+<style>
+ .container{
+ padding:0 30rpx;
+ }
+ .row{
+ padding:30rpx 0;
+ }
+ .content{
+ margin-bottom:90rpx;
+ }
+ .action-item{
+ width:72rpx;
+ height:72rpx;
+ border-radius: 50%;
+
+ }
+ .bgc-gray{
+ background-color:#C4C4C4;
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/notice/list.vue b/subPackage/notice/list.vue
new file mode 100644
index 0000000..ea2e9c0
--- /dev/null
+++ b/subPackage/notice/list.vue
@@ -0,0 +1,46 @@
+<template>
+ <view class="">
+
+
+ <view class="notic-list" @click="navigatorPage('/detail')">
+ <view class="f-28 mb-30">
+ 新业态新就业群体现状调查问卷
+ </view>
+ <view class="flex a-i-c j-c-s-b">
+ <view class="f-28 flex a-i-c">
+ <view class="flex a-i-c mr-30">
+ <u-icon name="thumb-up-fill" size="24" color="#CECECE"></u-icon>
+ <text class="f-24 c-99 ml-10">121</text>
+ </view>
+ <view class="flex a-i-c">
+ <u-icon name="eye-fill" size="24" color="#CECECE"></u-icon>
+ <text class="f-24 c-99 ml-10">121</text>
+ </view>
+ </view>
+ <text class="f-24 c-99">2023-08-21</text>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data(){
+ return {
+
+ }
+ },
+ methods:{
+ navTo(){
+ this.$u.func.globalNavigator('detail', "navTo")
+ }
+ }
+ }
+</script>
+
+<style>
+ .notic-list {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #f5f5f5;
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/user/clockIn/index.vue b/subPackage/user/clockIn/index.vue
index 0fe4c73..504ec4b 100644
--- a/subPackage/user/clockIn/index.vue
+++ b/subPackage/user/clockIn/index.vue
@@ -4,17 +4,26 @@
<u-form labelPosition="left" :model="info" :rules="rules" ref="uForm" labelWidth="90"
:labelStyle="{fontSize:'28rpx'}">
<u-form-item label="工作主题" prop="info.title" borderBottom ref="item1">
- <u-input v-model="info.title" border="none" placeholder="请输入工作内容" placeholderClass="f-28 c-99"
+ <u-input v-model="info.title" border="none" placeholder="请输入工作主题" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
<u-form-item label="当前位置" borderBottom ref="item1">
- <u-input v-model="info.address" border="none" :disabled="true" placeholderClass="f-28 c-99"
+ <u-input v-model="info.address" border="none" placeholderClass="f-28 c-99"
inputAlign="right">
<template slot="suffix">
- <button class="location-btn c-main f-24">获取地址</button>
+ <button class="location-btn c-main f-24" @click="getLocation()">获取地址</button>
</template>
</u-input>
</u-form-item>
+
+ <!-- <view class="row flex a-i-c j-c-s-b">
+ <text class="f-28">当前位置</text>
+ <view class="flex">
+ <view class="f-28">当前位置</view>
+ <button class="location-btn c-main f-24" @click="getLocation()">获取地址</button>
+ </view>
+ </view> -->
+
<u-form-item label="工作内容" prop="info.content" :borderBottom="false" ref="item1">
<u-input v-model="info.content" border="none" placeholder="请输入工作内容" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
@@ -71,6 +80,15 @@
]
}
+ },
+ methods:{
+ getLocation(){
+ uni.chooseLocation({
+ success:(res)=>{
+ console.log(res);
+ }
+ })
+ }
}
}
</script>
@@ -84,14 +102,18 @@
margin: 20rpx 30rpx;
padding: 0 30rpx;
}
+ .row{
+ padding:20rpx 0;
+ border-bottom:1px solid
+ }
.location-btn{
width:116rpx;
height:46rpx;
line-height: 46rpx;
border-radius: 4rpx;
border:1px solid currentColor;
- background-color:#fff;
padding:0;
+ background-color: #fff;
}
.upload {
diff --git a/subPackage/user/password/index.vue b/subPackage/user/password/index.vue
index 1355f49..8036a44 100644
--- a/subPackage/user/password/index.vue
+++ b/subPackage/user/password/index.vue
@@ -1,20 +1,30 @@
<template>
- <view class="password">
+ <view class="">
+ <view class="row flex a-i-c f-28 bgc-ff">
+ <text>登录账号</text>
+ <text>{{userInfo.user_name}}</text>
+ </view>
<view class="form-card">
<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
- <u--form labelPosition="left" :model="model" :rules="rules" ref="uForm">
- <u-form-item labelWidth='200rpx' label="原密码" prop="oldPassword" borderBottom ref="item1">
- <u--input v-model="model.oldPassword" placeholder='请输入原密码' border="none"></u--input>
+ <u-form labelPosition="left" :model="model" :rules="rules" ref="uForm">
+ <u-form-item labelWidth='200rpx' label="*原密码" prop="oldPassword" borderBottom ref="item1">
+ <u-input v-model="model.oldPassword" placeholder='请输入原密码' border="none"
+ inputAlign="right"></u-input>
</u-form-item>
- <u-form-item labelWidth='200rpx' label="新密码" prop="newPassword" borderBottom ref="item1">
- <u--input v-model="model.newPassword" placeholder='请输入新密码' border="none"></u--input>
+ <u-form-item labelWidth='200rpx' label="*新密码" prop="newPassword" borderBottom ref="item1">
+ <u-input v-model="model.newPassword" placeholder='请输入新密码' border="none"
+ inputAlign="right"></u-input>
</u-form-item>
- <u-form-item labelWidth='280rpx' label="请再次输入新密码" prop="newPassword1" ref="item1">
- <u--input v-model="model.newPassword1" placeholder='请再次输入新密码' border="none"></u--input>
+ <u-form-item labelWidth='280rpx' label="*确认密码" prop="newPassword1" ref="item1">
+ <u-input v-model="model.newPassword1" placeholder='请确认密码' border="none"
+ inputAlign="right"></u-input>
</u-form-item>
- </u--form>
+ </u-form>
</view>
- <button class="confirm_btn" @click="confirm">保存</button>
+ <!-- <button class="confirm_btn" @click="confirm">保存</button>-->
+ <view class="footer">
+ <button class="footer-btn" @click="confirm">提交</button>
+ </view>
</view>
</template>
@@ -157,27 +167,51 @@
};
</script>
-<style lang="scss" scoped>
- .password {
- background-color: #e6edfa;
- padding: 20rpx 0;
- height: 100vh;
+<style lang="scss">
+ page {
+ width: 100%;
+ height: 100%;
+ background-color: #f5f5f5;
+ }
- .form-card {
- background-color: #fff;
- border-radius: 16rpx;
- margin: 0 20rpx;
- padding: 0 20rpx;
- }
+ .row {
+ margin: 20rpx 30rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
+ }
- .confirm_btn {
- background: #1180ff;
+ .form-card {
+ background-color: #fff;
+ padding: 0 20rpx;
+ margin: 0 30rpx;
+ }
+
+ .confirm_btn {
+ background: #1180ff;
+ color: #fff;
+ height: 72rpx;
+ line-height: 72rpx;
+ width: 90%;
+ margin-top: 200rpx;
+ border-radius: 20rpx;
+ }
+ .footer {
+ width: 100%;
+ padding: 30rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 10;
+ box-sizing: border-box;
+ padding-bottom: calc( env(safe-area-inset-bottom) + 50rpx);
+ .footer-btn {
+ width: 100%;
+ height: 78rpx;
+ line-height: 78rpx;
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ border-radius: 8rpx;
color: #fff;
- height: 72rpx;
- line-height: 72rpx;
- width: 90%;
- margin-top: 200rpx;
- border-radius: 20rpx;
+ font-size: 32rpx;
}
}
</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
new file mode 100644
index 0000000..3c6a122
--- /dev/null
+++ b/subPackage/workbench/views/audit.vue
@@ -0,0 +1,96 @@
+<template>
+ <view>
+ <view class="tab">
+ <u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
+ </view>
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="i in 3">
+ <view class="item-title flex a-i-c j-c-s-b mb-20">
+ <text class="f-32 fw">名称</text>
+ <!-- <u-tag text="待审批" type="warning" plain plainFill></u-tag> -->
+ <u-tag text="审核通过" type="success" plain plainFill></u-tag>
+ <!-- <u-tag text="审核拒绝" type="error" plain plainFill></u-tag> -->
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">事件类型</text>
+ <text class="f-28 c-66">一次性任务</text>
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">标签</text>
+ <text class="f-28 c-66">打金店</text>
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">地址</text>
+ <text class="address f-28 c-66">西市街道万达社区居民委员会滨江西路66号万达晶座11栋303室</text>
+ </view>
+ </view>
+ </view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data(){
+ return {
+ tabList:[
+ {
+ name:"待审核",
+ status:1
+ },
+ {
+ name:"审核通过",
+ status:2
+ },
+ {
+ name:"已拒绝",
+ status:3
+ },
+ ],
+ tabIndex:0
+ }
+ },
+ methods:{
+ changeTab(e){
+ this.tabIndex = e.index;
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ page{
+ background-color:#F5F5F5;
+ }
+ .tab{
+ width:100%;
+ height:88rpx;
+ position:fixed;
+ top:0;
+ left:0;
+ background-color:#fff;
+ padding:0 30rpx;
+ box-sizing: border-box;
+
+ }
+ .tab /deep/.u-tabs__wrapper__nav__item{
+ flex:1;
+ }
+ .list{
+ margin:118rpx 30rpx 0;
+ }
+ .list-item{
+ padding:0 30rpx 20rpx;
+ border-radius: 8rpx;
+ .item-title{
+ padding:30rpx 0;
+ border-bottom:1px solid #F5F5F5;
+ }
+ .item-row{
+ padding:10rpx 0;
+ .address{
+ width:65%;
+ }
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3