商城测试版v5

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({
-    user_name: "麦兜"
-  });
+  const [formData, setFormData] = useState<typeof adminUserInfo>(adminUserInfo);
   // 昵称修改保存
   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}>
-            {(companyTypeData.data as any).list && (companyTypeData.data as any).list[(formData as any)?.company_type_index].name}
+          <Picker mode="selector" range={comanyTypeDataFormat as any} rangeKey="name" value={(formData as any)?.purchaser_type} onChange={handleCompanyType}>
+            {formData?.purchaser_type_name}
           </Picker>
         </UserEditList>
         <UserEditList onClick={() => onNavigate("/pages/certification/index")} label="我的认证" placeholder="待绑定" icon="">