Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/views/Preview/PreviewCover.vue

@@ -43,7 +43,7 @@ import FileService from '@/services/FileService'
 import { storeToRefs } from 'pinia'
 import { useSlidesStore } from '../../store'
 import { VIEWPORT_SIZE, VIEWPORT_VER_SIZE } from '../../configs/canvas'
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { ElLoading } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { useUserStore } from "@/store";

src/views/components/Order/Review.vue

@@ -36,7 +36,7 @@
                             <div class="price" v-if="x.price>0">
                                 <span class="text-weight-bold">￥</span>
                                 <span class="text-weight-bold" style="font-size: 1.67vw;">{{ x.price }}</span>
-                                <span class="text-grey-8">/人</span>
+                                <span class="text-grey-8">/{{activeVersion==1?'人':'年'}}</span>
                             </div>
                             <div class="price" v-else>
                                 <span class="text-weight-bold" style="font-size: 1.2vw;">咨询客服</span>