From 3db1115ee2d45d3f554ba7fcd8e46c81ed8fd2f1 Mon Sep 17 00:00:00 2001 From: admin <> Date: Wed, 16 Oct 2024 15:43:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=AE=E4=BF=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=AC=E5=8F=91=20=E5=88=86=E4=BA=AB=20=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomSwiper/index.vue | 20 +++++++++------ src/components/OpOnline/index.vue | 4 +-- src/main.ts | 2 ++ src/pages/minix/index.js | 37 +++++++++++++++++++++++++++ src/pagesBattery/index.vue | 2 +- src/pagesHome/index.vue | 19 +++++++++----- src/pagesLogin/index.vue | 2 +- src/pagesVehicle/inquiry.vue | 4 +-- src/pagesVehicle/recovery.vue | 4 +-- src/pagesVehicle/registration.vue | 4 +-- src/static/style/common.scss | 4 +-- src/uni.scss | 4 +-- 12 files changed, 77 insertions(+), 29 deletions(-) create mode 100644 src/pages/minix/index.js diff --git a/src/components/CustomSwiper/index.vue b/src/components/CustomSwiper/index.vue index 026a807..4991343 100644 --- a/src/components/CustomSwiper/index.vue +++ b/src/components/CustomSwiper/index.vue @@ -40,14 +40,17 @@ const props = withDefaults( { list: [ { - imgUrl: "b-a1.png", - }, - { - imgUrl: "b-a2.png", - }, - { - imgUrl: "b-a3.png", - }, + imgUrl: 'b-a1-1.1.1.png' + } + // { + // imgUrl: "b-a1.png", + // }, + // { + // imgUrl: "b-a2.png", + // }, + // { + // imgUrl: "b-a3.png", + // }, ], } ); @@ -75,6 +78,7 @@ const change = (e: any) => { cursor: pointer; image { width: 100%; + height: 200px; } } .title { diff --git a/src/components/OpOnline/index.vue b/src/components/OpOnline/index.vue index ae028a5..b69c322 100644 --- a/src/components/OpOnline/index.vue +++ b/src/components/OpOnline/index.vue @@ -120,7 +120,7 @@ onMounted(() => { height: 60rpx; padding: 10rpx; border-radius: 100%; - border: 2px solid #294ac7; - background-color: #294ac7; + border: 2px solid #608CF1; + background-color: #608CF1; } diff --git a/src/main.ts b/src/main.ts index 823334f..025540e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,9 +5,11 @@ import App from "./App.vue"; import './static/style/common.scss' import TabBar from "@/components/TabBar/index.vue"//路径根据你的文件修改 +import myMixin from "@/pages/minix/index.js"; export function createApp() { const app = createSSRApp(App); + app.mixin(myMixin); app.use(uviewPlus); app.use(pinia); app.component('TabBar', TabBar) diff --git a/src/pages/minix/index.js b/src/pages/minix/index.js new file mode 100644 index 0000000..f10c597 --- /dev/null +++ b/src/pages/minix/index.js @@ -0,0 +1,37 @@ +export default { + data() { + return { + title1: "", + path1: "", + }; + }, + created() { + //#ifdef MP-WEIXIN + wx.showShareMenu({ + withShareTicket: true, + menus: ["shareAppMessage", "shareTimeline"], + }); + // 尝试通过 uni.getCurrentPages 获取当前页面栈，然后获取栈顶页面的路由信息 + const pages = getCurrentPages(); + if (pages.length > 0) { + const currentPage = pages[pages.length - 1]; + this.path1 = currentPage.route; + } + + //#endif + }, + //2.配置分享好友 + onShareAppMessage(res) { + return { + title: this.title1, + path: this.path1, + }; + }, + //2.配置分享到朋友圈 + onShareTimeline(res) { + return { + title: this.title1, + path: this.path1, + }; + }, +}; diff --git a/src/pagesBattery/index.vue b/src/pagesBattery/index.vue index 0a0c5bb..d04ec75 100644 --- a/src/pagesBattery/index.vue +++ b/src/pagesBattery/index.vue @@ -242,7 +242,7 @@ const callNumber = (number: any) => { .text { font-weight: 400; font-size: 28rpx; - color: #294ac7; + color: #608CF1; line-height: 42rpx; } .desc { diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue index 46a8f9c..ee23385 100644 --- a/src/pagesHome/index.vue +++ b/src/pagesHome/index.vue @@ -28,12 +28,12 @@ - 爱梵达 - 爱梵达 --> + + @@ -72,17 +77,17 @@ import { url } from "@/utils/data"; const entryItemList = ref([ { - path: "1.png", + path: "01.png", name: "报废车辆回收", url: "/pagesVehicle/index", }, { - path: "2.png", + path: "02.png", name: "电池回收", url: "/pagesBattery/index", }, { - path: "3.png", + path: "03.png", name: "废钢回收", url: "/pagesScrapSteel/index", }, diff --git a/src/pagesLogin/index.vue b/src/pagesLogin/index.vue index e039d7b..f439d5a 100644 --- a/src/pagesLogin/index.vue +++ b/src/pagesLogin/index.vue @@ -60,7 +60,7 @@ ({ { name: "汽油" }, { name: "柴油" }, { name: "油气" }, - { name: "纯电" }, - { name: "油电" }, + // { name: "纯电" }, + // { name: "油电" }, { name: "无动力" }, { name: "天然气" }, ], diff --git a/src/pagesVehicle/recovery.vue b/src/pagesVehicle/recovery.vue index e4e5856..336ba57 100644 --- a/src/pagesVehicle/recovery.vue +++ b/src/pagesVehicle/recovery.vue @@ -547,8 +547,8 @@ const contrlModalParams = reactive({ { name: "汽油" }, { name: "柴油" }, { name: "油气" }, - { name: "纯电" }, - { name: "油电" }, + // { name: "纯电" }, + // { name: "油电" }, { name: "无动力" }, { name: "天然气" }, ], diff --git a/src/pagesVehicle/registration.vue b/src/pagesVehicle/registration.vue index dc5027a..73ed836 100644 --- a/src/pagesVehicle/registration.vue +++ b/src/pagesVehicle/registration.vue @@ -548,8 +548,8 @@ const contrlModalParams = reactive({ { name: "汽油" }, { name: "柴油" }, { name: "油气" }, - { name: "纯电" }, - { name: "油电" }, + // { name: "纯电" }, + // { name: "油电" }, { name: "无动力" }, { name: "天然气" }, ], diff --git a/src/static/style/common.scss b/src/static/style/common.scss index 05d4fd5..3de439f 100644 --- a/src/static/style/common.scss +++ b/src/static/style/common.scss @@ -60,10 +60,10 @@ body { .uni-calendar-item--multiple .uni-calendar-item--after-checked, .uni-calendar-item__weeks-box .uni-calendar-item--checked, .uni-datetime-picker--btn { - background-color: #294AC7 !important; + background-color: #608CF1 !important; } .uni-datetime-picker-btn-text { - color: #294AC7 !important; + color: #608CF1 !important; } .uni-date__x-input { font-size: 12px; diff --git a/src/uni.scss b/src/uni.scss index c26c5a4..de240a3 100644 --- a/src/uni.scss +++ b/src/uni.scss @@ -17,9 +17,9 @@ /* uni.scss */ @import 'uview-plus/theme.scss'; -$u-primary: #294AC7 !important; +$u-primary: #608CF1 !important; /* 行为相关颜色 */ -$uni-color-primary: #294AC7; // #007aff +$uni-color-primary: #608CF1; // #007aff $uni-color-success: #4cd964; $uni-color-warning: #f0ad4e; $uni-color-error: #302423;