diff --git a/dc-App/manifest.json b/dc-App/manifest.json index e6eb991..5ebb146 100644 --- a/dc-App/manifest.json +++ b/dc-App/manifest.json @@ -128,9 +128,11 @@ }, "splashscreen" : { "useOriginalMsgbox" : true, - "androidStyle" : "common", + "androidStyle" : "default", "android" : { - "hdpi" : "C:/Users/19943/Desktop/43980605a54b98e16d4dec19a08ba33.png" + "hdpi" : "E:\\Works\\lighting\\guoJiDaChe\\Flinto@2x.png", + "xhdpi" : "E:\\Works\\lighting\\guoJiDaChe\\Flinto@2x.png", + "xxhdpi" : "E:\\Works\\lighting\\guoJiDaChe\\Flinto@2x.png" } } }, diff --git a/dc-App/pages.json b/dc-App/pages.json index f4d8ca8..206136a 100644 --- a/dc-App/pages.json +++ b/dc-App/pages.json @@ -203,6 +203,14 @@ "enablePullDownRefresh": true, "navigationBarTitleText": "Contact" } + }, + { + "path": "pages/index/firstLogin", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/dc-App/pages/Chat/chat.vue b/dc-App/pages/Chat/chat.vue index b70a943..972062b 100644 --- a/dc-App/pages/Chat/chat.vue +++ b/dc-App/pages/Chat/chat.vue @@ -1,135 +1,304 @@ diff --git a/dc-App/pages/Chat/newChat.vue b/dc-App/pages/Chat/newChat.vue index 033381c..0c90702 100644 --- a/dc-App/pages/Chat/newChat.vue +++ b/dc-App/pages/Chat/newChat.vue @@ -10,7 +10,7 @@ {{ info.title }} - + {{ sayLangStr }} @@ -235,7 +235,8 @@ export default { sendFlag: false }, scrollId: 'bottomId', - storeList: 'msgHisList' + storeList: 'msgHisList', + ifShowLang: false, } }, onLoad(option) { @@ -249,6 +250,9 @@ export default { userAvatar: infoData.userAvatar, title: infoData.title } + if (infoData.title == 'Translator') { + this.ifShowLang = true + } uni.setStorageSync('userId', infoData.userId) this.info = tempInfo this.userId = infoData.userId diff --git a/dc-App/pages/Chat/newChat/submit.vue b/dc-App/pages/Chat/newChat/submit.vue index d44e41e..fe44e40 100644 --- a/dc-App/pages/Chat/newChat/submit.vue +++ b/dc-App/pages/Chat/newChat/submit.vue @@ -2,7 +2,7 @@ - + @@ -82,6 +82,7 @@ export default { timer: '', //计时器 vlength: 0, translatorImageUploadUrl: config.translatorImageUploadUrl, + isShow: false }; }, components: { @@ -94,6 +95,11 @@ export default { default: '' }, }, + mounted() { + if (this.title == 'Translator') { + this.isShow = true + } + }, methods: { //获取高度方法 getElementHeight() { diff --git a/dc-App/pages/busNavigation/busNavigation.nvue b/dc-App/pages/busNavigation/busNavigation.nvue index 0f29fd8..21282d6 100644 --- a/dc-App/pages/busNavigation/busNavigation.nvue +++ b/dc-App/pages/busNavigation/busNavigation.nvue @@ -806,7 +806,7 @@ } .bz_width { - //width: 100%; + width: 600rpx; } .segment-item{ width: 300rpx; diff --git a/dc-App/pages/index/firstLogin.vue b/dc-App/pages/index/firstLogin.vue new file mode 100644 index 0000000..fb0eda3 --- /dev/null +++ b/dc-App/pages/index/firstLogin.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/dc-App/pages/index/index.vue b/dc-App/pages/index/index.vue index 91b2585..fd55e22 100644 --- a/dc-App/pages/index/index.vue +++ b/dc-App/pages/index/index.vue @@ -1,517 +1,533 @@ diff --git a/dc-App/pages/index/nIndex.nvue b/dc-App/pages/index/nIndex.nvue index ab9e460..de60e9c 100644 --- a/dc-App/pages/index/nIndex.nvue +++ b/dc-App/pages/index/nIndex.nvue @@ -403,6 +403,8 @@ this.watchData() this.getBaseInfo() this.getOrderInfo() + //移除缓存 + // uni.removeStorageSync('isFirst') }, created() { uni.setLocale("en") diff --git a/dc-App/pages/my/Contact.vue b/dc-App/pages/my/Contact.vue index 4fd6e2b..d8a3a6f 100644 --- a/dc-App/pages/my/Contact.vue +++ b/dc-App/pages/my/Contact.vue @@ -3,7 +3,7 @@ - contact@company.com + flinto.registra@flintown.cn diff --git a/dc-App/pages/my/my.vue b/dc-App/pages/my/my.vue index 50eb4db..6a219e7 100644 --- a/dc-App/pages/my/my.vue +++ b/dc-App/pages/my/my.vue @@ -29,7 +29,7 @@ - + Contact Us diff --git a/dc-App/static/chatImg/TripIntroduction.png b/dc-App/static/chatImg/TripIntroduction.png new file mode 100644 index 0000000..e54c0df Binary files /dev/null and b/dc-App/static/chatImg/TripIntroduction.png differ diff --git a/dc-App/static/chatImg/ai.png b/dc-App/static/chatImg/ai.png new file mode 100644 index 0000000..977e555 Binary files /dev/null and b/dc-App/static/chatImg/ai.png differ diff --git a/dc-App/static/chatImg/bud.png b/dc-App/static/chatImg/bud.png new file mode 100644 index 0000000..ad5621f Binary files /dev/null and b/dc-App/static/chatImg/bud.png differ diff --git a/dc-App/static/chatImg/budselect.png b/dc-App/static/chatImg/budselect.png new file mode 100644 index 0000000..c402470 Binary files /dev/null and b/dc-App/static/chatImg/budselect.png differ diff --git a/dc-App/static/chatImg/fanyi.png b/dc-App/static/chatImg/fanyi.png new file mode 100644 index 0000000..8f14279 Binary files /dev/null and b/dc-App/static/chatImg/fanyi.png differ diff --git a/dc-App/static/chatImg/search.png b/dc-App/static/chatImg/search.png new file mode 100644 index 0000000..032d5a4 Binary files /dev/null and b/dc-App/static/chatImg/search.png differ diff --git a/dc-App/static/chatImg/searchselect.png b/dc-App/static/chatImg/searchselect.png new file mode 100644 index 0000000..745e5c1 Binary files /dev/null and b/dc-App/static/chatImg/searchselect.png differ diff --git a/dc-App/static/chatImg/tran.png b/dc-App/static/chatImg/tran.png new file mode 100644 index 0000000..0f99e0e Binary files /dev/null and b/dc-App/static/chatImg/tran.png differ diff --git a/dc-App/static/chatImg/transelect.png b/dc-App/static/chatImg/transelect.png new file mode 100644 index 0000000..1138023 Binary files /dev/null and b/dc-App/static/chatImg/transelect.png differ diff --git a/dc-App/static/chatImg/translatorIntroduction.png b/dc-App/static/chatImg/translatorIntroduction.png new file mode 100644 index 0000000..e7a4c7c Binary files /dev/null and b/dc-App/static/chatImg/translatorIntroduction.png differ diff --git a/dc-App/static/chatImg/trip.png b/dc-App/static/chatImg/trip.png new file mode 100644 index 0000000..84c78b5 Binary files /dev/null and b/dc-App/static/chatImg/trip.png differ diff --git a/dc-App/static/chatImg/tripselect.png b/dc-App/static/chatImg/tripselect.png new file mode 100644 index 0000000..c46cd1e Binary files /dev/null and b/dc-App/static/chatImg/tripselect.png differ diff --git a/dc-App/static/imgs/connection.png b/dc-App/static/imgs/connection.png new file mode 100644 index 0000000..14b0c03 Binary files /dev/null and b/dc-App/static/imgs/connection.png differ diff --git a/dc-App/static/imgs/first1.png b/dc-App/static/imgs/first1.png new file mode 100644 index 0000000..7e3927c Binary files /dev/null and b/dc-App/static/imgs/first1.png differ diff --git a/dc-App/static/imgs/first2.png b/dc-App/static/imgs/first2.png new file mode 100644 index 0000000..d663b4d Binary files /dev/null and b/dc-App/static/imgs/first2.png differ diff --git a/dc-App/unpackage/cache/app-android/uts/uni_modules/lime-file-utils/manifest.json b/dc-App/unpackage/cache/app-android/uts/uni_modules/lime-file-utils/manifest.json index 5454c47..0f0f00b 100644 --- a/dc-App/unpackage/cache/app-android/uts/uni_modules/lime-file-utils/manifest.json +++ b/dc-App/unpackage/cache/app-android/uts/uni_modules/lime-file-utils/manifest.json @@ -1,7 +1,7 @@ { "version": "1", "env": { - "compilerVersion": "4.45.2025010502" + "compilerVersion": "4.29.2024093009" }, "files": { "utssdk/app-android/index.uts": { @@ -11,16 +11,16 @@ "md5": "0ef341bba9f99907e18ce67611e4f917" }, "utssdk/interface.uts": { - "md5": "db15187a9fadbca426061057ae59c979" + "md5": "cc107c301f81d7258b06e2275c8bd580" }, "utssdk/unierror.uts": { - "md5": "93cda918cb6cdfcb499987746a492d17" + "md5": "aedbc1a046aa54cb4b419cb7cf9cf794" }, "package.json": { - "md5": "6c74f7276527d2834eed5a1806a1daa5" + "md5": "10b15779033e7e8d4e5812a40553f84e" }, "utssdk/app-android/config.json": { - "md5": "49e34dad9b85d9ddf183e599555456fa" + "md5": "643b2980a54aaca20ecd07d593fb4099" } } -} \ No newline at end of file +}