From 16d22b5c055e6221c5a9d8a1904f52264a3dcfcb Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 13 Sep 2024 20:53:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-wxparty/pages/AIAide/index.json | 2 +-
gz-wxparty/pages/register/index.js | 11 ++++-------
gz-wxparty/api/api.js | 2 +-
gz-wxparty/pages/myRegisterList/index.wxml | 2 +-
gz-customerSystem/src/views/register/index.jsx | 6 +++---
gz-wxparty/pages/register/index.wxss | 4 ++++
gz-wxparty/pages/homePage/index.wxml | 2 +-
gz-wxparty/pages/homePage/index.js | 3 ++-
gz-wxparty/pages/register/index.wxml | 4 ++--
9 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index eb6690f..c1c0450 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -1,8 +1,8 @@
/*
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-08 15:14:12
- * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-12 15:42:34
+ * @LastEditors: lwh
+ * @LastEditTime: 2024-09-13 10:35:03
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -1225,7 +1225,7 @@
const getCountData = async () => {
const res = await getCountListApi()
if (res.type) {
- const data = res.data
+ const data = res.data || {};
setCountData(data)
}
}
diff --git a/gz-wxparty/api/api.js b/gz-wxparty/api/api.js
index 554f013..a39897a 100644
--- a/gz-wxparty/api/api.js
+++ b/gz-wxparty/api/api.js
@@ -8,7 +8,7 @@
// === 测试环境 ===
// debug: 'https://gz.hugeinfo.com.cn/',
- debug: 'http://gxdn5f.natappfree.cc/',
+ debug: 'http://qbkwa3.natappfree.cc/',
img: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/images/',
assets: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/js/',
txt: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/txt/',
diff --git a/gz-wxparty/pages/AIAide/index.json b/gz-wxparty/pages/AIAide/index.json
index 9c44361..509caa6 100644
--- a/gz-wxparty/pages/AIAide/index.json
+++ b/gz-wxparty/pages/AIAide/index.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "穗调解数智人",
+ "navigationBarTitleText": "解纷数智人",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/gz-wxparty/pages/homePage/index.js b/gz-wxparty/pages/homePage/index.js
index 6cb4859..e2e201e 100644
--- a/gz-wxparty/pages/homePage/index.js
+++ b/gz-wxparty/pages/homePage/index.js
@@ -260,7 +260,7 @@
// 登录，获取用户信息
async handleGetUserInfo() {
- $$.showLoading();
+
wx.getUserProfile({
desc: '完善用户信息',
complete(res) {
@@ -276,6 +276,7 @@
encryptedData: res.encryptedData,
ivStr: res.iv,
};
+ $$.showLoading();
const res3 = await registerApi(submitData);
$$.hideLoading();
if (res3.type) {
diff --git a/gz-wxparty/pages/homePage/index.wxml b/gz-wxparty/pages/homePage/index.wxml
index cabd718..d5b1cf4 100644
--- a/gz-wxparty/pages/homePage/index.wxml
+++ b/gz-wxparty/pages/homePage/index.wxml
@@ -157,7 +157,7 @@
<view wx:if="{{ AiModal.caseDes?true:false }}" class="AiModal-search">
<view class="AiModal">
<image src="{{imgUrl}}AICase.png" mode="" />
- <view class="AiModal-title">穗调解数智人提醒您</view>
+ <view class="AiModal-title">解纷数智人提醒您</view>
<view class="AiModal-subTitle">为了更好的帮助您解决问题，向您推荐了与您反映问题相似的典型案例和相关法条</view>
<van-button bind:click="AiModalClick" class="AiModal-button" round block data-item="{{ AiModal }}" type="primary">前往查看</van-button>
</view>
diff --git a/gz-wxparty/pages/myRegisterList/index.wxml b/gz-wxparty/pages/myRegisterList/index.wxml
index c847a4d..73e7df1 100644
--- a/gz-wxparty/pages/myRegisterList/index.wxml
+++ b/gz-wxparty/pages/myRegisterList/index.wxml
@@ -60,7 +60,7 @@
<view wx:if="{{item.processStatus<3}}" class="list-detail" bindtap="GoPage" data-url="{{'../../pages/AIAide/index?caseDes='+item.caseDes+'&caseClaim='+item.caseClaim+'&caseId='+item.id}}">
<view class="list-detail-l">
<van-icon size='16' name="{{imgUrl}}myRegisterList_7.png" />
- <view class="list-detail-title">穗调解数智人</view>
+ <view class="list-detail-title">解纷数智人</view>
</view>
<view class="list-detail-r">查看</view>
</view>
diff --git a/gz-wxparty/pages/register/index.js b/gz-wxparty/pages/register/index.js
index dba3d37..b0c0441 100644
--- a/gz-wxparty/pages/register/index.js
+++ b/gz-wxparty/pages/register/index.js
@@ -526,9 +526,9 @@
that.setData({
submitData: {
...that.data.submitData,
- [key]: wordsResult
+ [key]: that.data.submitData.caseDes + wordsResult
},
- [keyNum]: wordsResult.length
+ [keyNum]: (that.data.submitData.caseDes + wordsResult).length
});
}
},
@@ -810,9 +810,6 @@
onShow: function () {
if (this.data.oneData?.trueName) {
let list = this.data.oneList;
- console.log('list', list);
- console.log('this.data.editIndex', this.data.editIndex);
- console.log('this.data.oneData', this.data.oneData);
if (this.data.editIndex) {
list[this.data.editIndex] = this.data.oneData;
} else {
@@ -841,9 +838,9 @@
this.setData({
submitData: {
...this.data.submitData,
- [this.data.twoKey]: this.data.twoValue,
+ [this.data.twoKey]: this.data.submitData.caseDes + this.data.twoValue,
},
- [this.data.twoKey + 'Num']: this.data.twoValue.length,
+ [this.data.twoKey + 'Num']: (this.data.submitData.caseDes + this.data.twoValue).length,
twoValue: '',
twoKey: ''
})
diff --git a/gz-wxparty/pages/register/index.wxml b/gz-wxparty/pages/register/index.wxml
index 9d16467..d18d8df 100644
--- a/gz-wxparty/pages/register/index.wxml
+++ b/gz-wxparty/pages/register/index.wxml
@@ -118,7 +118,7 @@
<block>
<view class="cell-item">
<view class="cell-title"><text><text class="cell-required">*</text> 事项概况</text></view>
- <van-field custom-style="padding:0 20rpx;line-height:90rpx" autosize="{{ { maxHeight: 88, minHeight: 88 } }}" bind:change="handleChange" border="{{ false }}" maxlength='2000' data-key="caseDes" placeholder="请完整描述事项概况，应具备5要素：发生时间+发生地点+人物情况+事项起因+事项经过" type="textarea" value="{{ submitData.caseDes }}" />
+ <van-field class="textarea-Input" autosize="{{true}}" custom-style="padding:0 20rpx;line-height:90rpx" bind:change="handleChange" border="{{ false }}" maxlength='2000' data-key="caseDes" placeholder="请完整描述事项概况，应具备5要素：发生时间+发生地点+人物情况+事项起因+事项经过" type="textarea" value="{{ submitData.caseDes }}" />
</view>
<view class="textarea-foot">
<view class="textarea-limit">{{caseDesNum||0}}/2000字</view>
@@ -137,7 +137,7 @@
<block>
<view class="cell-item">
<view class="cell-title"><text><text class="cell-required">*</text> 事项申请</text></view>
- <van-field custom-style="padding:0 20rpx;line-height:90rpx" autosize="{{ { maxHeight: 88, minHeight: 88 } }}" bind:change="handleChange" border="{{ false }}" maxlength='500' data-key="caseClaim" placeholder="希望相关部门如何处理，建议分条描述，如请求1，请求2..." type="textarea" value="{{ submitData.caseClaim }}" />
+ <van-field class="textarea-Input" custom-style="padding:0 20rpx;line-height:90rpx" autosize="{{true}}" bind:change="handleChange" border="{{ false }}" maxlength='500' data-key="caseClaim" placeholder="希望相关部门如何处理，建议分条描述，如请求1，请求2..." type="textarea" value="{{ submitData.caseClaim }}" />
</view>
<view class="textarea-foot">
<view class="textarea-limit">{{caseClaimNum||0}}/500字</view>
diff --git a/gz-wxparty/pages/register/index.wxss b/gz-wxparty/pages/register/index.wxss
index 4354c63..ef6afa2 100644
--- a/gz-wxparty/pages/register/index.wxss
+++ b/gz-wxparty/pages/register/index.wxss
@@ -894,4 +894,8 @@
text-align: center;
padding: 24rpx 0 0;
text-decoration: underline;
+}
+
+.textarea-Input .van-field__control--textarea {
+ min-height: 88px;
}
\ No newline at end of file
--
Gitblit v1.8.0