Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

config/base.config.json~9fd9e0c42f4f7acd87288c2a6cbbf656aae80311

-{"userRegister":{"useType":{"memberType":[{"id":1,"typeName":"企业会员"},{"id":3,"typeName":"渠道企业会员"},{"id":4,"typeName":"渠道个人会员"},{"id":2,"typeName":"个人会员"}],"businessType":[{"id":1,"typeName":"采购"},{"id":39,"typeName":"供货"}]}},"web":{"shopInfo":[{"id":302,"name":"云鲜采企业商城","type":1,"environment":1,"logoUrl":"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/5b19a059530a4060984fc045125da1f81597395561658.png","describe":null,"state":1,"url":"/"},{"id":303,"name":"云鲜采渠道商城","type":3,"environment":1,"logoUrl":"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a63c8c81e74947f88c64d4c72bfb565c1597395598958.png","describe":null,"state":1,"url":"/shop"}]},"global":{"siteId":502,"siteUrl":"http://localhost:4396","logo":"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png","countryList":[{"name":"简体中文-ZH","key":"zh-CN","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"},{"name":"English-EN","key":"en-US","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"},{"name":"日本語-JP","key":"jp","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"},{"name":"한국어-KO","key":"ko","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"}]}}
+{"userRegister":{"useType":{"memberType":[{"id":1,"typeName":"企业会员"},{"id":3,"typeName":"渠道企业会员"},{"id":4,"typeName":"渠道个人会员"},{"id":2,"typeName":"个人会员"}],"businessType":[{"id":1,"typeName":"采购"},{"id":39,"typeName":"供货"},{"id":40,"typeName":"供货商消费者"},{"id":41,"typeName":"供货商消费者渠道会员"}]}},"web":{"shopInfo":[]},"global":{"siteId":502,"siteUrl":"http://localhost:4396","logo":"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png","countryList":[{"name":"简体中文-ZH","key":"zh-CN","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"},{"name":"English-EN","key":"en-US","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"},{"name":"日本語-JP","key":"jp","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"},{"name":"한국어-KO","key":"ko","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"}]}}

config/routes/index.ts

@@ -38,12 +38,13 @@ const memberCenterRoute = {
     },
     ...routes,
     {
-      path: '/noAuth',
+      path: '/memberCenter/noAuth',
       auth: false,
       component: '@/pages/403',
     },
     // 能力中心的404页
     {
+      path: '/*',
       auth: false,
       component: '@/pages/404',
     },

src/app.tsx

@@ -22,13 +22,16 @@ const whiteLists = [
   '/user/login',
   '/user/register',
   '/memberCenter',
+  '/memberCenter/noAuth',
   '/commodity',
   '/shops',
   '/shop/commodity/detail',
   '/shop/commodity',
   '/shop',
   '/infomation',
+  '/403',
   '/404',
+  '/500',
   '/noAuth'
 ]
 
@@ -70,10 +73,11 @@ export function render(oldRender: Function) {
         token: data.token
       })
       setRouters(data.urls)
+      oldRender()
     })
+  } else {
+    oldRender()
   }
