修复bug 提交测试

src/main.js

@@ -3,6 +3,7 @@ import ElementUI from 'element-ui'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import 'default-passive-events'
 import 'babel-polyfill'
+// import './global.scss'
 
 import 'element-ui/lib/theme-chalk/index.css'
 import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n

src/styles/index.scss

@@ -4,6 +4,7 @@
 @import './element-ui.scss';
 @import './sidebar.scss';
 
+$--color-primary: teal;
 body {
   height: 100%;
   -moz-osx-font-smoothing: grayscale;

src/styles/variables.scss

@@ -10,7 +10,8 @@ $subMenuBg:#0E605B;
 $subMenuHover:#0E605B;
 
 $sideBarWidth: 165px;
-
+/* 改变主题色变量 */
+$--color-primary: rgb(19, 129, 122);
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -112,7 +112,6 @@
                       :rules="[{ required: true, message: '请输入报名截止时间' }]">
           <el-date-picker v-model.trim="topFrom.time"
                           :disabled="basdisabled"
-                          @change="changeApplyTime"
                           type="date"
                           value-format="yyyy-MM-dd"
                           :picker-options="{
@@ -154,7 +153,7 @@
                       :rules="[
             { required: !isNotEditing(), message: '请选择缴费有效期开始' },
           ]">
-          <el-date-picker :disabled="isNotEditing() || basdisabled || !topFrom.time"
+          <el-date-picker :disabled="isNotEditing() || basdisabled "
                           v-model="topFrom.paymentValidStartDate"
                           @change="changePaymentValidStartDate"
                           placeholder="开始日期"
@@ -391,13 +390,28 @@
                        :disabled="basdisabled"
                        class="classCheckBox"
                        v-model.trim="payList.school.ischeck"></el-checkbox>
+
           <div class="chioseList">
-            <div class="chioseItem"
-                 :class="payList.school.chiose == 'ONE_OFF' ? 'active' : ''"
-                 @click="!basdisabled ? (payList.school.chiose = 'ONE_OFF') : null">
-              一次性
-            </div>
-            <div class="chioseItem"
+            <el-radio-group v-model="payList.school.chiose"
+                            size="small">
+              <el-radio-button label="ONE_OFF">一次性</el-radio-button>
+              <el-radio-button label="MONTHLY">一个月</el-radio-button>
+              <el-radio-button label="TERM">一学期</el-radio-button>
+              <el-radio-button label="YEAR">一学年</el-radio-button>
+            </el-radio-group>
+            <!-- <el-tag :effect="payList.school.chiose == 'ONE_OFF' ? 'dark' : 'plain'"
+                    @click="!basdisabled ? (payList.school.chiose = 'ONE_OFF') : null">一次性</el-tag>
+            <el-tag :effect="payList.school.chiose == 'MONTHLY' ? 'dark' : 'plain'"
+                    @click="!basdisabled ? (payList.school.chiose = 'MONTHLY') : null">一个月</el-tag>
+            <el-tag :effect="payList.school.chiose == 'TERM' ? 'dark' : 'plain'"
+                    @click="!basdisabled ? (payList.school.chiose = 'TERM') : null">一学期</el-tag>
+            <el-tag :effect="payList.school.chiose == 'YEAR' ? 'dark' : 'plain'"
+                    @click="!basdisabled ? (payList.school.chiose = 'YEAR') : null">一学年</el-tag> -->
+            <!-- <div class="chioseItem"
+                 :class="">
+
+            </div> -->
+            <!-- <div class="chioseItem"
                  :class="payList.school.chiose == 'MONTHLY' ? 'active' : ''"
                  @click="!basdisabled ? (payList.school.chiose = 'MONTHLY') : null">
               一个月
@@ -411,19 +425,25 @@
                  :class="payList.school.chiose == 'YEAR' ? 'active' : ''"
                  @click="!basdisabled ? (payList.school.chiose = 'YEAR') : null">
               一学年
-            </div>
+            </div> -->
           </div>
           <div class="inputWrap">
