feat: 入群配置调整

project/src/components/Home.vue

@@ -2,9 +2,6 @@
   <div>
     <div class="dataInfoBox" v-loading="data_loading">
       <div class="dataItem" v-for="(item,index) in custTotal" :key="index+'datainfo'">
-        <!-- <div class="dataItemIcon" :style="`background:${item.bg_color};color:${item.color}`">
-          <i class="el-icon-s-custom"></i>
-        </div> -->
         <img class="dataItemIcon" :src="item.img" alt="">
         <p class="dataName">{{item.name}}</p>
         <div class="data">{{item.wordBreakNameValue||item.wordBreakNameValue==0?$formatNum(item.wordBreakNameValue):'-'}}</div>

project/src/components/assembly/cancelSendListDialog.vue

@@ -30,7 +30,6 @@
       </div>
     </div>
     <div slot="footer" class="dialog-footer">
-      <!-- <el-button size="mini" @click="handleCancel">关 闭</el-button> -->
     </div>
   </el-dialog>
 </template>

project/src/components/assembly/editCon.vue

@@ -132,7 +132,6 @@
           <div class="warning_hint f12" style="margin-left:0" v-if="$getStrBytes(link.url) > 2048"> <i
               class="el-icon-warning-outline"></i> 链接地址，最多2048个字节，已超出！</div>
         </div>
-        <!-- <el-input class="input" size="small" placeholder="请输入链接地址" v-model="link.url" clearable></el-input> -->
       </div>
       <div class="lineItem">
         <label>图文封面：</label>
@@ -161,7 +160,6 @@
           <div class="warning_hint f12" style="margin-left:0" v-if="$getStrBytes(link.desc) > 512"> <i
               class="el-icon-warning-outline"></i> 消息描述，最多512个字节，已超出！</div>
         </div>
-        <!-- <el-input class="input" size="small" placeholder="请输入消息描述" v-model="link.desc" clearable></el-input> -->
       </div>
       <div class="buttons">
         <el-button type="primary" plain size="mini" @click="linkVisible = false">取消</el-button>
@@ -187,12 +185,10 @@
             <div class="warning_hint f12" style="margin-left:0" v-if="$getStrBytes(miniprogram.title) > 64"> <i
                 class="el-icon-warning-outline"></i> 小程序标题，最多64个字节，已超出！</div>
           </div>
-          <!-- <el-input class="input" size="small" placeholder="请输入小程序标题" v-model="miniprogram.title" clearable></el-input> -->
         </div>
         <div class="lineItem">
           <label><em>*</em>小程序：</label>
           <div style="flex:1">
-            <!-- <el-input class="input" size="small" placeholder="请输入小程序appID" v-model="miniprogram.appid" clearable /> -->
             <div class="select-w">
               <el-select v-model="miniprogram.appid" size="small" placeholder="请选择小程序" clearable filterable>
                 <el-option v-for="item in miniProOptions" :key="item.app_id" :label="item.app_name + ' - ' + item.platform_name" :value="item.app_id" />
@@ -237,8 +233,6 @@
               <span class="uploadImgHint" style="margin:0">在封面中心添加"播放按钮"素材。</span>
             </div>
           </div>
-
-          <!-- <el-button type="primary" plain size="mini">裁剪</el-button> -->
         </div>
         <p class="uploadImgHint" style="margin-left:20px;">*仅支持PNG及JPG，封面显示图片宽高比为5:4，且文件大小不得超过10M。</p>
         <div class="buttons">

project/src/components/assembly/screen/channel.vue

@@ -2,23 +2,6 @@
   <div class="common-screen-item">
     <label class="common-screen-label" v-if="title && title != ''"
       :style="labelWidth ? 'width:auto;padding-left:30px' : ''">{{ title }}</label>
