feat: add typescript support

src/pages/home/Report.vue

@@ -3,9 +3,9 @@
     <BaseHeader backMode="light">
       <template v-slot:center>
         <span class="f16">
-          <template v-if="mode === 'video'">视频</template>
+          <template v-if="data.mode === 'video'">视频</template>
-          <template v-if="mode === 'music'">音乐</template>
+          <template v-if="data.mode === 'music'">音乐</template>
-          <template v-if="mode === 'chat'">私信</template>举报</span
+          <template v-if="data.mode === 'chat'">私信</template>举报</span
         >
       </template>
     </BaseHeader>
@@ -13,43 +13,55 @@
       <div class="title">
         <span>内容违规</span>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '色情低俗', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '色情低俗', mode: data.mode })">
         <span>色情低俗</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '时政不实信息', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '时政不实信息', mode: data.mode })"
+      >
         <span>时政不实信息</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '违法犯罪', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '违法犯罪', mode: data.mode })">
         <span>违法犯罪</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '垃圾广告、售卖假货等', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '垃圾广告、售卖假货等', mode: data.mode })"
+      >
         <span>垃圾广告、售卖假货等</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '造谣传播', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '造谣传播', mode: data.mode })">
         <span>造谣传播</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '涉嫌欺诈', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '涉嫌欺诈', mode: data.mode })">
         <span>涉嫌欺诈</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '侮辱漫骂', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '侮辱漫骂', mode: data.mode })">
         <span>侮辱漫骂</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '危险行为', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '危险行为', mode: data.mode })">
         <span>危险行为</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '涉嫌非法集资', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '涉嫌非法集资', mode: data.mode })"
+      >
         <span>涉嫌非法集资</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '价值观导向不良', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '价值观导向不良', mode: data.mode })"
+      >
         <span>价值观导向不良</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
@@ -61,20 +73,26 @@
       <div
         class="row"
         @click="
-          $nav('/home/submit-report', {
+          nav('/home/submit-report', {
             type: '侵犯名誉、隐私、肖像权等',
-            mode
+            mode: data.mode
           })
         "
       >
         <span>侵犯名誉、隐私、肖像权等</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '内容盗用本人作品', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '内容盗用本人作品', mode: data.mode })"
+      >
         <span>内容盗用本人作品</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '内容盗用他人作品', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '内容盗用他人作品', mode: data.mode })"
+      >
         <span>内容盗用他人作品</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
@@ -82,11 +100,17 @@
       <div class="title">
         <span>未成年</span>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '未成年人不当行为', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '未成年人不当行为', mode: data.mode })"
+      >
         <span>未成年人不当行为</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '内容不适合未成年观看', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '内容不适合未成年观看', mode: data.mode })"
+      >
         <span>内容不适合未成年观看</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
@@ -94,41 +118,49 @@
       <div class="title">
         <span>其他</span>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '引人不适', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '引人不适', mode: data.mode })">
         <span>引人不适</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '疑似自我伤害', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '疑似自我伤害', mode: data.mode })"
+      >
         <span>疑似自我伤害</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '诱导点赞、分享、关注', mode })">
+      <div
+        class="row"
+        @click="nav('/home/submit-report', { type: '诱导点赞、分享、关注', mode: data.mode })"
+      >
         <span>诱导点赞、分享、关注</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
-      <div class="row" @click="$nav('/home/submit-report', { type: '其他', mode })">
+      <div class="row" @click="nav('/home/submit-report', { type: '其他', mode: data.mode })">
         <span>其他</span>
         <dy-back scale=".8" direction="right"></dy-back>
       </div>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-export default {
+import { onMounted, reactive } from 'vue'
-  name: 'Report',
+import { useRoute } from 'vue-router'
-  props: {},
+import { useNav } from '@/utils/hooks/useNav'
-  data() {
+
-    return {
+defineOptions({
-      mode: 'video'
+  name: 'Report'
-    }
+})
-  },
+
-  computed: {},
+const route = useRoute()
-  created() {
+const nav = useNav()
-    this.mode = this.$route.query.mode
+const data = reactive({
-  },
+  mode: 'video'
-  activated() {},
+})
-  methods: {}
+
-}
+onMounted(() => {
+  data.mode = route.query.mode as string
+})
 </script>
 
 <style scoped lang="less">

src/pages/home/SubmitReport.vue

@@ -3,9 +3,9 @@
     <BaseHeader>
       <template v-slot:center>
         <span class="f16">
-          <template v-if="mode === 'video'">视频</template>
+          <template v-if="data.mode === 'video'">视频</template>
-          <template v-if="mode === 'music'">音乐</template>
+          <template v-if="data.mode === 'music'">音乐</template>
-          <template v-if="mode === 'chat'">私信</template>举报</span
+          <template v-if="data.mode === 'chat'">私信</template>举报</span
         >
       </template>
     </BaseHeader>
@@ -16,7 +16,7 @@
         >
       </div>
       <div class="row">
-        <span> 举报理由：{{ type }} </span>
+        <span> 举报理由：{{ data.type }} </span>
       </div>
       <div class="l-row">
         <div class="notice">举报描述(选填)</div>
@@ -26,59 +26,61 @@
             id=""
             cols="30"
             rows="10"
-            v-model="desc"
+            v-model="data.desc"
             placeholder="详细描述举报理由"
           ></textarea>
         </div>
-        <div class="text-num">{{ desc.length }}/200</div>
+        <div class="text-num">{{ data.desc.length }}/200</div>
       </div>
       <div class="upload-photo">
-        <div class="photo-wrapper" :key="index" v-for="(item, index) in photos">
+        <div class="photo-wrapper" :key="index" v-for="(item, index) in data.photos">
           <img class="photo" :src="item" alt="" />
           <img
             class="close"
             src="../../assets/img/icon/components/light-close.png"
             alt=""
-            @click="photos.pop()"
+            @click="data.photos.pop()"
           />
         </div>
-        <div class="upload" @click="upload" v-if="photos.length !== 4">
+        <div class="upload" @click="upload" v-if="data.photos.length !== 4">
           <img src="../../assets/img/icon/home/camera-gray.png" alt="" />
-          <span>{{ photos.length }}/4</span>
+          <span>{{ data.photos.length }}/4</span>
         </div>
       </div>
 
-      <dy-button type="primary" @click="$no">提交</dy-button>
+      <dy-button type="primary" @click="_no">提交</dy-button>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-export default {
+import { onMounted, reactive } from 'vue'
-  name: 'Report',
+import { useRoute } from 'vue-router'
-  props: {},
+import { _hideLoading, _no, _showLoading, _sleep } from '@/utils'
-  data() {
+
-    return {
+defineOptions({
-      type: '色情低俗',
+  name: 'SubmitReport'
-      mode: 'video',
+})
-      desc: '',
+
-      photos: []
+const route = useRoute()
-    }
+const data = reactive({
-  },
+  type: '色情低俗',
-  computed: {},
+  mode: 'video',
-  created() {
+  desc: '',
-    this.type = this.$route.query.type
+  photos: []
-    this.mode = this.$route.query.mode
+})
-  },
+
-  methods: {
+onMounted(() => {
-    async upload() {
+  data.type = route.query.type
-      this.$showLoading()
+  data.mode = route.query.mode
-      await this.$sleep(500)
+})
-      this.$hideLoading()
+
-      this.photos.push(
+async function upload() {
-        new URL(`../../assets/img/poster/${this.photos.length}.jpg`, import.meta.url).href
+  _showLoading()
-      )
+  await _sleep(500)
-    }
+  _hideLoading()
-  }
+  data.photos.push(
+    new URL(`../../assets/img/poster/${data.photos.length}.jpg`, import.meta.url).href
+  )
 }
 </script>
 

src/pages/login/Help.vue

@@ -13,17 +13,10 @@
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-export default {
+defineOptions({
-  name: 'Help',
+  name: 'Help'
-  props: {},
+})
-  data() {
-    return {}
-  },
-  computed: {},
-  created() {},
-  methods: {}
-}
 </script>
 
 <style scoped lang="less">

src/pages/login/Login.vue

@@ -2,10 +2,10 @@
   <div class="login">
     <BaseHeader mode="light" backMode="dark" backImg="close">
       <template v-slot:right>
-        <span class="f14" @click="$nav('/login/help')">帮助与设置</span>
+        <span class="f14" @click="nav('/login/help')">帮助与设置</span>
       </template>
     </BaseHeader>
-    <Loading v-if="loading.getPhone" />
+    <Loading v-if="data.loading.getPhone" />
     <div v-else class="content">
       <div class="desc">
         <div class="title">登录看朋友内容</div>
@@ -15,34 +15,34 @@
 
       <dy-button
         type="primary"
-        :loading="loading.login"
+        :loading="data.loading.login"
         :active="false"
         :loadingWithText="true"
         @click="login"
       >
-        {{ loading.login ? '登录中' : '一键登录' }}
+        {{ data.loading.login ? '登录中' : '一键登录' }}
+      </dy-button>
+      <dy-button :active="false" type="white" @click="nav('/login/other')"
+        >其他手机号码登录
       </dy-button>
-      <dy-button :active="false" type="white" @click="$nav('/login/other')"
-        >其他手机号码登录</dy-button
-      >
 
-      <div class="protocol" :class="showAnim ? 'anim-bounce' : ''">
+      <div class="protocol" :class="data.showAnim ? 'anim-bounce' : ''">
-        <Tooltip style="top: -100%; left: -10rem" v-model="showTooltip" />
+        <Tooltip style="top: -100%; left: -10rem" v-model="data.showTooltip" />
         <div class="left">
-          <Check v-model="isAgree" />
+          <Check v-model="data.isAgree" />
         </div>
         <div class="right">
           我已阅读并同意
-          <span class="link" @click="$nav('/service-protocol', { type: '“抖音”用户服务协议' })"
+          <span class="link" @click="nav('/service-protocol', { type: '“抖音”用户服务协议' })"
             >用户协议</span
           >
           和
-          <span class="link" @click="$nav('/service-protocol', { type: '“抖音”隐私政策' })"
+          <span class="link" @click="nav('/service-protocol', { type: '“抖音”隐私政策' })"
             >隐私政策</span
           >
           <div>
             以及
-            <span class="link" @click="$nav('/service-protocol', { type: '中国移动认证服务协议' })"
+            <span class="link" @click="nav('/service-protocol', { type: '中国移动认证服务协议' })"
               >《中国移动认证服务条款》</span
             >
             ，同时登录并使用抖音火山版（原“火山小视频”）和抖音
@@ -52,74 +52,72 @@
 
       <div class="other-login">
         <transition name="fade">
-          <div v-if="isOtherLogin" class="icons">
+          <div v-if="data.isOtherLogin" class="icons">
-            <img @click="$no" src="../../assets/img/icon/login/toutiao-round.png" alt="" />
+            <img @click="_no" src="../../assets/img/icon/login/toutiao-round.png" alt="" />
-            <img @click="$no" src="../../assets/img/icon/login/qq-round.webp" alt="" />
+            <img @click="_no" src="../../assets/img/icon/login/qq-round.webp" alt="" />
-            <img @click="$no" src="../../assets/img/icon/login/wechat-round.png" alt="" />
+            <img @click="_no" src="../../assets/img/icon/login/wechat-round.png" alt="" />
-            <img @click="$no" src="../../assets/img/icon/login/weibo-round.webp" alt="" />
+            <img @click="_no" src="../../assets/img/icon/login/weibo-round.webp" alt="" />
           </div>
         </transition>
       </div>
       <transition name="fade">
         <span
-          v-if="!isOtherLogin"
+          v-if="!data.isOtherLogin"
           class="other-login-text link"
-          @click="isOtherLogin = !isOtherLogin"
+          @click="data.isOtherLogin = !data.isOtherLogin"
           >其他方式登录</span
         >
       </transition>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import Check from '../../components/Check'
+import Check from '../../components/Check.vue'
-import Tooltip from './components/Tooltip'
+import Tooltip from './components/Tooltip.vue'
-import Loading from '../../components/Loading'
+import Loading from '../../components/Loading.vue'
+import { onMounted, reactive } from 'vue'
+import { useNav } from '@/utils/hooks/useNav'
+import { _no, _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  name: 'login',
+  name: 'login'
-  components: {
+})
-    Check,
+
-    Tooltip,
+const nav = useNav()
-    Loading
+const data = reactive({
-  },
+  isAgree: false,
-  data() {
+  isOtherLogin: false,
-    return {
+  showAnim: false,
-      isAgree: false,
+  showTooltip: false,
-      isOtherLogin: false,
+  loading: {
-      showAnim: false,
+    login: false,
-      showTooltip: false,
+    getPhone: false
-      loading: {
+  }
-        login: false,
+})
-        getPhone: false
+
-      }
+onMounted(() => {
-    }
+  getPhone()
-  },
+})
-  computed: {},
+
-  created() {
+async function getPhone() {
-    this.getPhone()
+  data.loading.getPhone = true
-  },
+  await _sleep(1000)
-  methods: {
+  data.loading.getPhone = false
-    async getPhone() {
+}
-      this.loading.getPhone = true
+
-      await this.$sleep(1000)
+function login() {
-      this.loading.getPhone = false
+  if (data.isAgree) {
-    },
+    data.loading.login = true
-    login() {
+  } else {
-      if (this.isAgree) {
+    if (!data.showAnim && !data.showTooltip) {
-        this.loading.login = true
+      data.showAnim = true
-      } else {
+      setTimeout(() => {
-        if (!this.showAnim && !this.showTooltip) {
+        data.showAnim = false
-          this.showAnim = true
+        data.showTooltip = true
-          setTimeout(() => {
+      }, 500)
-            this.showAnim = false
+      setTimeout(() => {
-            this.showTooltip = true
+        data.showTooltip = false
-          }, 500)
+      }, 3000)
-          setTimeout(() => {
-            this.showTooltip = false
-          }, 3000)
-        }
-      }
     }
   }
 }

src/pages/login/VerificationCode.vue

@@ -2,7 +2,7 @@
   <div class="VerificationCode">
     <BaseHeader mode="light" backMode="dark" backImg="back">
       <template v-slot:right>
-        <span class="f14" @click="$nav('/login/help')">帮助与设置</span>
+        <span class="f14" @click="nav('/login/help')">帮助与设置</span>
       </template>
     </BaseHeader>
     <div class="content">
@@ -14,91 +14,93 @@
       <LoginInput
         autofocus
         type="code"
-        v-model="code"
+        v-model="data.code"
         placeholder="请输入验证码"
-        v-model:isSendVerificationCode="isSendVerificationCode"
+        v-model:isSendVerificationCode="data.isSendVerificationCode"
         @send="sendCode"
       />
-      <div class="options" v-if="showVoiceCode">
+      <div class="options" v-if="data.showVoiceCode">
         <span> 收不到短信？<span class="link" @click="getVoiceCode">获取语音验证码</span> </span>
       </div>
 
       <dy-button
         type="primary"
-        :loading="loading"
+        :loading="data.loading"
         :active="false"
-        :disabled="code.length < 4"
+        :disabled="data.code.length < 4"
         @click="login"
       >
-        {{ loading ? '登录中' : '登录' }}
+        {{ data.loading ? '登录中' : '登录' }}
       </dy-button>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import LoginInput from './components/LoginInput'
+import LoginInput from './components/LoginInput.vue'
+import { onMounted, reactive } from 'vue'
+import { useNav } from '@/utils/hooks/useNav'
+import { _hideLoading, _showConfirmDialog, _showLoading, _showNoticeDialog, _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  name: 'VerificationCode',
+  name: 'VerificationCode'
-  components: {
+})
-    LoginInput
+
-  },
+const nav = useNav()
-  data() {
+const data = reactive({
-    return {
+  showAnim: false,
-      showAnim: false,
+  showTooltip: false,
-      showTooltip: false,
+  loading: false,
-      loading: false,
+  phone: '',
-      phone: '',
+  password: '',
-      password: '',
+  code: '',
-      code: '',
+  isSendVerificationCode: true,
-      isSendVerificationCode: true,
+  showVoiceCode: false
-      showVoiceCode: false
+})
-    }
+
-  },
+onMounted(() => {
-  created() {
+  setTimeout(() => {
-    setTimeout(() => {
+    data.showVoiceCode = true
-      this.showVoiceCode = true
+  }, 3000)
-    }, 3000)
+})
-  },
+
-  methods: {
+function getVoiceCode() {
-    getVoiceCode() {
+  return _showNoticeDialog(
-      return this.$showNoticeDialog(
+    '语音验证码',
-        '语音验证码',
+    '我们将以电话的方式告知你验证码，请注意接听',
-        '我们将以电话的方式告知你验证码，请注意接听',
+    '',
-        '',
+    () => {
-        () => {
-          setTimeout(() => {
-            this.$showConfirmDialog(
-              '',
-              '您的手机可能由于空号/欠费/停机无法收到验证码，请恢复手机号状态，如果' +
-                '您因为换号无法收到验证码，可以尝试找回账号',
-              '',
-              () => {},
-              null,
-              '找回账号',
-              '返回',
-              ''
-            )
-          }, 2000)
-        },
-        '知道了'
-      )
-    },
-    //TODO loading样式不对
-    async sendCode() {
-      this.$showLoading()
-      await this.$sleep(500)
-      this.$hideLoading()
-      this.isSendVerificationCode = true
-    },
-    login() {
-      this.loading = true
       setTimeout(() => {
-        this.isSendVerificationCode = true
+        _showConfirmDialog(
-        this.loading = false
+          '',
-      }, 1000)
+          '您的手机可能由于空号/欠费/停机无法收到验证码，请恢复手机号状态，如果' +
-    }
+            '您因为换号无法收到验证码，可以尝试找回账号',
-  }
+          '',
+          () => {},
+          null,
+          '找回账号',
+          '返回',
+          ''
+        )
+      }, 2000)
+    },
+    '知道了'
+  )
+}
+
+//TODO loading样式不对
+async function sendCode() {
+  _showLoading()
+  await _sleep(500)
+  _hideLoading()
+  data.isSendVerificationCode = true
+}
+
+function login() {
+  data.loading = true
+  setTimeout(() => {
+    data.isSendVerificationCode = true
+    data.loading = false
+  }, 1000)
 }
 </script>
 

