积分商城

UI/src/pages/memberGrowthSetting/memberGrowthSetting.js

@@ -77,7 +77,7 @@ class MemberGrowthSetting extends React.Component {
 
         //初始化平台来源列表
         request({
-            url: "/dataDictory/findAllOriginType",
+            url: APIV4+"/dataDictory/findAllOriginType",
             method: "get",
         }).then(result => {
             console.log(result.data);
@@ -133,7 +133,7 @@ class MemberGrowthSetting extends React.Component {
         });
 
         request({
-            url: "/pointGrowthRule/rule",
+            url: APIV4+"/pointGrowthRule/rule",
             method: "put",
             data: this.state.taskDataUpdate,
         }).then(result => {
@@ -199,8 +199,8 @@ class MemberGrowthSetting extends React.Component {
             visibleTasks: false,
         });
 
-        jrequest({
-            url: "/pointGrowthRule/rule",
+        request({
+            url: APIV4+"/pointGrowthRule/rule",
             method: "put",
             data: this.state.taskDataUpdate,
         }).then(result => {

UI/src/pages/memberLevelSetting/memberLevelSetting.js

@@ -138,9 +138,17 @@ export default class MemberLevelSettingPage extends React.Component {
     }
     
     onSaveAll = () => {
+        if(!this.state.editorState){
+            message.error("请填写等级说明");
+            return;
+        }
+        if(!this.state.lvSettings ||this.state.lvSettings.length ==0){
+            message.error("请填写等级");
+            return;
+        }
+
         let lvDesc = this.state.lvDesc?this.state.lvDesc:{};
         lvDesc.description = this.state.editorState.toHTML();
-        
         let data = {
             list: this.state.lvSettings,
             desc: lvDesc

UI/src/pages/pointsRule/pointsRule.js

@@ -39,7 +39,7 @@ class PointsRule extends React.Component {
 
         //获取积分清零规则
         request({
-            url: "/userPointClearRule/rule",
+            url: APIV4+"/userPointClearRule/rule",
             method: "get"
         }).then(result => {
             console.log(result);
@@ -52,7 +52,7 @@ class PointsRule extends React.Component {
 
         //获取积分兑换RMB规则
         request({
-            url: "/userPointRmbRule/rule",
+            url: APIV4+"/userPointRmbRule/rule",
             method: "get"
         }).then(result => {
             if(result.data)
@@ -66,7 +66,7 @@ class PointsRule extends React.Component {
 
         //获取待消费、已发放、已消费、已过期积分
         request({
-            url: "/userPointStastic/point",
+            url: APIV4+"/userPointStastic/point",
             method: "get"
         }).then(result => {
             if(result.data){
@@ -82,7 +82,7 @@ class PointsRule extends React.Component {
 
         //获取积分说明
         request({
-            url: "/userPointLog/desc",
+            url: APIV4+"/userPointLog/desc",
             method: "get"
         }).then(result => {
             let content = "";
@@ -102,7 +102,7 @@ class PointsRule extends React.Component {
     refreshData = () => {
         //获取积分说明
         request({
-            url: "/userPointLog/desc",
+            url: APIV4+"/userPointLog/desc",
             method: "get"
         }).then(result => {
             if(result.data){
@@ -147,7 +147,7 @@ class PointsRule extends React.Component {
             visiblePointsClearRule: false,
         });
         request({
-            url: "/userPointClearRule/rule",
+            url: APIV4+"/userPointClearRule/rule",
             method: "post",
             data: { "description": this.state.selectedPointsClearRule }
         }).then(result => {
@@ -201,7 +201,7 @@ class PointsRule extends React.Component {
             visiblePointsToRMB: false,
         });
         request({
-            url: "/userPointRmbRule/rule",
+            url: APIV4+"/userPointRmbRule/rule",
             method: "post",
             data: { "description": this.state.selectedPoints + "积分" + "=" + this.state.selectedRMB + "人民币" }
         }).then(result => {
@@ -217,7 +217,7 @@ class PointsRule extends React.Component {
     //弹出证据链查看模态框
     showModalEvidence = (data) => {
         request({
-            url: "/userGrowthLog/logById?id=" + data.id,
+            url: APIV4+"/userGrowthLog/logById?id=" + data.id,
             method: "get"
         }).then((res) => {
             // console.log(res);
@@ -254,12 +254,12 @@ class PointsRule extends React.Component {
 
     // 保存积分说明至数据库
     savePointStatemen = () => {
-        let pointDesc = this.state.pointDesc;
+        let pointDesc = this.state.pointDesc?this.state.pointDesc:{};
         pointDesc.description = this.state.editorState.toHTML();
 
         console.log(pointDesc);
         request({
-            url: "/userPointLog/desc",
+            url: APIV4+"/userPointLog/desc",
             method: "post",
             data: pointDesc
         }).then(result => {

UI/src/utils/config.js

@@ -1,12 +1,11 @@
 const APIV1 = '/api/v1'
 const APIV2 = '/api/v2' 
 const APIV3 = 'http://localhost:8004'
-const APIV4 = 'http://localhost:8005'
+const APIV4 = 'http://192.168.50.32:8005'
 
 const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
 const WXAPIV5= 'http://192.168.50.32:7000'
-// const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
-const WXMpAPI= 'http://localhost:8081'
+const WXMpAPI= 'http://192.168.50.39:8081'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
@@ -14,24 +13,22 @@ module.exports =  {
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: ['http://localhost:8000',
-  'http://localhost:8030',
+  CORS: [
+  'http://localhost:8031',
   'http://192.168.50.32:8031',
-  'http://192.168.50.32:8030',
-  'http://localhost:8030',
-  'http://192.168.10.129:8081',
-  'http://192.168.50.32:8081',
   'http://localhost:8081',
-  'http://localhost:8004',
-  'http://localhost:8005',
-  'http://localhost:7000',  
+  'http://192.168.50.32:8081',
+  'http://192.168.50.39:8081',
   'http://192.168.50.32:7000',
+  'http://localhost:8000',
+  'http://localhost:8004',
+  'http://192.168.50.32:8005',
   'http://192.168.50.32:13001'
-  ],
+],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
-  webApiPrefix: APIV3,
+  webApiPrefix:APIV3,
   authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,

UI/src/utils/config_test.js

@@ -1,11 +1,12 @@
 const APIV1 = '/api/v1'
 const APIV2 = '/api/v2' 
 const APIV3 = 'http://localhost:8004'
-const APIV4 = 'http://192.168.50.32:8006'
+const APIV4 = 'http://localhost:8005'
 
-const APIV3Auth = 'http://192.168.50.32:8031'
+const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
 const WXAPIV5= 'http://192.168.50.32:7000'
-const WXMpAPI= 'http://192.168.50.39:8081'
+// const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
+const WXMpAPI= 'http://localhost:8081'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
@@ -13,20 +14,24 @@ module.exports =  {
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: [
-  'http://localhost:8031',
+  CORS: ['http://localhost:8000',
+  'http://localhost:8030',
   'http://192.168.50.32:8031',
-  'http://localhost:8081',
-  'http://192.168.50.32:8081',
+  'http://192.168.50.32:8030',
+  'http://localhost:8030',
+  'http://192.168.10.129:8081',
   'http://192.168.50.39:8081',
-  'http://localhost:7000',
-  'http://localhost:8000',
+  'http://localhost:8081',
   'http://localhost:8004',
-  'http://192.168.50.32:8006'],
+  'http://localhost:8005',
+  'http://localhost:7000',  
+  'http://192.168.50.32:7000',
+  'http://192.168.50.32:13001'
+  ],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
-  webApiPrefix:APIV3,
+  webApiPrefix: APIV3,
   authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,
@@ -63,4 +68,4 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
-}
+}

mpwechatApp/publish/config.properties

@@ -1,13 +1,13 @@
-resource.Locations = D:\\public\\
-resource.href = /public/
-project.weburl = http://219.128.77.86:7001
-#project.weburl = http://localhost:8081
-material.Locations = D:\\public\\material
-material.href= /public/material
-
-
-#resource.Locations = /home/www/appCenterTest/public/
+#resource.Locations = D:\\public\\
 #resource.href = /public/
-#project.weburl = http://192.168.50.39:8081
-#material.Locations = /home/www/appCenterTest/public/material
+#project.weburl = http://219.128.77.86:7001
+##project.weburl = http://localhost:8081
+#material.Locations = D:\\public\\material
 #material.href= /public/material
+
+
+resource.Locations = /home/www/appCenterTest/public/
+resource.href = /public/
+project.weburl = http://192.168.50.39:8081
+material.Locations = /home/www/appCenterTest/public/material
+material.href= /public/material