Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud

src/sheep/api/apply.ts

@@ -3,7 +3,7 @@ import request from "@/sheep/utils/request";
 export default {
   foreignList: (params: any) =>
     request({
-      url: "pay/foreign-ticket/get-all",
+      url: "wallet/wallet-foreign/app/page-join",
       method: "GET",
       params,
       custom: {
@@ -12,16 +12,16 @@ export default {
     }),
   foreignDetail: (params: any) =>
     request({
-      url: "pay/foreign-ticket/get-detail",
+      url: "wallet/wallet-foreign/app/detail",
       method: "GET",
       params,
       custom: {
         showLoading: false,
       },
     }),
-  foreignItems: (params: any) =>
+  codeList: (params: any) =>
     request({
-      url: "pay/foreign-ticket/get-items",
+      url: "wallet/wallet-code-use/app/code-list",
       method: "GET",
       params,
       custom: {
@@ -30,7 +30,7 @@ export default {
     }),
   foreignApply: (data: any) =>
     request({
-      url: "pay/foreign-ticket/apply",
+      url: "wallet/wallet-foreign/app/apply",
       method: "POST",
       data,
       custom: {
@@ -39,7 +39,7 @@ export default {
     }),
   strideList: (params: any) =>
     request({
-      url: "pay/stride-dept/get-all",
+      url: "wallet/wallet-stride/app/page-join",
       method: "GET",
       params,
       custom: {
@@ -48,16 +48,7 @@ export default {
     }),
   strideDetail: (params: any) =>
     request({
-      url: "pay/stride-dept/get-detail",
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-  strideItems: (params: any) =>
-    request({
-      url: "pay/stride-dept/get-items",
+      url: "wallet/wallet-stride/app/detail",
       method: "GET",
       params,
       custom: {
@@ -66,7 +57,7 @@ export default {
     }),
   strideApply: (data: any) =>
     request({
-      url: "pay/stride-dept/apply",
+      url: "wallet/wallet-stride/app/apply",
       method: "POST",
       data,
       custom: {

src/sheep/api/face.ts

@@ -3,7 +3,7 @@ import request from "@/sheep/utils/request";
 export default {
   page: (params: any) =>
     request({
-      url: `/sys/user/face-page-join`,
+      url: `/admin/user-face/app/page-join`,
       method: "GET",
       params,
       custom: {
@@ -12,7 +12,7 @@ export default {
     }),
   del: (params: any) =>
     request({
-      url: `/sys/user/face-delete`,
+      url: `/admin/user-face/app`,
       method: "DELETE",
       params,
       custom: {
@@ -21,7 +21,7 @@ export default {
     }),
   create: (data: any) =>
     request({
-      url: `/sys/user/face-create`,
+      url: `/admin/user-face/app`,
       method: "POST",
       data,
       custom: {
@@ -30,7 +30,7 @@ export default {
     }),
   get: (params: any) =>
     request({
-      url: `/sys/user/face-get`,
+      url: `/admin/user-face/app/detail`,
       method: "GET",
       params,
       custom: {
@@ -39,7 +39,7 @@ export default {
     }),
   put: (data: any) =>
     request({
-      url: `/sys/user/face-update`,
+      url: `/admin/user-face/app`,
       method: "PUT",
       data,
       custom: {

src/sheep/hooks/index.ts

@@ -9,3 +9,5 @@ export * from "./use-page";
 export * from "./use-phone";
 
 export * from "./use-unit";
+
+export * from "./use-token";

src/sheep/hooks/use-img.ts

@@ -1,6 +1,11 @@
+import { filePath } from "../utils/file";
+
 export const usePreviewImage = (str: string | undefined) => {
+  console.log(str, "str");
+
   if (str == undefined) return;
-  let urlList = str.split(",");
+  let urlList = str.split(",").map((v) => filePath(v));
+  console.log(urlList);
   uni.previewImage({
     urls: urlList,
   });

src/sheep/hooks/use-token.ts

@@ -0,0 +1,17 @@
+import storageConstant from "../constant/storage-constant";
+
+export const useToken = () => {
+  const tokenKey = storageConstant.TOKEN;
+  const tokenStorage = uni.getStorageSync(tokenKey);
+  if (!tokenStorage.access_token) return "";
+  return `Bearer ${tokenStorage.access_token}`;
+};
+
+export const useDefaultHeader = () => {
+  const token = useToken();
+  return {
+    "TENANT-ID": "1",
+    "CLIENT-TOC": "Y",
+    Authorization: token,
+  };
+};

src/sheep/utils/request.ts

@@ -154,15 +154,15 @@ http.interceptors.response.use(
     return Promise.resolve(response.data);
   },
   (error) => {
-    let errorMessage = "";
+    console.log(error);
+
+    let errorMessage = error.data.msg;
     if (error !== undefined) {
-      if (errorMessage) {
-        uni.showToast({
-          title: errorMessage || "",
-          icon: "none",
-          mask: true,
-        });
-      }
+      uni.showToast({
+        title: errorMessage || "",
+        icon: "none",
+        mask: true,
+      });
     }
     return false;
   }