-    <!-- <div :style="width ? 'width:' + width : ''"
-      :class="['common-screen-self-box', 'common-input-select', (valueCon && valueCon.val) && clearable ? 'common-input-select-hover' : '']">
-      <div :class="['common-screen-self-con', (!valueCon || !valueCon.val) ? 'common-screen-self-placeholder' : '']">
-        <div class="common-screen-self-con-div">
-          <span>{{ valueCon && valueCon.val ? valueCon.val : (placeholder || placeholderVal || '请选择') }}</span>
-        </div>
-        <i class="el-icon-circle-close other-icon" @click.stop="clear"></i>
-      </div>
-      <div class="common-screen-self-icon">
-        <i class="el-icon-arrow-down"></i>
-      </div>
-      <el-select v-model="value" class="common-screen-opacity-0" placeholder="请选择" @change="change">
-        <el-option v-for="item in options" :key="item.key" :label="item.val" :value="item.key">
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-select
       class="select-cls"
       v-model="value"

project/src/components/assembly/screen/customerService.vue

@@ -3,7 +3,6 @@
     <label class="common-screen-label" v-if="title && title != ''" :style="labelWidth ? 'width:' + labelWidth : ''">{{
         title
     }}</label>
-    <!-- trigger="manual" || trigger="click" -->
     <el-popover append-to-body placement="bottom" trigger="manual" v-model="visible" :disabled="disabled">
       <div
         :style="width ? 'width:' + width : ''"

project/src/components/assembly/screen/customerServiceCorpV3.vue

@@ -11,7 +11,6 @@
           <div class="common-screen-self-con-div">
             <span v-if="!final_result||final_result.length==0">{{placeholder || '请选择'}}</span>
             <template v-else>
-              <!-- <span v-for="(item,index) in final_result" :key="index">{{item.name}}{{index==final_result.length-1?'':','}}</span> -->
               <span v-for="(item,idx) in rtSelectedCorpList" :key="item.corpid + '-' + idx">{{item.corp_name}}{{idx==rtSelectedCorpList.length-1?'':','}}</span>
               <span v-if="rtSelectedCorpList.length && rtSelectedUserList.length">,</span>
               <span v-for="(item,index) in rtSelectedUserList" :key="item.corpid + '-' + index">{{item.user_name}}{{index==rtSelectedUserList.length-1?'':','}}</span>
@@ -70,35 +69,6 @@
             <div class="result_num">已选择<span>{{rtSelectedCorpList&&rtSelectedCorpList.length}}</span>个主体和<span>{{rtSelectedUserList&&rtSelectedUserList.length}}</span>名{{source == 'chatGroup' ? '群主' : '成员'}}</div>
           </div>
           <div class="member_result self-scrollbar-3">
-
-            <!-- <div v-for='(corp, corpIdx) in selectedCorpList' :key="corp.corpid">
-              <div class="corp-wrap">
-                <div class="corp-info">
-                  <i class="el-icon-s-cooperation c-46a7ff"></i>
-                  <span>{{corp.corp_name}}</span>
-                </div>
-                <i class="el-icon-close pointer" @click="onClickDelSelectedCorp(corp)"></i>
-              </div>
-
-              <div class="memberItem" v-for="(item,index) in corp.user_list" :key="item.user_id">
-                <div class="flex" style="flex:1">
-                  <img class="memberImg" :src="item.avatar" alt="">
-                  <div class="memberInfo">
-                    <div class="name">
-                      {{item.user_name}}
-                      <span :class="['status-tag', item.is_active == 0 ? 'disabled' : '']">{{ item.is_active == 1 ? '已激活' : '未激活' }}</span>
-                    </div>
-                    <div class="other">部门：{{item.corp_name}}</div>
-                    <div v-if="item.active_desc === '即将过期'" class="other">
-                      <span>{{ item.active_desc }}</span>
-                      <span v-if="item.expire_time">({{ item.expire_time.slice(0, 10) }})</span>
-                    </div>
-                  </div>
-                </div>
-                <i class="el-icon-close" style="margin-left:10px" @click="closeUser(item)"></i>
-              </div>
-            </div> -->
-
             <!-- S 全选企微数据 -->
             <div v-for='(corp, corpIdx) in rtSelectedCorpList' :key="corp.corpid">
               <div class="corp-wrap">

