From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_google

---
 app/src/main/assets/apps/__UNI__A2E7300/www/pages/parameterConfiguration/doubleSliderDetail.css |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/src/main/assets/apps/__UNI__A2E7300/www/pages/parameterConfiguration/doubleSliderDetail.css b/app/src/main/assets/apps/__UNI__A2E7300/www/pages/parameterConfiguration/doubleSliderDetail.css
index f345a5a..0262e40 100644
--- a/app/src/main/assets/apps/__UNI__A2E7300/www/pages/parameterConfiguration/doubleSliderDetail.css
+++ b/app/src/main/assets/apps/__UNI__A2E7300/www/pages/parameterConfiguration/doubleSliderDetail.css
@@ -1 +1 @@
-uni-view[data-v-890c3ce2],uni-scroll-view[data-v-890c3ce2],uni-swiper-item[data-v-890c3ce2]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-890c3ce2]{display:flex;align-items:center}.u-icon--left[data-v-890c3ce2]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-890c3ce2]{flex-direction:row;align-items:center}.u-icon--top[data-v-890c3ce2]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-890c3ce2]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-890c3ce2]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-890c3ce2]{color:#3c9cff}.u-icon__icon--success[data-v-890c3ce2]{color:#5ac725}.u-icon__icon--error[data-v-890c3ce2]{color:#f56c6c}.u-icon__icon--warning[data-v-890c3ce2]{color:#f9ae3d}.u-icon__icon--info[data-v-890c3ce2]{color:#909399}.u-icon__img[data-v-890c3ce2]{height:auto;will-change:transform}.u-icon__label[data-v-890c3ce2]{line-height:1}.u-navbar[data-v-f97c537c]{background-color:#fff}.u-navbar .status_bar[data-v-f97c537c]{background-color:#fff;height:var(--status-bar-height)}.u-navbar--fixed[data-v-f97c537c]{position:fixed;left:0;right:0;top:0;z-index:11;background-color:#fff}.u-navbar__content[data-v-f97c537c]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#fff;position:relative;justify-content:center}.u-navbar__content__left[data-v-f97c537c],.u-navbar__content__right[data-v-f97c537c]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-f97c537c]{left:-5px}.u-navbar__content__left--hover[data-v-f97c537c]{opacity:.7}.u-navbar__content__left__text[data-v-f97c537c]{font-size:14px;margin-left:3px}.u-navbar__content__title[data-v-f97c537c]{text-align:center;font-size:16px;font-weight:400;color:#303133}.u-navbar__content__right[data-v-f97c537c]{right:0}.u-navbar__content__right__text[data-v-f97c537c]{font-size:15px;margin-left:3px}.slider-range[data-v-d5e42edb]{position:relative;padding-top:1.25rem}.slider-range-inner[data-v-d5e42edb]{position:relative;width:100%}.slider-range.disabled .slider-bar-inner[data-v-d5e42edb]{opacity:.35}.slider-range.disabled .slider-handle-block[data-v-d5e42edb]{cursor:not-allowed}.slider-bar[data-v-d5e42edb]{position:absolute;top:50%;left:0;right:0;transform:translateY(-50%)}.slider-bar-bg[data-v-d5e42edb]{position:absolute;width:100%;height:100%;border-radius:10000px;z-index:10}.slider-bar-inner[data-v-d5e42edb]{position:absolute;width:100%;height:100%;border-radius:10000px;z-index:11}.slider-handle-block[data-v-d5e42edb]{position:absolute;top:50%;transform:translate(-50%,-50%);border-radius:50%;z-index:12}.slider-handle-block.decoration[data-v-d5e42edb]:before{position:absolute;content:"";width:.1875rem;height:.75rem;top:50%;left:29%;transform:translateY(-50%);background:#eeedf2;border-radius:.09375rem;z-index:13}.slider-handle-block.decoration[data-v-d5e42edb]:after{position:absolute;content:"";width:.1875rem;height:.75rem;top:50%;right:29%;transform:translateY(-50%);background:#eeedf2;border-radius:.09375rem;z-index:13}.range-tip[data-v-d5e42edb]{position:absolute;top:0;font-size:.75rem;color:#666;transform:translate(-50%,-100%)}.content-view[data-v-5547f0c4]{display:flex;flex-direction:column;width:23.4375rem;padding:1.3125rem 1rem;box-sizing:border-box}.top-view[data-v-5547f0c4]{display:flex;flex-direction:row;justify-content:space-between;width:100%}.top-view .top-start-view[data-v-5547f0c4],.top-view .top-end-view[data-v-5547f0c4]{display:flex;flex-direction:row;align-items:flex-start}.top-view .current-min-view[data-v-5547f0c4]{display:flex;flex-direction:column;justify-content:center;align-items:center;width:5.0625rem}.top-view .current-min-value[data-v-5547f0c4]{height:2rem;line-height:2rem;padding:0 .1875rem}.top-view .min-value-view[data-v-5547f0c4]{width:2rem;height:2rem;border-radius:1rem;background-color:#343439;text-align:center;line-height:2rem}.top-view .min-value-view[data-v-5547f0c4]:active{background-color:#38c494;color:#fff}.top-view .max-value-view[data-v-5547f0c4]{width:2rem;height:2rem;border-radius:1rem;background-color:#343439;text-align:center;line-height:2rem}.top-view .max-value-view[data-v-5547f0c4]:active{background-color:#38c494;color:#fff}.bottom-view[data-v-5547f0c4]{display:flex;margin-top:2.0625rem;align-items:center}.bottom-view .slider-view[data-v-5547f0c4]{margin:-2rem .3125rem 0;height:2rem;flex:1}
+uni-view[data-v-890c3ce2],uni-scroll-view[data-v-890c3ce2],uni-swiper-item[data-v-890c3ce2]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-890c3ce2]{display:flex;align-items:center}.u-icon--left[data-v-890c3ce2]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-890c3ce2]{flex-direction:row;align-items:center}.u-icon--top[data-v-890c3ce2]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-890c3ce2]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-890c3ce2]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-890c3ce2]{color:#3c9cff}.u-icon__icon--success[data-v-890c3ce2]{color:#5ac725}.u-icon__icon--error[data-v-890c3ce2]{color:#f56c6c}.u-icon__icon--warning[data-v-890c3ce2]{color:#f9ae3d}.u-icon__icon--info[data-v-890c3ce2]{color:#909399}.u-icon__img[data-v-890c3ce2]{height:auto;will-change:transform}.u-icon__label[data-v-890c3ce2]{line-height:1}.u-navbar[data-v-f97c537c]{background-color:#fff}.u-navbar .status_bar[data-v-f97c537c]{background-color:#fff;height:var(--status-bar-height)}.u-navbar--fixed[data-v-f97c537c]{position:fixed;left:0;right:0;top:0;z-index:11;background-color:#fff}.u-navbar__content[data-v-f97c537c]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#fff;position:relative;justify-content:center}.u-navbar__content__left[data-v-f97c537c],.u-navbar__content__right[data-v-f97c537c]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-f97c537c]{left:-5px}.u-navbar__content__left--hover[data-v-f97c537c]{opacity:.7}.u-navbar__content__left__text[data-v-f97c537c]{font-size:14px;margin-left:3px}.u-navbar__content__title[data-v-f97c537c]{text-align:center;font-size:16px;font-weight:400;color:#303133}.u-navbar__content__right[data-v-f97c537c]{right:0}.u-navbar__content__right__text[data-v-f97c537c]{font-size:15px;margin-left:3px}.slider-range[data-v-798fa6e7]{position:relative;padding-top:1.25rem}.slider-range-inner[data-v-798fa6e7]{position:relative;width:100%}.slider-range.disabled .slider-bar-inner[data-v-798fa6e7]{opacity:.35}.slider-range.disabled .slider-handle-block[data-v-798fa6e7]{cursor:not-allowed}.slider-bar[data-v-798fa6e7]{position:absolute;top:50%;left:0;right:0;transform:translateY(-50%)}.slider-bar-bg[data-v-798fa6e7]{position:absolute;width:100%;height:100%;border-radius:10000px;z-index:10}.slider-bar-inner[data-v-798fa6e7]{position:absolute;width:100%;height:100%;border-radius:10000px;z-index:11}.slider-handle-block[data-v-798fa6e7]{position:absolute;top:50%;transform:translate(-50%,-50%);border:10px solid transparent;z-index:12}.slider-handle-block.decoration[data-v-798fa6e7]:before{position:absolute;content:"";width:.1875rem;height:.75rem;top:50%;left:29%;transform:translateY(-50%);background:#eeedf2;border-radius:.09375rem;z-index:13}.slider-handle-block.decoration[data-v-798fa6e7]:after{position:absolute;content:"";width:.1875rem;height:.75rem;top:50%;right:29%;transform:translateY(-50%);background:#eeedf2;border-radius:.09375rem;z-index:13}.visual-view[data-v-798fa6e7]{position:relative;border-radius:50%;pointer-events:none}.range-tip[data-v-798fa6e7]{position:absolute;top:0;font-size:.75rem;color:#666;transform:translate(-50%,-100%)}.content-view[data-v-4f05c733]{display:flex;flex-direction:column;width:23.4375rem;padding:1.3125rem 1rem;box-sizing:border-box}.top-view[data-v-4f05c733]{display:flex;flex-direction:row;justify-content:space-between;width:100%}.top-view .top-start-view[data-v-4f05c733],.top-view .top-end-view[data-v-4f05c733]{display:flex;flex-direction:row;align-items:flex-start}.top-view .current-min-view[data-v-4f05c733]{display:flex;flex-direction:column;justify-content:center;align-items:center;width:5.0625rem}.top-view .current-min-value[data-v-4f05c733]{height:2rem;line-height:2rem;padding:0 .1875rem}.top-view .min-value-view[data-v-4f05c733]{width:2rem;height:2rem;border-radius:1rem;background-color:#343439;text-align:center;line-height:2rem}.top-view .min-value-view[data-v-4f05c733]:active{background-color:#38c494;color:#fff}.top-view .max-value-view[data-v-4f05c733]{width:2rem;height:2rem;border-radius:1rem;background-color:#343439;text-align:center;line-height:2rem}.top-view .max-value-view[data-v-4f05c733]:active{background-color:#38c494;color:#fff}.bottom-view[data-v-4f05c733]{display:flex;margin-top:2.0625rem;align-items:center}.bottom-view .slider-view[data-v-4f05c733]{margin:-2rem .3125rem 0;height:2rem;flex:1}

--
Gitblit v1.8.0