From 5f852fa4401e63903e4eaaa808d3c9c6ac86395d Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 23 三月 2023 10:55:39 +0800
Subject: [PATCH] 修改我要登记
---
miniprogram/pages/user/report/index.json | 2 +-
miniprogram/app.ts | 4 ++--
miniprogram/pages/user/report/submitReport/index.json | 2 +-
miniprogram/pages/user/report/submitReport/index.ts | 36 ++++++++++++++++++------------------
miniprogram/pages/manager/group/message/index.wxml | 2 +-
miniprogram/pages/manager/group/message/records/index.wxml | 4 ++--
miniprogram/pages/manager/group/message/records/detail/index.wxml | 2 +-
miniprogram/pages/manager/group/message/member/index.wxml | 2 +-
miniprogram/pages/user/report/index.wxml | 2 +-
9 files changed, 28 insertions(+), 28 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/index.wxml b/miniprogram/pages/manager/group/message/index.wxml
index cd3e9a6..caab3ec 100644
--- a/miniprogram/pages/manager/group/message/index.wxml
+++ b/miniprogram/pages/manager/group/message/index.wxml
@@ -62,7 +62,7 @@
<view class="wenzi-wenzi">妗堜欢</view>
</view>
<view class="view-0" bindtap="chatRecords">
- <image src="../../../icon/chatRecord.png" class="bottom-icon"></image>
+ <image src="../../../icon/chatrecord.png" class="bottom-icon"></image>
<view class="wenzi-wenzi">鑱婂ぉ璁板綍</view>
</view>
</view>
diff --git a/miniprogram/pages/manager/group/message/member/index.wxml b/miniprogram/pages/manager/group/message/member/index.wxml
index 76b0620..451e4e6 100644
--- a/miniprogram/pages/manager/group/message/member/index.wxml
+++ b/miniprogram/pages/manager/group/message/member/index.wxml
@@ -13,7 +13,7 @@
<view class="wenzi">缇ゆ垚鍛� ({{memberConut}})浜�</view>
<view class="list" wx:for="{{memberList}}" wx:key="index" >
<view id="{{item.id}}" bindtap="memberDetail">
- <image class="managerIcon" src="{{item.pic}}"></image>
+ <image class="managerIcon" src="../../../../../image/userman.jpg"></image>
<view class="name">{{item.realName}}</view>
</view>
</view>
diff --git a/miniprogram/pages/manager/group/message/records/detail/index.wxml b/miniprogram/pages/manager/group/message/records/detail/index.wxml
index 9a36d00..ef9d622 100644
--- a/miniprogram/pages/manager/group/message/records/detail/index.wxml
+++ b/miniprogram/pages/manager/group/message/records/detail/index.wxml
@@ -22,7 +22,7 @@
<!-- <view class="wenzi">缇ゆ垚鍛樻煡鎵� ({{memberConut}})浜�</view> -->
<view class="list" wx:for="{{messageList}}" wx:key="index" >
<view id="{{item.id}}" bindtap="memberDetail">
- <image class="managerIcon" src="{{item.pic}}"></image>
+ <image class="managerIcon" src="../../../../../../image/userman.jpg"></image>
<view class="time">{{item.ctime}}</view>
<view class="name">{{item.realName}}</view>
<view class="text">{{item.text}}</view>
diff --git a/miniprogram/pages/manager/group/message/records/index.wxml b/miniprogram/pages/manager/group/message/records/index.wxml
index 3804f5b..c49a886 100644
--- a/miniprogram/pages/manager/group/message/records/index.wxml
+++ b/miniprogram/pages/manager/group/message/records/index.wxml
@@ -13,7 +13,7 @@
<view class="wenzi">缇ゆ垚鍛樻煡鎵� ({{memberConut}})浜�</view>
<view class="list" wx:for="{{memberList}}" wx:key="index" >
<view id="{{item.id}}" bindtap="memberDetail">
- <image class="managerIcon" src="{{item.pic}}"></image>
+ <image class="managerIcon" src="../../../../../image/userman.jpg"></image>
<view class="name">{{item.realName}}</view>
</view>
</view>
@@ -22,7 +22,7 @@
<!-- <view class="wenzi">缇ゆ垚鍛樻煡鎵� ({{memberConut}})浜�</view> -->
<view class="list" wx:for="{{messageList}}" wx:key="index" >
<view id="{{item.id}}" bindtap="memberDetail">
- <image class="managerIcon" src="{{item.pic}}"></image>
+ <image class="managerIcon" src="../../../../../image/userman.jpg"></image>
<view class="time">{{item.ctime}}</view>
<view class="name">{{item.realName}}</view>
<view class="text">{{item.text}}</view>
diff --git a/miniprogram/pages/user/report/index.json b/miniprogram/pages/user/report/index.json
index 6f9802c..26234d6 100644
--- a/miniprogram/pages/user/report/index.json
+++ b/miniprogram/pages/user/report/index.json
@@ -1,4 +1,4 @@
{
"usingComponents": {},
- "navigationBarTitleText": "鎴戣鎶ユ"
+ "navigationBarTitleText": "鎴戣鐧昏"
}
\ No newline at end of file
diff --git a/miniprogram/pages/user/report/index.wxml b/miniprogram/pages/user/report/index.wxml
index cf0627a..8763530 100644
--- a/miniprogram/pages/user/report/index.wxml
+++ b/miniprogram/pages/user/report/index.wxml
@@ -16,7 +16,7 @@
</view>
</view>
<view class="buttonView">
- <button class="button" bindtap="report">鎴戣鎶ユ</button>
+ <button class="button" bindtap="report">鎴戣鐧昏</button>
</view>
</view>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/report/submitReport/index.json b/miniprogram/pages/user/report/submitReport/index.json
index 96db794..7ae7a61 100644
--- a/miniprogram/pages/user/report/submitReport/index.json
+++ b/miniprogram/pages/user/report/submitReport/index.json
@@ -2,6 +2,6 @@
"usingComponents": {
"time-picker": "../../../../componets/pick/index"
},
- "navigationBarTitleText": "鎴戣鎶ユ",
+ "navigationBarTitleText": "鎴戣鐧昏",
"component": true
}
\ No newline at end of file
diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 78ef684..0538308 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/miniprogram/pages/user/report/submitReport/index.ts
@@ -89,14 +89,16 @@
formData: { user: 'test' },
success(res) {
// 涓婁紶瀹屾垚闇�瑕佹洿鏂� fileList
- const { fileImgList = [] } = that.data;
- const { transactionReceiptList = [] } = that.data;
- const { otherList = [] } = that.data;
- const { cardIdList = [] } = that.data;
+ const { fileImgList = [] } = that.data; //鍚堝悓
+ const { transactionReceiptList = [] } = that.data; // 浜ゆ槗鍑瘉
+ const { otherList = [] } = that.data; //鍏朵粬
+ const { cardIdList = [] } = that.data; //韬唤璇�
let result = JSON.parse(res.data)
if (that.data.beforList == 'a') {
cardIdList.push({ ...file, url: result.data });
that.setData({ cardIdList });
+ console.log(that.data.cardIdList);
+
} else if (that.data.beforList == 'b') {
fileImgList.push({ ...file, url: result.data });
that.setData({ fileImgList });
@@ -230,10 +232,10 @@
this.data.reportDetail.reportMaterials = this.data.materials
this.data.reportDetail.userId = wx.getStorageSync('id')
this.data.reportDetail.cheatTime = this.data.cheatTime
- this.data.reportDetail.idCardMaterials = this.data.cardIdList.map(res => res.url).join(',')
- this.data.reportDetail.contractMaterials = this.data.fileImgList.map(res => res.url).join(',')
- this.data.reportDetail.transactionMaterials = this.data.transactionReceiptList.map(res => res.url).join(',')
- this.data.reportDetail.elseMaterials = this.data.otherList.map(res => res.url).join(',')
+ this.data.reportDetail.idCardMaterials =this.data.cardIdList.length>0? this.data.cardIdList.map(res => res.url).join(','):null
+ this.data.reportDetail.contractMaterials =this.data.fileImgList.length>0? this.data.fileImgList.map(res => res.url).join(','):null
+ this.data.reportDetail.transactionMaterials =this.data.transactionReceiptList.length>0? this.data.transactionReceiptList.map(res => res.url).join(','):null
+ this.data.reportDetail.elseMaterials =this.data.otherList.length>0? this.data.otherList.map(res => res.url).join(','):null;;
// if ( this.data.reportDetail.information==null|| this.data.reportDetail.reportDescription==null) {
// wx.showToast({
// icon: "none",
@@ -258,9 +260,7 @@
},
onLoad:function(e) {
console.log(e);
-
let that = this
-
let phone = wx.getStorageSync('phone')
that.setData({
phone: phone
@@ -356,38 +356,38 @@
sexId: arraySex.findIndex(val=>{return val.sex == form.sex}),
Location: form.location,
workingLocation: form.workingLocation,
- cardIdList: form.idCardMaterials.split(',').map(i => {
+ cardIdList:form.idCardMaterials? form.idCardMaterials.split(',').map(i => {
return {
thumb: that.imgComplete(i),
url: i,
type: "image",
size: 999999
}
- }),
- fileImgList: form.contractMaterials.split(',').map(i => {
+ }):[],
+ fileImgList:form.contractMaterials? form.contractMaterials.split(',').map(i => {
return {
thumb: that.imgComplete(i),
url: i,
type: "image",
size: 999999
}
- }),
- transactionReceiptList: form.transactionMaterials.split(',').map(i => {
+ }):[],
+ transactionReceiptList:form.transactionMaterials? form.transactionMaterials.split(',').map(i => {
return {
thumb: that.imgComplete(i),
url: i,
type: "image",
size: 999999
}
- }),
- otherList: form.elseMaterials.split(',').map(i => {
+ }):[],
+ otherList:form.elseMaterials? form.elseMaterials.split(',').map(i => {
return {
thumb: that.imgComplete(i),
url: i,
type: "image",
size: 999999
}
- })
+ }):[]
})
}
})
--
Gitblit v1.8.0