From 3a4651056a1afb5c66c5ec65ca68a49e0212be39 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Tue, 10 Sep 2024 20:37:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-wxparty/pages/AIAideDetail/index.js | 6 +
by-wxparty/utils/util.js | 2
gz-wxparty/pages/register/index.js | 4
gz-customerSystem/src/views/register/matterDetail/FileTable.jsx | 67 +++++++++++-----
gz-wxparty/api/api.js | 32 ++++----
gz-wxparty/utils/util.js | 2
gz-wxparty/pages/addPerson/index.js | 4
gz-wxparty/pages/AIAideDetail/index.wxml | 17 ++++
gz-wxparty/pages/homePage/index.wxml | 29 ++++--
gz-wxparty/pages/homePage/index.js | 3
gz-wxparty/pages/homePage/index.wxss | 40 +++++++++
11 files changed, 149 insertions(+), 57 deletions(-)
diff --git a/by-wxparty/utils/util.js b/by-wxparty/utils/util.js
index ff41e3d..8658a7f 100644
--- a/by-wxparty/utils/util.js
+++ b/by-wxparty/utils/util.js
@@ -5,7 +5,7 @@
const url = api.url;
// 是否是开发环境
-const isDebug = true;
+const isDebug = false;
const baseUrl = isDebug ? api.url.debug : api.url.web;
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
index ffe2f5f..f311a3b 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
@@ -218,33 +218,58 @@
//上传弹窗完成后的事件
const handleUpload = () => {
+
const newList = tableData.map(item => {
- if (item.ownerType == sourceType) {
- const data = fileMap[sourceType]
- console.log(data);
- return {
- ...item,
- size: data.length,
- fileNames: data.map(item => item.trueName).join('，'),
- updateTime: $$.timeFormat(data[data.length - 1].updateTime),
- fileInfoList: data.map(item => {
- return {
- ...item,
- name: item.trueName,
- uid: item.id,
- }
- }),
+ if (item.ownerType == '22_00018-101') {
+ const data = fileMap['22_00018-101'];
+ if (data?.length > 0) {
+ return {
+ ...item,
+ size: data.length,
+ fileNames: data.map(item => item.trueName).join('，'),
+ updateTime: $$.timeFormat(data[data.length - 1].updateTime),
+ fileInfoList: data.map(item => {
+ return {
+ ...item,
+ name: item.trueName,
+ uid: item.id,
+ }
+ }),
+ }
+ } else {
+ return item
}
- } else {
- return item
+
+ }
+ if (item.ownerType == '22_00018-102') {
+ const data = fileMap['22_00018-102'] || [];
+ if (data?.length > 0) {
+ return {
+ ...item,
+ size: data.length,
+ fileNames: data.map(item => item.trueName).join('，'),
+ updateTime: $$.timeFormat(data[data.length - 1].updateTime),
+ fileInfoList: data.map(item => {
+ return {
+ ...item,
+ name: item.trueName,
+ uid: item.id,
+ }
+ }),
+ }
+ } else {
+ return item
+ }
}
})
+
setTableData(newList)
setUpLoadVisible(false);
};
//根据sourceType生成组件
const formType = (type) => {
+
if (type === '22_00018-101') {
//申请材料
return (
@@ -268,9 +293,10 @@
return item
}
})
+
setFileMap({
...fileMap,
- '22_00018-101': newList
+ '22_00018-101': newList.filter(i => i.ownerType === '22_00018-101')
})
}}
/>
@@ -304,7 +330,7 @@
})
setFileMap({
...fileMap,
- '22_00018-102': newList
+ '22_00018-102': newList.filter(i => i.ownerType === '22_00018-102')
})
}}
/>
@@ -324,6 +350,7 @@
const res = await deleteFileByIdApi({ ids })
if (res.type) {
$$.infoSuccess({ content: '删除成功！' });
+ setTableData(tableData.filter(item => !ids.includes(item.ownerType)))
}
},
});
@@ -408,6 +435,6 @@
<NewFileCheck menuList={tableData} sourceType={sourceType} />
</div>
</Modal>
- </Fragment>
+ </Fragment >
)
}
diff --git a/gz-wxparty/api/api.js b/gz-wxparty/api/api.js
index 20b6733..bbcdd29 100644
--- a/gz-wxparty/api/api.js
+++ b/gz-wxparty/api/api.js
@@ -23,24 +23,24 @@
// 文件下载url 后面接附件编号
// 不同服务接口type
- fileShowUrl: 'dyh-sys',
- fileDownUrl: 'dyh-sys',
- mediate: 'dyh-mediate', // dyh-mediate
- cust: 'dyh-cust', // dyh-cust
- oper: 'dyh-oper', // dyh-oper
- sys: 'dyh-sys', // dyh-sys
- disp: 'dyh-disp', //dyh-disp
- utils: 'dyh-utils', //dyh-utils
+ // fileShowUrl: 'dyh-sys',
+ // fileDownUrl: 'dyh-sys',
+ // mediate: 'dyh-mediate', // dyh-mediate
+ // cust: 'dyh-cust', // dyh-cust
+ // oper: 'dyh-oper', // dyh-oper
+ // sys: 'dyh-sys', // dyh-sys
+ // disp: 'dyh-disp', //dyh-disp
+ // utils: 'dyh-utils', //dyh-utils
// 正式环境
- // fileShowUrl: 'gzdyh-sys',
- // fileDownUrl: 'gzdyh-sys',
- // mediate: 'gzdyh-mediate', // gzdyh-mediate
- // cust: 'gzdyh-cust', // gzdyh-cust
- // oper: 'gzdyh-oper', // gzdyh-oper
- // sys: 'gzdyh-sys', // gzdyh-sys
- // disp: 'gzdyh-disp', //gzdyh-disp
- // utils: 'gzdyh-utils', //gzdyh-utils
+ fileShowUrl: 'gzdyh-sys',
+ fileDownUrl: 'gzdyh-sys',
+ mediate: 'gzdyh-mediate', // gzdyh-mediate
+ cust: 'gzdyh-cust', // gzdyh-cust
+ oper: 'gzdyh-oper', // gzdyh-oper
+ sys: 'gzdyh-sys', // gzdyh-sys
+ disp: 'gzdyh-disp', //gzdyh-disp
+ utils: 'gzdyh-utils', //gzdyh-utils
};
module.exports = {
diff --git a/gz-wxparty/pages/AIAideDetail/index.js b/gz-wxparty/pages/AIAideDetail/index.js
index 68555a5..4681911 100644
--- a/gz-wxparty/pages/AIAideDetail/index.js
+++ b/gz-wxparty/pages/AIAideDetail/index.js
@@ -18,7 +18,8 @@
* 页面的初始数据
*/
data: {
- data: {}
+ data: {},
+ lastData: {}
},
async getaw(data) {
@@ -39,6 +40,9 @@
let nowData = {
...options
}
+ this.setData({
+ lastData: nowData
+ })
this.getaw(nowData)
},
diff --git a/gz-wxparty/pages/AIAideDetail/index.wxml b/gz-wxparty/pages/AIAideDetail/index.wxml
index 744816f..f397c69 100644
--- a/gz-wxparty/pages/AIAideDetail/index.wxml
+++ b/gz-wxparty/pages/AIAideDetail/index.wxml
@@ -1,7 +1,22 @@
<!--pages/AIAideDetail/index.wxml-->
<view class="title">{{data.caseTitle||'-'}}</view>
<view class="line"></view>
-<view class="card">
+<view class="card" wx:if="{{lastData.type==='1'}}">
+ <view class="subtitle">【案件描述】</view>
+ <view class="text">
+ {{data.caseDesc||'-'}}
+ </view>
+ <view class="subtitle">【群众诉求】</view>
+ <view class="text">
+ {{data.caseclaim||'-'}}
+ </view>
+ <view class="subtitle">【和解协议】</view>
+ <view class="text">
+ {{data.agreecontent||'-'}}
+ </view>
+</view>
+
+<view class="card" wx:if="{{lastData.type==='2'}}">
<view class="subtitle">【案件描述】</view>
<view class="text">
{{data.caseDesc||'-'}}
diff --git a/gz-wxparty/pages/addPerson/index.js b/gz-wxparty/pages/addPerson/index.js
index 558a8df..85a8c5c 100644
--- a/gz-wxparty/pages/addPerson/index.js
+++ b/gz-wxparty/pages/addPerson/index.js
@@ -32,8 +32,8 @@
formData: {
trueName: '',
mobile: '',
- certiType: '',
- certiTypeName: '',
+ certiType: '09_00015-1',
+ certiTypeName: '身份证',
certiNo: '',
addr: '',
placeAddr: '',
diff --git a/gz-wxparty/pages/homePage/index.js b/gz-wxparty/pages/homePage/index.js
index 2609053..4418f55 100644
--- a/gz-wxparty/pages/homePage/index.js
+++ b/gz-wxparty/pages/homePage/index.js
@@ -53,7 +53,8 @@
imgUrl: $$.url.img,
agreementMsg: '', // 服务协议
popupVisible: false,
- banner: [`${$$.url.img}banner-1.png`, `${$$.url.img}banner-2.jpg`, `${$$.url.img}banner-3.jpg`], // 轮播图
+ banner: [`${$$.url.img}Banner1.png`, `${$$.url.img}Banner2.png`], // 轮播图
+ // banner: [`${$$.url.img}Banner1.png`, `${$$.url.img}Banner2.png`, `${$$.url.img}banner3.png`, `${$$.url.img}banner4.png`], // 轮播图
countUnitData: {}, //化解资源
userInfo: {}, //用户信息
video: [], // 热门视频
diff --git a/gz-wxparty/pages/homePage/index.wxml b/gz-wxparty/pages/homePage/index.wxml
index a2364af..3918ed8 100644
--- a/gz-wxparty/pages/homePage/index.wxml
+++ b/gz-wxparty/pages/homePage/index.wxml
@@ -6,16 +6,23 @@
<!-- 幻灯片 -->
<view class="homePage-main">
- <swiper autoplay="{{ true }}" class="swiper" indicator-dots="{{ true }}">
- <swiper-item wx:for="{{ banner }}" wx:key="index">
- <image class="swiper-item" src="{{ item }}" />
- </swiper-item>
- </swiper>
+ <view class="swiper-bg">
+ <swiper autoplay="{{ true }}" class="swiper" indicator-dots="{{ true }}">
+ <swiper-item class="swiper-main" wx:for="{{ banner }}" wx:key="index">
+ <image class="swiper-item" src="{{ item }}" />
+ </swiper-item>
+ </swiper>
+ <view class="swiper-head">
+ <view class="mediate">
+ <view>你好，{{userInfo.trueName||'游客'}}</view>
+ <view bindtap="_handleGoPage" data-url="../../pages/me/index" wx:if="{{userInfo.realStatus===1}}" class="public-color">个人中心</view>
+ <view wx:else bindtap="handleNavigateTo" data-url="../../pages/realNameAuthentication/index" data-type="register" class="public-color">实名认证</view>
+ </view>
+ </view>
+ </view>
<view class="main">
- <view class="mediate">
- <view>你好，{{userInfo.trueName||'游客'}}</view>
- <view bindtap="_handleGoPage" data-url="../../pages/me/index" wx:if="{{userInfo.realStatus===1}}" class="public-color">个人中心</view>
- <view wx:else bindtap="handleNavigateTo" data-url="../../pages/realNameAuthentication/index" data-type="register" class="public-color">实名认证</view>
+ <view style="height: 32rpx;">
+
</view>
<!-- 服务申请 -->
<view>
@@ -67,7 +74,7 @@
<!-- 咨询动态 -->
<view>
<view class="flex_dt">
- <view class="main_title">咨询动态</view>
+ <view class="main_title">资讯动态</view>
<view bindtap="handleGetMore" data-type="newMsg" wx:if="{{ newMessageMore }}" class=" flex_dt_more">
<text>查看更多</text>
<van-icon name="arrow" size="16" />
@@ -81,7 +88,7 @@
</view>
</view>
<view class="dt_card_r">
- <image src="{{item.showUrl}}" mode="" />
+ <image src="{{item.imageUrl}}" mode="" />
</view>
</view>
</view>
diff --git a/gz-wxparty/pages/homePage/index.wxss b/gz-wxparty/pages/homePage/index.wxss
index 2702e9f..4b99ac8 100644
--- a/gz-wxparty/pages/homePage/index.wxss
+++ b/gz-wxparty/pages/homePage/index.wxss
@@ -172,6 +172,14 @@
align-items: center;
padding: 0 32rpx;
justify-content: space-between;
+ margin: 0 32rpx;
+}
+
+.swiper-head {
+ position: absolute;
+ width: 100%;
+ z-index: 1;
+ bottom: -64rpx;
}
.mediate-image {
@@ -434,14 +442,42 @@
font-size: 34rpx;
line-height: 50rpx;
color: var(--main-color);
- margin-bottom:24rpx;
+ margin-bottom: 24rpx;
}
.AiModal-subTitle {
- color: rgba(23,26,29,0.60);
+ color: rgba(23, 26, 29, 0.60);
text-align: center;
margin-bottom: 24rpx;
}
+
.AiModal-button {
width: 100%;
+}
+
+.swiper {
+ padding: 32rpx;
+}
+
+.swiper-bg {
+ position: relative;
+ background: linear-gradient(106deg, #5fa6d4 0%, #1a6fb8 100%);
+}
+
+.swiper-bg::after {
+ content: '';
+ position: absolute;
+ width: 100%;
+ height: 20px;
+ border-radius: 100%;
+ background: inherit;
+ /*继承父级背景*/
+ bottom: 0;
+ left: 50%;
+ transform: translate(-50%, 50%);
+}
+
+.swiper-main {
+ position: absolute;
+ top: 0;
}
\ No newline at end of file
diff --git a/gz-wxparty/pages/register/index.js b/gz-wxparty/pages/register/index.js
index 425a282..51f7e56 100644
--- a/gz-wxparty/pages/register/index.js
+++ b/gz-wxparty/pages/register/index.js
@@ -697,7 +697,9 @@
perTypeName: '申请方当事人',
perClass: '09_01001-1',
perClassName: '自然人',
- certiNo: data.idcard || ''
+ certiNo: data.idcard || '',
+ certiType: data.certiType || '09_00015-1',
+ certiTypeName: data.certiTypeName || '身份证',
}]
})
};
diff --git a/gz-wxparty/utils/util.js b/gz-wxparty/utils/util.js
index 9137bfb..175157e 100644
--- a/gz-wxparty/utils/util.js
+++ b/gz-wxparty/utils/util.js
@@ -5,7 +5,7 @@
const url = api.url;
// 是否是开发环境
-const isDebug = true;
+const isDebug = false;
const baseUrl = isDebug ? api.url.debug : api.url.web;
--
Gitblit v1.8.0