商城测试版v5

src/common/constant.js

@@ -4,7 +4,7 @@
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
 // 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://test.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` // 发
@@ -12,7 +12,7 @@
 // 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.42:50001/lymarket` // 杰
+// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
 
 // CDN
 // 生成密钥

src/components/orderBtns/index.tsx

@@ -47,7 +47,7 @@ export default memo(({orderInfo, onClick}:Param) => {
         SaLeModeWeightCut,
     } = SALE_MODE
     
-    //订单按钮按订单状态归类, value是该订单状态，可能该按钮会出现
+    //注册按钮
     const orderBtnsList = useRef([
         
         {
@@ -60,7 +60,7 @@ export default memo(({orderInfo, onClick}:Param) => {
                 SaleOrderStatusWaitingPayment.value, 
                 SaleOrderStatusTaking.value,
                 SaleOrderStatusWaitingDelivery.value], //取消订单按钮对应： 待接单，配布中，已配布, 待付款， 待发货, 提货中
-            label: '取消订单'
+            label: '取消订单',
         },
         {
             id: 3,
@@ -112,7 +112,7 @@ export default memo(({orderInfo, onClick}:Param) => {
                 //取消订单按钮
                 return( orderInfo.actual_amount == 0 && item.value.includes(orderInfo.status)) //在待发货之前没有付过款
             } else if (item.id == 2) {
-                //去付款按钮(这里后端偷偷改了逻辑)
+                //去付款按钮
                 return( orderInfo.wait_pay_amount != 0 && item.value.includes(orderInfo.status)) //只要没有付完款就显示
             } else if(item.id == 3 ) {
                 //申请退款, 只有大货才有

src/components/shopCart/index.module.scss

@@ -54,7 +54,7 @@
             padding-bottom: 120px;
             .product_item{
                 display: flex;
-                justify-content: space-between;
+                align-items: center;
                 &:nth-child(n+2) {
                     margin-top: 37px;
                 }
@@ -80,14 +80,11 @@
                    margin-left: 20px;
                    padding-right: 10px;
                    box-sizing: border-box;
-                   .title{
+                   
-                       font-size: $font_size;
-                       color: $color_font_one;
-                       @include common_ellipsis;
-                   }
                    .subtitle{
                        color: $color_font_two;
                        font-size: $font_size_medium;
+                       margin: 10px 0;
                    }
                    .tag{
                        font-size: $font_size_min;
@@ -106,9 +103,7 @@
             }
             .count{
                 display: flex;
-                flex-direction: column;
                 justify-content: space-between;
-                align-items: flex-end;
                 .btn_count{
                     width: 235px;
                     height: 64px;
@@ -118,6 +113,25 @@
                     display: flex;
                     align-items: center;
                 }
+                
+                .long{
+                    color: $color_main;
+                    font-size: $font_size_medium;
+                }
+            }
+            .product_item_name{
+                display: flex;
+                flex-direction: column;
+                flex: 1;
+                color: #3C3C3C;
+                
+            }
+            .product_item_name_header{
+                display: flex;
+                justify-content: space-between;
+                margin-bottom: 10px;
+                margin-left: 20px;
+                font-size: 28px;
                 .price{
                     font-size: $font_size;
                     font-weight: 700;
@@ -126,9 +140,12 @@
                         font-size: $font_size_min;
                     }
                 }
-                .long{
+                .title{
-                    color: $color_main;
+                    font-size: $font_size;
-                    font-size: $font_size_medium;
+                    color: $color_font_one;
+                    padding-right: 10px;
+                    @include common_ellipsis;
+                    flex: 1;
                 }
             }
         }

src/components/shopCart/index.tsx

@@ -307,14 +307,16 @@ export default ({show = false, onClose}: param) => {
                                         <View className={styles.img}>
                                             <Image mode="aspectFill" src={formatImgUrl(item.texture_url)}/>
                                         </View>
-                                        <View className={styles.des}>
+                                        <View className={styles.product_item_name}>
+                                            <View className={styles.product_item_name_header}>
                                                 <View className={styles.title}>{formatHashTag(item.product_code, item.product_name)}</View>
+                                                <View className={styles.price}><text>￥</text>{formatPirce(item.sale_price)}<text>/{selectList[item.sale_mode].eunit}</text></View>
+                                            </View>
+                                            <View className={styles.count}>
+                                                <View className={styles.des}>
                                                     <View className={styles.subtitle}>{item.product_color_code +' ' + item.product_color_name}</View>
                                                     <View className={styles.tag}>{item.sale_mode_name}</View>
                                                 </View>
-                                        <View className={styles.count}>
-                                            <View className={styles.price}><text>￥</text>{formatPirce(item.sale_price)}<text>/{selectList[item.sale_mode].eunit}</text></View>
-                                            {/* <View className={styles.long}>×{formatCount(item)}{selectList[selectIndex].unit}</View> */}
                                                 <View className={styles.btn_count}>
                                                     <Counter
                                                         onBlue={(e) => getInputValue(e, item)} 
@@ -330,6 +332,7 @@ export default ({show = false, onClose}: param) => {
                                                 </View>
                                             </View>
                                         </View>
+                                    </View>
                                 })}
                             </View>
                         </InfiniteScroll>}

src/pages/applyAfterSales/index.tsx

@@ -3,7 +3,7 @@ import { FC, memo, useCallback, useEffect, useMemo, useRef, useState } from "rea
 import classnames from "classnames";
 import styles  from './index.module.scss'
 import ReasonPopup from "./components/reasonPopup";
-import { useDidShow, useRouter } from "@tarojs/taro";
+import Taro, { useDidShow, useRouter } from "@tarojs/taro";
 import { GetSaleOrderDetailApi } from "@/api/order";
 import KindList from "./components/kindList"
 import CutKindList from "./components/cutkindList"
@@ -129,7 +129,7 @@ export default () => {
     //提交数据
     const {fetchData: fetchDataReturnApply} = ReturnApplyOrderApi()
     const onSubmitData = async () => {
-        if(submitData.roll_list.length <= 0) return alert.error('请选择退货颜色')
+        if(submitData.roll_list.length <= 0) return alert.none('请选择或输入退货颜色')
         console.log('submitData::',submitData)
         let res = await fetchDataReturnApply(submitData)
         if(res.success) {
@@ -143,8 +143,10 @@ export default () => {
     //底部按钮
     const onSubmit = throttle((val) => {
         if(val == 2) {
-            if(!submitData.return_explain) return alert.error('请填写其他说明')
+            if(!submitData.return_explain && !submitData.reason_describe) return alert.error('请填写其他说明')
             onSubmitData()
+        } else {
+            Taro.navigateBack()
         }
     }, 600)
 

src/pages/userEdit/index.tsx

@@ -5,7 +5,7 @@ import { Button, Image, Picker, Text, Textarea, View } from "@tarojs/components"
 import Taro, { chooseMedia } from "@tarojs/taro";
 import { realNameUpdateApi, companyTypeApi, portraitUpdateApi } from "@/api/user";
 import { companyDetailApi, companyUpdateApi } from "@/api/company"
-import { memo, useCallback, useEffect, useRef, useState } from "react"
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import "./index.scss"
 import ModifyModal from "./components/ModifyModal";
 import useLogin from "@/use/useLogin";
@@ -32,9 +32,7 @@ export default () => {
     getCompanyTypeData();
   }, [])
   // 表单数据
-  const [formData, setFormData] = useState({
+  const [formData, setFormData] = useState<typeof adminUserInfo>(adminUserInfo);
-    user_name: "麦兜"
-  });
   // 昵称修改保存
   const { fetchData: realNameUpdateFetch } = realNameUpdateApi();
   const rules = {
@@ -128,6 +126,7 @@ export default () => {
     const { value } = ev.detail;
     const item = companyTypeData.data.list && companyTypeData.data.list[value];
     if (item) {
+      if(item.id == 0) return alert.error('请选择类型')
       const params = await getCompanyFetch();
       const result = await saveFetch({
         ...params.data,
@@ -150,6 +149,17 @@ export default () => {
     goLink('/pages/index/index',{}, 'switchTab')
   }
 
+  const comanyTypeDataFormat = useMemo(() => {
+    if(companyTypeData.data.list) {
+      return companyTypeData.data.list?.map(item => {
+        if(item.id == 0) item.name = '--请选择类型--'
+        return item
+      })
+    } else {
+      return []
+    }
+  }, [companyTypeData])
+
   return (
     <View className="user-edit">
       <View onClick={handleSelectRortrait} className="user-edit-portrait">
@@ -172,8 +182,8 @@ export default () => {
         <View className="user-edit-content-title"><Text /> 组织资料</View>
         <UserEditList onClick={() => (ModifyCompanyNameEl.current as any).setModalShow(true)} data={(formData as any)?.company_name} label="名称" placeholder="待绑定" icon="" />
         <UserEditList label="类型" placeholder="完善公司/组织信息" icon="">
-          <Picker mode="selector" range={(companyTypeData.data as any).list as any} rangeKey="name" value={(formData as any)?.company_type_index} onChange={handleCompanyType}>
+          <Picker mode="selector" range={comanyTypeDataFormat as any} rangeKey="name" value={(formData as any)?.purchaser_type} onChange={handleCompanyType}>
-            {(companyTypeData.data as any).list && (companyTypeData.data as any).list[(formData as any)?.company_type_index].name}
+            {formData?.purchaser_type_name}
           </Picker>
         </UserEditList>
         <UserEditList onClick={() => onNavigate("/pages/certification/index")} label="我的认证" placeholder="待绑定" icon="">

src/reducers/userInfo.ts

@@ -41,7 +41,16 @@ export type UserAdminParam = {
     is_authorize_name?: false|true,
     is_authorize_phone?: false|true,
     phone?:string,
-    authentication_status?:number
+    authentication_status?:number,
+    authentication_status_name: string,
+    company_id?: number,
+    company_name?: string,
+    founder_user_id?: string,
+    founder_user_name?: string,
+    order_access_status?: number,
+    order_access_status_name?: string,
+    purchaser_type?: number,
+    purchaser_type_name?: string
 }
 
 export type SortCodeParam = {