Skip to content

S
shareConfig
Commit c27a44fc by 无尘
Options

fix: 更新选择卡券

parent e3edf9e4
Showing with 50 additions and 45 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.59cf079a9d143ccffb898a48eedbf413.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.9.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.c1977f55fa3fe916a7da.js></script><script type=text/javascript src=./static/js/vendor.b02712d05f24edc20c20.js></script><script type=text/javascript src=./static/js/app.fd13ff6fa6f5bc76d47d.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.51f0fe3717b12a18dd2bcba714dc4056.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.df15060a2af69bec9ce6.js></script><script type=text/javascript src=./static/js/vendor.b02712d05f24edc20c20.js></script><script type=text/javascript src=./static/js/app.fd13ff6fa6f5bc76d47d.js></script></body></html>
\ No newline at end of file
dist/static/css/app.51f0fe3717b12a18dd2bcba714dc4056.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.59cf079a9d143ccffb898a48eedbf413.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.a377ba7eb6450ac96685.js → dist/static/js/2.d5e808b13499728f62a7.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.c1977f55fa3fe916a7da.js → dist/static/js/manifest.df15060a2af69bec9ce6.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(u=0;u<a.length;u++)i=o(o.s=a[u]);return i};var r={},t={16:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"fc08294428601171995f",1:"0b4debf702276a81a576",2:"a377ba7eb6450ac96685",3:"c019d8cafd3a06152654",4:"ae830ced22d08598daf5",5:"8150fcbeaf473a1ddc0e",6:"166b5a2cade062094c6c",7:"77854ed7bad11f815191",8:"99e63d6938e3e2cc698c",9:"2f6f9c5ddfdec55bd7ad",10:"b13e3a0e48cb424eddfe",11:"9529a2b8d9ed57634743",12:"35c46a8717276a0cefcc",13:"a792ce23fe879d2e71eb"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(u=0;u<a.length;u++)i=o(o.s=a[u]);return i};var r={},t={16:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"fc08294428601171995f",1:"0b4debf702276a81a576",2:"d5e808b13499728f62a7",3:"c019d8cafd3a06152654",4:"ae830ced22d08598daf5",5:"8150fcbeaf473a1ddc0e",6:"166b5a2cade062094c6c",7:"77854ed7bad11f815191",8:"99e63d6938e3e2cc698c",9:"2f6f9c5ddfdec55bd7ad",10:"b13e3a0e48cb424eddfe",11:"9529a2b8d9ed57634743",12:"35c46a8717276a0cefcc",13:"a792ce23fe879d2e71eb"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-12 10:18:30
* @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:35:28
* @LastEditTime: 2020-12-21 15:39:54
-->
<!DOCTYPE html>
<html>
......@@ -36,7 +36,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.1.91.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/pagination.1.0.9.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
</body>
......
src/components/active-config/configs/disable-card-show.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-12-21 15:23:14
* @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:29:47
* @LastEditTime: 2020-12-21 15:45:50
-->
<!--
<disable-card-show :cardName="cardName"></disable-card-show>
......@@ -14,7 +14,7 @@ import disableCardShow from '@/components/active-config/configs/disable-card-sho
<template>
<div class="el-select w-146">
<div class="el-input is-disabled el-input--suffix">
<div class="el-input__inner">{{cardName || '--'}}</div>
<div class="el-input__inner text-ellipsis">{{cardName || '--'}}</div>
<span class="el-input__suffix">
<span class="el-input__suffix-inner">
<i class="el-select__caret el-input__icon el-icon-arrow-up"></i>
......@@ -43,6 +43,10 @@ export default {
};
</script>
<style lang='less' scoped>
.text-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
src/components/active-config/configs/entry-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:32:41
* @LastEditTime: 2020-12-21 16:01:14
-->
<!--
<entry-award></entry-award>
......@@ -128,8 +128,8 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
v-model="scope.row.cardCheck"
:disabled="$route.query.editFlag || scope.row.oldData"
>卡券</el-checkbox>
<disable-card-show v-if="$route.query.editFlag || scope.row.oldData" :cardName="scope.row.cardName"></disable-card-show>
<el-select
<!-- <el-select
v-else
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
......@@ -143,7 +143,9 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
:label="item.cardName"
:value="item.coupCardId"
> </el-option>
</el-select>
</el-select> -->
<disable-card-show v-if="$route.query.editFlag || scope.row.oldData" :cardName.sync="scope.row.cardName"></disable-card-show>
<select-card v-else v-model="scope.row.cardId" :cardName.sync="scope.row.cardName"></select-card>
</div>
</div>
<el-button
......@@ -220,7 +222,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
v-model="scope.row.cardCheck"
:disabled="$route.query.editFlag || scope.row.oldData"
>卡券</el-checkbox>
<el-select
<!-- <el-select
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.cardId"
......@@ -233,7 +235,9 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
:label="item.cardName"
:value="item.coupCardId"
> </el-option>
</el-select>
</el-select> -->
<disable-card-show v-if="$route.query.editFlag || scope.row.oldData" :cardName.sync="scope.row.cardName"></disable-card-show>
<select-card v-else v-model="scope.row.cardId" :cardName.sync="scope.row.cardName"></select-card>
</div>
</div>
<el-button
......@@ -262,6 +266,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
import errMsg from '@/common/js/error';
import { getRequest } from '@/api/api';
import selectCard from '@/components/active-config/configs/select-card.vue';
import disableCardShow from '@/components/active-config/configs/disable-card-show.vue';
export default {
name: 'entry-award',
......@@ -299,7 +304,7 @@ export default {
}
}
},
components: {disableCardShow},
components: { selectCard, disableCardShow },
data() {
return {
basePath: [],
......
src/components/active-config/configs/invitee-reward.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:31:13
* @LastEditTime: 2020-12-21 15:55:58
-->
<!--
<invitee-reward></invitee-reward>
......@@ -252,22 +252,8 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
>
<div class="store-select-title">
<span class="font-14 color-606266">选择卡券：</span>
<!-- <el-select
:disabled="$route.query.editFlag"
class="w-240"
v-model="invitedAward.cardId"
placeholder="请选择"
@change="changeSingleCard($event)"
>
<el-option
v-for="item in cardList"
:key="item.coupCardId"
:label="item.cardName"
:value="item.coupCardId"
> </el-option>
</el-select>-->
<disable-card-show v-if="$route.query.editFlag" :cardName="invitedAward.cardName"></disable-card-show>
<select-card v-else v-model="invitedAward.cardId" :cardName="invitedAward.cardName" @selectCard="selectCard"></select-card>
<select-card v-else v-model="invitedAward.cardId" :cardName.sync="invitedAward.cardName"></select-card>
</div>
</div>
......@@ -301,7 +287,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
<el-table-column label="奖励卡券">
<template slot-scope="scope">
<div class="cell">
<el-select
<!-- <el-select
:disabled="$route.query.editFlag"
class="w-240"
v-model="scope.row.cardId"
......@@ -314,7 +300,9 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
:label="item.cardName"
:value="item.coupCardId"
> </el-option>
</el-select>
</el-select> -->
<disable-card-show v-if="$route.query.editFlag" :cardName="scope.row.cardName"></disable-card-show>
<select-card v-else v-model="scope.row.cardId" :cardName.sync="scope.row.cardName"></select-card>
<el-button
v-if="scope.$index != 0"
class="m-l-16"
......@@ -574,23 +562,23 @@ export default {
/**
* 选择卡券
*/
selectCard(item) {
/*selectCard(item) {
const that = this;
that.invitedAward.cardName = item.cardName;
/* that.cardList.forEach(ele => {
that.cardList.forEach(ele => {
if (ele.coupCardId == e) {
that.invitedAward.cardName = ele.cardName;
}
}); */
},
changeCard(e, row) {
});
},*/
/* changeCard(e, row) {
const that = this;
that.cardList.forEach(ele => {
if (ele.coupCardId == e) {
row.cardName = ele.cardName;
}
});
}
} */
},
watch: {
value(newData) {
......
src/components/active-config/configs/select-card.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-12-21 14:43:50
* @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:19:12
* @LastEditTime: 2020-12-21 15:54:32
-->
<!--
<select-card v-model="coupCardId" :cardName="cardName" @selectCard="selectCard"></select-card>
......@@ -24,11 +24,11 @@ import selectCard from '@/components/active-config/configs/select-card.vue';
</div>
</div>
</div>
<div class="select-search-input cursor-pointer" slot="reference" style="display: inline-block;">
<div class="select-search-input cursor-pointer" slot="reference" style="display: inline-block; vertical-align: top;">
<div class="el-select" style="width: 213px">
<div class="el-input el-input--large el-input--suffix">
<div class="el-input el-input--suffix">
<div class="el-input__inner">
<div class="text-ellipsis select-brand font-12 color-909399 max-w-260">{{ cardName || '请选择' }}</div>
<div :class="['text-ellipsis font-14 max-w-260', cardName ? 'color-606266': 'color-909399']">{{ cardName || '请选择' }}</div>
</div>
</div>
</div>
......@@ -64,6 +64,7 @@ export default {
changeSelect(item) {
const that = this;
that.$emit('input', item.coupCardId);
that.$emit('update:cardName', item.cardName);
that.$emit('selectCard', item);
that.brandVisible = false;
},
......@@ -98,6 +99,13 @@ export default {
</script>
<style type="text/less" lang="less" scoped>
.text-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.max-w-260 {
max-width: 260px;
}
</style>
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