From 619c0cacc5a4e8af1132227e2f28f66648ad81df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com>
Date: Mon, 17 Aug 2026 17:13:40 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aapple=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |    9 +-
 pages/login_package/bind-phone/bind-phone.vue |  100 +-
 pages/login_package/login/login.vue           |  114 +-
 pages/mine_package/mine_order/mine_order.vue  |   10 +-
 .../mine_order_info/mine_order_info.vue       | 1471 +++++++++--------
 utils/enumUtils.js                            |    3 +-
 6 files changed, 850 insertions(+), 857 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index be52294..4d24a42 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -8,8 +8,15 @@
             "type" : "uni-app:app-android"
         },
         {
-            "customPlaygroundType" : "device",
+            "bundleId" : "com.trustbridge.mm",
+            "certificateFile" : "/Users/qinxingxing/Documents/alpha/资料/商城证书/int/ios/malldev.p12",
+            "certificateProfileFile" : "/Users/qinxingxing/Documents/alpha/资料/商城证书/int/ios/malldev.mobileprovision",
+            "customPlaygroundType" : "local",
+            "iOSProjectStandardBaseHistory" : {
+                "current" : "iOS_debug_5.24.ipa"
+            },
             "playground" : "custom",
+            "runSignStatus" : 0,
             "type" : "uni-app:app-ios"
         },
         {
diff --git a/pages/login_package/bind-phone/bind-phone.vue b/pages/login_package/bind-phone/bind-phone.vue
index 1c45828..7ac013f 100644
--- a/pages/login_package/bind-phone/bind-phone.vue
+++ b/pages/login_package/bind-phone/bind-phone.vue
@@ -2,13 +2,7 @@
   <view class="register_warp">
     <view class="header_">
       <view style="margin-top: 10rpx">
-        <up-image
-          src="/static/common/left.png"
-          width="18"
-          height="20"
-          bgColor="#f1f6ff00"
-          @click="jumpMine"
-        />
+        <up-image src="/static/common/left.png" width="18" height="20" bgColor="#f1f6ff00" @click="jumpMine" />
       </view>
       <view class="title_">绑定手机号</view>
       <view></view>
@@ -16,79 +10,48 @@
 
     <view class="register_ifo_warp">
       <view class="register_info_item">
-        <up-input
-          placeholder="请输入手机号"
-          border="surround"
-          v-model="form.mobile"
-          :customStyle="inputCss"
-        ></up-input>
+        <up-input placeholder="请输入手机号" border="surround" v-model="form.mobile" :customStyle="inputCss"></up-input>
       </view>
       <view class="register_info_item">
-        <up-input
-          placeholder="请输入验证码"
-          border="surround"
-          v-model="form.smsCode"
-          :customStyle="inputCss"
-        >
+        <up-input placeholder="请输入验证码" border="surround" v-model="form.smsCode" :customStyle="inputCss">
           <template #suffix style="margin-right: 10rpx">
             <view v-if="countdown" class="code-warp">
-              <up-count-down
-                :time="60 * 1000"
-                format="ss"
-                @finish="countdown = false"
-              ></up-count-down>
+              <up-count-down :time="60 * 1000" format="ss" @finish="countdown = false"></up-count-down>
               <text style="margin-left: 10rpx">s</text>
             </view>
             <view v-else @click="getMobileCode" class="code_msg">
               获取验证码
-                <qiaobao-assistant page-key="pages/login_package/bind-phone/bind-phone" title="账户登录" />
-</view>
+              <qiaobao-assistant page-key="pages/login_package/bind-phone/bind-phone" title="账户登录" />
+            </view>
           </template>
         </up-input>
       </view>
     </view>
 
-    <view
-      class="login_comm_but login_comm_but_yes"
-      @click="submit"
-      :loading="butLoading"
-    >
+    <view class="login_comm_but login_comm_but_yes" @click="submit" :loading="butLoading">
       登录
     </view>
 
-      <view class="policy_warp">
-      <up-checkbox
-        name="isCheck"
-        usedAlone
-        v-model:checked="isPolicy"
-        shape="circle"
-        activeColor="#7934F6"
-        size="19"
-        iconSize="18"
-      >
+    <view class="policy_warp">
+      <up-checkbox name="isCheck" usedAlone v-model:checked="isPolicy" shape="circle" activeColor="#7934F6" size="19"
+        iconSize="18">
         <template #label>
           <text @click="aa">已阅读并同意</text>
-          <text class="policy_a_warp" @click="jumpUserAgreement"
-            >《服务协议》</text
-          >
+          <text class="policy_a_warp" @click="jumpUserAgreement">《服务协议》</text>
           <text>、</text>
-          <text class="policy_a_warp" @click="jumpPrivacyAgreement"
-            >《隐私政策》</text
-          >
+          <text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
           <text>、</text>
-          <text class="policy_a_warp" @click="jumpProductAgreement"
-            >《售后保障协议》</text
-          >
+          <text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
         </template>
       </up-checkbox>
     </view>
 
     <up-toast ref="uToastRef"></up-toast>
-		<u-modal :show="tipsShow" title="提示" showCancelButton @cancel="onCancel" @confirm="onConfirm">
+    <u-modal :show="tipsShow" title="提示" showCancelButton @cancel="onCancel" @confirm="onConfirm">
       <view class="slot-content">
-				我已阅读并同意
-				<text style="color: #007AFF;">用户协议</text>和<text style="color: #007AFF;">隐私政策</text>
-			</view>
+        我已阅读并同意
+        <text style="color: #007AFF;">用户协议</text>和<text style="color: #007AFF;">隐私政策</text>
+      </view>
     </u-modal>
   </view>
 </template>
@@ -96,7 +59,7 @@
 <script>
 import { SMS_TYPE } from "@/utils/enumUtils.js";
 import { getUserList } from "@/api/common.js";
-import { wechatLogin, alipayLogin } from "@/api/auth.js";
+import { wechatLogin, alipayLogin, appleLogin } from "@/api/auth.js";
 import {
   setStorageFun,
   TOKEN_NAME,
@@ -123,7 +86,7 @@ export default {
       countdown: false, // 清空倒计时
       butLoading: false,
       disabled: false,
-      type: 1, //1.微信 2.支付宝
+      type: 1, //1.微信 2.支付宝,3.apple
       tipsShow: false,
       content: '确认绑定手机号吗？',
       isPolicy: false,
@@ -136,25 +99,25 @@ export default {
     console.log("-----1", option, this.form.token, this.type);
   },
   methods: {
-    submit(){
-      if(!this.isPolicy){
+    submit() {
+      if (!this.isPolicy) {
         this.tipsShow = true;
       }
     },
-    onCancel(){
-			this.tipsShow = false;
-		},
-		onConfirm(){
-			this.tipsShow = false;
+    onCancel() {
+      this.tipsShow = false;
+    },
+    onConfirm() {
+      this.tipsShow = false;
       this.isPolicy = true;
       this.registerFun();
-		},
+    },
     jumpMine() {
       uni.reLaunch({
         url: "/pages/login_package/login/login",
       });
     },
-     // 用户协议
+    // 用户协议
     jumpUserAgreement() {
       uni.navigateTo({
         url: "/pages/mine_package/mine_user_agreement/mine_user_agreement?backPath=login",
@@ -166,7 +129,7 @@ export default {
         url: "/pages/mine_package/mine_privacy_agreement/mine_privacy_agreement?backPath=login",
       });
     },
- // 售后保障协议
+    // 售后保障协议
     jumpProductAgreement() {
       uni.navigateTo({
         url: "/pages/mine_package/mine_product_agreement/mine_product_agreement?backPath=login",
@@ -197,7 +160,7 @@ export default {
         token: form.token,
       };
       const response =
-        this.type == 1 ? await wechatLogin(params) : await alipayLogin(params);
+        this.type == 1 ? await wechatLogin(params) : this.type == 2 ? await alipayLogin(params) : await appleLogin(params);
       console.log("微信登录接口返回:", params, response);
       if (response && response.bizcode === 100) {
         const data = response.data;
@@ -257,7 +220,7 @@ export default {
 
       const params = {
         mobile: form.mobile,
-        type: this.type == 1 ? SMS_TYPE.WECHAT : SMS_TYPE.ALIPAY,
+        type: this.type == 1 ? SMS_TYPE.WECHAT : this.type == 2 ? SMS_TYPE.ALIPAY : SMS_TYPE.APPLE,
       };
       const response = await getUserList(params);
       if (response && response.bizcode === 100) {
@@ -278,6 +241,7 @@ export default {
   display: flex;
   align-items: center;
   padding: calc(24rpx + env(safe-area-inset-bottom)) 30rpx 0 30rpx;
+
   .title_ {
     font-weight: bold;
     font-size: 36rpx;
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 5e8f0d4..1387b88 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -13,8 +13,8 @@
       <view class="login_info_item">
         <up-input placeholder="请输入手机号/账户名称" border="surround" v-model="form.name" :customStyle="inputCss"
           :adjust-position="false" @change="checkNameParam"></up-input>
-          <qiaobao-assistant page-key="pages/login_package/login/login" title="账户登录" />
-</view>
+        <qiaobao-assistant page-key="pages/login_package/login/login" title="账户登录" />
+      </view>
       <!-- 密码登录 -->
       <view class="login_info_item" v-if="loginWay === 'password'">
         <up-input placeholder="请输入密码" border="surround" v-model="form.password" :customStyle="inputCss"
@@ -81,7 +81,7 @@
         <view class="login_other_item" @click="wechatOneLogin(1)">
           <up-image src="/pages/login_package/static/login/WXICON.png" width="44" height="44"
             bgColor="#f1f6ff00"></up-image>
-          微信登录11
+          微信登录
         </view>
       </view>
       <view class="login_other_icon">
@@ -524,57 +524,75 @@ export default {
       }
 
       // #ifdef APP-PLUS
-      uni.login({
-        provider: 'apple',
-        success: async (loginRes) => {
-          console.log('Apple 登录成功:', loginRes);
-          const authResult = loginRes.authResult || {};
-          const params = {
-            identityToken: authResult.identityToken,
-            openId: authResult.user,
-            fullName: authResult.fullName ? `${authResult.fullName.familyName || ''}${authResult.fullName.givenName || ''}` : '',
-            authorizationCode: authResult.authorizationCode
-          };
-
-          try {
-            const response = await appleLogin(params);
-            if (response && response.bizcode === 100) {
-              if (response.data && response.data.userId) {
-                this.loginWay = "apple";
-                this.loginFun(response);
-              } else {
-                uni.navigateTo({
-                  url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=3`,
-                });
-              }
-            } else {
-              this.$refs.uToastRef.show({
-                type: "error",
-                message: response?.msg || "Apple登录失败",
-              });
-            }
-          } catch (error) {
-            console.error("Apple登录异常:", error);
+      uni.getProvider({
+        service: 'oauth',
+        success: (provRes) => {
+          if (!provRes.provider || !provRes.provider.includes('apple')) {
+            this.loading = false;
             this.$refs.uToastRef.show({
               type: "error",
-              message: "Apple登录异常，请重试",
+              message: "当前运行环境或自定义基座未支持 Apple 登录",
             });
-          } finally {
-            this.loading = false;
+            return;
           }
-        },
-        fail: (err) => {
-          this.loading = false;
-          console.error('Apple登录授权失败:', err);
-          this.$refs.uToastRef.show({
-            type: "error",
-            message: "Apple登录授权失败",
+          uni.login({
+            provider: 'apple',
+            success: async (loginRes) => {
+              console.log('Apple 登录成功:', loginRes);
+              const authResult = loginRes.appleInfo || {};
+              const params = {
+                identityToken: authResult.identityToken,
+                // openId: authResult.user,
+                // fullName: authResult.fullName ? `${authResult.fullName.familyName || ''}${authResult.fullName.givenName || ''}` : '',
+                // authorizationCode: authResult.authorizationCode
+              };
+
+              console.log("Apple 登录成功-0:", params)
+              try {
+                const response = await appleLogin(params);
+                console.log("Apple 登录成功-1:", response)
+                if (response && response.bizcode === 100) {
+
+                  if (response.data && response.data.userId) {
+                    this.loginWay = "apple";
+                    this.loginFun(response);
+                  } else {
+                    uni.navigateTo({
+                      url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=3`,
+                    });
+                  }
+                } else {
+                  console.log("Apple 登录成功-2:", response)
+                  this.$refs.uToastRef.show({
+                    type: "error",
+                    message: response?.msg || "Apple登录失败",
+                  });
+                }
+              } catch (error) {
+                console.error("Apple登录异常:", error);
+                this.$refs.uToastRef.show({
+                  type: "error",
+                  message: "Apple登录异常，请重试",
+                });
+              } finally {
+                this.loading = false;
+              }
+            },
+            fail: (err) => {
+              this.loading = false;
+              console.error('Apple登录授权失败:', err);
+              this.$refs.uToastRef.show({
+                type: "error",
+                message: "Apple登录授权失败",
+              });
+            }
           });
-        }
-      });
-      // #endif
-    },
+          // #endif
+        },
+      })
+    }
   },
+
   computed: {
     isIOS() {
       // #ifdef APP-PLUS
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index c570613..94a31fb 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -99,7 +99,7 @@
               <view>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
             </view> -->
             <view class="collect_msg" v-if="item.buyDeductionValue">共{{ item.buyNum }}件,合计数字积分{{ item.buyDeductionValue
-              }}
+            }}
               +￥{{ item.sumAmount }}</view>
             <view class="collect_msg" v-if="!item.buyDeductionValue">运费:￥{{ item.postage }},商品总价:￥{{ item.sumAmount }}
             </view>
@@ -296,8 +296,8 @@
 
     <u-modal class="sure_pay" :show="surePayShow" title="提示" showCancelButton @cancel="surePayShow = false"
       @confirm="cancelPay" confirmColor="#7934F6" content="确定取消支付吗？"></u-modal>
-      <qiaobao-assistant page-key="pages/mine_package/mine_order/mine_order" title="我的订单" />
-</view>
+    <qiaobao-assistant page-key="pages/mine_package/mine_order/mine_order" title="我的订单" />
+  </view>
 </template>
 
 <script>
@@ -538,11 +538,11 @@ export default {
           if (this.$refs.uToastRef) {
             this.$refs.uToastRef.show({
               type: 'success',
-              message: '地址修改成功'
+              message: '申请修改地址已提交，请等待'
             });
           } else {
             uni.showToast({
-              title: '地址修改成功',
+              title: '申请修改地址已提交，请等待',
               icon: 'success'
             });
           }
diff --git a/pages/mine_package/mine_order_info/mine_order_info.vue b/pages/mine_package/mine_order_info/mine_order_info.vue
index 25b4a70..e0a7616 100644
--- a/pages/mine_package/mine_order_info/mine_order_info.vue
+++ b/pages/mine_package/mine_order_info/mine_order_info.vue
@@ -1,736 +1,739 @@
-<template>
-	<view class="mine_order_info_warp">
-		<up-loading-page :loading="listLoading"></up-loading-page>
-		<view class="order_info_header">
-			<up-image src="/static/common/left_b.png" width="20" height="19" bgColor="#f1f6ff00"
-				@click="jumpLeft"></up-image>
-			<view class="header_status">
-				<view style="margin-top: 10rpx">
-					<up-image src="/pages/mine_package/static/order_status_1.png" width="20" height="19"
-						bgColor="#f1f6ff00"></up-image>
-				</view>
-				<text class="msg">{{ getValue(ORDER_STATUS, orderInfo.status) }}</text>
-			</view>
-		</view>
-		<view class="order_info_content">
-			<!-- 等待付款 -->
-			<view class="content_due" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
-				<view style="">
-					<text style="font-size: 28rpx; font-weight: bold">需付款：</text>
-					<text style="font-size: 28rpx">￥</text>
-					<text style="font-size: 36rpx; font-weight: bold">{{
-						orderInfo.sumAmount
-					}}</text>
-					<text style="font-size: 20rpx; font-weight: bold; margin-left: 20rpx">订单</text>
-					<text style="font-size: 28rpx; font-weight: bold; margin-left: 10rpx">{{
-						formatDate1(orderInfo.expireTime) }}</text>
-					<text style="font-size: 20rpx; font-weight: bold">&nbsp;自动取消</text>
-				</view>
-			</view>
-			<view class="content_cancel" v-if="orderInfo.status === ORDER_TYPE.CANCELED">取消原因：超时未支付</view>
-			<!-- 地址 -->
-			<view class="steps_warp">
-				<!-- 物流单号 -->
-				<view class="address_info">
-					<view class="address_data_warp">
-						<up-image src="/pages/rwa_package/static/waybill.png" width="20" height="20"
-							bgColor="#f1f6ff00"></up-image>
-						<view class="address_info_name">订单编号：</view>
-						<view class="address_info_mobile" style="margin-right: 20rpx">{{
-							orderInfo.orderNum
-						}}</view>
-						<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"
-							@click="copyData(orderInfo.orderNum)"></up-image>
-					</view>
-				</view>
-				<view class="address_info_right">&nbsp;</view>
-				<!-- 收货地址 -->
-				<view class="address_warp">
-					<view class="address_info">
-						<view class="address_data_warp">
-							<up-image src="/static/common/address.png" width="20" height="20"
-								bgColor="#f1f6ff00"></up-image>
-							<view class="address_info_name">{{ orderInfo.name }}</view>
-							<view class="address_info_mobile">{{ orderInfo.phone }}</view>
-						</view>
-						<view class="address_but">{{ getValue(LOGISTICS_STATUS_UPDATE,
-							orderInfo.modifyShippingAddressStatus) }}</view>
-					</view>
-					<view class="address_content">
-						{{ assembleAddress(orderInfo).names }} {{ orderInfo.address }}
-					</view>
-				</view>
-			</view>
-
-			<!-- 产品 -->
-			<view class="order_comm order_product_warp">
-				<!-- 头部 -->
-				<view class="order_product_header">
-					<up-image :src="orderInfo.shopLogo" width="22" height="22" bgColor="#f1f6ff00"
-						shape="circle"></up-image>
-					<view class="order_product_title">{{ orderInfo.shopName }}</view>
-				</view>
-				<!-- 产品详情 -->
-				<view class="order_item_content">
-					<view v-for="pItem in orderInfo.items" :key="pItem.id">
-						<view class="content_item">
-							<up-image :src="pItem.mainGraph" width="80" height="80" bgColor="#f1f6ff00"></up-image>
-							<view class="content_info">
-								<view class="content_info_title">{{ pItem.title }}</view>
-								<view class="content_info_tag">{{ pItem.goodsSpece }}</view>
-								<view>
-									<text class="content_info_description" v-for="dItem in pItem.description"
-										:key="dItem">
-										{{ dItem }}
-									</text>
-								</view>
-							</view>
-							<view class="content_right">
-								<view class="content_right_total">￥{{ pItem.goodsAmount }}</view>
-								<view class="content_right_quantity">x{{ pItem.buyNum }}</view>
-							</view>
-						</view>
-						<view class="content_other_item">
-							<view class="data_item data_item_yd" v-if="pItem.expressNo">
-								<view class="item_title">运单号：</view>
-								<view class="item_value">
-									<view>{{ pItem.expressNo }} </view>
-									<view style="margin-left: 10rpx">
-										<up-image src="/static/common/copy.png" width="14" height="14"
-											bgColor="#f1f6ff00" @click="copyData(pItem.expressNo)"></up-image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<!-- 金额等数据汇总 -->
-			<view class="order_comm order_data_warp">
-				<view class="data_item">
-					<view class="item_title">商品总价</view>
-					<view class="item_value">￥{{ orderInfo.sumAmount }}</view>
-				</view>
-				<view class="data_item">
-					<view class="item_title">快递运费</view>
-					<view class="item_value">￥{{ orderInfo.postage }}</view>
-				</view>
-				<view class="data_item">
-					<view class="item_title">平台优惠<text class="copy_order_coupon" v-if="orderInfo.coupon">优惠券</text>
-					</view>
-					<view class="item_value">-￥0.00</view>
-				</view>
-				<view class="data_item">
-					<view class="item_title">应付款</view>
-					<view class="item_value pay_amount">￥{{ orderInfo.sumAmount + orderInfo.postage }}</view>
-				</view>
-				<view class="order_data_but"></view>
-
-				<view class="data_item">
-					<view class="item_title">买家留言</view>
-					<view class="item_value">{{ orderInfo.remark }}</view>
-				</view>
-				<view class="data_item">
-					<view class="item_title">配送方式</view>
-					<view class="item_value">普通快递</view>
-				</view>
-				<!-- <view class="data_item">
-					<view class="item_title">支付方式</view>
-					<view class="item_value">微信支付</view>
-				</view> -->
-				<view class="data_item">
-					<view class="item_title">下单时间</view>
-					<view class="item_value">{{ formatDate(orderInfo.ctdate) }}</view>
-				</view>
-			</view>
-
-			<view class="code_content" v-if="orderInfo.antChainHash">
-				<view>
-					<view style="font-size: 28rpx; color: #333; font-weight: bold">您的订单已接入蚂蚁链溯源</view>
-					<view style="font-size: 20rpx; color: #999; margin-bottom: 18rpx">扫描二维码或复制下方链接查看溯源信息</view>
-					<view class="code_content_item">
-						<view class="code_content_item_text">
-							{{
-								`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`
-							}}
-						</view>
-						<up-image style="margin-left: 8rpx" src="/pages/rwa_package/static/rwa/copy.png" width="12"
-							@click="
-								copyData(
-									`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`
-								)
-								" height="12" bgColor="#f1f6ff00"></up-image>
-					</view>
-				</view>
-				<view @click.native="
-					previewQrcode(
-						`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`
-					)
-					">
-					<up-qrcode
-						:val="`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`"
-						:size="63"></up-qrcode>
-				</view>
-			</view>
-			<!-- 支付方式 -->
-
-			<view class="order_way_warp" @click="wayShowFun(true)" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
-				<view>支付方式</view>
-				<view class="order_way_right">
-					{{ getValue(wayOption, wayForm.payway) }}
-					<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-				</view>
-			</view>
-		</view>
-		<view class="collect_operate order_but_warp" v-if="
-			[ORDER_TYPE.UNPAID, ORDER_TYPE.NOT_RECEIVE].includes(orderInfo.status)
-		">
-			<!-- <view class="operate_comm operate_but_1"  v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">取消订单</view> -->
-			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.UNPAID" @click="goPay">去付款
-			</view>
-			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
-			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.NOT_RECEIVE"
-				@click="confirmReceiptOk(orderInfo)">确认收货</view>
-			<!-- <view class="operate_comm operate_but_3" v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
-			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请售后</view> -->
-			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
-			<!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(orderInfo.status)">删除记录</view> -->
-			<!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(orderInfo.status)">再次购买</view> -->
-		</view>
-
-		<!-- 选择支付方式 -->
-		<up-popup v-model:show="wayShow" :round="10" :closeOnClickOverlay="false" :closeable="true"
-			:safeAreaInsetBottom="false">
-			<view class="way_popup_warp">
-				<view class="way_popup_title">支付方式</view>
-				<up-radio-group v-model="wayForm.payway" placement="column">
-					<view v-for="item in wayOption" :key="item.id" style="margin-bottom: 10rpx">
-						<view class="way_item">
-							<view class="way_item_">
-								<!-- <view style="margin-top: 2rpx;"><up-image :src="item.path" width="20" height="20" bgColor="#f1f6ff00"></up-image></view> -->
-								<view class="way_item_val">{{ item.name
-								}}<text v-if="item.balance">&nbsp;&nbsp;(￥{{ item.balance }})</text>
-								</view>
-							</view>
-							<up-radio :name="item.type" activeColor="#FF7C41"> </up-radio>
-						</view>
-						<view class="balance_comm_msg" v-if="item.type === 'balance' && isShowBalance">
-							当前现金余额不足，如需支付请前往充值</view>
-					</view>
-				</up-radio-group>
-				<view class="popup_but" @click="wayShow = false"> 确认 </view>
-			</view>
-		</up-popup>
-		<up-toast ref="uToastRef"></up-toast>
-		<QrcodePreview ref="qrcodePreviewRef" :qrcodeVal="qrcodeVal" />
+<template>
+	<view class="mine_order_info_warp">
+		<up-loading-page :loading="listLoading"></up-loading-page>
+		<view class="order_info_header">
+			<up-image src="/static/common/left_b.png" width="20" height="19" bgColor="#f1f6ff00"
+				@click="jumpLeft"></up-image>
+			<view class="header_status">
+				<view style="margin-top: 10rpx">
+					<up-image src="/pages/mine_package/static/order_status_1.png" width="20" height="19"
+						bgColor="#f1f6ff00"></up-image>
+				</view>
+				<text class="msg">{{ getValue(ORDER_STATUS, orderInfo.status) }}</text>
+			</view>
+		</view>
+		<view class="order_info_content">
+			<!-- 等待付款 -->
+			<view class="content_due" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
+				<view style="">
+					<text style="font-size: 28rpx; font-weight: bold">需付款：</text>
+					<text style="font-size: 28rpx">￥</text>
+					<text style="font-size: 36rpx; font-weight: bold">{{
+						orderInfo.sumAmount
+					}}</text>
+					<text style="font-size: 20rpx; font-weight: bold; margin-left: 20rpx">订单</text>
+					<text style="font-size: 28rpx; font-weight: bold; margin-left: 10rpx">{{
+						formatDate1(orderInfo.expireTime) }}</text>
+					<text style="font-size: 20rpx; font-weight: bold">&nbsp;自动取消</text>
+				</view>
+			</view>
+			<view class="content_cancel" v-if="orderInfo.status === ORDER_TYPE.CANCELED">取消原因：超时未支付</view>
+			<!-- 地址 -->
+			<view class="steps_warp">
+				<!-- 物流单号 -->
+				<view class="address_info">
+					<view class="address_data_warp">
+						<up-image src="/pages/rwa_package/static/waybill.png" width="20" height="20"
+							bgColor="#f1f6ff00"></up-image>
+						<view class="address_info_name">订单编号：</view>
+						<view class="address_info_mobile" style="margin-right: 20rpx">{{
+							orderInfo.orderNum
+						}}</view>
+						<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"
+							@click="copyData(orderInfo.orderNum)"></up-image>
+					</view>
+				</view>
+				<view class="address_info_right">&nbsp;</view>
+				<!-- 收货地址 -->
+				<view class="address_warp">
+					<view class="address_info">
+						<view class="address_data_warp">
+							<up-image src="/static/common/address.png" width="20" height="20"
+								bgColor="#f1f6ff00"></up-image>
+							<view class="address_info_name">{{ orderInfo.name }}</view>
+							<view class="address_info_mobile">{{ orderInfo.phone }}</view>
+						</view>
+						<view class="address_but" :class="{ 'is-rejected': orderInfo.modifyShippingAddressStatus === 3 || getValue(LOGISTICS_STATUS_UPDATE, orderInfo.modifyShippingAddressStatus) === '审核驳回' }">{{ getValue(LOGISTICS_STATUS_UPDATE, orderInfo.modifyShippingAddressStatus) }}</view>
+					</view>
+					<view class="address_content">
+						{{ assembleAddress(orderInfo).names }} {{ orderInfo.address }}
+					</view>
+				</view>
+			</view>
+
+			<!-- 产品 -->
+			<view class="order_comm order_product_warp">
+				<!-- 头部 -->
+				<view class="order_product_header">
+					<up-image :src="orderInfo.shopLogo" width="22" height="22" bgColor="#f1f6ff00"
+						shape="circle"></up-image>
+					<view class="order_product_title">{{ orderInfo.shopName }}</view>
+				</view>
+				<!-- 产品详情 -->
+				<view class="order_item_content">
+					<view v-for="pItem in orderInfo.items" :key="pItem.id">
+						<view class="content_item">
+							<up-image :src="pItem.mainGraph" width="80" height="80" bgColor="#f1f6ff00"></up-image>
+							<view class="content_info">
+								<view class="content_info_title">{{ pItem.title }}</view>
+								<view class="content_info_tag">{{ pItem.goodsSpece }}</view>
+								<view>
+									<text class="content_info_description" v-for="dItem in pItem.description"
+										:key="dItem">
+										{{ dItem }}
+									</text>
+								</view>
+							</view>
+							<view class="content_right">
+								<view class="content_right_total">￥{{ pItem.goodsAmount }}</view>
+								<view class="content_right_quantity">x{{ pItem.buyNum }}</view>
+							</view>
+						</view>
+						<view class="content_other_item">
+							<view class="data_item data_item_yd" v-if="pItem.expressNo">
+								<view class="item_title">运单号：</view>
+								<view class="item_value">
+									<view>{{ pItem.expressNo }} </view>
+									<view style="margin-left: 10rpx">
+										<up-image src="/static/common/copy.png" width="14" height="14"
+											bgColor="#f1f6ff00" @click="copyData(pItem.expressNo)"></up-image>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 金额等数据汇总 -->
+			<view class="order_comm order_data_warp">
+				<view class="data_item">
+					<view class="item_title">商品总价</view>
+					<view class="item_value">￥{{ orderInfo.sumAmount }}</view>
+				</view>
+				<view class="data_item">
+					<view class="item_title">快递运费</view>
+					<view class="item_value">￥{{ orderInfo.postage }}</view>
+				</view>
+				<view class="data_item">
+					<view class="item_title">平台优惠<text class="copy_order_coupon" v-if="orderInfo.coupon">优惠券</text>
+					</view>
+					<view class="item_value">-￥0.00</view>
+				</view>
+				<view class="data_item">
+					<view class="item_title">应付款</view>
+					<view class="item_value pay_amount">￥{{ orderInfo.sumAmount + orderInfo.postage }}</view>
+				</view>
+				<view class="order_data_but"></view>
+
+				<view class="data_item">
+					<view class="item_title">买家留言</view>
+					<view class="item_value">{{ orderInfo.remark }}</view>
+				</view>
+				<view class="data_item">
+					<view class="item_title">配送方式</view>
+					<view class="item_value">普通快递</view>
+				</view>
+				<!-- <view class="data_item">
+					<view class="item_title">支付方式</view>
+					<view class="item_value">微信支付</view>
+				</view> -->
+				<view class="data_item">
+					<view class="item_title">下单时间</view>
+					<view class="item_value">{{ formatDate(orderInfo.ctdate) }}</view>
+				</view>
+			</view>
+
+			<view class="code_content" v-if="orderInfo.antChainHash">
+				<view>
+					<view style="font-size: 28rpx; color: #333; font-weight: bold">您的订单已接入蚂蚁链溯源</view>
+					<view style="font-size: 20rpx; color: #999; margin-bottom: 18rpx">扫描二维码或复制下方链接查看溯源信息</view>
+					<view class="code_content_item">
+						<view class="code_content_item_text">
+							{{
+								`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`
+							}}
+						</view>
+						<up-image style="margin-left: 8rpx" src="/pages/rwa_package/static/rwa/copy.png" width="12"
+							@click="
+								copyData(
+									`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`
+								)
+								" height="12" bgColor="#f1f6ff00"></up-image>
+					</view>
+				</view>
+				<view @click.native="
+					previewQrcode(
+						`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`
+					)
+					">
+					<up-qrcode
+						:val="`https://chaininsight.antdigital.com/search?unionId=2647&projectName=VBGAKNJB&content=${orderInfo.antChainHash}`"
+						:size="63"></up-qrcode>
+				</view>
+			</view>
+			<!-- 支付方式 -->
+
+			<view class="order_way_warp" @click="wayShowFun(true)" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
+				<view>支付方式</view>
+				<view class="order_way_right">
+					{{ getValue(wayOption, wayForm.payway) }}
+					<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
+				</view>
+			</view>
+		</view>
+		<view class="collect_operate order_but_warp" v-if="
+			[ORDER_TYPE.UNPAID, ORDER_TYPE.NOT_RECEIVE].includes(orderInfo.status)
+		">
+			<!-- <view class="operate_comm operate_but_1"  v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">取消订单</view> -->
+			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.UNPAID" @click="goPay">去付款
+			</view>
+			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
+			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.NOT_RECEIVE"
+				@click="confirmReceiptOk(orderInfo)">确认收货</view>
+			<!-- <view class="operate_comm operate_but_3" v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
+			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请售后</view> -->
+			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
+			<!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(orderInfo.status)">删除记录</view> -->
+			<!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(orderInfo.status)">再次购买</view> -->
+		</view>
+
+		<!-- 选择支付方式 -->
+		<up-popup v-model:show="wayShow" :round="10" :closeOnClickOverlay="false" :closeable="true"
+			:safeAreaInsetBottom="false">
+			<view class="way_popup_warp">
+				<view class="way_popup_title">支付方式</view>
+				<up-radio-group v-model="wayForm.payway" placement="column">
+					<view v-for="item in wayOption" :key="item.id" style="margin-bottom: 10rpx">
+						<view class="way_item">
+							<view class="way_item_">
+								<!-- <view style="margin-top: 2rpx;"><up-image :src="item.path" width="20" height="20" bgColor="#f1f6ff00"></up-image></view> -->
+								<view class="way_item_val">{{ item.name
+								}}<text v-if="item.balance">&nbsp;&nbsp;(￥{{ item.balance }})</text>
+								</view>
+							</view>
+							<up-radio :name="item.type" activeColor="#FF7C41"> </up-radio>
+						</view>
+						<view class="balance_comm_msg" v-if="item.type === 'balance' && isShowBalance">
+							当前现金余额不足，如需支付请前往充值</view>
+					</view>
+				</up-radio-group>
+				<view class="popup_but" @click="wayShow = false"> 确认 </view>
+			</view>
+		</up-popup>
+		<up-toast ref="uToastRef"></up-toast>
+		<QrcodePreview ref="qrcodePreviewRef" :qrcodeVal="qrcodeVal" />
 	    <qiaobao-assistant page-key="pages/mine_package/mine_order_info/mine_order_info" title="订单详情" />
-</view>
-</template>
-
-<script>
-import { ORDER_TYPE, ORDER_STATUS, getValue, LOGISTICS_STATUS_UPDATE } from "@/utils/enumUtils.js";
-import QrcodePreview from "@/components/qrcode-preview.vue";
-import {
-	copyData,
-	assembleAddress,
-	formatDate,
-	formatDate1,
-} from "@/utils/index.js";
-import {
-	getDetail,
-	payment,
-	getSupportPay,
-	confirmReceipt,
-} from "@/api/order.js";
-import {
-	appWxpayFun,
-	zfbPayFun,
-	jumpWayOk,
-	jumpWayError,
-} from "@/utils/payUtils.js";
-
-export default {
-	computed: {
-		ORDER_TYPE() {
-			return ORDER_TYPE;
-		},
-		ORDER_STATUS() {
-			return ORDER_STATUS;
-		},
-		ORDER_STATUS_CSS() {
-			return ORDER_STATUS_CSS;
-		},
-		LOGISTICS_STATUS_UPDATE() {
-			return LOGISTICS_STATUS_UPDATE
-		}
-	},
-	data() {
-		return {
-			id: 0,
-			orderInfo: {},
-			listLoading: false,
-			wayForm: {
-				id: 0,
-				payway: null, // 支付方式
-			},
-			wayShow: false,
-			wayOption: [], // 支付选项
-			height: "100vh",
-			isShowBalance: false,
-			qrcodeVal: '',
-		};
-	},
-	onLoad(options) {
-		const id = options.id;
-		this.id = id ? parseInt(id, 10) : 0;
-		this.getOrderInfo();
-		const payOpen = options.payOpen;
-		// 支付弹框
-		if (payOpen && payOpen !== "null") {
-			this.getWayOption();
-			this.wayShow = payOpen;
-		}
-	},
-	methods: {
-		getValue,
-		copyData,
-		assembleAddress,
-		formatDate,
-		formatDate1,
-		jumpLeft() {
-			const type = this.orderInfo.status + 1;
-			uni.navigateTo({
-				url:
-					"/pages/mine_package/mine_order/mine_order?type=" + type
-			});
-		},
-		wayShowFun(type) {
-			if (type) {
-				this.getWayOption();
-			}
-			this.wayShow = type;
-		},
-		async getWayOption() {
-			console.log("orderInfo", this.orderInfo);
-			let params = {
-				types: "1,2,3",
-			};
-			const result = await getSupportPay(params);
-			if (result && result.bizcode === 100) {
-				const data = result.data || [];
-				const amount = this.orderInfo.sumAmount;
-				let flag = data.some((item) =>
-					["wechat", "alipay"].includes(item.type)
-				);
-				// 没有支付宝和微信支付
-				if (flag) {
-					this.isShowBalance = false;
-				} else {
-					const balanceFlag = data.some(
-						(item) => item.type === "balance" && item.balance < amount
-					);
-					this.isShowBalance = balanceFlag;
-				}
-				this.wayOption = data;
-			}
-		},
-		// 查询订单详情
-		async getOrderInfo() {
-			this.listLoading = true;
-			const params = {
-				id: this.id,
-			};
-			const result = await getDetail(params);
-			if (result && result.bizcode === 100) {
-				const orderInfo = result.data;
-				this.orderInfo = orderInfo;
-				this.$nextTick(() => {
-					if (
-						[ORDER_TYPE.UNPAID, ORDER_TYPE.NOT_RECEIVE].includes(
-							orderInfo.status
-						)
-					) {
-						this.height = "calc(100vh - 180rpx)";
-					} else {
-						this.height = "100vh";
-					}
-
-				});
-			}
-
-			this.listLoading = false;
-		},
-		// 去支付
-		async goPay() {
-			const payway = this.wayForm.payway;
-			if (!payway || payway === 0) {
-				this.$refs.uToastRef.show({
-					type: "error",
-					message: "请先选择支付方式",
-				});
-				return;
-			}
-			const params = {
-				id: this.orderInfo.id,
-				payway,
-			};
-			const resp = await payment(params);
-			// 提交订单成功，就唤起支付
-			if (resp && resp.bizcode === 100) {
-				const item = resp.data;
-				if (item.status === 1) {
-					jumpWayOk();
-					return;
-				}
-				if (item.wechat && Object.keys(item.wechat).length !== 0) {
-					this.appWxpay(item.wechat, item.orderId, item.orderNum);
-				} else if (
-					item.alipay &&
-					Object.keys(item.alipay).length !== 0 &&
-					item.alipay
-				) {
-					this.zfbPay(item.alipay, item.orderId, item.orderNum);
-				} else {
-					this.$refs.uToastRef.show({
-						type: "error",
-						message: "订单支付失败",
-					});
-					setTimeout(() => {
-						jumpWayError();
-					}, 2000);
-				}
-			} else {
-				this.getOrderInfo();
-			}
-		},
-		// app 微信支付
-		async appWxpay(alipay, orderId, orderNum) {
-			try {
-				const result = await appWxpayFun(alipay, orderId, orderNum);
-				console.log("支付成功", result);
-				// 处理支付成功后的逻辑，如更新订单状态等
-			} catch (error) {
-				console.error("支付失败", error);
-				// 处理支付失败后的逻辑，如提示用户等
-			}
-		},
-		// 支付宝支付
-		async zfbPay(alipay, orderId, orderNum) {
-			try {
-				const result = await zfbPayFun(alipay, orderId, orderNum);
-				console.log("支付成功", result);
-				// 处理支付成功后的逻辑，如更新订单状态等
-			} catch (error) {
-				console.error("支付失败", error);
-				// 处理支付失败后的逻辑，如提示用户等
-			}
-		},
-		/**
-		 * 确认收货
-		 */
-		confirmReceiptOk(item) {
-			const then = this;
-			uni.showModal({
-				title: "提示",
-				content: "是否确认收货？",
-				success: function (res) {
-					if (res.confirm) {
-						then.confirmReceiptFun(item);
-					}
-				},
-			});
-		},
-		async confirmReceiptFun(item) {
-			const params = {
-				id: item.id,
-			};
-			const resp = await confirmReceipt(params);
-			if (resp && resp.bizcode === 100) {
-				this.orderList = [];
-				this.form.page = 1;
-				this.loadData();
-			}
-		},
-		/**
-		 * 去充值
-		 */
-		goRechargeFun(item) {
-			uni.navigateTo({
-				url:
-					"/pages/mine_package/mine_purse_recharge/mine_purse_recharge?category=balance&amount=" +
-					item.balance +
-					"&back=orderInfo&id=" +
-					this.id,
-			});
-		},
-		previewQrcode(val) {
-			console.log("val--", val);
-			this.qrcodeVal = val;
-			this.$refs.qrcodePreviewRef.open();
-		},
-	},
-
-	components: {
-		QrcodePreview,
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-.code_content {
-	display: flex;
-	background: #fff;
-	border-radius: 24rpx;
-	padding: 32rpx;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 48rpx;
-
-	.code_content_item {
-		font-size: 20rpx;
-		color: #7934f6;
-		display: flex;
-		align-items: center;
-
-		.code_content_item_text {
-			width: 350rpx;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			display: inline-block;
-			word-break: keep-all;
-		}
-	}
-}
-
-.mine_order_info_warp {
-	// height: 100vh;
-	height: calc(100vh - 180rpx);
-	background-color: $app-bj;
-	position: relative;
-	overflow-y: auto;
-}
-
-.order_info_header {
-	background-color: $app-bt-bj;
-	height: 288rpx;
-	display: flex;
-	padding: 100rpx 30rpx 30rpx;
-
-	.header_status {
-		width: 90%;
-		text-align: center;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 58rpx;
-		align-items: center;
-
-		.msg {
-			margin-left: 20rpx;
-			font-weight: bold;
-			font-size: 36rpx;
-			color: #ffffff;
-		}
-	}
-}
-
-.order_info_content {
-	position: absolute;
-	top: 184rpx;
-	width: calc(100% - 40rpx);
-	padding: 0 20rpx;
-
-	.content_due {
-		display: grid;
-		justify-content: center;
-		width: 100%;
-		color: #ffffff;
-
-		.payment_but {
-			display: flex;
-			justify-content: center;
-		}
-
-		.but {
-			background: #ffffff;
-			border-radius: 16rpx;
-			text-align: center;
-			width: 200rpx;
-			padding: 10rpx 0;
-			color: $app-bt-bj;
-			font-weight: bold;
-			font-size: 28rpx;
-			margin-top: 20rpx;
-		}
-	}
-
-	.content_cancel {
-		text-align: center;
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #ffffff;
-	}
-
-	.steps_warp {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 20rpx;
-		width: calc(100% - 40rpx);
-		margin-top: 66rpx;
-
-		.address_info_right {
-			border-left: 1rpx dashed #99999959;
-			height: 14rpx;
-			width: 10rpx;
-			margin: 10rpx 20rpx;
-		}
-
-		.address_warp {}
-
-		.address_info {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.address_data_warp {
-			font-weight: bold;
-			color: #1a1a1a;
-			display: flex;
-			align-items: center;
-		}
-
-		.address_info_name {
-			margin-left: 10rpx;
-			font-size: 28rpx;
-		}
-
-		.address_info_mobile {
-			margin-left: 10rpx;
-			font-size: 24rpx;
-		}
-
-		.address_but {
-			background-color: #b5b5b5;
-			border-radius: 8rpx;
-			font-size: 22rpx;
-			font-weight: 400;
-			color: #ffffff;
-			padding: 2rpx 16rpx;
-			white-space: nowrap;
-		}
-
-		.address_content {
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #666666;
-			padding: 20rpx 10rpx 20rpx 44rpx;
-		}
-	}
-}
-
-.order_comm {
-	background: #ffffff;
-	border-radius: 20rpx;
-	padding: 30rpx;
-	margin-top: 30rpx;
-	width: calc(100% - 60rpx);
-}
-
-.order_product_warp {
-	.order_product_header {
-		display: flex;
-		align-items: center;
-	}
-
-	.order_product_title {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #1a1a1a;
-		margin-left: 10rpx;
-	}
-}
-
-.order_data_warp {
-	margin-bottom: 20rpx;
-
-	.pay_amount {
-		color: $app-bt-bj;
-	}
-
-	.copy_order_number {
-		background: #f2f2f2;
-		border-radius: 18rpx;
-		font-weight: bold;
-		font-size: 22rpx;
-		color: #333333;
-		padding: 4rpx 14rpx;
-
-		margin-left: 10rpx;
-	}
-
-	.copy_order_coupon {
-		margin-left: 24rpx;
-		border-radius: 6rpx;
-		border: 1px solid $app-bt-bj;
-		padding: 4rpx 18rpx;
-		color: $app-bt-bj;
-	}
-
-	.order_data_but {
-		border: 1rpx solid #f6f6f6;
-	}
-}
-
-.order_but_warp {
-	position: fixed;
-	height: 140rpx;
-	bottom: 0;
-	background-color: #ffffff;
-	right: 14rpx;
-	width: calc(100% - 40rpx);
-	background-color: #ffffff;
-	padding: 20rpx;
-
-	.operate_comm {
-		height: 34rpx;
-	}
-}
-
-.content_other_item {
-	margin-top: 20rpx;
-}
-
-.data_item {
-	display: flex;
-	justify-content: space-between;
-	line-height: 60rpx;
-	font-weight: bold;
-	font-size: 24rpx;
-}
-
-.item_title {
-	color: #808080;
-}
-
-.item_value {
-	color: #1a1a1a;
-	display: flex;
-}
-
-.order_way_warp {
-	margin-bottom: 60rpx;
-	width: calc(100% - 96rpx);
-}
-
-.content_info_title {
-	width: 370rpx;
-}
-
-.data_item_yd {
-	display: flex;
-	justify-content: left;
-}
+</view>
+</template>
+
+<script>
+import { ORDER_TYPE, ORDER_STATUS, getValue, LOGISTICS_STATUS_UPDATE } from "@/utils/enumUtils.js";
+import QrcodePreview from "@/components/qrcode-preview.vue";
+import {
+	copyData,
+	assembleAddress,
+	formatDate,
+	formatDate1,
+} from "@/utils/index.js";
+import {
+	getDetail,
+	payment,
+	getSupportPay,
+	confirmReceipt,
+} from "@/api/order.js";
+import {
+	appWxpayFun,
+	zfbPayFun,
+	jumpWayOk,
+	jumpWayError,
+} from "@/utils/payUtils.js";
+
+export default {
+	computed: {
+		ORDER_TYPE() {
+			return ORDER_TYPE;
+		},
+		ORDER_STATUS() {
+			return ORDER_STATUS;
+		},
+		ORDER_STATUS_CSS() {
+			return ORDER_STATUS_CSS;
+		},
+		LOGISTICS_STATUS_UPDATE() {
+			return LOGISTICS_STATUS_UPDATE
+		}
+	},
+	data() {
+		return {
+			id: 0,
+			orderInfo: {},
+			listLoading: false,
+			wayForm: {
+				id: 0,
+				payway: null, // 支付方式
+			},
+			wayShow: false,
+			wayOption: [], // 支付选项
+			height: "100vh",
+			isShowBalance: false,
+			qrcodeVal: '',
+		};
+	},
+	onLoad(options) {
+		const id = options.id;
+		this.id = id ? parseInt(id, 10) : 0;
+		this.getOrderInfo();
+		const payOpen = options.payOpen;
+		// 支付弹框
+		if (payOpen && payOpen !== "null") {
+			this.getWayOption();
+			this.wayShow = payOpen;
+		}
+	},
+	methods: {
+		getValue,
+		copyData,
+		assembleAddress,
+		formatDate,
+		formatDate1,
+		jumpLeft() {
+			const type = this.orderInfo.status + 1;
+			uni.navigateTo({
+				url:
+					"/pages/mine_package/mine_order/mine_order?type=" + type
+			});
+		},
+		wayShowFun(type) {
+			if (type) {
+				this.getWayOption();
+			}
+			this.wayShow = type;
+		},
+		async getWayOption() {
+			console.log("orderInfo", this.orderInfo);
+			let params = {
+				types: "1,2,3",
+			};
+			const result = await getSupportPay(params);
+			if (result && result.bizcode === 100) {
+				const data = result.data || [];
+				const amount = this.orderInfo.sumAmount;
+				let flag = data.some((item) =>
+					["wechat", "alipay"].includes(item.type)
+				);
+				// 没有支付宝和微信支付
+				if (flag) {
+					this.isShowBalance = false;
+				} else {
+					const balanceFlag = data.some(
+						(item) => item.type === "balance" && item.balance < amount
+					);
+					this.isShowBalance = balanceFlag;
+				}
+				this.wayOption = data;
+			}
+		},
+		// 查询订单详情
+		async getOrderInfo() {
+			this.listLoading = true;
+			const params = {
+				id: this.id,
+			};
+			const result = await getDetail(params);
+			if (result && result.bizcode === 100) {
+				const orderInfo = result.data;
+				this.orderInfo = orderInfo;
+				this.$nextTick(() => {
+					if (
+						[ORDER_TYPE.UNPAID, ORDER_TYPE.NOT_RECEIVE].includes(
+							orderInfo.status
+						)
+					) {
+						this.height = "calc(100vh - 180rpx)";
+					} else {
+						this.height = "100vh";
+					}
+
+				});
+			}
+
+			this.listLoading = false;
+		},
+		// 去支付
+		async goPay() {
+			const payway = this.wayForm.payway;
+			if (!payway || payway === 0) {
+				this.$refs.uToastRef.show({
+					type: "error",
+					message: "请先选择支付方式",
+				});
+				return;
+			}
+			const params = {
+				id: this.orderInfo.id,
+				payway,
+			};
+			const resp = await payment(params);
+			// 提交订单成功，就唤起支付
+			if (resp && resp.bizcode === 100) {
+				const item = resp.data;
+				if (item.status === 1) {
+					jumpWayOk();
+					return;
+				}
+				if (item.wechat && Object.keys(item.wechat).length !== 0) {
+					this.appWxpay(item.wechat, item.orderId, item.orderNum);
+				} else if (
+					item.alipay &&
+					Object.keys(item.alipay).length !== 0 &&
+					item.alipay
+				) {
+					this.zfbPay(item.alipay, item.orderId, item.orderNum);
+				} else {
+					this.$refs.uToastRef.show({
+						type: "error",
+						message: "订单支付失败",
+					});
+					setTimeout(() => {
+						jumpWayError();
+					}, 2000);
+				}
+			} else {
+				this.getOrderInfo();
+			}
+		},
+		// app 微信支付
+		async appWxpay(alipay, orderId, orderNum) {
+			try {
+				const result = await appWxpayFun(alipay, orderId, orderNum);
+				console.log("支付成功", result);
+				// 处理支付成功后的逻辑，如更新订单状态等
+			} catch (error) {
+				console.error("支付失败", error);
+				// 处理支付失败后的逻辑，如提示用户等
+			}
+		},
+		// 支付宝支付
+		async zfbPay(alipay, orderId, orderNum) {
+			try {
+				const result = await zfbPayFun(alipay, orderId, orderNum);
+				console.log("支付成功", result);
+				// 处理支付成功后的逻辑，如更新订单状态等
+			} catch (error) {
+				console.error("支付失败", error);
+				// 处理支付失败后的逻辑，如提示用户等
+			}
+		},
+		/**
+		 * 确认收货
+		 */
+		confirmReceiptOk(item) {
+			const then = this;
+			uni.showModal({
+				title: "提示",
+				content: "是否确认收货？",
+				success: function (res) {
+					if (res.confirm) {
+						then.confirmReceiptFun(item);
+					}
+				},
+			});
+		},
+		async confirmReceiptFun(item) {
+			const params = {
+				id: item.id,
+			};
+			const resp = await confirmReceipt(params);
+			if (resp && resp.bizcode === 100) {
+				this.orderList = [];
+				this.form.page = 1;
+				this.loadData();
+			}
+		},
+		/**
+		 * 去充值
+		 */
+		goRechargeFun(item) {
+			uni.navigateTo({
+				url:
+					"/pages/mine_package/mine_purse_recharge/mine_purse_recharge?category=balance&amount=" +
+					item.balance +
+					"&back=orderInfo&id=" +
+					this.id,
+			});
+		},
+		previewQrcode(val) {
+			console.log("val--", val);
+			this.qrcodeVal = val;
+			this.$refs.qrcodePreviewRef.open();
+		},
+	},
+
+	components: {
+		QrcodePreview,
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.code_content {
+	display: flex;
+	background: #fff;
+	border-radius: 24rpx;
+	padding: 32rpx;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 48rpx;
+
+	.code_content_item {
+		font-size: 20rpx;
+		color: #7934f6;
+		display: flex;
+		align-items: center;
+
+		.code_content_item_text {
+			width: 350rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			display: inline-block;
+			word-break: keep-all;
+		}
+	}
+}
+
+.mine_order_info_warp {
+	// height: 100vh;
+	height: calc(100vh - 180rpx);
+	background-color: $app-bj;
+	position: relative;
+	overflow-y: auto;
+}
+
+.order_info_header {
+	background-color: $app-bt-bj;
+	height: 288rpx;
+	display: flex;
+	padding: 100rpx 30rpx 30rpx;
+
+	.header_status {
+		width: 90%;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 58rpx;
+		align-items: center;
+
+		.msg {
+			margin-left: 20rpx;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #ffffff;
+		}
+	}
+}
+
+.order_info_content {
+	position: absolute;
+	top: 184rpx;
+	width: calc(100% - 40rpx);
+	padding: 0 20rpx;
+
+	.content_due {
+		display: grid;
+		justify-content: center;
+		width: 100%;
+		color: #ffffff;
+
+		.payment_but {
+			display: flex;
+			justify-content: center;
+		}
+
+		.but {
+			background: #ffffff;
+			border-radius: 16rpx;
+			text-align: center;
+			width: 200rpx;
+			padding: 10rpx 0;
+			color: $app-bt-bj;
+			font-weight: bold;
+			font-size: 28rpx;
+			margin-top: 20rpx;
+		}
+	}
+
+	.content_cancel {
+		text-align: center;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #ffffff;
+	}
+
+	.steps_warp {
+		background: #ffffff;
+		border-radius: 24rpx;
+		padding: 20rpx;
+		width: calc(100% - 40rpx);
+		margin-top: 66rpx;
+
+		.address_info_right {
+			border-left: 1rpx dashed #99999959;
+			height: 14rpx;
+			width: 10rpx;
+			margin: 10rpx 20rpx;
+		}
+
+		.address_warp {}
+
+		.address_info {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.address_data_warp {
+			font-weight: bold;
+			color: #1a1a1a;
+			display: flex;
+			align-items: center;
+		}
+
+		.address_info_name {
+			margin-left: 10rpx;
+			font-size: 28rpx;
+		}
+
+		.address_info_mobile {
+			margin-left: 10rpx;
+			font-size: 24rpx;
+		}
+
+		.address_but {
+			background-color: #b5b5b5;
+			border-radius: 8rpx;
+			font-size: 22rpx;
+			font-weight: 400;
+			color: #ffffff;
+			padding: 2rpx 16rpx;
+			white-space: nowrap;
+
+			&.is-rejected {
+				background-color: #e54d42;
+			}
+		}
+
+		.address_content {
+			font-weight: 500;
+			font-size: 26rpx;
+			color: #666666;
+			padding: 20rpx 10rpx 20rpx 44rpx;
+		}
+	}
+}
+
+.order_comm {
+	background: #ffffff;
+	border-radius: 20rpx;
+	padding: 30rpx;
+	margin-top: 30rpx;
+	width: calc(100% - 60rpx);
+}
+
+.order_product_warp {
+	.order_product_header {
+		display: flex;
+		align-items: center;
+	}
+
+	.order_product_title {
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #1a1a1a;
+		margin-left: 10rpx;
+	}
+}
+
+.order_data_warp {
+	margin-bottom: 20rpx;
+
+	.pay_amount {
+		color: $app-bt-bj;
+	}
+
+	.copy_order_number {
+		background: #f2f2f2;
+		border-radius: 18rpx;
+		font-weight: bold;
+		font-size: 22rpx;
+		color: #333333;
+		padding: 4rpx 14rpx;
+
+		margin-left: 10rpx;
+	}
+
+	.copy_order_coupon {
+		margin-left: 24rpx;
+		border-radius: 6rpx;
+		border: 1px solid $app-bt-bj;
+		padding: 4rpx 18rpx;
+		color: $app-bt-bj;
+	}
+
+	.order_data_but {
+		border: 1rpx solid #f6f6f6;
+	}
+}
+
+.order_but_warp {
+	position: fixed;
+	height: 140rpx;
+	bottom: 0;
+	background-color: #ffffff;
+	right: 14rpx;
+	width: calc(100% - 40rpx);
+	background-color: #ffffff;
+	padding: 20rpx;
+
+	.operate_comm {
+		height: 34rpx;
+	}
+}
+
+.content_other_item {
+	margin-top: 20rpx;
+}
+
+.data_item {
+	display: flex;
+	justify-content: space-between;
+	line-height: 60rpx;
+	font-weight: bold;
+	font-size: 24rpx;
+}
+
+.item_title {
+	color: #808080;
+}
+
+.item_value {
+	color: #1a1a1a;
+	display: flex;
+}
+
+.order_way_warp {
+	margin-bottom: 60rpx;
+	width: calc(100% - 96rpx);
+}
+
+.content_info_title {
+	width: 370rpx;
+}
+
+.data_item_yd {
+	display: flex;
+	justify-content: left;
+}
 </style>
\ No newline at end of file
diff --git a/utils/enumUtils.js b/utils/enumUtils.js
index d264c4a..7297d9c 100644
--- a/utils/enumUtils.js
+++ b/utils/enumUtils.js
@@ -24,7 +24,8 @@ export const SMS_TYPE = {
 	"LOGIN": "login",
 	"REGISTER": "register",
 	"WECHAT": "wechatValid",
-	"ALIPAY": "alipayValid"
+	"ALIPAY": "alipayValid",
+	"APPLE": "appleValid"
 }
 
 // 图片类型 图片分类：COMMON-公共,CATEGORY-商品类目图标,BRAND-品牌LOGO,SHOP-店铺LOGO,GOODS-商品图片,SPECS-商品规格图片