update

lottery/WeCom.html

@@ -816,7 +816,7 @@
           </div>
         </div>
         <!-- 标签筛选组件 -->
-        <select-tag :show-Client-Tag.sync="showClientTag" @add="handleAdd"></select-tag>
+        <select-tag :label-Filter.sync="labelFilter" :show-Client-Tag.sync="showClientTag" @add="handleAdd"></select-tag>
         <!-- 客户、客户群列表 -->
         <div class="client_content" :style="activeTab === '客户' ? 'top: 144px' : 'top: 100px'">
           <div class="client_content_box">
@@ -967,7 +967,7 @@
         activeTab: '客户',
         activeTag: '全部',
         loading: false,
-
+        labelFilter: 0,
         activeTabbar: 'home',
         keyword: '',
         showClientTag: false,
@@ -1314,6 +1314,9 @@
         this.activeTag = tag
         if (tag === '按客户标签筛选') {
           this.showClientTag = true
+        } else {
+          this.tagIds = []
+          this.pageClient()
         }
       },
       // 客户详情
@@ -1349,7 +1352,6 @@
           }).then(result => {
             let { data, code, msg } = result
             if (code === 1) {
-              // this.taskList = data.records || []
               if (data) {
                 this.wxcpLoginRegister(data)
               }
@@ -1379,7 +1381,7 @@
             vant.Toast.fail(msg)
           }
         }).finally(() => {
-          console.log('this.aiCallToken', this.aiCallToken)
+          window.location.href = `https://test.wefanbot.com:18211/?token=${this.aiCallToken}`
         })
       },
       // 勾选客户变更

lottery/clientDynamicsDetail.html

@@ -519,7 +519,7 @@
               <div class="follow_item">
                 <div class="follow_item_time">
                   <span class="item_time">{{timeFormat(item.createdTime, 'hh:mm')}}</span>
-                  <span v-if="item.bizCode === 'READ'">客户动态</span>
+                  <span v-if="item.bizCode === 'READ'">{{item.title}}</span>
                   <span v-else-if="item.bizCode === 'SUBMIT'">留资</span>
                 </div>
                 <div class="item_box">
@@ -529,7 +529,7 @@
                   </div>
                   <div class="item_content">
                     <img :src="item.cover || './img/qw/mem_icon.png'" alt="">
-                    <div class="item_tip" v-if="item.bizCode === 'READ'">{{item.title}}</div>
+                    <div class="item_tip" v-if="item.bizCode === 'READ'">{{item.content}}</div>
                     <div class="item_tip2" v-else-if="item.bizCode === 'SUBMIT'">
                       <div>{{item.name}}</div>
                       <div>{{item.phone}}</div>

lottery/clientSop.html

@@ -185,6 +185,43 @@
                   </div>
                 </div>
               </div>
+              <div class="sop_body" v-if="item.matters && item.matters.length > 0">
+                <div v-for="(m, mIndex) in item.matters" :key="mIndex">
+                  <div v-if="m.matterType === 0" class="sop_c" >
+                    <span>文章：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 31" class="sop_c">
+                    <span>海报：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 2" class="sop_c">
+                    <span>表单：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 3" class="sop_c">
+                    <span>文件：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 15" class="sop_c">
+                    <span>视频：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 16" class="sop_c">
+                    <span>视频链接：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 51" class="sop_c">
+                    <span>视频号：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 33" class="sop_c">
+                    <span>小程序：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 17" class="sop_c">
+                    <span>图集：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 19" class="sop_c">
+                    <span>图集项图片：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 4" class="sop_c">
+                    <span>外部链接：{{ m.title }}</span>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </el-tab-pane>
@@ -232,6 +269,43 @@
                   </div>
                 </div>
               </div>
