Merge branch 'vue3'

2026-08-06 02:47:29 +08:00 · 2026-07-13 16:56:36 +08:00
parent 5ef5adf9be f6037dc18b
commit f646022926
34 changed files with 129 additions and 262 deletions
--- a/manager/public/config.js
+++ b/manager/public/config.js
@@ -3,15 +3,9 @@ var BASE = {
   * @description api请求基础路径
   */
  API_DEV: {
-    common: "http://127.0.0.1:8890",
-    buyer: "http://127.0.0.1:8888",
-    seller: "http://127.0.0.1:8889",
    manager: "http://127.0.0.1:8887",
  },
  API_PROD: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
-    seller: "https://store-api.pickmall.cn",
    manager: "https://admin-api.pickmall.cn"
  },
  /**
--- a/manager/src/api/common.js
+++ b/manager/src/api/common.js
@@ -1,29 +1,29 @@
-import {commonUrl, getRequest, getRequestWithNoToken, postRequestWithNoToken,uploadFileRequest,uploadFile} from '@/libs/axios';
+import {managerApiUrl, getRequest, getRequestWithNoToken, postRequestWithNoToken,uploadFileRequest,uploadFile} from '@/libs/axios';

 // 通过id获取子地区
 export const getChildRegion = (id) => {
-  return getRequest(`${commonUrl}/common/common/region/item/${id}`);
+  return getRequest(`${managerApiUrl}/manager/common/region/item/${id}`);
 };

 // 点地图获取地址信息
 export const getRegion = (params) => {
-  return getRequest(`${commonUrl}/common/common/region/region`, params);
+  return getRequest(`${managerApiUrl}/manager/common/region/region`, params);
 };

 // 获取拼图验证
 export const getVerifyImg = (verificationEnums) => {
-  return getRequestWithNoToken(`${commonUrl}/common/common/slider/${verificationEnums}`);
+  return getRequestWithNoToken(`${managerApiUrl}/manager/common/slider/${verificationEnums}`);
 };

 // 拼图验证
 export const postVerifyImg = (params) => {
-  return postRequestWithNoToken(`${commonUrl}/common/common/slider/${params.verificationEnums}`, params);
+  return postRequestWithNoToken(`${managerApiUrl}/manager/common/slider/${params.verificationEnums}`, params);
 };


 // 获取系统基础信息（登录页等场景无需 token）
 export const getBaseSite = () => {
-  return getRequestWithNoToken(`${commonUrl}/common/common/site`);
+  return getRequestWithNoToken(`${managerApiUrl}/manager/common/site`);
 };

 // 上传文件
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -9,20 +9,18 @@ import {
  putRequestWithNoForm,
  postRequestWithNoTokenData,
  postRequestWithNoForm,
-  managerUrl
+  managerUrl,
+  managerApiUrl
 } from "@/libs/axios";

-
-let commonUrl = (process.env.NODE_ENV === 'development' ? BASE.API_DEV.common : BASE.API_PROD.common)
-
 // 文件上传接口
-export const uploadFile = commonUrl+ "/common/common/upload/file";
+export const uploadFile = managerApiUrl + "/manager/common/upload/file";
 // Websocket
 export const ws = managerUrl + "/ws";

 //获取所有city
 export const getAllCity = (params) => {
-  return getRequest(commonUrl + '/common/common/region/allCity', params)
+  return getRequest(managerApiUrl + '/manager/common/region/allCity', params)
 }


@@ -356,7 +354,7 @@ export const aliDownloadFile = (fKey, params) => {

 // base64上传
 export const base64Upload = (params) => {
-  return postRequest("/common/common/upload/file", params);
+  return postRequest("/common/upload/file", params);
 };

 // 系统设置
@@ -460,31 +458,6 @@ export const resetPassword = (params) => {
  return postRequest(`/passport/user/resetPassword/${params}`);
 };

-// 初始化商品索引
-export const createIndex = () => {
-  return getRequest(`/other/elasticsearch`);
-};
-
-// 初始化商品索引
-export const getProgress = () => {
-  return getRequest(`/other/elasticsearch/progress`);
-};
-
-// 删除ES中下架的商品
-export const deleteGoodsDown = () => {
-  return getRequest(`/other/elasticsearch/deleteGoodsDown`);
-};
-
-// 删除不存在的索引
-export const delSkuIndex = () => {
-  return getRequest(`/other/elasticsearch/delSkuIndex`);
-};
-
-// 生成所有商品的缓存
-export const generateGoodsCache = () => {
-  return getRequest(`/other/elasticsearch/cache`);
-};
-
 // 分页查询自定义分词
 export const getCustomWordsPage = (params) => {
  return getRequest(`/other/customWords/page`, params);
@@ -532,22 +505,22 @@ export const getHotWordsHistory = (params) => {

 // 获取文件目录列表
 export const getFileDirectory = () => {
-  return getRequest(commonUrl+`/common/resource/fileDirectory`);
+  return getRequest(managerApiUrl+`/manager/common/fileDirectory`);
 };

 // 添加文件目录
 export const addFileDirectory = (params) => {
-  return postRequestWithNoForm(commonUrl+`/common/resource/fileDirectory`,params);
+  return postRequestWithNoForm(managerApiUrl+`/manager/common/fileDirectory`,params);
 };


 // 修改文件目录
 export const updateFileDirectory = (params) => {
-  return putRequestWithNoForm(commonUrl+`/common/resource/fileDirectory`,params);
+  return putRequestWithNoForm(managerApiUrl+`/manager/common/fileDirectory`,params);
 };


 // 删除文件目录
 export const delFileDirectory = (id) => {
-  return deleteRequest(commonUrl+`/common/resource/fileDirectory/${id}`);
+  return deleteRequest(managerApiUrl+`/manager/common/fileDirectory/${id}`);
 };
--- a/manager/src/components/verify/verify.js
+++ b/manager/src/components/verify/verify.js
@@ -1,13 +1,13 @@

-import {commonUrl, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/axios';
+import {managerApiUrl, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/axios';


 // 获取拼图验证
 export const getVerifyImg = (verificationEnums) => {
-  return getRequestWithNoToken(`${commonUrl}/common/common/slider/${verificationEnums}`);
+  return getRequestWithNoToken(`${managerApiUrl}/manager/common/slider/${verificationEnums}`);
 };

 // 拼图验证
 export const postVerifyImg = (params) => {
-  return postRequestWithNoToken(`${commonUrl}/common/common/slider/${params.verificationEnums}`, params);
+  return postRequestWithNoToken(`${managerApiUrl}/manager/common/slider/${params.verificationEnums}`, params);
 };
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -6,16 +6,13 @@ import Cookies from "js-cookie";
 import {v4 as uuidv4} from 'uuid';

 // 统一请求路径前缀
-export const commonUrl =
+export const managerApiUrl =
  process.env.NODE_ENV === "development"
-    ? BASE.API_DEV.common
-    : BASE.API_PROD.common;
-export const managerUrl =
-  (process.env.NODE_ENV === "development"
    ? BASE.API_DEV.manager
-    : BASE.API_PROD.manager) + BASE.PREFIX;
+    : BASE.API_PROD.manager;
+export const managerUrl = managerApiUrl + BASE.PREFIX;
 // 文件上传接口
-export const uploadFile = commonUrl + "/common/common/upload/file";
+export const uploadFile = managerApiUrl + "/manager/common/upload/file";


 const service = axios.create({
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -190,7 +190,7 @@
                      <el-upload
                        v-if="canUploadImages"
                        ref="up"
-                        :action="commonUrl + '/common/common/upload/file'"
+                        :action="managerApiUrl + '/manager/common/upload/file'"
                        :data="uploadData"
                        :headers="accessToken"
                        :before-upload="beforeUpload"
@@ -385,7 +385,7 @@ import {
  updateFileDirectory,
 } from "@/api/index";
 import DPlayer from "dplayer";
-import {commonUrl} from "@/libs/axios";
+import {managerApiUrl} from "@/libs/axios";
 import config from "@/config/index";
 import playIcon from "@/assets/play.png";

@@ -417,7 +417,7 @@ export default {
  },
  data() {
    return {
-      commonUrl, // 上传文件路径
+      managerApiUrl, // 上传文件路径
      config, // api地址
      fileDirectoryId: "",
      groupFormValidate: {
--- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@@ -51,15 +51,6 @@
        </el-form-item>
      </div>
      <div class="label-btns goods-setting-btns">
-        <div class="goods-setting-action-row">
-          <el-button type="success" @click="createIndex()">重新生成所有商品索引</el-button>
-          <el-button type="info" @click="deleteDownGoods()">删除ES中下架的商品</el-button>
-          <el-button type="warning" @click="generateCache()">生成所有商品的缓存</el-button>
-          <el-button type="danger" @click="deleteNotExistIndex()">删除不存在的索引</el-button>
-          <div class="progress-item" v-if="showProgress">
-            <el-progress :percentage="progressVal" />
-          </div>
-        </div>
        <div class="goods-setting-save-row">
          <el-button type="primary" @click="submit('formValidate')">保存</el-button>
        </div>
@@ -69,7 +60,7 @@
 </template>
 <script>
 import { ElMessage } from "element-plus";
-import { setSetting, createIndex, getProgress, deleteGoodsDown, generateGoodsCache, delSkuIndex } from "@/api/index";
+import { setSetting } from "@/api/index";
 export default {
  props: ["res", "type"],
  data() {
@@ -83,9 +74,6 @@ export default {
        originalPictureWidth: "0",
        originalPictureHeight: "0",
      },
-      progressVal: 0,
-      showProgress: false,
-      intervalProgress: null,
      ruleValidate: {},
      result: "",
    };
@@ -103,69 +91,6 @@ export default {
        }
      });
    },
-    createIndex() {
-      createIndex().then((res) => {
-        if (res.success) {
-          ElMessage.success("开始生成!");
-          this.showProgress = true;
-          setTimeout(() => {
-            this.intervalProgress = setInterval(() => {
-              getProgress().then((resp) => {
-                const progressResult = resp.result;
-                if (progressResult != null && progressResult.flag === 0) {
-                  clearInterval(this.intervalProgress);
-                  this.showProgress = false;
-                  ElMessage.success("生成成功!");
-                } else {
-                  this.progressVal = Math.floor((progressResult.processed / progressResult.total) * 100);
-                }
-              });
-            }, 1000);
-          }, 10000);
-        } else if (res.code === 100000) {
-          this.showProgress = true;
-          this.intervalProgress = setInterval(() => {
-            getProgress().then((resp) => {
-              const progressResult = resp.result;
-              if (progressResult != null && progressResult.flag === 0) {
-                clearInterval(this.intervalProgress);
-                this.showProgress = false;
-                ElMessage.success("生成成功!");
-              } else {
-                this.progressVal = Math.floor((progressResult.processed / progressResult.total) * 100);
-              }
-            });
-          }, 1000);
-        }
-      });
-    },
-    deleteDownGoods() {
-      deleteGoodsDown().then((res) => {
-        if (res.success) {
-          ElMessage.success("删除成功!");
-        } else {
-          ElMessage.error("删除失败!");
-        }
-      });
-    },
-    generateCache() {
-      generateGoodsCache().then((res) => {
-        if (res.success) {
-          ElMessage.success("生成成功!");
-        } else {
-          ElMessage.error("生成失败!");
-        }
-      });
-    },
-    deleteNotExistIndex() {
-      delSkuIndex().then((res) => {
-        if (res.success) {
-          ElMessage.success("删除成功!");
-        } else {
-          ElMessage.error("删除失败!");
-        }
-      });
-    },
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
@@ -217,19 +142,6 @@ export default {
  gap: 10px;
  margin-left: 150px;
 }
-.goods-setting-action-row {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 10px;
-}
-.goods-setting-action-row .progress-item {
-  flex: 0 0 240px;
-  min-width: 200px;
-}
-.goods-setting-action-row .progress-item :deep(.el-progress) {
-  width: 100%;
-}
 :deep(.el-input){
  width: 180px !important;
 }