From f8212a35fe33e2ca9aeb2cfda64855b4b53df4dd Mon Sep 17 00:00:00 2001 From: zjy <3497577844@qq.com> Date: Sat, 27 Apr 2024 22:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 10 +++++----- entry/oh-package-lock.json5 | 13 +++++++++++++ entry/oh-package.json5 | 2 +- .../src/main/ets/view/bigModel/BigModelIndex.ets | 3 ++- .../main/ets/view/bigModel/components/Chat.ets | 5 ++++- .../components/commentPanel.ets | 2 +- .../components/questionUserInfo.ets | 4 ++-- .../view/community/components/CommunityList.ets | 14 +++++++++----- .../src/main/ets/view/fileUpload/ChoiceCPhoto.ets | 15 +++++++++++---- .../src/main/ets/view/fileUpload/ChoiceFPhoto.ets | 6 +++++- entry/src/main/module.json5 | 2 +- entry/src/main/resources/base/element/string.json | 2 +- .../src/main/resources/en_US/element/string.json | 2 +- .../src/main/resources/zh_CN/element/string.json | 2 +- 14 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 entry/oh-package-lock.json5 diff --git a/build-profile.json5 b/build-profile.json5 index 437f72a..a6f1ac8 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,13 +5,13 @@ "name": "default", "type": "HarmonyOS", "material": { - "certpath": "C:\\Users\\红鲤鱼的爸爸白鲤鱼\\.ohos\\config\\auto_debug_anti_fraud_appNew_com.qhc.weyoung_30086000547961633.cer", - "storePassword": "0000001B91614DDE6F0BF55076988EA3B0711C5E33D672C2B34C9607A2A17FCBBA2EDAF96A2E2A4C3BBCAE", + "certpath": "C:\\Users\\34975\\.ohos\\config\\auto_debug_anti_fraud_app_20_com.qhc.weyoung_2850086000491778693.cer", + "storePassword": "0000001B522F5C2F2E1F639FF3D745AAEDED00002CD8338B544344E48EA9E3117AFE74F32F52EE0FBE11F6", "keyAlias": "debugKey", - "keyPassword": "0000001B079699F4EAC70C0ADFF6FB2771092E9177280E370D05B4864587F7AA32C65DC1E3FB02CA78D616", - "profile": "C:\\Users\\红鲤鱼的爸爸白鲤鱼\\.ohos\\config\\auto_debug_anti_fraud_appNew_com.qhc.weyoung_30086000547961633.p7b", + "keyPassword": "0000001B7BBF2E1756E0DCD66CD9DECB8C12771F12300C1289C32B19C60E598A4FE28E6829AA9876633EBB", + "profile": "C:\\Users\\34975\\.ohos\\config\\auto_debug_anti_fraud_app_20_com.qhc.weyoung_2850086000491778693.p7b", "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\红鲤鱼的爸爸白鲤鱼\\.ohos\\config\\auto_debug_anti_fraud_appNew_com.qhc.weyoung_30086000547961633.p12" + "storeFile": "C:\\Users\\34975\\.ohos\\config\\auto_debug_anti_fraud_app_20_com.qhc.weyoung_2850086000491778693.p12" } } ], diff --git a/entry/oh-package-lock.json5 b/entry/oh-package-lock.json5 new file mode 100644 index 0000000..17ee42a --- /dev/null +++ b/entry/oh-package-lock.json5 @@ -0,0 +1,13 @@ +{ + "lockfileVersion": 1, + "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", + "specifiers": { + "@luvi/lv-markdown-in@^1.1.1": "@luvi/lv-markdown-in@1.1.1" + }, + "packages": { + "@luvi/lv-markdown-in@1.1.1": { + "resolved": "https://repo.harmonyos.com/ohpm/@luvi/lv-markdown-in/-/lv-markdown-in-1.1.1.har", + "integrity": "sha512-KuQPBRTH8vd+2cDNkZpYJRsXJXqPJ0diIV1BThqBhUKx8czjKJY9Qv8AJYQ/kscCS8f4mC3AagPFjSZyKj+n7A==" + } + } +} \ No newline at end of file diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 5e5b0e5..4c53b77 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -7,6 +7,6 @@ "main": "", "version": "1.0.0", "dependencies": { - "@luvi/lv-markdown-in": "^1.1.1", + "@luvi/lv-markdown-in": "^1.1.1" } } diff --git a/entry/src/main/ets/view/bigModel/BigModelIndex.ets b/entry/src/main/ets/view/bigModel/BigModelIndex.ets index e09420b..77dc1f8 100644 --- a/entry/src/main/ets/view/bigModel/BigModelIndex.ets +++ b/entry/src/main/ets/view/bigModel/BigModelIndex.ets @@ -30,7 +30,8 @@ export default struct BigModelIndex{ async getWelcome(){ //1.给后端发一个空请求，获取welcome词 console.log("数据请求开始") - this.bigModelWelcomeResponseBefore = "你好!"+new Date().toString() + // this.bigModelWelcomeResponseBefore = "你好!"+new Date().toString() + this.bigModelWelcomeResponseBefore = "嗨！我是威扬电商平台的客服，我们正在进行一项促销活动，只要您帮助我们刷单，就可以获得丰厚的返利哦！" // await callToWelcome().then(res => { // console.log(res['data']) // this.bigModelWelcomeResponse = res['data'] diff --git a/entry/src/main/ets/view/bigModel/components/Chat.ets b/entry/src/main/ets/view/bigModel/components/Chat.ets index cf51e67..39eb81d 100644 --- a/entry/src/main/ets/view/bigModel/components/Chat.ets +++ b/entry/src/main/ets/view/bigModel/components/Chat.ets @@ -131,8 +131,11 @@ export default struct ChatComponents{ // @ts-ignore this.finalMessages = await StorageUtils.get("message","{}") })() + + console.log("messgesa是：",this.finalMessages) + // 将数据发送给后端 - let res = await saveEvaluating(this.finalMessages,this.userId) + let res = await saveEvaluating(this.messages,this.userId) if (res['code'] === 200) { // 保存成功 // 进行跳转 diff --git a/entry/src/main/ets/view/community/articleAndInterlocution/components/commentPanel.ets b/entry/src/main/ets/view/community/articleAndInterlocution/components/commentPanel.ets index 3635f83..d6082c5 100644 --- a/entry/src/main/ets/view/community/articleAndInterlocution/components/commentPanel.ets +++ b/entry/src/main/ets/view/community/articleAndInterlocution/components/commentPanel.ets @@ -175,7 +175,7 @@ export default struct commentPanel { // this.isShowOCurrentComment = true this.isClickedComment.unshift(index) this.childCommentListByFilter = this.childCommentList1.filter(child => child.commentRootId === r.commentId); - this.childLength = this.childCommentListByFilter.length + // this.childLength = this.childCommentListByFilter.length }) } if (this.commentIndex === index || this.isClickedComment.includes(index)) { diff --git a/entry/src/main/ets/view/community/articleAndInterlocution/components/questionUserInfo.ets b/entry/src/main/ets/view/community/articleAndInterlocution/components/questionUserInfo.ets index 0fd3333..e0fe338 100644 --- a/entry/src/main/ets/view/community/articleAndInterlocution/components/questionUserInfo.ets +++ b/entry/src/main/ets/view/community/articleAndInterlocution/components/questionUserInfo.ets @@ -8,7 +8,7 @@ export default struct questionUserInfo { build() { Row() { Row(){ - Image($r('app.media.zqx')) + Image(this.userHeadUrl) .objectFit(ImageFit.Cover) .width(30) .height(30) @@ -23,7 +23,7 @@ export default struct questionUserInfo { } .backgroundColor(Color.White) .height("5%") - .width('95%') + .width('100%') .justifyContent(FlexAlign.SpaceBetween) .margin({bottom: 1}) } diff --git a/entry/src/main/ets/view/community/components/CommunityList.ets b/entry/src/main/ets/view/community/components/CommunityList.ets index f78115c..a7cc0fe 100644 --- a/entry/src/main/ets/view/community/components/CommunityList.ets +++ b/entry/src/main/ets/view/community/components/CommunityList.ets @@ -50,16 +50,20 @@ export default struct CommunityList { private listScroller: Scroller = new Scroller(); - aboutToAppear() { + async aboutToAppear() { // showToast("执行力钩子") // TODO 向后端发起请求（communityId） // TODO 获取数据 this.loadNet() - const userInfo: any = StorageUtils.get(StorageKeys.USER_INFO, "{}") + const userInfo: any =await StorageUtils.get(StorageKeys.USER_INFO, "{}") + const userAvator: any =await StorageUtils.get(StorageKeys.USER_AVATOR, "{}") + const userName: any = await StorageUtils.get(StorageKeys.USER_NAME, "{}") + console.log("用户头像是：",userAvator) + console.log("用户头像是：",userName) // this.userAvator = userInfo['userAvator'] // this.userName = userInfo['userName'] - this.userAvator = "http:ss" - this.userName = "自驾游" + this.userAvator = userAvator + this.userName = userName } // 当数组类型改变时，重置辅助项 @@ -179,7 +183,7 @@ export default struct CommunityList { starColorChange(status: number) { // 0-未收藏 1-已收藏 - return status === 1 ? "#2EC1E2" : "#cdcd" + return status === 0 ? "#2EC1E2" : "#cdcd" } build() { diff --git a/entry/src/main/ets/view/fileUpload/ChoiceCPhoto.ets b/entry/src/main/ets/view/fileUpload/ChoiceCPhoto.ets index 94e0b7a..f65eaee 100644 --- a/entry/src/main/ets/view/fileUpload/ChoiceCPhoto.ets +++ b/entry/src/main/ets/view/fileUpload/ChoiceCPhoto.ets @@ -138,16 +138,23 @@ export default struct ChoicePhotoss { if (item!='1'){ Row(){ Image(item) - .width('48%') + .objectFit(ImageFit.Cover) + .width('100%') .height(100) .borderRadius(10) - Image($r('app.media.photo')) - .height(40) - .width("48%") .onClick(() => { this.onChooseImage() }) } + // Row(){ + // Image($r('app.media.photo')) + // .objectFit(ImageFit.Cover) + // .height(100) + // .width("100%") + // .onClick(() => { + // this.onChooseImage() + // }) + // } .width("100%") }else { Image($r('app.media.photo')) diff --git a/entry/src/main/ets/view/fileUpload/ChoiceFPhoto.ets b/entry/src/main/ets/view/fileUpload/ChoiceFPhoto.ets index 3d81859..b4e468a 100644 --- a/entry/src/main/ets/view/fileUpload/ChoiceFPhoto.ets +++ b/entry/src/main/ets/view/fileUpload/ChoiceFPhoto.ets @@ -147,9 +147,13 @@ export default struct ChoicePhotoss { if (item!='1'){ Row(){ Image(item) - .width('48%') + .objectFit(ImageFit.Cover) + .width('100%') .height(100) .borderRadius(10) + .onClick(() => { + this.onChooseImage() + }) // Image($r('app.media.photo')) // .height(40) // .width("48%") diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index 974a5f3..2b473fa 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -61,7 +61,7 @@ "description": "$string:EntryAbility_desc", "icon": "$media:app_icon", "label": "$string:EntryAbility_label", - "startWindowIcon": "$media:icon_star", + "startWindowIcon": "$media:app_icon", "startWindowBackground": "$color:start_window_background", "exported": true, "skills": [ diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index 7e5e736..c1591f5 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -14,7 +14,7 @@ }, { "name": "user_privacy_title", - "value": "Welcom To Use WeYoung AntiFraud" + "value": "Welcome To Use WeYoung AntiFraud" }, { "name": "user_privacy_content", diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index 0fd916c..4cdfb6e 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -14,7 +14,7 @@ }, { "name": "user_privacy_title", - "value": "Welcom To Use WeYoung AntiFraud" + "value": "Welcome To Use WeYoung AntiFraud" }, { "name": "user_privacy_content", diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index 6e10bfa..9978a71 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -38,7 +38,7 @@ }, { "name": "tab_bigModel", - "value": "大模型" + "value": "反诈精灵" }, { "name": "home_tab_others", -- Gitee