Skip to content

M
marketing
Commit ed2748af by chenxin
Options

fix:ewash不需要权限控制 card增加canEdit

parent f4072d80
Showing with 33 additions and 19 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=/marketing/static/css/main.ce8d937a0750ffc106722650efcba9fb.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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=https://unpkg.com/element-ui/lib/index.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.31.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.b84a6175760582deb080.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.095e881034c2120038f0.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=/marketing/static/css/main.9ea3d0b64d723791448d94c9b90374f0.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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=https://unpkg.com/element-ui/lib/index.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.31.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.4918f294e3961163b78e.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.095e881034c2120038f0.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.b84a6175760582deb080.js → dist/static/js/manifest.4918f294e3961163b78e.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,f,u,s=0,l=[];s<n.length;s++)f=n[s],t[f]&&l.push(t[f][0]),t[f]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)u=o(o.s=c[s]);return u};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"286e74489b9c3cf88220",1:"397a59c1598eb95c1240",2:"1eb336bd2c524523aad7",3:"48dc665c460c4f1ac5c6",4:"82b6062b9f7c9e15698f",5:"6b1aa9617fe5621ae2c6",6:"d927629a33a65a838c3a",7:"6dfebb35a2cb22f7489d",8:"54794a20463ff6fbd8a7",9:"fb83115d712756a35c09"}[e]+".js";var i=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=f,a.appendChild(c),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,f,u,d=0,s=[];d<n.length;d++)f=n[d],t[f]&&s.push(t[f][0]),t[f]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"286e74489b9c3cf88220",1:"ccae1bd3654fa6f0e20e",2:"7c623d12e32e4066d6ce",3:"412babd99d8107d89a48",4:"82b6062b9f7c9e15698f",5:"040c5edae738dc44ee28",6:"d927629a33a65a838c3a",7:"6dfebb35a2cb22f7489d",8:"54794a20463ff6fbd8a7",9:"fb83115d712756a35c09"}[e]+".js";var i=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=f,a.appendChild(c),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/wechat.1eb336bd2c524523aad7.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/wechat.7c623d12e32e4066d6ce.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/libs/imgTemp/imgItemRadio.vue
......@@ -4,7 +4,7 @@
<img :src="imgData.qcloudImageUrl" alt="" srcset="" />
</div>
<div class="dm-img-item_center">
<el-checkbox :label="imgData.imageMediaId">{{ imgData.imageTitle }}</el-checkbox>
<el-checkbox :disabled="imgData.canEdit === false" :label="imgData.imageMediaId">{{ imgData.imageTitle }}</el-checkbox>
</div>
</label>
</template>
......
src/components/libs/imgTemp/index-box.vue
......@@ -20,7 +20,7 @@
</label>
</div>
</div>
<el-checkbox-group v-loading="loading" v-model="newMediaId" :max="1" class="clearfix img-item__wrap" :style="scrollStyle">
<el-checkbox-group v-loading="loading" v-model="newMediaId" class="clearfix img-item__wrap" :style="scrollStyle">
<img-item-radio v-for="(v, i) in imgList" :key="i" :imgData="v" @click.native.stop.prevent="selectImg(v)"></img-item-radio>
</el-checkbox-group>
<el-pagination v-show="imgList.length" background class="dm-pagination imglib-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
......@@ -111,7 +111,7 @@ export default {
const resList = res.result.page.result.map(v => {
// 开启本人使用开关
if (this.selfSwitch === false) {
v.isEdit = true;
v.canEdit = true;
}
return v;
});
......
src/views/card/form.js
......@@ -54,6 +54,7 @@ export default {
return {
requestProject: 'marketing',
uuid: '',
canEdit: false,
loading: false,
submitLoading: false,
cardShelfsLoading: false, //卡券展架loading
......@@ -207,6 +208,8 @@ export default {
res = await getCardDetail({ coupCardId: this.$route.params.id });
}
if (res.errorCode === 0) {
// 是否是本人
this.canEdit = res.result.canEdit !== false;
// 拉取卡券适用渠道的列表
if (this.isAdd || this.isCopy) {
this.cardApplyChannelOptions = res.result.systemCoupChannelList;
......
src/views/card/form.vue
......@@ -223,7 +223,7 @@
</el-form-item>
<div class="btn-wrap_fixed" :class="{ on: asideShow }">
<el-button type="primary" @click="submitForm('form')" v-loading="submitLoading" v-show="!isInfo">保存并提交审核</el-button>
<el-button type="primary" @click="submitForm('form')" v-loading="submitLoading" v-show="!isInfo && canEdit">保存并提交审核</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
</el-form>
......
src/views/card/list.vue
......@@ -82,7 +82,7 @@ export default {
this.loading = true;
try {
let res = await cardPageList(this.listParams);
this.tableList = res.result.result;
this.tableList = res.result.result || [];
this.total = res.result.totalCount;
} catch (err) {
this.$tips({ type: 'error', message: '加载列表失败' });
......
src/views/card/partials/status-render.js
......@@ -9,10 +9,13 @@ export default Vue.component('render-temp', {
}
},
render(h) {
const bind1 = (
const canEdit = this.item.canEdit !== false; // 只有canEdit === false 才证明不能使用 没有权限仅可以详情/报表
const bind1 = canEdit ? (
<a title="投放" onClick={this.handler.bind(null, 1)}>
<i class="iconfont icon-daohang-" />
</a>
) : (
''
);
const bind2 = (
<a title="报表" onClick={this.handler.bind(null, 2)}>
......@@ -24,20 +27,24 @@ export default Vue.component('render-temp', {
<i class="el-icon-edit" />
</a>
);
const bind4 = (
const bind4 = canEdit ? (
<a title="删除" onClick={this.handler.bind(null, 4)}>
<i class="el-icon-delete" />
</a>
) : (
''
);
const bind5 = (
<a title="详情" onClick={this.handler.bind(null, 5)}>
<i class="el-icon-document" />
</a>
);
const bind6 = (
const bind6 = canEdit ? (
<a title="复制" onClick={this.handler.bind(null, 6)}>
<i class="iconfont icon-wxcard-copy" />
</a>
) : (
''
);
const statushtml = (
......
src/views/ewash/list.vue
......@@ -12,7 +12,6 @@
<el-option v-for="(item, index) in cardTypeOptions" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-input :disabled="!ewashDisable" v-model="listParams.searchParam" class="w200 vertical-middle" placeholder="输入卡券名称/备注" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSelfFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<div class="fr">
<el-button type="primary" @click="$router.push('/ewash/statements')" :disabled="!ewashDisable">查看账单</el-button>
<el-button type="primary" @click="handleDialogShow" :disabled="!ewashDisable">创建子账户</el-button>
......@@ -61,8 +60,7 @@ export default {
pageSize: 20,
cardType: '',
gicCouponType: 1,
giftCouponDiscountType: '',
showSelfFlag: ''
giftCouponDiscountType: ''
},
total: 0,
loading: false,
......
src/views/message/record.vue
......@@ -28,7 +28,6 @@
<time-counts v-if="scope.row.sendStatus == 0" class="primary-color fz12" :defaultVal="scope.row.sendTime" :autoStart="true"></time-counts>
</template>
</el-table-column>
<el-table-column min-width="100" align="left" prop="creatorName" label="创建人" v-if="$store.state.marketing.openFlag"></el-table-column>
<el-table-column label="操作" align="left" width="140px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/message/record/detail/' + scope.row.smsId)">详情</el-button>
......
src/views/wechat/editor.vue
......@@ -72,7 +72,7 @@
</el-form>
<!-- 图片弹窗 -->
<el-dialog title="提示" :visible.sync="imgShow" width="60%" :before-close="close">
<dm-img-box :activeId.sync="mediaId" :scrollStyle="{ maxHeight: '500px', overflowY: 'auto', overflowX: 'hidden' }"></dm-img-box>
<dm-img-box :selfSwitch="false" :activeId.sync="mediaId" :scrollStyle="{ maxHeight: '500px', overflowY: 'auto', overflowX: 'hidden' }"></dm-img-box>
<span slot="footer" class="dialog-footer"><el-button @click="close">关 闭</el-button></span>
</el-dialog>
<!-- 视频 -->
......
src/views/wechat/form.vue
......@@ -48,7 +48,7 @@
</el-radio-group>
<div class="pt20">
<div v-show="info.contentType === 0" style="padding:15px; border:1px solid #DCDFE6;border-radius:2px;">
<dm-img-text :showSelf="false" :showSelfFlag="1" @get-data="getImgTextData" :radioShow="true" :auto="false" :imageTextId="info.imageTextId" :activeId="info.imageTextWechatId"></dm-img-text>
<dm-img-text :showSelf="false" :showSelfFlag="showSelfFlag" @get-data="getImgTextData" :radioShow="true" :auto="false" :imageTextId="info.imageTextId" :activeId="info.imageTextWechatId"></dm-img-text>
</div>
<dm-img-box :selfSwitch="false" v-show="info.contentType === 2" :mediaId="info.mediaId" @get-data="getImgData"></dm-img-box>
<div v-show="info.contentType === 1">
......@@ -102,9 +102,16 @@ export default {
computed: {
asideShow() {
return this.$store.state.marketing.asideShow;
},
showSelfFlag() {
if (this.isAdd || this.isEdit) {
return 1; // 仅看本人
}
if (this.isInfo) {
return 0; // 可见全部
}
}
},
data() {
return {
loading: false,
......
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