Parcourir la source

调整编译bug

lcl il y a 8 mois
Parent
commit
6ae475108d

+ 1 - 1
package.json

@@ -151,4 +151,4 @@
   "repository": "git@github.com:pure-admin/vue-pure-admin.git",
   "author": "xiaoxian521",
   "license": "MIT"
-}
+}

+ 1 - 1
src/api/user.ts

@@ -50,7 +50,7 @@ export type RefreshTokenResult = {
 export const getLogin = (data?: object) => {
   console.log(data);
   return http.login(
-    "http://localhost:5296/v1/kxs/sysServer/oauth2/token",
+    "http://makertest.yumuit.com/v1/kxs/sysServer/oauth2/token",
     data
   );
 };

+ 2 - 2
src/utils/getUrl/getUrl.js

@@ -64,7 +64,7 @@ const getURL = () => {
 const getAllPlate = () => {
   return new Promise(async (resolve, reject) => {
     postRequest(
-      "http://localhost:5296/noauth/apiinfo/groupsforadmin",
+      "http://makertest.yumuit.com/noauth/apiinfo/groupsforadmin",
       {
         key: "kxs#2024"
       }
@@ -99,7 +99,7 @@ const getGroupUrl = async (checkPlate = []) => {
       );
     }, 5000);
     postRequest(
-      "http://localhost:5296/noauth/apiinfo/listforadmin",
+      "http://makertest.yumuit.com/noauth/apiinfo/listforadmin",
       parameters
     )
       .then(async res => {

+ 4 - 0
src/utils/http/index.ts

@@ -191,6 +191,8 @@ class PureHttp {
     param?: any,
     axiosConfig?: PureHttpRequestConfig
   ): Promise<T> {
+    //本地调试配置
+    url = url.replace("http://makertest.yumuit.com", "/aapi")
     const config = {
       method: "post",
       url:
@@ -233,6 +235,8 @@ class PureHttp {
     param?: any,
     axiosConfig?: PureHttpRequestConfig
   ): any {
+    //本地调试配置
+    url = url.replace("http://makertest.yumuit.com", "/aapi")
     const config = {
       method,
       url,

+ 31 - 66
src/views/app/appBottomNavs/components/add/index.vue

@@ -55,7 +55,6 @@ const styleOptionList = [
 ]
 // 分类选项数据
 const kindOptionList = [
-  { label: '创客版', id: 'creater' }
 ]
 
 // 选项卡参数(默认值为列表某项的id)
@@ -83,23 +82,23 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-          title: "", //标题
-          selectIcon: "", //选中图标
-          normalIcon: "", //未选中图标
-          selectTextColor: "", //选中文字颜色
-          normalTextColor: "", //未选中文字颜色
-          pageName: "", //关联页面文件
-          noPageHint: "", //空页面提示信息
-          backgroudColor: "", //背景色
-          style: "", //按钮样式
-          scrollerAnimationImages: "", //滚动图片
-          pagPath: "", //PAG文件
-          showTitle: "", //是否显示标题
-          pagLocalPath: "", //pag文件路径
-          pagDefaultIcon: "", //pag默认图标
-          iconSize: "", //图标尺寸
-          statusBarColor: "", //状态栏底色
-          kind: "", //分类
+                title: "", //标题
+      selectIcon: "", //选中图标
+      normalIcon: "", //未选中图标
+      selectTextColor: "", //选中文字颜色
+      normalTextColor: "", //未选中文字颜色
+      pageName: "", //关联页面文件
+      noPageHint: "", //空页面提示信息
+      backgroudColor: "", //背景色
+      style: "", //按钮样式
+      scrollerAnimationImages: "", //滚动图片
+      pagPath: "", //PAG文件
+      showTitle: "", //是否显示标题
+      pagLocalPath: "", //pag文件路径
+      pagDefaultIcon: "", //pag默认图标
+      iconSize: "", //图标尺寸
+      statusBarColor: "", //状态栏底色
+      kind: "", //分类
 
         };
         // 关闭新增弹窗;
@@ -123,46 +122,6 @@ const submit = async (formEl) => {
 
 
 
-// 上传选中图标回调
-const select_iconCallBack = (url) => {
-  ElMessage({
-    message: `选中图标上传成功:${url}`,
-    type: "success"
-  });
-  UpdateForm.value.select_icon = url;
-}
-// 上传未选中图标回调
-const normal_iconCallBack = (url) => {
-  ElMessage({
-    message: `未选中图标上传成功:${url}`,
-    type: "success"
-  });
-  UpdateForm.value.normal_icon = url;
-}
-// 上传PAG文件回调
-const pag_pathCallBack = (url) => {
-  ElMessage({
-    message: `PAG文件上传成功:${url}`,
-    type: "success"
-  });
-  UpdateForm.value.pag_path = url;
-}
-// 上传pag文件路径回调
-const pag_local_pathCallBack = (url) => {
-  ElMessage({
-    message: `pag文件路径上传成功:${url}`,
-    type: "success"
-  });
-  UpdateForm.value.pag_local_path = url;
-}
-// 上传pag默认图标回调
-const pag_default_iconCallBack = (url) => {
-  ElMessage({
-    message: `pag默认图标上传成功:${url}`,
-    type: "success"
-  });
-  UpdateForm.value.pag_default_icon = url;
-}
 
 // 表单校验规则
 const rules = reactive({
@@ -179,7 +138,7 @@ const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-    title: "", //标题
+        title: "", //标题
     selectIcon: "", //选中图标
     normalIcon: "", //未选中图标
     selectTextColor: "", //选中文字颜色
@@ -215,9 +174,11 @@ const isFullscreen = ref(false)
             el-input(v-model='UpdateForm.title' autocomplete='off'
               placeholder="请输入标题")
           el-form-item(label='选中图标' prop="selectIcon")
-            UploadImg(:cropper="true" :callBack="selectIconCallBack")
+            el-input(v-model='UpdateForm.selectIcon' autocomplete='off'
+              placeholder="请输入选中图标")
           el-form-item(label='未选中图标' prop="normalIcon")
-            UploadImg(:cropper="true" :callBack="normalIconCallBack")
+            el-input(v-model='UpdateForm.normalIcon' autocomplete='off'
+              placeholder="请输入未选中图标")
           el-form-item(label='选中文字颜色' prop="selectTextColor")
             el-input(v-model='UpdateForm.selectTextColor' autocomplete='off'
               placeholder="请输入选中文字颜色")
@@ -240,18 +201,22 @@ const isFullscreen = ref(false)
               clearable,
             )
               el-option(:label="item.label", :value="item.id" v-for="(item,index) in styleOptionList")
+          el-form-item(label='滚动图片' prop="scrollerAnimationImages")
+            el-input(v-model='UpdateForm.scrollerAnimationImages' autocomplete='off'
+              placeholder="请输入滚动图片")
           el-form-item(label='PAG文件' prop="pagPath")
-            el-input(v-model='UpdateForm.pagPath' autocomplete='off' class="!w-[230px]" disabled)
-            Uploadfile(btntext="上传文件" :FilePath="pagPathCallBack")
+            el-input(v-model='UpdateForm.pagPath' autocomplete='off'
+              placeholder="请输入PAG文件")
       el-tab-pane(label="基本信息" name="2")
         el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
           el-form-item(label='是否显示标题' prop="showTitle")
             el-switch(v-model="UpdateForm.showTitle")
           el-form-item(label='pag文件路径' prop="pagLocalPath")
-            el-input(v-model='UpdateForm.pagLocalPath' autocomplete='off' class="!w-[230px]" disabled)
-            Uploadfile(btntext="上传文件" :FilePath="pagLocalPathCallBack")
+            el-input(v-model='UpdateForm.pagLocalPath' autocomplete='off'
+              placeholder="请输入pag文件路径")
           el-form-item(label='pag默认图标' prop="pagDefaultIcon")
-            UploadImg(:cropper="true" :callBack="pagDefaultIconCallBack")
+            el-input(v-model='UpdateForm.pagDefaultIcon' autocomplete='off'
+              placeholder="请输入pag默认图标")
           el-form-item(label='图标尺寸' prop="iconSize")
             el-input-number(v-model='UpdateForm.iconSize' :min="1" :max="1000"
               placeholder="请输入图标尺寸")

+ 31 - 65
src/views/app/appBottomNavs/components/update/index.vue

@@ -64,7 +64,7 @@ const submit = async (formEl) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       //表单校验成功回调
-      console.log('submit!')
+      console.log('submit!');
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
@@ -79,22 +79,22 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                title: "", //标题
-      selectIcon: "", //选中图标
-      normalIcon: "", //未选中图标
-      selectTextColor: "", //选中文字颜色
-      normalTextColor: "", //未选中文字颜色
-      pageName: "", //关联页面文件
-      noPageHint: "", //空页面提示信息
-      backgroudColor: "", //背景色
-      style: "", //按钮样式
-      scrollerAnimationImages: "", //滚动图片
-      pagPath: "", //PAG文件
-      showTitle: "", //是否显示标题
-      pagLocalPath: "", //pag文件路径
-      pagDefaultIcon: "", //pag默认图标
-      iconSize: "", //图标尺寸
-      statusBarColor: "", //状态栏底色
+          title: "", //标题
+          selectIcon: "", //选中图标
+          normalIcon: "", //未选中图标
+          selectTextColor: "", //选中文字颜色
+          normalTextColor: "", //未选中文字颜色
+          pageName: "", //关联页面文件
+          noPageHint: "", //空页面提示信息
+          backgroudColor: "", //背景色
+          style: "", //按钮样式
+          scrollerAnimationImages: "", //滚动图片
+          pagPath: "", //PAG文件
+          showTitle: "", //是否显示标题
+          pagLocalPath: "", //pag文件路径
+          pagDefaultIcon: "", //pag默认图标
+          iconSize: "", //图标尺寸
+          statusBarColor: "", //状态栏底色
 
         };
         // 关闭修改弹窗;
@@ -118,46 +118,6 @@ const submit = async (formEl) => {
 
 
 
-// 上传选中图标回调
-const select_iconCallBack = (url) => {
-  ElMessage({
-    message: `选中图标上传成功:${url}`,
-    type: "success"
-  });
-UpdateForm.value.select_icon = url;
-}
-// 上传未选中图标回调
-const normal_iconCallBack = (url) => {
-  ElMessage({
-    message: `未选中图标上传成功:${url}`,
-    type: "success"
-  });
-UpdateForm.value.normal_icon = url;
-}
-// 上传PAG文件回调
-const pag_pathCallBack = (url) => {
-  ElMessage({
-    message: `PAG文件上传成功:${url}`,
-    type: "success"
-  });
-UpdateForm.value.pag_path = url;
-}
-// 上传pag文件路径回调
-const pag_local_pathCallBack = (url) => {
-  ElMessage({
-    message: `pag文件路径上传成功:${url}`,
-    type: "success"
-  });
-UpdateForm.value.pag_local_path = url;
-}
-// 上传pag默认图标回调
-const pag_default_iconCallBack = (url) => {
-  ElMessage({
-    message: `pag默认图标上传成功:${url}`,
-    type: "success"
-  });
-UpdateForm.value.pag_default_icon = url;
-}
 
 // 表单校验规则
 const rules = reactive({
@@ -170,7 +130,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appBottomNavsquery.method, url: UrlList.kxsConfigServer.appBottomNavsquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appBottomNavsquery.method, url: UrlList.kxsConfigServer.appBottomNavsquery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -214,9 +174,11 @@ const isFullscreen = ref(false)
             el-input(v-model='UpdateForm.title' autocomplete='off'
               placeholder="请输入标题")
           el-form-item(label='选中图标' prop="selectIcon")
-            UploadImg(:cropper="true" :callBack="selectIconCallBack")
+            el-input(v-model='UpdateForm.selectIcon' autocomplete='off'
+              placeholder="请输入选中图标")
           el-form-item(label='未选中图标' prop="normalIcon")
-            UploadImg(:cropper="true" :callBack="normalIconCallBack")
+            el-input(v-model='UpdateForm.normalIcon' autocomplete='off'
+              placeholder="请输入未选中图标")
           el-form-item(label='选中文字颜色' prop="selectTextColor")
             el-input(v-model='UpdateForm.selectTextColor' autocomplete='off'
               placeholder="请输入选中文字颜色")
@@ -239,18 +201,22 @@ const isFullscreen = ref(false)
               clearable,
             )
               el-option(:label="item.label", :value="item.id" v-for="(item,index) in styleOptionList")
+          el-form-item(label='滚动图片' prop="scrollerAnimationImages")
+            el-input(v-model='UpdateForm.scrollerAnimationImages' autocomplete='off'
+              placeholder="请输入滚动图片")
           el-form-item(label='PAG文件' prop="pagPath")
-            el-input(v-model='UpdateForm.pagPath' autocomplete='off' class="!w-[230px]" disabled)
-            Uploadfile(btntext="上传文件" :FilePath="pagPathCallBack")
+            el-input(v-model='UpdateForm.pagPath' autocomplete='off'
+              placeholder="请输入PAG文件")
       el-tab-pane(label="基本信息" name="2")
         el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
           el-form-item(label='是否显示标题' prop="showTitle")
             el-switch(v-model="UpdateForm.showTitle")
           el-form-item(label='pag文件路径' prop="pagLocalPath")
-            el-input(v-model='UpdateForm.pagLocalPath' autocomplete='off' class="!w-[230px]" disabled)
-            Uploadfile(btntext="上传文件" :FilePath="pagLocalPathCallBack")
+            el-input(v-model='UpdateForm.pagLocalPath' autocomplete='off'
+              placeholder="请输入pag文件路径")
           el-form-item(label='pag默认图标' prop="pagDefaultIcon")
-            UploadImg(:cropper="true" :callBack="pagDefaultIconCallBack")
+            el-input(v-model='UpdateForm.pagDefaultIcon' autocomplete='off'
+              placeholder="请输入pag默认图标")
           el-form-item(label='图标尺寸' prop="iconSize")
             el-input-number(v-model='UpdateForm.iconSize' :min="1" :max="1000"
               placeholder="请输入图标尺寸")

+ 7 - 6
vite.config.ts

@@ -52,12 +52,12 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
       host: "0.0.0.0",
       // 本地跨域代理 https://cn.vitejs.dev/config/server-options.html#server-proxy
       proxy: {
-        // "/api": {
-        //   // 这里填写后端地址
-        //   target: "http://test.apigateway.shuangkebang.com",
-        //   changeOrigin: true,
-        //   rewrite: path => path.replace(/^\/api/, "")
-        // }
+        "/aapi": {
+          // 这里填写后端地址
+          target: "http://makertest.yumuit.com",
+          changeOrigin: true,
+          rewrite: path => path.replace(/^\/aapi/, "")
+        }
       }
     },
     plugins: getPluginsList(command, VITE_CDN, VITE_COMPRESSION),
@@ -67,6 +67,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
       exclude
     },
     build: {
+      target: "esnext",
       sourcemap: false,
       // 消除打包大小超过500kb警告
       chunkSizeWarningLimit: 4000,