project/src/components/channelCode/createChannelCode.vue

@@ -169,18 +169,8 @@
           </span>
         </el-dialog>
       </div>
-
-<!--      <addLimit v-if="add_limit&&detialFlag"-->
-<!--                :user_id_list="user_id_list"-->
-<!--                :afferentVal="afferent_limit"-->
-<!--                :afferent_warn_val="warn_user"-->
-<!--                @deleUserId="(val)=>{deleUserId(val)}"-->
-<!--                @getTableData="(val)=>{afferent_limit=val}"-->
-<!--                @getVal="(val)=>{warn_user=val}"></addLimit>-->
-
       <div class="line" style="margin-top:20px"></div>
       <div style="margin-top: 20px">
-<!--        <el-button type="primary" @click="newCode_click">{{$route.query.id ? ($route.query.type =='copy' ? '复制' : '编辑') : '新建'}}活码</el-button>-->
         <el-button type="primary" @click="newCode_click">保存</el-button>
       </div>
     </div>
@@ -196,7 +186,6 @@
 
 <script>
 import dialogGroup from './dialogGroup.vue'
-// import addLimit from './addLimit.vue'
 import customerNote from './customerNote.vue'
 import selfCustomerservice from '@/components/assembly/screen/customerService.vue'
 import enterpriseTag from '@/components/assembly/screen/enterpriseTagFC.vue'
@@ -211,7 +200,6 @@ export default {
     enterpriseTag,
     editCon,
     welcomEdit,
-    // addLimit,
     customerNote,
     customerServiceCorp
   },

project/src/components/channelCode/publicTable.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-  <!-- table -->
     <el-table v-loading="loading" ref="multipleTable"
               border
               :height="height"

project/src/components/customManage/customerTransfer.vue

@@ -129,7 +129,6 @@
       </el-table-column>
       <el-table-column prop="createtime" min-width="160" label="添加时间" show-overflow-tooltip align="center">
       </el-table-column>
-      <!-- <el-table-column prop="address" width="160" label="上次对话时间" show-overflow-tooltip align="center"></el-table-column> -->
       <el-table-column width="140" label="添加渠道" show-overflow-tooltip align="center">
         <template slot-scope="scope">
           <div>{{ scope.row.add_way }}</div>

project/src/components/customManage/manage.vue

@@ -135,7 +135,6 @@
         </template>
       </el-table-column>
       <el-table-column prop="createtime" min-width="160" label="添加时间" show-overflow-tooltip align="center"></el-table-column>
-      <!-- <el-table-column prop="address" width="160" label="上次对话时间" show-overflow-tooltip align="center"></el-table-column> -->
       <el-table-column label="添加渠道" min-width="140" show-overflow-tooltip align="center">
         <template slot-scope="scope">
           <div>{{scope.row.add_way}}</div>

project/src/components/customManage/transferRecord.vue

@@ -34,8 +34,6 @@
     <!-- table -->
     <el-table ref="multipleTable" :height='height' :data="tableData" tooltip-effect="dark" style="width: 100%">
       <el-table-column prop="customer_name" label="客户名称" show-overflow-tooltip align="center"></el-table-column>
-      <!-- <el-table-column prop="takeover_username" label="接替员工" show-overflow-tooltip align="center"></el-table-column> -->
-
       <el-table-column label="转接状态" align="center" min-width="100">
         <template slot-scope="scope">
           <template v-if="scope.row.status == -1">

project/src/components/customOperate/createFriendsCircle.vue

@@ -8,12 +8,6 @@
         <i class="el-icon-close pointer" @click="$emit('close')"></i>
       </div>
     </div>
-    <!-- <div class="backBox" @click="$router.go(-1)">
-      <div class="back">
-        <i class="el-icon-back"></i>
-        <span>返回</span>
-      </div>
-    </div> -->
     <div v-if="!loading" class="bg-ffffff" style="padding: 15px 30px;">
       <h3 class="bigTitle">
         朋友圈类型

