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

Merge branch 'master' into reduction

This commit is contained in:
wangsongsole 2024-04-21 14:00:53 +08:00
parent 5be32eb31c df27fd7c4f
commit 96de9742d6
13 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combining.css
View File

@ -106,7 +106,7 @@ body {
.content .box .g-b-u li {
background-size: 100% 100%;
height: 1.16rem;
width: 2rem;
width: 1rem;
margin-left: 0.1rem;
}

2
combining.html
View File

@ -587,7 +587,7 @@
window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() ||
(ua.indexOf("android") > -1 &&

2
coupon/myOrder.html
View File

@ -344,7 +344,7 @@
window.location.origin +
"/alipay.html?orderNumber=" + res.alipay_order_number
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
//在微信内置环境、百度app打开，不能唤起支付宝
this.href = link;

2
order.html
View File

@ -232,7 +232,7 @@
}
let link =
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
"https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (
ua.indexOf("micromessenger") > -1 ||

2
packkey/combining.html
View File

@ -621,7 +621,7 @@
window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() ||
(ua.indexOf("android") > -1 &&

2
packkey/order.html
View File

@ -223,7 +223,7 @@
data.order_number
);
let link =
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
"https://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (
ua.indexOf("micromessenger") > -1 ||

2
packkey/reduce.html
View File

@ -331,7 +331,7 @@
window.location.origin +
"/packkey/alipay.html?orderNumber=" + this.orderId
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
//复制链接地址，提醒去浏览器打开

42
packkey/wx-combining.html
View File

@ -214,7 +214,7 @@
const emailReg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
new Vue({
el: "#app",
data () {
data() {
return {
goods: '',
backAble: (~~sessionStorage.getItem('goodsCount')) > 1,
@ -249,7 +249,7 @@
};
},
mounted () {
mounted() {
document.title = localStorage.getItem('title');
this.code_batch_id = JSON.parse(sessionStorage.getItem('goodsInfo')).entity.code_batch_id;
this.getProductDetail();
@ -272,7 +272,7 @@
},
computed: {
dynamicStyle () {
dynamicStyle() {
switch (Number(this.goods.group_info.channel)) {
case 1:
return {
@ -326,7 +326,7 @@
methods: {
//获取商品详情
getProductDetail () {
getProductDetail() {
const self = this;
req.axiosGet('/key/group/v2/groupProductDetail', {
token: self.token,
@ -391,7 +391,7 @@
}).catch();
},
// 轮循
groupProductVoucherDetail () {
groupProductVoucherDetail() {
let self = this;
req.axiosPost('/key/group/groupProductVoucherDetail', {
token: this.token,
@ -507,7 +507,7 @@
/* ******************************************** 官方领取 ******************************************** */
/* 直接领取 */
directSubmit () {
directSubmit() {
const self = this;
self.loading = true;
setTimeout(() => {
@ -558,7 +558,7 @@
},
/* 公众号领取 */
publicCollection () {
publicCollection() {
let params = {
token: this.token,
code_batch_id: this.code_batch_id,
@ -588,7 +588,7 @@
},
/* 支付宝官方领取H5跳转 */
toLinkAlipay () {
toLinkAlipay() {
// 领取成功结算 5
if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5) {
settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
@ -604,7 +604,7 @@
window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() ||
(ua.indexOf("android") > -1 &&
@ -621,7 +621,7 @@
/* ******************************************** 账号领取 ******************************************** */
/* 立即领取 */
submit () {
submit() {
if (this.goods.group_info.channel == 3 || this.goods.group_info.channel == 1 && this.goods.group_info.receive_mode == 2) {
const { confirm, receive_account } = this.form;
if (this.loading) return;
@ -638,7 +638,7 @@
},
// 提交函数
submitOne (data) {
submitOne(data) {
/* 领取立减金 */
req.axiosPost("/key/couponGroupUsage", data)
.then(({ code, message }) => {
@ -656,7 +656,7 @@
},
// 重试函数
resetSubmit (data) {
resetSubmit(data) {
/* 领取立减金 */
req.axiosPost("/voucher/groupVoucherRetry", data)
.then(({ code, message }) => {
@ -670,7 +670,7 @@
},
/* 验证后 最终提交 */
finalSubmit () {
finalSubmit() {
const self = this;
self.loading = true;
setTimeout(() => {
@ -697,7 +697,7 @@
},
/* 返回 */
backGoodsFn () {
backGoodsFn() {
if (this.backAble) {
window.location.replace('./homepage.html');
} else {
@ -706,7 +706,7 @@
},
/* 接口异常处理 */
axiosErrorFun (code, message) {
axiosErrorFun(code, message) {
this.loading = false;
if (code == 403) {
if (this.backAble) {
@ -723,7 +723,7 @@
},
//复制文本
copyFn () {
copyFn() {
var textArea = document.createElement("textarea");
textArea.value = this.copyLink;
document.body.appendChild(textArea);
@ -738,7 +738,7 @@
},
/* 触发提示 */
tips (text) {
tips(text) {
this.cls && clearTimeout(this.cls);
this.prompt_text = text;
this.promptShow = true;
@ -747,18 +747,18 @@
}, 3000);
},
// 错误弹出框关闭
knowFn () {
knowFn() {
this.popboxshow = false;
this.maskshow = false;
},
// 错误弹窗
openErrorDialog (tip) {
openErrorDialog(tip) {
this.maskshow = true;
this.tiptext = tip;
this.popboxshow = true;
},
// 6发放中 1待使用 9领取失败 20待领取 轮循+详情
formatStatusText (status) {
formatStatusText(status) {
switch (status) {
case 6:
return "发放中";
@ -775,7 +775,7 @@
}
},
// 计算 num
computeNum (data) {
computeNum(data) {
const self = this;
let new_product = data.map(item => {
let result = item.voucher.reduce((acc, curr) => {

42
packkey/ysf-combining.html
View File

@ -214,7 +214,7 @@
const emailReg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
new Vue({
el: "#app",
data () {
data() {
return {
goods: '',
backAble: (~~sessionStorage.getItem('goodsCount')) > 1,
@ -249,7 +249,7 @@
};
},
mounted () {
mounted() {
document.title = localStorage.getItem('title');
this.code_batch_id = JSON.parse(sessionStorage.getItem('goodsInfo')).entity.code_batch_id;
this.getProductDetail();
@ -272,7 +272,7 @@
},
computed: {
dynamicStyle () {
dynamicStyle() {
switch (Number(this.goods.group_info.channel)) {
case 1:
return {
@ -326,7 +326,7 @@
methods: {
//获取商品详情
getProductDetail () {
getProductDetail() {
const self = this;
req.axiosGet('/key/group/v2/groupProductDetail', {
token: self.token,
@ -391,7 +391,7 @@
}).catch();
},
// 轮循
groupProductVoucherDetail () {
groupProductVoucherDetail() {
let self = this;
req.axiosPost('/key/group/groupProductVoucherDetail', {
token: this.token,
@ -507,7 +507,7 @@
/* ******************************************** 官方领取 ******************************************** */
/* 直接领取 */
directSubmit () {
directSubmit() {
const self = this;
self.loading = true;
setTimeout(() => {
@ -557,7 +557,7 @@
},
/* 公众号领取 */
publicCollection () {
publicCollection() {
let params = {
token: this.token,
code_batch_id: this.code_batch_id,
@ -587,7 +587,7 @@
},
/* 支付宝官方领取H5跳转 */
toLinkAlipay () {
toLinkAlipay() {
// 领取成功结算 5
if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5) {
settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
@ -603,7 +603,7 @@
window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() ||
(ua.indexOf("android") > -1 &&
@ -620,7 +620,7 @@
/* ******************************************** 账号领取 ******************************************** */
/* 立即领取 */
submit () {
submit() {
if (this.goods.group_info.channel == 3 || this.goods.group_info.channel == 1 && this.goods.group_info.receive_mode == 2) {
const { confirm, receive_account } = this.form;
if (this.loading) return;
@ -637,7 +637,7 @@
},
// 提交函数
submitOne (data) {
submitOne(data) {
/* 领取立减金 */
req.axiosPost("/key/couponGroupUsage", data)
.then(({ code, message }) => {
@ -655,7 +655,7 @@
},
// 重试函数
resetSubmit (data) {
resetSubmit(data) {
/* 领取立减金 */
req.axiosPost("/voucher/groupVoucherRetry", data)
.then(({ code, message }) => {
@ -669,7 +669,7 @@
},
/* 验证后 最终提交 */
finalSubmit () {
finalSubmit() {
const self = this;
self.loading = true;
setTimeout(() => {
@ -696,7 +696,7 @@
},
/* 返回 */
backGoodsFn () {
backGoodsFn() {
if (this.backAble) {
window.location.replace('./homepage.html');
} else {
@ -705,7 +705,7 @@
},
/* 接口异常处理 */
axiosErrorFun (code, message) {
axiosErrorFun(code, message) {
this.loading = false;
if (code == 403) {
if (this.backAble) {
@ -722,7 +722,7 @@
},
//复制文本
copyFn () {
copyFn() {
var textArea = document.createElement("textarea");
textArea.value = this.copyLink;
document.body.appendChild(textArea);
@ -737,7 +737,7 @@
},
/* 触发提示 */
tips (text) {
tips(text) {
this.cls && clearTimeout(this.cls);
this.prompt_text = text;
this.promptShow = true;
@ -746,18 +746,18 @@
}, 3000);
},
// 错误弹出框关闭
knowFn () {
knowFn() {
this.popboxshow = false;
this.maskshow = false;
},
// 错误弹窗
openErrorDialog (tip) {
openErrorDialog(tip) {
this.maskshow = true;
this.tiptext = tip;
this.popboxshow = true;
},
// 6发放中 1待使用 9领取失败 20待领取 轮循+详情
formatStatusText (status) {
formatStatusText(status) {
switch (status) {
case 6:
return "发放中";
@ -774,7 +774,7 @@
}
},
// 计算 num
computeNum (data) {
computeNum(data) {
const self = this;
let new_product = data.map(item => {
let result = item.voucher.reduce((acc, curr) => {

2
paysuccess.html
View File

@ -164,7 +164,7 @@
window.location.origin +
"/alipay.html?orderNumber=" + this.orderId
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
/* 判断如果是微信浏览器或者百度浏览器 则无法拉起支付宝 */
if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {

2
reduce.html
View File

@ -321,7 +321,7 @@
window.location.origin +
"/alipay.html?orderNumber=" + this.orderId
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) {
//复制链接地址，提醒去浏览器打开

2
wx-combining.html
View File

@ -566,7 +566,7 @@
window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() ||
(ua.indexOf("android") > -1 &&

42
ysf-combining.html
View File

@ -213,7 +213,7 @@
const emailReg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
new Vue({
el: "#app",
data () {
data() {
return {
goods: '',
backAble: (~~sessionStorage.getItem('goodsCount')) > 1,
@ -248,7 +248,7 @@
};
},
mounted () {
mounted() {
document.title = localStorage.getItem('title');
this.code_batch_id = JSON.parse(sessionStorage.getItem('goodsInfo')).entity.code_batch_id;
this.getProductDetail();
@ -271,7 +271,7 @@
},
computed: {
dynamicStyle () {
dynamicStyle() {
switch (Number(this.goods.group_info.channel)) {
case 1:
return {
@ -325,7 +325,7 @@
methods: {
//获取商品详情
getProductDetail () {
getProductDetail() {
const self = this;
req.axiosGet('/key/group/v2/groupProductDetail', {
token: self.token,
@ -378,7 +378,7 @@
}).catch();
},
// 轮循
groupProductVoucherDetail () {
groupProductVoucherDetail() {
let self = this;
req.axiosPost('/key/group/groupProductVoucherDetail', {
token: this.token,
@ -494,7 +494,7 @@
/* ******************************************** 官方领取 ******************************************** */
/* 直接领取 */
directSubmit () {
directSubmit() {
const self = this;
self.loading = true;
setTimeout(() => {
@ -540,7 +540,7 @@
},
/* 公众号领取 */
publicCollection () {
publicCollection() {
let params = {
token: this.token,
code_batch_id: this.code_batch_id,
@ -560,13 +560,13 @@
},
/* 支付宝官方领取H5跳转 */
toLinkAlipay () {
toLinkAlipay() {
let self = this;
let banklink = encodeURIComponent(
window.location.origin +
`/packkey/combiningAlipay.html?codeBatchId=${this.code_batch_id}&token=${this.token}`
);
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let link = "https://openapi.1688sup.com/alipay/oauth?jump=" + banklink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (isWx() ||
(ua.indexOf("android") > -1 &&
@ -583,7 +583,7 @@
/* ******************************************** 账号领取 ******************************************** */
/* 立即领取 */
submit () {
submit() {
if (this.goods.group_info.channel == 3 || this.goods.group_info.channel == 1 && this.goods.group_info.receive_mode == 2) {
const { confirm, receive_account } = this.form;
if (this.loading) return;
@ -600,7 +600,7 @@
},
// 提交函数
submitOne (data) {
submitOne(data) {
/* 领取立减金 */
req.axiosPost("/key/couponGroupUsage", data)
.then(({ code, message }) => {
@ -614,7 +614,7 @@
},
// 重试函数
resetSubmit (data) {
resetSubmit(data) {
/* 领取立减金 */
req.axiosPost("/voucher/groupVoucherRetry", data)
.then(({ code, message }) => {
@ -628,7 +628,7 @@
},
/* 验证后 最终提交 */
finalSubmit () {
finalSubmit() {
const self = this;
self.loading = true;
setTimeout(() => {
@ -655,7 +655,7 @@
},
/* 返回 */
backGoodsFn () {
backGoodsFn() {
if (this.backAble) {
window.location.replace('./homepage.html');
} else {
@ -664,7 +664,7 @@
},
/* 接口异常处理 */
axiosErrorFun (code, message) {
axiosErrorFun(code, message) {
this.loading = false;
if (code == 403) {
if (this.backAble) {
@ -681,7 +681,7 @@
},
//复制文本
copyFn () {
copyFn() {
var textArea = document.createElement("textarea");
textArea.value = this.copyLink;
document.body.appendChild(textArea);
@ -696,7 +696,7 @@
},
/* 触发提示 */
tips (text) {
tips(text) {
this.cls && clearTimeout(this.cls);
this.prompt_text = text;
this.promptShow = true;
@ -705,18 +705,18 @@
}, 3000);
},
// 错误弹出框关闭
knowFn () {
knowFn() {
this.popboxshow = false;
this.maskshow = false;
},
// 错误弹窗
openErrorDialog (tip) {
openErrorDialog(tip) {
this.maskshow = true;
this.tiptext = tip;
this.popboxshow = true;
},
// 6发放中 1待使用 9领取失败 20待领取 轮循+详情
formatStatusText (status) {
formatStatusText(status) {
switch (status) {
case 6:
return "发放中";
@ -733,7 +733,7 @@
}
},
// 计算 num
computeNum (data) {
computeNum(data) {
const self = this;
let new_product = data.map(item => {
let result = item.voucher.reduce((acc, curr) => {