Merge branch 'master' of http://git.lcpcp.cc/root/lcoco

api/login.js

@@ -6,5 +6,5 @@ const newsUrl = '/admin/utility/'
 export const login = (data) => request('/auth/oauth2/token', 'post', { ...data },false)
 export const forgetPassword = (data) => request(newsUrl + 'forget_password', 'post', { ...data },false)
 export const register = (data) => request(newsUrl + 'register', 'post', { ...data },true)
-export const filUserInfo = (data) => request(newsUrl + 'fill_user_info', 'post', { ...data },true)
+export const filUserInfo = (data) => request(newsUrl + 'fillUserInfo', 'post', { ...data },true)
 export const setCard = (data) => request(newsUrl + 'card', 'post', { ...data },true)

js_sdk/tencentcloud-plugin-cos/upload-file.js

@@ -38,7 +38,6 @@ export default async function uploadFile(file, key, onProgressUpdate) {
     },
   });
   const signData = result;
-  console.log(signData)
   return new Promise((resolve, reject) => {
     let filePath = undefined;
     let fileExt;
@@ -86,6 +85,8 @@ export default async function uploadFile(file, key, onProgressUpdate) {
           resolve(key);
         }
       },
+      complete(r){
+      },
       fail(error) {
         // 支付宝小程序环境下会将返回的204状态码识别为异常而触发fail回调，实际上是上传成功了的
         if (error.statusCode === 204) {

manifest.json

@@ -132,18 +132,12 @@
                 "/admin" : {
                     "target" : "https://icoco.tech/",
                     "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/admin" : "admin"
-                    }
+                    "secure" : false
                 },
                 "/auth" : {
                     "target" : "https://icoco.tech/",
                     "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/auth" : "auth"
-                    }
+                    "secure" : false
                 }
             }
         }

pages/perfect/cards.vue

@@ -98,7 +98,7 @@ export default {
     openChooseImage(){
       uni.chooseImage({
         count: 6, //默认9
-        sizeType: ['original'], //可以指定是原图还是压缩图，默认二者都有
+        sizeType: ['compressed '], //可以指定是原图还是压缩图，默认二者都有
         sourceType: ['album'], //从相册选择
         success:  (res) =>{
           console.log(res)
@@ -111,7 +111,7 @@ export default {
                   this.imgBg=imgUrl
                   this.imgBg=await cosServe.getSignUrl(this.imgBg)
                 }
-                this.imgList.push(imgUrl)
+                this.imgList.push(tools.setFileObj(imgUrl,1))
               })
             })
             console.log( this.imgList)

service/tools.js

@@ -354,6 +354,7 @@ tools.getDateYM = ()=>{
  * @param type
  */
 tools.setLoginData = function (data) {
+    uni.setStorageSync('user_id', data.user_id)
     uni.setStorageSync('token', data.access_token)
     uni.setStorageSync('tokenType', data.token_type)
     uni.setStorageSync('refreshToken', data.access_token)
@@ -431,5 +432,17 @@ tools.getCosToken=function (){
         return undefined
     }
 }
+tools.setFileObj=function (url,type){
+    url= url.replace('https://','')
+    url= url.replace('http://','')
+    url= url.replace('icoco-1317650740.cos.ap-guangzhou.myqcloud.com/','')
+    return {
+        "location":url,
+        "hash":"abc123",
+        "version":"1.0",
+        "type":type===1?"PHOTO":"V",
+        "serverSideEncryption":"AES256"
+    }
+}
 
 export default tools

service/txOssSts.js

@@ -26,12 +26,22 @@ let cosServe={}
  * @returns {Promise<unknown>}
  */
 cosServe.txUploadFile=async function (file,folder){
-
     //默认为个人目录gallery
+    tools.showLoading()
     folder=folder==='moment'?'moment':'gallery'
-    let key=folder+'/'+tools.getDate()+'/'+tools.getRandFileName(file.name)
+   let user_id= uni.getStorageSync('user_id')
+    if(!user_id){
+        user_id='00'
+    }
+    if(!file.name){
+        file.name=file.path
+    }
+    let key=folder+'/'+user_id+'/'+tools.getDate()+'/'+tools.getRandFileName(file.name)
+    // #ifdef APP-PLUS
+    file =file.path;
+    //#endif
     let url = await uploadFile(file,key);
-    console.log(url)
+    tools.hideLoading()
     return  url
 }