Merge branch 'feature/7月迭代-会员' into test

src/components/allCustomers/components/customerlabelDialog.vue

@@ -36,6 +36,7 @@
                   </template>
                   <template v-else>
                     <el-radio-group v-model="item.checkBox">
+                      <!-- <el-radio v-for="(list, idx) in item.subTags" :key="idx" :label="list.tagsId" @change="changeCheck(item, false)">{{ list.tagsName }}</el-radio> -->
                       <el-radio v-for="(list, idx) in item.subTags" :key="idx" :label="list.tagsId" @change="changeCheck(item, false)" @click.native.prevent="clickitem(item,list.tagsId)">{{ list.tagsName }}</el-radio>
                     </el-radio-group>
                   </template>
@@ -62,7 +63,9 @@
                   </template>
                   <template v-else>
                     <el-radio-group v-model="item.checkBox">
-                      <el-radio v-for="(list, idx) in item.subTags" :key="idx" :label="list.tagsId" @change="changeCheck(item, false)" @click.native.prevent="clickitem(item,list.tagsId)">{{ list.tagsName }}</el-radio>
+                      <!-- <el-radio v-for="(list, idx) in item.subTags" :key="idx" :label="list.tagsId" @change="changeCheck(item, false)">{{ list.tagsName }}</el-radio> -->
+                      <el-radio v-for="(list, idx) in item.subTags" :key="idx" :label="list.tagsId" @click.native.prevent="clickitem(item,list.tagsId)">{{ list.tagsName }}</el-radio>
+                      
                     </el-radio-group>
                   </template>
                 </div>
@@ -201,13 +204,14 @@ export default {
       });
       return curTagsList;
     },
+    // 单选框双击取消
     clickitem(radio, e) {
-      console.log(radio.checkBox, 'pp', e);
       e === radio.checkBox ? radio.checkBox = '' : radio.checkBox = e;
+        this.changeCheck(radio, false);
     },
     // 切换选中
     changeCheck (item, isMultiple = true) {
-      console.log(item);
+      console.log(item, 'item');
       let count = 0;
       this.$nextTick(_ => {
         // 站位
@@ -340,7 +344,10 @@ export default {
   }
 }
 .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
-  -webkit-box-shadow: none;
-  box-shadow: none;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
+.el-radio__inner:hover {
+  border-color: none !important;
 }
 </style>