From 1229b7af1f85669f8061b8985618d929b029eb33 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 12 四月 2023 17:13:34 +0800
Subject: [PATCH] 修改首页
---
miniprogram/pages/manager/group/message/publicty/index.wxss | 19 +++
miniprogram/pages/manager/group/message/publicty/index.wxml | 25 +++-
miniprogram/app.ts | 4
miniprogram/pages/manager/group/message/Speech/index.wxml | 4
miniprogram/pages/manager/group/message/publicty/index.ts | 99 +++++++++++++++++++
miniprogram/pages/manager/group/message/Speech/index.wxss | 10 +
miniprogram/pages/manager/group/message/Speech/index.ts | 135 ++++++++++++++++++--------
7 files changed, 236 insertions(+), 60 deletions(-)
diff --git a/miniprogram/app.ts b/miniprogram/app.ts
index 4160081..a9c5d3c 100644
--- a/miniprogram/app.ts
+++ b/miniprogram/app.ts
@@ -1,8 +1,8 @@
// app.ts
App({
globalData: {
- url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
- // url:'http://192.168.3.220:8080',
+ // url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
+ url:'http://192.168.3.220:8080',
// url:'http://221.237.182.28:8443/api',
imageUrl:'https://qyqjzdd.cdqingyang.gov.cn/minio'
// imageUrl:'http://192.168.3.220:8080/minio'
diff --git a/miniprogram/pages/manager/group/message/Speech/index.ts b/miniprogram/pages/manager/group/message/Speech/index.ts
index 217c046..9a79ea2 100644
--- a/miniprogram/pages/manager/group/message/Speech/index.ts
+++ b/miniprogram/pages/manager/group/message/Speech/index.ts
@@ -66,50 +66,99 @@
}
},
allPick() {
- wx.request(
- {
- url: groupBanSpeech.globalData.url + "/wx/group/member/allBanSpeech",
- method: "GET",
- data: {
- id: this.data.groupId
- },
- header: { 'token': wx.getStorageSync('token') },
- success: (res) => {
- wx.showToast({
- icon: "none",
- title: '绂佽█鎴愬姛!',
- })
-
- this.setData({
- checkedAll : !this.data.checkedAll
- })
- console.log(this.data.checkedAll);
-
- wx.request(
- {
- url: groupBanSpeech.globalData.url + "/wx/group/member",
- method: "GET",
- data: {
- id: this.data.groupId
- },
- header: { 'token': wx.getStorageSync('token') },
- success: (res) => {
- for (let index = 0; index < res.data.data.memberList.length; index++) {
- if (res.data.data.memberList[index].pic != null) {
- res.data.data.memberList[index].pic = groupBanSpeech.globalData.imageUrl + "/img/" + res.data.data.memberList[index].pic;
- }
- }
- this.setData({
- memberList: res.data.data.memberList,
- managerList: res.data.data.managerMemberList,
- memberConut: res.data.data.memberCount,
- managerCount: res.data.data.managerMemberCount
- })
- console.log(this.data.memberList)
- }
+ if (this.data.checkedAll) {
+ wx.request(
+ {
+ url: groupBanSpeech.globalData.url + "/group/banSpeechRemark?id="+this.data.groupId,
+ method: "PUT",
+ // data: {
+ // id: this.data.groupId
+ // },
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ wx.showToast({
+ icon: "none",
+ title: '鍏佽鍙戣█!',
})
- }
- })
+
+ this.setData({
+ checkedAll : !this.data.checkedAll
+ })
+ console.log(this.data.checkedAll);
+
+ wx.request(
+ {
+ url: groupBanSpeech.globalData.url + "/wx/group/member",
+ method: "GET",
+ data: {
+ id: this.data.groupId
+ },
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ for (let index = 0; index < res.data.data.memberList.length; index++) {
+ if (res.data.data.memberList[index].pic != null) {
+ res.data.data.memberList[index].pic = groupBanSpeech.globalData.imageUrl + "/img/" + res.data.data.memberList[index].pic;
+ }
+ }
+ this.setData({
+ memberList: res.data.data.memberList,
+ managerList: res.data.data.managerMemberList,
+ memberConut: res.data.data.memberCount,
+ managerCount: res.data.data.managerMemberCount
+ })
+ console.log(this.data.memberList)
+ }
+ })
+ }
+ })
+ } else {
+ wx.request(
+ {
+ url: groupBanSpeech.globalData.url + "/wx/group/member/allBanSpeech",
+
+ method: "GET",
+ data: {
+ id: this.data.groupId
+ },
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ wx.showToast({
+ icon: "none",
+ title: '绂佽█鎴愬姛!',
+ })
+
+ this.setData({
+ checkedAll : !this.data.checkedAll
+ })
+ console.log(this.data.checkedAll);
+
+ wx.request(
+ {
+ url: groupBanSpeech.globalData.url + "/wx/group/member",
+ method: "GET",
+ data: {
+ id: this.data.groupId
+ },
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ for (let index = 0; index < res.data.data.memberList.length; index++) {
+ if (res.data.data.memberList[index].pic != null) {
+ res.data.data.memberList[index].pic = groupBanSpeech.globalData.imageUrl + "/img/" + res.data.data.memberList[index].pic;
+ }
+ }
+ this.setData({
+ memberList: res.data.data.memberList,
+ managerList: res.data.data.managerMemberList,
+ memberConut: res.data.data.memberCount,
+ managerCount: res.data.data.managerMemberCount
+ })
+ console.log(this.data.memberList)
+ }
+ })
+ }
+ })
+ }
+
},
pick(e) {
console.log(e);
diff --git a/miniprogram/pages/manager/group/message/Speech/index.wxml b/miniprogram/pages/manager/group/message/Speech/index.wxml
index 2a75a4a..eb0e7c5 100644
--- a/miniprogram/pages/manager/group/message/Speech/index.wxml
+++ b/miniprogram/pages/manager/group/message/Speech/index.wxml
@@ -10,8 +10,8 @@
</view>
</view> -->
<view class="manager">
- <view>
- <view class="wenzi">缇ゆ垚鍛� ({{memberConut}})浜�</view>
+ <view class="title">
+ <view >缇ゆ垚鍛� ({{memberConut}})浜�</view>
<van-checkbox value="{{ checkedAll }}" bind:change="allPick" class="radio">鍏ㄩ��</van-checkbox>
<!-- <radio bindtap="allPick" color="red" class="radio">鍏ㄩ��</radio> -->
</view>
diff --git a/miniprogram/pages/manager/group/message/Speech/index.wxss b/miniprogram/pages/manager/group/message/Speech/index.wxss
index 8dcaa7c..c200491 100644
--- a/miniprogram/pages/manager/group/message/Speech/index.wxss
+++ b/miniprogram/pages/manager/group/message/Speech/index.wxss
@@ -19,9 +19,13 @@
background-color: #F5F5F9;
height: 40px;
}
-.radio{
- float: right;
- margin-top: -8%;
+.title{
+ display: flex;
+ justify-content: space-between;
+ padding: 0 0.5rem;
+ height: 40px;
+ background-color: #F5F5F9;
+ align-items: center;
}
.name{
font-size: 14px;
diff --git a/miniprogram/pages/manager/group/message/publicty/index.ts b/miniprogram/pages/manager/group/message/publicty/index.ts
index 2181874..9a63329 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.ts
+++ b/miniprogram/pages/manager/group/message/publicty/index.ts
@@ -1,17 +1,112 @@
// index.ts
// 鑾峰彇搴旂敤瀹炰緥
const groupPublicty = getApp()
-
+import Dialog from '@vant/weapp/dialog/dialog';
Page({
data: {
+ groId:'',
+ value:'',
+ show: false,
causeList:[],
isShow:false
},
- causeListAdd(){
+ ondel(event) {
+ console.log(event);
+ let that=this
+ const { position, instance } = event.detail;
+ switch (position) {
+ case 'left':
+ case 'cell':
+ instance.close();
+ break;
+ case 'right':
+ Dialog.confirm({
+ message: '纭畾鍒犻櫎鍚楋紵',
+ }).then(() => {
+ that.delCalist(event)
+ instance.close();
+ }).catch(() => {
+ instance.close();
+ });
+ break;
+ }
+ },
+ delCalist(e){
+ wx.request(
+ {
+ url:groupPublicty.globalData.url+"/wx/announcement/delete?id="+e.target.dataset.id.id,
+ method:"DELETE",
+ // data:{
+ // announcement:this.data.value,
+ // groupId:Number(this.data.groId)
+
+ // },
+ header:{'token':wx.getStorageSync('token')},
+ success:(res)=>{
+ console.log(res)
+ this.getList()
+ }
+ })
+ },
+ getUserInfo(event) {
+ console.log(event.detail);
+ wx.request(
+ {
+ url:groupPublicty.globalData.url+"/wx/announcement/add?announcement="+this.data.value+"&groupId="+this.data.groId,
+ method:"POST",
+ // data:{
+ // announcement:this.data.value,
+ // groupId:Number(this.data.groId)
+
+ // },
+ header:{'token':wx.getStorageSync('token')},
+ success:(res)=>{
+ console.log(res)
+ this.setData({
+ value:''
+ })
+ this.getList()
+ }
+ })
+ },
+ onChange(event) {
+ // event.detail 涓哄綋鍓嶈緭鍏ョ殑鍊�
+ console.log(event.detail);
+ this.setData({
+ value:event.detail
+ })
+ },
+ onClose() {
+ this.setData({ show: false ,
+ value:''});
+ },
+ addCause(){
+ this.setData({ show: true });
+ },
+ getList(){
+ wx.request(
+ {
+ url:groupPublicty.globalData.url+"/group/getAllNotice",
+ method:"GET",
+ data:{
+ id:this.data.groId
+ },
+ header:{'token':wx.getStorageSync('token')},
+ success:(res)=>{
+ console.log(res)
+ this.setData({
+ causeList:res.data.data
+ })
+ }
+ })
},
// 浜嬩欢澶勭悊鍑芥暟
onLoad(e) {
+ console.log(e);
+ this.setData({
+ groId:e.id
+ })
wx.request(
{
url:groupPublicty.globalData.url+"/group/getAllNotice",
diff --git a/miniprogram/pages/manager/group/message/publicty/index.wxml b/miniprogram/pages/manager/group/message/publicty/index.wxml
index 106593c..1a2f807 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.wxml
+++ b/miniprogram/pages/manager/group/message/publicty/index.wxml
@@ -1,14 +1,23 @@
<view class="content">
+ <van-dialog id="van-dialog" />
<van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{causeList.length === 0}}"></van-empty>
+ <view class="foot"> <button class="button" bindtap="addCause">鏂� 澧� 缇� 鍏� 鍛�</button></view>
+ <van-dialog use-slot title="缇ゅ叕鍛�" show="{{ show }}" show-cancel-button bind:close="onClose" bind:confirm="getUserInfo">
+ <van-field value="{{ value }}" placeholder="璇疯緭鍏ョ兢鍏憡" border="{{ false }}" bind:change="onChange" />
+ </van-dialog>
<view class="lists" wx:for="{{causeList}}" wx:key="id">
+ <van-swipe-cell class="list-swipe" id="swipe-cell" right-width="{{ 65 }}" async-close bind:close="ondel" data-id="{{item}}">
<view class="item2">
- <image class="icon" src="../../../../icon/notice.png"></image>
- <span class="content">缇ゅ叕鍛�</span>
- <view class="item">{{item.ctime}}</view>
- </view>
-
- <view class="item3">{{item.text}}</view>
-
- <!-- <van-button type="info" bind:click="causeListAdd">娣诲姞</van-button> -->
+ <image class="icon" src="../../../../icon/notice.png"></image>
+ <span class="content">缇ゅ叕鍛�</span>
+ <view class="item">{{item.ctime}}</view>
</view>
+
+ <view class="item3">{{item.text}}</view>
+ <view slot="right">鍒犻櫎</view>
+ </van-swipe-cell>
+
+
+ <!-- <van-button type="info" bind:click="causeListAdd">娣诲姞</van-button> -->
+ </view>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/manager/group/message/publicty/index.wxss b/miniprogram/pages/manager/group/message/publicty/index.wxss
index ecec931..d5e0e3b 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.wxss
+++ b/miniprogram/pages/manager/group/message/publicty/index.wxss
@@ -42,3 +42,22 @@
font-size: 14px;
margin-bottom: 2%;
}
+.foot{
+ position: absolute;
+ bottom: 1rem;
+ width: 90%;
+ padding: 1rem;
+}
+.button{
+ /* margin-top: 60%; */
+ font-size: 13px;
+ color: #fff;
+ background-color: #6699ff;
+ border: 1px solid #6699ff;
+}
+.van-swipe-cell__right{
+ padding: 0.7rem;
+ width: 100%;
+ background-color: red;
+ color: #FFF;
+}
\ No newline at end of file
--
Gitblit v1.8.0