Yansen 5 лет назад
Родитель
Сommit
405b1750aa
4 измененных файлов: 11 добавлений и 11 удалений
  1. 7
    8
      config/config.js
  2. 2
    1
      package.json
  3. 1
    1
      src/pages/activity/groupActivity/list.jsx
  4. 1
    1
      src/pages/activity/helpActivity/list.jsx

+ 7
- 8
config/config.js Просмотреть файл

33
       },
33
       },
34
       pwa: pwa
34
       pwa: pwa
35
         ? {
35
         ? {
36
-          workboxPluginMode: 'InjectManifest',
37
-          workboxOptions: {
38
-            importWorkboxFrom: 'local',
39
-          },
40
-        }
36
+            workboxPluginMode: 'InjectManifest',
37
+            workboxOptions: {
38
+              importWorkboxFrom: 'local',
39
+            },
40
+          }
41
         : false, // default close dll, because issue https://github.com/ant-design/ant-design-pro/issues/4665
41
         : false, // default close dll, because issue https://github.com/ant-design/ant-design-pro/issues/4665
42
       // dll features https://webpack.js.org/plugins/dll-plugin/
42
       // dll features https://webpack.js.org/plugins/dll-plugin/
43
       // dll: {
43
       // dll: {
83
   targets: {
83
   targets: {
84
     ie: 11,
84
     ie: 11,
85
   },
85
   },
86
-  publicPath: './',
86
+  publicPath:
87
+    process.env.PROD_ENV === 1 ? 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/' : './',
87
   // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
88
   // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
88
   history: 'hash',
89
   history: 'hash',
89
   devtool: isAntDesignProPreview ? 'source-map' : false,
90
   devtool: isAntDesignProPreview ? 'source-map' : false,
97
     'btn-danger-bg': '#FF7E48',
98
     'btn-danger-bg': '#FF7E48',
98
     'radio-button-hover-color': '#FF7E48',
99
     'radio-button-hover-color': '#FF7E48',
99
     'radio-button-active-color': 'red',
100
     'radio-button-active-color': 'red',
100
-    
101
-
102
   },
101
   },
103
   define: {
102
   define: {
104
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:
103
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:

+ 2
- 1
package.json Просмотреть файл

5
   "description": "An out-of-box UI solution for enterprise applications",
5
   "description": "An out-of-box UI solution for enterprise applications",
6
   "scripts": {
6
   "scripts": {
7
     "analyze": "cross-env ANALYZE=1 umi build",
7
     "analyze": "cross-env ANALYZE=1 umi build",
8
-    "build": "umi build",
8
+    "build": "cross-env PROD_ENV=1 umi build",
9
+    "build:test": "cross-env PROD_ENV=2 umi build",
9
     "deploy": "cross-env ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION=site npm run site && npm run gh-pages",
10
     "deploy": "cross-env ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION=site npm run site && npm run gh-pages",
10
     "fetch:blocks": "pro fetch-blocks",
11
     "fetch:blocks": "pro fetch-blocks",
11
     "format-imports": "import-sort --write '**/*.{js,jsx,ts,tsx}'",
12
     "format-imports": "import-sort --write '**/*.{js,jsx,ts,tsx}'",

+ 1
- 1
src/pages/activity/groupActivity/list.jsx Просмотреть файл

163
           </AuthButton>,
163
           </AuthButton>,
164
             
164
             
165
           <AuthButton name="admin.taShareActivity.top" noRight={null}>
165
           <AuthButton name="admin.taShareActivity.top" noRight={null}>
166
-            <EditIcon type={row.sort === 1 ? 'cancel' : 'top'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
166
+            <EditIcon type={row.sort ? 'cancel' : 'top'} text={row.sort ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
167
           </AuthButton>,
167
           </AuthButton>,
168
 
168
 
169
           <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,
169
           <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,

+ 1
- 1
src/pages/activity/helpActivity/list.jsx Просмотреть файл

149
         </AuthButton>,
149
         </AuthButton>,
150
 
150
 
151
         <AuthButton name="admin.help.top" noRight={null}>
151
         <AuthButton name="admin.help.top" noRight={null}>
152
-          <EditIcon type={row.isMain === 1 ? 'cancel' : 'top'} text={row.isMain === 1 ? '取消推首页' : '推荐首页'} onClick={topDynamic(row, 1)} />
152
+          <EditIcon type={row.isMain ? 'cancel' : 'top'} text={row.isMain ? '取消推首页' : '推荐首页'} onClick={topDynamic(row, 1)} />
153
         </AuthButton>,
153
         </AuthButton>,
154
 
154
 
155
         <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />,
155
         <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />,