修复剪样样式

src/api/user.ts

@@ -86,8 +86,8 @@ export const ApplyOrderAccessApi = () => {
  */
 export const SubscriptionMessageApi = () => {
   return useRequest({
-    // url: '/v1/mall/subscriptionMessage',
+    url: '/v1/mall/subscriptionMessage',
-    url: '/v3/mallCherry/subscriptionMessage',
+    // url: '/v3/mallCherry/subscriptionMessage',
     method: 'get',
   })
 }

src/common/constant.ts

@@ -39,9 +39,11 @@ export const getCDNSource = (suffix: string) => {
 export const CDN_UPLOAD_IMG = `${UPLOAD_CDN_URL || ''}`
 
 // appid
-export const WX_APPID = 'wx68d92d7cbf0b6963'
+// export const WX_APPID = 'wx68d92d7cbf0b6963'
-// export const WX_APPID = 'wx714eaf2dfdb9c6bb'
+// export const Platform = 6
-export const Platform = 6
+
+export const WX_APPID = 'wx714eaf2dfdb9c6bb'
+export const Platform = 9
 
 // 招商银行小程序appid
 export const BANk_WX_APPID = 'wx65934ee32a88d726'

src/components/bindSalesManDialog/index.tsx

@@ -131,7 +131,7 @@ const BindSalesManDialog = ({ onSuccess }: params, ref: Ref<SalesManDialogRef>)
       <View className={styles.inviteCodeDialog}>
         <View className={styles.background}>
           <View className={styles.left}>
-            <View className={styles.title}>陆盈商城服务</View>
+            <View className={styles.title}>商城服务</View>
             <View className={styles.description}>欢迎使用！填写邀请码</View>
           </View>
           <View className={styles.right}>

src/components/popupSelectColor/index.module.scss

@@ -80,7 +80,10 @@
     .submit {
       font-size: 28px;
       color: #fff;
-      background: #4581ff;
+      background: #9cbcff;
+    }
+    .selected {
+      background: #4581ff !important;
     }
   }
 }

src/components/popupSelectColor/index.tsx

@@ -9,7 +9,7 @@ import IconFont from '@/components/iconfont/iconfont'
 import { GetProductDetailApi } from '@/api/material'
 import { formatHashTag } from '@/common/fotmat'
 import colorItem from '@/pages/codeList/components/colorItem'
-import { goLink } from '@/common/common'
+import { alert, goLink } from '@/common/common'
 
 export interface ColorItem {
   bulk_price: number
@@ -88,6 +88,9 @@ export default memo((props: Param) => {
   }, [colorList])
 
   const onSubmit = () => {
+    if (selectCount <= 0) {
+      return alert.none('请选择色号')
+    }
     const data: ColorItem[] = []
     colorList?.map((item) => {
       if (item.status) { data.push({ ...item, count: 1 }) }
@@ -111,7 +114,7 @@ export default memo((props: Param) => {
       </View>
       <View className={styles.btns}>
         <View className={styles.cancel} onClick={onClose}>取消</View>
-        <View className={styles.submit} onClick={onSubmit}>领取剪样({selectCount})</View>
+        <View className={classNames(styles.submit, selectCount && styles.selected)} onClick={onSubmit}>领取剪样({selectCount})</View>
       </View>
     </Popup>
   </View>

src/pages/colorCardClipping/components/cutSampleList/index.tsx

@@ -107,7 +107,6 @@ export default () => {
           selfOnRefresherRefresh={getRefresherRefresh}
           defaultUrl="/color_card/colorCardList_empty.png"
           defaultText="还没领取过剪样"
-
         >
           {orderData.list?.map((item) => {
             return (

src/pages/colorCardClipping/components/productItem/index.tsx

@@ -39,13 +39,13 @@ export default (props: Param) => {
     e.stopPropagation()
     onCancel?.(id)
   }
-  // const labAndImgObj = useMemo(
+  const labAndImgObj = useMemo(
-  //   () => {
+    () => {
-  //     const res = value.color_card_info[0]
+      const res = value.color_card_info?.[0]
-  //     return { lab: res.lab, rgb: res.rgb, texture_url: res.texture_url }
+      return { lab: res?.lab, rgb: res?.rgb, texture_url: res?.texture_url }
-  //   },
+    },
-  //   [value],
+    [value],
-  // )
+  )
 
   return <View className={styles.list_item} onClick={() => goLink('/pages/colorCardOrderDetail/index', { id: value.order_id })} >
     <View className={styles.item_header}>
@@ -54,7 +54,7 @@ export default (props: Param) => {
     </View>
     <View className={styles.item_con}>
       <View className={styles.image}>
-        <LabAndImg value={{}} showStatus={false} />
+        <LabAndImg value={labAndImgObj} showStatus={false} />
       </View>
 
       <View className={styles.item_con_desc}>

src/pages/colorCardList/index.tsx

@@ -103,7 +103,7 @@ export default () => {
 
   const onSelectData = (val, status) => {
     if (status) {
-      setSelectList(e => [...e, val])
+      setSelectList(e => [val, ...e])
     }
     else {
       const res = selectList?.filter((item) => {

src/pages/colorCardOrder/index.tsx

@@ -13,6 +13,7 @@ import { getFilterData } from '@/common/util'
 import { UseSubscriptionMessage } from '@/use/useCommon'
 import { SUBSCRIPTION_MESSAGE_SCENE } from '@/common/enum'
 import { addressListApi } from '@/api/addressManager'
+import MoveBtn from '@/components/moveBtn'
 
 export interface submitData {
   address_id: number

src/pages/cutSampleList/components/productItem/index.module.scss

@@ -29,11 +29,12 @@
       @include common_ellipsis(2);
     }
     .card_info_label {
-      display: grid;
+      display: flex;
-      grid-template-columns: repeat(3, 100px);
+      flex-wrap: wrap;
       grid-gap: 10px 10px;
       margin-top: 10px;
       text {
+        padding: 5px 6px;
         font-size: 24px;
         color: #4581ff;
         height: 34px;

src/pages/cutSampleList/components/productItem/index.tsx

@@ -67,7 +67,8 @@ export default memo((props: ParamType) => {
     <View className={styles.card_info}>
       <View className={styles.card_info_name}>{formatHashTag(productItem?.code, productItem?.name)}</View>
       <View className={styles.card_info_label}>
-        {/* {new Array(2).fill('').map(item => <Text key={item.id}></Text>)} */}
+        <Text>{productItem?.width}</Text>
+        <Text>{productItem?.weight_density}</Text>
       </View>
       <View className={styles.desc}>{productItem?.component}</View>
     </View>

src/pages/cutSampleListOrderDetail/components/orderState/index.tsx

@@ -11,6 +11,7 @@ export interface orderStateItem {
   delivery_appendix_url: string[]
   order_status: number
   order_status_name: string
+  order_time: string
 }
 
 export interface orderStateParam {
@@ -38,7 +39,7 @@ const OrderState = (props: orderStateParam) => {
             {(list?.length != (index + 1)) && <View className={styles.order_status_line}></View>}
             <View className={styles.order_status_content}>
               <View className={classnames(styles.order_status_title, (index == 0) && styles.order_status_select)}>{item.order_status_name}</View>
-              <View className={classnames(styles.order_status_time, (index == 0) && styles.order_status_select)}>{formatDateTime(item.audit_time)}</View>
+              <View className={classnames(styles.order_status_time, (index == 0) && styles.order_status_select)}>{formatDateTime(item.order_time)}</View>
             </View>
             <Text className={classnames(styles.order_status_des, (index == 0) && styles.order_status_des_select)}>{item.audit_remark}</Text>
             {item.delivery_appendix_url?.length > 0 && <View className={styles.images}>

src/pages/salesAfter/components/weightMemo/index.tsx

@@ -14,7 +14,7 @@ export default memo(({ onCheck, onCustom }: Param) => {
       <View className={styles.weight_memo_item} onClick={() => onCheck?.()}>
         <View className={styles.title}>
           <Text className={classnames('iconfont icon-a-yuanmadanmadanguanli', styles.miconfont_check)}></Text>
-          <Text>陆盈纺织</Text>
+          <Text>面料优选A+</Text>
         </View>
         <View className={styles.desc}>
           <Text>查看原码单</Text>
@@ -33,4 +33,4 @@ export default memo(({ onCheck, onCustom }: Param) => {
       </View>
     </View>
   )
-})
+})

src/pages/user/index.tsx

@@ -103,7 +103,7 @@ export default () => {
             <View className={styles.header_name}>
               <Text>{userInfo?.adminUserInfo?.phone ? userInfo?.adminUserInfo?.user_name : '点击登录'}</Text>
               <View className={styles['arcd-info-left-phone']}>
-                <View className={styles.header_title}> {userInfo?.adminUserInfo?.phone || 'Hi,欢迎来到陆盈商城'}</View>
+                <View className={styles.header_title}> {userInfo?.adminUserInfo?.phone || 'Hi,欢迎来到商城'}</View>
               </View>
               {!!userInfo?.adminUserInfo?.company_name && <View className={styles.header_picture} >
                 <View className={styles.icon_renzhengchenggong}><IconFont name="icon-renzhengchenggong" size={24} /></View>