commit

src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java

@@ -127,7 +127,7 @@ public class FitnessWalkCommonServiceImpl extends BaseServiceImpl<FitnessWalkAwa
                 redisService.setex(redisKey, CACHE_TIME, JSONObject.toJSONString(activity));
             } catch (Exception e) {
                 e.printStackTrace();
-                throw new RuntimeException("获取数据异常!");
+//                throw new RuntimeException("获取数据异常!");
             }
         }
 

src/main/resources/views/platform/zhgh/activity/fitnesswalk/punchStatistics.html

@@ -329,7 +329,7 @@ layout("/layouts/platform.html"){
             },
             unionChange(val) {
                 this.pageForm.unitId = null
-                getUnits(val).then((res) => {
+                this.$businessTool.listUnit(val).then((res) => {
                     this.unitOptions = res
                     this.doSearch()
                 })
@@ -372,9 +372,9 @@ layout("/layouts/platform.html"){
             }
         },
         created() {
-            getUnions(null).then((res) => {
+            this.$businessTool.listUnion().then((res) => {
                 this.unionOptions = res
-                return getUnits(null)
+                return this.$businessTool.listUnit()
             }).then((res) => {
                 this.unitOptions = res
                 this.getCascadersActivity()

src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html

@@ -353,7 +353,7 @@ layout("/layouts/platform.html"){
             },
             unionChange(val) {
                 this.pageForm.unitId = null
-                getUnits(val).then((res) => {
+                this.$businessTool.listUnit(val).then((res) => {
                     this.unitOptions = res
                     this.doSearch()
                 })
@@ -388,9 +388,9 @@ layout("/layouts/platform.html"){
             },
         },
         created() {
-            getUnions(null).then((res) => {
+            this.$businessTool.listUnion().then((res) => {
                 this.unionOptions = res
-                return getUnits(null)
+                return this.$businessTool.listUnit()
             }).then((res) => {
                 this.unitOptions = res
                 this.getCascadersActivity()

src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html

@@ -174,7 +174,7 @@ layout("/layouts/platform.html"){
             },
             unionChange(val) {
                 this.pageForm.unitId = null
-                getUnits(val).then((res) => {
+                this.$businessTool.listUnit(val).then((res) => {
                     this.unitOptions = res
                     this.doSearch()
                 })
@@ -192,9 +192,9 @@ layout("/layouts/platform.html"){
             }
         },
         created() {
-            getUnions(null).then((res) => {
+            this.$businessTool.listUnion().then((res) => {
                 this.unionOptions = res
-                return getUnits(null)
+                return this.$businessTool.listUnit()
             }).then((res) => {
                 this.unitOptions = res
                 this.getCascadersActivity()

src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html

@@ -171,7 +171,7 @@ layout("/layouts/platform.html"){
             },
             unionChange(val) {
                 this.pageForm.unitId = null
-                getUnits(val).then((res) => {
+                this.$businessTool.listUnit(val).then((res) => {
                     this.unitOptions = res
                     this.doSearch()
                 })
@@ -216,9 +216,9 @@ layout("/layouts/platform.html"){
             }
         },
         created() {
-            getUnions(null).then((res) => {
+            this.$businessTool.listUnion().then((res) => {
                 this.unionOptions = res
-                return getUnits(null)
+                return this.$businessTool.listUnit()
             }).then((res) => {
                 this.unitOptions = res
                 this.getCascadersActivity()

src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html

@@ -193,7 +193,7 @@ layout("/layouts/platform.html"){
             },
             unionChange(val) {
                 this.pageForm.unitId = null
-                getUnits(val).then((res) => {
+                this.$businessTool.listUnit(val).then((res) => {
                     this.unitOptions = res
                     this.doSearch()
                 })
@@ -235,9 +235,9 @@ layout("/layouts/platform.html"){
             },
         },
         created() {
-            getUnions(null).then((res) => {
+            this.$businessTool.listUnion().then((res) => {
                 this.unionOptions = res
-                return getUnits(null)
+                return this.$businessTool.listUnit()
             }).then((res) => {
                 this.unitOptions = res
                 this.getCascadersActivity()

src/main/resources/views/platform/zhgh/activity/fitnesswalk/userPunchStatistics.html

@@ -285,7 +285,7 @@ layout("/layouts/platform.html"){
             }
         },
         created() {
-            getUnions(null).then(res => {
+            this.$businessTool.listUnion().then(res => {
                 this.$set(this, 'unionOptions', res || [])
                 this.getCascadersActivity()
             })