+              <div class="sop_body" v-if="item.matters && item.matters.length > 0">
+                <div v-for="(m, mIndex) in item.matters" :key="mIndex">
+                  <div v-if="m.matterType === 0" class="sop_c">
+                    <span>文章：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 31" class="sop_c">
+                    <span>海报：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 2" class="sop_c">
+                    <span>表单：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 3" class="sop_c">
+                    <span>文件：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 15" class="sop_c">
+                    <span>视频：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 16" class="sop_c">
+                    <span>视频链接：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 51" class="sop_c">
+                    <span>视频号：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 33" class="sop_c">
+                    <span>小程序：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 17" class="sop_c">
+                    <span>图集：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 19" class="sop_c">
+                    <span>图集项图片：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 4" class="sop_c">
+                    <span>外部链接：{{ m.title }}</span>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </el-tab-pane>
@@ -365,6 +439,7 @@
       },
       //获取执行中的sop计划
       executeSopList (status) {
+        this.externalUserId = ''
         fetch(this.httpUrl + `/scrm/v1/wxcp-sop/p/executeSopList?externalUserId=${this.externalUserId}&memberId=${this.memberId}&bId=${this.bId}&status=${status || 0}`)
           .then(res => {
             return res.json()

lottery/groupSop.html

@@ -185,6 +185,43 @@
                   </div>
                 </div>
               </div>
+              <div class="sop_body" v-if="item.matters && item.matters.length > 0">
+                <div v-for="(m, mIndex) in item.matters" :key="mIndex">
+                  <div v-if="m.matterType === 0" class="sop_c">
+                    <span>文章：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 31" class="sop_c">
+                    <span>海报：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 2" class="sop_c">
+                    <span>表单：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 3" class="sop_c">
+                    <span>文件：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 15" class="sop_c">
+                    <span>视频：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 16" class="sop_c">
+                    <span>视频链接：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 51" class="sop_c">
+                    <span>视频号：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 33" class="sop_c">
+                    <span>小程序：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 17" class="sop_c">
+                    <span>图集：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 19" class="sop_c">
+                    <span>图集项图片：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 4" class="sop_c">
+                    <span>外部链接：{{ m.title }}</span>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </el-tab-pane>
@@ -232,6 +269,43 @@
                   </div>
                 </div>
               </div>
+              <div class="sop_body" v-if="item.matters && item.matters.length > 0">
+                <div v-for="(m, mIndex) in item.matters" :key="mIndex">
+                  <div v-if="m.matterType === 0" class="sop_c">
+                    <span>文章：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 31" class="sop_c">
+                    <span>海报：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 2" class="sop_c">
+                    <span>表单：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 3" class="sop_c">
+                    <span>文件：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 15" class="sop_c">
+                    <span>视频：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 16" class="sop_c">
+                    <span>视频链接：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 51" class="sop_c">
+                    <span>视频号：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 33" class="sop_c">
+                    <span>小程序：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 17" class="sop_c">
+                    <span>图集：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 19" class="sop_c">
+                    <span>图集项图片：{{ m.title }}</span>
+                  </div>
+                  <div v-if="m.contentType === 4" class="sop_c">
+                    <span>外部链接：{{ m.title }}</span>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </el-tab-pane>

lottery/js/select-tag.js

@@ -14,13 +14,13 @@ var demo_str = `
       </van-search>
     </div>
     <van-radio-group v-model="tagType" direction="horizontal" v-if="showLabelFilter">
-      <van-radio :name="1">
+      <van-radio :name="0">
         标签满足其一
         <template #icon="props">
           <div :class="props.checked ? 'check_div_active' : 'check_div'"></div>
         </template>
       </van-radio>
-      <van-radio :name="0">
+      <van-radio :name="1">
         标签同时满足
         <template #icon="props">
           <div :class="props.checked ? 'check_div_active' : 'check_div'"></div>
@@ -60,7 +60,7 @@ var demoComponent = Vue.extend({
       httpUrl: '',
       env: '',
       keyword: '',
-      tagType: 1,
+      tagType: 0,
       popupVisible: this.showClientTag, // 本地状态，避免直接修改 prop
       tagGroupList: [],
       showTagList: [],
@@ -69,7 +69,7 @@ var demoComponent = Vue.extend({
   props: {
     labelFilter: {
       type: Number,
-      default: 1
+      default: 0
     },
     showClientTag: {
       type: Boolean,

lottery/qw/clientMass.html

@@ -918,13 +918,13 @@
                   <div class="con_data_del"@click="handleDelCond(index, condIndex)">删除</div>
                 </div>
                 <van-radio-group class="tag_radio" v-model="cond.labelFilter" direction="horizontal">
-                  <van-radio :name="1" class="tag_radio_item">
+                  <van-radio :name="0" class="tag_radio_item">
                     标签满足其一
                     <template #icon="props">
                       <div :class="props.checked ? 'check_div_active' : 'check_div'"></div>
                     </template>
                   </van-radio>
-                  <van-radio :name="0">
+                  <van-radio :name="1">
                     标签同时满足
                     <template #icon="props">
                       <div :class="props.checked ? 'check_div_active' : 'check_div'"></div>

lottery/qw/qwJxs.html

@@ -254,6 +254,10 @@
     font-size: 14px;
     color: #222222;
     line-height: 20px;
+    width: 120px; /* 必须设置宽度 */
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
   .top_data_right {
     display: flex;

lottery/qw/taskDetail.html

@@ -597,7 +597,7 @@
           <div class="clue_data">
             <div class="clue_data_item">
               <div class="ai_title">添加企微时间：</div>
-              <div class="clue_data_time">{{timeFormat(taskData.createdTime)}}</div>
+              <div class="clue_data_time">{{timeFormat(taskData.clientAddTime)}}</div>
             </div>
             <div class="clue_data_item">
               <div class="ai_title">线索分类：</div>
@@ -628,7 +628,7 @@
               <div class="follow_item">
                 <div class="follow_item_time">
                   <span class="item_time">{{timeFormat(item.createdTime, 'hh:mm')}}</span>
-                  <span v-if="item.bizCode === 'READ'">客户动态</span>
+                  <span v-if="item.bizCode === 'READ'">{{item.title}}</span>
                   <span v-else-if="item.bizCode === 'SUBMIT'">留资</span>
                 </div>
                 <div class="item_box">
@@ -638,7 +638,7 @@
                   </div>
                   <div class="item_content">
                     <img :src="item.cover || '../img/qw/mem_icon.png'" alt="">
-                    <div class="item_tip" v-if="item.bizCode === 'READ'">{{item.title}}</div>
+                    <div class="item_tip" v-if="item.bizCode === 'READ'">{{item.content}}</div>
                     <div class="item_tip2" v-else-if="item.bizCode === 'SUBMIT'">
                       <div>{{item.name}}</div>
                       <div>{{item.phone}}</div>

lottery/qw/toDoTask.html

@@ -190,8 +190,7 @@
           <div class="task_item_line"></div>
           <div class="task_item_des">
             <div class="task_des_title">任务描述：</div>
-            <div class="task_des" v-if="taskType === 'CLIENT_LOG'" v-html="item.taskDesc"></div>
-            <div class="task_des" v-else>{{item.taskDesc}}</div>
+            <div class="task_des" v-html="item.taskDesc"></div>
           </div>
           <div class="task_btn_box" @click="handleTaskDetail(item)">
             <div :class="item.isRead ? 'task_btn_read' : 'task_btn'" v-if="taskType === 'MONITORED_MESSAGE'">{{item.isRead ? '已读' : '去回复'}}</div>
@@ -246,6 +245,9 @@
             let { data, code, msg } = result
             if (code === 1) {
               this.taskList = data.records || []
+              this.taskList.forEach(item => {
+                item.taskDesc = item.taskDesc ? item.taskDesc.replace(/\n/g, '<br>') : ''
+              })
             } else {
               vant.Toast.fail(msg)
             }