Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/Account/frontPage.vue

@@ -104,6 +104,12 @@ export default defineComponent({
 			let key = accountfrontPage.frontPageList[0].key
 			accountfrontPage.activeKey = key
 			const data = route.query
+			if(!!data.subscribe){
+				accountfrontPage.activeKey = 'cancelRenewal'
+				nextTick(()=>{
+					domRefs.cancelRenewal[0].subscribe()
+				})
+			}
 			if(data?.state == 'weiXin'){
 				accountfrontPage.activeKey = 'bind'
 				wechatLogin(data)

src/component/home/tools/poseTransfer/index.vue

@@ -145,7 +145,7 @@
                       <i class="fi fi-br-check"></i>
                     </div>
                     <div
-                      @click.stop="setUploadDelete(item, index)"
+                      @click.stop="setUploadDelete(item, index, true)"
                       v-if="source != 'design'"
                     >
                       <i class="fi fi-rr-trash icon_delete"></i>
@@ -740,7 +740,7 @@ export default defineComponent({
           file.imgUrl = res.data.url
           file.id = res.data.id
           file.type = 'ProductElement'
-           file.frameType = 'last'
+          file.frameType = 'last'
           // 取消尾帧列表选中状态
           ;(value?.fileList || []).forEach(
             (listItem: any) => (listItem.isChecked = false)
@@ -863,7 +863,7 @@ export default defineComponent({
       speed.speedState = false
       document.removeEventListener('click', openSpeed)
     }
-    const setUploadDelete = (item: any, index: any) => {
+    const setUploadDelete = (item: any, index: any, isLastFrame: boolean = false) => {
       let value = {
         id: item.id
       }
@@ -872,11 +872,15 @@ export default defineComponent({
         {},
         { params: value }
       ).then(rv => {
-        let storeData = {
-          str: 'delete',
-          index
+        if (isLastFrame) {
+          store.commit('setPoseTransferLastFrameList')
+        }else{
+          let storeData = {
+            str: 'delete',
+            index
+          }
+          store.commit('setUploadElement', storeData)
         }
-        store.commit('setUploadElement', storeData)
       })
     }
     watch(