david 2 rokov pred
rodič
commit
d69067ca5b
3 zmenil súbory, kde vykonal 51 pridanie a 27 odobranie
  1. 1 1
      src/views/bonus/period.vue
  2. 49 25
      src/views/user/member-list.vue
  3. 1 1
      vue.config.js

+ 1 - 1
src/views/bonus/period.vue

@@ -422,7 +422,7 @@ export default {
         pageSize: this.dialogPageSize,
       }
       fetchRecordList(this.currentPeriod,paramsData).then(response => {
-        this.dialogData = response.list
+        this.dialogData = response.data.list
         this.dialogLoading = false;
       })
     },

+ 49 - 25
src/views/user/member-list.vue

@@ -357,13 +357,13 @@ export default {
 
 					this.loading = false
 					this.getData(this.currentPage, this.pageSize)
+				}).catch(error => {
+					this.$message({
+						message: error,
+						type: 'warning'
+					})
+					this.loading = false
 				})
-			}).catch(error => {
-				this.$message({
-					message: error,
-					type: 'warning'
-				})
-				this.loading = false
 			})
 		},
 		handleIsAtlasManage(isAtlas) {
@@ -393,13 +393,13 @@ export default {
 
 					this.loading = false
 					this.getData(this.currentPage, this.pageSize)
+				}).catch(error => {
+					this.loading = false
+					this.$message({
+						message: error,
+						type: 'error'
+					})
 				})
-			}).catch(error => {
-				this.$message({
-					message: error,
-					type: 'warning'
-				})
-				this.loading = false
 			})
 		},
 		handleIsRechargeManage(isRecharge) {
@@ -428,13 +428,13 @@ export default {
 					})
 					this.loading = false
 					this.getData(this.currentPage, this.pageSize)
+				}).catch(error => {
+					this.loading = false
+					this.$message({
+						message: error,
+						type: 'warning'
+				    })
 				})
-			}).catch(error => {
-				this.$message({
-					message: error,
-					type: 'warning'
-				})
-				this.loading = false
 			})
 		},
 		handleExport() {
@@ -451,13 +451,13 @@ export default {
 					})
 					this.loading = false
 					this.getData(this.currentPage, this.pageSize)
+				}).catch(error => {
+					this.loading = false
+					this.$message({
+						message: error,
+						type: 'warning'
+				    })
 				})
-			}).catch(error => {
-				this.$message({
-					message: error,
-					type: 'warning'
-				})
-				this.loading = false
 			})
 		},
 		handleModifyPassword(row){
@@ -470,6 +470,12 @@ export default {
 				this.formModifyProfile = response.data.userInfo
 				this.allOpenBank = response.data.allOpenBank
 				this.allNation = response.data.allNation
+			}).catch(error => {
+				this.$message({
+					message: error,
+					type: 'error'
+				})
+				this.loading = false
 			})
 		},
 		handleStatusActive(row) {
@@ -481,6 +487,12 @@ export default {
 				})
 				this.loading = false
 				this.getData(this.currentPage, this.pageSize)
+			}).catch(error => {
+				this.$message({
+					message: error,
+					type: 'error'
+				})
+				this.loading = false
 			})
 		},
 		handleStatusLock(row) {
@@ -492,6 +504,12 @@ export default {
 				})
 				this.loading = false
 				this.getData(this.currentPage, this.pageSize)
+			}).catch(error => {
+				this.$message({
+					message: error,
+					type: 'error'
+				})
+				this.loading = false
 			})
 		},
 		handleIsModifyPassword(row, status){
@@ -503,6 +521,12 @@ export default {
 				})
 				this.loading = false
 				this.getData(this.currentPage, this.pageSize)
+			}).catch(error => {
+				this.$message({
+					message: error,
+					type: 'error'
+				})
+				this.loading = false
 			})
 		},
 		handleModifyPasswordSubmit() {
@@ -520,7 +544,7 @@ export default {
 			}).catch(error => {
 				this.$message({
 					message: error,
-					type: 'success'
+					type: 'error'
 				})
 				this.submitPasswordButtonStat = false
 			})

+ 1 - 1
vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://172.19.234.110:9970",
+        target:"http://172.27.37.176:9970",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""