Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -12,10 +12,10 @@
     <div class="showMyCareer" v-if="showCareer">
       <mycareer :show-close="true" :uid="careerId" @close="closeCareer"></mycareer>
     </div>
-    <customerService v-show="showCustomerService" @close="showCustomerService=false"/>
-    <img @click="showCustomerService=!showCustomerService"
+    <customerService v-show="showCustomerService" />
+    <!-- <img @click="showCustomerService=!showCustomerService"
     class="customerServiceButton"
-    src="./assets/img/kefu1.png" alt=""/>
+    src="./assets/img/kefu1.png" alt=""/> -->
   </div>
 </template>
 
@@ -237,6 +237,9 @@
       this.MsgBus.$on("changeTheme", t => {
         this.isRed = t == 1;
       });
+      this.MsgBus.$on("showCustomerServiceHandler", (isShow) => {
+        this.showCustomerService = isShow;
+      });
     }
   };
 

src/components/commonPage/customerService/index.vue

 <template>
   <div class="dialogPptistVisible-box" style="width: 100%;height: 100%;">
-    
+
     <div style="position: relative;width: 800px;">
       <span style="opacity: 0;">1</span>
       <div class="item">
@@ -12,7 +12,7 @@
     <iframe id="myTemplateUrl" v-if="Url!=''" name="myTemplateUrl" :src="Url" class="TemplateIframe">
     </iframe>
   </div>
-  
+
 </template>
 <script>
 import { compressToBase64 } from '@/utils/compression';
@@ -47,7 +47,7 @@ import { compressToBase64 } from '@/utils/compression';
     },
     methods: {
       close() {
-        this.$emit('close')
+        this.MsgBus.$emit("showCustomerServiceHandler",false);
       },
       async createInitDifyAsync(){
         const userInfo = this.getLocalStorage();
@@ -113,7 +113,7 @@ import { compressToBase64 } from '@/utils/compression';
     right: -40px;
     top: -10px;
     z-index: 99;
-    
+
   }
   .itemBox{
     width: 30px;

src/components/index.vue

@@ -284,15 +284,22 @@
               </el-dropdown>
             </li>
             <template v-if="userInfo.RB_Group_id == 2">
-              <li style="position: relative;">
-                <!--||MsgCount>0-->
+              <!-- <li style="position: relative;">
                 <i class="iconfont icon-imessage_top"
                   :class="[(hasNewMsg > 0) && !IM_bodyIsShow ? 'animation red' : '', IM_bodyIsShow ? 'red' : '']"
                   @click="IM_bodyIsShow = !IM_bodyIsShow, IM_navType = 1"></i>
-              </li>
+              </li> -->
               <li style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
                 <!-- <i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i> -->
-                <img src="../assets/img/AI.png" style="width: 25px;cursor: pointer;" title="AI行程" @click="goRequirement()">
+                <el-tooltip effect="dark" content="AI行程" placement="top">
+                  <img src="../assets/img/AI.png" style="width: 30px;cursor: pointer;" @click="goRequirement()">
+                </el-tooltip>
+              </li>
+              <li style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
+                <el-tooltip effect="dark" content="ERP智能客服" placement="top">
+                  <!-- <img src="../assets/img/AI.png" style="width: 30px;cursor: pointer;" @click="goRequirement()"> -->
+                  <div class="top-right-menu-item" style="margin-top: -10px;" @click="showCustomerServiceHandler()" ></div>
+                </el-tooltip>
               </li>
               <li v-if="!useRed"><i class="iconfont icon-gonggao"
                   @click="IM_bodyIsShow = !IM_bodyIsShow, IM_navType = 52"></i>
@@ -2075,6 +2082,9 @@ export default {
     }
   },
   methods: {
+    showCustomerServiceHandler() {
+      this.MsgBus.$emit("showCustomerServiceHandler",true);
+    },
     // 销售看板
     SalesBoard() {
       this.apipost(
@@ -4673,7 +4683,17 @@ export default {
 .downmz .khd a {
   color: #fff;
 }
-
+.top-right-menu-item{
+  width: 30px;
+  height: 30px;
+  background-image: url('../assets/img/robot.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  cursor: pointer;
+}
+.top-right-menu-item:hover{
+  background-image: url('../assets/img/robot_hover.png');
+}
 .downmz .khd {
   display: inline-block;
   width: 162px;

src/pages/requirements/components/RequirementDetail.vue

@@ -124,7 +124,7 @@
           <div class="option-label">{{ item.label }}</div>
         </div>
       </div>
-      <div class="qrcode-area" style="margin: 24px 0; text-align: center;" v-loading="createQrcode">
+      <div v-if="currentPublishOption!='pdfItinerary'" class="qrcode-area" style="margin: 24px 0; text-align: center;" v-loading="createQrcode">
         <div style="height: 100px; width: 100px; background: #f5f5f5; display: inline-block; border-radius: 8px; line-height: 100px;">
           <!-- 这里放二维码图片 -->
           <img :src="qrcodeUrl" style="width: 100%; height: 100%;" />
@@ -134,12 +134,13 @@
       <el-input
         v-model="publishShareLink"
         readonly
-        placeholder="这里是分享链接"
+        placeholder=""
         style="width: 100%;"
         v-if="currentPublishOption!='wechatH5'"
       >
         <template #append>
           <el-button @click="copyPublishLink">复制</el-button>
+          <el-button @click="openUrl(publishShareLink)">打开</el-button>
         </template>
       </el-input>
       <div style="height: 30px;"></div>
@@ -362,7 +363,7 @@ export default {
     },
     handlePDFItinerary(row) {
       // 下载PDF行程书
-      window.open(`${this.baseHref}/api/itinerary/pdf/book/${row.id}`, '_blank');
+      this.getDownloadTDUrl(row);
     },
     handleWebSchedule(row) {
       // 打开Web行程单页面
@@ -453,6 +454,33 @@ export default {
         );
       }
     },
+    getDownloadTDUrl(row) {
+      if(row.tdId == 0){
+        this.$message.error('请先创建TD行程');
+        return;
+      }
+      this.apipost && this.apipost(
+          "triptemplate_GetTripOther", {Id:row.tdId},
+          res => {
+            if (res.data && res.data.resultCode == 1) {
+              const params = {"Id":row.tdId,"Hash":res.data.data.HashInfo,"Range":"","Quality":1,"DownloadType":0}
+              this.apipost("ppt_get_downloadtoken",params,res=>{
+                if(res.data && res.data.resultCode == 1){
+                  this.publishShareLink = `${this.domainManager().PptUrl}/download/${res.data.data}`;
+                }
+              });
+            } else {
+              this.$message.error('获取TD行程失败');
+            }
+          },
+          err => {
+            this.$message.error('获取TD行程失败');
+          }
+        );
+    },
+    openUrl(url){
+      window.open(url, '_blank');
+    },
     editTD(row) {
       // 先请求接口获取uid，再拼接PPT预览链接
       if (row.tdId > 0) {
@@ -461,7 +489,7 @@ export default {
           res => {
             if (res.data && res.data.resultCode == 1) {
               let href = this.domainManager().PptUrl;
-              const pageUrl = `/editor/${row.tdId}/1/1/0/e/1/c/1`
+              const pageUrl = `/editor/${row.tdId}/${row.tdTemplate}/1/0/e/1/c/1`
               let url = `${href}/autoLogin?uid=${res.data.data}&model=1001&redict=${encodeURIComponent(pageUrl)}`;
               window.open(url, '_blank');
             } else {