Merge branch 'cjd' into dev

src/components/gitConfig/dialog.vue

@@ -2,6 +2,7 @@
   <el-dialog
     :title="dialogObj.title"
     :visible.sync="dialogObj.show"
+    :close-on-click-modal="false"
     center
     width="500px">
     <el-form :model="form" :rules="rules" ref="form">
@@ -9,10 +10,10 @@
         <el-input v-model="form.name"></el-input>
       </el-form-item>
       <el-form-item label="成本价格" prop="cost_price">
-        <el-input v-model.number="form.cost_price"></el-input>
+        <el-input v-model="form.cost_price"></el-input>
       </el-form-item>
       <el-form-item label="赠品总数" prop="gift_num">
-        <el-input v-model.number="form.gift_num" @change="giftNumChange"></el-input>
+        <el-input v-model="form.gift_num" @change="giftNumChange"></el-input>
       </el-form-item>
       <el-form-item label="库存数量" prop="stock_num">
         <div>{{form.stock_num}}</div>
@@ -49,6 +50,14 @@
                 }
             };
 
+            const validCostPrice = (rule, value, callback) => {
+                if (!/^[\.\d]*$/.test(value)) {
+                    callback(new Error('只能填数字和小数'));
+                } else {
+                    callback();
+                }
+            };
+
             return {
                 form: {
                     name: '',
@@ -64,7 +73,7 @@
                     ],
                     cost_price: [
                         {required: true, message: '请输入成本价格'},
-                        {type: 'number', message: '只能填阿拉伯数字'}
+                        {validator: validCostPrice}
                     ],
                     gift_num: [
                         {required: true, message: '请输入赠品总数'},

src/components/teacherDetail/index.vue

@@ -195,7 +195,7 @@
           <el-form-item label="关联赠品">
             <el-input v-model="form.gift_name"></el-input>
           </el-form-item>
-          <el-form-item label="订单状态">
+          <el-form-item label="赠品物流状态">
             <el-select v-model="form.deliver_status" placeholder="请选择" clearable>
               <el-option label="未发货" value="0"></el-option>
               <el-option label="已发货" value="1"></el-option>