Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/pages/orderSystem/orderDetail/components/orderPayResultModal/index.tsx

@@ -7,6 +7,7 @@ import { history } from 'umi'
 import OverflowText from '@/components/OverflowText'
 
 export interface OrderPayResultModalProps {
+  /** default: 确认模式，preview: 预览模式 */
   type: 'default' | 'preview',
   currentRef: any
 }
@@ -16,7 +17,7 @@ const OrderPayResultModal:React.FC<OrderPayResultModalProps> = ({type, currentRe
   const { id } = usePageStatus()
   const [visible, setVisible] = useState(false)
   const [isReady, setIsReady] = useState<any>()
-  const canCtlData = data.payments.find(v => v.showConfirm) || {}
+  const canCtlData = data.payments.find(v => type === 'preview' ? v.showView : v.showConfirm) || {}
 
   // const transData = canCtlData.vouchers?.split(',') || []
 

src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx

@@ -15,6 +15,7 @@ const TabPane = Tabs.TabPane
 
 const TabHeader = ({dataSource}) => {
   const { setPayResultType, payResultVisible } = useContext(OrderDetailContext)
+
   return <div>
       <Row justify='space-between' style={{minWidth: 216}}>
         <Col>

src/pages/orderSystem/orderDetail/index.tsx

@@ -13,6 +13,7 @@ import OrderTransformRecord from './components/orderTransformRecord'
 import OrderPayTabs from './components/orderPayTabs'
 import OrderDeleveRecord from './components/orderDeleveRecord'
 import { OrderKindType } from './constant'
+import OrderPayResultModal from './components/orderPayResultModal'
 
 export interface CommonOrderDetailProps {}
 
@@ -110,6 +111,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
             <OrderTransformRecord/>
           </div>
         </OrderDetailWrapper>
+        <OrderPayResultModal currentRef={payResultVisible} type={payResultType}/>
       </OrderDetailContext.Provider>
     </div>
   ) : null

src/pages/ruleSettingManage/mallRules/components/editMallModal.tsx

@@ -61,7 +61,10 @@ const classSchema: ISchema = {
             },
             logoUrl: {
               title: '商城LOGO',
-              'x-component': 'CustomUpload'
+              'x-component': 'CustomUpload',
+              "x-component-props": {
+                size: '200x200'
+              },
             },
           }
         },

src/pages/ruleSettingManage/mallRules/components/mall.tsx

@@ -140,14 +140,17 @@ const MemberInfo: React.FC<Iprops> = (props) => {
   const fetchMembersList = async (params) => {
     const res = await PublicApi.getManageWebShopWebSelfShopList(params)
     const { code, data } = res
-    const _data = data.map(item => {
-      return {
-        ...item,
-        shopId: item.id,
-        domainName: `http://${item.url}.${item.domainName}/`
-      }
-    })
-    return { totalCount: data.length, data: _data }
+    if (code === 1000) {
+      const _data = data.map(item => {
+        return {
+          ...item,
+          shopId: item.id,
+          isDefault: 0, // 默认为否
+          domainName: `http://${item.url}.${item.domainName}/`
+        }
+      })
+      return { totalCount: data.length, data: _data }
+    }
   }
 
   // 改变状态

src/pages/ruleSettingManage/mallRules/components/member.tsx

@@ -193,10 +193,16 @@ const MemberInfo: React.FC<Iprops> = (props) => {
   }
 
   const fetchMembersList = async (params) => {
-    const res = await PublicApi.getMemberManageAllProviderPage(params)
+    const res = await PublicApi.getMemberManagePlatformProviderPage(params)
     const { code, data } = res
-    let _data = data.data.map(item => ({ ...item, memberName: item.name, memberRoleId: item.memberId + '_' + item.roleId }))
-    return { totalCount: data.totalCount, data: _data }
+    if (code === 1000) {
+      let _data = data.data.map(item => ({ 
+        ...item, 
+        memberName: item.name, 
+        memberRoleId: item.memberId + '_' + item.roleId 
+      }))
+      return { totalCount: data.totalCount, data: _data }
+    }
   }
 
   const handleCancelAddMember = () => {

src/pages/ruleSettingManage/mallRules/detail.tsx

@@ -74,7 +74,7 @@ const PaymentConfigLayout = () => {
     let shopList = form.getFieldValue('shopList')
     if (shopList && shopList.length) {
       shopList = shopList.map(item => {
-        const urlArr = item.url.split('/')
+        const urlArr = item?.url.split('/')
         urlArr[urlArr.length - 1] = mId || ''
         return {
           ...item,