HandOver-liuwu
/
mobileclient
mirror of https://codeup.aliyun.com/lsxd/marketing/mobileclient.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

组合商品

This commit is contained in:
zhangguoping 2024-10-22 19:00:48 +08:00
parent 425d942a36
commit bc98d6fa08
7 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
combining.html
View File

@ -22,6 +22,14 @@
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
.content .box .g-b-u li{
position: relative;
}
.content .box .g-b-u li .period_tips_text {
position: absolute;
font-size: 0.1rem;
top: 0;
}
</style> </style>
</head> </head>
@ -78,6 +86,7 @@
已使用({{item.voucher.num}}/{{item.voucher.send_num}})</p> 已使用({{item.voucher.num}}/{{item.voucher.send_num}})</p>
<p class="g-b-but" v-if="item.voucher.status === 5" style="font-size: 0.1rem;"> <p class="g-b-but" v-if="item.voucher.status === 5" style="font-size: 0.1rem;">
领取失败({{item.voucher.num}}/{{item.voucher.send_num}})</p> 领取失败({{item.voucher.num}}/{{item.voucher.send_num}})</p>
<p class="period_tips_text" v-if="item.voucher.period_tips_text">{{item.voucher.period_tips_text}}</p>
</li> </li>
</ul> </ul>
<p class="notis" :style="{color:dynamicStyle.notis_color}" v-show="goods.product.length>3"> <p class="notis" :style="{color:dynamicStyle.notis_color}" v-show="goods.product.length>3">
@ -97,9 +106,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -489,6 +498,8 @@
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.goods = res.data; this.goods = res.data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false;
@ -688,7 +699,7 @@
self.loading = false; self.loading = false;
}, 5000); }, 5000);
if (this.goods.send_status === 3 || this.goods.send_status === 4) { if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) {
let params = { let params = {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
code_batch_id: this.code_batch_id, code_batch_id: this.code_batch_id,

17
packkey/combining.html
View File

@ -23,6 +23,14 @@
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
.content .box .g-b-u li{
position: relative;
}
.content .box .g-b-u li .period_tips_text {
position: absolute;
font-size: 0.1rem;
top: 0;
}
</style> </style>
</head> </head>
@ -79,6 +87,7 @@
已使用({{item.voucher.num}}/{{item.voucher.send_num}})</p> 已使用({{item.voucher.num}}/{{item.voucher.send_num}})</p>
<p class="g-b-but" v-if="item.voucher.status === 5" style="font-size: 0.1rem;"> <p class="g-b-but" v-if="item.voucher.status === 5" style="font-size: 0.1rem;">
领取失败({{item.voucher.num}}/{{item.voucher.send_num}})</p> 领取失败({{item.voucher.num}}/{{item.voucher.send_num}})</p>
<p class="period_tips_text" v-if="item.voucher.period_tips_text">{{item.voucher.period_tips_text}}</p>
</li> </li>
</ul> </ul>
<p class="notis" :style="{color:dynamicStyle.notis_color}" v-show="goods.product.length>3"> <p class="notis" :style="{color:dynamicStyle.notis_color}" v-show="goods.product.length>3">
@ -98,9 +107,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -491,6 +500,8 @@
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.goods = res.data; this.goods = res.data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// 支付宝组合商品 // 支付宝组合商品
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false;
@ -726,7 +737,7 @@
self.loading = false; self.loading = false;
}, 5000); }, 5000);
if (this.goods.send_status === 3 || this.goods.send_status === 4) { if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) {
let params = { let params = {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
code_batch_id: this.code_batch_id, code_batch_id: this.code_batch_id,

8
packkey/wx-combining.html
View File

@ -109,9 +109,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -338,6 +338,8 @@
new_data.product = self.computeNum(new_data.product); new_data.product = self.computeNum(new_data.product);
self.goods = new_data; self.goods = new_data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false;
@ -709,7 +711,7 @@
self.loading = false; self.loading = false;
}, 5000); }, 5000);
if (this.goods.send_status === 3 || this.goods.send_status === 4) { if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) {
let params = { let params = {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
code_batch_id: this.code_batch_id, code_batch_id: this.code_batch_id,

8
packkey/ysf-combining.html
View File

@ -108,9 +108,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -337,6 +337,8 @@
new_data.product = self.computeNum(new_data.product); new_data.product = self.computeNum(new_data.product);
self.goods = new_data; self.goods = new_data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false;
@ -676,7 +678,7 @@
self.loading = false; self.loading = false;
}, 5000); }, 5000);
if (this.goods.send_status === 3 || this.goods.send_status === 4) { if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) {
let params = { let params = {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
code_batch_id: this.code_batch_id, code_batch_id: this.code_batch_id,

8
wx-combining.html
View File

@ -109,9 +109,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -337,6 +337,8 @@
new_data.product = self.computeNum(new_data.product); new_data.product = self.computeNum(new_data.product);
self.goods = new_data; self.goods = new_data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false;
@ -667,7 +669,7 @@
self.loading = false; self.loading = false;
}, 5000); }, 5000);
if (this.goods.send_status === 3 || this.goods.send_status === 4) { if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) {
let params = { let params = {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
code_batch_id: this.code_batch_id, code_batch_id: this.code_batch_id,

6
xw-pages/wx-combining.html
View File

@ -109,9 +109,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -337,6 +337,8 @@
new_data.product = self.computeNum(new_data.product); new_data.product = self.computeNum(new_data.product);
self.goods = new_data; self.goods = new_data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false;

8
ysf-combining.html
View File

@ -108,9 +108,9 @@
<template <template
v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)"> v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm"> :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
<input type="text" maxlength="50" <input type="text" maxlength="50"
:placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
v-model="form.receive_account"> v-model="form.receive_account">
</template> </template>
@ -336,6 +336,8 @@
new_data.product = self.computeNum(new_data.product); new_data.product = self.computeNum(new_data.product);
self.goods = new_data; self.goods = new_data;
this.form.receive_account = this.goods.account || '';
this.form.confirm = this.goods.account || '';
// send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取 // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false;
@ -635,7 +637,7 @@
self.loading = false; self.loading = false;
}, 5000); }, 5000);
if (this.goods.send_status === 3 || this.goods.send_status === 4) { if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) {
let params = { let params = {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
code_batch_id: this.code_batch_id, code_batch_id: this.code_batch_id,