diff --git a/src/api/content.js b/src/api/content.js
index 404d245e69ebb575592749d577d6437825c72b32..e464193c4c195b012602b652f8900e3f1de61cee 100644
--- a/src/api/content.js
+++ b/src/api/content.js
@@ -68,10 +68,6 @@ export const getMessageTemplateTable = async (playload) => {
}
export const editMessageTemplateRecord = async (playload) => {
- // let module_name = 'ContentService.add'
- // if (playload.id && playload.id !== '') {
- // module_name = 'ContentService.update'
- // }
const data = {
module: 'AdminService.messageTempAdd',
...playload
diff --git a/src/api/customer.js b/src/api/customer.js
index 188124f16794c46152b24d50d91579c93f69a0bd..1c7329a4157abbfa7d62d0fbc2db57cec8e9f0f2 100644
--- a/src/api/customer.js
+++ b/src/api/customer.js
@@ -37,20 +37,3 @@ export const getCustomerInsideNameList = async () => {
})
return resp.data
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/editor.js b/src/api/editor.js
index f317b027011916c41813db0dc5329d59a7ec35b2..f3d56a0e97831efd56b81439e0f646598a1d0a01 100644
--- a/src/api/editor.js
+++ b/src/api/editor.js
@@ -3,7 +3,6 @@ import config from '@/config'
export const uploadImg = async (playload) => {
const data = {
- // module: 'CustomerService.update',
...playload
}
const resp = await axios.request({
diff --git a/src/api/explosion.js b/src/api/explosion.js
index dc6810d6ea743af730e14016baacbcde3faeba87..15c1d0bc04069f664e22c6fc952655eb18cf008e 100644
--- a/src/api/explosion.js
+++ b/src/api/explosion.js
@@ -126,20 +126,3 @@ export const getLostRate = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/financial.js b/src/api/financial.js
index 151a48bed110c4792c8990595908737baedaa5e1..04803cd11e9fd198553643baca7e63c29ac7ce14 100644
--- a/src/api/financial.js
+++ b/src/api/financial.js
@@ -98,20 +98,3 @@ export const getFundingRecordTable = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/home.js b/src/api/home.js
index 93d2251ad5615c182800e1006580c9a38a8ea587..60f7af0edb100db32cf7a598b7ca70ddf13591a4 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -12,20 +12,3 @@ export const getHomeData = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/interactive.js b/src/api/interactive.js
index 13249da795a444f2165ac9d2b6389af33ed63265..809123eb6b909a869f4e33844deedcb9f6a1cd7e 100644
--- a/src/api/interactive.js
+++ b/src/api/interactive.js
@@ -54,20 +54,3 @@ export const editExchangeRecord = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/operate.js b/src/api/operate.js
index ca37b9d2cc0bd1d1a70e8aa667730b6608b93471..eed2ee537c369c0ae816c7b9a4bb924e973442cb 100644
--- a/src/api/operate.js
+++ b/src/api/operate.js
@@ -41,7 +41,7 @@ export const getSysBannerTable = async (playload) => {
export const editSysBannerRecord = async (playload) => {
let module_name = 'AdminService.adminBannerAdd'
if (playload.id && playload.id !== '') {
- module_name = 'AdminService.adminBannerUpdate'
+ module_name = 'CarTypeService.updateCarType'
}
const data = {
module: module_name,
@@ -67,20 +67,3 @@ export const deleteSysBannerRecord = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/sale.js b/src/api/sale.js
index 0d06cde88e800d1c2c262b9b98f19a1856a1ba23..5051c45a0bdba0103b56c2971970cd4ed8799897 100644
--- a/src/api/sale.js
+++ b/src/api/sale.js
@@ -132,20 +132,3 @@ export const getUnsellOrderRank = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/sms.js b/src/api/sms.js
index cbc1e2ae194507e50e64434d7f25d8b16a5e6e1e..e180b6d41e377e8351ba072592232ad807e933b0 100644
--- a/src/api/sms.js
+++ b/src/api/sms.js
@@ -117,20 +117,3 @@ export const sendSmsRecord = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/api/system.js b/src/api/system.js
index dc0b7a9093cdc790383a38b4a6c06e2ed3217125..426f73e9f29c2c5548e650d40b0192e229ea6ba6 100644
--- a/src/api/system.js
+++ b/src/api/system.js
@@ -84,10 +84,6 @@ export const getRoleInfo = async (playload) => {
}
export const editRoleRecord = async (playload) => {
- // let module_name = 'SystemService.addGroup'
- // if (playload.id && playload.id !== '') {
- // module_name = 'SystemService.updateGroup'
- // }
const data = {
module: 'SystemService.groupRoleChange',
...playload
@@ -229,20 +225,3 @@ export const editSysConfigRecord = async (playload) => {
})
return resp
}
-
-// export const editCustomerRecord = async (playload) => {
-// let module_name = 'ContentService.add'
-// if (playload.id && playload.id !== '') {
-// module_name = 'ContentService.update'
-// }
-// const data = {
-// module: module_name,
-// ...playload
-// }
-// const resp = await axios.request({
-// url: config.postUrl,
-// data,
-// method: 'post'
-// })
-// return resp
-// }
diff --git a/src/assets/images/forward.jpg b/src/assets/images/forward.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..abf2bde442a9fc9482c2d73553e2643e9741ef78
Binary files /dev/null and b/src/assets/images/forward.jpg differ
diff --git a/src/assets/images/forward.png b/src/assets/images/forward.png
deleted file mode 100644
index 5d113a5e5ed8ef78d751463e0bc4e7df77abfcaa..0000000000000000000000000000000000000000
Binary files a/src/assets/images/forward.png and /dev/null differ
diff --git a/src/assets/images/read.jpg b/src/assets/images/read.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..af1e5d9dcc29fc26a6aef04cc165b6c008030feb
Binary files /dev/null and b/src/assets/images/read.jpg differ
diff --git a/src/assets/images/read.png b/src/assets/images/read.png
deleted file mode 100644
index 3a0ac8e62caaf1fefb968456b24ed4f7e77256c2..0000000000000000000000000000000000000000
Binary files a/src/assets/images/read.png and /dev/null differ
diff --git a/src/assets/images/traffic.jpg b/src/assets/images/traffic.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9527073e788d6d6691103bf6230592905e6b35f6
Binary files /dev/null and b/src/assets/images/traffic.jpg differ
diff --git a/src/assets/images/traffic.png b/src/assets/images/traffic.png
deleted file mode 100644
index a8ca36dd4b40ccd105953140ed4c06bd59ed47d6..0000000000000000000000000000000000000000
Binary files a/src/assets/images/traffic.png and /dev/null differ
diff --git a/src/components/account-drawer/account-drawer.vue b/src/components/account-drawer/account-drawer.vue
index 23db35c8980633fe54354786b5232464a465a9dc..02c651b7f70d4fef642e3db8f30f2b29f14c6428 100644
--- a/src/components/account-drawer/account-drawer.vue
+++ b/src/components/account-drawer/account-drawer.vue
@@ -25,41 +25,22 @@
:label-width="110">
-
-
-
-
-
-
-
@@ -147,16 +128,12 @@ export default {
if (valid) {
this.$emit('account-valid', {
id: this.row.id,
- // pid: ,
tel: this.row.tel,
- // loginaccount: this.row.loginaccount,
password: this.row.password !== this.password ? this.row.password : '',
- // cpwd: this.row.cpwd,
uname: this.row.uname,
role: this.row.role ? parseInt(this.row.role) : '',
state: this.row.openState === true ? 0 : 1
})
- // this.$refs['accountDrawer'].resetFields()
}
})
},
diff --git a/src/components/account-funding-drawer/account-funding-drawer.vue b/src/components/account-funding-drawer/account-funding-drawer.vue
index 3114998645a3daf91b361f90c452d22a7f7d18fa..1cce6fbf355c65ea1ac50ddf01177359d782a53e 100644
--- a/src/components/account-funding-drawer/account-funding-drawer.vue
+++ b/src/components/account-funding-drawer/account-funding-drawer.vue
@@ -154,7 +154,6 @@ export default {
price: this.form.price,
des: this.form.des
})
- // this.$refs['accountDrawer'].resetFields()
}
})
},
diff --git a/src/components/ad-content-form/ad-content-form.vue b/src/components/ad-content-form/ad-content-form.vue
index 184848c83f40a593ecfc7b6e0593efccfd69a505..90bf6ad7dccbb1104df649e1af40c443ffc51895 100644
--- a/src/components/ad-content-form/ad-content-form.vue
+++ b/src/components/ad-content-form/ad-content-form.vue
@@ -7,11 +7,9 @@
inline
:label-width="80">
-
-
diff --git a/src/components/add-group-confirm/add-group-confirm.vue b/src/components/add-group-confirm/add-group-confirm.vue
index 1668eb06533242144845d9c4749da91180640ccd..fc00cc91b6c28e04f94642bbd54256de5c9e8e36 100644
--- a/src/components/add-group-confirm/add-group-confirm.vue
+++ b/src/components/add-group-confirm/add-group-confirm.vue
@@ -9,10 +9,6 @@
@on-cancel="cancel"
width="30%">
-
分组标签名称:
{{confirmData.srname ? confirmData.srname : '-'}}
@@ -78,7 +74,6 @@ export default {
},
computed: {
...mapState({
- // row: state => state.taskList.row,
modalState: state => state.modal.addGroupConfirmState,
goodsList: state => state.goodService.goodsList
})
diff --git a/src/components/add-group-drawer/add-group-drawer.vue b/src/components/add-group-drawer/add-group-drawer.vue
index f489891b43795117e7933c02b4e03960a0dc8f88..08f6fb34d111856aed2a82e52695f71036dc4c10 100644
--- a/src/components/add-group-drawer/add-group-drawer.vue
+++ b/src/components/add-group-drawer/add-group-drawer.vue
@@ -160,22 +160,9 @@ export default {
trigger: 'blur'
}
],
- // sex: [
- // {
- // required: true,
- // message: '请选择性别',
- // trigger: 'change'
- // }
- // ],
- // gid: [
- // {
- // required: true,
- // message: '请选择意向商品',
- // trigger: 'change'
- // }
- // ],
joindate: [
{
+ required: true,
validator: validateDate,
trigger: 'change'
}
@@ -213,7 +200,6 @@ export default {
handleSubmit () {
this.$refs['addGroupDrawer'].validate(valid => {
if (valid) {
- // console.log(this.form.uid)
this.$emit('group-valid', {
addGroupDrawer: this.$refs['addGroupDrawer'],
srname: this.form.srname,
@@ -252,10 +238,7 @@ export default {
? this.nameList.filter(item => item.id === this.form.uid)[0]
.uname
: '全部'
- // moneystate: this.form.state === '5' ? this.form.moneystate : '',
- // signmoney: this.form.state === '5' ? this.form.signmoney : ''
})
- // this.$refs['addGroupDrawer'].resetFields()
}
})
},
diff --git a/src/components/admin-message-drawer/admin-message-drawer.vue b/src/components/admin-message-drawer/admin-message-drawer.vue
index d745eeaf452eb9fc9ffe7dcbc1f4110959860c26..1b080698aab079d6a518f8678786af12b191586c 100644
--- a/src/components/admin-message-drawer/admin-message-drawer.vue
+++ b/src/components/admin-message-drawer/admin-message-drawer.vue
@@ -32,7 +32,6 @@
diff --git a/src/components/admin-message-form/admin-message-form.vue b/src/components/admin-message-form/admin-message-form.vue
index b27ed7e83b4715966ef36737af2c1bf9de2b8b8e..52fc1fd170f9d679d7cd0a9ef793a060c22fcdac 100644
--- a/src/components/admin-message-form/admin-message-form.vue
+++ b/src/components/admin-message-form/admin-message-form.vue
@@ -7,11 +7,9 @@
inline
:label-width="80">
-
-
diff --git a/src/components/analysis-form/analysis-form.vue b/src/components/analysis-form/analysis-form.vue
index 2a1541f69d3ede44f3aad1bd0dee6c13ffb00971..6d1d986d5178ed0d8c2b895bbbf944f127f63653 100644
--- a/src/components/analysis-form/analysis-form.vue
+++ b/src/components/analysis-form/analysis-form.vue
@@ -6,46 +6,6 @@
@keydown.enter.native="handleSubmit"
:label-width="100"
inline>
-
@@ -125,39 +85,6 @@
-
-
-
diff --git a/src/components/confirm-modal/confirm-modal.vue b/src/components/confirm-modal/confirm-modal.vue
index b7a2af1659773770d56094cbdcfb861d3eb792a3..0f0e32f4b49c2283d921e12832164ece031d50ed 100644
--- a/src/components/confirm-modal/confirm-modal.vue
+++ b/src/components/confirm-modal/confirm-modal.vue
@@ -30,7 +30,6 @@ export default {
},
computed: {
...mapState({
- // row: state => state.taskList.row,
modalState: state => state.modal.confirmModalState
})
},
diff --git a/src/components/content-editor/content-editor.vue b/src/components/content-editor/content-editor.vue
index fd9f507c3e9b2fc397b21c9507a4883a8c723377..361701b70ea3792da2b1af48464ca3fe8f39d2f3 100644
--- a/src/components/content-editor/content-editor.vue
+++ b/src/components/content-editor/content-editor.vue
@@ -1,7 +1,6 @@
diff --git a/src/components/graphic-modal/graphic-modal.vue b/src/components/graphic-modal/graphic-modal.vue
index 4cd2df6f0c417c9a5c83cf1b35034d2b6f0abae5..141c14d9b8ad950c5c0d63d3426622e87fcda1b6 100644
--- a/src/components/graphic-modal/graphic-modal.vue
+++ b/src/components/graphic-modal/graphic-modal.vue
@@ -5,14 +5,12 @@
}
.toolbar {
width: 100%;
- /* border: 1px solid #ccc; */
position: relative;
z-index: 10001;
}
.text {
border: 1px solid #ccc;
height: 400px;
- /* min-height: 400px; */
}
.boxerl {
position: relative;
@@ -60,17 +58,28 @@
图文
-
+
-
+
+
+
+
+ *
+ 页面图片:
+
+
+ 提示:请上传大小小于500kb的图片!
是
-
-
+
+ *
+ 内容编辑:
+
+
@@ -82,21 +91,13 @@
-
-
-
@@ -112,7 +113,6 @@ export default {
name: 'GraphicModal',
components: {
UploadImg
- // VueUeditorWrap
},
props: {
modalState: Boolean
@@ -128,24 +128,13 @@ export default {
imgUrl: '',
token: getToken(),
editorContent: '',
- // msg: '',
- // myConfig: {
- // // 编辑器不自动被内容撑高
- // autoHeightEnabled: false,
- // // 初始容器高度
- // initialFrameHeight: 240,
- // // 初始容器宽度
- // initialFrameWidth: '100%',
- // // 上传文件接口(这个地址是我为了方便各位体验文件上传功能搭建的临时接口,请勿在生产环境使用!!!)
- // serverUrl: '',
- // // UEditor 资源文件的存放路径,如果你使用的是 vue-cli 生成的项目,通常不需要设置该选项,vue-ueditor-wrap 会自动处理常见的情况,如果需要特殊配置,参考下方的常见问题2
- // UEDITOR_HOME_URL: '/UEditor/'
- // },
ruleInline: {
name: [
{ required: true, message: '请输入标题!', trigger: 'blur' }
+ ],
+ subtitle: [
+ { required: true, message: '请输入分享内容副标题!', trigger: 'blur' }
]
-
}
}
},
@@ -155,7 +144,6 @@ export default {
} else {
this.title = '添加图文列表'
}
- // this.$refs.content.innerHTML = this.row.content
},
computed: {
...mapState({
@@ -165,11 +153,6 @@ export default {
},
methods: {
...mapActions(['updateModalState']),
- // ready (editorInstance) {
- // editorInstance.contentChange = () => {
- // console.log(this.msg)
- // }
- // },
changeLoading () {
this.loading = false
this.$nextTick(() => {
@@ -187,26 +170,19 @@ export default {
return this.changeLoading()
}
this.$emit('graphic-valid', {
- // type: this.row.type,
- // name: this.row.name,
- // img: this.imgUrl,
- // content: this.row.content,
- // editor: this.editor,
id: this.row.id,
type: 1,
name: this.row.name,
+ subtitle: this.row.subtitle,
parseURL: this.row.parseURL ? this.row.parseURL : '',
content: this.editorContent ? this.editorContent : this.row.content,
img: this.imgUrl
})
- // //console.log(this.editorContent)
})
},
cancel () {
this.updateModalState(false)
this.$refs['graphicModal'].resetFields()
- // this.editor.txt.clear()
- // this.$refs.showContent.innerHTML = ''
},
handleUpload (url) {
this.imgUrl = url
@@ -220,77 +196,42 @@ export default {
},
mounted () {
let self = this
- // this.myConfig.serverUrl = process.env.NODE_ENV === 'development' ? '/api/upload?folder=task' : 'http://rbackapi.baisha.work/upload?folder=task'
- // this.msg = this.row.content
- // // //console.log(this.graphicList)
this.actionUrl = process.env.NODE_ENV === 'development' ? '/api/upload?folder=task' : 'http://rbackapi.baisha.work/upload?folder=task'
- // this.editor = new E(this.$refs.editor)
this.editor = new E('#div1', '#div2')
this.editor.customConfig.onchange = (html) => {
this.editorContent = html
- // this.$refs.showContent.innerHTML = html
}
- // //console.log(this.row.content)
- // editor.customConfig.uploadImgShowBase64 = true
this.editor.customConfig.withCredentials = true
- // this.editor.customConfig.debug = true
this.editor.customConfig.uploadImgServer = this.actionUrl
this.editor.customConfig.uploadImgMaxSize = 500 * 1024
this.editor.customConfig.uploadImgHeaders = {
'agent': 'Web',
'token': this.token
}
- // editor.customConfig.uploadImgParams = {
- // // 如果版本 <=v3.1.0 ,属性值会自动进行 encode ,此处无需 encode
- // // 如果版本 >=v3.1.1 ,属性值不会自动 encode ,如有需要自己手动 encode
- // token: 'abcdef12345'
- // }
this.editor.customConfig.uploadImgHooks = {
before (xhr, editor, files) {
- // 图片上传之前触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,files 是选择的图片文件
- // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
- // return {
- // prevent: true,
- // msg: '放弃上传'
- // }
},
success (xhr, editor, result) {
- // 图片上传并返回结果,图片插入成功之后触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,result 是服务器端返回的结果
- // //console.log(editor)
- // //console.log(result)
+
},
fail (xhr, editor, result) {
- // 图片上传并返回结果,但图片插入错误时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,result 是服务器端返回的结果
+
},
error (xhr, editor) {
- // 图片上传出错时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象
+
},
timeout (xhr, editor) {
- // 图片上传超时时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象
- },
- // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式,可使用该配置
- // (但是,服务器端返回的必须是一个 JSON 格式字符串!!!否则会报错)
+ },
customInsert (insertImg, result, editor) {
- // 图片上传并返回结果,自定义插入图片的事件(而不是编辑器自动插入图片!!!)
- // insertImg 是插入图片的函数,editor 是编辑器对象,result 是服务器端返回的结果
-
- // 举例:假如上传图片成功后,服务器端返回的是 {url:'....'} 这种格式,即可这样插入图片:
if (result.state === '000') {
let url = result.host + result.data
insertImg(url)
}
- // result 必须是一个 JSON 格式字符串!!!否则报错
}
}
this.editor.customConfig.customAlert = function (info) {
- // info 是需要提示的内容
self.$Notice.warning({
title: '文件大小不正确',
desc: '请上传500kb以下大小的图片'
diff --git a/src/components/h5-list/components/edit-panel/edit-panel.vue b/src/components/h5-list/components/edit-panel/edit-panel.vue
deleted file mode 100644
index 319e20ea0868fa9c630e1ef34022439dca361f1b..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/edit-panel/edit-panel.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-
-
-
-
{ panelTabState = 0 }">
- 文本
- 元素
-
-
{ panelTabState = 1 }">动作
-
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/edit-panel/index.js b/src/components/h5-list/components/edit-panel/index.js
deleted file mode 100644
index 7c1597c51faa0e6e137a39478365c00b3e656b7b..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/edit-panel/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import EditPanel from './edit-panel.vue'
-export default EditPanel
diff --git a/src/components/h5-list/components/element/font-element/font-element.vue b/src/components/h5-list/components/element/font-element/font-element.vue
deleted file mode 100644
index c3d136d2905be367ce88facf1394886e19cdfbef..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/element/font-element/font-element.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/element/font-element/index.js b/src/components/h5-list/components/element/font-element/index.js
deleted file mode 100644
index 1b1c4e0f8c25eae512f8ff7ace716c22944215a3..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/element/font-element/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import FontElement from './font-element.vue'
-export default FontElement
diff --git a/src/components/h5-list/components/element/pic-element/index.js b/src/components/h5-list/components/element/pic-element/index.js
deleted file mode 100644
index 24a9e22ed9cfc6cf89cd9b10515db73e0f3c2c36..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/element/pic-element/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import PicElement from './pic-element.vue'
-export default PicElement
diff --git a/src/components/h5-list/components/element/pic-element/pic-element.vue b/src/components/h5-list/components/element/pic-element/pic-element.vue
deleted file mode 100644
index b07abd91325811d3ee0876beda9303678beaa620..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/element/pic-element/pic-element.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
![]()
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/element/shapes-element/index.js b/src/components/h5-list/components/element/shapes-element/index.js
deleted file mode 100644
index 16e0ef2aa1de4ed9c38cecab849c076a51931561..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/element/shapes-element/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ShapesElement from './shapes-element.vue'
-export default ShapesElement
diff --git a/src/components/h5-list/components/element/shapes-element/shapes-element.vue b/src/components/h5-list/components/element/shapes-element/shapes-element.vue
deleted file mode 100644
index 5082d4d7f43b2ef52375992006867ba631f92494..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/element/shapes-element/shapes-element.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/h5-index/h5-index.vue b/src/components/h5-list/components/h5-index/h5-index.vue
deleted file mode 100644
index 365725dba81d6d2239822a7e226f45c16cb31263..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/h5-index/h5-index.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/h5-index/index.js b/src/components/h5-list/components/h5-index/index.js
deleted file mode 100644
index 389de7601a07d337f608dd36228bf82804f29e1a..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/h5-index/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import H5Index from './h5-index.vue'
-export default H5Index
diff --git a/src/components/h5-list/components/header-edit/header-edit.vue b/src/components/h5-list/components/header-edit/header-edit.vue
deleted file mode 100644
index 30db92434d19e29aef5eca8fd1915fab898f0216..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/header-edit/header-edit.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/header-edit/index.js b/src/components/h5-list/components/header-edit/index.js
deleted file mode 100644
index aba476588f438b04a6142b460487883b27ff503b..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/header-edit/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import HeaderEdit from './header-edit.vue'
-export default HeaderEdit
diff --git a/src/components/h5-list/components/img-panel/img-panel.vue b/src/components/h5-list/components/img-panel/img-panel.vue
deleted file mode 100644
index ef6f28fee4fba3f1aa06a27fe4f6bc8e1b6af716..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/img-panel/img-panel.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/img-panel/index.js b/src/components/h5-list/components/img-panel/index.js
deleted file mode 100644
index 0d89dafff93d299a165176049a2205a8d22d9f56..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/img-panel/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ImgPanel from './img-panel.vue'
-export default ImgPanel
diff --git a/src/components/h5-list/components/operate-new/index.js b/src/components/h5-list/components/operate-new/index.js
deleted file mode 100644
index aa6197c6229dca7fc5cdfcd98bd5ad0d08bc4545..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/operate-new/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import OperateNew from './operate-new.vue'
-export default OperateNew
diff --git a/src/components/h5-list/components/operate-new/operate-new.vue b/src/components/h5-list/components/operate-new/operate-new.vue
deleted file mode 100644
index 7a62d3d8aee0483ac8ba97791cd6d88158bdd127..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/operate-new/operate-new.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/operate/index.js b/src/components/h5-list/components/operate/index.js
deleted file mode 100644
index ee9c7107e1661cb3756db97c8f163c1879439c0b..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/operate/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Operate from './operate.vue'
-export default Operate
diff --git a/src/components/h5-list/components/operate/operate.vue b/src/components/h5-list/components/operate/operate.vue
deleted file mode 100644
index 78e563a742aab6f91c82128e4691533e07106278..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/operate/operate.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/overview/index.js b/src/components/h5-list/components/overview/index.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/components/h5-list/components/overview/overview.vue b/src/components/h5-list/components/overview/overview.vue
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/components/h5-list/components/page/index.js b/src/components/h5-list/components/page/index.js
deleted file mode 100644
index b6cc655dfbe78a0dc80ef68cc501d21543f165c0..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/page/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Page from './page.vue'
-export default Page
diff --git a/src/components/h5-list/components/page/page.vue b/src/components/h5-list/components/page/page.vue
deleted file mode 100644
index 82ad88d1dec37dc7b5b174e0ade3b86ec8514afc..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/page/page.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/picture-picker/index.js b/src/components/h5-list/components/picture-picker/index.js
deleted file mode 100644
index 1c0dfaf3fed451b9cebb8b9846421fe4db877f1d..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/picture-picker/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import PicturePicker from './picture-picker.vue'
-export default PicturePicker
diff --git a/src/components/h5-list/components/picture-picker/picture-picker.vue b/src/components/h5-list/components/picture-picker/picture-picker.vue
deleted file mode 100644
index c9cdc24098a04e5c23b542f6e539f33e18bb5f40..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/picture-picker/picture-picker.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/preview/index.js b/src/components/h5-list/components/preview/index.js
deleted file mode 100644
index d9b78828273b417d5a98a09654896965e590178a..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/preview/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Preview from './preview.vue'
-export default Preview
diff --git a/src/components/h5-list/components/preview/preview.vue b/src/components/h5-list/components/preview/preview.vue
deleted file mode 100644
index 446d591129d5afe90fe42211c004b513e92ec070..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/preview/preview.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/svg-panel/index.js b/src/components/h5-list/components/svg-panel/index.js
deleted file mode 100644
index 4c17582fae0459bcf11f8358aaae1e6bdd443208..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/svg-panel/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import SvgPanel from './svg-panel.vue'
-export default SvgPanel
diff --git a/src/components/h5-list/components/svg-panel/svg-panel.vue b/src/components/h5-list/components/svg-panel/svg-panel.vue
deleted file mode 100644
index c8e4c571e2fd58f86a771852e7b919dbf9a0c53b..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/svg-panel/svg-panel.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/components/video-panel/index.js b/src/components/h5-list/components/video-panel/index.js
deleted file mode 100644
index df1128c10160c6ec0ccb04c6974e993984c93bd6..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/video-panel/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import VideoPanel from './video-panel.vue'
-export default VideoPanel
diff --git a/src/components/h5-list/components/video-panel/video-panel.vue b/src/components/h5-list/components/video-panel/video-panel.vue
deleted file mode 100644
index d87e45ed5362685e0109a5483c8641d7675bc799..0000000000000000000000000000000000000000
--- a/src/components/h5-list/components/video-panel/video-panel.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/h5-list.vue b/src/components/h5-list/h5-list.vue
deleted file mode 100644
index c7e6a93faee108cd5a13de767c98c38a01a90da9..0000000000000000000000000000000000000000
--- a/src/components/h5-list/h5-list.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-
-
-
-
- -
-
-
-
- -
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/h5-list/index.js b/src/components/h5-list/index.js
deleted file mode 100644
index b89d35002793ff075c37e852902670c1f17558b5..0000000000000000000000000000000000000000
--- a/src/components/h5-list/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import H5List from './h5-list.vue'
-export default H5List
diff --git a/src/components/h5-modal/h5-modal.vue b/src/components/h5-modal/h5-modal.vue
index c4db82f7a58289173edf4743fd18668002e23c90..79122a20596fa73460165ccfffcf84bf21632d7f 100644
--- a/src/components/h5-modal/h5-modal.vue
+++ b/src/components/h5-modal/h5-modal.vue
@@ -18,7 +18,6 @@
h5
-
@@ -37,14 +36,7 @@ export default {
return {
title: '',
loading: true,
- ruleInline: {
- // name: [
- // { required: true, message: '姓名不能为空', trigger: 'blur' }
- // ],
- // tel: [
- // { required: true, message: '手机号不能为空', trigger: 'blur' }
- // ]
- }
+ ruleInline: {}
}
},
updated () {
diff --git a/src/components/loss-modal/loss-modal.vue b/src/components/loss-modal/loss-modal.vue
index ab42cab09db6a017ac3a1bb7732ecabfabec6c1b..d1c7e11114dec6cd80da43d30587e692711a74c7 100644
--- a/src/components/loss-modal/loss-modal.vue
+++ b/src/components/loss-modal/loss-modal.vue
@@ -18,7 +18,10 @@
流失客户备注信息
-
性别:
+
+ *
+ 性别:
+
-
客户意向度:
+
+ *
+ 客户意向度:
+
-
意向商品:
+
+ *
+ 意向商品:
+
-
接待销售:
+
+ *
+ 接待销售:
+
+
+
+
+
+
+
+
+
+
@@ -105,9 +128,6 @@
-
-
-
@@ -151,6 +168,7 @@ export default {
},
data () {
const reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+ const numReg = /^\d+$/
const validateDate = (rule, value, callback) => {
const start = value[0]
const end = value[1]
@@ -177,7 +195,7 @@ export default {
if (value === '') {
callback(new Error('人数不能为空!'))
} else {
- if (!reg.test(value)) {
+ if (!numReg.test(value)) {
callback(new Error('请输入正确的人数!'))
} else {
callback()
@@ -200,6 +218,13 @@ export default {
trigger: 'change'
}
],
+ subtitle: [
+ {
+ required: true,
+ message: '副标题不能为空',
+ trigger: 'blur'
+ }
+ ],
price: [
{
validator: validateMoney,
@@ -223,6 +248,19 @@ export default {
validator: validateNum,
trigger: 'blur'
}
+ ],
+ peopnum: [
+ {
+ validator: validateNum,
+ trigger: 'blur'
+ }
+ ],
+ unit: [
+ {
+ required: true,
+ message: '单位不能为空',
+ trigger: 'blur'
+ }
]
}
}
@@ -283,8 +321,10 @@ export default {
: '',
img: this.row.img,
content: this.editorContent ? this.editorContent : this.row.content,
- top: this.row.topState === true ? 1 : undefined
- // state: this.row.openState === true ? 0 : 1
+ top: this.row.topState === true ? 1 : undefined,
+ subtitle: this.row.subtitle,
+ unit: this.row.unit,
+ peopnum: this.row.peopnum
})
})
},
@@ -302,79 +342,46 @@ export default {
},
mounted () {
let self = this
- // //console.log(this.graphicList)
this.actionUrl =
process.env.NODE_ENV === 'development'
? '/api/upload?folder=task'
: 'http://rbackapi.baisha.work/upload?folder=task'
this.editor = new E('#div1', '#div2')
- // this.editor = new E(this.$refs.editor)
this.editor.customConfig.onchange = html => {
this.editorContent = html
- // this.$refs.showContent.innerHTML = html
}
- // //console.log(this.row.content)
- // editor.customConfig.uploadImgShowBase64 = true
this.editor.customConfig.withCredentials = true
- // this.editor.customConfig.debug = true
this.editor.customConfig.uploadImgServer = this.actionUrl
this.editor.customConfig.uploadImgMaxSize = 500 * 1024
this.editor.customConfig.uploadImgHeaders = {
agent: 'Web',
token: this.token
}
- // editor.customConfig.uploadImgParams = {
- // // 如果版本 <=v3.1.0 ,属性值会自动进行 encode ,此处无需 encode
- // // 如果版本 >=v3.1.1 ,属性值不会自动 encode ,如有需要自己手动 encode
- // token: 'abcdef12345'
- // }
this.editor.customConfig.uploadImgHooks = {
before (xhr, editor, files) {
- // 图片上传之前触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,files 是选择的图片文件
- // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
- // return {
- // prevent: true,
- // msg: '放弃上传'
- // }
+
},
success (xhr, editor, result) {
- // 图片上传并返回结果,图片插入成功之后触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,result 是服务器端返回的结果
- // //console.log(editor)
- // //console.log(result)
+
},
fail (xhr, editor, result) {
this.$Notice.warning({
title: '文件大小不正确',
desc: '请上传3M以下大小的图片'
})
- // 图片上传并返回结果,但图片插入错误时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,result 是服务器端返回的结果
},
error (xhr, editor) {
- // 图片上传出错时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象
+
},
timeout (xhr, editor) {
- // 图片上传超时时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象
- },
- // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式,可使用该配置
- // (但是,服务器端返回的必须是一个 JSON 格式字符串!!!否则会报错)
+ },
customInsert (insertImg, result, editor) {
- // 图片上传并返回结果,自定义插入图片的事件(而不是编辑器自动插入图片!!!)
- // insertImg 是插入图片的函数,editor 是编辑器对象,result 是服务器端返回的结果
-
- // 举例:假如上传图片成功后,服务器端返回的是 {url:'....'} 这种格式,即可这样插入图片:
let url = result.host + result.data
insertImg(url)
- // result 必须是一个 JSON 格式字符串!!!否则报错
}
}
this.editor.customConfig.customAlert = function (info) {
- // info 是需要提示的内容
self.$Notice.warning({
title: '文件大小不正确',
desc: '请上传500kb以下大小的图片'
diff --git a/src/components/pie/pie.vue b/src/components/pie/pie.vue
index 050bb41bd37ef7f6d4dd01bc3e917b9f0ea182d8..34071627ae156e6572111474345e0b51ad007348 100644
--- a/src/components/pie/pie.vue
+++ b/src/components/pie/pie.vue
@@ -30,7 +30,6 @@ export default {
let data = this.value
let text = this.text
const option = {
- // color: this.color,
title: {
text: this.text,
x: 'center'
@@ -52,7 +51,6 @@ export default {
index = i + 1
}
}
- // return name + ' ' + res
if (text !== '销售业绩最高排名/销售业绩最低排名') {
return '{a|序号:' + index + '}' + ' ' + '{a|名称:' + name + '}' + ' ' + '{b|数量:' + res + '}'
} else {
diff --git a/src/components/product-list-form/product-list-form.vue b/src/components/product-list-form/product-list-form.vue
index 1b466f75337026336b2c271f8bf7a9bf81b245d3..4d686b56542a599b987926c49ab71d1b79af0175 100644
--- a/src/components/product-list-form/product-list-form.vue
+++ b/src/components/product-list-form/product-list-form.vue
@@ -7,7 +7,6 @@
inline
:label-width="80">
-
diff --git a/src/components/product-list-modal/product-list-modal.vue b/src/components/product-list-modal/product-list-modal.vue
index b7d27f1f03471a3e93476089db3b764cad24f58d..de819e9b08eb4ad65d171bcded0a8aaf8198bfa7 100644
--- a/src/components/product-list-modal/product-list-modal.vue
+++ b/src/components/product-list-modal/product-list-modal.vue
@@ -23,9 +23,6 @@
-
@@ -64,6 +61,7 @@ export default {
],
price: [
{
+ required: true,
validator: validateMoney,
trigger: 'blur'
}
@@ -102,7 +100,6 @@ export default {
name: this.row.name,
price: this.row.price,
des: this.row.des
- // state: this.row.openState === true ? 0 : 1
})
})
},
diff --git a/src/components/protocol-modal/protocol-modal.vue b/src/components/protocol-modal/protocol-modal.vue
index 86b015a6525bbcc363463cffeb56079644e68aa4..16fc8c9202b19d8ddc312940337f6bc63e0054c8 100644
--- a/src/components/protocol-modal/protocol-modal.vue
+++ b/src/components/protocol-modal/protocol-modal.vue
@@ -5,13 +5,11 @@
}
.toolbar {
width: 100%;
- /* border: 1px solid #ccc; */
position: relative;
z-index: 10001;
}
.text {
border: 1px solid #ccc;
- /* min-height: 400px; */
height: 400px;
}
.boxerl {
@@ -51,8 +49,6 @@
@on-ok="handleSubmit"
@on-cancel="cancel"
width="50%">
-
协议配置:
@@ -64,16 +60,12 @@
-
-
@@ -102,18 +94,12 @@ export default {
token: getToken(),
editorContent: '',
ruleInline: {
- // name: [
- // { required: true, message: '姓名不能为空', trigger: 'blur' }
- // ],
- // tel: [
- // { required: true, message: '手机号不能为空', trigger: 'blur' }
- // ]
+
}
}
},
updated () {
this.title = '协议配置'
- // this.$refs.content.innerHTML = this.row.content
},
computed: {
...mapState({
@@ -141,19 +127,12 @@ export default {
},
handleSubmit () {
this.$emit('protocol-valid', {
- // type: this.row.type,
- // name: this.row.name,
- // img: this.imgUrl,
- // content: this.row.content
content: this.editorContent ? this.editorContent : this.row.content
})
- // //console.log(this.editorContent)
},
cancel () {
this.updateModalState(false)
- // this.$refs['graphicModal'].resetFields()
this.editor.txt.clear()
- // this.$refs.showContent.innerHTML = ''
},
handleUpload (url) {
this.imgUrl = url
@@ -163,16 +142,11 @@ export default {
window.addEventListener('scroll', this.doThis)
},
mounted () {
- // //console.log(this.graphicList)
this.actionUrl = process.env.NODE_ENV === 'development' ? '/api/upload?folder=task' : 'http://rbackapi.baisha.work/upload?folder=task'
- // this.editor = new E(this.$refs.editor)
this.editor = new E('#div1', '#div2')
this.editor.customConfig.onchange = (html) => {
this.editorContent = html
- // this.$refs.showContent.innerHTML = html
}
- // //console.log(this.row.content)
- // editor.customConfig.uploadImgShowBase64 = true
this.editor.customConfig.withCredentials = true
this.editor.customConfig.debug = true
this.editor.customConfig.uploadImgServer = this.actionUrl
@@ -181,55 +155,28 @@ export default {
'agent': 'Web',
'token': this.token
}
- // editor.customConfig.uploadImgParams = {
- // // 如果版本 <=v3.1.0 ,属性值会自动进行 encode ,此处无需 encode
- // // 如果版本 >=v3.1.1 ,属性值不会自动 encode ,如有需要自己手动 encode
- // token: 'abcdef12345'
- // }
this.editor.customConfig.uploadImgHooks = {
before (xhr, editor, files) {
- // 图片上传之前触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,files 是选择的图片文件
- // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
- // return {
- // prevent: true,
- // msg: '放弃上传'
- // }
},
success (xhr, editor, result) {
- // 图片上传并返回结果,图片插入成功之后触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,result 是服务器端返回的结果
- // //console.log(editor)
- // //console.log(result)
+
},
fail (xhr, editor, result) {
this.$Notice.warning({
title: '文件大小不正确',
desc: '请上传3M以下大小的图片'
})
- // 图片上传并返回结果,但图片插入错误时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象,result 是服务器端返回的结果
},
error (xhr, editor) {
- // 图片上传出错时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象
+
},
timeout (xhr, editor) {
- // 图片上传超时时触发
- // xhr 是 XMLHttpRequst 对象,editor 是编辑器对象
- },
- // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式,可使用该配置
- // (但是,服务器端返回的必须是一个 JSON 格式字符串!!!否则会报错)
+ },
customInsert (insertImg, result, editor) {
- // 图片上传并返回结果,自定义插入图片的事件(而不是编辑器自动插入图片!!!)
- // insertImg 是插入图片的函数,editor 是编辑器对象,result 是服务器端返回的结果
-
- // 举例:假如上传图片成功后,服务器端返回的是 {url:'....'} 这种格式,即可这样插入图片:
let url = result.host + result.data
insertImg(url)
- // result 必须是一个 JSON 格式字符串!!!否则报错
}
}
this.editor.customConfig.pasteFilterStyle = false
diff --git a/src/components/rate-bar/rate-bar.vue b/src/components/rate-bar/rate-bar.vue
index 192aa49eef3d4b53add8dedba7bea0c1527d8ccf..4d30ff718e4fcb05d1108f8e12fb5aee4d599357 100644
--- a/src/components/rate-bar/rate-bar.vue
+++ b/src/components/rate-bar/rate-bar.vue
@@ -26,7 +26,6 @@ export default {
},
mounted () {
let data = this.value.date
- // console.log(this.value)
const option = {
title: {
text: this.text,
@@ -66,7 +65,6 @@ export default {
right: '0%',
data: this.value.date,
textStyle: {
- // fontSize: difSize_title,
color: '#000'
}
},
diff --git a/src/components/refund-modal/refund-modal.vue b/src/components/refund-modal/refund-modal.vue
index 7265ad7d072a4c70616c151c7a206a60e44f7d49..0a3ca73a57a05f2f26f50dd6a635f4f70091831b 100644
--- a/src/components/refund-modal/refund-modal.vue
+++ b/src/components/refund-modal/refund-modal.vue
@@ -40,12 +40,7 @@ export default {
title: '',
loading: true,
ruleInline: {
- // name: [
- // { required: true, message: '姓名不能为空', trigger: 'blur' }
- // ],
- // tel: [
- // { required: true, message: '手机号不能为空', trigger: 'blur' }
- // ]
+
}
}
},
@@ -54,7 +49,6 @@ export default {
},
computed: {
...mapState({
- // row: state => state.taskList.row,
modalState: state => state.modal.refundModalState
})
},
diff --git a/src/components/role-manage-modal/role-manage-modal.vue b/src/components/role-manage-modal/role-manage-modal.vue
index b140e0a11f3cfd5d1f22b93d2c4794b1ecc8dbbf..41f3fdc55d7f19503f3aee43243cc6befcd57222 100644
--- a/src/components/role-manage-modal/role-manage-modal.vue
+++ b/src/components/role-manage-modal/role-manage-modal.vue
@@ -16,45 +16,11 @@
-
-
-
+
+ *
+ 权限设置:
+
+
@@ -97,12 +63,6 @@ export default {
trigger: 'blur'
}
]
- // name: [
- // { required: true, message: '姓名不能为空', trigger: 'blur' }
- // ],
- // tel: [
- // { required: true, message: '手机号不能为空', trigger: 'blur' }
- // ]
}
}
},
@@ -115,7 +75,6 @@ export default {
},
computed: {
...mapState({
- // row: state => state.taskList.row,
modalState: state => state.modal.modalState,
row: state => state.role.row,
roleListData: state => state.role.roleListData,
@@ -140,7 +99,6 @@ export default {
role: this.row.role,
id: this.roleListChildren.join()
})
- // this.$refs['roleManageModal'].resetFields()
})
},
cancel () {
@@ -148,26 +106,7 @@ export default {
this.$refs['roleManageModal'].resetFields()
},
handleChange (event, data) {
- // if (data.checked) {
- // data.checked = false
- // if (data.children && data.children.length > 0) {
- // data.children.forEach(item => {
- // item.checked = false
- // })
- // }
- // } else {
- // data.checked = true
- // if (data.children && data.children.length > 0) {
- // data.children.forEach(item => {
- // item.checked = true
- // })
- // }
- // }
- // console.log(event.target.checked)
- // console.log(event)
- // console.log(data)
if (event.target.checked === true) {
- // console.log(1)
this.roleListChildren = [...this.roleListChildren, data.id]
if (data.children && data.children.length > 0) {
data.children.forEach(item => {
@@ -175,12 +114,10 @@ export default {
})
}
} else if (event.target.checked === false) {
- // console.log(2)
this.roleListChildren.splice(this.roleListChildren.findIndex(item => item === data.id), 1)
if (data.children && data.children.length > 0) {
data.children.forEach(dataitem => {
const index = this.roleListChildren.findIndex(item => item === dataitem.id)
- // console.log(index)
if (index > -1) {
this.roleListChildren.splice(index, 1)
}
@@ -189,12 +126,6 @@ export default {
}
},
handleChangeChild (event, data) {
- // if (data.checked) {
- // data.checked = false
- // } else {
- // data.checked = true
- // }
- // console.log(data.id)
let parentId = ''
this.roleListData.forEach((dataitem) => {
if (data.pid === dataitem.id) {
diff --git a/src/components/sale-bar/sale-bar.vue b/src/components/sale-bar/sale-bar.vue
index e3cfe6b6c55c918e8b344a8d32db90ef0a7137eb..e3e268df65ce7dd0420869f2126c701e53b4d55d 100644
--- a/src/components/sale-bar/sale-bar.vue
+++ b/src/components/sale-bar/sale-bar.vue
@@ -26,7 +26,6 @@ export default {
},
mounted () {
let data = this.value.date
- // console.log(this.value)
const option = {
title: {
text: this.text,
@@ -57,7 +56,6 @@ export default {
yAxis: [
{
type: 'value'
- // axisLabel:{formatter:'{value} %'}
}
],
legend: {
@@ -66,7 +64,6 @@ export default {
right: '0%',
data: this.value.date,
textStyle: {
- // fontSize: difSize_title,
color: '#000'
}
},
diff --git a/src/components/sale-drawer/sale-drawer.vue b/src/components/sale-drawer/sale-drawer.vue
index 1eb0623b715335711972d4f060b1baf8ac44c2ba..5cbd93fb08a8db27df26f0fee95c4162548b7669 100644
--- a/src/components/sale-drawer/sale-drawer.vue
+++ b/src/components/sale-drawer/sale-drawer.vue
@@ -164,7 +164,6 @@ export default {
},
computed: {
...mapState({
- // row: state => state.taskList.row,
modalState: state => state.modal.saleDrawerState,
saleDrawerList: state => state.saleDrawerTable.saleDrawerList,
dataCount: state => state.saleDrawerTable.saleDrawerDataCount,
@@ -185,25 +184,12 @@ export default {
this.loading = true
})
},
- // handleSubmit () {
- // this.$emit('customer-valid', {
- // reservetime: this.form.reservetime ? this.$moment(this.form.reservetime, this.$moment.ISO_8601).format('YYYY-MM-DD') : '',
- // newreservetime: this.form.newreservetime ? this.$moment(this.form.newreservetime, this.$moment.ISO_8601).format('YYYY-MM-DD') : '',
- // commodity: this.form.commodity,
- // yxcommodity: this.form.yxcommodity,
- // commission: this.form.commission,
- // signmoney: this.form.signmoney,
- // des: this.form.des
- // })
- // },
cancel () {
this.updateSaleDrawerState(false)
this.tabName = 'infoName'
this.changePageSize(10)
- // this.$refs['saleDrawer'].resetFields()
},
handleSubmit (playload) {
- // //console.log(playload)
this.getSaleDrawerList({
...playload,
uid: this.row.id ? this.row.id : -1
diff --git a/src/components/sale-form/sale-form.vue b/src/components/sale-form/sale-form.vue
index 83d7af31a48d1a4e2b8e1b670ec2cb0bbe56b3fe..2bcdbc4edd21b8dcb2475c00c9bd8020199eaa4c 100644
--- a/src/components/sale-form/sale-form.vue
+++ b/src/components/sale-form/sale-form.vue
@@ -9,7 +9,6 @@
-
@@ -38,21 +37,6 @@
-
-
-