From 1bfd170696d71c94f5ab747ca8d8d60f76bb8afe Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Mon, 27 Feb 2023 16:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001354):=20=E3=80=90?=
 =?UTF-8?q?=E9=9D=A2=E6=96=99=E4=BC=98=E9=80=89&=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E3=80=90=E8=89=B2=E5=8D=A1?=
 =?UTF-8?q?=E5=89=AA=E6=A0=B7/=E9=A2=86=E5=8F=96=E8=89=B2=E5=8D=A1?=
 =?UTF-8?q?=E3=80=91--=E6=B7=BB=E5=8A=A0=E8=89=B2=E5=8D=A1=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=E9=94=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【面料优选&amp;内部小程序】【色卡剪样/领取色卡】&#45;&#45;添加色卡后，点击返回键，没弹框提示】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001354
---
 project.private.config.json                   |  14 ++
 src/common/constant.ts                        |   2 +-
 .../getColorCard/addColorCard/index.config.ts |   2 +
 .../addColorCard/index.module.scss            |   3 +
 src/pages/getColorCard/addColorCard/index.tsx | 237 ++++++++++--------
 .../addSampleCutting/index.config.ts          |   2 +
 .../addSampleCutting/index.module.scss        |   3 +
 .../sampleCutting/addSampleCutting/index.tsx  |  21 ++
 8 files changed, 174 insertions(+), 110 deletions(-)

