Merge branch 'test' into feat-websoc
@@ -85,25 +85,25 @@ const handleUpdateClick = async () => {
|
|||||||
<!-- 悬浮图标(溢出卡片顶部) -->
|
<!-- 悬浮图标(溢出卡片顶部) -->
|
||||||
<image
|
<image
|
||||||
v-if="isNewVersion"
|
v-if="isNewVersion"
|
||||||
src="../static/ota/ota-mascot.png"
|
src="https://static.shelingxingqiu.com/shootmini/static/ota/ota-mascot.png"
|
||||||
mode="aspectFit"
|
mode="aspectFit"
|
||||||
class="float-icon float-mascot"
|
class="float-icon float-mascot"
|
||||||
/>
|
/>
|
||||||
<image
|
<image
|
||||||
v-else-if="isSuccess"
|
v-else-if="isSuccess"
|
||||||
src="../static/ota/check-char.png"
|
src="https://static.shelingxingqiu.com/shootmini/static/ota/check-char.png"
|
||||||
mode="aspectFit"
|
mode="aspectFit"
|
||||||
class="float-icon float-check"
|
class="float-icon float-check"
|
||||||
/>
|
/>
|
||||||
<image
|
<image
|
||||||
v-else-if="isFailure"
|
v-else-if="isFailure"
|
||||||
src="../static/ota/close-char.png"
|
src="https://static.shelingxingqiu.com/shootmini/static/ota/close-char.png"
|
||||||
mode="aspectFit"
|
mode="aspectFit"
|
||||||
class="float-icon float-close"
|
class="float-icon float-close"
|
||||||
/>
|
/>
|
||||||
<image
|
<image
|
||||||
v-else-if="isProgress"
|
v-else-if="isProgress"
|
||||||
src="../static/ota/target-char.png"
|
src="https://static.shelingxingqiu.com/shootmini/static/ota/target-char.png"
|
||||||
mode="aspectFit"
|
mode="aspectFit"
|
||||||
class="float-icon float-target"
|
class="float-icon float-target"
|
||||||
/>
|
/>
|
||||||
@@ -111,7 +111,7 @@ const handleUpdateClick = async () => {
|
|||||||
<!-- 弹窗卡片:overflow:visible 允许按钮溢出底部,背景图通过 ota-bg-clip 独立裁剪保持圆角 -->
|
<!-- 弹窗卡片:overflow:visible 允许按钮溢出底部,背景图通过 ota-bg-clip 独立裁剪保持圆角 -->
|
||||||
<view class="ota-dialog">
|
<view class="ota-dialog">
|
||||||
<view class="ota-bg-clip">
|
<view class="ota-bg-clip">
|
||||||
<image src="../static/ota/ota-bg.png" mode="aspectFill" class="ota-bg" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/ota-bg.png" mode="aspectFill" class="ota-bg" />
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view
|
||||||
class="ota-content"
|
class="ota-content"
|
||||||
@@ -120,9 +120,9 @@ const handleUpdateClick = async () => {
|
|||||||
|
|
||||||
<!-- 发现新版本:new-ver.png 已包含标题图,不再重复文字;版本号使用 ota-ver.png 胶囊背景 -->
|
<!-- 发现新版本:new-ver.png 已包含标题图,不再重复文字;版本号使用 ota-ver.png 胶囊背景 -->
|
||||||
<block v-if="isNewVersion">
|
<block v-if="isNewVersion">
|
||||||
<image src="../static/ota/new-ver.png" mode="aspectFit" class="new-ver-img" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/new-ver.png" mode="aspectFit" class="new-ver-img" />
|
||||||
<view v-if="version" class="version-tag-wrap">
|
<view v-if="version" class="version-tag-wrap">
|
||||||
<image src="../static/ota/ota-ver.png" mode="aspectFit" class="version-tag-bg-img" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/ota-ver.png" mode="aspectFit" class="version-tag-bg-img" />
|
||||||
<text class="version-tag">{{ version }}</text>
|
<text class="version-tag">{{ version }}</text>
|
||||||
</view>
|
</view>
|
||||||
<!-- 副标题:如“新版本将优化智能弓体验”,离下方详情 12rpx -->
|
<!-- 副标题:如“新版本将优化智能弓体验”,离下方详情 12rpx -->
|
||||||
@@ -139,7 +139,7 @@ const handleUpdateClick = async () => {
|
|||||||
|
|
||||||
<!-- 更新成功:图片左边距 34rpx,文案左边距 44rpx,按钮浮动底部居中 -->
|
<!-- 更新成功:图片左边距 34rpx,文案左边距 44rpx,按钮浮动底部居中 -->
|
||||||
<block v-else-if="isSuccess">
|
<block v-else-if="isSuccess">
|
||||||
<image src="../static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
|
||||||
<text class="dialog-desc">请关机并重启智能弓</text>
|
<text class="dialog-desc">请关机并重启智能弓</text>
|
||||||
<view class="btn-group-result">
|
<view class="btn-group-result">
|
||||||
<view class="primary-btn" @click="emit('done')">
|
<view class="primary-btn" @click="emit('done')">
|
||||||
@@ -150,7 +150,7 @@ const handleUpdateClick = async () => {
|
|||||||
|
|
||||||
<!-- 更新中:复用成功标题图,正文区域展示进度条,无底部按钮 -->
|
<!-- 更新中:复用成功标题图,正文区域展示进度条,无底部按钮 -->
|
||||||
<block v-else-if="isProgress">
|
<block v-else-if="isProgress">
|
||||||
<image src="../static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
|
||||||
<view class="progress-wrap">
|
<view class="progress-wrap">
|
||||||
<view class="progress-track">
|
<view class="progress-track">
|
||||||
<view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
|
<view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
|
||||||
@@ -160,7 +160,7 @@ const handleUpdateClick = async () => {
|
|||||||
|
|
||||||
<!-- 更新失败:图片左边距 34rpx,文案左对齐 44rpx,按钮浮动底部居中 -->
|
<!-- 更新失败:图片左边距 34rpx,文案左对齐 44rpx,按钮浮动底部居中 -->
|
||||||
<block v-else-if="isFailure">
|
<block v-else-if="isFailure">
|
||||||
<image src="../static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" />
|
||||||
<text class="dialog-desc">请确保:</text>
|
<text class="dialog-desc">请确保:</text>
|
||||||
<text class="dialog-desc">1、智能弓已开启</text>
|
<text class="dialog-desc">1、智能弓已开启</text>
|
||||||
<text class="dialog-desc">2、网路连接稳定</text>
|
<text class="dialog-desc">2、网路连接稳定</text>
|
||||||
|
|||||||
@@ -632,7 +632,7 @@ onUnmounted(() => {
|
|||||||
>
|
>
|
||||||
<!-- Hero: wifi1.png 单图(已内含吉祥物) -->
|
<!-- Hero: wifi1.png 单图(已内含吉祥物) -->
|
||||||
<view class="hero-area">
|
<view class="hero-area">
|
||||||
<image src="../static/ota/wifi1.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/wifi1.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<text class="page-title" :class="{ 'connected-page-title': currentState === 'CONNECTED' }">
|
<text class="page-title" :class="{ 'connected-page-title': currentState === 'CONNECTED' }">
|
||||||
@@ -721,7 +721,7 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
<!-- UPDATING -->
|
<!-- UPDATING -->
|
||||||
<view v-else-if="currentState === 'UPDATING'" class="center-page">
|
<view v-else-if="currentState === 'UPDATING'" class="center-page">
|
||||||
<image src="../static/ota/target-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/target-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
|
||||||
<text class="page-title" style="margin-top: 24rpx;">更新中,请稍等片刻...</text>
|
<text class="page-title" style="margin-top: 24rpx;">更新中,请稍等片刻...</text>
|
||||||
<view class="progress-wrap">
|
<view class="progress-wrap">
|
||||||
<view class="progress-track">
|
<view class="progress-track">
|
||||||
@@ -733,7 +733,7 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
<!-- DONE -->
|
<!-- DONE -->
|
||||||
<view v-else-if="currentState === 'DONE'" class="center-page">
|
<view v-else-if="currentState === 'DONE'" class="center-page">
|
||||||
<image src="../static/ota/check-char.png" mode="aspectFit" style="width: 194rpx; height: 166rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/check-char.png" mode="aspectFit" style="width: 194rpx; height: 166rpx;" />
|
||||||
<text class="page-title" style="margin-top: 24rpx;">更新完成</text>
|
<text class="page-title" style="margin-top: 24rpx;">更新完成</text>
|
||||||
<text class="page-desc-white">请关机并重启智能弓</text>
|
<text class="page-desc-white">请关机并重启智能弓</text>
|
||||||
<view class="primary-btn done-btn" style="margin-top:20px" @click="handleDone">
|
<view class="primary-btn done-btn" style="margin-top:20px" @click="handleDone">
|
||||||
@@ -743,7 +743,7 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
<!-- FAILED -->
|
<!-- FAILED -->
|
||||||
<view v-else-if="currentState === 'FAILED'" class="center-page">
|
<view v-else-if="currentState === 'FAILED'" class="center-page">
|
||||||
<image src="../static/ota/close-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/close-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
|
||||||
<text class="page-title fail-title" style="margin-top: 24rpx;">更新失败</text>
|
<text class="page-title fail-title" style="margin-top: 24rpx;">更新失败</text>
|
||||||
<text class="page-desc-white">请确保:</text>
|
<text class="page-desc-white">请确保:</text>
|
||||||
<text class="page-desc-white">1、智能弓已开启</text>
|
<text class="page-desc-white">1、智能弓已开启</text>
|
||||||
@@ -756,7 +756,7 @@ onUnmounted(() => {
|
|||||||
<!-- CONNECTING 底部弹窗 -->
|
<!-- CONNECTING 底部弹窗 -->
|
||||||
<view v-if="currentState === 'CONNECTING'" class="sheet-mask">
|
<view v-if="currentState === 'CONNECTING'" class="sheet-mask">
|
||||||
<view class="sheet" :style="{ marginBottom: keyboardHeight + 'px' }" @click.stop="">
|
<view class="sheet" :style="{ marginBottom: keyboardHeight + 'px' }" @click.stop="">
|
||||||
<image src="../static/ota/ota-bg.png" mode="aspectFill" class="sheet-bg" />
|
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/ota-bg.png" mode="aspectFill" class="sheet-bg" />
|
||||||
<view class="sheet-inner">
|
<view class="sheet-inner">
|
||||||
|
|
||||||
<!-- 有密码网络 -->
|
<!-- 有密码网络 -->
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 237 B |
|
Before Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |