Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

src/views/company/companyConfig/index.vue

@@ -184,7 +184,7 @@
         </el-tab-pane>
         <el-tab-pane label="配置销售会员审核" name="companyUserConfig">
           <el-form ref="companyUserConfig" label-width="140px">
-            <el-form-item label="会员是否默认黑名单">
+            <el-form-item label="会员是否小黑屋"><!--会员是否默认黑名单-->
               <el-row>
                 <el-switch v-model="userIsDefaultBlack"></el-switch>
               </el-row>

src/views/qw/user/index.vue

@@ -275,6 +275,7 @@
           </el-button>
           <el-button
             v-if="scope.row.loginCodeUrl==null && scope.row.appKey !=null"
+            v-show="false"
             size="mini"
             type="text"
             icon="el-icon-sunny"