Skip to content

W
welfare
Commit cd2393c4 by chenxin
Options

fix: 履约 路由调整

parent c90c4262
Showing with 22 additions and 20 deletions
dist/css/chunk-5865ed76.9908b7cb.css deleted 100644 → 0
.enter[data-v-2fe4d5e4]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-top:80px}.enter>div.b1[data-v-2fe4d5e4]:after{background:url(../img/01.c155f11a.png)}.enter>div.b1[data-v-2fe4d5e4]:after,.enter>div.b2[data-v-2fe4d5e4]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b2[data-v-2fe4d5e4]:after{background:url(../img/02.438fcb96.png)}.enter>div.b3[data-v-2fe4d5e4]:after{background:url(../img/03.6fab4498.png)}.enter>div.b3[data-v-2fe4d5e4]:after,.enter>div.b4[data-v-2fe4d5e4]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b4[data-v-2fe4d5e4]:after{background:url(../img/04.08b8aa0f.png)}.enter>div[data-v-2fe4d5e4]{width:280px;position:relative;height:360px;border-radius:12px;margin-right:28px}.enter>div[data-v-2fe4d5e4]:last-child{margin-right:0}.enter>div.b1[data-v-2fe4d5e4]{color:#eb584f;background:-webkit-gradient(linear,left top,left bottom,from(#fae5e5),to(#f7cecd));background:linear-gradient(180deg,#fae5e5,#f7cecd)}.enter>div.b1 span.title[data-v-2fe4d5e4]{background:#eb584f}.enter>div.b2[data-v-2fe4d5e4]{color:#f1bd49;background:-webkit-gradient(linear,left top,left bottom,from(#f8f7e4),to(#f7f1cb));background:linear-gradient(180deg,#f8f7e4,#f7f1cb)}.enter>div.b2 span.title[data-v-2fe4d5e4]{background:#f1bd49}.enter>div.b3[data-v-2fe4d5e4]{color:#597ef7;background:-webkit-gradient(linear,left top,left bottom,from(#f1f1f9),to(#d9e1fa));background:linear-gradient(180deg,#f1f1f9,#d9e1fa)}.enter>div.b3 span.title[data-v-2fe4d5e4]{background:#597ef7}.enter>div.b4[data-v-2fe4d5e4]{color:#df7d45;background:-webkit-gradient(linear,left top,left bottom,from(#f5e8df),to(#f2d8c8));background:linear-gradient(180deg,#f5e8df,#f2d8c8)}.enter>div.b4 span.title[data-v-2fe4d5e4]{background:#df7d45}.enter>div p.desc[data-v-2fe4d5e4]{font-size:14px;font-weight:400;line-height:20px;margin:20px;color:inherit}.enter>div .target[data-v-2fe4d5e4]{position:absolute;cursor:pointer;color:inherit;width:40px;height:40px;top:94px;left:22px}.enter>div .target i[data-v-2fe4d5e4]{color:inherit;font-size:32px}.enter>div span.title[data-v-2fe4d5e4]{padding-left:20px;width:140px;display:inline-block;line-height:40px;color:#fff;border-radius:12px 0 12px 0;font-size:20px;font-weight:500}
\ No newline at end of file
dist/css/chunk-9632093e.00b42928.css 0 → 100644
.enter[data-v-8987bf3a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-top:80px}.enter>div.b1[data-v-8987bf3a]:after{background:url(../img/01.c155f11a.png)}.enter>div.b1[data-v-8987bf3a]:after,.enter>div.b2[data-v-8987bf3a]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b2[data-v-8987bf3a]:after{background:url(../img/02.438fcb96.png)}.enter>div.b3[data-v-8987bf3a]:after{background:url(../img/03.6fab4498.png)}.enter>div.b3[data-v-8987bf3a]:after,.enter>div.b4[data-v-8987bf3a]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b4[data-v-8987bf3a]:after{background:url(../img/04.08b8aa0f.png)}.enter>div[data-v-8987bf3a]{width:280px;position:relative;height:360px;border-radius:12px;margin-right:28px}.enter>div[data-v-8987bf3a]:last-child{margin-right:0}.enter>div.b1[data-v-8987bf3a]{color:#eb584f;background:-webkit-gradient(linear,left top,left bottom,from(#fae5e5),to(#f7cecd));background:linear-gradient(180deg,#fae5e5,#f7cecd)}.enter>div.b1 span.title[data-v-8987bf3a]{background:#eb584f}.enter>div.b2[data-v-8987bf3a]{color:#f1bd49;background:-webkit-gradient(linear,left top,left bottom,from(#f8f7e4),to(#f7f1cb));background:linear-gradient(180deg,#f8f7e4,#f7f1cb)}.enter>div.b2 span.title[data-v-8987bf3a]{background:#f1bd49}.enter>div.b3[data-v-8987bf3a]{color:#597ef7;background:-webkit-gradient(linear,left top,left bottom,from(#f1f1f9),to(#d9e1fa));background:linear-gradient(180deg,#f1f1f9,#d9e1fa)}.enter>div.b3 span.title[data-v-8987bf3a]{background:#597ef7}.enter>div.b4[data-v-8987bf3a]{color:#df7d45;background:-webkit-gradient(linear,left top,left bottom,from(#f5e8df),to(#f2d8c8));background:linear-gradient(180deg,#f5e8df,#f2d8c8)}.enter>div.b4 span.title[data-v-8987bf3a]{background:#df7d45}.enter>div p.desc[data-v-8987bf3a]{font-size:14px;font-weight:400;line-height:20px;margin:20px;color:inherit}.enter>div .target[data-v-8987bf3a]{position:absolute;cursor:pointer;color:inherit;width:40px;height:40px;top:70px;left:22px}.enter>div .target i[data-v-8987bf3a]{color:inherit;font-size:32px}.enter>div span.title[data-v-8987bf3a]{padding-left:20px;width:140px;display:inline-block;line-height:40px;color:#fff;border-radius:12px 0 12px 0;font-size:20px;font-weight:500}
\ No newline at end of file
dist/js/chunk-5865ed76.909d1aec.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5865ed76"],{"1e4b":function(t,e,a){"use strict";a.r(e);var c=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,c){return a("div",{key:c,class:"b"+(c+1)},[a("span",{staticClass:"title"},[t._v(t._s(e.title))]),a("p",{staticClass:"desc"},[t._v(t._s(e.desc))]),a("router-link",{staticClass:"target",attrs:{to:e.target}},[a("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},n=[],i=a("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(a("d457"),a("2877")),u=Object(s["a"])(l,c,n,!1,null,"2fe4d5e4",null);e["default"]=u.exports},b46e:function(t,e,a){},d457:function(t,e,a){"use strict";a("b46e")},f9e4:function(t,e,a){"use strict";a.d(e,"b",(function(){return c})),a.d(e,"a",(function(){return n}));a("6c7b"),Array(31).fill().map((function(t,e){return{label:"".concat(e+1,"号"),value:"".concat(e+1)}})),Array(28).fill().map((function(t,e){return{label:"".concat(e+1,"号"),value:"".concat(e+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,e){return{label:"".concat(e+1,"月"),value:"".concat(e+1)}}));var c=[{title:"实物礼品",desc:"文案描述文案描述文案描述",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",desc:"文案描述文案描述文案描述",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",desc:"文案描述文案描述文案描述",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",desc:"文案描述文案描述文案描述",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file
dist/js/chunk-9632093e.b81e318e.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-9632093e"],{"0687":function(t,a,e){},"1e4b":function(t,a,e){"use strict";e.r(a);var c=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"enter"},t._l(t.wfTypes,(function(a,c){return e("div",{key:c,class:"b"+(c+1)},[e("span",{staticClass:"title"},[t._v(t._s(a.title))]),e("router-link",{staticClass:"target",attrs:{to:a.target}},[e("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},n=[],i=e("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(e("ccb6"),e("2877")),u=Object(s["a"])(l,c,n,!1,null,"8987bf3a",null);a["default"]=u.exports},ccb6:function(t,a,e){"use strict";e("0687")},f9e4:function(t,a,e){"use strict";e.d(a,"b",(function(){return c})),e.d(a,"a",(function(){return n}));e("6c7b"),Array(31).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})),Array(28).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,a){return{label:"".concat(a+1,"月"),value:"".concat(a+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file
src/components/layout/layout.vue
......@@ -4,7 +4,7 @@
<!-- maside插槽 替换asidemenu title -->
<div slot="maside">
<!-- :hide-timeout="100000" -->
<el-dropdown class="m-title" :hide-on-click="false">
<el-dropdown class="m-title" :hide-on-click="false" v-if="project.includes('card')">
<div class="el-dropdown-link">
<div><p class="ellipsis">{{ currentAreaName || '未选择域' }}</p><i class="el-icon-arrow-down el-icon--right"></i></div>
</div>
......
src/components/libs/switch-page.vue
......@@ -40,6 +40,7 @@ export default {
cursor: pointer;
text-align: center;
padding-top: 9px;
z-index: 900;
}
.toggle {
li {
......
src/components/stock-list/welfare-item.vue
......@@ -28,13 +28,15 @@
</div>
<!-- 实物礼品才有sku列表 -->
<el-table :data="skuList" v-if="type == 1" style="width: calc(100% - 40px)" max-height="200" class="ml20 mr20 mb10 el-table-list-mini-empty">
<el-table-column prop="num" label="SKU信息" min-width="200">
<el-table-column prop="num" label="SKU信息" min-width="180">
<template slot-scope="scope">
<img :src="scope.row.giftSkuImgUrl" width="50" height="50" />
{{ scope.row.giftSkuName || '--' }}
<div style="display:flex;align-items:center;">
<img :src="scope.row.giftSkuImgUrl" width="40" height="40" class="mr10" />
<span>{{ scope.row.giftSkuName || '--' }}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="giftSkuCode" label="SKU编码" min-width="150"></el-table-column>
<el-table-column prop="giftSkuId" label="SKU编码" min-width="150"></el-table-column>
<el-table-column prop="totalStock" label="总库存" min-width="150"></el-table-column>
<el-table-column prop="occupyStock" label="已占用" min-width="150"></el-table-column>
<el-table-column prop="remainedStock" label="可占库存" min-width="150"></el-table-column>
......@@ -80,9 +82,9 @@ export default {
if(this.type == 1 || this.type == 2) {
// 礼品
giftGet({ id: this.welfareId }).then(res => {
const { imgUrl, updateTime, createTime, giftName, giftNo, virCostPrice, outStock, preStock, occupyStock, remainedStock, totalStock, useStatus } = res.result;
const { giftImages, updateTime, createTime, giftName, giftNo, virCostPrice, outStock, preStock, occupyStock, remainedStock, totalStock, useStatus } = res.result;
this.info = {
imgUrl,
imgUrl: giftImages,
updateTime,
createTime,
name: giftName,
......@@ -134,7 +136,7 @@ export default {
2: '已过期',
3: '已禁用',
};
return (this.type == 1 || this.type == 2 ? gift[val] : card[val]);
return (this.type == 1 || this.type == 2 ? gift[val] : card[val]) || '--';
}
},
watch: {
......
src/config/mapping/common.js
......@@ -31,10 +31,10 @@ export const monthList = Array(12)
});
export const wfTypes = [
{ title: '实物礼品', desc: '文案描述文案描述文案描述', target: '/gift-manage/real-gift', code: 'w-real-gifts' },
{ title: '虚拟礼品', desc: '文案描述文案描述文案描述', target: '/gift-manage/virtual-gift', code: 'w-virtual-gifts' },
{ title: 'GIC 卡券', desc: '文案描述文案描述文案描述', target: '/gic-card/list', code: 'w-gic-card' },
{ title: 'GIC 卡券包', desc: '文案描述文案描述文案描述', target: '/card-package/list', code: 'w-card-package' },
{ title: '实物礼品', target: '/gift-manage/real-gift', code: 'w-real-gifts' },
{ title: '虚拟礼品', target: '/gift-manage/virtual-gift', code: 'w-virtual-gifts' },
{ title: 'GIC 卡券', target: '/gic-card/list', code: 'w-gic-card' },
{ title: 'GIC 卡券包', target: '/card-package/list', code: 'w-card-package' },
];
// 调整类型(1:加，2:减)
......
src/router/performance.js
......@@ -2,9 +2,9 @@ import Layout from '@/components/layout/layout';
export default [
{
path: '/performance',
path: '/gift-performance',
component: Layout,
redirect: '/performance/delivery',
redirect: '//gift-performance/delivery',
children: [
{
path: 'delivery',
......
src/views/index.vue
......@@ -3,7 +3,6 @@
<div class="enter">
<div v-for="(item, idx) in wfTypes" :key="idx" :class="`b${idx + 1}`">
<span class="title">{{ item.title }}</span>
<p class="desc">{{ item.desc }}</p>
<router-link :to="item.target" class="target"><i class="icon-right-circle iconfont-welfare4"></i></router-link>
</div>
</div>
......@@ -74,7 +73,7 @@ export default {
color: inherit;
width: 40px;
height: 40px;
top: 94px;
top: 70px;
left: 22px;
i {
color: inherit;
......
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