Skip to content

S
shareConfig
Commit ecd1393d by 无尘
Options

fix: 更新选择卡券

parent c27a44fc
Showing with 25 additions and 43 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.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> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.45436a55c234be2295b25e2f1a6b84ea.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.0abaf507e0ef38b61450.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 \ No newline at end of file
dist/static/js/2.c9d31c3e06c2e0c849fe.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.d5e808b13499728f62a7.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/manifest.0abaf507e0ef38b61450.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,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 o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);s.length;)s.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={16:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"fc08294428601171995f",1:"0b4debf702276a81a576",2:"c9d31c3e06c2e0c849fe",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,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.df15060a2af69bec9ce6.js deleted 100644 → 0
!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
src/components/active-config/configs/competition-award.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-10-19 09:25:47 * @LastEditTime: 2020-12-21 16:12:26
--> -->
<!-- <!--
<competition-award></competition-award> <competition-award></competition-award>
...@@ -418,7 +418,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -418,7 +418,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</div> </div>
<div class="m-t-10"> <div class="m-t-10">
<el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox> <el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
<el-select <!-- <el-select
class="w-146" class="w-146"
:disabled="$route.query.editFlag" :disabled="$route.query.editFlag"
v-model="scope.row.cardId" v-model="scope.row.cardId"
...@@ -431,7 +431,9 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -431,7 +431,9 @@ import competitionAward from '@/components/active-config/configs/competition-awa
:label="item.cardName" :label="item.cardName"
:value="item.coupCardId" :value="item.coupCardId"
> </el-option> > </el-option>
</el-select> </el-select> -->
<disable-card-show v-if="$route.query.editFlag " :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>
</div> </div>
<el-button <el-button
...@@ -459,6 +461,9 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -459,6 +461,9 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</template> </template>
<script> <script>
import limitInput from '@/components/limit-input.vue'; import limitInput from '@/components/limit-input.vue';
import selectCard from '@/components/active-config/configs/select-card.vue';
import disableCardShow from '@/components/active-config/configs/disable-card-show.vue';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
import mixins from '@/mixins/emitter'; import mixins from '@/mixins/emitter';
...@@ -504,7 +509,9 @@ export default { ...@@ -504,7 +509,9 @@ export default {
} }
}, },
components: { components: {
limitInput limitInput,
selectCard,
disableCardShow
}, },
data() { data() {
return { return {
......
src/components/active-config/configs/entry-award.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-21 16:01:14 * @LastEditTime: 2020-12-21 16:04:59
--> -->
<!-- <!--
<entry-award></entry-award> <entry-award></entry-award>
...@@ -128,22 +128,6 @@ import entryAward from '@/components/active-config/configs/entry-award.vue'; ...@@ -128,22 +128,6 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
v-model="scope.row.cardCheck" v-model="scope.row.cardCheck"
:disabled="$route.query.editFlag || scope.row.oldData" :disabled="$route.query.editFlag || scope.row.oldData"
>卡券</el-checkbox> >卡券</el-checkbox>
<!-- <el-select
v-else
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.cardId"
placeholder="请选择"
@change="changeCard($event, scope.row)"
>
<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 || scope.row.oldData" :cardName.sync="scope.row.cardName"></disable-card-show> <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> <select-card v-else v-model="scope.row.cardId" :cardName.sync="scope.row.cardName"></select-card>
</div> </div>
...@@ -222,20 +206,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue'; ...@@ -222,20 +206,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
v-model="scope.row.cardCheck" v-model="scope.row.cardCheck"
:disabled="$route.query.editFlag || scope.row.oldData" :disabled="$route.query.editFlag || scope.row.oldData"
>卡券</el-checkbox> >卡券</el-checkbox>
<!-- <el-select
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.cardId"
placeholder="请选择"
@change="changeCard($event, scope.row)"
>
<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 || scope.row.oldData" :cardName.sync="scope.row.cardName"></disable-card-show> <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> <select-card v-else v-model="scope.row.cardId" :cardName.sync="scope.row.cardName"></select-card>
</div> </div>
......
src/components/active-config/configs/invitee-reward.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:55:58 * @LastEditTime: 2020-12-21 16:12:16
--> -->
<!-- <!--
<invitee-reward></invitee-reward> <invitee-reward></invitee-reward>
...@@ -302,7 +302,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue ...@@ -302,7 +302,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
> </el-option> > </el-option>
</el-select> --> </el-select> -->
<disable-card-show v-if="$route.query.editFlag" :cardName="scope.row.cardName"></disable-card-show> <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> <select-card v-else v-model="scope.row.cardId" :width="'260px'" :cardName.sync="scope.row.cardName"></select-card>
<el-button <el-button
v-if="scope.$index != 0" v-if="scope.$index != 0"
class="m-l-16" class="m-l-16"
......
src/components/active-config/configs/select-card.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-12-21 14:43:50 * @Date: 2020-12-21 14:43:50
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-21 15:54:32 * @LastEditTime: 2020-12-21 16:10:02
--> -->
<!-- <!--
<select-card v-model="coupCardId" :cardName="cardName" @selectCard="selectCard"></select-card> <select-card v-model="coupCardId" :cardName="cardName" @selectCard="selectCard"></select-card>
...@@ -25,7 +25,7 @@ import selectCard from '@/components/active-config/configs/select-card.vue'; ...@@ -25,7 +25,7 @@ import selectCard from '@/components/active-config/configs/select-card.vue';
</div> </div>
</div> </div>
<div class="select-search-input cursor-pointer" slot="reference" style="display: inline-block; vertical-align: top;"> <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-select" :style="{'width': width}">
<div class="el-input el-input--suffix"> <div class="el-input el-input--suffix">
<div class="el-input__inner"> <div class="el-input__inner">
<div :class="['text-ellipsis font-14 max-w-260', cardName ? 'color-606266': 'color-909399']">{{ cardName || '请选择' }}</div> <div :class="['text-ellipsis font-14 max-w-260', cardName ? 'color-606266': 'color-909399']">{{ cardName || '请选择' }}</div>
...@@ -49,6 +49,10 @@ export default { ...@@ -49,6 +49,10 @@ export default {
cardName: { cardName: {
type: String, type: String,
default: '' default: ''
},
width: {
type: String,
default: '146px'
} }
}, },
data() { data() {
......
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