Merge branch 'test' into ota-mode

# Conflicts:
#	src/apis.js

src/pages/my-device.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
@@ -16,11 +16,13 @@ const showTip = ref(false);
 const confirmBindTip = ref(false);
 const addDevice = ref();
 const store = useStore();
-const { updateDevice } = store;
+const { updateDevice, clearDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
 const calibration = ref(false);
 const token = ref(null);
+const isSVip = computed(() => user.value.sVip === true);
+const isVip = computed(() => user.value.vip === true && !isSVip.value);
 
 // 扫描二维码方法
 const handleScan = () => {
@@ -84,13 +86,21 @@ const toFristTryPage = () => {
 };
 
 const unbindDevice = async () => {
-  await unbindDeviceAPI(device.value.deviceId);
+  try {
+    await unbindDeviceAPI(device.value.deviceId);
+  } catch (error) {
+    if (error?.type === "DEVICE_BIND_INVALID") {
+      uni.setStorageSync("calibration", false);
+      clearDevice();
+    }
+    return;
+  }
   uni.setStorageSync("calibration", false);
   uni.showToast({
     title: "解绑成功",
     icon: "success",
   });
-  device.value = {};
+  clearDevice();
 };
 
 /** 连接wifi跳转到wifi列表页面 */
@@ -127,8 +137,23 @@ const goCalibration = async () => {
   });
 };
 
-onShow(() => {
+const syncDeviceBinding = async () => {
+  if (!user.value.id) return;
+  try {
+    const devices = await getMyDevicesAPI();
+    if (devices.bindings && devices.bindings.length) {
+      updateDevice(devices.bindings[0].deviceId, devices.bindings[0].deviceName);
+    } else {
+      clearDevice();
+    }
+  } catch (error) {
+    console.log("sync device binding error", error);
+  }
+};
+
+onShow(async () => {
   calibration.value = uni.getStorageSync("calibration");
+  await syncDeviceBinding();
 });
 </script>
 
@@ -214,36 +239,49 @@ onShow(() => {
             mode="widthFix"
             :style="{ borderRadius: '50%' }"
           />
-          <text>{{ user.nickName }}</text>
+          <view
+            :class="[
+              'member-nickname',
+              isVip ? 'member-nickname--vip' : '',
+              isSVip ? 'member-nickname--svip' : '',
+            ]"
+          >
+            <text class="member-nickname__text">{{ user.nickName }}</text>
+            <text v-if="isSVip" class="member-nickname__shine">{{
+              user.nickName
+            }}</text>
+          </view>
         </view>
       </view>
-      <block v-if="calibration">
-        <SButton :onClick="toFristTryPage" width="60vw" :rounded="40"
-          >进入新手试炼</SButton
-        >
-        <view :style="{ marginTop: '15px' }">
-          <SButton
-            :onClick="backToHome"
-            backgroundColor="#fff3"
-            color="#fff"
-            width="60vw"
-            :rounded="40"
-            >返回首页</SButton
-          >
-        </view>
-      </block>
-      <block v-else>
+      <!-- <block v-if="calibration"> -->
         <view>
           <text>恭喜，你的弓箭和账号已成功绑定！</text>
           <text :style="{ color: '#fed847' }">已赠送6个月射灵世界会员</text>
         </view>
-        <SButton :onClick="goCalibration" width="60vw" :rounded="40">
+        <!-- <SButton :onClick="goCalibration" width="60vw" :rounded="40">
           开启智能弓进行校准
         </SButton>
         <text :style="{ marginTop: '20rpx', fontSize: '24rpx', color: '#fff9' }"
           >校准时弓箭激光将开启，请勿直视激光</text
-        >
-      </block>
+        > -->
+
+        <view>
+          <SButton
+          :onClick="backToHome"
+          backgroundColor="#fff3"
+          color="#fff"
+          width="60vw"
+          :rounded="40"
+          >返回首页</SButton
+          >
+        </view>
+        <view :style="{ marginTop: '15px' }">
+          <SButton :onClick="toFristTryPage" width="60vw" :rounded="40">进入新手试炼</SButton>
+        </view>
+      <!-- </block> -->
+      <!-- <block v-else>
+        
+      </block> -->
     </view>
     <view v-if="device.deviceId && !justBind" class="has-device">
       <view class="device-binded">
@@ -270,7 +308,18 @@ onShow(() => {
             mode="widthFix"
             :style="{ borderRadius: '50%' }"
           />
-          <text>{{ user.nickName }}</text>
+          <view
+            :class="[
+              'member-nickname',
+              isVip ? 'member-nickname--vip' : '',
+              isSVip ? 'member-nickname--svip' : '',
+            ]"
+          >
+            <text class="member-nickname__text">{{ user.nickName }}</text>
+            <text v-if="isSVip" class="member-nickname__shine">{{
+              user.nickName
+            }}</text>
+          </view>
         </view>
       </view>
       <view :style="{ marginTop: '240rpx' }">
@@ -404,7 +453,7 @@ onShow(() => {
   width: 140rpx;
   height: 140rpx;
   margin-bottom: 5px;
-  border-radius: 10px;
+  border-radius: 12px;
 }
 .device-binded > view > text {
   width: 120px;
@@ -413,6 +462,15 @@ onShow(() => {
   text-overflow: ellipsis;
   text-align: center;
 }
+.device-binded .member-nickname {
+  justify-content: center;
+  width: 120px;
+}
+.device-binded .member-nickname__text,
+.device-binded .member-nickname__shine {
+  font-size: 26rpx;
+  text-align: center;
+}
 .device-binded > image {
   width: 100rpx;
   margin: 0 20px;