diff --git a/project.private.config.json b/project.private.config.json
index 807fae9..1c2ff94 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -37,6 +37,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/login/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/getColorCard/addColorCard/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
diff --git a/src/common/constant.ts b/src/common/constant.ts
index 850aed6..14bc3f1 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -15,7 +15,7 @@ export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' //  杰
 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` //  华
-// export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷
+// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
 
 // CDN
 // 生成密钥
diff --git a/src/pages/getColorCard/addColorCard/index.config.ts b/src/pages/getColorCard/addColorCard/index.config.ts
index e8660e0..c6c6fc4 100644
--- a/src/pages/getColorCard/addColorCard/index.config.ts
+++ b/src/pages/getColorCard/addColorCard/index.config.ts
@@ -1,3 +1,5 @@
 export default {
   navigationBarTitleText: '领取色卡',
+  disableSwipeBack: true,
+  navigationStyle: 'custom',
 }
diff --git a/src/pages/getColorCard/addColorCard/index.module.scss b/src/pages/getColorCard/addColorCard/index.module.scss
index 9c00d31..2771112 100644
--- a/src/pages/getColorCard/addColorCard/index.module.scss
+++ b/src/pages/getColorCard/addColorCard/index.module.scss
@@ -4,6 +4,9 @@ page {
   display: flex;
   flex-flow: column nowrap;
 }
+.backIcon {
+  transform: rotate(180deg);
+}
 .layoutBlock {
   padding: 24px 34px;
 }
diff --git a/src/pages/getColorCard/addColorCard/index.tsx b/src/pages/getColorCard/addColorCard/index.tsx
index bd4b96a..6301d32 100644
--- a/src/pages/getColorCard/addColorCard/index.tsx
+++ b/src/pages/getColorCard/addColorCard/index.tsx
@@ -17,6 +17,7 @@ import Remark from '@/pages/orderDetails/components/remark'
 import { formatRemoveHashTag } from '@/common/format'
 import { SubmitColorCardOrder } from '@/api/colorCard'
 import MoveBtn from '@/components/moveBtn'
+import NavBar from '@/pages/order/components/NavBar'
 
 const AddColorCard = () => {
   // 获取选择的客户
@@ -263,123 +264,141 @@ const AddColorCard = () => {
     setRemark(value)
   }, [])
 
-  return <MoveBtn showList={['businessManager']}>
-    <View className={styles.main}>
-      <View className={styles.context}>
-        {/* 客户信息 */}
-        <LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}>
-          <View className={styles.customerTop}>
-            <View>客户信息</View>
-          </View>
-          <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
-          <View className={styles.customerBottom}>
-            {
-              clientInfo.clientId !== -1
-                ? (<>
-                  <Text>
-                    {clientInfo.clientName}
-                  </Text>
-                  <Text>
-                    {clientInfo.clientPhone}
-                  </Text>
-                </>
-                )
-                : <View>选择领取客户</View>
-            }
-            <IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
-          </View>
-        </LayoutBlock>
-        {
-          clientInfo.clientId !== -1 && <AddressDetailBox
-            showBtn={false}
-            showWhatFont="物流"
-            navSelect={handSelect}
-            obj={addressInfo}
-            receivingStatus={2}
-            icon={<IconFont name="icon-dizhi1" size={60}></IconFont>}
-          ></AddressDetailBox>
+  const onClickBack = () => {
+    Taro.showModal({
+      content: '返回后页面数据将不回保留，确认返回？',
+      confirmColor: '#4a8dff',
+      success: ({ confirm }) => {
+        if (confirm) {
+          Taro.navigateBack({
+            delta: 1,
+          })
         }
+      },
+    })
+  }
 
-        <NormalButton customClassName={styles.addButton} circle onClick={handleAddColorCard} plain size="normal" type="primary">添加色卡</NormalButton>
-        {/* 色卡信息 */}
-        <LayoutBlock customStyle={{ marginTop: '12px' }} circle customClassName={styles.layoutBlock}>
-          <View className={styles.colorCardTop}>色卡信息</View>
-          <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
+  return <View className={styles.main}>
+    <NavBar hasLeft leftSlot={
+      <View onClick={onClickBack}>
+        <IconFont customClassName={styles.backIcon} name="icon-chakanquanbukehu" size={48} color="#191919"></IconFont>
+      </View>
+    } title="领取色卡"
+    ></NavBar>
+    <View className={styles.context}>
+      {/* 客户信息 */}
+      <LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}>
+        <View className={styles.customerTop}>
+          <View>客户信息</View>
+        </View>
+        <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
+        <View className={styles.customerBottom}>
           {
-            order.map((item) => {
-              return (
-                <View className={styles.colorCardBottom} key={item.id}>
-                  <View style={{ minWidth: '24%' }}>
-                    <View className={styles.leftCont}>
-                      <LabAndImg value={labAndImgObj(item)} />
-                    </View>
-                  </View>
-                  <View className={styles.rightCont}>
-                    <View className={styles.rightCont__top}>
-                      {item.color_card_name}
-                    </View>
-                    <View className={styles.rightCont__bottom}>
-                      <View className={styles.rightCont__left}>
-                        {
-                          item.affiliation_product.map((product_color, index) => {
-                            return <Tag customStyle={{ marginRight: '5px', marginBottom: '2px', padding: '5px', background: '#e3ecff', color: '#558cff', borderColor: '#e3ecff' }} key={index} size="small" circle>{formatRemoveHashTag(product_color.code)}</Tag>
-                          })
-                        }
-                      </View>
-                      <View className={styles.rightCont__right}>
-                        <Counter
-                          onBlue={getInputValue}
-                          defaultNum={item?.count || 1}
-                          onChange={e => handleCountChange(e, item.id)}
-                          onClickBtn={getInputValue}
-                          unit="本"
-                          minNum={0}
-                          maxNum={999}
-                        />
-                      </View>
-                    </View>
-                    <Divider direction="horizontal" customStyles={{ margin: '12px 0 0 ' }}></Divider>
+            clientInfo.clientId !== -1
+              ? (<>
+                <Text>
+                  {clientInfo.clientName}
+                </Text>
+                <Text>
+                  {clientInfo.clientPhone}
+                </Text>
+              </>
+              )
+              : <View>选择领取客户</View>
+          }
+          <IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
+        </View>
+      </LayoutBlock>
+      {
+        clientInfo.clientId !== -1 && <AddressDetailBox
+          showBtn={false}
+          showWhatFont="物流"
+          navSelect={handSelect}
+          obj={addressInfo}
+          receivingStatus={2}
+          icon={<IconFont name="icon-dizhi1" size={60}></IconFont>}
+        ></AddressDetailBox>
+      }
+
+      <NormalButton customClassName={styles.addButton} circle onClick={handleAddColorCard} plain size="normal" type="primary">添加色卡</NormalButton>
+      {/* 色卡信息 */}
+      <LayoutBlock customStyle={{ marginTop: '12px' }} circle customClassName={styles.layoutBlock}>
+        <View className={styles.colorCardTop}>色卡信息</View>
+        <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
+        {
+          order.map((item) => {
+            return (
+              <View className={styles.colorCardBottom} key={item.id}>
+                <View style={{ minWidth: '24%' }}>
+                  <View className={styles.leftCont}>
+                    <LabAndImg value={labAndImgObj(item)} />
                   </View>
                 </View>
-              )
-            })
-          }
-          <View className={styles.paymentMethod}>快递到付</View>
-        </LayoutBlock>
-        {/* 备注信息 */}
-        <LayoutBlock circle customClassName={styles.layoutBlock} onClick={handleShowDesc}>
-          <View className={styles.remarkTop}>
-            <View className={styles.remarkTitle}>备注信息</View>
-            <View className={styles.remarkTag}>
-              <Text>填写/修改备注</Text>
-              <IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
-            </View>
+                <View className={styles.rightCont}>
+                  <View className={styles.rightCont__top}>
+                    {item.color_card_name}
+                  </View>
+                  <View className={styles.rightCont__bottom}>
+                    <View className={styles.rightCont__left}>
+                      {
+                        item.affiliation_product.map((product_color, index) => {
+                          return <Tag customStyle={{ marginRight: '5px', marginBottom: '2px', padding: '5px', background: '#e3ecff', color: '#558cff', borderColor: '#e3ecff' }} key={index} size="small" circle>{formatRemoveHashTag(product_color.code)}</Tag>
+                        })
+                      }
+                    </View>
+                    <View className={styles.rightCont__right}>
+                      <Counter
+                        onBlue={getInputValue}
+                        defaultNum={item?.count || 1}
+                        onChange={e => handleCountChange(e, item.id)}
+                        onClickBtn={getInputValue}
+                        unit="本"
+                        minNum={0}
+                        maxNum={999}
+                      />
+                    </View>
+                  </View>
+                  <Divider direction="horizontal" customStyles={{ margin: '12px 0 0 ' }}></Divider>
+                </View>
+              </View>
+            )
+          })
+        }
+        <View className={styles.paymentMethod}>快递到付</View>
+      </LayoutBlock>
+      {/* 备注信息 */}
+      <LayoutBlock circle customClassName={styles.layoutBlock} onClick={handleShowDesc}>
+        <View className={styles.remarkTop}>
+          <View className={styles.remarkTitle}>备注信息</View>
+          <View className={styles.remarkTag}>
+            <Text>填写/修改备注</Text>
+            <IconFont name="icon-chakanquanbukehu" color="#444444" size={32}></IconFont>
           </View>
-          <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
-          <View className={styles.remarkBottom}>
-            <View className={styles.remarkContent}>{ remark || '尚未备注信息' }</View>
-          </View>
-        </LayoutBlock>
-
-      </View>
-      <View className={styles.bottomBar}>
-        <View className={styles.bottomTotal}>
-        当前共 {order.length} 种色卡,共 {order.reduce((total, curr) => total + (curr.count || 1), 0)} 本
         </View>
-        <NormalButton
-          customClassName={styles.bottomBar__button}
-          type="primary"
-          round
-          onClick={handleSubmitOrder}
-        >
-        提交订单
-        </NormalButton>
+        <Divider direction="horizontal" customStyles={{ margin: '12px 0' }}></Divider>
+        <View className={styles.remarkBottom}>
+          <View className={styles.remarkContent}>{ remark || '尚未备注信息' }</View>
+        </View>
+      </LayoutBlock>
 
-      </View>
-      <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
-        <Remark onSave={getRemark} defaultValue={remark} showInput={!!showDesc} />
-      </Popup>
     </View>
-  </MoveBtn>
+    <View className={styles.bottomBar}>
+      <View className={styles.bottomTotal}>
+        当前共 {order.length} 种色卡,共 {order.reduce((total, curr) => total + (curr.count || 1), 0)} 本
+      </View>
+      <NormalButton
+        customClassName={styles.bottomBar__button}
+        type="primary"
+        round
+        onClick={handleSubmitOrder}
+      >
+        提交订单
+      </NormalButton>
+
+    </View>
+    <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
+      <Remark onSave={getRemark} defaultValue={remark} showInput={!!showDesc} />
+    </Popup>
+  </View>
 }
 export default AddColorCard
diff --git a/src/pages/sampleCutting/addSampleCutting/index.config.ts b/src/pages/sampleCutting/addSampleCutting/index.config.ts
index 70948c5..835f5c2 100644
--- a/src/pages/sampleCutting/addSampleCutting/index.config.ts
+++ b/src/pages/sampleCutting/addSampleCutting/index.config.ts
@@ -1,3 +1,5 @@
 export default {
   navigationBarTitleText: '领取剪样',
+  disableSwipeBack: true,
+  navigationStyle: 'custom',
 }
diff --git a/src/pages/sampleCutting/addSampleCutting/index.module.scss b/src/pages/sampleCutting/addSampleCutting/index.module.scss
index 3736ab5..9802cdd 100644
--- a/src/pages/sampleCutting/addSampleCutting/index.module.scss
+++ b/src/pages/sampleCutting/addSampleCutting/index.module.scss
@@ -4,6 +4,9 @@ page {
   display: flex;
   flex-flow: column nowrap;
 }
+.backIcon {
+  transform: rotate(180deg);
+}
 .layoutBlock {
   padding: 24px 34px;
 }
diff --git a/src/pages/sampleCutting/addSampleCutting/index.tsx b/src/pages/sampleCutting/addSampleCutting/index.tsx
index 73f1f48..6a48131 100644
--- a/src/pages/sampleCutting/addSampleCutting/index.tsx
+++ b/src/pages/sampleCutting/addSampleCutting/index.tsx
@@ -16,6 +16,7 @@ import Popup from '@/components/popup'
 import Remark from '@/pages/orderDetails/components/remark'
 import { formatRemoveHashTag } from '@/common/format'
 import { SubmitCutSampleOrder } from '@/api/sampleCutting'
+import NavBar from '@/pages/order/components/NavBar'
 
 const AddColorCard = () => {
   // 获取选择的客户
@@ -310,7 +311,27 @@ const AddColorCard = () => {
     }, 0)
   }, [order])
 
+  const onClickBack = () => {
+    Taro.showModal({
+      content: '返回后页面数据将不回保留，确认返回？',
+      confirmColor: '#4a8dff',
+      success: ({ confirm }) => {
+        if (confirm) {
+          Taro.navigateBack({
+            delta: 1,
+          })
+        }
+      },
+    })
+  }
+
   return <View className={styles.main}>
+    <NavBar hasLeft leftSlot={
+      <View onClick={onClickBack}>
+        <IconFont customClassName={styles.backIcon} name="icon-chakanquanbukehu" size={48} color="#191919"></IconFont>
+      </View>
+    } title="领取剪样"
+    ></NavBar>
     <View className={styles.context}>
       {/* 客户信息 */}
       <LayoutBlock circle onClick={handleSelectCustomer} customStyle={{ marginTop: '12px' }} customClassName={styles.layoutBlock}>