Merge branch 'btscroll' of http://192.168.2.236:10080/zhouna/preliminary into btscroll

src/common/OptionInp.vue

@@ -5,7 +5,7 @@
     <div class="inp" @click="preClick">
       <input :type="msg.type=='number'?'tel':'text'" 
               :placeholder="msg.placeholder"
-              
+              :disabled="exclu"
               :class="[{'exclu':exclu},{'cancel':item.select==0}]"
               v-model="txt"
               @click="handleCli"

src/common/UploadImg.vue

@@ -3,7 +3,7 @@
     <div class="box">
       <ul class="upload-imgs">
         <li
-          v-if="imgLen<6"
+          v-show="imgLen<6"
           class="uploadBox"
           @click="handleUpload"
         >