Merge remote-tracking branch 'boe/dev_0801test' into dev0731

src/views/audience/audienceManage.vue

@@ -76,7 +76,7 @@
               v-if="
                 record.status === 1
               "
-              @click="handleStop(record)"
+              @click="handleStopClick(record)"
               type="link"
               >停用
             </a-button>
@@ -167,6 +167,30 @@
     </a-modal>
     <a-modal
       v-model:visible="visibleCopyAudience"
+      title="复制受众"
+      width="680px"
+      @ok="handleCopy"
+      @cancel="handleCopyCancel"
+      okText="确认">
+      <div style="margin: 20px 20px">
+        <a-form
+          name="basic"
+          :label-col="{ span: 8 }"
+          :wrapper-col="{ span: 16 }"
+          autocomplete="off"
+          
+        >
+          <a-form-item
+            label="受众名称"
+            name="audienceName"
+          >
+            <a-input style="width:300px" show-count :maxlength="30" v-model:value="audienceName" placeholder="请填写受众名称" />
+          </a-form-item>
+        </a-form>
+      </div>
+    </a-modal>
+    <a-modal
+      v-model:visible="visibleCopyAudience1"
       :footer="null"
       :closable="false"
       style="margin-top: 250px"
@@ -201,7 +225,7 @@
                 show-count
                 :type="4"
               ></NameInput> -->
-              <a-input v-model:value="audienceName" placeholder="请输入受众名称" :maxlength="50" show-count/>
+              <a-input v-model:value="audienceName" placeholder="请输入受众名称" :maxlength="30" show-count/>
             </div>
           </div>
           <div class="btn">
@@ -253,6 +277,9 @@
         </div>
       </div>
     </a-modal> -->
+    <a-modal v-model:visible="visibleStopAudience" width="500px" title="停用受众" @ok="handleStop">
+      <div style="margin: 20px 50px">您确定要删除此受众吗？</div>
+    </a-modal>
     <a-modal v-model:visible="visibleDeleteAudience" width="500px" title="删除受众" @ok="handleDelete">
       <div style="margin: 20px 50px">您确定要删除此受众吗？</div>
     </a-modal>
@@ -282,7 +309,7 @@
             name="audienceName"
             :rules="[{ required: true, message: '请填写名称!' }]"
           >
-            <a-input style="width:300px" v-model:value="ruleForm.audienceName" placeholder="请填写名称" />
+            <a-input style="width:300px" show-count :maxlength="30" v-model:value="ruleForm.audienceName" placeholder="请填写名称" />
           </a-form-item>
 
           <a-form-item
@@ -884,6 +911,7 @@ const tableTotal = ref(0);
 const tableTotalMember = ref(0);
 const tableTotalUser = ref(0);
 const visibleCopyAudience = ref(false);
+const visibleStopAudience = ref(false);
 const visibleDeleteAudience = ref(false);
 const visibleDeleteAudienceMember = ref(false);
 const visibleBatchDeleteAudienceMember = ref(false);
@@ -1089,6 +1117,7 @@ function timeChange(time, timeStr) {
 }
 
 const handleSearch = () => {
+  searchData.value.pageNo = 1;
   console.log("handleSearch searchDate:",searchData.value);
   getAudiencePageList();
   // fetch();
@@ -1204,6 +1233,10 @@ const handleCopyClick = (record) => {
 }
 const handleCopy = async () => {
   console.log("handleCopy audienceId:",audienceId.value);
+  if(audienceName.value.length>30){
+    message.warning("受众名称小于30字符");
+    return;
+  }
   let res = await copyAudience({
     audienceId: audienceId.value,
     audienceName: audienceName.value,
@@ -1239,19 +1272,25 @@ const handlePublish = async (record,type) => {
     message.error(res.data.message);
   }
 }
-const handleStop = async (record) => {
+const handleStop = async () => {
-  console.log("handleStop record:",record);
+  console.log("handleStop:",);
   let res = await stopAudience({
-    audienceId: record.audienceId,
+    audienceId: audienceId.value,
   })
   console.log("stopAudience res:",res);
   if(res&&res.data.status==200){
     message.success("停用成功");
+    visibleStopAudience.value = false;
     getAudiencePageList();
   }else{
     message.error(res.data.message);
   }
 }
+const handleStopClick = (record) => {
+  console.log("handleStopClick record:",record);
+  audienceId.value = record.audienceId;
+  visibleStopAudience.value = true;
+}
 const handleDeleteClick = (record) => {
   console.log("handleDeleteClick record:",record);
   audienceId.value = record.audienceId;