Merge branch 'fix_pay' into iteration_201218

dist/static/css/chunk-1851af68.78d605d4.css

@@ -0,0 +1 @@
+.number-input[data-v-5d883a23]{width:100%}.number-input[data-v-3c7aa9aa] .el-input__inner,.number-input[data-v-5d883a23] .el-input__inner{text-align:left}

src/views/resetTeaming/modals/extra-class.vue

@@ -113,7 +113,6 @@
               :precision="2"
               :min="0"
               @change="change"
-              :disabled="!isUserType"
               placeholder="请输入现价"
             />
           </el-form-item>

src/views/resetTeaming/modals/payment-cycle.vue

@@ -18,7 +18,7 @@
         :precision="2"
         :min="0"
         @change="paymentAmountChange"
-        :disabled="(isUserType || (isCommon && isUserType)) && isDisabled"
+        :disabled="isDisabled"
         placeholder="请输入缴费金额"
       />
     </el-form-item>

src/views/resetTeaming/modals/user-pay-form.vue

@@ -378,21 +378,12 @@ export default {
         }
       }
       if (this.cycles && this.cycles.length) {
-        if (this.paymentAmountDisabled) {
-          this.cycles = this.cycles.map((item, index) => {
-            return {
-              ...item,
-              paymentAmount: (index === 0 ? first / 100 : (other / 100))
-            }
-          })
-        } else {
-          this.cycles = this.cycles.map((item, index) => {
-            return {
-              ...item,
-              paymentAmount: (index === 0 && !item.changeed ? money : item.paymentAmount)
-            }
-          })
-        }
+        this.cycles = this.cycles.map((item, index) => {
+          return {
+            ...item,
+            paymentAmount: (index === 0 ? first / 100 : (other / 100))
+          }
+        })
       }
       // if (!money) {
         // this.$set(this.cycle, "paymentAmount", undefined);

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -65,6 +65,7 @@
         <template slot-scope="scope">
           <el-form-item
             :prop="'classs.' + type + '.cycle.' + scope.$index + '.time'"
+            :rules="[{ required: true, message: '请选择课程时长' }]"
             inline-message>
             <el-select v-model.trim="scope.row.time"
               style="width:100%!important"