🐞 fix(ID1001354): 【面料优选&内部小程序】【色卡剪样/领取色卡】--添加色卡后，点击返回键，没弹框提示

【【面料优选&内部小程序】【色卡剪样/领取色卡】--添加色卡后，点击返回键，没弹框提示】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001354

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
         }
       ]
     }

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
 // 生成密钥

src/pages/getColorCard/addColorCard/index.config.ts

@@ -1,3 +1,5 @@
 export default {
   navigationBarTitleText: '领取色卡',
+  disableSwipeBack: true,
+  navigationStyle: 'custom',
 }

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;
 }

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,8 +264,27 @@ const AddColorCard = () => {
     setRemark(value)
   }, [])
 
-  return <MoveBtn showList={['businessManager']}>
+  const onClickBack = () => {
-    <View className={styles.main}>
+    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}>
@@ -380,6 +400,5 @@ const AddColorCard = () => {
       <Remark onSave={getRemark} defaultValue={remark} showInput={!!showDesc} />
     </Popup>
   </View>
-  </MoveBtn>
 }
 export default AddColorCard

src/pages/sampleCutting/addSampleCutting/index.config.ts

@@ -1,3 +1,5 @@
 export default {
   navigationBarTitleText: '领取剪样',
+  disableSwipeBack: true,
+  navigationStyle: 'custom',
 }

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;
 }

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}>