feat:图片上传接口联调

ee3c6e9d · zhangleyuan · 9e66ce76 · ee3c6e9d · ee3c6e9d · ee3c6e9d
Commit ee3c6e9d authored Dec 07, 2020 by zhangleyuan
7 changed files
--- a/src/components/CropperModal.tsx
+++ b/src/components/CropperModal.tsx
@@ -43,7 +43,6 @@ const CropperModal = (props: CropperModalProps) => {
        ready: () => {
          const $clone = $image.clone().removeClass('cropper-hidden') as any;
          $previews.html($clone);
        },
        crop: _.throttle(function (e: any) {
          const imageData = ($image as any).cropper('getImageData');
@@ -66,6 +65,7 @@ const CropperModal = (props: CropperModalProps) => {
  function _handleSave(): any {
    const $image = $('#image');
    ($image as any).cropper('getCroppedCanvas').toBlob((blob: any) => {
+      console.log("blob",blob);
      Upload.uploadBlobToOSS(blob, 'avatar' + (new Date()).valueOf()).then((imgAddress:string) => {
        save(imgAddress);
        close();

--- a/src/core/upload.js
+++ b/src/core/upload.js
 import { func } from "prop-types";
 import Service from '@/common/js/service';
+import User from '@/common/js/user';
 /*
 * @Author: 吴文洁
 * @Date: 2020-08-11 11:47:14
- * @LastEditors: wangyixi
+ * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-10-19 16:30:24
+ * @LastEditTime: 2020-12-07 15:53:10
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 class Upload {
  static uploadBlobToOSS(Blob, name, dir, dataType = 'url') {
    // 上传图片和视频
-    return Service.Hades('/public/store/commonOssAuthority', { resourceName: name, instId:'0'}).then((res) => {
+    const param = {
-      console.log(0)
+      accessTypeEnum:"PUBLIC",
+      bizCode:'CLOUD_CLASS_COMMON',
+      instId:User.getStoreId(),
+      resourceName:name
+    }
+    return Service.Hades('public/store/commonOssAuthority', param).then((res) => {
      const signInfo = res.result;
-      const { url } = res.result
+      const { fileUrl } = res.result
      return this.uploadBlobToNewOSS(Blob, name, dir, signInfo.signatureVO || signInfo).then(() => {
-        return dataType === 'url' ? url : signInfo
+        return dataType === 'url' ? fileUrl : signInfo
      });
    })
  };

--- a/src/data-source/base/request-apis.ts
+++ b/src/data-source/base/request-apis.ts
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-12-01 17:21:21
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-04 17:39:12
+ * @LastEditTime: 2020-12-07 11:08:03
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -25,9 +25,13 @@ export function getStoreUser(params: object) {
 export function sendBizAuthCode(params: object) {
  return Service.Hades("public/store/sendBizAuthCode", params);
 }
-export function editUserPhone(params: object) {
-  return Service.Hades("public/store/editUserPhone", params);
-}
 export function checkBizAuthCode(params: object) {
  return Service.Hades("public/store/checkBizAuthCode", params);
 }
+export function sendNewPhoneAuthCode(params: object) {
+  return Service.Hades("public/store/sendNewPhoneAuthCode", params);
+}
+export function editUserPhone(params: object) {
+  return Service.Hades("public/store/editUserPhone", params);
+}
--- a/src/domains/basic-domain/baseService.ts
+++ b/src/domains/basic-domain/baseService.ts
@@ -2,12 +2,12 @@
 * @Author: wufan
 * @Date: 2020-12-01 17:20:49
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-04 17:08:24
+ * @LastEditTime: 2020-12-07 11:08:23
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
-import { getUserStore, getUserPermission ,logout,getStoreUser,sendBizAuthCode,editUserPhone,checkBizAuthCode} from '@/data-source/base/request-apis';
+import { getUserStore, getUserPermission ,logout,getStoreUser,sendBizAuthCode,editUserPhone,checkBizAuthCode,sendNewPhoneAuthCode} from '@/data-source/base/request-apis';
 export default class StoreService {
    // 获取员工列表 
@@ -37,5 +37,7 @@ export default class StoreService {
  static checkBizAuthCode(params: any){
    return checkBizAuthCode(params);
  }
+  static sendNewPhoneAuthCode(params: any){
+    return sendNewPhoneAuthCode(params);
+  }
 }
\ No newline at end of file
--- a/src/modules/personalInfo/ChangePhoneModal.tsx
+++ b/src/modules/personalInfo/ChangePhoneModal.tsx
@@ -54,13 +54,13 @@ function ChangePhoneModal(props: changePhoneModalProps) {
        let timer:any;
        const param ={
            phone:newPhone,
-            serverType:'CLOUD_CLASS_MODIFY_PHONE',
+            serverType:'CLOUD_CLASS_NEW_PHONE',
            sig: checkData.sig,
            sessionId: checkData.csessionid,
            token: checkData.token,
            scene: 'nc_login'
        }
-        BaseService.sendBizAuthCode(param).then((res) => {
+        BaseService.sendNewPhoneAuthCode(param).then((res) => {
            timeSub(60,0);
        });
         function timeSub(waitTime:number, unit:number):any{
@@ -97,7 +97,7 @@ function ChangePhoneModal(props: changePhoneModalProps) {
        }
        const param ={
            authCode: phoneVerify,
-            phone: "string",
+            phone: newPhone,
            storeUserId: 0
        }
        BaseService.editUserPhone(param).then((res) => {

--- a/src/modules/personalInfo/index.tsx
+++ b/src/modules/personalInfo/index.tsx
@@ -2,7 +2,7 @@
 * @Author: zhangleyuan
 * @Date: 2020-11-27 15:06:31
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-04 18:00:20
+ * @LastEditTime: 2020-12-07 15:59:26
 * @Description: 描述一下
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -42,10 +42,11 @@ function PersonalInfoPage() {
      storeUserId:User.getStoreUserId()
    }
    BaseService.getStoreUser(param).then((res) => {
-      const {nickName,phone,roleCodes} = res.result;
+      const {nickName,phone,roleCodes,avatar} = res.result;
      setNickName(nickName);
      setPhone(phone);
      setRoleCodes(roleCodes)
+      setAvatar(avatar)
    });
  }
  function _handleUpdateAvatar(e: any): any {
@@ -77,7 +78,7 @@ function PersonalInfoPage() {
      nickName,
      phone: String(phone),
      roleCodes:roleCodes,
-      // avatar,
+      avatar,
      storeUserId:User.getStoreUserId()
    };
    StoreService.editEmployee(params).then((res) => {

--- a/src/modules/store-manege/CourseCatalogPage.tsx
+++ b/src/modules/store-manege/CourseCatalogPage.tsx
@@ -157,9 +157,15 @@ function CourseCatalogPage() {
      parentId,
    }
    StoreService.getAllSonCategory(param).then((res: any) => {
-      record.children=res.result || [];
+      record.children= res.result || [];
-      const _courseCatalogList =[...courseCatalogList]
+      record.children.map((item:any,index:any) => {
-       setCourseCatalogList(_courseCatalogList)
+        item.key= item.id
+        return item
+      })
+      const _courseCatalogList =[...courseCatalogList];
+      console.log("_courseCatalogList",_courseCatalogList);
+      setCourseCatalogList(_courseCatalogList)
    });
  }
@@ -186,9 +192,7 @@ function CourseCatalogPage() {
                  if(!record.children){
                    return
                  }
-                  if (record.children.length !== 0){
+                  if (record.children.length === 0){
-                    return <div>{record.children[0].categoryName}</div>;
-                  }else{
                    return <div>还未添加任何子分类</div>;
                  }
                }}