Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

src/views/Marketing/goods/commodityManageMent/add/index.vue

@@ -253,7 +253,7 @@
               </el-date-picker>
               <el-tooltip class="item" effect="dark" placement="right">
                 <div slot="content">
-                  商品学习有效期：商品可以进行售卖的有效时间范围<br />
+                  商品有效期：商品可以进行售卖的有效时间范围<br />
                   1.非时间范围，不可以上架进行售卖；<br />
                   2.到了结束日期，不需要人为操作，系统自动下架商品
                 </div>
@@ -547,7 +547,7 @@
           >
             <el-select
               v-model="listData.serviceTimeType"
-              placeholder="请选择学习服务器类型"
+              placeholder="请选择学习服务期类型"
               @change="initServiceFun"
             >
               <el-option
@@ -2112,7 +2112,8 @@ export default {
     },
     judgeResult2(v) {
       if (
-        Number(this.listData.standPrice) &&
+        (Number(this.listData.standPrice) ||
+          Number(this.listData.standPrice) === 0) &&
         Number(this.listData.standPrice) < Number(this.listData.lowestPrice)
       ) {
         this.listData.lowestPrice = "";

src/views/Marketing/goods/commodityManageMent/edit/index.vue

@@ -256,7 +256,7 @@
               </el-date-picker>
               <el-tooltip class="item" effect="dark" placement="right">
                 <div slot="content">
-                  商品学习有效期：商品可以进行售卖的有效时间范围<br />
+                  商品有效期：商品可以进行售卖的有效时间范围<br />
                   1.非时间范围，不可以上架进行售卖；<br />
                   2.到了结束日期，不需要人为操作，系统自动下架商品
                 </div>
@@ -554,7 +554,7 @@
           >
             <el-select
               v-model="listData.serviceTimeType"
-              placeholder="请选择学习服务器类型"
+              placeholder="请选择学习服务期类型"
               @change="initServiceFun"
             >
               <el-option
@@ -2109,7 +2109,8 @@ export default {
     },
     judgeResult2(v) {
       if (
-        Number(this.listData.standPrice) &&
+        (Number(this.listData.standPrice) ||
+          Number(this.listData.standPrice) === 0) &&
         Number(this.listData.standPrice) < Number(this.listData.lowestPrice)
       ) {
         this.listData.lowestPrice = "";

src/views/education/classManageMent/classList/index.vue

@@ -48,7 +48,7 @@ export default {
       loading: false, //当前表单加载是否加载动画
       navText: {
         border: true,
-        title: "班级列表",
+        title: "班级管理",
         index: 0,
         ch: "条",
         num: false,

src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -140,7 +140,7 @@ export default {
       dialogDR: false,
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "学习学时记录列表",
+        title: "学习学时记录",
         index: 0,
         ch: "条",
         num: false,
@@ -484,8 +484,11 @@ export default {
         searchKey: this.formData.searchKey || "",
         searchStartTime: this.formData.searchStartTime / 1000 || "",
         searchEndTime: this.formData.searchEndTime / 1000 || "",
-        // officialStatus:
-        //   this.formData.studyStatus === 2 ? this.formData.learnStatus : "",
+        periodStatus: this.formData.periodStatus || "",
+        officialStatus:
+          this.formData.studyStatus === 2 && this.formData.periodStatus === 1
+            ? this.formData.periodPlush
+            : "",
       };
       this.exputs(data);
     },

src/views/education/classManageMent/listOfhoursToBeReviewed/index.vue

@@ -98,7 +98,7 @@ export default {
       underReiviewNums: 0,
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "学时待审核列表",
+        title: "学时待审管理",
         index: 0,
         ch: "条",
         num: false,