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

🐛 fix: 修复

This commit is contained in:
wangsongsole 2023-12-28 18:06:33 +08:00
parent 3e86fc8c24
commit 4a6dd6c901
1 changed files with 210 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

315
order.html
View File

@ -8,8 +8,8 @@
<title>订单</title> <title>订单</title>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/vue.min.js?v=1367936144322" type="text/javascript" <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/vue.min.js?v=1367936144322" type="text/javascript"
charset="utf-8"></script> charset="utf-8"></script>
<script type="text/javascript" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js?v=1367936144322"> <script type="text/javascript"
</script> src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js?v=1367936144322"></script>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script> <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/modelPop.js"></script> <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/modelPop.js"></script>
<link rel="stylesheet" <link rel="stylesheet"
@ -21,29 +21,28 @@
<div id="app"> <div id="app">
<!-- 弹出提示 --> <!-- 弹出提示 -->
<img class="backPresTy" @click="location.href = './homepage.html'" v-if="goodsCount<2" <img class="backPresTy" @click="location.href = './homepage.html'" v-if="goodsCount<2"
src=" https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png" alt=""> src=" https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png" alt="" />
<p class="nav-title">订单</p> <p class="nav-title">订单</p>
<div id="refresh" @touchstart="touchStart($event)" @touchmove="touchMove($event)" <div id="refresh" @touchstart="touchStart($event)" @touchmove="touchMove($event)"
@touchcancel="touchEnd($event)" @touchend="touchEnd($event)"> @touchcancel="touchEnd($event)" @touchend="touchEnd($event)">
<img v-show='!!loadShowHeight' class='img-lodging' <img v-show="!!loadShowHeight" class="img-lodging"
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/img-logding.png" alt=""> src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/img-logding.png" alt="" />
<div class="content" slot="content" @scroll="scrollBottom($event)"> <div class="content" slot="content" @scroll="scrollBottom($event)">
<div class="content-item" v-for="item in orderList" :key="item.order_number"> <div class="content-item" v-for="item in orderList" :key="item.order_number">
<div class="top"> <div class="top">
<p class="time">{{item.create_time}}</p> <p class="time">{{item.create_time}}</p>
<p class="status" :style="{color:statusColor(item.status)}">{{item.status_text}} <p class="status" :style="{color:statusColor(item.status)}">
{{item.status_text}}
</p> </p>
</div> </div>
<div class="middle"> <div class="middle">
<img :src="item.src" alt=""> <img :src="item.src" alt="" />
<div class="right"> <div class="right">
<div class="title_originalPrice"> <div class="title_originalPrice">
<p class="title">{{item.product_name}}</p> <p class="title">{{item.product_name}}</p>
</div> </div>
<p class="id">订单编号：{{item.order_number}}</p> <p class="id">订单编号：{{item.order_number}}</p>
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
<p class="button-card b-l" @click="lookCard(item)" <p class="button-card b-l" @click="lookCard(item)"
@ -51,14 +50,16 @@
查看卡密 查看卡密
</p> </p>
<p class="button-card b-c-r b-l" @click="receiveFn(item)" <p class="button-card b-c-r b-l" @click="receiveFn(item)"
v-if="(item.status!==2&&item.goods.entity.send_num<2)&&[2,3].includes(item.type)&&[1,2].includes(item.channel)"> v-if="(item.status!==2&&item.goods.entity.send_num<2||item.status===0&&item.goods.entity.send_num>1)&&[2,3].includes(item.type)&&[1,2].includes(item.channel)">
去领取</p> 去领取
</p>
</div> </div>
</div> </div>
<p class="noMore" v-if="total<limit&&orderList.length">没有更多了</p> <p class="noMore" v-if="total<limit&&orderList.length">没有更多了</p>
<!-- 空状态 --> <!-- 空状态 -->
<div class="empty" v-if="!orderList.length&&!loadShowHeight"> <div class="empty" v-if="!orderList.length&&!loadShowHeight">
<img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/order-empty.png" alt=""> <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/order-empty.png"
alt="" />
<p>暂无订单</p> <p>暂无订单</p>
</div> </div>
</div> </div>
@ -75,7 +76,7 @@
<tab-static-component :current="2" v-if="goodsCount>1"></tab-static-component> <tab-static-component :current="2" v-if="goodsCount>1"></tab-static-component>
</div> </div>
<script> <script>
const token = localStorage.getItem('token'); const token = localStorage.getItem("token");
new Vue({ new Vue({
el: "#app", el: "#app",
data () { data () {
@ -87,35 +88,35 @@
/* 提示框状态 */ /* 提示框状态 */
popShow: false, popShow: false,
popTitle: '', popTitle: "",
popText: '', popText: "",
popStatus: 1 /*1 成功 2提示 3失败 */, popStatus: 1 /*1 成功 2提示 3失败 */,
bottomText: '' /*1 成功 2提示 3失败 */, bottomText: "" /*1 成功 2提示 3失败 */,
goodsCount: 0,/* 商品数量 */ goodsCount: 0 /* 商品数量 */,
href: '',/* 支付链接 */ href: "" /* 支付链接 */,
isCancel: false, isCancel: false,
/* toast */ /* toast */
toastShow: '', toastShow: "",
toastTip: '', toastTip: "",
redirect: false, redirect: false,
/* 加载 */ /* 加载 */
scrollTop: 0, scrollTop: 0,
startY: 0, startY: 0,
loadShowHeight: 0, loadShowHeight: 0,
loadFlag: false, loadFlag: false
}; };
}, },
components: { components: {
tabStaticComponent, tabStaticComponent,
modelPop, modelPop
}, },
created () { created () {
this.getOrderList(); this.getOrderList();
this.goodsCount = Number(sessionStorage.getItem('goodsCount')); this.goodsCount = Number(sessionStorage.getItem("goodsCount"));
this.scrollTop = this.scrollTop =
document.documentElement.scrollTop || document.body.scrollTop; document.documentElement.scrollTop || document.body.scrollTop;
}, },
@ -125,18 +126,32 @@
cancelOrder ({ order_number }) { cancelOrder ({ order_number }) {
this.order_number = order_number; this.order_number = order_number;
this.isCancel = true; this.isCancel = true;
this.popFunction({ title: '温馨提示', text: '是否确认取消订单', status: 2, b_text: '我知道了', show: true }); this.popFunction({
title: "温馨提示",
text: "是否确认取消订单",
status: 2,
b_text: "我知道了",
show: true
});
}, },
/* 根据不同状态展示 订单样式和表现 */ /* 根据不同状态展示 订单样式和表现 */
statusColor (status) { statusColor (status) {
const colorArray = ['#f28542', '#f28542', '#44D27D', '#fd553d', '#fd553d', '#aaaaaa', '#fd553d']; const colorArray = [
"#f28542",
"#f28542",
"#44D27D",
"#fd553d",
"#fd553d",
"#aaaaaa",
"#fd553d"
];
return colorArray[status]; return colorArray[status];
}, },
/*跳转起始页面*/ /*跳转起始页面*/
toPage () { toPage () {
let entryLink = localStorage.getItem('entryLink'); let entryLink = localStorage.getItem("entryLink");
setTimeout(() => { setTimeout(() => {
window.location.replace(entryLink); window.location.replace(entryLink);
}, 3 * 1000); }, 3 * 1000);
@ -144,13 +159,18 @@
/* 领取红包和立减金 */ /* 领取红包和立减金 */
receiveFn (item) { receiveFn (item) {
req.axiosGet(`/key/order/getLink`, { order_number: item.order_number, token }).then(({ data, code, message }) => { req
if (code === 200) { .axiosGet(`/key/order/getLink`, {
this.toApp(item, data); order_number: item.order_number,
} else { token
this.apiError(code, message); })
} .then(({ data, code, message }) => {
}); if (code === 200) {
this.toApp(item, data);
} else {
this.apiError(code, message);
}
});
}, },
/* 领取跳转逻辑 */ /* 领取跳转逻辑 */
@ -159,23 +179,45 @@
//领取立减金 //领取立减金
if (item.type === 2) { if (item.type === 2) {
if (item.status == 5) { if (item.status == 5) {
return this.popFunction({ title: '温馨提示', text: '立减金领取过期', status: 2, b_text: '我知道了', show: true }); return this.popFunction({
title: "温馨提示",
text: "立减金领取过期",
status: 2,
b_text: "我知道了",
show: true
});
} }
if (item.channel == 1) { if (item.channel == 1) {
if (item.goods.entity.receive_mode === 2) { /* H5 领取 */ if (item.goods.entity.receive_mode === 2) {
sessionStorage.setItem('goodsInfo', JSON.stringify(item.goods)); /* H5 领取 */
location.href = './zfb-reduce.html'; sessionStorage.setItem(
"goodsInfo",
JSON.stringify(item.goods)
);
location.href = "./zfb-reduce.html";
} else { } else {
let bankLink = encodeURIComponent( let bankLink = encodeURIComponent(
window.location.origin + window.location.origin +
"/alipay.html?orderNumber=" + data.order_number "/alipay.html?orderNumber=" +
data.order_number
); );
let link = "http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink; let link =
"http://openapi.1688sup.com/alipay/oauth?jump=" + bankLink;
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境 let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (ua.indexOf("micromessenger") > -1 || ua.indexOf("baiduboxapp") > -1 || ua.indexOf("firefox") > -1) { if (
ua.indexOf("micromessenger") > -1 ||
ua.indexOf("baiduboxapp") > -1 ||
ua.indexOf("firefox") > -1
) {
//在微信内置环境、百度app打开，不能唤起支付宝 //在微信内置环境、百度app打开，不能唤起支付宝
this.href = link; this.href = link;
this.popFunction({ title: '温馨提示', text: `请复制链接,在其他浏览器打开`, status: 2, b_text: '点击复制', show: true }); this.popFunction({
title: "温馨提示",
text: `请复制链接,在其他浏览器打开`,
status: 2,
b_text: "点击复制",
show: true
});
} else { } else {
//唤起支付宝 //唤起支付宝
window.location.replace(link); window.location.replace(link);
@ -186,7 +228,13 @@
if (item.channel == 2) { if (item.channel == 2) {
if (ua.indexOf("windows") > -1) { if (ua.indexOf("windows") > -1) {
this.href = data.redirect_url; this.href = data.redirect_url;
this.popFunction({ title: '温馨提示', text: `请复制链接,在其他浏览器打开`, status: 2, b_text: '点击复制', show: true }); this.popFunction({
title: "温馨提示",
text: `请复制链接,在其他浏览器打开`,
status: 2,
b_text: "点击复制",
show: true
});
} else { } else {
location.replace(data.redirect_url); location.replace(data.redirect_url);
} }
@ -196,14 +244,31 @@
/* 红包领取 */ /* 红包领取 */
if (item.type === 3) { if (item.type === 3) {
if (item.channel === 1) { if (item.channel === 1) {
if (item.goods.entity.receive_mode === 2) { /* H5 领取 */ if (item.goods.entity.receive_mode === 2) {
sessionStorage.setItem('goodsInfo', JSON.stringify(item.goods)); /* H5 领取 */
location.href = './zfb-redPackets.html'; sessionStorage.setItem(
"goodsInfo",
JSON.stringify(item.goods)
);
location.href = "./zfb-redPackets.html";
} else { } else {
const aliPaysUrl = `alipays://platformapi/startapp?appId=2021004100663111&page=pages/index/index?order_number=${encodeURIComponent(window.btoa(data.order_number))}`; const aliPaysUrl = `alipays://platformapi/startapp?appId=2021004100663111&page=pages/index/index?order_number=${encodeURIComponent(
if (isWx() || (ua.indexOf("android") > -1 && ua.indexOf("baiduboxapp") > -1) || ua.indexOf("windows") > -1) { window.btoa(data.order_number)
)}`;
if (
isWx() ||
(ua.indexOf("android") > -1 &&
ua.indexOf("baiduboxapp") > -1) ||
ua.indexOf("windows") > -1
) {
this.href = aliPaysUrl; this.href = aliPaysUrl;
this.popFunction({ title: '温馨提示', text: `请复制链接,在其他浏览器打开`, status: 2, b_text: '点击复制', show: true }); this.popFunction({
title: "温馨提示",
text: `请复制链接,在其他浏览器打开`,
status: 2,
b_text: "点击复制",
show: true
});
} else { } else {
location.replace(aliPaysUrl); location.replace(aliPaysUrl);
} }
@ -213,7 +278,13 @@
if (item.channel === 2) { if (item.channel === 2) {
if (ua.indexOf("windows") > -1) { if (ua.indexOf("windows") > -1) {
this.href = data.redirect_url; this.href = data.redirect_url;
this.popFunction({ title: '温馨提示', text: `请复制链接,在其他浏览器打开`, status: 2, b_text: '点击复制', show: true }); this.popFunction({
title: "温馨提示",
text: `请复制链接,在其他浏览器打开`,
status: 2,
b_text: "点击复制",
show: true
});
} else { } else {
location.replace(data.redirect_url); location.replace(data.redirect_url);
} }
@ -223,32 +294,36 @@
/* 弹窗回调 */ /* 弹窗回调 */
backFunction (type) { backFunction (type) {
if (this.bottomText === '点击复制' && type) { if (this.bottomText === "点击复制" && type) {
var aux = document.createElement("input"); var aux = document.createElement("input");
aux.setAttribute("value", this.href); aux.setAttribute("value", this.href);
document.body.appendChild(aux); document.body.appendChild(aux);
aux.select(); aux.select();
document.execCommand("copy"); document.execCommand("copy");
document.body.removeChild(aux); document.body.removeChild(aux);
this.openDialog('复制成功'); this.openDialog("复制成功");
} }
/* 取消订单 */ /* 取消订单 */
if (this.isCancel && type === 2) { if (this.isCancel && type === 2) {
req.axiosPut(`/key/order/cancel/${this.order_number}?token=${token}`).then(({ code, message }) => { req
if (code === 200) { .axiosPut(
this.getOrderList(); `/key/order/cancel/${this.order_number}?token=${token}`
} else { )
this.apiError(code, message); .then(({ code, message }) => {
} if (code === 200) {
}); this.getOrderList();
} else {
this.apiError(code, message);
}
});
} }
}, },
/* 查看卡密 */ /* 查看卡密 */
lookCard (item) { lookCard (item) {
localStorage.setItem("cardProductDetail", JSON.stringify(item)); localStorage.setItem("cardProductDetail", JSON.stringify(item));
window.location.href = './coupon/lookCard.html'; window.location.href = "./coupon/lookCard.html";
}, },
/* 统一控制弹窗 */ /* 统一控制弹窗 */
@ -266,7 +341,7 @@
this.toastTip = tip; this.toastTip = tip;
setTimeout(() => { setTimeout(() => {
this.toastShow = false; this.toastShow = false;
this.toastTip = ''; this.toastTip = "";
}, 3000); }, 3000);
}, },
@ -275,7 +350,11 @@
let Scroll = e.target; let Scroll = e.target;
let scrollHeight = Scroll.scrollHeight - Scroll.clientHeight; let scrollHeight = Scroll.scrollHeight - Scroll.clientHeight;
this.scrollTop = Scroll.scrollTop; this.scrollTop = Scroll.scrollTop;
if (scrollHeight - Scroll.scrollTop < 100 && !this.loadFlag && this.total === this.limit) { if (
scrollHeight - Scroll.scrollTop < 100 &&
!this.loadFlag &&
this.total === this.limit
) {
this.loadFlag = true; this.loadFlag = true;
this.page++; this.page++;
this.getOrderList(true); this.getOrderList(true);
@ -287,7 +366,6 @@
this.startY = e.targetTouches[0].pageY; this.startY = e.targetTouches[0].pageY;
}, },
touchMove (e) { touchMove (e) {
if (this.scrollTop == 0) { if (this.scrollTop == 0) {
let moveDistance = e.targetTouches[0].pageY - this.startY; let moveDistance = e.targetTouches[0].pageY - this.startY;
@ -314,32 +392,44 @@
this.loadShowHeight = true; this.loadShowHeight = true;
} }
req.axiosGet(`/key/order/queryList`, { token, page: this.page, limit: this.limit }).then(({ data, code, message }) => { req
if (code === 200) { .axiosGet(`/key/order/queryList`, {
this.total = data.length; token,
data = data.map((item) => { page: this.page,
return this.refactorData(item); limit: this.limit
}); })
if (!isLodging) { .then(({ data, code, message }) => {
setTimeout(() => { if (code === 200) {
this.loadShowHeight = 0; this.total = data.length;
this.orderList = data; data = data.map((item) => {
}, 1 * 1000); return this.refactorData(item);
});
if (!isLodging) {
setTimeout(() => {
this.loadShowHeight = 0;
this.orderList = data;
}, 1 * 1000);
}
if (isLodging && this.page > 1) {
this.orderList = this.orderList.concat(data);
this.loadFlag = false;
}
} else {
this.loadShowHeight = 0;
this.apiError(code, message);
} }
if (isLodging && this.page > 1) { });
this.orderList = this.orderList.concat(data);
this.loadFlag = false;
}
} else {
this.loadShowHeight = 0;
this.apiError(code, message);
}
});
}, },
/* 处理错误 */ /* 处理错误 */
apiError (code, message) { apiError (code, message) {
this.popFunction({ title: '温馨提示', text: message, status: 3, b_text: '我知道了', show: true }); this.popFunction({
title: "温馨提示",
text: message,
status: 3,
b_text: "我知道了",
show: true
});
if (code === 403) { if (code === 403) {
this.toPage(); this.toPage();
} }
@ -349,53 +439,68 @@
refactorData (item) { refactorData (item) {
/* type: 1兑换码 2立减金 3红包 */ /* type: 1兑换码 2立减金 3红包 */
/* channel: 1支付宝 2微信 3云闪付 */ /* channel: 1支付宝 2微信 3云闪付 */
const { order_number, create_time, status_text, status, type, product, card_number, card_password } = item; const {
const newItem = {
order_number, order_number,
create_time, create_time,
status_text, status_text,
status, status,
type, type,
product,
card_number,
card_password
} = item;
const newItem = {
order_number,
create_time,
status_text,
status,
type
}; };
switch (type) { switch (type) {
case 1: case 1:
newItem['product_name'] = product.product_name; newItem["product_name"] = product.product_name;
newItem['src'] = product.show_url; newItem["src"] = product.show_url;
newItem['show_url'] = product.show_url; newItem["show_url"] = product.show_url;
newItem['product_type'] = product.product_type; newItem["product_type"] = product.product_type;
newItem['goods'] = product; newItem["goods"] = product;
newItem['card_number'] = card_number; newItem["card_number"] = card_number;
newItem['card_password'] = card_password; newItem["card_password"] = card_password;
newItem['card_show'] = product.card_show; newItem["card_show"] = product.card_show;
break; break;
case 2: case 2:
const channel = product.entity.channel; const channel = product.entity.channel;
newItem['product_name'] = product.entity.batch_goods_name; newItem["product_name"] = product.entity.batch_goods_name;
newItem['channel'] = channel; newItem["channel"] = channel;
newItem['goods'] = product; newItem["goods"] = product;
if (channel === 1) { if (channel === 1) {
newItem['src'] = 'https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png'; newItem["src"] =
"https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png";
} }
if (channel === 2) { if (channel === 2) {
newItem['src'] = 'https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png'; newItem["src"] =
"https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png";
} }
if (channel === 3) { if (channel === 3) {
newItem['src'] = 'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/logo_ysf.png'; newItem["src"] =
"https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/logo_ysf.png";
} }
break; break;
case 3: case 3:
const channels = product.entity.channel; const channels = product.entity.channel;
newItem['product_name'] = product.entity.batch_goods_name; newItem["product_name"] = product.entity.batch_goods_name;
newItem['channel'] = channels; newItem["channel"] = channels;
newItem['goods'] = product; newItem["goods"] = product;
if (channels === 1) { if (channels === 1) {
newItem['src'] = 'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/redPacktes/alipay_icon.png'; newItem["src"] =
"https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/redPacktes/alipay_icon.png";
} }
if (channels === 2) { if (channels === 2) {
newItem['src'] = 'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/redPacktes/wechat_icon.png'; newItem["src"] =
"https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/redPacktes/wechat_icon.png";
} }
if (channels === 3) { if (channels === 3) {
newItem['src'] = 'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/logo_ysf.png'; newItem["src"] =
"https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/logo_ysf.png";
} }
break; break;
default: default: