From 9a25833c6e91a98a43a5338e0f22db7bdf4db6e8 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Fri, 15 Mar 2024 16:16:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E7=9A=84order=20number?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index bfacd1d..986d93a 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -93,7 +93,7 @@
     <script>
         new Vue({
             el: "#app",
-            data () {
+            data() {
                 return {
                     limit: 15,
                     page: 1,
@@ -130,7 +130,7 @@
                 modelPop,
             },
 
-            created () {
+            created() {
                 this.getOrderList();
                 this.goodsCount = localStorage.getItem('goodsCount');
                 this.scrollTop =
@@ -143,13 +143,13 @@
 
             methods: {
                 /* 根据不同状态展示 订单样式和表现 */
-                statusColor (status) {
+                statusColor(status) {
                     const colorArray = ['#f28542', '#f28542', '#44D27D', '#fd553d', '#fd553d', '#aaaaaa', '#fd553d'];
                     return colorArray[status];
                 },
 
 
-                scrollBottom (e) {
+                scrollBottom(e) {
                     let Scroll = e.target;
                     let scrollHeight = Scroll.scrollHeight - Scroll.clientHeight;
                     this.scrollTop = Scroll.scrollTop;
@@ -161,12 +161,12 @@
                 },
 
                 /* 以下三个方法是下拉刷新 */
-                touchStart (e) {
+                touchStart(e) {
                     this.startY = e.targetTouches[0].pageY;
                 },
 
 
-                touchMove (e) {
+                touchMove(e) {
                     if (this.scrollTop == 0) {
                         let moveDistance = e.targetTouches[0].pageY - this.startY;
                         if (moveDistance > 0 && moveDistance <= 80) {
@@ -175,7 +175,7 @@
                     }
                 },
 
-                touchEnd () {
+                touchEnd() {
                     if (this.loadShowHeight >= 60) {
                         this.page = 1;
                         this.getOrderList();
@@ -185,13 +185,13 @@
                 },
 
                 /* 查看卡密 */
-                lookCard (item) {
+                lookCard(item) {
                     sessionStorage.setItem("orderNumber", item.order_number);
                     window.location.href = '../orderDetails/cardOrder.html';
                 },
 
                 /*跳转详情*/
-                toDetails (order) {
+                toDetails(order) {
                     sessionStorage.setItem('orderNumber', order.order_number);
                     switch (order.goods.product_type) {
                         case 1:
@@ -207,7 +207,7 @@
                 },
 
                 /* 图标分流 */
-                filterImgSrc (item) {
+                filterImgSrc(item) {
                     if (item.type === 1) {
                         return item.show_url;
                     } else {
@@ -222,18 +222,18 @@
                 },
 
                 /* 返回 */
-                backHandler () {
+                backHandler() {
                     window.location.replace('./couponCollection.html');
                 },
 
                 /* 立即支付按钮 */
-                immediatelyPay (item) {
+                immediatelyPay(item) {
                     localStorage.setItem('goodsInfo', JSON.stringify(item));
                     window.location.href = `./settlement.html?orderNumber=${item.order_number}&payType=${item.pay_type}`;
                 },
 
                 /* 取消订单按钮 */
-                immediatelyCancel (item) {
+                immediatelyCancel(item) {
                     this.isCancel = true;
                     this.activeOrder = item;
                     this.popFunction({ title: '温馨提示', text: '是否确认取消订单', status: 2, b_text: '', show: true });
@@ -241,7 +241,7 @@
 
 
                 /* 统一控制弹窗 */
-                popFunction ({ title, text, status, b_text, show }) {
+                popFunction({ title, text, status, b_text, show }) {
                     this.popTitle = title;
                     this.popText = text;
                     this.popStatus = status;
@@ -250,7 +250,7 @@
                 },
 
                 /* 请求订单数据 */
-                getOrderList (isLodging) {
+                getOrderList(isLodging) {
                     /* 下拉 */
                     if (!isLodging) {
                         this.orderList = [];
@@ -284,7 +284,7 @@
                 },
 
                 /*跳转起始页面*/
-                toPage (time = 1) {
+                toPage(time = 1) {
                     let entryLink = localStorage.getItem('entryLink');
                     setTimeout(() => {
                         window.location.replace(entryLink);
@@ -292,7 +292,7 @@
                 },
 
                 /* 弹窗回调 */
-                backFunction (type) {
+                backFunction(type) {
                     if (this.bottomText === '点击复制' && type) {
                         var aux = document.createElement("input");
                         aux.setAttribute("value", this.href);
@@ -328,7 +328,7 @@
 
 
                 //领取立减金
-                receiveFn (res) {
+                receiveFn(res) {
                     if (res.status == 5) {
                         return this.popFunction({ title: '温馨提示', text: '立减金领取过期', status: 2, b_text: '我知道了', show: true });
                     }
@@ -355,7 +355,7 @@
                     if (res.goods.channel == 2) {
                         if (res.goods.is_webview == 1) {
                             /* 公众号 */
-                            this.publicCollection(res.order_number);
+                            this.publicCollection(res.alipay_order_number);
                         } else if (ua.indexOf("dingtalk") > -1) {
                             //在钉钉内置环境打开，不能唤起微信小程序
                             window.location.href = res.wechat_redirect_url;
@@ -367,7 +367,7 @@
                 },
 
                 /* 公众号领取 */
-                publicCollection (order_number) {
+                publicCollection(order_number) {
                     let params = {
                         order_number,
                         channel: 2,
@@ -386,7 +386,7 @@
                 },
 
                 // 单条弹框
-                openDialog (tip) {
+                openDialog(tip) {
                     this.toastShow = true;
                     this.toastTip = tip;
                     setTimeout(() => {