From 519af9e7ef7fd66883576f291ccb450d7cbf7d64 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Tue, 28 Feb 2023 17:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001400):=20=E3=80=90?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E5=95=86=E5=9F=8E=E3=80=91-=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD{=E5=89=AA=E6=A0=B7=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85}=EF=BC=9A=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【内部商城】&#45;功能{剪样订单详情}：未显示取消订单按钮】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001400
---
 project.private.config.json                           | 7 +++++++
 src/pages/sampleCutting/sampleCuttingDetail/index.tsx | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/project.private.config.json b/project.private.config.json
index 6eca9dd..61eebd9 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -79,6 +79,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/sampleCutting/sampleCuttingDetail/index",
+          "query": "id=45",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
diff --git a/src/pages/sampleCutting/sampleCuttingDetail/index.tsx b/src/pages/sampleCutting/sampleCuttingDetail/index.tsx
index 77e3503..6e2307e 100644
--- a/src/pages/sampleCutting/sampleCuttingDetail/index.tsx
+++ b/src/pages/sampleCutting/sampleCuttingDetail/index.tsx
@@ -99,7 +99,7 @@ const SampleCuttingDetail = () => {
         <View className={styles.orderProcess}>订单进程</View>
         <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
         <View className={styles.orderProcessBottom}>
-          <Steps current={order.order_form?.[0].order_status === 5 ? 1 : 0} direction="vertical" customStyle={{ padding: '0' }}>
+          <Steps current={order.order_form?.[0].order_status === 1 ? 1 : 0} direction="vertical" customStyle={{ padding: '0' }}>
             {/*
                  申请中5 -> 已完成 6
                  申请中5 -> 已取消 3
@@ -235,7 +235,7 @@ const SampleCuttingDetail = () => {
     </View>
     <View className={styles.bottomBar}>
       {
-        order.order_form?.[0].order_status === 5
+        order.order_form?.[0].order_status === 1
           ? <NormalButton customClassName={styles.bottomBar__button} type="info" plain round onClick={handleCancel} >
           取消订单
           </NormalButton>