修复订单详情页无法选择电子合同

config/proxy.ts

 export default {
   '/api': {
-    'target': 'http://10.0.0.25:8100/',
+    'target': 'http://lingxi-all.wg.shushangyun.com',
     'changeOrigin': true,
     'pathRewrite': { '^/api': '' },
   }

package.json

@@ -18,7 +18,8 @@
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
-    "start:cross": "cross-env SITE_ID=352 yarn start"
+    "start:cross": "cross-env SITE_ID=352 yarn start",
+    "start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com yarn start"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [

src/constants/index.ts

@@ -44,8 +44,8 @@ export enum LAYOUT_TYPE {
 }
 
 // 本地环境跳过权限校验
-export const isDev = process.env.NODE_ENV === "development"
-// export const isDev = false
+// export const isDev = process.env.NODE_ENV === "development"
+export const isDev = false
 
 export const Environment_Status = {
   0: "所有",

src/formSchema/effects/useAsyncSelect.ts

@@ -17,10 +17,6 @@ export const useAsyncSelect = async (name, service: () => Promise<any[]>, format
     })
     linkage.loading(name)
     service().then(res => {
-      setFieldState(name, state => {
-        state.originAsyncData = res
-      })
-      linkage.loaded(name)
       if (format) {
         const [labelString, valueString] = format
         res = res.map(v => ({
@@ -28,7 +24,15 @@ export const useAsyncSelect = async (name, service: () => Promise<any[]>, format
           value: v[valueString]
         }))
       }
-      linkage.enum(name, res)
+      console.log(res)
+      setFieldState(name, state => {
+        state.loading = !state.loading
+        state.props.enum = res
+        state.originAsyncData = res
+      })
+      // linkage.loaded(name)
+      
+      // linkage.enum(name, res)
       //请求结束可以dispatch一个自定义事件收尾，方便后续针对该事件做联动
       dispatch('requestAsyncSelect', {
         name,

src/pages/transaction/saleOrder/orderPreview/components/orderElectronModal/index.tsx

@@ -167,7 +167,8 @@ const OrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
       expressionScope={{
         electronBtn
       }}
-      effects={($) => {
+      effects={($, actions) => {
+        
         useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id'])
       }}
     />

src/pages/transaction/saleOrder/orderPreview/components/orderProductTable/index.tsx

@@ -282,17 +282,19 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
     const hasPriceList = orderProductRequests.filter(v => !v.memberPrice)
     if (hasPriceList.length > 0) {
       asyncGetMemberPrice(hasPriceList).then((asyncData) => {
-        const newData = orderProductRequests.map((v, i) => {
-          if (!v.memberPrice) {
-            v.memberPrice = asyncData.find(j => j.id === v.id)?.value || ''
-          }
-          return v
-        })
-
-        ctl.setData({
-          ...data,
-          orderProductRequests: newData
-        })
+        if (asyncData.length > 0) {
+          const newData = orderProductRequests.map((v, i) => {
+            if (!v.memberPrice) {
+              v.memberPrice = asyncData.find(j => j.id === v.id)?.value || 0
+            }
+            return v
+          })
+  
+          ctl.setData({
+            ...data,
+            orderProductRequests: newData
+          })
+        }
       })
     }
   }, [orderProductRequests])

src/pages/transaction/saleOrder/orderPreview/index.tsx

@@ -228,6 +228,8 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     titleLabel: '订单号: ',
     titleValue: formData.orderNo
   } : null
+
+  console.log('123')
   return formData ? (
     <div>
       <OrderDetailContext.Provider value={formContext}>