fix:bug

.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 祥粤云学堂管理后台
+VUE_APP_TITLE =中正云教育管理后台
 
 # 开发环境配置
 ENV = 'development'
 
-# 祥粤云学堂管理后台/开发环境
+# 中正云教育管理后台/开发环境
 VUE_APP_BASE_API = 'http://192.168.1.222:5030/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 

.env.production

@@ -1,9 +1,9 @@
 # 页面标题
-VUE_APP_TITLE = 祥粤云学堂管理后台
+VUE_APP_TITLE = 中正云教育管理后台
 
 # 生产环境配置
 ENV = 'production'
 
-# 祥粤云学堂管理后台/生产环境
+# 中正云教育管理后台/生产环境
 VUE_APP_BASE_API = 'https://cloud.xyyxt.net/'
 VUE_APP_IMG_API = 'https://file.xyyxt.net'

.env.staging

@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 祥粤云学堂管理后台
+VUE_APP_TITLE = 中正云教育管理后台
 
 NODE_ENV = production
 
 # 预发布环境配置
 ENV = 'staging'
 
-# 祥粤云学堂管理后台/预发布环境
+# 中正云教育管理后台/预发布环境
 VUE_APP_BASE_API = 'http://192.168.1.222:6030/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'

src/layout/components/Sidebar/Logo.vue

@@ -36,7 +36,7 @@ export default {
   },
   data() {
     return {
-      title: '祥粤云学堂',
+      title: '中正云教育',
       logo: logoImg,
       logoYT:logoYTImg,
     }
@@ -80,8 +80,8 @@ export default {
       color: #fff;
       font-weight: bold;
       line-height: 50px;
-      font-size: 14px;
-      font-family: Microsoft YaHei;
+      font-size: 16px;
+      font-family: "Lucida Calligraphy", cursive, serif, sans-serif;
       vertical-align: middle;
     }
   }

src/views/2Cport/pageSettings/footer.vue

@@ -35,7 +35,6 @@
         >
       </el-table>
       <div style="text-align: center; margin-top: 20px">
-        <el-button :size="size">取 消</el-button>
         <el-button :size="size" type="primary" @click="submit">保 存</el-button>
       </div>
     </div>

src/views/2Cport/pageSettings/header.vue

@@ -40,7 +40,7 @@
             />
             <div style="flex: 1">
               <h4 style="margin: 6px 0px">{{ listData.serviceTel.tel }}</h4>
-              <div>服务时间：周一至周日 {{ listData.serviceTel.time }}</div>
+              <div>服务时间：{{ listData.serviceTel.time }}</div>
             </div>
           </el-col>
         </el-row>
@@ -182,7 +182,6 @@
       </el-table>
     </div>
     <div style="text-align: center; margin-top: 20px">
-      <el-button :size="size">取 消</el-button>
       <el-button :size="size" type="primary" @click="submit">保 存</el-button>
     </div>
   </div>

src/views/2Cport/pageSettings/links.vue

@@ -38,7 +38,6 @@
         >
       </el-table>
       <div style="text-align: center; margin-top: 20px">
-        <el-button :size="size">取 消</el-button>
         <el-button :size="size" type="primary" @click="submit">保 存</el-button>
       </div>
     </div>

src/views/Marketing/goods/commodityManageMent/add/courseContent/courseCheck.vue

@@ -18,20 +18,6 @@
         </div>
       </div>
       <div style="margin-bottom: 10px">
-        <!-- 专业 -->
-        <el-select
-          v-model="formData['majorId']"
-          placeholder="请选择专业"
-          :size="size"
-          clearable
-        >
-          <el-option
-            v-for="(items, indexs) in ProfessionalList"
-            :key="indexs"
-            :label="items.categoryName"
-            :value="items.id"
-          ></el-option>
-        </el-select>
         <!-- 搜索框 -->
         <el-input
           style="width: 230px; margin: 0px 10px"
@@ -133,7 +119,6 @@ export default {
       formData: {},
       activeLists: [],
       disCheckList: [],
-      ProfessionalList: [],
       total: 0,
     };
   },
