diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index 99560e5..54dd2a6 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -50,6 +50,12 @@ export const moduleRoutes = { name: 'home', meta: { title: '首页', isTab: true } } + // { + // path: '/homeWork', + // component: () => import('@/views/modules/HomeWork'), + // name: 'homeWork', + // meta: { title: '首页', isTab: true } + // } ] } @@ -111,6 +117,7 @@ router.beforeEach((to, from, next) => { // }) // .catch(() => {}) // 获取菜单列表, 添加并全局变量保存 + const userType = localStorage.getItem('userType') console.log('获取菜单::::' + localStorage.getItem('userType')) diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue index 038b406..f8f936e 100644 --- a/epmet-oper-web/src/views/main-navbar.vue +++ b/epmet-oper-web/src/views/main-navbar.vue @@ -72,7 +72,7 @@ - {{ $t('updatePassword.title') }} + {{ $t('logout') }} @@ -114,6 +114,7 @@ export default { }, methods: { changeCustomerName (customerName) { + this.customerName = localStorage.getItem('customerName') }, // 全屏 @@ -141,13 +142,18 @@ export default { cancelButtonText: this.$t('cancel'), type: 'warning' }).then(() => { + //关闭所有标签页 + // tabs, 关闭全部 + this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home') + + this.$http.post('/auth/login/logout').then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } clearLoginInfo() - console.log('logout:::::' + localStorage.getItem('userType')) + if (localStorage.getItem('userType') === 'work') { this.$router.push({ name: 'loginWork' }) } else { diff --git a/epmet-oper-web/src/views/modules/HomeWork.vue b/epmet-oper-web/src/views/modules/HomeWork.vue new file mode 100644 index 0000000..28a0014 --- /dev/null +++ b/epmet-oper-web/src/views/modules/HomeWork.vue @@ -0,0 +1,14 @@ + + + diff --git a/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue index 10b192b..06ef032 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue @@ -23,6 +23,8 @@ content="请输入2-5个字" placement="bottom-start"> diff --git a/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue index 63c5c03..248c95b 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue @@ -515,8 +515,9 @@ export default { // 上架/下架 upOrDown (functionId, shoppingStatus) { + this.optionType = '1' - this.upOrDownDia.title = shoppingStatus === 0 ? '下架原因' : '上架原因' + this.upOrDownDia.title = shoppingStatus === '0' ? '下架原因' : '上架原因' this.upOrDownForm = { customerId: this.customerId, functionId: functionId, diff --git a/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue b/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue index 94420c7..9302b7e 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue @@ -155,13 +155,13 @@ export default { pageTitle: [ { required: true, message: '页面标题不能为空', trigger: 'blur' }, { min: 2, max: 10, message: '页面标题长度在 2 到 10 个字符', trigger: 'blur' } - ], - iconPath: [ - { required: true, message: '图标不能为空', trigger: 'blur' } - ], - selectedIconPath: [ - { required: true, message: '选中图标不能为空', trigger: 'blur' } ] + // iconPath: [ + // { required: true, message: '图标不能为空', trigger: 'blur' } + // ], + // selectedIconPath: [ + // { required: true, message: '选中图标不能为空', trigger: 'blur' } + // ] } } }, diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue index f60ad49..f330d24 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -139,11 +139,11 @@ export default { plain: false, methodName: 'showToken', // 回调方法名称 isShow: (row) => { - if (this.env !== 'prod') { - return true - } else { - return false - } + // if (this.env !== 'prod') { + return true + // } else { + // return false + // } } } ], diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue index a3d619b..90e2c01 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue @@ -69,7 +69,7 @@ class="el-upload__tip">可上传小程序使用录屏,最多上传1个视频。视频支持mp4格式,视频大小不超过20M - @@ -77,7 +77,7 @@ 加急
一年3次,不加急:预计在1-7天内完成,加急:预计再2-12小时内完成
-
+ --> @@ -189,6 +189,7 @@ export default { sceneOtherDisabled: true, // 其他场景是否禁用 dataForm: { isSpeed: false, // 是否加急 + isRepeat: false, // 上一次提审是否是加急,初次提审都是false versionDesc: '', // 小程序版本说明和功能解释 ugcDeclare: { // 用户生成内容场景(UGC)信息安全声明 scene: [1, 2, 4], // UGC场景 0,不涉及用户生成内容, 1.用户资料,2.图片,3.视频,4.文本,5其他, 可多选,当scene填0时无需填写下列字段 @@ -231,6 +232,7 @@ export default { reseatDataForm () { this.dataForm = { isSpeed: false, // 是否加急 + isRepeat: false, // 上一次提审是否是加急,初次提审都是false versionDesc: '', // 小程序版本说明和功能解释 ugcDeclare: { // 用户生成内容场景(UGC)信息安全声明 scene: [1, 2, 4], // UGC场景 0,不涉及用户生成内容, 1.用户资料,2.图片,3.视频,4.文本,5其他, 可多选,当scene填0时无需填写下列字段 @@ -436,8 +438,10 @@ export default { // console.log('预览视频:') // console.log(params.previewInfo.videoIdList) } - // 加急 - params.isSpeed = this.dataForm.isSpeed + // 加急 + // params.isSpeed = this.dataForm.isSpeed + params.isSpeed = false + params.isRepeat = false// 上一次提审是否是加急,初次提审都是false // 小程序描述排除空内容 if (this.dataForm.versionDesc !== '') { diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue index 2adc916..f60bf8d 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue @@ -60,8 +60,10 @@ export default { return { loading: false, codeId: '', // 上传代码id,父组件传 + isRepeat: false, // 上一次是否加急,父组件传 dataForm: { + feedbackInfo: '', // 反馈内容 feedbackStuff: '' // 反馈素材 }, @@ -91,8 +93,10 @@ export default { ...mapGetters(['clientHeight']) }, methods: { - initData (codeId) { + initData (codeId, isRepeat) { this.codeId = codeId + this.isRepeat = isRepeat // 是否加急标识,父组件传 + }, reseatDataForm () { this.dataForm = { @@ -165,7 +169,8 @@ export default { submitCode () { let params = { codeId: this.codeId, - isSpeed: false + isSpeed: false,//重新提神一直是false + isRepeat: this.isRepeat, // 判断上一次是否加急,状态同上一次 } // 反馈说明 diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue index df56743..9a4743b 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue @@ -86,11 +86,11 @@ size="mini" type="primary" @click="submitRecall">审核撤回 - 加急申请 + @click="speedupaudit">加急申请 --> {{ audit.commitTime }} + {{ audit.statusShow }} @@ -383,6 +387,12 @@ export default { } else { this.audit.statusShow = '审核延后' } + + // if (this.audit.isSpeed) { + // this.audit.isSpeedShow = '加急' + // } else { + // this.audit.isSpeedShow = '不加急' + // } } this.commit = data.commit @@ -445,10 +455,11 @@ export default { // 审核驳回 打开提交审核窗口 submitCodeRejectShow () { if (this.audit.status === 'audit_failed') { - this.showSubmit = '2' - this.$refs['ref_submit_form_reject'].initData(this.audit.codeId) + this.showSubmit = '2'//显示重新提审div + // this.$refs['ref_submit_form_reject'].initData(this.audit.codeId, this.audit.isSpeed) + this.$refs['ref_submit_form_reject'].initData(this.audit.codeId, false) } else { - this.showSubmit = '1' + this.showSubmit = '1'//显示提审div this.$refs['ref_submit_form'].initData(this.audit.codeId) } }, @@ -552,7 +563,8 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/release' + this.startLoading() + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/speedupaudit' // const url = '/third/code/speedupaudit' const param = { codeId: this.audit.codeId @@ -563,6 +575,7 @@ export default { this.refresh() }, (rspMsg, data) => { + this.endLoading() this.$message.error(rspMsg) }) }).catch(() => { }) diff --git a/epmet-oper-web/src/views/modules/home.vue b/epmet-oper-web/src/views/modules/home.vue index 7d50d9b..9837fa5 100644 --- a/epmet-oper-web/src/views/modules/home.vue +++ b/epmet-oper-web/src/views/modules/home.vue @@ -1,15 +1,47 @@ diff --git a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue index bcdbe3b..b8d1325 100644 --- a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue +++ b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue @@ -18,6 +18,8 @@ content="请输入2-5个字" placement="bottom-start"> @@ -55,10 +57,12 @@ - + {{dataForm.targetLink}} -
- +
+
+ - - + + +
+
+
+
+ {{domainNameList[index]}} + +
@@ -214,7 +227,7 @@ export default { { required: true, message: '功能描述不能为空', trigger: 'blur' } ], targetLink: [ - { required: true, message: '不能为空', trigger: 'blur' } + { required: true, message: '外链地址不能为空', trigger: 'blur' } ] } } diff --git a/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue index cdd621c..d0a8749 100644 --- a/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue +++ b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue @@ -4,9 +4,9 @@ :close-on-click-modal="false" :before-close="handleClose" :close-on-press-escape="false" - :width="60+'%'" - :top="'30px'"> - + - - - +
+ +
- + + 恢复默认 - - +
+ +
- + + 恢复默认
@@ -133,6 +142,7 @@