gjy 3 years ago
parent
commit
f7ce5021c7
1 changed files with 0 additions and 4 deletions
  1. 0 4
      src/layout/index/top/index.vue

+ 0 - 4
src/layout/index/top/index.vue

@@ -21,11 +21,7 @@
       <!-- 使用租户 -->
       
       <div class="hidden-content">
-<<<<<<< HEAD
-        <el-input ref="hiddenFocus" autocomplete="off" auto-complete="new-password" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur"
-=======
         <el-input ref="hiddenFocus" type="password" class="input-Style" readonly v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="off" 
->>>>>>> 0ac5e0a88855fee27f238cc34df869a56246713c
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>