@@ -146,8 +131,6 @@ export default {
       this.formData = JSON.parse(JSON.stringify(obj));
       //获取业务层次-课程
       this.getInfos();
-      //获取业务层次-专业
-      this.getmajInit();
       this.dialogVisibleTableBoxs = true;
       this.$nextTick(() => {
         this.$refs.multipleTable.clearSelection();
@@ -173,16 +156,6 @@ export default {
         this.total = res.total;
       });
     },
-    /**
-     * 获取业务层次-专业
-     */
-    getmajInit() {
-      this.$api
-        .inquireCourseMajor({ status: 1, businessId: this.formData.businessId })
-        .then((res) => {
-          this.ProfessionalList = res.rows;
-        });
-    },
     /**
      * 开启动画结束执行
      */

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

@@ -151,7 +151,6 @@ export default {
      * 点击添加函数
      */
     addCourse() {
-      console.log(this.listData.subjectIds)
       //搜索条件
       var data = {
         businessId: this.listData.businessId,

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

@@ -157,6 +157,8 @@ export default {
         } else {
           callback();
         }
+      }else{
+        callback();
       }
     };
     var checkExamPwd = (rule, value, callback) => {
@@ -167,6 +169,8 @@ export default {
         } else {
           callback();
         }
+      }else{
+        callback();
       }
     };
     var checkinteger = (rule, value, callback) => {

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

@@ -5,6 +5,7 @@
         <el-select
           v-model="listData.certificateTypeId"
           placeholder="请选择证书类型"
+          clearable
         >
           <el-option
             v-for="(item, index) in certificate"
@@ -24,6 +25,7 @@
         <el-select
           v-model="listData.certificateId"
           placeholder="请选择证书名称"
+          clearable
         >
           <el-option
             v-for="(item, index) in certificateList"
@@ -43,6 +45,7 @@
         <el-select
           v-model="listData.certificateTpId"
           placeholder="请选择证书模板"
+          clearable
         >
           <el-option
             v-for="(item, index) in certificateTpList"

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

@@ -69,7 +69,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院校" prop="schoolId" v-if="listData.businessId" :key="14">
+        <el-form-item
+          label="院校"
+          prop="schoolId"
+          v-if="listData.businessId"
+          :key="14"
+        >
           <el-select v-model="listData.schoolId" placeholder="请选择院校">
             <el-option
               v-for="(item, index) in newSchoolOption"
@@ -80,7 +85,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="专业" prop="majorId" v-if="listData.businessId" :key="15">
+        <el-form-item
+          label="专业"
+          prop="majorId"
+          v-if="listData.businessId"
+          :key="15"
+        >
           <el-select v-model="listData.majorId" placeholder="请选择专业">
             <el-option
               v-for="(item, index) in newMajorOption"
@@ -91,12 +101,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="科目" prop="subjectIds" v-if="listData.businessId">
+        <el-form-item
+          label="科目"
+          prop="subjectIds"
+          v-if="listData.businessId"
+        >
           <el-select
             v-model="listData.subjectIds"
             placeholder="请选择科目"
             multiple
             collapse-tags
+          @change="subjectChanges"
           >
             <el-option
               v-for="(item, index) in newSubjectOption"
@@ -221,6 +236,7 @@ export default {
       this.$set(this.listData, "majorId", "");
       this.$set(this.listData, "subjectIds", "");
       this.$set(this.listData, "handoutsId", "");
+      console.log("sendBybus", val);
       this.$bus.$emit("sendBybus");
       this.$bus.$emit("sendBybusBank");
       if (val) {
@@ -233,16 +249,14 @@ export default {
         }
       }
     },
-    /**
-     * 科目变化
-     */
-    "listData.subjectIds"(val) {
-      this.$bus.$emit("sendBybus");
-      this.$bus.$emit("sendBybusBank");
-    },
   },
   computed: { ...mapGetters(["paysupply", "educationType"]) },
   methods: {
+    subjectChanges() {
+      console.log(123)
+      this.$bus.$emit("sendBybus");
+      this.$bus.$emit("sendBybusBank");
+    },
     /**
      * 商品类型切换
      */
@@ -278,6 +292,7 @@ export default {
         );
       } //封面
       if (val === 1 || val === 6) {
+        console.log("封面", val);
         this.$bus.$emit("sendBybus");
       }
       if (val === 2) {

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

@@ -12,28 +12,41 @@
       prop="studyCount"
       style="margin-top: 10px"
     >
-      <el-input
-        :style="`max-width:${inputWidth}px;`"
+      <el-input-number
+        :controls="false"
+        :style="`max-width: ${inputWidth}px`"
         v-model="listData.studyCount"
-      ></el-input>
+        :precision="0"
+        :min="0"
+      ></el-input-number>
     </el-form-item>
     <template v-if="listData.goodsType === 1">
-      <el-form-item v-if="rules['examNumber'][0].status" label="考试次数" style="margin-top: 12px" prop="examNumber">
-        <el-input
-          :style="`max-width:${inputWidth}px;`"
+      <el-form-item
+        v-if="rules['examNumber'][0].status"
+        label="考试次数"
+        style="margin-top: 12px"
+        prop="examNumber"
+      >
+        <el-input-number
+          :controls="false"
+          :style="`max-width: ${inputWidth}px`"
           v-model="listData.examNumber"
-        ></el-input>
+          :precision="0"
+          :min="0"
+        ></el-input-number>
       </el-form-item>
       <el-form-item
         label="前培(刷题)机会"
         style="margin-top: 12px"
         prop="doNumber"
         v-if="rules['doNumber'][0].status"
-      >
-        <el-input
-          :style="`max-width:${inputWidth}px;`"
+        ><el-input-number
+          :controls="false"
+          :style="`max-width: ${inputWidth}px`"
           v-model="listData.doNumber"
-        ></el-input>
+          :precision="0"
+          :min="0"
+        ></el-input-number>
       </el-form-item>
     </template>
     <el-form-item
@@ -110,7 +123,7 @@
 
 <script>
 export default {
-  props: ["listData","rules"],
+  props: ["listData", "rules"],
   data() {
     return {
       inputWidth: 217,
@@ -141,7 +154,7 @@ export default {
     initServiceFun() {
       this.$set(this.listData, "serviceTimeNum", "");
       this.$set(this.listData, "studyTimeArrays", []);
-      this.$bus.$emit("initTimeVal")
+      this.$bus.$emit("initTimeVal");
     },
     changeDataTimeStudy(arr) {
       if (arr && arr[0] === arr[1]) {

src/views/Marketing/goods/commodityManageMent/edit/courseContent/courseCheck.vue

@@ -18,20 +18,6 @@
         </div>
       </div>
       <div style="margin-bottom: 10px">
-        <!-- 专业 -->
-        <el-select
-          v-model="formData['majorId']"
-          placeholder="请选择专业"
-          :size="size"
-          clearable
-        >
-          <el-option
-            v-for="(items, indexs) in ProfessionalList"
-            :key="indexs"
-            :label="items.categoryName"
-            :value="items.id"
-          ></el-option>
-        </el-select>
         <!-- 搜索框 -->
         <el-input
           style="width: 230px; margin: 0px 10px"
@@ -133,7 +119,6 @@ export default {
       formData: {},
       activeLists: [],
       disCheckList: [],
-      ProfessionalList: [],
       total: 0,
     };
   },
@@ -146,8 +131,6 @@ export default {
       this.formData = JSON.parse(JSON.stringify(obj));
       //获取业务层次-课程
       this.getInfos();
-      //获取业务层次-专业
-      this.getmajInit();
       this.dialogVisibleTableBoxs = true;
       this.$nextTick(() => {
         this.$refs.multipleTable.clearSelection();
@@ -173,16 +156,6 @@ export default {
         this.total = res.total;
       });
     },
-    /**
-     * 获取业务层次-专业
-     */
-    getmajInit() {
-      this.$api
-        .inquireCourseMajor({ status: 1, businessId: this.formData.businessId })
-        .then((res) => {
-          this.ProfessionalList = res.rows;
-        });
-    },
     /**
      * 开启动画结束执行
      */

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

@@ -139,7 +139,7 @@ export default {
       if (rule.required) {
         if (!value) {
           return callback(new Error(rule.message));
-        } else {
+        }else{
           callback();
         }
       } else {
@@ -178,6 +178,12 @@ export default {
         } else {
           callback();
         }
+      }else{
+        if (this.copyNums >= 0){
+          return callback(new Error(`不能小于${this.copyNums}次`));
+        }else{
+          callback()
+        }
       }
     };
     var checkExamPwd = (rule, value, callback) => {
@@ -192,6 +198,14 @@ export default {
         } else {
           callback();
         }
+      }else{
+        if (rule.field === "examNumber" && this.copyExamNumber >= 0){
+          return callback(new Error(`不能小于${this.copyExamNumber}次`));
+        }else if (rule.field === "doNumber" && this.copyDoNumber >= 0){
+          return callback(new Error(`不能小于${this.copyDoNumber}次`));
+        }else{
+          callback()
+        }
       }
     };
     var checkinteger = (rule, value, callback) => {
@@ -220,7 +234,7 @@ export default {
       listData: {
         coverUrl: "oss/images/avatar/20211013/1634097664410_1397766697",
         goodsType: "",
-        certificateTypeId: "",
+        certificateTypeId:"",
       },
       rules: {
         year: [
@@ -325,21 +339,11 @@ export default {
           },
         ],
         standPrice: [
-          {
-            required: true,
-            message: "请输入标准价格",
-            trigger: "blur",
-            type: "number",
-          },
+          { required: true, message: "请输入标准价格", trigger: "blur",type:"number" },
           { validator: validatorstandPrice, trigger: "blur" },
         ],
         lowestPrice: [
-          {
-            required: true,
-            message: "请输入最低价格",
-            trigger: "blur",
-            type: "number",
-          },
+          { required: true, message: "请输入最低价格", trigger: "blur",type:"number" },
           { validator: validatorlowestPrice, trigger: "blur" },
         ],
         standPriceJson: [
@@ -366,6 +370,7 @@ export default {
         ],
         examNumber: [
           {
+            type: "number",
             required: false,
             message: "请输入次数",
             trigger: "blur",
@@ -374,6 +379,7 @@ export default {
         ],
         doNumber: [
           {
+            type: "number",
             required: false,
             message: "请输入次数",
             trigger: "blur",
@@ -383,6 +389,7 @@ export default {
 
         studyCount: [
           {
+            type: "number",
             required: false,
             message: "请输入次数",
             trigger: "blur",

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

@@ -6,6 +6,7 @@
           v-model="listData.certificateTypeId"
           placeholder="请选择证书类型"
           @change="editStatus = true"
+          clearable
         >
           <el-option
             v-for="(item, index) in certificate"
@@ -26,6 +27,7 @@
           v-model="listData.certificateId"
           placeholder="请选择证书名称"
           @change="editStatus = true"
+          clearable
         >
           <el-option
             v-for="(item, index) in certificateList"
@@ -45,6 +47,7 @@
         <el-select
           v-model="listData.certificateTpId"
           placeholder="请选择证书模板"
+          clearable
         >
           <el-option
             v-for="(item, index) in certificateTpList"

src/views/index.vue

@@ -267,9 +267,9 @@
       <div class="flex_boxs dy_sty3">
         <p>班级数量</p>
         <div class="style_box_tran">
-          <div class="imgIBx imgUrl1 imgSize">
+          <div class="imgIBx imgUrl1 imgSize" @click="jumpPage(8, -1)">
             <p class="p1">当前累计数量</p>
-            <p class="p2" @click="jumpPage(8, -1)">
+            <p class="p2">
               {{ uploadAnimalData.allNumClass.toFixed(0) }}
             </p>
           </div>
@@ -298,9 +298,9 @@
       <div class="flex_boxs dy_sty3">
         <p class="tranSty">xxx</p>
         <div class="style_box_tran">
-          <div class="imgIBx imgUrl2 imgSize">
+          <div class="imgIBx imgUrl2 imgSize" @click="jumpPage(9, -1)">
             <p class="p1">已开班</p>
-            <p class="p2" @click="jumpPage(9, -1)">
+            <p class="p2">
               {{ uploadAnimalData.allOpenNumClass.toFixed(0) }}
             </p>
           </div>
@@ -329,9 +329,9 @@
       <div class="flex_boxs dy_sty3">
         <p class="tranSty">xxx</p>
         <div class="style_box_tran">
-          <div class="imgIBx imgUrl3 imgSize">
+          <div class="imgIBx imgUrl3 imgSize" @click="jumpPage(10, -1)">
             <p class="p1">预报名</p>
-            <p class="p2" @click="jumpPage(10, -1)">
+            <p class="p2">
               {{ uploadAnimalData.allPreNumClass.toFixed(0) }}
             </p>
           </div>
@@ -445,9 +445,9 @@
       <div class="flex_boxs dy_sty4">
         <p>学时审核</p>
         <div class="style_box_tran_yellow">
-          <div class="imgIBx imgUrl4 imgSize">
+          <div class="imgIBx imgUrl4 imgSize" @click="jumpPage(16,null,2)">
             <p class="p1">待初审</p>
-            <p class="p2" @click="jumpPage(16,null,2)">{{ uploadAnimalData.waitAllNum.toFixed(0) }}</p>
+            <p class="p2">{{ uploadAnimalData.waitAllNum.toFixed(0) }}</p>
           </div>
           <div class="li_s">
             <div class="li_s_child">
@@ -475,9 +475,9 @@
         <p class="tranSty">xxx</p>
 
         <div class="style_box_tran_yellow">
-          <div class="imgIBx imgUrl5 imgSize">
+          <div class="imgIBx imgUrl5 imgSize" @click="jumpPage(16,null,3)">
             <p class="p1">待复审</p>
-            <p class="p2" @click="jumpPage(16,null,3)">{{ uploadAnimalData.ingAllNum.toFixed(0) }}</p>
+            <p class="p2">{{ uploadAnimalData.ingAllNum.toFixed(0) }}</p>
           </div>
           <div class="li_s">
             <div class="li_s_child">

vue.config.js

@@ -5,7 +5,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = process.env.VUE_APP_TITLE || '祥粤云学堂管理后台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '中正云教育管理后台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口