From 3d61423374719ef63d9ade12b7dc1b147e084e1b Mon Sep 17 00:00:00 2001 From: sj <1304317391@qq.com> Date: Tue, 25 Oct 2022 18:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=8A=E4=BC=A0=E5=8F=8A=E8=AF=84=E6=B5=8B=E8=A7=86?= =?UTF-8?q?=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 15 +++++++++++++-- src/views/bxg/activity/seckill/form.vue | 2 +- src/views/bxg/shop/goods/form.vue | 15 +++++++++------ src/views/bxg/shop/storeBrand/index.vue | 19 +++++++++++++------ src/views/bxg/shop/userlevel/form.vue | 11 ++++++++--- src/views/bxg/wechat/config/robot.vue | 6 +++++- src/views/bxg/yxEvaluation/index.vue | 8 ++++---- 7 files changed, 53 insertions(+), 23 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 2c350b0..a1707c7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -80,7 +80,18 @@ export const constantRoutes = [ meta: {title: '个人中心', icon: 'user'} } ] - }, { + }, + { + path: '/yshop/materia/index', + name: `images`, + meta: { + title: '上传图片', + noCache: true + }, + component: (resolve) => require(['@/components/editorMaterial/index'], resolve), + hidden: true + }, + { path: '/dict', component: Layout, hidden: true, @@ -172,7 +183,7 @@ Router.prototype.push = function push(location) { export default new Router({ base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/", - mode: 'history', // 去掉url中的# + // mode: 'history', // 去掉url中的# scrollBehavior: () => ({y: 0}), routes: constantRoutes }) diff --git a/src/views/bxg/activity/seckill/form.vue b/src/views/bxg/activity/seckill/form.vue index 5701aef..67b5c53 100644 --- a/src/views/bxg/activity/seckill/form.vue +++ b/src/views/bxg/activity/seckill/form.vue @@ -714,7 +714,7 @@ export default { addCustomDialog () { window.UE.registerUI('yshop', function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: '/yshop/materia/index', + iframeUrl: '#/yshop/materia/index', editor: editor, name: uiName, title: '上传图片', diff --git a/src/views/bxg/shop/goods/form.vue b/src/views/bxg/shop/goods/form.vue index 2dcb0eb..b0652db 100644 --- a/src/views/bxg/shop/goods/form.vue +++ b/src/views/bxg/shop/goods/form.vue @@ -213,8 +213,9 @@ - - + + @@ -366,9 +367,9 @@ import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import MaterialList from '@/components/material' import singlePic from '@/components/singlematerial' -import VueUeditorWrap from 'vue-ueditor-wrap'; +import UeditorWrap from "vue-ueditor-wrap"; export default { - components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList, VueUeditorWrap, singlePic }, + components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList, UeditorWrap, singlePic }, data() { return { //品牌列表 @@ -796,9 +797,11 @@ export default { } }, addCustomDialog () { - window.UE.registerUI('yshop', function (editor, uiName) { + window.UE.registerUI( + "yshop", + function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: '/yshop/materia/index', + iframeUrl: '#/yshop/materia/index', editor: editor, name: uiName, title: '上传图片', diff --git a/src/views/bxg/shop/storeBrand/index.vue b/src/views/bxg/shop/storeBrand/index.vue index 9fe15ac..c893567 100644 --- a/src/views/bxg/shop/storeBrand/index.vue +++ b/src/views/bxg/shop/storeBrand/index.vue @@ -10,8 +10,8 @@ - - + + @@ -21,15 +21,21 @@ - - - + + + + + + + + + 显示 @@ -94,7 +100,8 @@ import MaterialList from "@/components/material"; // crud交由presenter持有 const defaultCrud = CRUD({ title: '品牌', url: '/bxg/api/yxStoreBrand', sort: 'id,desc', crudMethod: { ...crudYxStoreBrand }}) -const defaultForm = { id: null, brandName: null, sort: null, pic: null,backgroundImage:null,isShow: null, createTime: null, updateTime: null, isDel: null, tenantId: null } +const defaultForm = { id: null, brandName: null, sort: 0, goodsNumber:'',sellNumber:'', + pic: null,backgroundImage:null,isShow: null, createTime: null, updateTime: null, isDel: null, tenantId: null } export default { name: 'YxStoreBrand', components: { pagination, crudOperation, rrOperation, udOperation ,MaterialList}, diff --git a/src/views/bxg/shop/userlevel/form.vue b/src/views/bxg/shop/userlevel/form.vue index 7466f7d..1bccd60 100644 --- a/src/views/bxg/shop/userlevel/form.vue +++ b/src/views/bxg/shop/userlevel/form.vue @@ -23,9 +23,8 @@ - - 是 - 否 + + @@ -33,6 +32,10 @@ + + 是 + 否 +
取消 @@ -72,7 +75,9 @@ export default { imageArr: [], iconArr: [], explain: '', + benefit:'', addTime: '', + growthValue:'', isDel: '' }, rules: { diff --git a/src/views/bxg/wechat/config/robot.vue b/src/views/bxg/wechat/config/robot.vue index 8b96576..3e10d83 100644 --- a/src/views/bxg/wechat/config/robot.vue +++ b/src/views/bxg/wechat/config/robot.vue @@ -4,6 +4,9 @@ + + + 提交 @@ -27,7 +30,8 @@ export default { return { delLoading: false, form: { - robotUrl:'' + robotUrl:'', + cardActionUrl:'' }, rules: { } diff --git a/src/views/bxg/yxEvaluation/index.vue b/src/views/bxg/yxEvaluation/index.vue index 466ad15..6a4a311 100644 --- a/src/views/bxg/yxEvaluation/index.vue +++ b/src/views/bxg/yxEvaluation/index.vue @@ -215,9 +215,9 @@ export default { xs: 24 }, rules: { - videoInput: [ - { required: true, message: '评测视频未上传', trigger: 'blur' } - ], + // videoInput: [ + // { required: true, message: '评测视频未上传', trigger: 'blur' } + // ], product: [ { required: true, message: '评测关联商品不能为空', trigger: 'blur' } ], @@ -342,7 +342,7 @@ export default { // console.log('data',data) this.product=[Number(data.cateId),Number(data.id)] // this.product=[50,105] - // this.product=data + this.form.product=this.product[1] console.log( '111',this.product,typeof(this.product)); }