Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

src/pages/details/otherStandardDetails/index.vue

@@ -2270,8 +2270,8 @@ export default {
       this.uploadFilesplitEo.standNumSplit = this.sarStandardsInfoEO.lawsNumber
       this.uploadFilesplitEo.standNameSplit = this.sarStandardsInfoEO.lawsName
       this.uploadFilesplitEo.standId = this.sarStandardsInfoEO.id
-      // this.uploadFilesplitEo.fileType = this.$route.params.pageType
-      this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
+      this.uploadFilesplitEo.fileType = this.$route.params.pageType
+      // this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
 
       var filename = file.name
       var index1 = filename.lastIndexOf('.')

src/pages/personal/pages/my-questions/index.vue

@@ -1675,7 +1675,7 @@ export default {
       this.tagsLoading = true
       this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
-        answerer: this.$store.getters.userInfo.userId,
+        answererId: this.$store.getters.userInfo.userId,
       },{
         _this: this
       }, res => {

src/pages/personal/pages/my-questions/index3.vue

@@ -1710,7 +1710,7 @@ export default {
       this.tagsLoading = true
       this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
-        answerer: this.$store.getters.userInfo.userId,
+        answererId: this.$store.getters.userInfo.userId,
       },{
         _this: this
       }, res => {