From e604a4e954b3e0252c86f11bf3c1bb78f9b65951 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 三月 2023 12:41:24 +0800
Subject: [PATCH] 未进群提示
---
miniprogram/pages/user/report/submitReport/index.ts | 7 ++++++-
miniprogram/pages/user/report/detail/index.ts | 4 ++++
miniprogram/pages/user/report/submitReport/index.wxml | 4 ++--
miniprogram/pages/user/report/detail/index.wxml | 16 +++++++++++-----
miniprogram/pages/user/report/index.wxml | 3 ++-
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/miniprogram/pages/user/report/detail/index.ts b/miniprogram/pages/user/report/detail/index.ts
index e9e4978..3b2e148 100644
--- a/miniprogram/pages/user/report/detail/index.ts
+++ b/miniprogram/pages/user/report/detail/index.ts
@@ -7,6 +7,7 @@
Page({
data: {
+ remarks:'',
reportDetail: {},
isShow: false,
causeIndex: 0,
@@ -36,6 +37,9 @@
this.setData({
reportDetail: res.data.data
})
+ this.setData({
+ remarks: res.data.data.remarks
+ })
// for (let index = 0; index < this.data.images.length; index++) {
// if (this.data.images != null && this.data.images[index] != "" && this.data.images != undefined) {
// this.data.images[index] = userDetail.globalData.imageUrl + "/img/" + this.data.images[index]
diff --git a/miniprogram/pages/user/report/detail/index.wxml b/miniprogram/pages/user/report/detail/index.wxml
index 753d9f1..26219e9 100644
--- a/miniprogram/pages/user/report/detail/index.wxml
+++ b/miniprogram/pages/user/report/detail/index.wxml
@@ -1,5 +1,11 @@
<!--index.wxml-->
<view>
+ <van-notice-bar
+ wx:if="{{reportDetail.isInGroup==2}}"
+ left-icon="volume-o"
+ text="{{'椹冲洖鍘熷洜锛�'+remarks}}"
+
+/>
<view class="list1">
<view class="content">{{reportDetail.ctime}}</view>
<view class="font-wenzi">鎶ユ鏃堕棿</view>
@@ -14,15 +20,15 @@
<view class="content">{{reportDetail.cheatTime}}</view>
<view class="font-wenzi">琚獥鏃堕棿</view>
</view>
- <view class="list1">
- <view class="content">{{reportDetail.reportDescription}}</view>
+ <!-- <view class="list1">
+ <view class="content">{{reportDetail.reportDescription||''}}</view>
<view class="font-wenzi">妗堜欢鎻忚堪</view>
- </view>
- <view class="list1">
+ </view> -->
+ <!-- <view class="list1">
<view class="font-wenzi">琛ュ厖淇℃伅</view>
<view class="font-wenzi1">{{reportDetail.information}}</view>
- </view>
+ </view> -->
<view class="list1">
<view class="font-wenzi">鎶ユ鏉愭枡</view>
<view class="imagess" wx:for="{{images}}" wx:key="index" wx:for-item="item">
diff --git a/miniprogram/pages/user/report/index.wxml b/miniprogram/pages/user/report/index.wxml
index 8c80d3f..0d8b1cf 100644
--- a/miniprogram/pages/user/report/index.wxml
+++ b/miniprogram/pages/user/report/index.wxml
@@ -8,7 +8,8 @@
<view class="conter" id="{{item.id}}" bindtap="getDetail">
<view class="inGroup" wx:if="{{item.isInGroup==1}}">宸茶繘缇�</view>
<view class="noInGroup" wx:if="{{item.isInGroup==0}}">鏈繘缇�</view>
- <view class="font-name"> {{item.reportDescription}} </view>
+ <view class="noInGroup" wx:if="{{item.isInGroup==2}}">宸查┏鍥�</view>
+ <view class="font-name"> {{item.reportDescription||'鏆傛湭閫夋嫨妗堜欢鎻忚堪'}} </view>
<!-- <view class="font-wenzi">></view> -->
<van-icon name="arrow" class="font-wenzi"/>
<view class="font-qita"> {{item.ctime}} </view>
diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 0f0207d..60046d8 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/miniprogram/pages/user/report/submitReport/index.ts
@@ -3,6 +3,7 @@
import Toast from '@vant/weapp/toast/toast';
Page({
data: {
+ capture:['camera'],
beforList:'a',
amountInvolved:'',
workingLocation:'',
@@ -10,7 +11,7 @@
userIdCard:'',
sex:'鐢�',
realName:'',
- phone:wx.getStorageSync('phone'),
+ phone:'',
fileImgList: [],
transactionReceiptList:[],
otherList:[],
@@ -259,6 +260,10 @@
},
onLoad(e) {
+ let phone = wx.getStorageSync('phone')
+ this.setData({
+ phone:phone
+ })
var date = new Date()
var month = date.getMonth() + 1
var day = date.getDate()
diff --git a/miniprogram/pages/user/report/submitReport/index.wxml b/miniprogram/pages/user/report/submitReport/index.wxml
index 9a097a9..206154e 100644
--- a/miniprogram/pages/user/report/submitReport/index.wxml
+++ b/miniprogram/pages/user/report/submitReport/index.wxml
@@ -103,8 +103,8 @@
file-list="{{ cardIdList }}"
max-count="2"
bind:after-read="afterReadImg"
- capture="camera"
- accept="image/*"
+ capture="{{ capture }}"
+ accept="image"
/>
</van-tab>
--
Gitblit v1.8.0