Merge branch 'wxl' into online

dist/static/css/chunk-39c2a625.2c721689.css

@@ -1 +0,0 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-b82a92a6]{display:inline-block;margin-right:10px}.right-code .title[data-v-b82a92a6]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-b82a92a6] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-b82a92a6] .studentInfo .multiple.el-select{width:100%!important}

dist/static/css/chunk-51b367e4.5997a02e.css

@@ -1 +0,0 @@
-.m-container .m-wrap[data-v-c1fd1100]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-wrap .newBand[data-v-c1fd1100]{margin:0 5px 0 50px}.m-container .m-wrap .el-tooltip.micon[data-v-c1fd1100]{width:20px;height:20px;position:relative;top:12px}[data-v-c1fd1100] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-e15f5a2e.2ee26f53.css → dist/static/css/chunk-54d4422a.86c1d215.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-2418f679],.el-button--primary[data-v-2418f679]:active,.el-button--primary[data-v-2418f679]:focus,.el-button--primary[data-v-2418f679]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2418f679] .el-date-editor.el-input,[data-v-2418f679] .el-select{width:100%!important}[data-v-2418f679] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-2418f679] .el-dialog__body{padding:10px 20px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-631be6e1],.el-button--primary[data-v-631be6e1]:active,.el-button--primary[data-v-631be6e1]:focus,.el-button--primary[data-v-631be6e1]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-631be6e1] .el-date-editor.el-input,[data-v-631be6e1] .el-select{width:100%!important}[data-v-631be6e1] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-631be6e1] .el-dialog__body{padding:10px 20px}

dist/static/css/chunk-139644f9.7e0121e4.css → dist/static/css/chunk-64363d89.5499b2c3.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-617592a8]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-617592a8]{display:inline-block}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-d165bdda]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-d165bdda]{display:inline-block}

dist/static/css/chunk-65fcc06b.c5202c43.css

@@ -0,0 +1 @@
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-3226c3ec]{display:inline-block;margin-right:10px}.right-code .title[data-v-3226c3ec]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-3226c3ec] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-3226c3ec] .studentInfo .multiple.el-select{width:100%!important}

dist/static/css/chunk-35683f4b.e93c73b4.css → dist/static/css/chunk-ab4515fa.ef269fe7.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.inputStyle[data-v-29a2e64d]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-63cd9bec]{width:100px;text-align:center}.work[data-v-63cd9bec]{margin-bottom:30px;font-size:16px}.visible[data-v-68587141]{visibility:hidden}.cl-container .topFrom[data-v-68587141]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-68587141]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-68587141]{list-style:none}.cl-container .searchForm[data-v-68587141]{margin:0 30px}.btnWraps[data-v-68587141]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-68587141]{margin-right:20px}.inputStyle[data-v-68587141]{width:180px}.red[data-v-68587141]{color:red}.exportBtn[data-v-68587141]{background:#13817a}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.inputStyle[data-v-29a2e64d]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-63cd9bec]{width:100px;text-align:center}.work[data-v-63cd9bec]{margin-bottom:30px;font-size:16px}.visible[data-v-661f9985]{visibility:hidden}.cl-container .topFrom[data-v-661f9985]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-661f9985]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-661f9985]{list-style:none}.cl-container .searchForm[data-v-661f9985]{margin:0 30px}.btnWraps[data-v-661f9985]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-661f9985]{margin-right:20px}.inputStyle[data-v-661f9985]{width:180px}.red[data-v-661f9985]{color:red}.exportBtn[data-v-661f9985]{background:#13817a}

dist/static/css/chunk-28abb8f3.bc255378.css → dist/static/css/chunk-c5eb8aec.7d93793f.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-547336c8],.el-button--primary[data-v-547336c8]:active,.el-button--primary[data-v-547336c8]:focus,.el-button--primary[data-v-547336c8]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-547336c8] .el-date-editor.el-input,[data-v-547336c8] .el-select{width:100%!important}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-7407323f],.el-button--primary[data-v-7407323f]:active,.el-button--primary[data-v-7407323f]:focus,.el-button--primary[data-v-7407323f]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-7407323f] .el-date-editor.el-input,[data-v-7407323f] .el-select{width:100%!important}

