Skip to content

M
marketing
Commit bd2565e7 by zhangmeng
Options

fix:修改了卡券审核通过状态不允许修改图文的问题

parent 1e029fb9
Showing with 19 additions and 8 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.8a5600ccec4e19af9b2ed627860e8c91.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b95f77e8a57f632ca3ef.js></script><script type=text/javascript src=/marketing/static/js/app.04d34e5a24d1dc8ba8cc.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.b3e4c384ee7c531df40fb031e314a948.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b95f77e8a57f632ca3ef.js></script><script type=text/javascript src=/marketing/static/js/app.77495d658f6e9ad46386.js></script></body></html>
\ No newline at end of file
dist/static/js/app.04d34e5a24d1dc8ba8cc.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.77495d658f6e9ad46386.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -27,6 +27,6 @@
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js"></script>
<!-- <script src="http://web-1251519181.file.myqcloud.com/components/people.2.0.00.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.02.js"></script>
</body>
</html>
package.json
......@@ -13,6 +13,7 @@
"dependencies": {
"@antv/data-set": "^0.8.9",
"@antv/g2": "^3.2.6",
"@gic-test/vue-gic-people": "^1.8.94",
"@riophae/vue-treeselect": "^0.0.36",
"@tinymce/tinymce-vue": "^1.0.8",
"axios": "^0.18.0",
......
src/main.js
......@@ -5,11 +5,11 @@ import store from './store';
import { axios } from './service/api/index';
import directives from './directives';
import vueGicAsideMenu from '@/components/aside-menu';
import vueGicPeople from '@gic-test/vue-gic-people';
// import vueGicPeople from '@gic-test/vue-gic-people/src/lib';
import packele from 'packele';
Vue.config.productionTip = false;
Vue.use(packele);
Vue.use(vueGicPeople);
// Vue.use(vueGicPeople);
Vue.use(vueGicAsideMenu);
Vue.prototype.axios = axios;
Vue.prototype.axios.withCredentials = true;
......
src/views/card/partials/imgtext-drag.vue
......@@ -73,7 +73,10 @@ export default {
},
methods: {
addImgText() {
if (this.disabled) return;
if (this.disabled) {
this.$tips({ type: 'warning', message: '审核通过的卡券不能修改图文' });
return;
}
this.list.push({
flag: false,
maskShow: false,
......@@ -86,7 +89,10 @@ export default {
});
},
edit(v) {
if (this.disabled) return;
if (this.disabled) {
this.$tips({ type: 'warning', message: '审核通过的卡券不能修改图文' });
return;
}
v.flag = false;
v.copyImgCode = v.imgCode;
v.copyText = v.text;
......@@ -107,7 +113,10 @@ export default {
this.$emit('update:list', this.copylist);
},
del(v, i) {
if (this.disabled) return;
if (this.disabled) {
this.$tips({ type: 'warning', message: '审核通过的卡券不能修改图文' });
return;
}
this.$confirm('是否删除该图文消息?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......
src/views/ecm/form.vue
......@@ -499,6 +499,7 @@ export default {
}
if (res.result.searchId) {
this.useId = res.result.searchId || '';
console.log(this.useId, 'useid');
this.hasSearchData = result.filterJson || '{}';
}
if (this.form.effectType === 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment