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

src/services/UserService.ts

@@ -3,6 +3,11 @@ import Api, { HttpResponse, Result } from './../utils/request';
 
 class UserServices {
 
+    static async ModifyUserPhoto(photo:String):Promise<HttpResponse>{
+        let msg = {photo}
+        return Api.Post("travel_ModifyUserPhoto",msg)
+    }
+
     static async getPPTGroupStatic():Promise<HttpResponse>{
         let msg = {}
         return Api.Post("travel_PPTGroupStatic",msg)

src/utils/upload/aliyun.ts

 import { domainManager } from "../domainManager";
 
 class AliyunUpload {
-    static UploadAsync = async (file:any,name:string)=>{
+    static UploadAsync = async (file: any, name: string) => {
         try {
             const formData = new FormData();
             formData.append('file', file);
             const response = await fetch(`${domainManager().UploadUrl}/Upload/UploadToALiOSS?filePath=${encodeURIComponent(name)}`, {
-              method: 'POST',
-              body: formData,
+                method: 'POST',
+                body: formData,
             });
-            if(response.ok){
+            if (response.ok) {
                 let result = await response.text()
                 let datas = JSON.parse(result)
-                return 'https://im.oytour.com'+datas.FilePath
+                return 'https://im.oytour.com' + datas.FilePath
+            }
+            return ''
+        } catch (error) {
+            return ''
+        }
+    }
+    static UploadAvatar = async (file: any, filepath: string) => {
+        try {
+            const formData = new FormData();
+            formData.append('file', file);
+            const response = await fetch(`${domainManager().UploadUrl}/Upload?filePath=${encodeURIComponent(filepath)}`, {
+                method: 'POST',
+                body: formData,
+            });
+            if (response.ok) {
+                let result = await response.text()
+                let datas = JSON.parse(result)
+                return `${domainManager().ViittoFileUrl}` + datas.FilePath
             }
             return ''
         } catch (error) {

src/views/UserCenter/Setting.vue

@@ -2,10 +2,10 @@
     <div class="user-setting">
         <div class="row flex-center">
             <el-upload drag 
-            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" 
+            :action="getUploadActionUrl()" 
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
-            class="avatar-upload">
+            class="avatar-upload" v-loading="loadingImg">
                 <el-avatar :size="72" :src="userInfo.photo" shape="square" class="bg-transparent"></el-avatar>
                 <div class="after-overlayer">上传</div>
             </el-upload>
@@ -118,6 +118,8 @@ import { ApiResult } from '@/configs/axios';
 import UserServices from '@/services/UserService'
 import VueHcaptcha from "@hcaptcha/vue3-hcaptcha";
 import { domainManager } from '@/utils/domainManager'
+import AliyunUpload from '@/utils/upload/aliyun'
+import CryptoJS from 'crypto-js'
 
 const useUser = useUserStore()
 const { userInfo } = storeToRefs(useUser)
@@ -145,6 +147,7 @@ const sending = ref(false)
 const isSend = ref(false)
 const isCountdown = ref(false)
 const countValue = ref<number>(0)
+const loadingImg = ref(false)
 const validateMail = (rule:any,value:any,callback:any)=>{
     if (value === '') {
         callback(new Error('请输入你的邮箱账户'))
@@ -174,21 +177,25 @@ const rules = reactive<FormRules<RuleForm>>({
 
 //上传头像地址
 const getUploadActionUrl=()=>{
-  let uid=userInfo.value.id;
-   const url=domainManager().domainUrl.replace("common","file")+`?cmd=dmc_post_LocalFileUpload&Type=19&fileType=3&PPTEmployeeId=${encodeURIComponent(uid)}`
+    let uid=userInfo.value.id;
+   const url=domainManager().UploadUrl
    return url;
 }
 
 const handleAvatarSuccess=async (res:any)=>{
-    if(res.data&&res.data.failUrl){
-        userInfo.value.photo = domainManager().DownloadUrl.replace("common","file")+`${res.data.failUrl}`
-        
-    }
    console.log("handleAvatarSuccess_res",res);
 }
 
 const beforeAvatarUpload=async (res:any)=>{
-    console.log("beforeAvatarUpload_res",res);
+    dialogType.value = 3
+    loadingImg.value = true
+    let filePath="/Upload/User/";
+    let url  = await AliyunUpload.UploadAvatar(res, filePath);
+ 
+    if(url!='') {
+         userInfo.value.photo =url
+        // await bindHandler()
+    }
 }
 
 const closeForm = () => {
@@ -218,6 +225,7 @@ const bindHandler = async () =>{
     if(dialogType.value==0) response = await UserServices.setMyNickNamed(userInfo.value.nickname)
     if(dialogType.value==1) response = await UserServices.setBindUserEmail(model.value.mail,model.value.code)
     if(dialogType.value==2) response = await UserServices.setModifyUserPwd(model.value.oldpwd,model.value.pwd)
+    if(dialogType.value==3) response = await UserServices.ModifyUserPhoto(userInfo.value.photo)
     if(response){
         if(response.data.resultCode == ApiResult.SUCCESS){
             if(dialogType.value==1) {
@@ -230,11 +238,13 @@ const bindHandler = async () =>{
             }
             dialogVisible.value = false
             dialogType.value = null
+            loadingImg.value = false
             return
         }
         ElMessage.error({message:response.data.message})
         invisibleHcaptchaBind.value?.reset()
         validateToken.value=''
+        loadingImg.value = false
     }
     
 }