超市页面修改

src/sheep/api/index.ts

@@ -21,3 +21,5 @@ export { default as userApi } from "./user";
 export { default as walletApi } from "./wallet";
 
 export { default as faceApi } from "./face";
+
+export { default as shopApi } from "./shop";

src/sheep/api/merchant.ts

@@ -3,7 +3,7 @@ import request from "@/sheep/utils/request";
 export default {
   page: (params: any) =>
     request({
-      url: "/merchant/manage/page-join",
+      url: "/wallet/mch-manage/app/page-join",
       method: "GET",
       params,
       custom: {
@@ -12,7 +12,7 @@ export default {
     }),
   detail: (params: any) =>
     request({
-      url: "/merchant/manage/get",
+      url: "/wallet/mch-manage/app/detail",
       method: "GET",
       params,
       custom: {

src/sheep/api/order.ts

@@ -3,7 +3,7 @@ import request from "@/sheep/utils/request";
 export default {
   page: (params: any) =>
     request({
-      url: `/hardware/order/page-join`,
+      url: `/hard/hard-order/app/page-join`,
       method: "GET",
       params,
       custom: {
@@ -12,7 +12,7 @@ export default {
     }),
   detail: (params: any) =>
     request({
-      url: `/hardware/order/get-join`,
+      url: `/hard/hard-order/app/detail`,
       method: "GET",
       params,
       custom: {

src/sheep/api/shop.ts

@@ -0,0 +1,49 @@
+import request from "@/sheep/utils/request";
+
+export default {
+  getSupermarketSpuList: (data: any) =>
+    request({
+      url: `/supermarket/supermarketSpu/ad/updateSpuStock`,
+      method: "POST",
+      data,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  //   del: (params: any) =>
+  //     request({
+  //       url: `/sys/user/face-delete`,
+  //       method: "DELETE",
+  //       params,
+  //       custom: {
+  //         showLoading: false,
+  //       },
+  //     }),
+  //   create: (data: any) =>
+  //     request({
+  //       url: `/sys/user/face-create`,
+  //       method: "POST",
+  //       data,
+  //       custom: {
+  //         showLoading: false,
+  //       },
+  //     }),
+  //   get: (params: any) =>
+  //     request({
+  //       url: `/sys/user/face-get`,
+  //       method: "GET",
+  //       params,
+  //       custom: {
+  //         showLoading: false,
+  //       },
+  //     }),
+  //   put: (data: any) =>
+  //     request({
+  //       url: `/sys/user/face-update`,
+  //       method: "PUT",
+  //       data,
+  //       custom: {
+  //         showLoading: false,
+  //       },
+  //     }),
+};

src/sheep/api/user.ts

@@ -1,8 +1,8 @@
 import request from "@/sheep/utils/request";
-import { encryptionBase64 } from "@/sheep/utils/util";
+import { encryption } from "@/sheep/utils/encryption";
 
-const basicAuth = "Basic " + encryptionBase64(import.meta.env.VITE_OAUTH2_APP_CLIENT);
-const basicAuthzzdsh = "Basic " + encryptionBase64(import.meta.env.VITE_OAUTH2_ZZDSHAPP_CLIENT);
+const basicAuth =
+  "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT);
 
 export default {
   userInfo: () =>
@@ -44,17 +44,23 @@ export default {
       },
     }),
   login: (params: any): any => {
-    params.scene = "account";
-    params.grant_type = "password";
-    params.scope = "server";
-    params.code = "";
-    request({
+    const { username, password, randomStr, code, grant_type, scope } = params;
+    const encPassword = encryption(password, import.meta.env.VITE_PWD_ENC_KEY);
+    return request({
       url: `/auth/oauth2/token`,
       method: "POST",
-      params,
+      params: {
+        username,
+        password: encPassword,
+        randomStr,
+        code,
+        grant_type,
+        scope,
+      },
+      data: { password: encPassword },
       header: {
+        skipToken: true,
         Authorization: basicAuth,
-        // Authorization: basicAuthzzdsh,
         "content-type": "application/x-www-form-urlencoded",
       },
       custom: {

src/sheep/api/wallet.ts

@@ -3,7 +3,7 @@ import request from "@/sheep/utils/request";
 export default {
   all: () =>
     request({
-      url: "pay/wallet/get-all",
+      url: "/wallet/wallet-manage/app/get-all",
       method: "GET",
       custom: {
         showLoading: false,
@@ -20,7 +20,7 @@ export default {
     }),
   detail: (params: any) =>
     request({
-      url: "pay/wallet/detail",
+      url: "wallet/wallet-manage/app/detail",
       method: "GET",
       params,
       custom: {
@@ -56,7 +56,7 @@ export default {
     }),
   transaction: (params: any) =>
     request({
-      url: "pay/wallet-transaction/page-by-id",
+      url: "wallet/wallet-transaction/page",
       method: "GET",
       params,
       custom: {
@@ -74,7 +74,7 @@ export default {
     }),
   rechargeList: (params: any) =>
     request({
-      url: "pay/wallet-recharge-package/list",
+      url: "wallet/wallet-recharge-package/app/list",
       method: "GET",
       params,
       custom: {
@@ -83,7 +83,7 @@ export default {
     }),
   recharge: (data: any) =>
     request({
-      url: "pay/wallet-recharge/create",
+      url: "wallet/wallet-recharge/app/create",
       method: "POST",
       data,
       custom: {