diff --git a/src/components/zd-navBar/navBar.scss b/src/components/zd-navBar/navBar.scss index 5a07cfd..0eb85a4 100644 --- a/src/components/zd-navBar/navBar.scss +++ b/src/components/zd-navBar/navBar.scss @@ -1,185 +1,185 @@ -page { - --height: 44px; /* 4*2+32 */ - --right: 40px; /* 10+87 */ - --navBarExtendHeight: 4px; - box-sizing: border-box; -} - -.lxy-nav-bar { - view, - text, - scroll-view, - input, - button, - image, - cover-view { - box-sizing: border-box; - } -} - -.lxy-nav-bar_fixed { - position: fixed; - top: 0; - z-index: 1000; -} - -.lxy-nav-bar .ios { - --height: 44px; /* 4*2+32 */ - --right: 40px; /* 10+87 */ - --navBarExtendHeight: 4px; - box-sizing: border-box; -} -.lxy-nav-bar .android { - --height: 48px; /* 8*2+32 */ - --right: 40px; /* 10+87 */ - --navBarExtendHeight: 4px; - box-sizing: border-box; -} -.lxy-nav-bar .devtools { - --height: 42px; /* 5*2+32 */ - --right: 40px; /* 10+87 */ - --navBarExtendHeight: 4px; - box-sizing: border-box; -} -.lxy-nav-bar__inner { - position: fixed; - top: 0; - left: 0; - z-index: 5001; - height: var(--height); - display: flex; - align-items: center; - padding-right: var(--right); - width: 100%; - padding-bottom: var(--navBarExtendHeight); -} -.lxy-nav-bar__inner .lxy-nav-bar__left { - position: relative; - width: var(--right); - height: 32px; - /* padding-left: 10px; */ - display: flex; - align-items: center; -} -.lxy-nav-bar__buttons { - height: 100%; - width: 100%; - display: flex; - align-items: center; - border-radius: 16px; - border: 1rpx solid rgba(204, 204, 204, 0.6); - position: relative; -} -.lxy-nav-bar__buttons.android { - border: 1rpx solid rgba(234, 234, 234, 0.6); -} -.lxy-nav-bar__buttons::after { - position: absolute; - content: ""; - width: 1rpx; - height: 18.4px; - background: rgba(204, 204, 204, 0.6); - left: 50%; - top: 50%; - transform: translate(-50%, -50%); -} -.lxy-nav-bar__buttons.android::after { - background: rgba(234, 234, 234, 0.6); -} -.lxy-nav-bar__button { - width: 100%; - height: 100%; - display: flex; - font-size: 12px; - background-repeat: no-repeat; - background-position: center center; - background-size: 1em 2em; -} - -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback:active, -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_gohome:active { - opacity: 0.5; -} -.lxy-nav-bar__inner .lxy-nav-bar__center { - font-size: 17px; - line-height: 17px; - text-align: center; - position: relative; - flex: 1; - display: -webkit-box; - display: -webkit-flex; - display: flex; - align-items: center; - justify-content: center; - padding-left: 10px; -} -.lxy-nav-bar__inner .lxy-nav-bar__center .lxy-nav-bar__center-title { - margin-top: -2px; - font-weight: bold; - white-space: nowrap; -} -.lxy-nav-bar__inner .lxy-nav-bar__loading { - font-size: 0; -} -.lxy-nav-bar__inner .lxy-nav-bar__loading .lxy-loading { - margin-left: 0; -} -.lxy-nav-bar__inner .lxy-nav-bar__right { - margin-right: 10px; -} -.lxy-nav-bar__placeholder { - height: var(--height); - background: #f8f8f8; - position: relative; - z-index: 50; -} - -.lxy-nav-bar-search { - width: 100%; - height: 100%; - display: flex; - justify-content: center; - align-items: center; - width: 100%; - height: 32px; - border-radius: 16px; - position: relative; - background: #f6f6f6; -} - -.lxy-nav-bar-search__input { - height: 100%; - display: flex; - align-items: center; - color: #999; - font-size: 15px; - line-height: 15px; -} -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E"); - background-position: 30rpx center; -} -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback.nuohe { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E"); -} -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback.white { - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z' fill='%23ffffff'/%3E%3C/svg%3E"); -} -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_gohome { - background-image: url("data:image/svg+xml,%3Csvg t='1565752242401' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4326' width='48' height='48'%3E%3Cpath d='M931.148 451.25L591.505 97.654c-21.106-21.953-49.313-34.034-79.551-34.034-30.235 0-58.448 12.081-79.554 34.034L92.76 451.25c-35.049 36.498-30.536 68.044-24.742 81.222 4.13 9.35 18.07 35.05 58.231 35.05h49.78v272.016c0 61.756 44.342 119.906 107.357 119.906h144.587v-287.87c0-30.866-4.675-48.062 26.848-48.062h114.268c31.52 0 26.845 17.196 26.845 48.061v287.872h144.588c63.013 0 107.358-58.15 107.358-119.906V567.523h49.782c40.16 0 54.1-25.7 58.229-35.05 5.793-13.18 10.306-44.726-24.743-81.224z m-33.486 60.28h-105.77v328.007c0 30.865-19.877 63.917-51.37 63.917h-88.6V671.572c0-61.761-19.79-104.05-82.832-104.05H454.821c-63.045 0-82.836 42.289-82.836 104.05v231.883h-88.599c-31.495 0-51.37-33.052-51.37-63.917V511.529H126.25c-0.984 0-1.888-3.852-2.708-3.907 1.94-3.388 5.276-11.975 10.825-17.743l339.671-353.35c10.142-10.578 24.467-17.057 38.353-16.924 13.888-0.133 27.342 6.346 37.483 16.923L889.54 489.88c5.549 5.768 8.885 14.355 10.825 17.743-0.818 0.055-1.72 3.907-2.704 3.907z' fill='%23000000' p-id='4327'%3E%3C/path%3E%3C/svg%3E"); - background-size: 22px 22px; -} -.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_gohome.white { - background-image: url("data:image/svg+xml,%3Csvg t='1565752242401' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4326' width='48' height='48'%3E%3Cpath d='M931.148 451.25L591.505 97.654c-21.106-21.953-49.313-34.034-79.551-34.034-30.235 0-58.448 12.081-79.554 34.034L92.76 451.25c-35.049 36.498-30.536 68.044-24.742 81.222 4.13 9.35 18.07 35.05 58.231 35.05h49.78v272.016c0 61.756 44.342 119.906 107.357 119.906h144.587v-287.87c0-30.866-4.675-48.062 26.848-48.062h114.268c31.52 0 26.845 17.196 26.845 48.061v287.872h144.588c63.013 0 107.358-58.15 107.358-119.906V567.523h49.782c40.16 0 54.1-25.7 58.229-35.05 5.793-13.18 10.306-44.726-24.743-81.224z m-33.486 60.28h-105.77v328.007c0 30.865-19.877 63.917-51.37 63.917h-88.6V671.572c0-61.761-19.79-104.05-82.832-104.05H454.821c-63.045 0-82.836 42.289-82.836 104.05v231.883h-88.599c-31.495 0-51.37-33.052-51.37-63.917V511.529H126.25c-0.984 0-1.888-3.852-2.708-3.907 1.94-3.388 5.276-11.975 10.825-17.743l339.671-353.35c10.142-10.578 24.467-17.057 38.353-16.924 13.888-0.133 27.342 6.346 37.483 16.923L889.54 489.88c5.549 5.768 8.885 14.355 10.825 17.743-0.818 0.055-1.72 3.907-2.704 3.907z' fill='%23ffffff' p-id='4327'%3E%3C/path%3E%3C/svg%3E"); - background-size: 22px 22px; -} -.lxy-nav-bar-search__icon { - width: 22px; - height: 22px; - display: flex; - align-items: center; - justify-content: center; - background-image: url("data:image/svg+xml,%3Csvg t='1565691512239' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='1240' width='48' height='48'%3E%3Cpath d='M819.2 798.254545L674.909091 653.963636c46.545455-48.872727 74.472727-114.036364 74.472727-186.181818 0-151.272727-123.345455-274.618182-274.618182-274.618182-151.272727 0-274.618182 123.345455-274.618181 274.618182 0 151.272727 123.345455 274.618182 274.618181 274.618182 65.163636 0 128-23.272727 174.545455-62.836364l144.290909 144.290909c2.327273 2.327273 6.981818 4.654545 11.636364 4.654546s9.309091-2.327273 11.636363-4.654546c6.981818-6.981818 6.981818-18.618182 2.327273-25.6zM235.054545 467.781818c0-132.654545 107.054545-239.709091 239.709091-239.709091 132.654545 0 239.709091 107.054545 239.709091 239.709091 0 132.654545-107.054545 239.709091-239.709091 239.709091-132.654545 0-239.709091-107.054545-239.709091-239.709091z' fill='%23999999' p-id='1241'%3E%3C/path%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-size: cover; -} +page { + --height: 44px; /* 4*2+32 */ + --right: 40px; /* 10+87 */ + --navBarExtendHeight: 4px; + box-sizing: border-box; +} + +.lxy-nav-bar { + view, + text, + scroll-view, + input, + button, + image, + cover-view { + box-sizing: border-box; + } +} + +.lxy-nav-bar_fixed { + position: fixed; + top: 0; + z-index: 1000; +} + +.lxy-nav-bar .ios { + --height: 44px; /* 4*2+32 */ + --right: 40px; /* 10+87 */ + --navBarExtendHeight: 4px; + box-sizing: border-box; +} +.lxy-nav-bar .android { + --height: 48px; /* 8*2+32 */ + --right: 40px; /* 10+87 */ + --navBarExtendHeight: 4px; + box-sizing: border-box; +} +.lxy-nav-bar .devtools { + --height: 42px; /* 5*2+32 */ + --right: 40px; /* 10+87 */ + --navBarExtendHeight: 4px; + box-sizing: border-box; +} +.lxy-nav-bar__inner { + position: fixed; + top: 0; + left: 0; + z-index: 5001; + height: var(--height); + display: flex; + align-items: center; + padding-right: var(--right); + width: 100%; + padding-bottom: var(--navBarExtendHeight); +} +.lxy-nav-bar__inner .lxy-nav-bar__left { + position: relative; + width: var(--right); + height: 32px; + /* padding-left: 10px; */ + display: flex; + align-items: center; +} +.lxy-nav-bar__buttons { + height: 100%; + width: 100%; + display: flex; + align-items: center; + border-radius: 16px; + border: 1rpx solid rgba(204, 204, 204, 0.6); + position: relative; +} +.lxy-nav-bar__buttons.android { + border: 1rpx solid rgba(234, 234, 234, 0.6); +} +.lxy-nav-bar__buttons::after { + position: absolute; + content: ""; + width: 1rpx; + height: 18.4px; + background: rgba(204, 204, 204, 0.6); + left: 50%; + top: 50%; + transform: translate(-50%, -50%); +} +.lxy-nav-bar__buttons.android::after { + background: rgba(234, 234, 234, 0.6); +} +.lxy-nav-bar__button { + width: 100%; + height: 100%; + display: flex; + font-size: 12px; + background-repeat: no-repeat; + background-position: center center; + background-size: 1em 2em; +} + +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback:active, +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_gohome:active { + opacity: 0.5; +} +.lxy-nav-bar__inner .lxy-nav-bar__center { + font-size: 17px; + line-height: 17px; + text-align: center; + position: relative; + flex: 1; + display: -webkit-box; + display: -webkit-flex; + display: flex; + align-items: center; + justify-content: center; + padding-left: 10px; +} +.lxy-nav-bar__inner .lxy-nav-bar__center .lxy-nav-bar__center-title { + margin-top: -2px; + font-weight: bold; + white-space: nowrap; +} +.lxy-nav-bar__inner .lxy-nav-bar__loading { + font-size: 0; +} +.lxy-nav-bar__inner .lxy-nav-bar__loading .lxy-loading { + margin-left: 0; +} +.lxy-nav-bar__inner .lxy-nav-bar__right { + margin-right: 10px; +} +.lxy-nav-bar__placeholder { + height: var(--height); + background: #f8f8f8; + position: relative; + z-index: 50; +} + +.lxy-nav-bar-search { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 32px; + border-radius: 16px; + position: relative; + background: #f6f6f6; +} + +.lxy-nav-bar-search__input { + height: 100%; + display: flex; + align-items: center; + color: #999; + font-size: 15px; + line-height: 15px; +} +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E"); + background-position: 30rpx center; +} +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback.nuohe { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E"); +} +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_goback.white { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z' fill='%23ffffff'/%3E%3C/svg%3E"); +} +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_gohome { + background-image: url("data:image/svg+xml,%3Csvg t='1565752242401' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4326' width='48' height='48'%3E%3Cpath d='M931.148 451.25L591.505 97.654c-21.106-21.953-49.313-34.034-79.551-34.034-30.235 0-58.448 12.081-79.554 34.034L92.76 451.25c-35.049 36.498-30.536 68.044-24.742 81.222 4.13 9.35 18.07 35.05 58.231 35.05h49.78v272.016c0 61.756 44.342 119.906 107.357 119.906h144.587v-287.87c0-30.866-4.675-48.062 26.848-48.062h114.268c31.52 0 26.845 17.196 26.845 48.061v287.872h144.588c63.013 0 107.358-58.15 107.358-119.906V567.523h49.782c40.16 0 54.1-25.7 58.229-35.05 5.793-13.18 10.306-44.726-24.743-81.224z m-33.486 60.28h-105.77v328.007c0 30.865-19.877 63.917-51.37 63.917h-88.6V671.572c0-61.761-19.79-104.05-82.832-104.05H454.821c-63.045 0-82.836 42.289-82.836 104.05v231.883h-88.599c-31.495 0-51.37-33.052-51.37-63.917V511.529H126.25c-0.984 0-1.888-3.852-2.708-3.907 1.94-3.388 5.276-11.975 10.825-17.743l339.671-353.35c10.142-10.578 24.467-17.057 38.353-16.924 13.888-0.133 27.342 6.346 37.483 16.923L889.54 489.88c5.549 5.768 8.885 14.355 10.825 17.743-0.818 0.055-1.72 3.907-2.704 3.907z' fill='%23000000' p-id='4327'%3E%3C/path%3E%3C/svg%3E"); + background-size: 22px 22px; +} +.lxy-nav-bar__inner .lxy-nav-bar__left .lxy-nav-bar__btn_gohome.white { + background-image: url("data:image/svg+xml,%3Csvg t='1565752242401' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4326' width='48' height='48'%3E%3Cpath d='M931.148 451.25L591.505 97.654c-21.106-21.953-49.313-34.034-79.551-34.034-30.235 0-58.448 12.081-79.554 34.034L92.76 451.25c-35.049 36.498-30.536 68.044-24.742 81.222 4.13 9.35 18.07 35.05 58.231 35.05h49.78v272.016c0 61.756 44.342 119.906 107.357 119.906h144.587v-287.87c0-30.866-4.675-48.062 26.848-48.062h114.268c31.52 0 26.845 17.196 26.845 48.061v287.872h144.588c63.013 0 107.358-58.15 107.358-119.906V567.523h49.782c40.16 0 54.1-25.7 58.229-35.05 5.793-13.18 10.306-44.726-24.743-81.224z m-33.486 60.28h-105.77v328.007c0 30.865-19.877 63.917-51.37 63.917h-88.6V671.572c0-61.761-19.79-104.05-82.832-104.05H454.821c-63.045 0-82.836 42.289-82.836 104.05v231.883h-88.599c-31.495 0-51.37-33.052-51.37-63.917V511.529H126.25c-0.984 0-1.888-3.852-2.708-3.907 1.94-3.388 5.276-11.975 10.825-17.743l339.671-353.35c10.142-10.578 24.467-17.057 38.353-16.924 13.888-0.133 27.342 6.346 37.483 16.923L889.54 489.88c5.549 5.768 8.885 14.355 10.825 17.743-0.818 0.055-1.72 3.907-2.704 3.907z' fill='%23ffffff' p-id='4327'%3E%3C/path%3E%3C/svg%3E"); + background-size: 22px 22px; +} +.lxy-nav-bar-search__icon { + width: 22px; + height: 22px; + display: flex; + align-items: center; + justify-content: center; + background-image: url("data:image/svg+xml,%3Csvg t='1565691512239' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='1240' width='48' height='48'%3E%3Cpath d='M819.2 798.254545L674.909091 653.963636c46.545455-48.872727 74.472727-114.036364 74.472727-186.181818 0-151.272727-123.345455-274.618182-274.618182-274.618182-151.272727 0-274.618182 123.345455-274.618181 274.618182 0 151.272727 123.345455 274.618182 274.618181 274.618182 65.163636 0 128-23.272727 174.545455-62.836364l144.290909 144.290909c2.327273 2.327273 6.981818 4.654545 11.636364 4.654546s9.309091-2.327273 11.636363-4.654546c6.981818-6.981818 6.981818-18.618182 2.327273-25.6zM235.054545 467.781818c0-132.654545 107.054545-239.709091 239.709091-239.709091 132.654545 0 239.709091 107.054545 239.709091 239.709091 0 132.654545-107.054545 239.709091-239.709091 239.709091-132.654545 0-239.709091-107.054545-239.709091-239.709091z' fill='%23999999' p-id='1241'%3E%3C/path%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-size: cover; +} diff --git a/src/patient/pages/certReslove/index.ts b/src/patient/pages/certReslove/index.ts index bed83df..c7f1d91 100644 --- a/src/patient/pages/certReslove/index.ts +++ b/src/patient/pages/certReslove/index.ts @@ -22,16 +22,13 @@ Page({ if (time === 0) { clearInterval(timer as number); timer = null; - this.setData({ - message: "1秒后自动进入", - }); this.handleSubmit(); } }, 1000); }, 1000); }, handleSubmit() { - if (this.data.message != "1秒后自动进入") return; + if (this.data.message != "0秒后自动进入") return; if (app.globalData.backPage) { wx.reLaunch({ url: app.globalData.backPage, diff --git a/src/patient/pages/getUserInfo/index.wxml b/src/patient/pages/getUserInfo/index.wxml index d1915ea..0eb67a3 100644 --- a/src/patient/pages/getUserInfo/index.wxml +++ b/src/patient/pages/getUserInfo/index.wxml @@ -1,6 +1,6 @@ diff --git a/src/patient/pages/liveDetail/index.scss b/src/patient/pages/liveDetail/index.scss index 814ea10..7ea524e 100644 --- a/src/patient/pages/liveDetail/index.scss +++ b/src/patient/pages/liveDetail/index.scss @@ -135,7 +135,7 @@ color: #ffffff; &.active { color: #484848; - background-color: #e7e7e7; + background: #e7e7e7; } } }