dist/static/css/chunk-d1993f12.d5e12101.css

@@ -0,0 +1 @@
+.m-container .m-wrap[data-v-22ddc966]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-wrap .newBand[data-v-22ddc966]{margin:0 5px 0 10px}.m-container .m-wrap .el-tooltip.micon[data-v-22ddc966]{width:20px;height:20px;position:relative;top:12px}[data-v-22ddc966] .el-input__icon.el-icon-date{height:40px!important}

src/utils/request.js

@@ -154,15 +154,8 @@ service.interceptors.response.use(
       tryHideFullScreenLoading()
       return Promise.reject()
     }
-
-
   },
   error => {
-    // Message({
-    //   message: error.message,
-    //   type: 'error',
-    //   duration: 5 * 1000
-    // })
     vue.$message.error(error.message)
     tryHideFullScreenLoading()
     return Promise.reject(error)

src/views/businessManager/orderManager/income.vue

@@ -270,6 +270,9 @@ export default {
             })
 
             load.endLoading();
+          }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
           });
         })
         .catch(() => {});

src/views/businessManager/orderManager/incomeOne.vue

@@ -286,7 +286,10 @@ this.orderDate.push(endDate)
               }
             })
           load.endLoading();
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
     },
     search () {

src/views/helpCenter/helpCategory.vue

@@ -22,13 +22,13 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
           :total="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"
           :page-sizes="pageInfo.page_size"
           @pagination="getList"
-        />
+        /> -->
       </div>
     </div>
     <el-dialog

src/views/helpCenter/helpContent.vue

@@ -186,7 +186,9 @@ export default {
     },
     getList() {
       let params = {
-        catalogIds: this.searchForm.catalogId ? this.searchForm.catalogId[0] : null
+        catalogIds: this.searchForm.catalogId ? this.searchForm.catalogId[0] : null,
+        page: this.pageInfo.page,
+        rows: this.pageInfo.limit
       }
       helpCenterContentList(params).then(res => {
         let result = res.data;

src/views/reportForm/index.vue

@@ -83,7 +83,10 @@ export default {
             }
           })
           load.endLoading();
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
   }
   }

src/views/studentManager/studentList.vue

@@ -462,7 +462,10 @@ export default {
           })
           
           load.endLoading();
-        })  
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          }) 
       }).catch(() => {});
     },
     checkPhone(val) {

src/views/teamBuild/signupList.vue

@@ -690,7 +690,10 @@ export default {
             }
           })
           load.endLoading();
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
     },
     onGoHome () { // 确认开团

src/views/teamDetail/components/baseInfo.vue

@@ -209,7 +209,10 @@ export default {
           })
           load.endLoading();
           
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
 
     },
@@ -261,7 +264,10 @@ export default {
           })
           load.endLoading();
           
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
     }
   },

src/views/teamDetail/teamCourseList.vue

@@ -408,6 +408,9 @@ export default {
               }
             })
             load.endLoading();
+          }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
           })
         })
         .catch(() => {});

src/views/teamDetail/teamDetailedList.vue

@@ -173,7 +173,10 @@ export default {
           })
           load.endLoading();
           
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
     },
     musicalListDetailExport () { // 报表导出
@@ -221,7 +224,10 @@ export default {
             }
           })
           load.endLoading();
-        })
+        }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
+          })
       }).catch(() => { })
     }
   },

src/views/vipClass/vipList.vue

@@ -403,6 +403,9 @@ export default {
               }
             })
             load.endLoading();
+          }).catch(error => {
+            this.$message.error('导出数据失败，请连接管理员');
+            load.endLoading();
           });
         }).catch(() => {});
     },