Merge branch 'feat-shebei' into test

src/pages/device/my-device.vue

@@ -447,12 +447,12 @@ onShow(async () => {
           <text class="highlight-text">射灵智能弓箭</text>
           <text>设备上的二维码</text>
         </view>
-        <view class="benefit-copy">
+        <!-- <view class="benefit-copy">
           <text>新设备首次绑定账号可获赠</text>
           <text class="highlight-text">6个月射灵会员礼包</text>
           <text>，</text>
           <text>该礼包仅可使用一次，请确保当前登录账号为您本人账号。</text>
-        </view>
+        </view> -->
         <button class="help-link" hover-class="none" @click="showTip = true">
           <text>没找到二维码或遇到问题&gt;</text>
         </button>
@@ -866,7 +866,7 @@ onShow(async () => {
 }
 
 .help-link {
-  margin-top: 72rpx;
+  margin-top: 36rpx;
   color: #ffd947;
   font-size: 26rpx;
   line-height: 36rpx;
@@ -874,8 +874,8 @@ onShow(async () => {
 
 .product-link {
   position: fixed;
-  bottom: 104rpx;
+  bottom: 208rpx;
-  bottom: calc(env(safe-area-inset-bottom) + 104rpx);
+  /* bottom: calc(env(safe-area-inset-bottom) + 104rpx); */
   left: 0;
   z-index: 2;
   width: 100%;

src/pages/device/ota-wifi.vue

@@ -39,6 +39,7 @@ const connectMode = ref("secure"); // secure | open | manual
 const connectError = ref("");
 const connectStatusText = ref("");
 const isSubmittingWifi = ref(false);
+const wifiSuccessVisible = ref(false);
 const keyboardHeight = ref(0);
 // 控制密码输入框是否显示明文
 const showPassword = ref(false);
@@ -364,10 +365,13 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
       secure: connectMode.value === "secure" || !!password,
     };
     connectError.value = "";
-    currentState.value = STATES.CONNECTED;
     void refreshConnectedWifiName();
     if (fromFirmwareUpdate.value) {
+      currentState.value = STATES.CONNECTED;
       openFirmwareCountdown();
+    } else {
+      // 保留配网输入界面，避免成功提示出现前先露出 WiFi 列表。
+      wifiSuccessVisible.value = true;
     }
   } catch (err) {
     if (requestId === wifiConnectRequestId) {
@@ -382,6 +386,13 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
   }
 };
 
+// 普通配网成功后，确认并收起输入界面，停留在当前 WiFi 页面。
+const confirmWifiSuccess = () => {
+  if (!wifiSuccessVisible.value) return;
+  wifiSuccessVisible.value = false;
+  currentState.value = STATES.CONNECTED;
+};
+
 // 校验用户输入并提交 WiFi 配置，不再把手机连接结果当作设备连接成功。
 const joinNetwork = () => {
   if (joinDisabled.value) return;
@@ -755,6 +766,14 @@ onUnmounted(() => {
       </view>
     </view>
 
+    <ModalDialog
+      :show="wifiSuccessVisible"
+      content="WIFI连接成功"
+      confirmText="确定"
+      :showCancel="false"
+      :onConfirm="confirmWifiSuccess"
+    ></ModalDialog>
+
     <ModalDialog
       :show="countdownVisible"
       title="WiFi连接成功"