Merge branch '03/18VipActive' into dev

src/views/app/PaymentResult.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="paymentresult">
-    <m-header v-if="headerStatus" :isBack="isBack" />
+    <m-header :isBack="isBack || false" />
     <div class="payon" v-if="pageStatus == 'on'">
       <img src="@/assets/images/pay_success.png" alt />
       <p>支付成功</p>
@@ -48,7 +48,7 @@
 
 <script>
 /* eslint-disable */
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import { browser, validStudentUrl } from "@/common/common";
 import { queryByOrderNoAuth, queryOrderInfo } from "@/api/app";
 
@@ -70,9 +70,6 @@ export default {
     };
   },
   mounted() {
-    if (!browser().android && !browser().iPhone) {
-      this.headerStatus = true;
-    }
     this.__init();
     // this.pushHistory();
     window.addEventListener(

src/views/service/GoodsOrder.vue

@@ -184,7 +184,7 @@
 <script>
 /* eslint-disable */
 import { queryStudentGoodsOrders, addGoodsSellOrder } from "./api";
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import MPayment from "@/components/MPayment";
 import Search from "@/components/Search";

src/views/service/GoodsOrderDetail.vue

@@ -190,7 +190,7 @@
 <script>
 /* eslint-disable */
 import { browser } from "@/common/util";
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import setLoading from "@/common/loading";
 import { goodsGet } from "./api";

src/views/service/GoodsSale.vue

@@ -259,7 +259,7 @@
   </div>
 </template>
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MPayment from "@/components/MPayment";
 import Protocol from "@/components/Protocol";
 import MRefund from "@/components/MRefund";

src/views/service/ServiceList.vue

@@ -33,7 +33,7 @@
   </div>
 </template>
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import search from "@/components/Search";
 import MEmpty from "@/components/MEmpty";
 import { repairTeamQueryPage } from "./api";

src/views/service/ServiceStudent.vue

@@ -85,7 +85,7 @@
   </div>
 </template>
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import search from "@/components/Search";
 import MEmpty from "@/components/MEmpty";
 import { getStudentsByTeacherOrgan } from "./api";
@@ -172,30 +172,31 @@ export default {
       let params = this.params;
       params.search = params.search ? params.search : null;
       let studentList = null;
-      // if (this.type == 'sale') {
-      // 	studentList = await queryEduStudents(params)
-      // } else {
-      studentList = await getStudentsByTeacherOrgan(params);
-      // }
-      let result = studentList.data;
-      this.loading = false;
-      if (studentList.code == 200) {
-        // 重点这句，判断是不是重复请求了
-        if (this.dataList.length > 0 && result.pageNo == 1) {
-          return;
-        }
-        params.page = result.pageNo;
-        this.dataList = this.dataList.concat(result.rows);
-        if (params.page >= result.totalPage) {
+      try {
+        studentList = await getStudentsByTeacherOrgan(params);
+        // }
+        let result = studentList.data;
+        this.loading = false;
+        if (studentList.code == 200) {
+          // 重点这句，判断是不是重复请求了
+          if (this.dataList.length > 0 && result.pageNo == 1) {
+            return;
+          }
+          params.page = result.pageNo;
+          this.dataList = this.dataList.concat(result.rows);
+          if (params.page >= result.totalPage) {
+            this.finished = true;
+          }
+          this.params.page++;
+        } else {
           this.finished = true;
         }
-        this.params.page++;
-      } else {
-        this.finished = true;
-      }
-      // 判断是否有数据
-      if (this.dataList.length <= 0) {
-        this.dataShow = false;
+        // 判断是否有数据
+        if (this.dataList.length <= 0) {
+          this.dataShow = false;
+        }
+      } catch {
+        //
       }
     },
     desensitPhone(phone) {

src/views/service/StudentRepaireRecord.vue

@@ -73,7 +73,7 @@
   </div>
 </template>
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import search from "@/components/Search";
 import { repairQueryPage } from "./api";

src/views/service/TeamStudentList.vue

@@ -45,7 +45,7 @@
   </div>
 </template>
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import search from "@/components/Search";
 import MEmpty from "@/components/MEmpty";
 import { getTeamStudentList } from "./api";

src/views/service/model/goodsList.vue

@@ -86,7 +86,7 @@
 </template>
 
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import Search from "@/components/Search";
 import { queryGoodsPage, queryGoodsCategoryPage } from "../api";

src/views/service/model/studentInstrument.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import { studentInstrumentGetList } from "../api";
 import MEmpty from "@/components/MEmpty";
 import dayjs from "dayjs";

src/views/service/studentLeBao.vue

@@ -117,7 +117,7 @@
   </div>
 </template>
 <script>
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import dayjs from "dayjs";
 import isBetween from "dayjs/plugin/isBetween";