-            预计收费:
-            <el-input v-model.trim="payList.school.price"
-                      :disabled="basdisabled"
-                      placeholder="请输入" />
+            <div>
+              预计收费:
+              <el-input v-model.trim="payList.school.price"
+                        :disabled="basdisabled"
+                        placeholder="请输入" />
+            </div>
+
           </div>
           <div class="inputWrap">
-            备注:
-            <el-input v-model.trim="payList.school.value"
-                      :disabled="basdisabled"
-                      placeholder="请输入" />
+            <div>
+              备注:
+              <el-input v-model.trim="payList.school.value"
+                        :disabled="basdisabled"
+                        placeholder="请输入" />
+            </div>
+
           </div>
         </div>
         <div class="checkRow">
@@ -432,7 +452,14 @@
                        :disabled="basdisabled"
                        v-model.trim="payList.company.ischeck"></el-checkbox>
           <div class="chioseList">
-            <div class="chioseItem"
+            <el-radio-group v-model="payList.company.chiose"
+                            size="small">
+              <el-radio-button label="ONE_OFF">一次性</el-radio-button>
+              <el-radio-button label="MONTHLY">一个月</el-radio-button>
+              <el-radio-button label="TERM">一学期</el-radio-button>
+              <el-radio-button label="YEAR">一学年</el-radio-button>
+            </el-radio-group>
+            <!-- <div class="chioseItem"
                  :class="payList.company.chiose == 'ONE_OFF' ? 'active' : ''"
                  @click="
                 !basdisabled ? (payList.company.chiose = 'ONE_OFF') : null
@@ -455,19 +482,25 @@
                  :class="payList.company.chiose == 'YEAR' ? 'active' : ''"
                  @click="!basdisabled ? (payList.company.chiose = 'YEAR') : null">
               一学年
-            </div>
+            </div> -->
           </div>
           <div class="inputWrap">
-            预计收费:
-            <el-input placeholder="请输入"
-                      :disabled="basdisabled"
-                      v-model.trim="payList.company.price" />
+            <div>
+              预计收费:
+              <el-input placeholder="请输入"
+                        :disabled="basdisabled"
+                        v-model.trim="payList.company.price" />
+            </div>
+
           </div>
           <div class="inputWrap">
-            备注:
-            <el-input placeholder="请输入"
-                      :disabled="basdisabled"
-                      v-model.trim="payList.company.value" />
+            <div>
+              备注:
+              <el-input placeholder="请输入"
+                        :disabled="basdisabled"
+                        v-model.trim="payList.company.value" />
+            </div>
+
           </div>
         </div>
       </div>
@@ -1300,7 +1333,7 @@ export default {
       padding: 15px 11px;
     }
     .checkRow {
-      // width: 1050px;
+      min-width: 1200px;
       padding-left: 28px;
       display: flex;
       flex-direction: row;
@@ -1310,7 +1343,7 @@ export default {
 
       .el-checkbox {
         line-height: 72px;
-        width: 150px;
+        width: 120px;
       }
       .inputWrap {
         line-height: 72px;
@@ -1435,4 +1468,16 @@ input[disabled] {
   border-color: #b3b3b3;
   color: #606266;
 }
+/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
+  background-color: rgb(19, 129, 122);
+  border-color: rgb(19, 129, 122);
+  -webkit-box-shadow: -1px 0 0 0rgb (19, 129, 122);
+  box-shadow: -1px 0 0 rgb(19, 129, 122);
+  color: #fff;
+}
+/deep/.el-radio-button__inner {
+  &:hover {
+    color: rgb(19, 129, 122);
+  }
+}
 </style>

src/views/teamBuild/signupList.vue

@@ -1243,7 +1243,12 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate (time) {
-          return time.getTime() > new Date(self.paymentExpireDate.replace(/-/g, "/")).getTime()
+          if (self.paymentExpireDate) {
+            return time.getTime() > new Date(self.paymentExpireDate.replace(/-/g, "/")).getTime()
+          } else {
+            return false
+          }
+
         }
       }
     },