From c47e4742240717bc8c9ffd2ef3239aeac1fc4fd1 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 三月 2023 14:06:05 +0800
Subject: [PATCH] 修改聊天
---
miniprogram/pages/manager/group/message/index.wxss | 6 +++
miniprogram/pages/manager/group/message/index.wxml | 18 ++++++++
miniprogram/pages/manager/index.ts | 24 ++++++++++--
miniprogram/pages/index/index.ts | 4 +-
miniprogram/app.json | 3 +
miniprogram/pages/manager/group/message/index.ts | 14 +++++++
6 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index c6ec919..0d73842 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -47,7 +47,8 @@
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index",
"van-uploader": "@vant/weapp/uploader/index",
- "van-notice-bar": "@vant/weapp/notice-bar/index"
+ "van-notice-bar": "@vant/weapp/notice-bar/index",
+ "van-overlay": "@vant/weapp/overlay/index"
},
"window": {
"backgroundTextStyle": "light",
diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts
index 543c0a6..0af5646 100644
--- a/miniprogram/pages/index/index.ts
+++ b/miniprogram/pages/index/index.ts
@@ -84,14 +84,14 @@
success:(res)=>{
console.log(res);
wx.setStorageSync('phone', res.data.msg)
- if (res.data.data==0) {
+ if (res.data.data==2) {
wx.redirectTo(
{
url: '../user/pubulicty/index'
// url: '../user/loginInfo/index'
}
)
- }else if(res.data.data==1){
+ }else if(res.data.data==0){
wx.redirectTo(
{
url: '../user/index'
diff --git a/miniprogram/pages/manager/group/message/index.ts b/miniprogram/pages/manager/group/message/index.ts
index 23f7e9f..c296a9a 100644
--- a/miniprogram/pages/manager/group/message/index.ts
+++ b/miniprogram/pages/manager/group/message/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ showOverlay:false,
messageList: [],
isShow: false,
height: null,
@@ -19,6 +20,19 @@
// url: '../cause/detail/index?id=' + e.currentTarget.id,
// })
// },
+ onClickHide(e){
+ console.log(e)
+ this.setData({
+ showOverlay:false
+ })
+ },
+ onClickShow(e){
+ console.log(e);
+
+ this.setData({
+ showOverlay:true
+ })
+ },
groupMenber(){
wx.navigateTo({
url:'../message/member/index?id='+this.data.groupId
diff --git a/miniprogram/pages/manager/group/message/index.wxml b/miniprogram/pages/manager/group/message/index.wxml
index c563bdc..d5fc3e4 100644
--- a/miniprogram/pages/manager/group/message/index.wxml
+++ b/miniprogram/pages/manager/group/message/index.wxml
@@ -1,11 +1,27 @@
<!-- <scroll-view class="chat-main" scroll-y="true" :scroll-into-view="scrollToView" :scroll-with-animation="needScrollAnimation" :style="{height:paddingBottom}"> -->
<view class="pageWhole">
+ <van-overlay show="{{ showOverlay }}" bind:click="onClickHide">
+ <view class="wrapper">
+ <view class="block">
+ <view >
+ <label>濮撳悕锛�</label>
+ </view>
+ <view >
+ <label>鐢佃瘽锛�</label>
+ </view>
+ <view >
+ <label>韬唤璇侊細</label>
+ </view>
+ </view>
+ </view>
+</van-overlay>
<view class="chat-item" id="chat">
<view wx:for="{{messageList}}" wx:key="index">
+
<view class="time">{{item.time}}</view>
<!-- b - 瀵规柟鐨勬秷鎭� -->
<view class="chat-left" wx:if="{{item.id!=uid}}">
- <image class="face" src="{{item.pic}}"></image>
+ <image class="face" bindtap="onClickShow" data-smile='smile every day' src="{{item.pic}}"></image>
<view class="chat-message-left">{{item.name}}-{{item.mobile}}</view>
<view class="chat-context-left">{{item.text}}</view>
<view class="chat-site-left"></view>
diff --git a/miniprogram/pages/manager/group/message/index.wxss b/miniprogram/pages/manager/group/message/index.wxss
index e7a78ed..0fcb417 100644
--- a/miniprogram/pages/manager/group/message/index.wxss
+++ b/miniprogram/pages/manager/group/message/index.wxss
@@ -149,3 +149,9 @@
.view-4{
}
+.wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ }
\ No newline at end of file
diff --git a/miniprogram/pages/manager/index.ts b/miniprogram/pages/manager/index.ts
index 6bf8bb0..9f7c165 100644
--- a/miniprogram/pages/manager/index.ts
+++ b/miniprogram/pages/manager/index.ts
@@ -17,17 +17,33 @@
url: '../logs/logs',
})
},
-
-
onLoad() {
+ console.log('66666666666666666666666');
+
+ this.getToken()
+ },
+ getToken(){
+ wx.request({
+ url: manager.globalData.url+"/wx/login",
+ data: {
+ "phone": wx.getStorageSync('phone'),
+ },
+ method: "GET",
+ success: (res) => {
+ console.log(res);
+ wx.setStorageSync('token', res.data.data.token)
+ wx.setStorageSync('role', res.data.data.role)
+ wx.setStorageSync('id', res.data.data.id)
+ wx.setStorageSync('card',res.data.data.time)
+ }})
},
getReport() {
console.log("xxx")
wx.navigateTo({
url: '../manager/report/index'
})
- }
- ,getGroup(){
+ },
+ getGroup(){
console.log("group")
wx.navigateTo({
url:'../manager/group/index'
--
Gitblit v1.8.0