url加提示

UI/src/components/Grid/BirdGridForm.js

@@ -188,7 +188,8 @@ class BirdGridForm extends React.Component {
         innerProps:field.editor.innerProps,
         width:field.width,
         action: typeof (field.editor.action) != 'undefined' ? (typeof (field.editor.action) === 'function'?field.editor.action(): field.editor.action):"",
-        beforeUpload:field.editor?field.editor.beforeUpload:undefined
+        beforeUpload:field.editor?field.editor.beforeUpload:undefined,
+        placeholder:field.placeholder
       }
       fieldOptions.push(fieldOption);
     }

UI/src/pages/sellmanage/appManagement.js

@@ -313,9 +313,10 @@ class AddminiFans extends Component {
         ]}, editor: { isRequired: true },hide :true }
         ,{ title: "应用入口", data: "enterUrl", type: "text", query: false,editor: {
             isRequired: true,
-            tips: "应用入口：点击可直接访问的链接入口，如H5链接",
-            validateRegular: "^[A-Za-z]+://[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\/.]+$",
+            tips: "应用入口：点击可直接访问的链接入口，如H5链接 格式:http(s)://{应用链接}",
+            validateRegular: "^[A-Za-z]+://[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\/.]+$"
           },
+          placeholder:'http(s)://{应用链接}',
           hide: true
         },
         {

UI/src/utils/config.js

@@ -1,69 +1,3 @@
-<<<<<<< HEAD
-const APIV1 = '/api/v1'
-const APIV2 = '/api/v2'
-const APIV3 = 'http://localhost:8004'
-const APIV4 = 'http://localhost:8005'
-
-const APIV3Auth = 'http://119.130.113.245:8030'
-const WXAPIV5= 'http://219.128.77.86:7000'
-const WXMpAPI= 'http://219.128.77.86:7001'
-module.exports =  {
-  name: '亮健营销平台',
-  prefix: 'bird',
-  footerText: 'bird admin  © 2018 360lj.com',
-  logo: '/logo.svg',
-  iconFontCSS: '/iconfont.css',
-  iconFontJS: '/iconfont.js',
-  CORS: [
-    'http://localhost:8000',
-    'http://localhost:8004',
-    'http://localhost:8005',
-    'http://119.130.113.245:7001',
-    'http://119.130.113.245:8030',
-    'http://219.128.77.86:7000',
-    'http://219.128.77.86:7001',
-  ],
-  //YQL: ['http://localhost:57251'],
-  openPages: ['/login','/'],
-  apiPrefix: '/api/v1',
-  webApiPrefix:APIV3,
-  authApiPrefix: APIV3Auth,
-  APIV1,
-  APIV2,
-  APIV3,
-  APIV3Auth,
-  APIV4,
-  WXAPIV5,
-  WXMpAPI,
-  ClientId:'f3ed0d90-3fc8-4eba-b83c-a0cfe54c174d',
-  ClientSecret:'78e238b4-c199-49ad-b619-69b6a78959d8',
-  ApplicationKey:'wechatcp',
-  color:{
-    success:'#52c41a',
-    warn:'#E6A23C',
-    error:'#ff4d4f'
-  },
-  api: {
-    // userLogin: `${APIV3}/web/login/index`,
-    userLogin: `${APIV3Auth}/ums/oauth2/accessToken?grant_type=password`,
-    // userLogout: `${APIV3}/web/login/logout`,
-    userLogout: `${APIV3Auth}/web/login/logout`,
-    //menus: `${APIV1}/menus`,
-    // menus: `${APIV3}/web/auth/menus`,
-    menus: `${APIV3Auth}/ums/oauth2/list/permission`,//?types=1 两种菜单类型 顶部菜单和左侧菜单
-    getDic:`${APIV1}/getdic?key=`,
-
-    upload:`${APIV3}/web/upload/uploadprofile`,
-    //getFileName:`/file/getName?url=`,
-    getFileName:`${APIV3}/`,
-    // getOperationToken:`${APIV3}/web/login/getOperationToken`,
-    getOperationToken: `${APIV3Auth}/ums/oauth2/accessToken?grant_type=refresh_token`,
-    // permissions:`${APIV3}/web/auth/permissions`
-    permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
-  },
-  APIV4, 
-}
-=======
 const APIV1 = '/api/v1'
 const APIV2 = '/api/v2' 
 const APIV3 = 'http://localhost:8004'
@@ -130,4 +64,3 @@ module.exports =  {
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
 }
->>>>>>> c97d7347d902fd4acbf66d00529289de585787e1

UI/src/utils/config3.js

@@ -1,13 +1,4 @@
 const APIV1 = '/api/v1'
-<<<<<<< HEAD:UI/src/utils/config3.js
-const APIV2 = '/api/v2' 
-const APIV3 = 'http://localhost:8004'
-const APIV4 = 'http://192.168.50.32:8006'
-
-const APIV3Auth = 'http://192.168.50.32:8031'
-const WXAPIV5= 'http://192.168.50.32:7000'
-const WXMpAPI= 'http://192.168.50.39:8081'
-=======
 const APIV2 = '/api/v2'
 const APIV3 = 'http://localhost:8004'
 const APIV4 = 'http://localhost:8005'
@@ -15,7 +6,6 @@ const APIV4 = 'http://localhost:8005'
 const APIV3Auth = 'http://119.130.113.245:8030'
 const WXAPIV5= 'http://219.128.77.86:7000'
 const WXMpAPI= 'http://219.128.77.86:7001'
->>>>>>> c97d7347d902fd4acbf66d00529289de585787e1:UI/src/utils/config3.js
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
@@ -24,17 +14,6 @@ module.exports =  {
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
   CORS: [
-<<<<<<< HEAD:UI/src/utils/config3.js
-  'http://localhost:8031',
-  'http://192.168.50.32:8031',
-  'http://localhost:8081',
-  'http://192.168.50.32:8081',
-  'http://192.168.50.39:8081',
-  'http://localhost:7000',
-  'http://localhost:8000',
-  'http://localhost:8004',
-  'http://192.168.50.32:8006'],
-=======
     'http://localhost:8000',
     'http://localhost:8004',
     'http://localhost:8005',
@@ -43,7 +22,6 @@ module.exports =  {
     'http://219.128.77.86:7000',
     'http://219.128.77.86:7001',
    ],
->>>>>>> c97d7347d902fd4acbf66d00529289de585787e1:UI/src/utils/config3.js
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
@@ -82,8 +60,5 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
-<<<<<<< HEAD:UI/src/utils/config3.js
-=======
   APIV4, 
->>>>>>> c97d7347d902fd4acbf66d00529289de585787e1:UI/src/utils/config3.js
 }