diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index e5f98f2..1c77e92 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -76,15 +76,10 @@
                 <img v-lazy="this.lazyImg[29]" alt=""  />
             </div>
             <img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" />
-<<<<<<< HEAD
-        </el-tooltip> -->
+        </el-tooltip>
 
         <img class="sth employee" v-lazy="lazyImg[21]" alt="" />
 
-=======
-        </el-tooltip>
-<!--        点击打开资料-->
->>>>>>> 30dc4392a3d14954db2a470097760650ed0cd212
         <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
             <div slot="content">
                 <img v-lazy="lazyImg[22]" alt="" />
@@ -356,20 +351,20 @@ export default {
                 {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
             ],
           // 总盒子里面的东西 写在computed了 业务物品
-          goodsShelfTotalData:[
-              {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13,
-                  userName:'啧啧啧',
-                  sex:'男',
-                  nation:'汉',
-                  dateBirthYear:'1994',
-                  dateBirthMonth:'4',
-                  dateBirthDay:'1',
-                  address:'深圳市宝安区新安街道华联全景G1栋403',
-                  idCardNo:'4 4 1 4 2 2 1 9 9 8 0 8 1 6 8 4 7 9 '},
-              {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
-              {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
-              {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
-          ],
+        //   goodsShelfTotalData:[
+        //       {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13,
+        //           userName:'啧啧啧',
+        //           sex:'男',
+        //           nation:'汉',
+        //           dateBirthYear:'1994',
+        //           dateBirthMonth:'4',
+        //           dateBirthDay:'1',
+        //           address:'深圳市宝安区新安街道华联全景G1栋403',
+        //           idCardNo:'4 4 1 4 2 2 1 9 9 8 0 8 1 6 8 4 7 9 '},
+        //       {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
+        //       {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
+        //       {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
+        //   ],
             // goods:[/* 物品栏物品 */
             // ],
             popArr:[/* 弹窗展示的物品 */