project/src/components/customOperate/createMassMsg.vue

@@ -8,12 +8,6 @@
         <i class="el-icon-close pointer" @click="$emit('close')" />
       </div>
     </div>
-    <!-- <div class="backBox" @click="$router.go(-1)">
-      <div class="back">
-        <i class="el-icon-back" />
-        <span>返回</span>
-      </div>
-    </div> -->
     <div v-if="!loading" class="bg-ffffff" style="padding: 15px 30px;">
       <h3 class="bigTitle">基础信息
         <template v-if="rule_id && !is_copy">
@@ -81,10 +75,6 @@
                 <el-checkbox label="2">女性</el-checkbox>
                 <el-checkbox label="0">未知性别</el-checkbox>
               </el-checkbox-group>
-              <!-- <el-radio v-model="gender" :disabled="!editFlag" :label="3" @change="changeEvent">全部性别</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="1" @change="changeEvent">仅男性粉丝</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="2" @change="changeEvent">仅女性粉丝</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="0" @change="changeEvent">未知性别</el-radio> -->
             </div>
             <div class="screeningItem">
               <label>付费情况：</label>

project/src/components/customOperate/friendsCircle/QWdetial.vue

@@ -77,7 +77,6 @@
           <div class="small_title">共{{info.publish_list[sendMember[acIdx].memListKey].length}}名成员</div>
           <div class="memBox">
             <div class="memBox_item" v-for="(item,index) in info.publish_list[sendMember[acIdx].memListKey]" :key="index">
-              <!-- <img :src="item.avatar" alt=""> -->
               <img src="@/assets/img/self_head.png">
               <div>
                 <div class="name">{{item.sender}}</div>

project/src/components/customOperate/friendsCircle/QWfc.vue

@@ -36,7 +36,6 @@
               </template>
               <template v-else-if="scope.row.attachments[0].msgtype == 'video'">
                 <div class="flex-align-center">
-                  <!-- <video :src="scope.row.attachments[0].video.pic_url" style="width: 60px;height: 100px;margin-right: 6px"  /> -->
                   <div class="flex-column flex-align-jus-center" style="margin-right:6px;" @click="onClickShowVideo(scope.row.attachments[0].video.pic_url)">
                     <img src="@/assets/img/video_bg.svg" style="width:60px;height:60px;" class="pointer" />
                     <el-button v-if="scope.row.attachments[0].video.pic_url" type="text" size="mini">查看视频</el-button>
@@ -88,7 +87,6 @@
                 <img :src="scope.row.attachments[0].image.pic_url" alt="" style="width: 60px;height:100%;">
               </template>
               <template v-else-if="scope.row.attachments[0].msgtype == 'video'">
-                <!-- <video :src="scope.row.attachments[0].video.pic_url" style="width: 60px;height: 100px;"></video> -->
                 <div class="flex-column flex-align-jus-center" style="width:60px;" @click="onClickShowVideo(scope.row.attachments[0].video.pic_url)">
                   <img src="@/assets/img/video_bg.svg" style="width:60px;height:60px;" class="pointer" />
                   <el-button v-if="scope.row.attachments[0].video.pic_url" type="text" size="mini">查看视频</el-button>

project/src/components/customOperate/massMsgDetail/dataTranslate.vue

@@ -27,12 +27,7 @@
       <div class="member_total">
         <div class="member_total_item">
           <div class="num">{{dataInfo.receive_fail_with_limit||dataInfo.receive_fail_with_limit==0?$formatNum(dataInfo.receive_fail_with_limit):'-'}}<span>人</span></div>
-          <div class="txt flex-align-jus-center">客户接收已达上限
-            <!-- <el-tooltip placement="top">
-              <div slot="content">每位客户每天可以接收1条群发消息，不限企业发布的群发和个人发布的群发。<br />如果超出则发送不成功，记为客户接收已达上限</div>
-              <div><i class="el-icon-question c-999"></i></div>
-            </el-tooltip> -->
-          </div>
+          <div class="txt flex-align-jus-center">客户接收已达上限</div>
         </div>
         <div class="splitLine_small"></div>
         <div class="member_total_item">

