Merge branch 'master' into online

dist/static/css/chunk-5786dd93.32695ca5.css → dist/static/css/chunk-290016f9.f8c4ecf7.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.right-code .title[data-v-61fea860]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-61fea860]{display:inline-block}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.right-code .title[data-v-8cebb9a6]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-8cebb9a6]{display:inline-block}

src/views/sporadicManager/sporadicList.vue

@@ -51,6 +51,8 @@
                        :value="9"></el-option>
             <el-option label="乐保服务"
                        :value="10"></el-option>
+            <el-option label="其它"
+                       :value="11"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -204,6 +206,8 @@
                        :value="9"></el-option>
             <el-option label="乐保服务"
                        :value="10"></el-option>
+            <el-option label="其它"
+                       :value="11"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="金额"
@@ -299,6 +303,8 @@
                        :value="9"></el-option>
             <el-option label="乐保服务"
                        :value="10"></el-option>
+            <el-option label="其它"
+                       :value="11"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="学员编号"
@@ -697,7 +703,8 @@ export default {
         '6': '福袋活动',
         '7': '上门费',
         '9': '账户充值',
-        '10': '乐保服务'
+        '10': '乐保服务',
+        '11': '其它'
       }
       return template[val]
     }