src/pages/me/MyMusic.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="MyMusic">
     <div class="header">
-      <dy-back class="back" mode="light" img="back" @click="$back" />
+      <dy-back class="back" mode="light" img="back" @click="router.back()" />
       <IndicatorLight
         name="myMusicList"
         :tabTexts="['猜你爱听', '我的收藏']"
-        v-model:active-index="slideIndex"
+        v-model:active-index="data.slideIndex"
       >
       </IndicatorLight>
       <dy-back style="opacity: 0" mode="light" img="back" />
     </div>
-    <SlideHorizontal name="myMusicList" v-model:index="slideIndex">
+    <SlideHorizontal name="myMusicList" v-model:index="data.slideIndex">
       <SlideItem>
-        <GuessMusic :list="guessMusic" />
+        <GuessMusic :list="data.guessMusic" />
       </SlideItem>
       <SlideItem style="overflow: auto">
-        <Loading style="left: 150%" v-if="loading" />
+        <Loading style="left: 150%" v-if="data.loading" />
         <div v-else class="my-collect">
           <div class="wrapper">
             <div class="play-all">
@@ -30,25 +30,25 @@
               <div
                 class="item"
                 :key="index"
-                v-for="(item, index) in collectMusic"
+                v-for="(item, index) in data.collectMusic"
                 @click="page2PlayMusic(item)"
               >
                 <div class="left">
                   <div class="cover-wrapper">
-                    <img v-lazy="$imgPreview(item.cover)" alt="" class="cover" />
+                    <img v-lazy="_checkImgUrl(item.cover)" alt="" class="cover" />
                   </div>
                   <div class="desc">
                     <span class="name">{{ item.name }}</span>
                     <div class="author">{{ item.author }}</div>
                     <div class="desc-bottom">
                       <div class="tag">完整版</div>
-                      <div class="duration">{{ $duration(item.duration) }}</div>
+                      <div class="duration">{{ _duration(item.duration) }}</div>
                     </div>
                   </div>
                 </div>
                 <div class="right">
                   <img
-                    v-if="page2SlideIndex === index"
+                    v-if="data.page2SlideIndex === index"
                     class="playing-icon"
                     src="../../assets/img/icon/me/pinlv.gif"
                   />
@@ -59,32 +59,32 @@
               <span>推荐收藏</span>
               <div class="right">
                 <span class="auto-play">自动播放</span>
-                <switches v-model="isAutoPlay" theme="bootstrap" color="success"></switches>
+                <switches v-model="data.isAutoPlay" theme="bootstrap" color="success"></switches>
               </div>
             </div>
             <div class="recommend-list">
               <div
                 class="item"
                 :key="index"
-                v-for="(item, index) in recommendMusic"
+                v-for="(item, index) in data.recommendMusic"
                 @click="page2PlayMusic(item)"
               >
                 <div class="left">
                   <div class="cover-wrapper">
-                    <img v-lazy="$imgPreview(item.cover)" alt="" class="cover" />
+                    <img v-lazy="_checkImgUrl(item.cover)" alt="" class="cover" />
                   </div>
                   <div class="desc">
                     <span class="name">{{ item.name }}</span>
                     <div class="author">{{ item.author }}</div>
                     <div class="desc-bottom">
                       <div class="tag">完整版</div>
-                      <div class="duration">{{ $duration(item.duration) }}</div>
+                      <div class="duration">{{ _duration(item.duration) }}</div>
                     </div>
                   </div>
                 </div>
                 <div class="right">
                   <img
-                    v-if="page2SlideIndex - collectMusic.length === index"
+                    v-if="data.page2SlideIndex - data.collectMusic.length === index"
                     class="playing-icon"
                     src="../../assets/img/icon/me/pinlv.gif"
                   />
@@ -105,28 +105,32 @@
             </div>
           </div>
           <transition name="float-play">
-            <div v-if="isShowFloatPlay" class="playing" @click="isShowCollectDialog = true">
+            <div
+              v-if="data.isShowFloatPlay"
+              class="playing"
+              @click="data.isShowCollectDialog = true"
+            >
               <div class="playing-wrapper">
                 <div class="cover-wrapper">
-                  <img v-lazy="$imgPreview(currentMusic.cover)" alt="" class="cover" />
+                  <img v-lazy="_checkImgUrl(data.currentMusic.cover)" alt="" class="cover" />
                 </div>
-                <div class="name">{{ currentMusic.name }}</div>
+                <div class="name">{{ data.currentMusic.name }}</div>
                 <img
-                  v-show="page2IsPlay"
+                  v-show="data.page2IsPlay"
                   @click.stop="togglePage2Play"
                   class="option"
                   src="../../assets/img/icon/me/float-pause-one.png"
                   alt=""
                 />
                 <img
-                  v-show="!page2IsPlay"
+                  v-show="!data.page2IsPlay"
                   @click.stop="togglePage2Play"
                   class="option"
                   src="../../assets/img/icon/me/float-play.png"
                   alt=""
                 />
                 <img
-                  @click.stop="$no"
+                  @click.stop="_no"
                   class="menu-list"
                   src="../../assets/img/icon/me/music-list.png"
                   alt=""
@@ -138,104 +142,104 @@
       </SlideItem>
     </SlideHorizontal>
     <transition name="my-collect-dialog">
-      <div class="my-collect-dialog" v-show="isShowCollectDialog">
+      <div class="my-collect-dialog" v-show="data.isShowCollectDialog">
         <div class="dialog-header">
-          <dy-back class="close" mode="light" img="back" @click="isShowCollectDialog = false" />
+          <dy-back
+            class="close"
+            mode="light"
+            img="back"
+            @click="data.isShowCollectDialog = false"
+          />
           <span>我的收藏</span>
           <dy-back style="opacity: 0" mode="light" img="back" />
         </div>
         <CollectMusic
           ref="CollectMusic"
           :list="page2Music"
-          v-model:page2SlideIndex="page2SlideIndex"
+          v-model:page2SlideIndex="data.page2SlideIndex"
         />
       </div>
     </transition>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { mapState } from 'pinia'
+import Switches from '../message/components/swtich/switches.vue'
-import Switches from '../message/components/swtich/switches'
+import IndicatorLight from '../../components/slide/IndicatorLight.vue'
-import IndicatorLight from '../../components/slide/IndicatorLight'
+import GuessMusic from './components/GuessMusic.vue'
-import GuessMusic from './components/GuessMusic'
+import Loading from '../../components/Loading.vue'
-import CollectMusic from './components/CollectMusic'
-import Loading from '../../components/Loading'
 import { userCollect } from '@/api/user'
 import { useBaseStore } from '@/store/pinia'
+import { computed, onMounted, reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useNav } from '@/utils/hooks/useNav'
+import { _checkImgUrl, _duration, _no } from '@/utils'
 
+defineOptions({
+  name: 'MyMusic'
+})
+
+const router = useRouter()
+const CollectMusic = ref()
+const data = reactive({
+  loading: false,
+  slideIndex: 1,
+  currentMusic: {
+    name: '告白气球',
+    mp3: 'https://mp32.9ku.com/upload/128/2017/02/05/858423.mp3',
+    cover: new URL('../../assets/img/music-cover/7.jpg', import.meta.url).href,
+    author: '周杰伦',
+    duration: 60,
+    use_count: 37441000,
+    is_collect: false,
+    is_play: false
+  },
+  collectMusic: [],
+  recommendMusic: [],
+  guessMusic: [],
+
+  isShowCollectDialog: false,
+  isShowFloatPlay: false,
+
+  isAutoPlay: true,
+  isCollect: false,
+
+  page2SlideIndex: -1,
+  page2IsPlay: false
+})
 //TODO 两个page页面的播放冲突未做
