Merge remote-tracking branch 'origin/master'

.env.prod-sxtb

@@ -0,0 +1,27 @@
+# 页面标题
+VUE_APP_TITLE =挑宝易购SCRM客服系统
+# 公司名称
+VUE_APP_COMPANY_NAME =西安挑宝益康医药连锁有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =陕ICP备17006076号-26
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/tbyg.png
+
+# 生产环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 2
+
+#项目所属
+VUE_APP_PROJECT_FROM=sxtb
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+VUE_APP_LIVE_WS_URL = wss://websocket.xianhetaihuij.cn/ws

package.json

@@ -17,6 +17,7 @@
     "build:prod-hcl": "vue-cli-service build --mode prod-hcl",
     "build:prod-test": "vue-cli-service build --mode prod-test",
     "build:prod-sxjz": "vue-cli-service build --mode prod-sxjz",
+    "build:prod-sxtb": "vue-cli-service build --mode prod-sxtb",
     "build:prod-jnmy": "vue-cli-service build --mode prod-jnmy",
     "build:prod-knt": "vue-cli-service build --mode prod-knt",
     "build:prod-hnyth": "vue-cli-service build --mode prod-hnyth",

src/views/company/companyVoiceRobotic/index.vue

@@ -87,7 +87,7 @@
       </el-table-column>
       <el-table-column label="添加类型" align="center" prop="isWeCom">
         <template slot-scope="scope">
-          <!-- <el-tag v-if="scope.row.isWeCom == 1">个微</el-tag> -->
+          <el-tag v-if="scope.row.isWeCom == 1">个微</el-tag>
           <el-tag v-if="scope.row.isWeCom == 2">企微</el-tag>
         </template>
       </el-table-column>
@@ -381,10 +381,10 @@
             </div>
             <el-form-item label="添加类型" prop="isWeCom">
               <el-radio-group v-model="form.isWeCom">
-                <!-- <el-radio :label="1" border>
+                <el-radio :label="1" border>
                   <i class="el-icon-pie-chart"></i>
                   个微
-                </el-radio> -->
+                </el-radio>
                 <el-radio :label="2" border>
                   <i class="el-icon-star-on"></i>
                   企微

src/views/company/companyWorkflow/design.vue

@@ -282,7 +282,7 @@
               </el-form-item>
             </div>
              <!-- AI加微配置 -->
-            <div v-if="selectedNode.nodeType == 'AI_ADD_WX_TASK'" class="property-section">
+            <div v-if="selectedNode.nodeType == 'AI_ADD_WX_TASK_NEW'" class="property-section">
               <div class="section-title">
                 <i class="el-icon-chat-dot-round"></i>加微配置
               </div>
@@ -536,7 +536,7 @@
             </div>
 
             <!-- 条件判断 -->
-            <div v-if="edgeSourceNode.nodeType == 'AI_CALL_TASK' || edgeSourceNode.nodeType == 'AI_SEND_MSG_TASK' || edgeSourceNode.nodeType == 'AI_ADD_WX_TASK' || edgeSourceNode.nodeType == 'AI_QW_ADD_WX_TASK'"  class="property-section">
+            <div v-if="edgeSourceNode.nodeType == 'AI_CALL_TASK' || edgeSourceNode.nodeType == 'AI_SEND_MSG_TASK' || edgeSourceNode.nodeType == 'AI_ADD_WX_TASK_NEW' || edgeSourceNode.nodeType == 'AI_QW_ADD_WX_TASK'"  class="property-section">
               <div class="section-title">
                 <i class="el-icon-set-up"></i>条件判断
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="addCondition" class="add-condition-btn">新增条件</el-button>
@@ -575,7 +575,7 @@
               </div>
 
               <!-- 加微信任务条件 -->
-              <div v-if="edgeSourceNode.nodeType == 'AI_ADD_WX_TASK' || edgeSourceNode.nodeType == 'AI_QW_ADD_WX_TASK'" class="conditions-container">
+              <div v-if="edgeSourceNode.nodeType == 'AI_ADD_WX_TASK_NEW' || edgeSourceNode.nodeType == 'AI_QW_ADD_WX_TASK'" class="conditions-container">
                 <div v-for="(item, index) in selectedEdge.conditionExprObj" :key="index" class="condition-item">
                   <div class="condition-header">
                     <span class="condition-number">条件 {{ index + 1 }}</span>
@@ -647,7 +647,7 @@ import {
 import { getWorkflow, addWorkflow, updateWorkflow, getNodeTypes, getWorkflowVersionDetail } from '@/api/company/companyWorkflow'
 import {getDicts} from "@/api/system/dict/data";
 import { getGatewayList, getLlmAccountList, getVoiceCodeList, getBusiGroupList } from '@/api/company/easyCall'
-// import { listAll } from '@/api/company/wxDialog';
+import { listAll } from '@/api/company/wxDialog';
 export default {
   name: 'WorkflowDesign',
   data() {
@@ -761,11 +761,11 @@ export default {
     } else if (this.workflowId) {
       this.loadWorkflow()
     }
-    // listAll().then(e => {
-    //   this.wxDialogList = e.data;
-    //   console.log("------")
-    //   console.log(this.wxDialogList)
-    // })
+    listAll().then(e => {
+      this.wxDialogList = e.data;
+      console.log("------")
+      console.log(this.wxDialogList)
+    })
 
     this.getDicts("sys_qw_qw_wx_add_way").then(response => {
       this.qwWxAddWayOptions = response.data;
@@ -1010,7 +1010,7 @@ export default {
         end: '#ff4d4f',
         condition: '#faad14',
         AI_CALL_TASK: '#1890ff',
-        AI_ADD_WX_TASK: '#722ed1',
+        AI_ADD_WX_TASK_NEW: '#722ed1',
         AI_SEND_MSG_TASK: '#eb2f96',
         DELAY_TASK: '#13c2c2'
       }