project/src/components/customOperate/sideTool/smartRadar/publicTable.vue

@@ -8,7 +8,6 @@
       <div class="flex-align-center" style="flex-wrap: wrap">
         <self-input :reset="reset" :hasLabel="false" label_name="搜索客户" @inputChange='(val)=>{customer_name = val;source_init()}'></self-input>
         <div class="flex" style="margin: 0 10px">
-<!--          <div class="f14 c-666" style="flex-shrink: 0;margin-right: 6px;width: 80px;text-align: right;">选择渠道</div>-->
           <el-select v-model="channel" size="small" clearable placeholder="请选择渠道" @change="source_init()" style="width: 200px">
             <el-option
               v-for="(item,index) in channelList"

project/src/components/customOperate/welcom_message.vue

@@ -358,7 +358,6 @@ export default {
         }else{
           item.weeks = ''
         }
-        // item.weeks = item.weeks.join(',');
 
         // S 坑：部分浏览器不支持 replaceAll 方法
         if (String.prototype.replaceAll) {

project/src/components/dataBoard/adqAccount/list.vue

@@ -20,7 +20,6 @@
         <el-popover placement="bottom" width="600" trigger="click">
           <div class="gzh_why_box">
             <div class="self-hint" style="border:none">
-              <!-- <i class="el-icon-message-solid"></i> -->
               <div>
                 <p class="fbolder f15" style="margin-bottom:8px">为什么要进行ADQ账号授权？</p>
                 <p>授权成功的账号，数据看板才可以提供数据回传和广告数据日报数据，为了获得更好的数据服务，请完成账号授权!</p>
@@ -36,8 +35,6 @@
     <!-- ADQ账号列表 -->
     <el-table ref="multipleTable" :height="height" :data="gzhData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange" row-key="account_id">
       <el-table-column type="selection" reserve-selection :selectable="checkSelectable" width="55" align="center"></el-table-column>
-      <!-- <el-table-column prop="account_name" min-width="160" label="公众号" show-overflow-tooltip align="center" fixed="left"></el-table-column> -->
-      <!-- <el-table-column prop="channel" min-width="140" label="渠道编号" show-overflow-tooltip align="center"></el-table-column> -->
       <el-table-column prop="account_id" min-width="160" label="ADQ投放账号ID" show-overflow-tooltip align="center"></el-table-column>
       <el-table-column prop="user_action_set_id" min-width="160" label="数据源ID" show-overflow-tooltip align="center"></el-table-column>
       <el-table-column prop="create_time" min-width="180" label="授权时间" show-overflow-tooltip align="center"></el-table-column>

project/src/components/dataBoard/chatGroupData.vue

@@ -22,7 +22,6 @@
           <el-button size="mini" plain @click="resetEvent">重置</el-button>
         </div>
       </div>
-      <!-- <div class="reset" @click="resetEvent">重置</div> -->
       <el-button v-if="isCanExport" class="export-btn" type="primary" size="mini" @click="onClickExport">导出Excel</el-button>
     </div>
     <div class="dataInfoBox" v-loading="dataLoading">

project/src/components/loginPage.vue

@@ -7,8 +7,6 @@
       <div class="head-top">
           <div class="head-left">
             <div class="logo_con">
-              <!-- <img src="@/assets/img/login_img/logo.png" class="small_logo" alt=""> -->
-              <!-- <span>猎羽</span> -->
               <img src="@/assets/img/login_img/logo_2023.png" class="small_logo_2023">
             </div>
             <img class="head-left-logo" src="@/assets/img/login_img/logo-box.png" alt=""></div>
@@ -72,10 +70,6 @@
     <div class="toast_container">
       <i class="el-icon-circle-close closeMask" @click="mask_flag=false"></i>
       <div class="bcg_box">
-        <!-- <div class="loginBox_title">
-          <img src="@/assets/img/cs_logo.png" alt="">
-          <span>猎羽</span>
-        </div> -->
         <img class="bcg_img" src="@/assets/img/login_box.png" alt="">
       </div>
 

project/src/components/manage/InviteIntoGroup/createData.vue

@@ -116,16 +116,19 @@
         </div>
         <p style="font-size:13px;line-height:30px;color:#f9a527;margin-left:10px">*持续邀请入群任务仅可新增不可编辑</p>
       </div>
-      <div v-show="continuously_attract_groups == 1" class="regulations">
-        <label>
-          <em>*</em>
-          单日拉群上限
-          <el-tooltip content="结合客户续拉功能使用，拉群上限 * 客户群人数上限（不设置默认为40）= 每日续拉的客户数" placement="top">
-            <div><i class="el-icon-question"></i></div>
-          </el-tooltip>
-        </label>
-        <el-input placeholder="请输入单日拉群上限" :disabled="!editFlag" style="width:300px" v-model.trim="upper_limit" clearable size="small" @input="onInputUpperLimit" />
+      <div v-show="continuously_attract_groups == 1" class="screeningCustomers" style="margin-left: 125px;padding:0 15px 20px;">
+        <div v-show="continuously_attract_groups == 1" class="regulations">
+          <label>
+            <em>*</em>
+            单日拉群上限
+            <el-tooltip content="结合客户续拉功能使用，拉群上限 * 客户群人数上限（不设置默认为40）= 每日续拉的客户数" placement="top">
+              <div><i class="el-icon-question"></i></div>
+            </el-tooltip>
+          </label>
+          <el-input placeholder="请输入单日拉群上限" :disabled="!editFlag" style="width:300px" v-model.trim="upper_limit" clearable size="small" @input="onInputUpperLimit" />
+        </div>
       </div>
+
       <!-- E 客户续拉 -->
 
       <!-- 拉群模式 -->
@@ -147,8 +150,8 @@
         </el-radio-group>
       </div>
 
-      <!-- S 客户补拉(拉群模式为“当前客服群聊”时可编辑) -->
-      <div v-show="main_msg_data.owner_type == 1" class="regulations" style="align-items: center">
+      <!-- S 客户补拉 -->
+      <div class="regulations" style="align-items: center">
         <label>
           客户补拉
         </label>
@@ -164,25 +167,27 @@
           />
         </div>
       </div>
-      <div v-show="supplementary_invite == 1" class="regulations">
-        <label>
-          <em>*</em>
-          补拉入群周期
-        </label>
-        <el-input placeholder="请输入补拉周期" :disabled="!editFlag" style="width:300px" v-model.trim="supplementary_invite_cycle" clearable size="small" @input="onInputSupplementaryInviteCycle">
-          <template slot="append">天</template>
-        </el-input>
-      </div>
-      <div class="regulations" v-show="supplementary_invite == 1">
-        <label><em>*</em>补拉时间点</label>
-        <div class="send-time-item">
-          <div class="timeNums-wrap">
-            <div class="timeNums" v-for="(item, idx) in supplementary_invite_time" :key="idx">
-              <el-time-picker v-model="supplementary_invite_time[idx]" size="mini" placeholder="请选择" value-format="HH:mm" format="HH:mm" :clearable="false" />
-              <i v-if="idx !== 0" class="el-icon-error" @click="onClickDelSupplementaryInviteTime(idx)" />
+      <div v-show="supplementary_invite == 1" class="screeningCustomers" style="margin-left: 125px;padding:0 15px 20px;">
+        <div class="regulations">
+          <label>
+            <em>*</em>
+            补拉入群周期
+          </label>
+          <el-input placeholder="请输入补拉周期" :disabled="!editFlag" style="width:300px" v-model.trim="supplementary_invite_cycle" clearable size="small" @input="onInputSupplementaryInviteCycle">
+            <template slot="append">天</template>
+          </el-input>
+        </div>
+        <div class="regulations">
+          <label><em>*</em>补拉时间点</label>
+          <div class="send-time-item">
+            <div class="timeNums-wrap">
+              <div class="timeNums" v-for="(item, idx) in supplementary_invite_time" :key="idx">
+                <el-time-picker v-model="supplementary_invite_time[idx]" size="mini" placeholder="请选择" value-format="HH:mm" format="HH:mm" :clearable="false" />
+                <i v-if="idx !== 0" class="el-icon-error" @click="onClickDelSupplementaryInviteTime(idx)" />
+              </div>
             </div>
+            <span class="add-btn" @click="onClickAddSupplementaryInviteTime"><i class="el-icon-circle-plus-outline" />新增时间点</span>
           </div>
-          <span class="add-btn" @click="onClickAddSupplementaryInviteTime"><i class="el-icon-circle-plus-outline" />新增时间点</span>
         </div>
       </div>
       <!-- E 客户补拉 -->
@@ -193,14 +198,7 @@
         <label><em>*</em>选择群聊:</label>
         <chatGroupOptions ref="chatGroupOptionsMain" width="300px" :isHasRoomId="true" :isOnJobUser="true" :chatListResult="main_msg_data.chat_group_config" @change="onChangeGlobalChatGroup" />
       </div>
-      <!-- 进群方式 -->
-      <!-- <div class="regulations" style="margin-top: 20px;">
-        <label>进群方式:</label>
-        <el-radio-group v-model="main_msg_data.join_type">
-          <el-radio :label="1">顺序进群</el-radio>
-          <el-radio :label="2">随机进群</el-radio>
-        </el-radio-group>
-      </div> -->
+
       <!-- 群管理 -->
       <div class="regulations" style="align-items: center">
         <label>渠道群管理:</label>
@@ -347,7 +345,6 @@ export default {
       user_id_list: [],
       main_msg_data: {
         owner_type: 2, // 拉群模式 2其他客服群聊 1当前客服群聊
-        // join_type: 1, // 进群方式 1:顺序进群 2:随机进群
         chat_group_config: [],
         is_limit:0
       },
@@ -524,7 +521,6 @@ export default {
             tag_type: this.afferent_tag_obj.tag
           }
 
-
           this.filter_type = res.rst.filter_type || 1
           this.add_time_later = (res.rst.customer_filter && res.rst.filter_type == 1) ? res.rst.add_time_later : ''
           this.add_times = (res.rst.customer_filter && res.rst.filter_type == 2) ? [res.rst.add_time_st || '', res.rst.add_time_et || ''] : []
@@ -543,8 +539,6 @@ export default {
             item.name = item.group_name
           })
           this.main_msg_data.is_limit = 1
-          //进群方式
-          // this.main_msg_data.join_type = res.rst.join_type
           //拉群模式
           this.main_msg_data.owner_type = res.rst.owner_type
 
@@ -612,7 +606,7 @@ export default {
         return
       }
 
-      if (this.main_msg_data.owner_type == 1 && this.supplementary_invite == 1) { // 客户补拉开启判空
+      if (this.supplementary_invite == 1) { // 客户补拉开启判空
         if (!this.supplementary_invite_cycle) {
           this.$message.warning('请输入补拉入群周期(不能为0)')
           return
@@ -655,7 +649,6 @@ export default {
         users:this.user_id_list&&this.user_id_list.length>0 ? this.user_id_list.join(',') : '',
         invite_config:JSON.stringify(this.main_msg_data.chat_group_config),
         owner_type:this.main_msg_data.owner_type,
-        // join_type:this.main_msg_data.join_type,
         customer_filter: this.customer_filter,
         // S 自定义筛选参数
         gender: this.gender && this.gender.length ? this.gender.join(',') : '',
@@ -671,15 +664,13 @@ export default {
         // E 自定义筛选参数
         invite_type: this.invite_type,
         invite_time: this.invite_type == 2 ? JSON.stringify(this.invite_time_list) : '',
-      }
 
-      // S 客户补拉参数
-      if (this.main_msg_data.owner_type == 1) {
-        params.supplementary_invite = this.supplementary_invite
-        params.supplementary_invite_cycle = this.supplementary_invite == 1 ? this.supplementary_invite_cycle : ''
-        params.supplementary_invite_time = this.supplementary_invite == 1 ? JSON.stringify(this.supplementary_invite_time) : ''
+        // S 客户补拉参数
+        supplementary_invite: this.supplementary_invite,
+        supplementary_invite_cycle: this.supplementary_invite == 1 ? this.supplementary_invite_cycle : '',
+        supplementary_invite_time: this.supplementary_invite == 1 ? JSON.stringify(this.supplementary_invite_time) : '',
+        // E 客户补拉参数
       }
-      // E 客户补拉参数
 
       if (this.isEdit) {
         params.rule_id = this.rule_id
@@ -764,12 +755,10 @@ export default {
     },
 
     onInputUpperLimit(inputVal) {
-      // this.upper_limit = getIntegerNumber(inputVal)
       this.upper_limit = getNot0IntegerNumber(inputVal)
     },
 
     onInputSupplementaryInviteCycle(inputVal) {
-      // this.supplementary_invite_cycle = getIntegerNumber(inputVal)
       this.supplementary_invite_cycle = getNot0IntegerNumber(inputVal)
     },
 
@@ -790,7 +779,7 @@ export default {
 @import "./create.scss";
 
 .listBox{
-  margin-left: 90px;
+  margin-left: 115px;
   width: 730px;
   margin-top: 10px;
   background-color: #fbfbfb;

project/src/router/allRouter.js

@@ -1,7 +1,3 @@
-// import INDEX from '@/components/Index/index.vue'
-// import Home from '@/components/Home.vue'
-// import homeData from '@/components/HomeData.vue'
-
 const INDEX = () => import(/* webpackChunkName: 'INDEX' */'@/components/Index/index.vue')
 const Home = () => import(/* webpackChunkName: 'Home' */'@/components/Home.vue')
 const homeData = () => import(/* webpackChunkName: 'homeData' */'@/components/HomeData.vue')
@@ -21,7 +17,6 @@ const chatGroup = () => import(/* webpackChunkName: 'chatGroup' */ '@/components
 const groupList = () => import(/* webpackChunkName: 'groupList' */ '@/components/customOperate/chatGroup/groupList.vue')
 const customerFriendsCircle = () => import(/* webpackChunkName: 'customerFriendsCircle' */ '@/components/customOperate/friendsCircle/index.vue')
 const sideTool = () => import(/* webpackChunkName: 'sideTool' */ '@/components/customOperate/sideTool/index.vue')
-// const createMassMsg = () => import(/* webpackChunkName: 'createMassMsg' */ '@/components/customOperate/createMassMsg.vue')
 const blackList = () => import(/* webpackChunkName: 'blackList' */ '@/components/customManage/blackList.vue')
 const welcomeMsg = () => import(/* webpackChunkName: 'welcomeMsg' */ '@/components/customOperate/welcomeMsg.vue')
 const welcom_message = () => import(/* webpackChunkName: 'welcom_message' */ '@/components/customOperate/welcom_message.vue')
@@ -551,26 +546,6 @@ export var allRouter = [
           title: '编辑欢迎语'
         }
       },
-      // {
-      //   path: 'createMassMsg',
-      //   name: 'createMassMsg',
-      //   component: createMassMsg,
-      //   meta: {
-      //     keepAlive: false,
-      //     isLogin: true,
-      //     title: '新建群发'
-      //   }
-      // },
-      // {
-      //   path: 'massMsg/:rule_id',
-      //   name: 'createMassMsg',
-      //   component: createMassMsg,
-      //   meta: {
-      //     keepAlive: false,
-      //     isLogin: true,
-      //     title: '群发详情'
-      //   }
-      // },
       {
         path: 'operatorGroup',
         name: 'operatorGroup',