fix

src/components/dataReview/index.vue

@@ -177,6 +177,13 @@
             </el-col>
           </el-form>
         </el-row>
+        <div
+          style="color:red;display: flex;"
+          v-if="historyData.text && historyData.text.length > 0"
+        >
+          <div style="width:110px;">审核结果反馈：</div>
+          <div>{{ historyData.text }}</div>
+        </div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="close">取 消</el-button>
@@ -394,7 +401,7 @@ export default {
               })
                 .then(_ => {
                   this.historyData = Object.assign(
-                    { id: res.data.id },
+                    { id: res.data.id, text: res.data.text },
                     JSON.parse(res.data.keyValue)
                   ); //历史数据
                   resolve();
@@ -862,7 +869,7 @@ export default {
                   if (this.checkStatus == 1) {
                     //后台设置需要审核通过才允许学习
                     this.checkFunc();
-                    return
+                    return;
                   }
                   this.$emit("callbackDataReview");
                 })
@@ -887,7 +894,7 @@ export default {
                   if (this.checkStatus == 1) {
                     //后台设置需要审核通过才允许学习
                     this.checkFunc();
-                    return
+                    return;
                   }
                   this.$emit("callbackDataReview");
                 })

src/components/login/index.vue

@@ -343,7 +343,7 @@ export default {
       }
     };
     const validatorTel = (rule, value, callback) => {
-      var reg = /^1[34578][0-9]{9}$/;
+      var reg = /^1[345789][0-9]{9}$/;
       if (!reg.test(value)) {
         return callback(new Error("请输入正确手机号码"));
       } else {

src/pages/course-detail/components/CourseTree.vue

@@ -74,6 +74,7 @@
             </template>
             <el-tag
               v-else
+              v-show="allSectionList.length > 0"
               size="mini"
               effect="light"
               :type="getStudyStatus(item1)['style']"
@@ -158,6 +159,7 @@
                 </template>
                 <el-tag
                   v-else
+                  v-show="allSectionList.length > 0"
                   size="mini"
                   effect="light"
                   :type="getStudyStatus(item2)['style']"
@@ -243,9 +245,13 @@
                         >
                       </template>
                     </template>
-                    <el-tag v-else size="mini" effect="dark">{{
-                      getStudyStatus(item3)["name"]
-                    }}</el-tag>
+                    <el-tag
+                      v-else
+                      size="mini"
+                      effect="dark"
+                      v-show="allSectionList.length > 0"
+                      >{{ getStudyStatus(item3)["name"] }}</el-tag
+                    >
                   </div>
                 </div>
               </li>
@@ -354,7 +360,6 @@ export default {
           }
         }
         if (item.sectionType == 2) {
-          console.log("aaasdasdasd", item, this.nowTime);
           if (item.liveStartTime > this.nowTime) {
             console.log("asdasdasd");
             return {
@@ -422,7 +427,7 @@ export default {
               i =>
                 i.moduleId == this.activeSection.moduleId &&
                 i.chapterId == this.activeSection.chapterId &&
-                i.sectionId == this.activeSection.sectionId && 
+                i.sectionId == this.activeSection.sectionId &&
                 i.studyStatus != 1
             ) !== -1
           ) {
@@ -441,7 +446,7 @@ export default {
               i =>
                 i.moduleId == this.activeSection.moduleId &&
                 i.chapterId == this.activeSection.chapterId &&
-                i.sectionId == this.activeSection.sectionId && 
+                i.sectionId == this.activeSection.sectionId &&
                 i.studyStatus != 1
             ) !== -1
           ) {
@@ -451,7 +456,6 @@ export default {
             };
           }
         }
-
         if (STATUSARRAY.every(i => i.studyStatus == 1)) {
           return {
             name: "已学完",
@@ -864,9 +868,9 @@ export default {
         }
       }
       this.$confirm(
-        `确定前往观看${item.sectionType == 2 ? " [直播] " : " [回放] "}${
-          item.sectionName || item.name
-        }?`,
+        `确定前往观看${
+          item.sectionType == 2 ? " [直播] " : " [回放] "
+        }${item.sectionName || item.name}?`,
         "提示",
         {
           confirmButtonText: "确定",
@@ -1140,9 +1144,9 @@ export default {
           Object.assign({}, this.allSectionList[index])
         ); //重新赋值当前节数据
         ary = this.allSectionList[index + 1];
-        if (ary && ary.studyStatus == 1){
-          ary = null
-          hasNoStudyStatus = null
+        if (ary && ary.studyStatus == 1) {
+          ary = null;
+          hasNoStudyStatus = null;
         }
       }
       if (ary) {

src/pages/login/index.vue

@@ -1103,7 +1103,7 @@ export default {
       }
     };
     const validatorTel = (rule, value, callback) => {
-      var reg = /^1[34578][0-9]{9}$/;
+      var reg = /^1[345789][0-9]{9}$/;
       if (!reg.test(value)) {
         return callback(new Error("请输入正确手机号码"));
       } else {

src/pages/payment/index.vue

@@ -138,7 +138,7 @@ export default {
   },
   data() {
     const validateTel = (rule, value, callback) => {
-      var reg = /^1[34578][0-9]{9}$/;
+      var reg = /^1[345789][0-9]{9}$/;
       if (!reg.test(value)) {
         return callback(new Error("请输入正确手机号码"));
       } else {

src/pages/person-center/handle-order/order/step-1/index.vue

@@ -191,7 +191,7 @@ export default {
       return ary;
     };
     const validateTel = (rule, value, callback) => {
-      var reg = /^1[34578][0-9]{9}$/;
+      var reg = /^1[345789][0-9]{9}$/;
       if (!reg.test(value)) {
         return callback(new Error("请输入正确手机号码"));
       } else if (this.checkTel == value) {

src/pages/person-center/handle-order/order/step-1/studentPage.vue

@@ -80,7 +80,7 @@
 export default {
   data() {
     const validateTel = (rule, value, callback) => {
-      var reg = /^1[34578][0-9]{9}$/;
+      var reg = /^1[345789][0-9]{9}$/;
       if (!reg.test(value)) {
         return callback(new Error("请输入正确手机号码"));
       } else {

src/pages/person-center/handle-rollCall/importStudent.vue

@@ -264,7 +264,7 @@ export default {
       return ary;
     };
     const validateTel = (rule, value, callback) => {
-      var reg = /^1[34578][0-9]{9}$/;
+      var reg = /^1[345789][0-9]{9}$/;
       if (!reg.test(value)) {
         return callback(new Error("请输入正确手机号码"));
       } else {

src/pages/person-center/my-course/index.vue

@@ -458,12 +458,12 @@
                   >
                   <el-button
                     v-if="
-                      (item.profileChangeStatus == 1 &&
+                      ((item.profileChangeStatus == 1 &&
                         (item.profileStatus == 1 || item.profileStatus == 2)) ||
                         (item.profileChangeStatus == 2 &&
-                          item.profileStatus != -1 &&
-                          item.educationName == '考前培训' &&
-                          item.projectName == '施工现场专业人员')
+                          item.profileStatus != -1)) &&
+                        item.educationName == '考前培训' &&
+                        item.projectName == '施工现场专业人员'
                     "
                     type="primary"
                     class="btn"
@@ -1092,7 +1092,7 @@ export default {
     },
     RequiredCourse(item) {
       return new Promise(resolve => {
-        if (item.categoryName !== "必修") {
+        // if (item.categoryName !== "必修") {
           this.$request
             .goodsGradeCheckFinishRequiredCourse({
               businessId: item.businessId,
@@ -1106,7 +1106,7 @@ export default {
                 resolve(true);
               }
             });
-        }
+        // }
       });
     },
     async goCourseDetail(item) {
@@ -1277,11 +1277,11 @@ export default {
       );
     },
     async appointment(item) {
-      // const result = await this.$request.courseoldgoodsredirect();
-      // if (result.data) {
-      //   window.open(result.data.pcUrl);
-      //   return;
-      // }
+      const result = await this.$request.courseoldgoodsredirect();
+      if (result.data) {
+        window.open(result.data.pcUrl);
+        return;
+      }
       if (item.subscribeSign !== 1) {
         this.$router.push({
           path: "/person-center/my-examination/index"

src/pages/person-center/my-info/index.vue

@@ -230,7 +230,7 @@ export default {
   },
   methods: {
     getCode() {
-      let testPhone = /^1[3|4|5|7|8][0-9]{9}$/;
+      let testPhone = /^1[3|4|5|7|8|9][0-9]{9}$/;
       if (testPhone.test(this.form.phone)) {
         this.$request
           .appcommonsmsbindNew({ tel: this.form.phone })
@@ -255,7 +255,7 @@ export default {
      * 确认提交修改
      */
     submitForm() {
-      let testPhone = /^1[3|4|5|7|8][0-9]{9}$/;
+      let testPhone = /^1[3|4|5|7|8|9][0-9]{9}$/;
       if (!testPhone.test(this.form.phone)) {
         this.$message.error("请输入正确手机号码");
         return;