-export default {
+onMounted(() => {
-  name: 'MyMusic',
+  getCollectMusic()
-  components: {
+})
-    Switches,
-    IndicatorLight,
-    GuessMusic,
-    CollectMusic,
-    Loading
-  },
-  data() {
-    return {
-      loading: false,
-      slideIndex: 1,
-      currentMusic: {
-        name: '告白气球',
-        mp3: 'https://mp32.9ku.com/upload/128/2017/02/05/858423.mp3',
-        cover: new URL('../../assets/img/music-cover/7.jpg', import.meta.url).href,
-        author: '周杰伦',
-        duration: 60,
-        use_count: 37441000,
-        is_collect: false,
-        is_play: false
-      },
-      collectMusic: [],
-      recommendMusic: [],
-      guessMusic: [],
 
-      isShowCollectDialog: false,
+const page2Music = computed(() => {
-      isShowFloatPlay: false,
+  return data.collectMusic.concat(data.recommendMusic)
+})
 
-      isAutoPlay: true,
+function togglePage2Play() {
-      isCollect: false,
+  data.page2IsPlay = !data.page2IsPlay
+  if (data.page2IsPlay) {
+    CollectMusic.value.play(data.page2SlideIndex)
+  } else {
+    CollectMusic.value.pause()
+  }
+}
 
-      page2SlideIndex: -1,
+function page2PlayMusic(item) {
-      page2IsPlay: false
+  data.currentMusic = item
-    }
+  data.isShowFloatPlay = true
-  },
+  data.page2IsPlay = true
-  computed: {
+  data.page2SlideIndex = page2Music.value.findIndex((v) => v.name === item.name)
-    ...mapState(useBaseStore, ['bodyWidth']),
+  data.isShowCollectDialog = true
-    page2Music() {
+  CollectMusic.value.play(data.page2SlideIndex)
-      return this.collectMusic.concat(this.recommendMusic)
+}
-    }
+
-  },
+async function getCollectMusic() {
-  created() {
+  data.loading = true
-    this.getCollectMusic()
+  let res: any = await userCollect()
-  },
+  data.loading = false
-  methods: {
+  if (res.success) {
-    togglePage2Play() {
+    data.collectMusic = res.data.music.list.slice(0, 2)
-      this.page2IsPlay = !this.page2IsPlay
+    data.guessMusic = data.recommendMusic = res.data.music.list.slice(2, -1)
-      if (this.page2IsPlay) {
-        this.$refs.CollectMusic.play(this.page2SlideIndex)
-      } else {
-        this.$refs.CollectMusic.pause()
-      }
-    },
-    page2PlayMusic(item) {
-      this.currentMusic = item
-      this.isShowFloatPlay = true
-      this.page2IsPlay = true
-      this.page2SlideIndex = this.page2Music.findIndex((v) => v.name === item.name)
-      this.isShowCollectDialog = true
-      this.$refs.CollectMusic.play(this.page2SlideIndex)
-    },
-    async getCollectMusic() {
-      this.loading = true
-      let res = await userCollect()
-      this.loading = false
-      if (res.code === this.SUCCESS) {
-        this.collectMusic = res.data.music.list.slice(0, 2)
-        this.guessMusic = this.recommendMusic = res.data.music.list.slice(2, -1)
-      }
-    }
   }
 }
 </script>

src/pages/me/MyRequestUpdate.vue

@@ -8,34 +8,27 @@
     <div class="content">
       <div class="request">
         <div class="list">
-          <div class="item" :key="i" v-for="(item, i) in friends.all">
+          <div class="item" :key="i" v-for="(item, i) in store.friends.all">
             <div class="left">
-              <img :src="$imgPreview(item.avatar)" />
+              <img :src="_checkImgUrl(item.avatar)" />
               <span class="name">{{ item.name }}</span>
             </div>
-            <span class="time">{{ $dateFormat(item.lastLoginTime, 'D') }}</span>
+            <span class="time">{{ _dateFormat(item.lastLoginTime, 'D') }}</span>
           </div>
         </div>
       </div>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { mapState } from 'pinia'
 import { useBaseStore } from '@/store/pinia'
+import { _checkImgUrl, _dateFormat } from '../../utils'
 
-export default {
+const store = useBaseStore()
-  name: 'MyRequestUpdate',
+
-  components: {},
+defineOptions({
-  data() {
+  name: 'MyRequestUpdate'
-    return {}
+})
-  },
-  computed: {
-    ...mapState(useBaseStore, ['friends'])
-  },
-  created() {},
-  methods: {}
-}
 </script>
 
 <style scoped lang="less">

src/pages/me/RequestUpdate.vue

@@ -9,12 +9,12 @@
           <img
             src="../../assets/img/icon/menu-gray.png"
             style="width: 20rem"
-            @click="isShowOption = true"
+            @click="data.isShowOption = true"
           />
         </div>
       </template>
     </BaseHeader>
-    <Loading v-if="loading" />
+    <Loading v-if="data.loading" />
     <div v-else class="content">
       <div class="none" v-if="false">
         <img src="../../assets/img/icon/none-bg1.webp" alt="" />
@@ -26,22 +26,22 @@
         <!--        <div class="subtitle f12">上次发布作品：2020-08-01 上次开播：昨天23:12</div>-->
         <div class="subtitle f12">历史求更新（粉丝送礼后7天未开播则退还礼物）</div>
         <div class="list">
-          <div class="item" :key="i" v-for="(item, i) in friends.all">
+          <div class="item" :key="i" v-for="(item, i) in store.friends.all">
             <div class="left">
-              <img :src="$imgPreview(item.avatar)" />
+              <img :src="_checkImgUrl(item.avatar)" />
               <span class="name">{{ item.name }}</span>
             </div>
-            <span class="time">{{ $dateFormat(item.lastLoginTime, 'D') }}</span>
+            <span class="time">{{ _dateFormat(item.lastLoginTime, 'D') }}</span>
           </div>
         </div>
         <no-more>最多展示100位粉丝的历史求更新记录</no-more>
       </div>
     </div>
     <div class="buttons">
-      <dy-button type="white" :border="false" :active="false" @click="$nav('/publish')"
+      <dy-button type="white" :border="false" :active="false" @click="nav('/publish')"
-        >发布作品</dy-button
+        >发布作品
-      >
+      </dy-button>
-      <dy-button type="primary" :active="false" @click="$no">去直播</dy-button>
+      <dy-button type="primary" :active="false" @click="_no">去直播</dy-button>
     </div>
 
     <from-bottom-dialog
@@ -49,53 +49,53 @@
       height="160rem"
       :show-heng-gang="false"
       mode="white"
-      v-model="isShowOption"
+      v-model="data.isShowOption"
     >
       <div class="l-row" @click="toggleRequestUpdate">
-        {{ openRequestUpdate ? '关闭' : '开启' }}求更新提醒
+        {{ data.openRequestUpdate ? '关闭' : '开启' }}求更新提醒
       </div>
-      <div class="l-row" @click="$nav('/me/my-request-update')">我的求更新提醒</div>
+      <div class="l-row" @click="nav('/me/my-request-update')">我的求更新提醒</div>
       <div class="space"></div>
-      <div class="l-row" @click="isShowOption = false">取消</div>
+      <div class="l-row" @click="data.isShowOption = false">取消</div>
     </from-bottom-dialog>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { mapState } from 'pinia'
+import FromBottomDialog from '../../components/dialog/FromBottomDialog.vue'
-import FromBottomDialog from '../../components/dialog/FromBottomDialog'
 import { useBaseStore } from '@/store/pinia'
+import { onMounted, reactive } from 'vue'
+import { useNav } from '@/utils/hooks/useNav'
+import { _checkImgUrl, _dateFormat, _notice, _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  name: 'RequestUpdate',
+  name: 'RequestUpdate'
-  components: { FromBottomDialog },
+})
-  data() {
+
-    return {
+const nav = useNav()
-      isShowOption: false,
+const store = useBaseStore()
-      loading: false,
+const data = reactive({
-      openRequestUpdate: true
+  isShowOption: false,
-    }
+  loading: false,
-  },
+  openRequestUpdate: true
-  computed: {
+})
-    ...mapState(useBaseStore, ['friends'])
+
-  },
+onMounted(() => {
-  created() {
+  getData()
-    this.getData()
+})
-  },
+
-  methods: {
+async function getData() {
-    async getData() {
+  data.loading = true
-      this.loading = true
+  await _sleep(700)
-      await this.$sleep(700)
+  data.loading = false
-      this.loading = false
+}
-    },
+
-    toggleRequestUpdate() {
+function toggleRequestUpdate() {
-      this.openRequestUpdate = !this.openRequestUpdate
+  data.openRequestUpdate = !data.openRequestUpdate
-      this.isShowOption = false
+  data.isShowOption = false
-      if (this.openRequestUpdate) {
+  if (data.openRequestUpdate) {
-        this.$notice('提醒已开启，再次点击可关闭')
+    _notice('提醒已开启，再次点击可关闭')
-      } else {
+  } else {
-        this.$notice('提醒已关闭，再次点击可开启')
+    _notice('提醒已关闭，再次点击可开启')
-      }
-    }
   }
 }
 </script>

src/pages/message/RedPacketDetail.vue

@@ -2,48 +2,43 @@
   <div id="RedPacketDetail">
     <BaseHeader mode="light">
       <template v-slot:right>
-        <span @click="$no" class="f14" style="color: rgb(193, 135, 79)">红包记录</span>
+        <span @click="_no" class="f14" style="color: rgb(193, 135, 79)">红包记录</span>
       </template>
     </BaseHeader>
     <div class="content">
       <div class="wrapper">
-        <img :src="_checkImgUrl(userinfo.cover_url[0].url_list[0])" alt="" class="avatar" />
+        <img :src="_checkImgUrl(store.userinfo.cover_url[0].url_list[0])" alt="" class="avatar" />
-        <span class="belong">{{ userinfo.nickname }}的红包</span>
+        <span class="belong">{{ store.userinfo.nickname }}的红包</span>
         <div class="password">大吉大利</div>
         <span class="money">0.01元</span>
         <!--        <span class="notice" @click="$nav('/me/money')">已存入我的零钱，可直接使用></span>-->
-        <span class="notice" @click="$no">已存入我的零钱，可直接使用></span>
+        <span class="notice" @click="_no">已存入我的零钱，可直接使用></span>
       </div>
       <img src="../../assets/img/icon/message/chat/money-detail-bg.png" alt="" class="bg" />
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { mapState } from 'pinia'
 import { useBaseStore } from '@/store/pinia'
-import { _checkImgUrl } from '@/utils'
+import { _checkImgUrl, _no } from '@/utils'
+import { useRouter } from 'vue-router'
+import { useNav } from '@/utils/hooks/useNav'
 
-export default {
+defineOptions({
-  name: 'RedPacketDetail',
+  name: 'RedPacketDetail'
-  components: {},
+})
-  props: {
+
-    modelValue: {
+defineProps({
-      type: Boolean,
+  modelValue: {
-      default() {
+    type: Boolean,
-        return false
+    default() {
-      }
+      return false
     }
-  },
+  }
-  data() {
+})
-    return {}
+const router = useRouter()
-  },
+const nav = useNav()
-  computed: {
+const store = useBaseStore()
-    ...mapState(useBaseStore, ['userinfo'])
-  },
-  watch: {},
-  created() {},
-  methods: { _checkImgUrl }
-}
 </script>
 
 <style scoped lang="less">

src/pages/message/SetRemark.vue

@@ -14,52 +14,55 @@
     <div class="content">
       <div class="notice">备注名</div>
       <div class="input-ctn" style="margin-bottom: 1rem">
-        <input type="text" v-model="remark" placeholder="请输入备注名" />
+        <input type="text" v-model="data.remark" placeholder="请输入备注名" />
         <img
-          v-if="remark.length"
+          v-if="data.remark.length"
           class="close"
           src="../../assets/img/icon/close.svg"
           alt=""
-          @click="remark = ''"
+          @click="data.remark = ''"
         />
       </div>
-      <div class="num">{{ remark.length }}/20</div>
+      <div class="num">{{ data.remark.length }}/20</div>
     </div>
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
-export default {
+import { computed, onMounted, reactive } from 'vue'
-  name: 'SetRemark',
+import { useRouter } from 'vue-router'
-  data() {
+import { _hideLoading, _showLoading, _showSimpleConfirmDialog, _sleep } from '@/utils'
-    return {
+
-      remark: '',
+defineOptions({
-      oldRemark: ''
+  name: 'SetRemark'
-    }
+})
-  },
+
-  computed: {
+const router = useRouter()
-    isChanged() {
+const data = reactive({
-      return this.remark !== this.oldRemark
+  remark: '',
-    }
+  oldRemark: ''
-  },
+})
-  created() {},
+
-  methods: {
+const isChanged = computed(() => {
-    back() {
+  return data.remark !== data.oldRemark
-      if (this.isChanged) {
+})
-        this.$showSimpleConfirmDialog('是否保存修改', this.save, this.$back)
+onMounted(() => {})
-      } else {
+
-        this.$back()
+function back() {
-      }
+  if (isChanged.value) {
-    },
+    _showSimpleConfirmDialog('是否保存修改', save, router.back)
-    async save() {
+  } else {
-      if (!this.isChanged) return
+    router.back()
-      this.$showLoading()
-      await this.$sleep(500)
-      this.$hideLoading()
-      this.$back()
-    }
   }
 }
+
+async function save() {
+  if (!isChanged.value) return
+  _showLoading()
+  await _sleep(500)
+  _hideLoading()
+  router.back()
+}
 </script>
 
 <style scoped lang="less">

src/pages/message/Share2Friend.vue

@@ -6,20 +6,20 @@
       </template>
       <template v-slot:bottom>
         <div class="search">
-          <div class="search-select-friends" v-if="selectFriends.length">
+          <div class="search-select-friends" v-if="data.selectFriends.length">
             <div class="wrapper">
               <img
-                :src="$imgPreview(item.avatar)"
+                :src="_checkImgUrl(item.avatar)"
                 :key="i"
-                v-for="(item, i) in selectFriends"
+                v-for="(item, i) in data.selectFriends"
                 @click="toggleSelect(item)"
               />
             </div>
           </div>
           <img v-else class="search-icon" src="../../assets/img/icon/search-gray.png" alt="" />
-          <input type="text" placeholder="搜索" v-model="searchKey" />
+          <input type="text" placeholder="搜索" v-model="data.searchKey" />
           <img
-            v-if="searchKey"
+            v-if="data.searchKey"
             @click="clear"
             class="clear"
             src="../../assets/img/icon/components/gray-close-full.png"
@@ -31,36 +31,38 @@
       class="is-search"
       :style="{
         height:
-          selectFriends.length && searchResult.length
+          data.selectFriends.length && data.searchResult.length
             ? 'calc(100% - 272rem)'
             : 'calc(100% - 112rem)'
       }"
-      v-show="searchKey"
+      v-show="data.searchKey"
     >
-      <div class="list" v-if="searchResult.length">
+      <div class="list" v-if="data.searchResult.length">
         <div
           class="local-row"
           :key="i"
-          v-for="(item, i) of searchResult"
+          v-for="(item, i) of data.searchResult"
           @click="handleClick(item)"
         >
           <Check mode="red" v-model="item.select" />
-          <img :src="$imgPreview(item.avatar)" alt="" />
+          <img :src="_checkImgUrl(item.avatar)" alt="" />
           <div class="desc">
             <span class="name">
-              <span v-if="item.name.indexOf(searchKey) > -1">
+              <span v-if="item.name.indexOf(data.searchKey) > -1">
-                {{ item.name.substr(0, item.name.indexOf(searchKey))
+                {{ item.name.substr(0, item.name.indexOf(data.searchKey))
-                }}<span style="color: #ffd800">{{ searchKey }}</span
+                }}<span style="color: #ffd800">{{ data.searchKey }}</span
-                >{{ item.name.substr(item.name.indexOf(searchKey) + searchKey.length) }}
+                >{{ item.name.substr(item.name.indexOf(data.searchKey) + data.searchKey.length) }}
               </span>
               <span v-else>{{ item.name }}</span>
             </span>
             <span class="account" v-if="item.account">
               抖音号：
-              <span v-if="item.account.indexOf(searchKey) > -1">
+              <span v-if="item.account.indexOf(data.searchKey) > -1">
-                {{ item.account.substr(0, item.account.indexOf(searchKey))
+                {{ item.account.substr(0, item.account.indexOf(data.searchKey))
-                }}<span style="color: #ffd800">{{ searchKey }}</span
+                }}<span style="color: #ffd800">{{ data.searchKey }}</span
-                >{{ item.account.substr(item.account.indexOf(searchKey) + searchKey.length) }}
+                >{{
+                  item.account.substr(item.account.indexOf(data.searchKey) + data.searchKey.length)
+                }}
               </span>
               <span v-else>{{ item.account }}</span>
             </span>
@@ -75,12 +77,12 @@
     </div>
     <div
       ref="list"
-      :style="{ paddingBottom: selectFriends.length ? '160rem' : 0 }"
+      :style="{ paddingBottom: data.selectFriends.length ? '160rem' : 0 }"
       class="content"
       @scroll="scroll"
     >
       <div class="list">
-        <div class="row" @click="$nav('/message/joined-group-chat')">
+        <div class="row" @click="nav('/message/joined-group-chat')">
           <span>已加入的群聊</span>
           <dy-back :scale="0.7" direction="right"></dy-back>
         </div>
@@ -88,48 +90,48 @@
         <div
           class="local-row"
           :key="i"
-          v-for="(item, i) of friends.recent"
+          v-for="(item, i) of data.friends.recent"
           @click="toggleSelect(item)"
         >
           <Check mode="red" v-model="item.select" />
-          <img :src="$imgPreview(item.avatar)" alt="" />
+          <img :src="_checkImgUrl(item.avatar)" alt="" />
           <span>{{ item.name }}</span>
         </div>
         <div class="title">互关好友</div>
         <div
           class="local-row"
           :key="i"
-          v-for="(item, i) of friends.eachOther"
+          v-for="(item, i) of data.friends.eachOther"
           @click="toggleSelect(item)"
         >
           <Check mode="red" v-model="item.select" />
-          <img :src="$imgPreview(item.avatar)" alt="" />
+          <img :src="_checkImgUrl(item.avatar)" alt="" />
           <span>{{ item.name }}</span>
         </div>
         <div class="title">全部</div>
-        <div :key="name" v-for="(value, name) of friendsSort">
+        <div :key="name" v-for="(value, name) of data.friendsSort">
           <div :class="name === '#' ? 'top' : name" class="title">
             <span>{{ name }}</span>
           </div>
           <div class="local-row" :key="i" v-for="(item, i) of value" @click="toggleSelect(item)">
             <Check mode="red" v-model="item.select" />
-            <img :src="$imgPreview(item.avatar)" alt="" />
+            <img :src="_checkImgUrl(item.avatar)" alt="" />
             <span>{{ item.name }}</span>
           </div>
         </div>
       </div>
-      <div class="share2friend" v-if="selectFriends.length && searchResult.length">
+      <div class="share2friend" v-if="data.selectFriends.length && data.searchResult.length">
         <div class="comment">
           <textarea placeholder="有什么想和好友说的..."></textarea>
           <img class="poster" src="../../assets/img/poster/1.jpg" alt="" />
         </div>
         <div class="wrapper">
-          <div class="create-chat" v-if="selectFriends.length > 1">
+          <div class="create-chat" v-if="data.selectFriends.length > 1">
-            <Check mode="red" v-model="isCreateChat" />
+            <Check mode="red" v-model="data.isCreateChat" />
             <span>创建群聊</span>
           </div>
           <dy-button type="primary"
-            >{{ selectFriends.length > 1 ? '分别发送' : '发送' }}
+            >{{ data.selectFriends.length > 1 ? '分别发送' : '发送' }}
           </dy-button>
         </div>
       </div>
@@ -167,198 +169,208 @@
     </div>
     <div
       class="hover"
-      :style="{ top: currentFixedIndicatorTop }"
+      :style="{ top: data.currentFixedIndicatorTop }"
       ref="hover"
-      v-if="currentFixedIndicator"
+      v-if="data.currentFixedIndicator"
     >
       <img src="../../assets/img/icon/components/video/water.png" alt="" />
-      <span>{{ currentFixedIndicator }}</span>
+      <span>{{ data.currentFixedIndicator }}</span>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import Check from '../../components/Check'
+import Check from '../../components/Check.vue'
 import { friends } from '@/api/user'
 
-export default {
+import { useBaseStore } from '@/store/pinia'
-  name: 'Share2Friend',
+import { onMounted, reactive, ref, watch } from 'vue'
-  components: { Check },
+import { useRouter } from 'vue-router'
-  props: {},
+import { useNav } from '@/utils/hooks/useNav'
-  computed: {
+import { _checkImgUrl, cloneDeep } from '@/utils'
-    // ...mapState(['friends']),
+
+defineOptions({
+  name: 'Share2Friend'
+})
+
+const router = useRouter()
+const nav = useNav()
+const store = useBaseStore()
+const data = reactive({
+  isCreateChat: false,
+  searchKey: '',
+  indexOffsetTop: {},
+  currentFixedIndicator: '',
+  currentFixedIndicatorTop: '0px',
+  friends: {
+    all: {},
+    recent: [],
+    eachOther: []
   },
-  data() {
+  selectFriends: [],
-    return {
+  friendsSort: {},
-      isCreateChat: false,
+  searchResult: []
-      searchKey: '',
+})
-      indexOffsetTop: {},
+
-      currentFixedIndicator: '',
+onMounted(() => {
-      currentFixedIndicatorTop: 0,
+  getFriends()
-      friends: {
+  let indexs = document.querySelectorAll('.index')
-        all: {},
+  indexs.forEach((v) => {
-        recent: [],
+    data.indexOffsetTop[v.children[0].innerText] = v.offsetTop
-        eachOther: []
+  })
-      },
+  let items = document.querySelectorAll('.item')
-      selectFriends: [],
+  let item = document.querySelector(`.item:nth-child(2)`)
-      friendsSort: {},
+  let itemHeight = item.clientHeight
-      searchResult: []
+  let ul = document.querySelector('.indicator')
-    }
+  let ulOffsetTop = ul.offsetTop
-  },
+  let resetColor = 'rgb(143, 143, 158)'
-  watch: {
+  ul.addEventListener('touchstart', (e) => {
-    searchKey(newVal) {
+    let pageY = e.touches[0].pageY - ulOffsetTop
-      let temp = this.$clone(this.friends.all)
+    let currentIndex = pageY / itemHeight
-      temp.map((v) => {
+    currentIndex = Math.floor(currentIndex)
-        if (this.selectFriends.find((w) => w.id === v.id)) v.select = true
+    render(currentIndex)
-      })
+    data.currentFixedIndicatorTop = e.touches[0].pageY - 28 + 'px'
-      this.searchResult = temp.filter((v) => {
+  })
-        return v.name.includes(newVal) || v.account.includes(newVal)
+  ul.addEventListener('touchmove', (e) => {
-      })
+    let pageY = e.touches[0].pageY - ulOffsetTop
-    }
+    data.currentFixedIndicatorTop = e.touches[0].pageY - 28 + 'px'
-  },
+
-  created() {
+    let currentIndex = pageY / itemHeight
-    this.getFriends()
+    currentIndex = Math.floor(currentIndex)
-  },
+    if (currentIndex >= 0 && currentIndex < 27) {
-  mounted() {
-    let indexs = document.querySelectorAll('.index')
-    indexs.forEach((v) => {
-      this.indexOffsetTop[v.children[0].innerText] = v.offsetTop
-    })
-    let items = document.querySelectorAll('.item')
-    let item = document.querySelector(`.item:nth-child(2)`)
-    let itemHeight = item.clientHeight
-    let ul = document.querySelector('.indicator')
-    let ulOffsetTop = ul.offsetTop
-    let resetColor = 'rgb(143, 143, 158)'
-    ul.addEventListener('touchstart', (e) => {
-      let pageY = e.touches[0].pageY - ulOffsetTop
-      let currentIndex = pageY / itemHeight
-      currentIndex = Math.floor(currentIndex)
       render(currentIndex)
-      this.currentFixedIndicatorTop = e.touches[0].pageY - 28 + 'px'
-    })
-    ul.addEventListener('touchmove', (e) => {
-      let pageY = e.touches[0].pageY - ulOffsetTop
-      this.currentFixedIndicatorTop = e.touches[0].pageY - 28 + 'px'
-
-      let currentIndex = pageY / itemHeight
-      currentIndex = Math.floor(currentIndex)
-      if (currentIndex >= 0 && currentIndex < 27) {
-        render(currentIndex)
-      }
-    })
-    ul.addEventListener('touchend', () => {
-      return (this.currentFixedIndicator = '')
-    })
-    let render = (currentIndex) => {
-      items.forEach((el) => {
-        el.style.color = resetColor
-      })
-      items[currentIndex].style.color = '#fff'
-      this.currentFixedIndicator = items[currentIndex].innerText
-      this.goto(items[currentIndex])
     }
-  },
+  })
-  methods: {
+  ul.addEventListener('touchend', () => {
-    handleClick(item) {
+    return (data.currentFixedIndicator = '')
-      this.toggleSelect(item)
+  })
-      this.searchKey = ''
+  let render = (currentIndex) => {
-    },
+    items.forEach((el) => {
-    clear() {
+      el.style.color = resetColor
-      console.log('clear')
+    })
-      this.searchKey = ''
+    items[currentIndex].style.color = '#fff'
-    },
+    data.currentFixedIndicator = items[currentIndex].innerText
-    toggleSelect(item) {
+    goto(items[currentIndex])
-      //减少判断次数，找到了就跳出循环
+  }
-      for (let i = 0; i < this.friends.recent.length; i++) {
+})
-        let v = this.friends.recent[i]
-        if (v.name === item.name) {
-          v.select = !v.select
-          break
-        }
-      }
 
-      for (let i = 0; i < this.friends.eachOther.length; i++) {
+watch(
-        let v = this.friends.eachOther[i]
+  () => data.searchKey,
-        if (v.name === item.name) {
+  (newVal) => {
-          v.select = !v.select
+    let temp = cloneDeep(data.friends.all)
-          break
+    temp.map((v) => {
-        }
+      if (data.selectFriends.find((w) => w.id === v.id)) v.select = true
-      }
+    })
+    data.searchResult = temp.filter((v) => {
+      return v.name.includes(newVal) || v.account.includes(newVal)
+    })
+  }
+)
 
-      let find = false
+function handleClick(item) {
-      let keys = Object.keys(this.friendsSort)
+  toggleSelect(item)
-      for (let i = 0; i < keys.length; i++) {
+  data.searchKey = ''
-        let k = keys[i]
+}
-        for (let j = 0; j < this.friendsSort[k].length; j++) {
-          let value = this.friendsSort[k][j]
-          if (value.name === item.name) {
-            value.select = !value.select
-            find = true
-            break
-          }
-        }
-        if (find) break
-      }
 
-      let resIndex = this.selectFriends.findIndex((v) => v.name === item.name)
+function clear() {
-      if (resIndex !== -1) {
+  console.log('clear')
-        item.select = false
+  data.searchKey = ''
-        this.selectFriends.splice(resIndex, 1)
+}
-      } else {
+
-        item.select = true
+function toggleSelect(item) {
-        this.selectFriends.push(item)
+  //减少判断次数，找到了就跳出循环
-      }
+  for (let i = 0; i < data.friends.recent.length; i++) {
-    },
+    let v = data.friends.recent[i]
-    async getFriends() {
+    if (v.name === item.name) {
-      let res = await friends()
+      v.select = !v.select
-      console.log('getFriends', res)
+      break
-      if (res.code === this.SUCCESS) {
-        this.friends = res.data
-        this.friends.all = this.friends.all.sort((a, b) => {
-          if (a.pinyin < b.pinyin) return -1
-          if (a.pinyin > b.pinyin) return 1
-          return 0
-        })
-        this.friends.all.map((v) => {
-          if (this.friendsSort[v.pinyin]) {
-            this.friendsSort[v.pinyin].push(v)
-          } else {
-            this.friendsSort[v.pinyin] = [v]
-          }
-        })
-      }
-    },
-    goto(el) {
-      let list = this.$refs.list
-      let py
-      if (el.dataset['index']) {
-        py = 'top'
-      } else {
-        py = el.innerText
-      }
-      if (document.querySelector(`.${py}`)) {
-        list.scrollTop = document.querySelector(`.${py}`).offsetTop - 100
-      }
-    },
-    scroll(e) {
-      // let isFixed = document.querySelector(`.fixed`)
-      // console.log(isFixed)
-      // let listScrollTop = e.target.scrollTop + (isFixed ? 110 : 110)
-      let listScrollTop = e.target.scrollTop + 110
-      // console.log('listScrollTop', listScrollTop)
-      let currentKey = null
-      for (const key in this.indexOffsetTop) {
-        // if (currentKey) break
-        let offsetTop = this.indexOffsetTop[key]
-        // console.log('offsetTop',offsetTop)
-        if (offsetTop < listScrollTop) {
-          currentKey = key
-        }
-      }
-      this.currentFixedIndicator = currentKey
-      // console.log('currentKey', currentKey)
     }
   }
+
+  for (let i = 0; i < data.friends.eachOther.length; i++) {
+    let v = data.friends.eachOther[i]
+    if (v.name === item.name) {
+      v.select = !v.select
+      break
+    }
+  }
+
+  let find = false
+  let keys = Object.keys(data.friendsSort)
+  for (let i = 0; i < keys.length; i++) {
+    let k = keys[i]
+    for (let j = 0; j < data.friendsSort[k].length; j++) {
+      let value = data.friendsSort[k][j]
+      if (value.name === item.name) {
+        value.select = !value.select
+        find = true
+        break
+      }
+    }
+    if (find) break
+  }
+
+  let resIndex = data.selectFriends.findIndex((v) => v.name === item.name)
+  if (resIndex !== -1) {
+    item.select = false
+    data.selectFriends.splice(resIndex, 1)
+  } else {
+    item.select = true
+    data.selectFriends.push(item)
+  }
+}
+
+async function getFriends() {
+  //TODO 这里的数据不对
+  let res = await friends()
+  console.log('getFriends', res)
+  if (res.success) {
+    data.friends = res.data
+    data.friends.all = data.friends.all.sort((a, b) => {
+      if (a.pinyin < b.pinyin) return -1
+      if (a.pinyin > b.pinyin) return 1
+      return 0
+    })
+    data.friends.all.map((v) => {
+      if (data.friendsSort[v.pinyin]) {
+        data.friendsSort[v.pinyin].push(v)
+      } else {
+        data.friendsSort[v.pinyin] = [v]
+      }
+    })
+  }
+}
+
+const list = ref()
+
+function goto(el) {
+  let py
+  if (el.dataset['index']) {
+    py = 'top'
+  } else {
+    py = el.innerText
+  }
+  if (document.querySelector(`.${py}`)) {
+    list.value.scrollTop = document.querySelector(`.${py}`).offsetTop - 100
+  }
+}
+
+function scroll(e) {
+  // let isFixed = document.querySelector(`.fixed`)
+  // console.log(isFixed)
+  // let listScrollTop = e.target.scrollTop + (isFixed ? 110 : 110)
+  let listScrollTop = e.target.scrollTop + 110
+  // console.log('listScrollTop', listScrollTop)
+  let currentKey = null
+  for (const key in data.indexOffsetTop) {
+    // if (currentKey) break
+    let offsetTop = data.indexOffsetTop[key]
+    // console.log('offsetTop',offsetTop)
+    if (offsetTop < listScrollTop) {
+      currentKey = key
+    }
+  }
+  data.currentFixedIndicator = currentKey
+  // console.log('currentKey', currentKey)
 }
 </script>
 

src/pages/message/chat/Chat.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="Chat">
-    <div class="chat-content" @touchstart="tooltipTop = -1">
+    <div class="chat-content" @touchstart="data.tooltipTop = -1">
       <div class="header">
         <div class="left">
-          <dy-back @click="$back"></dy-back>
+          <dy-back @click="router.back"></dy-back>
           <div class="badge">12</div>
           <span>zzzz</span>
         </div>
@@ -13,11 +13,11 @@
             src="../../../assets/img/icon/message/chat/call.png"
             alt=""
           />
-          <img @click="$no" src="../../../assets/img/icon/message/chat/video-white.png" alt="" />
+          <img @click="_no" src="../../../assets/img/icon/message/chat/video-white.png" alt="" />
           <img
             src="../../../assets/img/icon/menu-white.png"
             alt=""
-            @click="$nav('/message/chat/detail')"
+            @click="nav('/message/chat/detail')"
           />
         </div>
       </div>
@@ -27,22 +27,22 @@
           v-longpress="showTooltip"
           :message="item"
           :key="index"
-          v-for="(item, index) in messages"
+          v-for="(item, index) in data.messages"
         ></ChatMessage>
       </div>
       <div class="footer">
-        <div class="toolbar" v-if="!recording">
+        <div class="toolbar" v-if="!data.recording">
           <img src="../../../assets/img/icon/message/camera.png" alt="" class="camera" />
           <input
-            @click="typing = true"
+            @click="data.typing = true"
-            @blur="typing = false"
+            @blur="data.typing = false"
             type="text"
             placeholder="发送信息..."
           />
           <img @click="handleClick" src="../../../assets/img/icon/message/voice-white.png" alt="" />
           <img src="../../../assets/img/icon/message/emoji-white.png" alt="" />
           <img
-            @click="showOption = !showOption"
+            @click="data.showOption = !data.showOption"
             src="../../../assets/img/icon/message/add-white.png"
             alt=""
           />
@@ -50,12 +50,12 @@
         <div class="record" v-else>
           <span>按住 说话</span>
           <img
-            @click="recording = false"
+            @click="data.recording = false"
             src="../../../assets/img/icon/message/keyboard.png"
             alt=""
           />
         </div>
-        <div class="options" v-if="showOption">
+        <div class="options" v-if="data.showOption">
           <div class="option-wrapper">
             <div class="option">
               <img src="../../../assets/img/icon/message/photo.png" alt="" />
@@ -93,7 +93,7 @@
     <!--  长按工具栏  -->
     <transition name="tooltip">
       <!--      TODO 定位也有问题-->
-      <div class="tooltip" :style="{ top: tooltipTop + 'px' }" v-if="tooltipTop !== -1">
+      <div class="tooltip" :style="{ top: data.tooltipTop + 'px' }" v-if="data.tooltipTop !== -1">
         <div class="options">
           <img src="../../../assets/img/icon/message/chat/like.png" alt="" />
           <span>点赞</span>
@@ -128,24 +128,24 @@
         <dy-back mode="light" />
         <img src="../../../assets/img/icon/search-light.png" alt="" />
       </div>
-      <img :src="previewImg" alt="" class="img-src" />
+      <img :src="data.previewImg" alt="" class="img-src" />
       <div class="footer"></div>
     </div>
 
     <!--  红包  -->
     <transition name="scale">
-      <div class="red-packet" v-if="isShowOpenRedPacket">
+      <div class="red-packet" v-if="data.isShowOpenRedPacket">
-        <BaseMask @click="isShowOpenRedPacket = false" />
+        <BaseMask @click="data.isShowOpenRedPacket = false" />
         <div class="content">
-          <template v-if="isOpened">
+          <template v-if="data.isOpened">
             <img src="../../../assets/img/icon/message/chat/bg-open.png" alt="" class="bg" />
             <div class="wrapper">
               <div class="top">
                 <div class="money">0.01元</div>
-                <div class="belong">{{ userinfo.nickname }}的红包</div>
+                <div class="belong">{{ store.userinfo.nickname }}的红包</div>
                 <div class="password">大吉大利</div>
               </div>
-              <div class="notice" @click="$nav('/message/chat/red-packet-detail')">
+              <div class="notice" @click="nav('/message/chat/red-packet-detail')">
                 查看红包详情>
               </div>
             </div>
@@ -154,13 +154,17 @@
             <img src="../../../assets/img/icon/message/chat/bg-close.png" alt="" class="bg" />
             <div class="wrapper">
               <div class="top">
-                <img :src="_checkImgUrl(userinfo.cover_url[0].url_list[0])" alt="" class="avatar" />
+                <img
-                <div class="belong">{{ userinfo.nickname }}的红包</div>
+                  :src="_checkImgUrl(store.userinfo.cover_url[0].url_list[0])"
+                  alt=""
+                  class="avatar"
+                />
+                <div class="belong">{{ store.userinfo.nickname }}的红包</div>
                 <div class="password">大吉大利</div>
               </div>
 
-              <div class="l-button" :class="{ opening }" @click="openRedPacket">
+              <div class="l-button" :class="{ opening: data.opening }" @click="openRedPacket">
-                <template v-if="opening">
+                <template v-if="data.opening">
                   <img src="../../../assets/img/icon/loading-white.png" alt="" />
                   正在打开
                 </template>
@@ -172,23 +176,24 @@
             src="../../../assets/img/icon/message/chat/close.png"
             alt=""
             class="close"
-            @click="isShowOpenRedPacket = false"
+            @click="data.isShowOpenRedPacket = false"
           />
         </div>
       </div>
     </transition>
 
-    <Loading v-if="loading" />
+    <Loading v-if="data.loading" />
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import ChatMessage from '../components/ChatMessage'
+import ChatMessage from '../components/ChatMessage.vue'
-import { inject, nextTick } from 'vue'
+import { computed, inject, nextTick, onMounted, onUnmounted, reactive, ref } from 'vue'
-import { mapState } from 'pinia'
+import Loading from '@/components/Loading.vue'
-import Loading from '../../../components/Loading'
 import { useBaseStore } from '@/store/pinia'
-import { _checkImgUrl } from '@/utils'
+import { _checkImgUrl, _no, _sleep } from '@/utils'
 import $ from 'jquery'
+import { useRouter } from 'vue-router'
+import { useNav } from '@/utils/hooks/useNav'
 
 let CALL_STATE = {
   REJECT: 0,
@@ -224,332 +229,334 @@ let RED_PACKET_MODE = {
   SINGLE: 1,
   MULTIPLE: 2
 }
-export default {
-  name: 'Chat',
-  components: {
-    Loading,
-    ChatMessage
-  },
-  data() {
-    return {
-      previewImg: new URL('../../../assets/img/poster/3.jpg', import.meta.url).href,
-      videoCall: [],
-      MESSAGE_TYPE,
-      messages: [
-        {
-          type: MESSAGE_TYPE.TIME,
-          data: '',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
 
+defineOptions({
+  name: 'Chat'
+})
+
+const mitt = inject('mitt')
+const router = useRouter()
+const nav = useNav()
+const store = useBaseStore()
+const data = reactive({
+  previewImg: new URL('../../../assets/img/poster/3.jpg', import.meta.url).href,
+  videoCall: [],
+  MESSAGE_TYPE,
+  messages: [
+    {
+      type: MESSAGE_TYPE.TIME,
+      data: '',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+
+    {
+      type: MESSAGE_TYPE.MEME,
+      state: AUDIO_STATE.NORMAL,
+      data: new URL('../../../assets/img/poster/1.jpg', import.meta.url).href,
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      },
+      loved: [
         {
-          type: MESSAGE_TYPE.MEME,
+          id: 2,
-          state: AUDIO_STATE.NORMAL,
+          avatar: '../../assets/img/icon/head-image.jpg'
-          data: new URL('../../../assets/img/poster/1.jpg', import.meta.url).href,
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          },
-          loved: [
-            {
-              id: 2,
-              avatar: '../../assets/img/icon/head-image.jpg'
-            },
-            {
-              id: 2,
-              avatar: '../../assets/img/icon/head-image.jpg'
-            }
-          ]
         },
         {
-          type: MESSAGE_TYPE.IMAGE,
+          id: 2,
-          state: AUDIO_STATE.NORMAL,
+          avatar: '../../assets/img/icon/head-image.jpg'
-          data: new URL('../../../assets/img/poster/1.jpg', import.meta.url).href,
-          time: '2021-01-02 21:21',
-          user: {
-            id: 1,
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.IMAGE,
-          state: AUDIO_STATE.NORMAL,
-          data: new URL('../../../assets/img/poster/1.jpg', import.meta.url).href,
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          },
-          readState: READ_STATE.ARRIVED
-        },
-        {
-          type: MESSAGE_TYPE.VIDEO_CALL,
-          state: CALL_STATE.REJECT,
-          data: '2021-01-02 21:44',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.VIDEO_CALL,
-          state: CALL_STATE.RESOLVE,
-          data: '2021-01-02 21:44',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.VIDEO_CALL,
-          state: CALL_STATE.NONE,
-          data: '2021-01-02 21:44',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.AUDIO_CALL,
-          state: CALL_STATE.REJECT,
-          data: '2021-01-02 21:44',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.AUDIO_CALL,
-          state: CALL_STATE.RESOLVE,
-          data: '2021-01-02 21:44',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.AUDIO_CALL,
-          state: CALL_STATE.NONE,
-          data: '2021-01-02 21:44',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.AUDIO,
-          state: AUDIO_STATE.NORMAL,
-          data: {
-            duration: 5,
-            src: ''
-          },
-          time: '2021-01-02 21:21',
-          user: {
-            id: '1',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.AUDIO,
-          state: AUDIO_STATE.NORMAL,
-          data: {
-            duration: 10,
-            src: ''
-          },
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.TEXT,
-          data: '又在刷抖音',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.TEXT,
-          data: '我昨天@你那个视频发给我下',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.TEXT,
-          data: '我找不到了',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '1',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.TEXT,
-          data: '我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了',
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.DOUYIN_VIDEO,
-          state: VIDEO_STATE.VALID,
-          data: {
-            poster: new URL('../../../assets/img/poster/3.jpg', import.meta.url).href,
-            author: {
-              name: 'safasdfassafasdfassafasdfassafasdfas',
-              avatar: new URL('../../../assets/img/icon/head-image.jpeg', import.meta.url).href
-            },
-            title: '服了asd'
-          },
-          time: '2021-01-02 21:21',
-          user: {
-            id: '1',
-            avatar: '../../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.VIDEO,
-          state: VIDEO_STATE.VALID,
-          data: {
-            poster: new URL('../../../assets/img/poster/3.jpg', import.meta.url).href
-          },
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.RED_PACKET,
-          state: AUDIO_STATE.NORMAL,
-          mode: RED_PACKET_MODE.MULTIPLE,
-          data: {
-            money: 5.11,
-            title: '大吉大利',
-            state: '未领取'
-          },
-          time: '2021-01-02 21:21',
-          user: {
-            id: '2739632844317827',
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
-        },
-        {
-          type: MESSAGE_TYPE.RED_PACKET,
-          state: AUDIO_STATE.NORMAL,
-          mode: RED_PACKET_MODE.SINGLE,
-          data: {
-            money: 5.11,
-            title: '大吉大利',
-            state: '已过期'
-          },
-          time: '2021-01-02 21:21',
-          user: {
-            id: 1,
-            avatar: '../../assets/img/icon/head-image.jpg'
-          }
         }
-      ],
+      ]
-      typing: false,
+    },
-      loading: false,
+    {
-      opening: false,
+      type: MESSAGE_TYPE.IMAGE,
-      isOpened: false,
+      state: AUDIO_STATE.NORMAL,
-      recording: false,
+      data: new URL('../../../assets/img/poster/1.jpg', import.meta.url).href,
-      showOption: false,
+      time: '2021-01-02 21:21',
-      isShowOpenRedPacket: false,
+      user: {
-      tooltipTop: -1,
+        id: 1,
-      tooltipTopLocation: '',
+        avatar: '../../assets/img/icon/head-image.jpg'
-      mitt: inject('mitt')
+      }
+    },
+    {
+      type: MESSAGE_TYPE.IMAGE,
+      state: AUDIO_STATE.NORMAL,
+      data: new URL('../../../assets/img/poster/1.jpg', import.meta.url).href,
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      },
+      readState: READ_STATE.ARRIVED
+    },
+    {
+      type: MESSAGE_TYPE.VIDEO_CALL,
+      state: CALL_STATE.REJECT,
+      data: '2021-01-02 21:44',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.VIDEO_CALL,
+      state: CALL_STATE.RESOLVE,
+      data: '2021-01-02 21:44',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.VIDEO_CALL,
+      state: CALL_STATE.NONE,
+      data: '2021-01-02 21:44',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.AUDIO_CALL,
+      state: CALL_STATE.REJECT,
+      data: '2021-01-02 21:44',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.AUDIO_CALL,
+      state: CALL_STATE.RESOLVE,
+      data: '2021-01-02 21:44',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.AUDIO_CALL,
+      state: CALL_STATE.NONE,
+      data: '2021-01-02 21:44',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.AUDIO,
+      state: AUDIO_STATE.NORMAL,
+      data: {
+        duration: 5,
+        src: ''
+      },
+      time: '2021-01-02 21:21',
+      user: {
+        id: '1',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.AUDIO,
+      state: AUDIO_STATE.NORMAL,
+      data: {
+        duration: 10,
+        src: ''
+      },
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.TEXT,
+      data: '又在刷抖音',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.TEXT,
+      data: '我昨天@你那个视频发给我下',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.TEXT,
+      data: '我找不到了',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '1',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.TEXT,
+      data: '我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了我也找不到了',
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.DOUYIN_VIDEO,
+      state: VIDEO_STATE.VALID,
+      data: {
+        poster: new URL('../../../assets/img/poster/3.jpg', import.meta.url).href,
+        author: {
+          name: 'safasdfassafasdfassafasdfassafasdfas',
+          avatar: new URL('../../../assets/img/icon/head-image.jpeg', import.meta.url).href
+        },
+        title: '服了asd'
+      },
+      time: '2021-01-02 21:21',
+      user: {
+        id: '1',
+        avatar: '../../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.VIDEO,
+      state: VIDEO_STATE.VALID,
+      data: {
+        poster: new URL('../../../assets/img/poster/3.jpg', import.meta.url).href
+      },
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.RED_PACKET,
+      state: AUDIO_STATE.NORMAL,
+      mode: RED_PACKET_MODE.MULTIPLE,
+      data: {
+        money: 5.11,
+        title: '大吉大利',
+        state: '未领取'
+      },
+      time: '2021-01-02 21:21',
+      user: {
+        id: '2739632844317827',
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
+    },
+    {
+      type: MESSAGE_TYPE.RED_PACKET,
+      state: AUDIO_STATE.NORMAL,
+      mode: RED_PACKET_MODE.SINGLE,
+      data: {
+        money: 5.11,
+        title: '大吉大利',
+        state: '已过期'
+      },
+      time: '2021-01-02 21:21',
+      user: {
+        id: 1,
+        avatar: '../../assets/img/icon/head-image.jpg'
+      }
     }
-  },
+  ],
-  computed: {
+  typing: false,
-    isExpand() {
+  loading: false,
-      return this.showOption
+  opening: false,
-    },
+  isOpened: false,
-    isTyping() {
+  recording: false,
-      return this.typing || this.isExpand
+  showOption: false,
-    },
+  isShowOpenRedPacket: false,
-    ...mapState(useBaseStore, ['userinfo'])
+  tooltipTop: -1,
-  },
+  tooltipTopLocation: ''
-  created() {},
+})
-  mounted() {
+
-    $('img').on('load', this.scrollBottom)
+onMounted(() => {
-    this.scrollBottom()
+  $('img').on('load', scrollBottom)
-  },
+  scrollBottom()
-  unmounted() {
+})
-    $('img').off('load', this.scrollBottom)
+
-  },
+onUnmounted(() => {
-  methods: {
+  $('img').off('load', scrollBottom)
-    handleClick() {
+})
-      this.recording = true
+
-      this.showOption = false
+const isExpand = computed(() => {
-    },
+  return data.showOption
-    _checkImgUrl,
+})
-    scrollBottom() {
+const isTyping = computed(() => {
-      nextTick(() => {
+  return data.typing || isExpand
-        let wrapper = this.$refs.msgWrapper
+})
-        // console.log('wrapper.clientHeight', wrapper.clientHeight)
+
-        // console.log('wrapper.scrollHeight', wrapper.scrollHeight)
+function handleClick() {
-        wrapper.scrollTo({ top: wrapper.scrollHeight - wrapper.clientHeight })
+  data.recording = true
-      })
+  data.showOption = false
-    },
+}
-    openRedPacket() {
+
-      this.opening = true
+const msgWrapper = ref()
-      setTimeout(() => {
+
-        this.opening = false
+function scrollBottom() {
-        this.$nav('/message/chat/red-packet-detail')
+  nextTick(() => {
-      }, 1000)
+    let wrapper = msgWrapper.value
-    },
+    // console.log('wrapper.clientHeight', wrapper.clientHeight)
-    async clickItem(e) {
+    // console.log('wrapper.scrollHeight', wrapper.scrollHeight)
-      if (e.type === this.MESSAGE_TYPE.RED_PACKET) {
+    wrapper.scrollTo({ top: wrapper.scrollHeight - wrapper.clientHeight })
-        this.loading = true
+  })
-        await this.$sleep(500)
+}
-        this.loading = false
+
-        this.isOpened = e.data.state === '已过期'
+function openRedPacket() {
-        this.isShowOpenRedPacket = true
+  data.opening = true
-      }
+  setTimeout(() => {
-    },
+    data.opening = false
-    showTooltip(e) {
+    nav('/message/chat/red-packet-detail')
-      console.log(e)
+  }, 1000)
-      let wrapper = null
+}
-      e.path.map((v) => {
+
-        if (v && v.classList) {
+async function clickItem(e) {
-          if (v.classList.value === 'chat-wrapper') {
+  if (e.type === data.MESSAGE_TYPE.RED_PACKET) {
-            wrapper = v
+    data.loading = true
-          }
+    await _sleep(500)
-        }
+    data.loading = false
-      })
+    data.isOpened = e.data.state === '已过期'
-      if (wrapper) {
+    data.isShowOpenRedPacket = true
-        // console.log(wrapper.getBoundingClientRect())
+  }
-        if (wrapper.getBoundingClientRect().y - 61 > 70) {
+}
-          this.tooltipTopLocation = 'top'
+
-          this.tooltipTop = wrapper.getBoundingClientRect().y - 70
+function showTooltip(e) {
-        } else {
+  console.log(e)
-          this.tooltipTopLocation = 'bottom'
+  let wrapper = null
-          this.tooltipTop =
+  e.path.map((v) => {
-            wrapper.getBoundingClientRect().y + wrapper.getBoundingClientRect().height + 10
+    if (v && v.classList) {
-        }
+      if (v.classList.value === 'chat-wrapper') {
+        wrapper = v
       }
     }
+  })
+  if (wrapper) {
+    // console.log(wrapper.getBoundingClientRect())
+    if (wrapper.getBoundingClientRect().y - 61 > 70) {
+      data.tooltipTopLocation = 'top'
+      data.tooltipTop = wrapper.getBoundingClientRect().y - 70
+    } else {
+      data.tooltipTopLocation = 'bottom'
+      data.tooltipTop =
+        wrapper.getBoundingClientRect().y + wrapper.getBoundingClientRect().height + 10
+    }
   }
 }
 </script>

src/pages/message/chat/ChatDetail.vue

@@ -12,10 +12,10 @@
           @unfollow="unfollow(index)"
           mode="normal-add-button"
           :key="index"
-          v-for="(item, index) in list"
+          v-for="(item, index) in data.list"
           :people="item"
         />
-        <div class="add-people" @click="$nav('/message/share-to-friend')">
+        <div class="add-people" @click="nav('/message/share-to-friend')">
           <img src="../../../assets/img/icon/message/chat/add.png" alt="" class="head-image" />
           <div class="name">多人聊天</div>
         </div>
@@ -24,28 +24,28 @@
         <div class="row">
           <div class="left">消息免打扰</div>
           <div class="right">
-            <switches v-model="noMessage" theme="bootstrap" color="success"></switches>
+            <switches v-model="data.noMessage" theme="bootstrap" color="success"></switches>
           </div>
         </div>
         <div class="row">
           <div class="left">置顶聊天</div>
           <div class="right">
-            <switches v-model="top" theme="bootstrap" color="success"></switches>
+            <switches v-model="data.top" theme="bootstrap" color="success"></switches>
           </div>
         </div>
-        <div class="row" @click="$nav('/set-remark')">
+        <div class="row" @click="nav('/set-remark')">
           <div class="left">设备备注</div>
           <div class="right">
             <dy-back direction="right" scale=".7"></dy-back>
           </div>
         </div>
-        <div class="row" @click="$nav('/home/report', { mode: 'chat' })">
+        <div class="row" @click="nav('/home/report', { mode: 'chat' })">
           <div class="left">举报</div>
           <div class="right">
             <dy-back direction="right" scale=".7"></dy-back>
           </div>
         </div>
-        <div class="row" @click="blockDialog = true">
+        <div class="row" @click="data.blockDialog = true">
           <div class="left">拉黑</div>
           <div class="right">
             <dy-back direction="right" scale=".7"></dy-back>
@@ -53,76 +53,76 @@
         </div>
       </div>
     </div>
-    <BlockDialog v-model="blockDialog" />
+    <BlockDialog v-model="data.blockDialog" />
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import Switches from '../components/swtich/switches'
+import Switches from '../components/swtich/switches.vue'
-import People from '../../people/components/People'
+import People from '../../people/components/People.vue'
-import BlockDialog from '../components/BlockDialog'
+import BlockDialog from '../components/BlockDialog.vue'
 import CONST_VAR from '../../../utils/const_var'
 
-export default {
+import { useBaseStore } from '@/store/pinia'
-  name: 'ChatDetail',
+import { onMounted, reactive } from 'vue'
-  components: {
+import { useRouter } from 'vue-router'
-    Switches,
+import { useNav } from '@/utils/hooks/useNav'
-    People,
+import { _showConfirmDialog } from '@/utils'
-    BlockDialog
+
-  },
+defineOptions({
-  data() {
+  name: 'ChatDetail'
-    return {
+})
-      noMessage: false,
+
-      top: false,
+const router = useRouter()
-      blockDialog: false,
+const nav = useNav()
-      list: [
+const store = useBaseStore()
-        {
+const data = reactive({
-          id: '224e9a00-ffa0-4bc1-bb07-c318c7b02fa5',
+  noMessage: false,
-          avatar: new URL('../../../assets/img/icon/avatar/1.png', import.meta.url).href,
+  top: false,
-          name: '何以为家',
+  blockDialog: false,
-          sex: '',
+  list: [
-          age: null,
+    {
-          idCard: null,
+      id: '224e9a00-ffa0-4bc1-bb07-c318c7b02fa5',
-          phone: '',
+      avatar: new URL('../../../assets/img/icon/avatar/1.png', import.meta.url).href,
-          address: null,
+      name: '何以为家',
-          wechat: '',
+      sex: '',
-          password: null,
+      age: null,
-          lastLoginTime: '1629993515',
+      idCard: null,
-          createTime: '1630035089',
+      phone: '',
-          isDelete: 0,
+      address: null,
-          account: '234',
+      wechat: '',
-          pinyin: 'M',
+      password: null,
-          select: false,
+      lastLoginTime: '1629993515',
-          type: CONST_VAR.RELATE_ENUM.FOLLOW_EACH_OTHER
+      createTime: '1630035089',
-        }
+      isDelete: 0,
-      ]
+      account: '234',
-    }
+      pinyin: 'M',
-  },
+      select: false,
-  computed: {},
+      type: CONST_VAR.RELATE_ENUM.FOLLOW_EACH_OTHER
-  created() {},
-  methods: {
-    t() {
-      this.enabled = !this.enabled
-    },
-    follow(index) {
-      if (this.list[index].type === this.RELATE_ENUM.FOLLOW_ME) {
-        this.list[index].type = this.RELATE_ENUM.FOLLOW_EACH_OTHER
-      }
-    },
-    unfollow(index) {
-      this.$showConfirmDialog(
-        '正在与对方相互关注，是否不再关注该用户',
-        null,
-        'gray',
-        () => {
-          this.list[index].type = this.RELATE_ENUM.FOLLOW_ME
-        },
-        () => {},
-        '取消关注',
-        '返回'
-      )
     }
+  ]
+})
+
+onMounted(() => {})
+
+function follow(index) {
+  if (data.list[index].type === CONST_VAR.RELATE_ENUM.FOLLOW_ME) {
+    data.list[index].type = CONST_VAR.RELATE_ENUM.FOLLOW_EACH_OTHER
   }
 }
+
+function unfollow(index) {
+  _showConfirmDialog(
+    '正在与对方相互关注，是否不再关注该用户',
+    null,
+    'gray',
+    () => {
+      data.list[index].type = CONST_VAR.RELATE_ENUM.FOLLOW_ME
+    },
+    () => {},
+    '取消关注',
+    '返回'
+  )
+}
 </script>
 
 <style scoped lang="less">

src/pages/message/notice/LiveNotice.vue

@@ -5,15 +5,15 @@
         <span class="f16">直播通知</span>
       </template>
       <template v-slot:right>
-        <span class="f14" @click="$nav('/message/notice-setting', { type: 'LIVE' })">通知设置</span>
+        <span class="f14" @click="nav('/message/notice-setting', { type: 'LIVE' })">通知设置</span>
       </template>
     </BaseHeader>
-    <Loading v-if="loading" />
+    <Loading v-if="data.loading" />
     <div class="content" v-else>
       <Scroll ref="mainScroll">
         <div class="list">
           <NoMore />
-          <div class="item" :key="i" v-for="(item, i) in list" @click="goDetail(item)">
+          <div class="item" :key="i" v-for="(item, i) in data.list" @click="goDetail(item)">
             <div class="title">{{ item.title }}</div>
             <div class="time">{{ item.time }}</div>
             <div class="content-text">{{ item.content }}</div>
@@ -23,54 +23,50 @@
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { nextTick } from 'vue'
+import { nextTick, onMounted, reactive } from 'vue'
-import Scroll from '../../../components/Scroll'
+import Scroll from '@/components/Scroll.vue'
-import BasePage from '../../BasePage'
+import { useNav } from '@/utils/hooks/useNav'
+import { _no, _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  extends: BasePage,
+  name: 'LiveNotice'
-  name: 'LiveNotice',
+})
-  components: {
+
-    Scroll
+const nav = useNav()
-  },
+const data = reactive({
-  data() {
+  loading: false,
-    return {
+  list: [
-      loading: false,
+    {
-      list: [
+      title: '直播举报反馈',
-        {
+      time: '2021-10-12 12:12',
-          title: '直播举报反馈',
+      content: '你已提交对用户五五开直播内容的举报，我们会在12小时内进行处理，感谢你的监督'
-          time: '2021-10-12 12:12',
-          content: '你已提交对用户五五开直播内容的举报，我们会在12小时内进行处理，感谢你的监督'
-        },
-        {
-          title: '举报结果通知',
-          time: '2021-10-12 12:12',
-          content:
-            '你举报的【五五开】的直播内容，我们将对主播进行重点观察，并进一步判定，若发现违规立刻处理，感谢你的监督'
-        }
-      ]
-    }
-  },
-  watch: {},
-  computed: {},
-  created() {
-    this.getData()
-  },
-  methods: {
-    async getData() {
-      this.loading = true
-      await this.$sleep(700)
-      this.loading = false
-      await nextTick()
-      this.$refs.mainScroll.scrollBottom()
     },
-    goDetail(item) {
+    {
-      item.read = true
+      title: '举报结果通知',
-      if (item.detail) {
+      time: '2021-10-12 12:12',
-        this.$no()
+      content:
-      }
+        '你举报的【五五开】的直播内容，我们将对主播进行重点观察，并进一步判定，若发现违规立刻处理，感谢你的监督'
     }
+  ]
+})
+
+onMounted(() => {
+  getData()
+})
+
+async function getData() {
+  data.loading = true
+  await _sleep(700)
+  data.loading = false
+  await nextTick()
+  // data.$refs.mainScroll.scrollBottom()
+}
+
+function goDetail(item) {
+  item.read = true
+  if (item.detail) {
+    _no()
   }
 }
 </script>

src/pages/message/notice/MoneyNotice.vue

@@ -5,21 +5,19 @@
         <span class="f16">钱包通知</span>
       </template>
       <template v-slot:right>
-        <span class="f14" @click="$nav('/message/notice-setting', { type: 'MONEY' })"
+        <span class="f14" @click="nav('/message/notice-setting', { type: 'MONEY' })">通知设置</span>
-          >通知设置</span
-        >
       </template>
     </BaseHeader>
-    <Loading v-if="loading" />
+    <Loading v-if="data.loading" />
     <div class="content" v-else>
       <Scroll ref="mainScroll">
         <div class="list">
           <NoMore />
           <!--TODO 超过3行显示全文-->
-          <div class="item" :key="i" v-for="(item, i) in list" @click="$no">
+          <div class="item" :key="i" v-for="(item, i) in data.list" @click="_no">
             <div class="header">
               <div class="left">
-                <img src="../../../assets/img/icon/msg-icon9.webp" alt="" />
+                <img src="@/assets/img/icon/msg-icon9.webp" alt="" />
               </div>
               <div class="right">
                 <template v-if="item.type === 1">
@@ -29,8 +27,8 @@
                   <span>钱包任务</span>
                 </template>
                 <img
-                  @click.stop="isShowSetting = true"
+                  @click.stop="data.isShowSetting = true"
-                  src="../../../assets/img/icon/menu-gray.png"
+                  src="@/assets/img/icon/menu-gray.png"
                   alt=""
                 />
               </div>
@@ -61,74 +59,73 @@
       mode="white"
       mask-mode="dark"
       :show-heng-gang="false"
-      v-model="isShowSetting"
+      v-model="data.isShowSetting"
       height="160rem"
     >
       <div class="setting-dialog">
         <div class="row disabled">钱包任务</div>
-        <div class="row" @click="handleClick">{{ openNotice ? '关闭' : '开启' }}消息免打扰</div>
+        <div class="row" @click="handleClick">
+          {{ data.openNotice ? '关闭' : '开启' }}消息免打扰
+        </div>
         <div class="space"></div>
-        <div class="row" @click="isShowSetting = false">取消</div>
+        <div class="row" @click="data.isShowSetting = false">取消</div>
       </div>
     </from-bottom-dialog>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { nextTick } from 'vue'
+import { nextTick, onMounted, reactive } from 'vue'
-import FromBottomDialog from '../../../components/dialog/FromBottomDialog'
+import FromBottomDialog from '@/components/dialog/FromBottomDialog.vue'
-import Scroll from '../../../components/Scroll'
+import Scroll from '@/components/Scroll.vue'
-import BasePage from '../../BasePage'
+import { useNav } from '@/utils/hooks/useNav'
+import { _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  extends: BasePage,
+  name: 'MoneyNotice'
-  name: 'MoneyNotice',
+})
-  components: {
+
-    FromBottomDialog,
+const nav = useNav()
-    Scroll
+const data = reactive({
-  },
+  loading: false,
-  data() {
+  isShowSetting: false,
-    return {
+  openNotice: false,
-      loading: false,
+  list: [
-      isShowSetting: false,
+    {
-      openNotice: false,
+      type: 1,
-      list: [
+      toAccountType: '退回银行卡(工商银行3333)',
-        {
+      title: '红色退款发起通知',
-          type: 1,
+      time: '2021-10-12 12:12',
-          toAccountType: '退回银行卡(工商银行3333)',
+      money: 0.01,
-          title: '红色退款发起通知',
+      desc: '抖音红包超过24小时未被领取',
-          time: '2021-10-12 12:12',
+      toAccountTime: '2021-10-15 12:12'
-          money: 0.01,
-          desc: '抖音红包超过24小时未被领取',
-          toAccountTime: '2021-10-15 12:12'
-        },
-        {
-          type: 2,
-          toAccountType: '退回银行卡(工商银行3333)',
-          title: '卡券发放提醒',
-          time: '2021-10-12 12:12',
-          money: 0.01,
-          desc: '尊敬的用户，您获得1张DUO+满赠优惠券 到期时间:2021-08-26 23:23:23',
-          toAccountTime: '2021-10-15 12:12'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getData()
-  },
-  methods: {
-    handleClick() {
-      this.openNotice = !this.openNotice
-      this.isShowSetting = false
     },
-    async getData() {
+    {
-      this.loading = true
+      type: 2,
-      await this.$sleep(700)
+      toAccountType: '退回银行卡(工商银行3333)',
-      this.loading = false
+      title: '卡券发放提醒',
-      await nextTick()
+      time: '2021-10-12 12:12',
-      this.$refs.mainScroll.scrollBottom()
+      money: 0.01,
+      desc: '尊敬的用户，您获得1张DUO+满赠优惠券 到期时间:2021-08-26 23:23:23',
+      toAccountTime: '2021-10-15 12:12'
     }
-  }
+  ]
+})
+
+onMounted(() => {
+  getData()
+})
+
+function handleClick() {
+  data.openNotice = !data.openNotice
+  data.isShowSetting = false
+}
+
+async function getData() {
+  data.loading = true
+  await _sleep(700)
+  data.loading = false
+  await nextTick()
+  // data.$refs.mainScroll.scrollBottom()
 }
 </script>
 

src/pages/message/notice/NoticeSetting.vue

@@ -8,110 +8,114 @@
     <div class="content">
       <div class="title">消息免打扰</div>
       <div class="sub-title">开启后，新通知将用黄点展示，不再展示未读数字</div>
-      <template v-if="type === 'SYSTEM'">
+      <template v-if="data.type === 'SYSTEM'">
         <div class="row">
           <div class="left">系统通知</div>
-          <switches v-model="option" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option" theme="bootstrap" color="success"></switches>
         </div>
       </template>
 
-      <template v-if="type === 'TASK'">
+      <template v-if="data.type === 'TASK'">
         <div class="row">
           <div class="left">运营任务</div>
-          <switches v-model="option1" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option1" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">星图(任务)</div>
-          <switches v-model="option2" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option2" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">成长任务</div>
-          <switches v-model="option3" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option3" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">DUO来评审团</div>
-          <switches v-model="option4" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option4" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">任务中心</div>
-          <switches v-model="option5" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option5" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">中视频伙伴任务</div>
-          <switches v-model="option6" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option6" theme="bootstrap" color="success"></switches>
         </div>
       </template>
-      <template v-if="type === 'LIVE'">
+      <template v-if="data.type === 'LIVE'">
         <div class="row">
           <div class="left">直播</div>
-          <switches v-model="option7" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option7" theme="bootstrap" color="success"></switches>
         </div>
       </template>
-      <template v-if="type === 'MONEY'">
+      <template v-if="data.type === 'MONEY'">
         <div class="row">
           <div class="left">钱包服务</div>
-          <switches v-model="option8" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option8" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">收入服务</div>
-          <switches v-model="option9" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option9" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">零钱服务</div>
-          <switches v-model="option10" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option10" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">抖币服务</div>
-          <switches v-model="option11" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option11" theme="bootstrap" color="success"></switches>
         </div>
         <div class="row">
           <div class="left">卡券服务</div>
-          <switches v-model="option12" theme="bootstrap" color="success"></switches>
+          <switches v-model="data.option12" theme="bootstrap" color="success"></switches>
         </div>
       </template>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import Switches from '../components/swtich/switches'
+import Switches from '../components/swtich/switches.vue'
 
-export default {
+import { useBaseStore } from '@/store/pinia'
-  name: 'NoticeSetting',
+import { onMounted, reactive } from 'vue'
-  components: { Switches },
+import { useRoute, useRouter } from 'vue-router'
-  props: {
+import { useNav } from '@/utils/hooks/useNav'
-    modelValue: {
+
-      type: Boolean,
+defineOptions({
-      default() {
+  name: 'NoticeSetting'
-        return false
+})
-      }
+
+defineProps({
+  modelValue: {
+    type: Boolean,
+    default() {
+      return false
     }
-  },
+  }
-  data() {
+})
-    return {
+const router = useRouter()
-      option: true,
+const route = useRoute()
-      option1: false,
+const nav = useNav()
-      option2: false,
+const store = useBaseStore()
-      option3: true,
+const data = reactive({
-      option4: false,
+  option: true,
-      option5: false,
+  option1: false,
-      option6: false,
+  option2: false,
-      option7: true,
+  option3: true,
-      option8: true,
+  option4: false,
-      option9: false,
+  option5: false,
-      option10: false,
+  option6: false,
-      option11: false,
+  option7: true,
-      option12: false,
+  option8: true,
-      type: 'TASK'
+  option9: false,
-    }
+  option10: false,
-  },
+  option11: false,
-  watch: {},
+  option12: false,
-  computed: {},
+  type: 'TASK'
-  created() {
+})
-    this.type = this.$route.query.type
+
-  },
+onMounted(() => {
-  mounted() {},
+  data.type = route.query.type
-  methods: {}
+})
-}
 </script>
 
 <style scoped lang="less">

src/pages/message/notice/TaskNotice.vue

@@ -5,16 +5,16 @@
         <span class="f16">任务通知</span>
       </template>
       <template v-slot:right>
-        <span class="f14" @click="$nav('/message/notice-setting', { type: 'TASK' })">通知设置</span>
+        <span class="f14" @click="nav('/message/notice-setting', { type: 'TASK' })">通知设置</span>
       </template>
     </BaseHeader>
-    <Loading v-if="loading" />
+    <Loading v-if="data.loading" />
     <div class="content" v-else>
       <Scroll ref="mainScroll">
         <div class="list">
           <NoMore />
           <!--TODO 超过3行显示全文-->
-          <div class="item" :key="i" v-for="(item, i) in list" @click="goDetail(item)">
+          <div class="item" :key="i" v-for="(item, i) in data.list" @click="goDetail(item)">
             <div class="header">
               <div class="left">
                 <img src="../../../assets/img/icon/message/task.webp" alt="" />
@@ -22,7 +22,7 @@
               <div class="right">
                 <span>成长任务</span>
                 <img
-                  @click.stop="isShowSetting = true"
+                  @click.stop="data.isShowSetting = true"
                   src="../../../assets/img/icon/menu-gray.png"
                   alt=""
                 />
@@ -41,7 +41,7 @@
           </div>
         </div>
       </Scroll>
-      <div class="footer" @click="$no">查看更多任务</div>
+      <div class="footer" @click="_no">查看更多任务</div>
     </div>
 
     <from-bottom-dialog
@@ -49,95 +49,89 @@
       mode="white"
       mask-mode="dark"
       :show-heng-gang="false"
-      v-model="isShowSetting"
+      v-model="data.isShowSetting"
       height="160rem"
     >
       <div class="setting-dialog">
         <div class="row disabled">成长任务</div>
-        <div class="row" @click="handleClick">{{ openNotice ? '关闭' : '开启' }}消息免打扰</div>
+        <div class="row" @click="handleClick">
+          {{ data.openNotice ? '关闭' : '开启' }}消息免打扰
+        </div>
         <div class="space"></div>
-        <div class="row" @click="isShowSetting = false">取消</div>
+        <div class="row" @click="data.isShowSetting = false">取消</div>
       </div>
     </from-bottom-dialog>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import { nextTick } from 'vue'
+import { nextTick, onMounted, reactive } from 'vue'
-import FromBottomDialog from '../../../components/dialog/FromBottomDialog'
+import FromBottomDialog from '@/components/dialog/FromBottomDialog.vue'
-import Scroll from '../../../components/Scroll'
+import Scroll from '@/components/Scroll.vue'
-import BasePage from '../../BasePage'
+import { useNav } from '@/utils/hooks/useNav'
+import { _no, _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  extends: BasePage,
+  name: 'TaskNotice'
-  name: 'SystemNotice',
+})
-  components: {
+
-    FromBottomDialog,
+const nav = useNav()
-    Scroll
+const data = reactive({
-  },
+  loading: false,
-  data() {
+  isShowSetting: false,
-    return {
+  openNotice: false,
-      loading: false,
+  list: [
-      isShowSetting: false,
+    {
-      openNotice: false,
+      type: 1,
-      list: [
+      title: '发作品得流量',
-        {
+      detail: 'xxx',
-          type: 1,
+      time: '2021-10-12 12:12',
-          title: '发作品得流量',
+      content: '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
-          detail: 'xxx',
-          time: '2021-10-12 12:12',
-          content:
-            '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
-        },
-        {
-          type: 1,
-          title: '发作品得流量',
-          detail: 'xxx',
-          time: '2021-10-12 12:12',
-          content:
-            '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
-        },
-        {
-          type: 1,
-          title: '发作品得流量',
-          detail: 'xxx',
-          time: '2021-10-12 12:12',
-          content:
-            '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
-        },
-        {
-          type: 1,
-          title: '发作品得流量',
-          detail: 'xxx',
-          time: '2021-10-12 12:12',
-          content:
-            '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
-        }
-      ]
-    }
-  },
-  watch: {},
-  computed: {},
-  created() {
-    this.getData()
-  },
-  methods: {
-    handleClick() {
-      this.openNotice = !this.openNotice
-      this.isShowSetting = false
     },
-    async getData() {
+    {
-      this.loading = true
+      type: 1,
-      await this.$sleep(700)
+      title: '发作品得流量',
-      this.loading = false
+      detail: 'xxx',
-      await nextTick()
+      time: '2021-10-12 12:12',
-      this.$refs.mainScroll.scrollBottom()
+      content: '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
     },
-    goDetail(item) {
+    {
-      item.read = true
+      type: 1,
-      if (item.detail) {
+      title: '发作品得流量',
-        this.$no()
+      detail: 'xxx',
-      }
+      time: '2021-10-12 12:12',
+      content: '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
+    },
+    {
+      type: 1,
+      title: '发作品得流量',
+      detail: 'xxx',
+      time: '2021-10-12 12:12',
+      content: '4.24-4.28，公开发布1个道具作品，即得50-100的额外流量。快来发布视频，获得更多关注'
     }
+  ]
+})
+
+onMounted(() => {
+  getData()
+})
+
+function handleClick() {
+  data.openNotice = !data.openNotice
+  data.isShowSetting = false
+}
+
+async function getData() {
+  data.loading = true
+  await _sleep(700)
+  data.loading = false
+  await nextTick()
+  // data.$refs.mainScroll.scrollBottom()
+}
+
+function goDetail(item: any) {
+  item.read = true
+  if (item.detail) {
+    _no()
   }
 }
 </script>

src/pages/other/VideoDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="video-detail">
     <div class="search-wrapper">
-      <Icon class="back" icon="icon-park-outline:left" @click="$back" />
+      <Icon class="back" icon="icon-park-outline:left" @click="router.back" />
       <div class="search" @click="nav('/home/search')">
         <div class="left">
           <Icon class="icon" icon="ion:search" />

src/pages/people/AddressList.vue

@@ -11,32 +11,28 @@
           <div class="left">已有20+位朋友加入抖音</div>
         </div>
         <div class="list">
-          <People :key="i" v-for="(item, i) in list" :people="item"></People>
+          <People :key="i" v-for="(item, i) in data.list" :people="item"></People>
         </div>
       </div>
       <div class="footer">为尊重用户选择，仅展示已授权用户</div>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import People from './components/People'
+import People from './components/People.vue'
+import { reactive } from 'vue'
 
-export default {
+defineOptions({
-  name: 'AddressList',
+  name: 'AddressList'
-  components: {
+})
-    People
+
-  },
+const data = reactive({
-  data() {
+  list: [
-    return {
+    {
-      list: [
+      type: 5
-        {
-          type: 5
-        }
-      ]
     }
-  },
+  ]
-  methods: {}
+})
-}
 </script>
 
 <style scoped lang="less">

src/pages/people/FaceToFace.vue

@@ -2,23 +2,20 @@
   <div class="FaceToFace">
     <BaseHeader style="background: black">
       <template v-slot:right>
-        <span class="f16" @click="$nav('/common-setting')">设置</span>
+        <span class="f16" @click="nav('/common-setting')">设置</span>
       </template>
     </BaseHeader>
     <div class="content"></div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
 //TODO 动画效果麻烦
-export default {
+import { useNav } from '@/utils/hooks/useNav'
-  name: 'FaceToFace',
+
-  data() {
+defineOptions({
-    return {}
+  name: 'FaceToFace'
-  },
+})
-  computed: {},
+const nav = useNav()
-  created() {},
-  methods: {}
-}
 </script>
 
 <style scoped lang="less">

src/pages/people/FindAcquaintance.vue

@@ -6,41 +6,41 @@
         style="width: 50%"
         tabStyleWidth="40%"
         :tabTexts="['发现朋友', '熟人列表']"
-        v-model:active-index="currentSlideItemIndex"
+        v-model:active-index="data.currentSlideItemIndex"
       >
       </Indicator>
       <img
         src="../../assets/img/icon/menu-gray.png"
         alt=""
         class="option"
-        @click="moreOptionDialog = true"
+        @click="data.moreOptionDialog = true"
       />
     </div>
-    <SlideHorizontal v-model:index="currentSlideItemIndex">
+    <SlideHorizontal v-model:index="data.currentSlideItemIndex">
       <SlideItem class="tab1" style="overflow: auto">
         <div class="mr2r ml2r mt1r">
           <Search
-            v-if="!isShowRightText"
+            v-if="!data.isShowRightText"
             placeholder="搜索用户名字/抖音号"
             :is-show-right-text="false"
-            @click="isShowRightText = true"
+            @click="data.isShowRightText = true"
           >
             <img
               src="../../assets/img/icon/scan-gray.png"
               style="width: 10rem; transform: scale(1.5)"
-              @click.stop="$nav('/scan')"
+              @click.stop="nav('/scan')"
             />
           </Search>
           <Search
             v-else
-            v-model="searchKey"
+            v-model="data.searchKey"
             :is-show-right-text="true"
             @notice="search"
-            @clear="isSearch = false"
+            @clear="data.isSearch = false"
           ></Search>
         </div>
-        <div class="no-search" v-if="!isShowRightText">
+        <div class="no-search" v-if="!data.isShowRightText">
-          <div class="look-address-list" @click="findAddressListDialog = true">
+          <div class="look-address-list" @click="data.findAddressListDialog = true">
             <img class="left" src="../../assets/img/icon/people/address-book.png" alt="" />
             <div class="right">
               <div class="notice">
@@ -60,21 +60,21 @@
           </div>
           <People
             :key="i"
-            v-for="(item, i) in friends.all"
+            v-for="(item, i) in store.friends.all"
             :people="item"
             mode="recommend"
           ></People>
         </div>
         <div class="is-search" v-else>
-          <div class="tooltip" v-if="searchKey && !isSearch">
+          <div class="tooltip" v-if="data.searchKey && !data.isSearch">
             <img src="../../assets/img/icon/close.svg" style="width: 10rem" />
-            搜索用户名字/抖音号：<span class="searchKey">{{ searchKey }}</span>
+            搜索用户名字/抖音号：<span class="searchKey">{{ data.searchKey }}</span>
           </div>
           <!--          TODO -->
-          <template v-if="isSearch">
+          <template v-if="data.isSearch">
             <People
               :key="i"
-              v-for="(item, i) in friends.all"
+              v-for="(item, i) in store.friends.all"
               :people="item"
               mode="recommend"
             ></People>
@@ -83,8 +83,13 @@
       </SlideItem>
       <SlideItem class="tab2" style="overflow: auto">
         <Search placeholder="搜索用户备注或名字" class="mr20p ml20p mt10p"></Search>
-        <div class="title">{{ friends.all.length }} 位朋友</div>
+        <div class="title">{{ store.friends.all.length }} 位朋友</div>
-        <People :key="i" v-for="(item, i) in friends.all" :people="item" mode="friend"></People>
+        <People
+          :key="i"
+          v-for="(item, i) in store.friends.all"
+          :people="item"
+          mode="friend"
+        ></People>
         <NoMore class="mb5r" />
       </SlideItem>
     </SlideHorizontal>
@@ -95,9 +100,9 @@
 
     <transition name="fade">
       <div
-        v-if="findAddressListDialog"
+        v-if="data.findAddressListDialog"
         class="find-address-list-dialog"
-        @click="findAddressListDialog = false"
+        @click="data.findAddressListDialog = false"
       >
         <div class="body">
           <div>
@@ -106,21 +111,21 @@
           <span class="title">发现通讯录好友</span>
           <span class="desc">
             <span>授权通讯录，看看哪些好友在使用抖音。具体使用场景及撤回授权方式详见</span>
-            <span class="link" @click="$nav('/service-protocol', { type: '“抖音”用户服务协议' })"
+            <span class="link" @click="nav('/service-protocol', { type: '“抖音”用户服务协议' })"
               >《隐私政策》</span
             >
           </span>
         </div>
         <div class="footer">
-          <div @click="findAddressListDialog = false">暂时不要</div>
+          <div @click="data.findAddressListDialog = false">暂时不要</div>
-          <div @click="$nav('/address-list')">发现好友</div>
+          <div @click="nav('/address-list')">发现好友</div>
         </div>
       </div>
     </transition>
 
     <from-bottom-dialog
       page-id="FindAcquaintance"
-      v-model="moreOptionDialog"
+      v-model="data.moreOptionDialog"
       :show-heng-gang="false"
       height="210rem"
       mode="white"
@@ -129,25 +134,25 @@
         <div class="row" @click="handleClick">
           <span>站外好友口令</span>
         </div>
-        <div class="row" @click="$nav('/scan')">
+        <div class="row" @click="nav('/scan')">
           <span>扫一扫加好友</span>
         </div>
-        <div class="row" style="border-bottom: none" @click="$nav('/face-to-face')">
+        <div class="row" style="border-bottom: none" @click="nav('/face-to-face')">
           <span>面对面加好友</span>
         </div>
         <div class="space"></div>
-        <div class="row" @click="moreOptionDialog = false">取消</div>
+        <div class="row" @click="data.moreOptionDialog = false">取消</div>
       </div>
     </from-bottom-dialog>
 
     <transition name="fade">
-      <div class="out-web-img-account-dialog" v-if="outWebImgAccountDialog">
+      <div class="out-web-img-account-dialog" v-if="data.outWebImgAccountDialog">
         <img src="../../assets/img/icon/head-image.jpeg" alt="" class="img-account" />
         <img
           src="../../assets/img/icon/close-white.png"
           alt=""
           class="close"
-          @click="outWebImgAccountDialog = false"
+          @click="data.outWebImgAccountDialog = false"
         />
         <div class="desc">
           <div>这是你的图片口令</div>
@@ -157,11 +162,11 @@
           <img src="../../assets/img/icon/close.svg" alt="" />
           <span>图片口令已保存到相册</span>
         </div>
-        <div class="btn wechat" @click="outWebImgAccountDialog = false">
+        <div class="btn wechat" @click="data.outWebImgAccountDialog = false">
           <img src="../../assets/img/icon/close.svg" alt="" />
           <span>发给微信好友</span>
         </div>
-        <div class="btn qq" @click="outWebImgAccountDialog = false">
+        <div class="btn qq" @click="data.outWebImgAccountDialog = false">
           <img src="../../assets/img/icon/close.svg" alt="" />
           <span>发给QQ好友</span>
         </div>
@@ -169,83 +174,82 @@
     </transition>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import People from './components/People'
+import People from './components/People.vue'
-import Search from '../../components/Search'
+import Search from '../../components/Search.vue'
-import Indicator from '../../components/slide/Indicator'
+import Indicator from '../../components/slide/Indicator.vue'
-import FromBottomDialog from '../../components/dialog/FromBottomDialog'
+import FromBottomDialog from '../../components/dialog/FromBottomDialog.vue'
-import { mapState } from 'pinia'
 import { useBaseStore } from '@/store/pinia'
+import { computed, onMounted, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { useNav } from '@/utils/hooks/useNav'
+import { _hideLoading, _showLoading, _sleep } from '@/utils'
 
-export default {
+defineOptions({
-  name: 'FindAcquaintance',
+  name: 'FindAcquaintance'
-  components: {
+})
-    People,
-    Search,
-    Indicator,
-    FromBottomDialog
-  },
-  data() {
-    return {
-      findAddressListDialog: false,
-      moreOptionDialog: false,
-      outWebImgAccountDialog: false,
-      indicatorFixed: false,
-      isShowRightText: false,
-      isSearch: false,
-      searchKey: '',
 
-      currentSlideItemIndex: 0,
+const router = useRouter()
-      list: [
+const nav = useNav()
-        {
+const store = useBaseStore()
-          type: 1
+const data = reactive({
-        },
+  findAddressListDialog: false,
-        {
+  moreOptionDialog: false,
-          type: 2
+  outWebImgAccountDialog: false,
-        },
+  indicatorFixed: false,
-        {
+  isShowRightText: false,
-          type: 3
+  isSearch: false,
-        },
+  searchKey: '',
-        {
+
-          type: 4
+  currentSlideItemIndex: 0,
-        },
+  list: [
-        {
+    {
-          type: 5
+      type: 1
-        }
+    },
-      ]
+    {
+      type: 2
+    },
+    {
+      type: 3
+    },
+    {
+      type: 4
+    },
+    {
+      type: 5
     }
+  ]
+})
+
+onMounted(() => {})
+
+const maskDialog = computed({
+  get() {
+    return data.findAddressListDialog || data.outWebImgAccountDialog
   },
-  computed: {
+  set() {
-    maskDialog: {
+    data.findAddressListDialog = data.outWebImgAccountDialog = false
-      get() {
-        return this.findAddressListDialog || this.outWebImgAccountDialog
-      },
-      set() {
-        this.findAddressListDialog = this.outWebImgAccountDialog = false
-      }
-    },
-    ...mapState(useBaseStore, ['friends'])
-  },
-  mounted() {},
-  methods: {
-    async search() {
-      this.$showLoading()
-      await this.$sleep(500)
-      this.$hideLoading()
-      this.isSearch = true
-    },
-    back() {
-      if (this.isShowRightText) {
-        this.isShowRightText = false
-      } else {
-        this.$back()
-      }
-    },
-    handleClick() {
-      this.outWebImgAccountDialog = true
-      this.moreOptionDialog = false
-    }
   }
+})
+
+async function search() {
+  _showLoading()
+  await _sleep(500)
+  _hideLoading()
+  data.isSearch = true
+}
+
+function back() {
+  if (data.isShowRightText) {
+    data.isShowRightText = false
+  } else {
+    router.back()
+  }
+}
+
+function handleClick() {
+  data.outWebImgAccountDialog = true
+  data.moreOptionDialog = false
 }
 </script>
 

src/pages/people/FollowAndFans.vue

@@ -2,14 +2,14 @@
   <div class="FollowAndFans" id="FollowAndFans">
     <BaseHeader backMode="light">
       <template v-slot:center>
-        <span class="f14">{{ userinfo.nickname }}</span>
+        <span class="f14">{{ store.userinfo.nickname }}</span>
       </template>
       <template v-slot:right>
         <div>
           <img
             src="../../assets/img/icon/people/add-user.png"
             style="width: 2rem"
-            @click="$nav('/people/find-acquaintance')"
+            @click="nav('/people/find-acquaintance')"
           />
         </div>
       </template>
@@ -19,23 +19,23 @@
         <Indicator
           tabStyleWidth="50%"
           :tabTexts="['关注', '粉丝']"
-          v-model:active-index="slideIndex"
+          v-model:active-index="data.slideIndex"
         >
         </Indicator>
       </div>
       <SlideHorizontal
-        v-model:index="slideIndex"
+        v-model:index="data.slideIndex"
         style="height: calc(var(--vh, 1vh) * 100 - 111rem)"
       >
         <SlideItem class="tab1">
           <Search
-            v-model="searchKey"
+            v-model="data.searchKey"
             placeholder="搜索用户备注或名字"
             :is-show-right-text="false"
           />
-          <div class="is-search" v-if="searchKey">
+          <div class="is-search" v-if="data.searchKey">
-            <div class="search-result" v-if="searchFriends.length">
+            <div class="search-result" v-if="data.searchFriends.length">
-              <People :key="i" v-for="(item, i) in searchFriends" :people="item"></People>
+              <People :key="i" v-for="(item, i) in data.searchFriends" :people="item"></People>
             </div>
             <div class="no-result" v-else>
               <img src="../../assets/img/icon/no-result.png" alt="" />
@@ -45,75 +45,60 @@
           </div>
           <div class="no-search" v-else>
             <div class="title">我的关注</div>
-            <People :key="i" v-for="(item, i) in friends.all" :people="item"></People>
+            <People :key="i" v-for="(item, i) in store.friends.all" :people="item"></People>
           </div>
         </SlideItem>
         <SlideItem class="tab2">
-          <People :key="i" v-for="(item, i) in friends.all" :people="item"></People>
+          <People :key="i" v-for="(item, i) in store.friends.all" :people="item"></People>
           <NoMore />
         </SlideItem>
       </SlideHorizontal>
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
-import People from './components/People'
+import People from './components/People.vue'
-import Search from '../../components/Search'
+import Search from '../../components/Search.vue'
-import Indicator from '../../components/slide/Indicator'
+import Indicator from '../../components/slide/Indicator.vue'
-import { mapState } from 'pinia'
 import { useBaseStore } from '@/store/pinia'
+import { onMounted, reactive, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { useNav } from '@/utils/hooks/useNav'
 
-export default {
+defineOptions({
-  name: 'FindAcquaintance',
+  name: 'FindAcquaintance'
-  components: {
+})
-    People,
-    Search,
-    Indicator
-  },
-  data() {
-    return {
-      isSearch: false,
-      searchKey: '',
 
-      slideIndex: 0,
+const router = useRouter()
-      searchFriends: []
+const route = useRoute()
-    }
+const nav = useNav()
-  },
+const store = useBaseStore()
-  computed: {
+const data = reactive({
-    ...mapState(useBaseStore, ['friends', 'userinfo'])
+  isSearch: false,
-  },
+  searchKey: '',
-  watch: {
+
-    searchKey(newVal) {
+  slideIndex: 0,
-      if (newVal) {
+  searchFriends: []
-        //TODO 搜索时仅仅判断是否包含了对应字符串，抖音做了拼音判断的
+})
-        this.searchFriends = this.friends.all.filter((v) => {
+
-          if (v.name.includes(newVal)) return true
+onMounted(() => {
-          return v.account.includes(newVal)
+  data.slideIndex = ~~route.query.type
-        })
+})
-      } else {
+
-        this.searchFriends = []
+watch(
-      }
+  () => data.searchKey,
-    }
+  (newVal) => {
-  },
+    if (newVal) {
-  created() {
+      //TODO 搜索时仅仅判断是否包含了对应字符串，抖音做了拼音判断的
-    this.slideIndex = ~~this.$route.query.type
+      data.searchFriends = store.friends.all.filter((v) => {
-  },
+        if (v.name.includes(newVal)) return true
-  methods: {
+        return v.account.includes(newVal)
-    async search() {
+      })
-      this.$showLoading()
+    } else {
-      await this.$sleep(500)
+      data.searchFriends = []
-      this.$hideLoading()
-      this.isSearch = true
-    },
-    back() {
-      if (this.isShowRightText) {
-        this.isShowRightText = false
-      } else {
-        this.$back()
-      }
     }
   }
-}
+)
 </script>
 
 <style scoped lang="less">

src/pages/people/Scan.vue

@@ -21,17 +21,12 @@
     <div class="scan-anim"></div>
   </div>
 </template>
-<script>
+<script setup>
 //TODO 那个动画没做，用css画有点麻烦，后面ps p一张图片吧
-export default {
+
-  name: 'Scan',
+defineOptions({
-  data() {
+  name: 'Scan'
-    return {}
+})
-  },
-  computed: {},
-  created() {},
-  methods: {}
-}
 </script>
 
 <style scoped lang="less">

src/router/routes.ts

@@ -223,7 +223,6 @@ const routes: RouteRecordRaw[] = [
     path: '/message/share-to-friend',
     component: () => import('@/pages/message/Share2Friend.vue')
   },
-
   {
     path: '/video-detail',
     name: 'video-detail',

src/utils/index.jsx

@@ -677,5 +677,5 @@ export function _notice(val) {
 }
 
 export function _no() {
-  this.$notice('未实现')
+  _notice('未实现')
 }