lcl 8 ay önce
ebeveyn
işleme
24af994ef5

+ 39 - 22
src/views/app/appBottomNavs/components/add/index.vue

@@ -43,6 +43,7 @@ let UpdateForm = ref({
   pagDefaultIcon: "", //pag默认图标
   iconSize: "", //图标尺寸
   statusBarColor: "", //状态栏底色
+  kind: "", //分类
 
 });
 // 表单实例
@@ -52,6 +53,10 @@ const ruleFormRef = ref()
 // 按钮样式选项数据
 const styleOptionList = [
 ]
+// 分类选项数据
+const kindOptionList = [
+  { label: '创客版', id: 'creater' }
+]
 
 // 选项卡参数(默认值为列表某项的id)
 const activeId = ref('1')
@@ -78,22 +83,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: "", //状态栏底色
+          title: "", //标题
+          selectIcon: "", //选中图标
+          normalIcon: "", //未选中图标
+          selectTextColor: "", //选中文字颜色
+          normalTextColor: "", //未选中文字颜色
+          pageName: "", //关联页面文件
+          noPageHint: "", //空页面提示信息
+          backgroudColor: "", //背景色
+          style: "", //按钮样式
+          scrollerAnimationImages: "", //滚动图片
+          pagPath: "", //PAG文件
+          showTitle: "", //是否显示标题
+          pagLocalPath: "", //pag文件路径
+          pagDefaultIcon: "", //pag默认图标
+          iconSize: "", //图标尺寸
+          statusBarColor: "", //状态栏底色
+          kind: "", //分类
 
         };
         // 关闭新增弹窗;
@@ -123,7 +129,7 @@ const select_iconCallBack = (url) => {
     message: `选中图标上传成功:${url}`,
     type: "success"
   });
-UpdateForm.value.select_icon = url;
+  UpdateForm.value.select_icon = url;
 }
 // 上传未选中图标回调
 const normal_iconCallBack = (url) => {
@@ -131,7 +137,7 @@ const normal_iconCallBack = (url) => {
     message: `未选中图标上传成功:${url}`,
     type: "success"
   });
-UpdateForm.value.normal_icon = url;
+  UpdateForm.value.normal_icon = url;
 }
 // 上传PAG文件回调
 const pag_pathCallBack = (url) => {
@@ -139,7 +145,7 @@ const pag_pathCallBack = (url) => {
     message: `PAG文件上传成功:${url}`,
     type: "success"
   });
-UpdateForm.value.pag_path = url;
+  UpdateForm.value.pag_path = url;
 }
 // 上传pag文件路径回调
 const pag_local_pathCallBack = (url) => {
@@ -147,7 +153,7 @@ const pag_local_pathCallBack = (url) => {
     message: `pag文件路径上传成功:${url}`,
     type: "success"
   });
-UpdateForm.value.pag_local_path = url;
+  UpdateForm.value.pag_local_path = url;
 }
 // 上传pag默认图标回调
 const pag_default_iconCallBack = (url) => {
@@ -155,7 +161,7 @@ const pag_default_iconCallBack = (url) => {
     message: `pag默认图标上传成功:${url}`,
     type: "success"
   });
-UpdateForm.value.pag_default_icon = url;
+  UpdateForm.value.pag_default_icon = url;
 }
 
 // 表单校验规则
@@ -163,6 +169,9 @@ const rules = reactive({
   title: [
     { required: true, message: '请输入标题', trigger: 'blur' },
   ],
+  kind: [
+    { required: true, message: '请输入分类', trigger: 'blur' },
+  ],
 
 })
 // 关闭弹窗回调函数
@@ -170,7 +179,7 @@ const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        title: "", //标题
+    title: "", //标题
     selectIcon: "", //选中图标
     normalIcon: "", //未选中图标
     selectTextColor: "", //选中文字颜色
@@ -186,6 +195,7 @@ const closeVisible = () => {
     pagDefaultIcon: "", //pag默认图标
     iconSize: "", //图标尺寸
     statusBarColor: "", //状态栏底色
+    kind: "", //分类
 
   };
   closeFn();
@@ -248,6 +258,13 @@ const isFullscreen = ref(false)
           el-form-item(label='状态栏底色' prop="statusBarColor")
             el-input(v-model='UpdateForm.statusBarColor' autocomplete='off'
               placeholder="请输入状态栏底色")
+          el-form-item(label="分类", prop="kind")
+            el-select(
+              v-model="UpdateForm.kind",
+              placeholder="请选择分类",
+              clearable,
+            )
+              el-option(:label="item.label", :value="item.id" v-for="(item,index) in kindOptionList")
     el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
 
     .flex.justify-end

+ 15 - 15
src/views/app/appBottomNavs/hook.tsx

