Merge branch 'master' into 1.4.0

.env.development

 VUE_APP_API_URL = 'http://192.168.5.46/api/common/post'
 VUE_APP_UPLOADURLAPI_URL = 'http://192.168.5.46:8120'
+VUE_APP_VIITTOFILE_URL = 'http://192.168.5.46:8130'
+VUE_APP_NOTIFICATION_URL = 'http://localhost:8081'
+VUE_APP_DOWNLOAD_URL = 'http://192.168.5.46'
 VUE_APP_SHARE_URL = 'http://127.0.0.1:8080'
 VUE_APP_PDF_URL = 'http://127.0.0.1:5164'
 # VUE_APP_API_URL = 'https://reborn.oytour.com/api/common/post'

.env.production

 VUE_APP_API_URL = 'https://reborn.oytour.com/api/common/post'
 VUE_APP_UPLOADURLAPI_URL = 'https://upload.oytour.com'
+VUE_APP_VIITTOFILE_URL = 'http://imgfile.oytour.com'
+VUE_APP_NOTIFICATION_URL = 'http://yx.oytour.com'
+VUE_APP_DOWNLOAD_URL = 'https://reborn.oytour.com'
 VUE_APP_SHARE_URL = 'http://vitto.com'
 VUE_APP_PDF_URL = 'https://fileservice.oytour.com'
\ No newline at end of file

src/components/User/UserCard.vue

@@ -101,7 +101,8 @@
   <!-- 创建设计 -->
   <temDesign :addTem="addVisible" @close="addVisible=false"/>
   <OrderReview v-if="orderVisible" :show-person="isShowPerson" :default-type="isShowPerson?1:2" @close="()=>orderVisible=false"></OrderReview>
-  <follow v-show="isPublicAccount" :show="isPublicAccount" @close="isPublicAccount=false,getInfo()"></follow>
+  <follow v-show="isPublicAccount" :show="isPublicAccount" @close="isPublicAccount=false"
+  @success="isPublicAccount=false,getInfo()"></follow>
 </template>
 <script lang="ts" setup>
 import { ref, reactive } from "vue";

src/components/home/follow.vue

@@ -64,6 +64,7 @@ const params = reactive({
 })
 const emit = defineEmits<{
     (event: 'close'): void,
+    (event: 'success'): void,
 }>()
 
 const queryTimer = ref<any>(null)
@@ -73,6 +74,7 @@ const RefreshLoading = ref(false)
 const followForm = ref()
 
 const close = () => {
+    stopTimerHandler()
     emit('close')
 }
 if(model.value==0 && ConfigId.value) params.ConfigId = ConfigId.value
@@ -115,7 +117,7 @@ const userLoginHandler = async (type:any)=>{
         if(!type) {
             stopTimerHandler()
             ElMessage.success({message:'关注成功'})
-            location.reload()
+            emit('success')
         }
     }else if(result.status=='ERROR') {
         if(!type) {
@@ -133,17 +135,17 @@ const goVipIntroduce = () =>{
 }
 
 watch(()=>props.show,(n,o)=>{
-    if(!n) stopTimerHandler()
-    if(n) getQrcode()
+    if(n) {
+        getQrcode()
+        if(followForm.value)followForm.value.click()
+    }else document.removeEventListener('click', () => {});
 },{
     immediate: true
 })
 
 onMounted( () => {
     document.addEventListener('click', (e) => {
-        if (props.show&&followForm.value) {
-            followForm.value.click()
-        }
+        
     });
 })
 onBeforeUnmount(() => {

src/utils/domainManager.ts

 export const domainManager = () => {
-    const locationName = window.location.hostname
     const obj = {
-        domainUrl: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com/api/common/post" : "http://192.168.5.46/api/common/post",
+        domainUrl: process.env.VUE_APP_API_URL,
         //上传站点
-        UploadUrl: locationName.indexOf('oytour') !== -1 ? "https://upload.oytour.com" : "http://192.168.5.46:8120",
+        UploadUrl: process.env.VUE_APP_UPLOADURLAPI_URL,
         //文件站点
-        ViittoFileUrl: locationName.indexOf('oytour') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.5.46:8130',
+        ViittoFileUrl: process.env.VUE_APP_VIITTOFILE_URL,
         // 通知erp
-        notificationUrl: locationName.indexOf('oytour') !== -1 ? "http://yx.oytour.com" : "http://localhost:8081",
+        notificationUrl: process.env.VUE_APP_NOTIFICATION_URL,
         // 文件下载地址
-        DownloadUrl: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com" : "http://192.168.5.46",
+        DownloadUrl: process.env.VUE_APP_DOWNLOAD_URL,
   }
 return obj
 }   
\ No newline at end of file