-
-  oldRender()
 }
 
 /**
@@ -84,21 +88,20 @@ export function render(oldRender: Function) {
  * @param {*} { routes, matchedRoutes, location, action }
  */
 export function onRouteChange({ routes, matchedRoutes, location, action }) {
-  console.log(`当前可访问的路由为`)
-  console.log(routes, matchedRoutes, location)
+  console.log('onRouteChange')
   if (isDev) {
     return;
   }
   if (whiteLists.includes(location.pathname)) return;
 
   const routeAuthUrls = getRouters()
-  console.log(routeAuthUrls, "routeAuthUrls")
   // 是否登录
   if (getAuth()) {
     if (routeAuthUrls.includes(location.pathname)) {
 
     } else {
-      // history.replace('/')
+      // 无权限访问时
+      history.replace('/memberCenter/noAuth')
     }
   } else {
     history.replace('/user/login')

src/global/config/global.d.ts~9fd9e0c42f4f7acd87288c2a6cbbf656aae80311

@@ -17,19 +17,8 @@ export interface UserRegister {
 	useType: UseType;
 }
 
-export interface ShopInfo {
-	id: number;
-	name: string;
-	type: number;
-	environment: number;
-	logoUrl: string;
-	describe?: any;
-	state: number;
-	url: string;
-}
-
 export interface Web {
-	shopInfo: ShopInfo[];
+	shopInfo: any[];
 }
 
 export interface CountryList {

src/global/styles/reset.less

@@ -95,6 +95,11 @@
       height: 32px;
       line-height: 32px;
       margin: 8px 0;
+      border-top-width: 1px;
+      border-left-width: 1px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
     & label:nth-child(odd) {

src/pages/403.tsx

@@ -14,7 +14,6 @@ const NoFoundPage: React.FC<{}> = () => {
   
   return (
     <div className={styles.wrapper}>
-      <UserHeader logo={GlobalConfig.global.logo}/>
       <div className={styles.errorBox}>
         <Row>        
           <Col span={12}>

src/pages/classAndProperty/propertyValue/index.tsx

@@ -153,14 +153,12 @@ const PropertyValue: React.FC<{}> = () => {
 
   const confirm = (record: any) => {
     PublicApi.postProductCustomerUpdateCustomerAttributeValueStatus({id: record.id, isEnable: !record.isEnable}).then(res=>{
-        //@ts-ignore
         ref.current.reload()
     })
   }
 
   const clickDelete = (record: any) => {
     PublicApi.postProductCustomerDeleteCustomerAttributeValue({ id: record.id }).then(res=>{
-        //@ts-ignore
         ref.current.reload()
     })
   }

src/pages/commodity/products/addProducts.tsx

@@ -60,8 +60,8 @@ const AddProducts: React.FC<{}> = (props) => {
   }, [])
 
   const onSave = () => {
-    console.log('点击保存')
-    console.log(formRefs, 'formrefs')
+    // console.log('点击保存')
+    // console.log(formRefs, 'formrefs')
     if(formRefs.length > 0){
       try{
         let data = formRefs.map(async __ => {
@@ -69,10 +69,10 @@ const AddProducts: React.FC<{}> = (props) => {
             await __.current.validateFields()
           )
         })
-        console.log(data,'data')
+        // console.log(data,'data')
         Promise.all(data).then((values) => {
           // 提交的数据进行处理
-          console.log(values, productSelectAttribute, productAttributeAndImageParams, '所有数据')
+          // console.log(values, productSelectAttribute, productAttributeAndImageParams, '所有数据')
           productSelectAttribute.length>0 && productSelectAttribute.map(_itme => {
               delete _itme.attributeName
               delete _itme.isPrice
@@ -112,16 +112,19 @@ const AddProducts: React.FC<{}> = (props) => {
           _params.logistics.weight = Number(_params.logistics.weight)
           // 处理地址
           let _commodityAreaList:any = []
+          // console.log(_params, '_params')
           _params.commodityAreaList.length > 0 && _params.commodityAreaList.map(_itme => {
-            let _temp: any = {}
-            let pobj = areaOption.filter(_=>_.code===_itme[0])[0]
-            let cobj = pobj.areaResponses.filter(__=>__.code===_itme[1])[0]
-            _temp.provinceCode = pobj.code
-            _temp.provinceName = pobj.name,
-            _temp.cityCode = cobj.code,
-            _temp.cityName = cobj.name,
-            _commodityAreaList.push(_temp)
-            console.log(_itme, _temp, '地址的每一项')
+            if(_itme){
+              let _temp: any = {}
+              let pobj = areaOption.filter(_=>_.code===_itme[0])[0]
+              let cobj = pobj.areaResponses.filter(__=>__.code===_itme[1])[0]
+              _temp.provinceCode = pobj.code
+              _temp.provinceName = pobj.name,
+              _temp.cityCode = cobj.code,
+              _temp.cityName = cobj.name,
+              _commodityAreaList.push(_temp)
+              // console.log(_itme, _temp, '地址的每一项')
+            }
           })
           _params.commodityAreaList = _commodityAreaList
           const { id } = history.location.query

src/pages/commodity/products/index.tsx

@@ -59,6 +59,7 @@ const Products: React.FC<{}> = () => {
   const [shopsOption, setShopsOption] = useState<GetProductCommodityGetShopResponse>([])
   const [checkedValues, setCheckedValues] = useState<any>([])
   const [currentOptionId, setCurrentOptionId] = useState()
+  const [isDisabledOKbtn, setIsDisabledOKbtn] = useState<boolean>(false)
 
   let [isHighSearch, setIsHighSearch] = useState(false)
   const [filterParams, setFilterParams] = useState<paramItem>({ 
@@ -414,7 +415,7 @@ const Products: React.FC<{}> = () => {
     setCheckedValues(values)
   }
 
-  const clickUp = (param: any, id: any) => {  // 0 下架  1上架
+  const clickUp = (param: any, id: any) => {  // param: 0 下架  1上架
     setCurrentOptionId(id)
     PublicApi.getProductCommodityGetShop({id: id}).then(res => {
       setShopsOption(res.data)
@@ -425,6 +426,7 @@ const Products: React.FC<{}> = () => {
   }
 
   const handleUp = () => {
+    setIsDisabledOKbtn(true)
     let params = {
       id: currentOptionId,
       shopList: checkedValues
@@ -433,11 +435,13 @@ const Products: React.FC<{}> = () => {
       PublicApi.postProductCommodityPublishCommodity(params).then(res => {
         setUpDownModal(false)
         ref.current.reload()
+        setIsDisabledOKbtn(false)
       })
     else
       PublicApi.postProductCommodityOffPublishCommodity(params).then(res => {
         setUpDownModal(false)
         ref.current.reload()
+        setIsDisabledOKbtn(false)
       })
   }
 
@@ -475,7 +479,7 @@ const Products: React.FC<{}> = () => {
 
   const handleBatchDelete = (ids: string[]) => {
     console.log('删除', ids)
-    //@ts-ignore
+    // @ts-ignore
     PublicApi.postProductCommodityDeleteBatchCommodity({idList: ids}).then(res => {
       if(res.code === 1000)
         ref.current.reload()
@@ -487,7 +491,6 @@ const Products: React.FC<{}> = () => {
     setFilterParams(restObj)
     setBrandValue(undefined)
     setClassValue(undefined)
-    //@ts-ignore
     ref.current.reload(restObj)
   }
 
@@ -533,7 +536,6 @@ const Products: React.FC<{}> = () => {
     console.log(val)
     let obj = val ? {...filterParams, name: val} : { ...filterParams }
     setFilterParams(obj)
-    //@ts-ignore
     ref.current.reload(obj)
   }
 
@@ -774,6 +776,7 @@ const Products: React.FC<{}> = () => {
         onOk={handleUp}
         onCancel={handleCancelUp}
         forceRender={true}
+        okButtonProps={{ disabled: isDisabledOKbtn }}
       >
         <Form
           layout="vertical"

src/pages/commodity/products/viewProducts.tsx

@@ -142,8 +142,6 @@ const viewProducts: React.FC<{}> = () => {
     },
   ];
 
-
-
   /* 商品属性显示 */
   //以属性组和属性名称归档的数据
   const renderDataByTab = (data: GetProductCommodityGetCommodityResponse) => {
@@ -582,7 +580,7 @@ const viewProducts: React.FC<{}> = () => {
           {/* 视频区块 */}
           <div className={styles.descriptionBox}>
             {
-              productDetail?.commodityRemark?.video.length>0 ? productDetail?.commodityRemark?.video.map((_item, _index)=> <div key={_index}  className={styles.videoItem}>
+              productDetail?.commodityRemark?.video?.length>0 ? productDetail?.commodityRemark?.video.map((_item, _index)=> <div key={_index}  className={styles.videoItem}>
                 <video src={_item} controls={true}>
                   您的浏览器不支持视频标签，请及时升级。
                 </video>

src/pages/trademark/addBrand.tsx

@@ -121,18 +121,19 @@ const AddBrand: React.FC<{}> = () => {
   
   const handleSave = () => {
     form.validateFields().then((values:any) => {
-      if(values?.proveUrl?.fileList&&fileList.length){
-        delete values.proveUrl.fileList
-        delete values.proveUrl.file
-      }
+      console.log(values,'vvv')
       if(history.location.query.id){
         values.id = Number(history.location.query.id)
         let obj = {};
         fileList.forEach((item, index)=>{
-          obj[index] = item?.url
+          obj[index] = item?.url || item?.response?.data
         })
         values.proveUrl = obj
       }
+      if(values?.proveUrl?.fileList&&fileList.length){
+        delete values.proveUrl.fileList
+        delete values.proveUrl.file
+      }
       PublicApi.postProductBrandSaveOrUpdateBrand(values).then(res => {
           setIsEnableCheck(false)
           //@ts-ignore

src/pages/user/components/LoginWrap.tsx

@@ -23,7 +23,8 @@ const LoginWrap: React.FC = () => {
         token: data.token
       })
       setRouters(data.urls)
-      history.push('/memberCenter/home')
+      // 此处需使用href跳转， 否则无法触发app.ts中的路由初始化校验
+      window.location.href = '/memberCenter/home'
     })
   }
 

src/pages/user/register.tsx

@@ -41,7 +41,7 @@ const CustomCheckbox = props => {
   return (
     <Radio.Group value={props.value} onChange={props.onChange} className={layout === 'column' ? 'identityRadio' : 'businessRadio'} name={props.name}>
       {
-        props.dataSource && props.dataSource.map((v, i) => <Radio.Button value={v.value} key={v.value + i}>{v.label}</Radio.Button>)
+        props.dataSource && props.dataSource.map((v, i) => <Tooltip title={v.label} placement='leftTop' key={v.value + i}><Radio.Button value={v.value} >{v.label}</Radio.Button></Tooltip>)
       }
     </Radio.Group>
   )
@@ -280,7 +280,15 @@ const UserRegistry = () => {
                                       name={field.fieldName} 
                                       key={field.fieldName} 
                                       title={field.fieldCNName}
-                                      x-component-props={{ listType: 'text'}} 
+                                      x-component-props={{
+                                        name: 'file',
+                                        listType: 'text',
+                                        actions: "/api/file/file/upload",
+                                        data: {
+                                          fileType: 1
+                                        },
+                                        showUploadList: false,
+                                      }} 
                                       x-component='Upload'
                                     >
                                     </Field>

src/utils/request.ts

@@ -4,6 +4,7 @@ import { IRequestError, IRequestSuccess } from '..';
 import { history } from 'umi'
 import { message } from 'antd'
 import { getAuth, removeAuth } from './auth';
+import { GlobalConfig } from '@/global/config';
 
 export type CtlType = 'none' | 'message'
 // 根前缀请求路径
@@ -52,7 +53,8 @@ const errorHandler = (error: ResponseError): IRequestError => {
 
 const defaultHeaders = {
   'Content-Type': 'Application/json',
-  'source': '1'
+  'source': '1',
+  'site': GlobalConfig.global.siteId.toString()
 }
 
 /**