@@ -8,10 +8,10 @@ export function useAppBottomNavs() {
   onMounted(async () => {
     UrlList = await getGroupUrl(["kxsConfigServer"]);
     onSearch(ruleFormRef.value);
-  
+
   });
   let form = reactive({
-  kind:"", //分类
+    kind: "", //分类
 
   });
   const dataList = ref([]);
@@ -36,7 +36,12 @@ export function useAppBottomNavs() {
       width: 70,
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
-        {
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
+    {
       label: "标题",
       prop: "title",
       minWidth: 200
@@ -81,11 +86,6 @@ export function useAppBottomNavs() {
       prop: "style",
       minWidth: 200
     },
-    {
-      label: "ID",
-      prop: "id",
-      minWidth: 200
-    },
 
     {
       label: "操作",
@@ -151,7 +151,7 @@ export function useAppBottomNavs() {
 
 
 
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该app底部导航? `,
@@ -162,7 +162,7 @@ export function useAppBottomNavs() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appBottomNavsdelete.method, url: UrlList.kxsConfigServer.appBottomNavsdelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appBottomNavsdelete.method, url: UrlList.kxsConfigServer.appBottomNavsdelete.url, params: String(row.id) });
       if (status === 1) {
         ElMessage({
           message: "删除成功",
@@ -171,20 +171,20 @@ export function useAppBottomNavs() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdateVisible = ref(false);
   const editUpdateFormData = ref({});
   function handleUpdate(row) {

+ 45 - 24
src/views/app/appVersion/components/add/index.vue

@@ -34,6 +34,7 @@ let UpdateForm = ref({
   confirmText: "", //确定按钮文字
   cancelText: "", //取消按钮文字
   downloadUrl: "", //更新地址
+  kind: "", //分类
 
 });
 // 表单实例
@@ -43,7 +44,11 @@ const ruleFormRef = ref()
 // 终端类型选项数据
 const terminalKindOptionList = [
   { label: 'ios', id: 'ios' },
-  { label: 'android', id: 'android' },
+  { label: 'android', id: 'android' }
+]
+// 分类选项数据
+const kindOptionList = [
+  { label: '创客版', id: 'creater' }
 ]
 
 // 选项卡参数(默认值为列表某项的id)
@@ -78,6 +83,7 @@ const submit = async (formEl) => {
           confirmText: "", //确定按钮文字
           cancelText: "", //取消按钮文字
           downloadUrl: "", //更新地址
+          kind: "", //分类
 
         };
         // 关闭新增弹窗;
@@ -104,6 +110,9 @@ const submit = async (formEl) => {
 
 // 表单校验规则
 const rules = reactive({
+  kind: [
+    { required: true, message: '请输入分类', trigger: 'blur' },
+  ],
 
 })
 // 关闭弹窗回调函数
@@ -118,6 +127,7 @@ const closeVisible = () => {
     confirmText: "", //确定按钮文字
     cancelText: "", //取消按钮文字
     downloadUrl: "", //更新地址
+    kind: "", //分类
 
   };
   closeFn();
@@ -130,29 +140,40 @@ const isFullscreen = ref(false)
 <template lang="pug">
 .main
   el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="新增" draggable @close="closeVisible")
-    el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-      el-form-item(label="终端类型", prop="terminalKind")
-        el-select(
-          v-model="UpdateForm.terminalKind",
-          placeholder="请选择终端类型",
-          clearable,
-        )
-          el-option(:label="item.label", :value="item.id" v-for="(item,index) in terminalKindOptionList")
-      el-form-item(label='版本号' prop="versionNum")
-        el-input(v-model='UpdateForm.versionNum' autocomplete='off'
-          placeholder="请输入版本号")
-      el-form-item(label='标题' prop="title")
-        el-input(v-model='UpdateForm.title' autocomplete='off'
-          placeholder="请输入标题")
-      el-form-item(label='确定按钮文字' prop="confirmText")
-        el-input(v-model='UpdateForm.confirmText' autocomplete='off'
-          placeholder="请输入确定按钮文字")
-      el-form-item(label='取消按钮文字' prop="cancelText")
-        el-input(v-model='UpdateForm.cancelText' autocomplete='off'
-          placeholder="请输入取消按钮文字")
-      el-form-item(label='更新地址' prop="downloadUrl")
-        el-input(v-model='UpdateForm.downloadUrl' autocomplete='off'
-          placeholder="请输入更新地址")
+    el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
+      el-tab-pane(label="基本资料" name="1")
+        el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
+          el-form-item(label="终端类型", prop="terminalKind")
+            el-select(
+              v-model="UpdateForm.terminalKind",
+              placeholder="请选择终端类型",
+              clearable,
+            )
+              el-option(:label="item.label", :value="item.id" v-for="(item,index) in terminalKindOptionList")
+          el-form-item(label='版本号' prop="versionNum")
+            el-input(v-model='UpdateForm.versionNum' autocomplete='off'
+              placeholder="请输入版本号")
+          el-form-item(label='标题' prop="title")
+            el-input(v-model='UpdateForm.title' autocomplete='off'
+              placeholder="请输入标题")
+          el-form-item(label='确定按钮文字' prop="confirmText")
+            el-input(v-model='UpdateForm.confirmText' autocomplete='off'
+              placeholder="请输入确定按钮文字")
+          el-form-item(label='取消按钮文字' prop="cancelText")
+            el-input(v-model='UpdateForm.cancelText' autocomplete='off'
+              placeholder="请输入取消按钮文字")
+          el-form-item(label='更新地址' prop="downloadUrl")
+            el-input(v-model='UpdateForm.downloadUrl' autocomplete='off'
+              placeholder="请输入更新地址")
+      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="kind")
+            el-select(
+              v-model="UpdateForm.kind",
+              placeholder="请选择分类",
+              clearable,
+            )
+              el-option(:label="item.label", :value="item.id" v-for="(item,index) in kindOptionList")
     el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
 
     .flex.justify-end

+ 10 - 9
src/views/app/appVersion/components/update/index.vue

@@ -41,6 +41,8 @@ const UpdateForm: any = ref({
 });
 // 终端类型选项数据
 const terminalKindOptionList = [
+  { label: 'ios', id: 'ios' },
+  { label: 'android', id: 'android' }
 ]
 
 // 表单实例
@@ -70,13 +72,13 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                terminalKind: "", //终端类型
-      versionNum: "", //版本号
-      title: "", //标题
-      info: "", //更新信息
-      confirmText: "", //确定按钮文字
-      cancelText: "", //取消按钮文字
-      downloadUrl: "", //更新地址
+          terminalKind: "", //终端类型
+          versionNum: "", //版本号
+          title: "", //标题
+          info: "", //更新信息
+          confirmText: "", //确定按钮文字
+          cancelText: "", //取消按钮文字
+          downloadUrl: "", //更新地址
 
         };
         // 关闭修改弹窗;
@@ -109,7 +111,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appVersionquery.method, url: UrlList.kxsConfigServer.appVersionquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appVersionquery.method, url: UrlList.kxsConfigServer.appVersionquery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -125,7 +127,6 @@ const closeUpdateVisible = () => {
     confirmText: "", //确定按钮文字
     cancelText: "", //取消按钮文字
     downloadUrl: "", //更新地址
-
   };
   closeFn();
 };

+ 15 - 15
src/views/app/appVersion/hook.tsx

@@ -8,10 +8,10 @@ export function useAppVersion() {
   onMounted(async () => {
     UrlList = await getGroupUrl(["kxsConfigServer"]);
     onSearch(ruleFormRef.value);
-  
+
   });
   let form = reactive({
-  kind:"", //分类
+    kind: "", //分类
 
   });
   const dataList = ref([]);
@@ -36,7 +36,12 @@ export function useAppVersion() {
       width: 70,
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
-        {
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
+    {
       label: "终端类型",
       prop: "terminalKind",
       minWidth: 200
@@ -66,11 +71,6 @@ export function useAppVersion() {
       prop: "downloadUrl",
       minWidth: 200
     },
-    {
-      label: "ID",
-      prop: "id",
-      minWidth: 200
-    },
 
     {
       label: "操作",
@@ -136,7 +136,7 @@ export function useAppVersion() {
 
 
 
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该app版本管理? `,
@@ -147,7 +147,7 @@ export function useAppVersion() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appVersiondelete.method, url: UrlList.kxsConfigServer.appVersiondelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appVersiondelete.method, url: UrlList.kxsConfigServer.appVersiondelete.url, params: String(row.id) });
       if (status === 1) {
         ElMessage({
           message: "删除成功",
@@ -156,20 +156,20 @@ export function useAppVersion() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdateVisible = ref(false);
   const editUpdateFormData = ref({});
   function handleUpdate(row) {

+ 1 - 1
src/views/app/fileUpdateInfo/hook.tsx

@@ -132,7 +132,7 @@ export function useFileUpdateInfo() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.fileUpdateInfodelete.method, url: UrlList.kxsConfigServer.fileUpdateInfodelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.fileUpdateInfodelete.method, url: UrlList.kxsConfigServer.fileUpdateInfodelete.url, params: String(row.id) });
       if (status === 1) {
         ElMessage({
           message: "删除成功",

+ 1 - 1
src/views/app/pageUpdateInfo/hook.tsx

@@ -132,7 +132,7 @@ export function usePageUpdateInfo() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfodelete.method, url: UrlList.kxsConfigServer.pageUpdateInfodelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfodelete.method, url: UrlList.kxsConfigServer.pageUpdateInfodelete.url, params: String(row.id) });
       if (status === 1) {
         ElMessage({
           message: "删除成功",