From 94ea60ba206d8445741969862378af379de9c711 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 23 Feb 2023 19:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E4=BF=AE=E5=A4=8D=E5=89=AA?=
 =?UTF-8?q?=E6=A0=B7=E5=92=8C=E8=89=B2=E5=8D=A1ui=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts                                       | 5 ++---
 .../colorCardClipping/components/cutProductItem/index.tsx    | 4 ++--
 src/pages/cutSampleList/index.tsx                            | 4 ++--
 src/pages/login/index.tsx                                    | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 63a3170..4083328 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -5,14 +5,14 @@
 // export const BASE_URL = `http://192.168.0.89:40001/lymarket`
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境
-export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
+// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = 'https://dev.zzfzyc.com/lymarket' // 开发环境
 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
+export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷
 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' //  杰
 
@@ -21,7 +21,6 @@ export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 export const GET_UPLOAD_SIGN = '/upyun/getsign' // 请求签名 url
 export const UPLOAD_CDN_URL = 'https://v0.api.upyun.com/'
 
-// cdn
 export const IMG_CND_Prefix = CURRENT_ENV.includes('production') ? 'https://cdn.zzfzyc.com' : 'https://test.cdn.zzfzyc.com'
 // export const IMG_CND_Prefix = CURRENT_ENV.includes('production') ? 'https://cdn.zzfzyc.com' : 'https://cdn.zzfzyc.com'
 export const SEARCH_EMPTY_IMAGE = `${IMG_CND_Prefix}/search_empty.png`
diff --git a/src/pages/colorCardClipping/components/cutProductItem/index.tsx b/src/pages/colorCardClipping/components/cutProductItem/index.tsx
index 25999ba..200712b 100644
--- a/src/pages/colorCardClipping/components/cutProductItem/index.tsx
+++ b/src/pages/colorCardClipping/components/cutProductItem/index.tsx
@@ -83,8 +83,8 @@ export default (props: Param) => {
 
     </View>
     <View className={styles.card_info}>
-      <Text>色卡信息:</Text>
-      <Text>{value.total_fabrics}种面料，{value.total_colors}种剪样，共 {value.total_number} 份</Text>
+      <Text>剪样信息:</Text>
+      <Text>{value.total_fabrics}种面料，{value.total_colors}种颜色，共 {value.total_number} 份</Text>
     </View>
     <View className={styles.express}>快递到付</View>
     {value.mp_cut_sample_audit_status === 1 && <View className={styles.btns} onClick={e => onCancelEven?.(e, value.order_id)}><Text>取消订单</Text></View>}
diff --git a/src/pages/cutSampleList/index.tsx b/src/pages/cutSampleList/index.tsx
index b630e6b..a69802c 100644
--- a/src/pages/cutSampleList/index.tsx
+++ b/src/pages/cutSampleList/index.tsx
@@ -129,13 +129,13 @@ export default () => {
     if (pIndex === -1) {
       const data: any = { ...selectItem }
       data.colors = val
-      selectProcutColors.push(data)
+      selectProcutColors.unshift(data)
     }
     else {
       selectProcutColors[pIndex].colors = val
     }
     if (selectItem?.id && !selectProsuctIds.includes(selectItem?.id)) {
-      selectProsuctIds.push(selectItem?.id)
+      selectProsuctIds.unshift(selectItem?.id)
       setSelectProsuctIds(selectProsuctIds)
     }
     setSelectProcutColors(selectProcutColors)
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 5f1ba61..495862e 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -26,7 +26,7 @@ export default () => {
     if (!e.detail.code) { return alert.error('请授权手机号') }
     try {
       await getPhoneNumber(e.detail.code)
-      goLink('/pages/user/index', {}, 'redirectTo')
+      goLink('/pages/user/index', {}, 'switchTab')
     }
     catch (msg) {
       alert.none(msg)