From 2f23010ecd412149468a12694491a34e1dcef85a Mon Sep 17 00:00:00 2001
From: 夏洋涛 <1027869635@qq.com>
Date: Thu, 30 Mar 2023 16:54:54 +0800
Subject: [PATCH] feat:导师删除,联系修改

---
 src/views/Home.vue                                      |  14 +++++++++++---
 src/views/Service/AbroadDetailNext/AbroadDetail.scss    |  13 +++++++++++++
 src/views/Service/AbroadDetailNext/AbroadDetailNext.vue |  43 +++++++++++++++++++++++++++++--------------
 src/views/Service/BaseDetail/BaseDetail.scss            | 491 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/Service/BaseDetail/BaseDetail.vue             |  39 +++++++++++++++++++++++++++------------
 5 files changed, 332 insertions(+), 268 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 8e13d20..4f9a6cc 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -15,7 +15,14 @@
       </van-swipe>
     </div>
     <div class="content">
-      <van-search v-model="searchValue" placeholder="搜索馆关键字、活动、研学旅行" shape="round" @search="onSearch()" />
+      <van-search
+        v-model="searchValue"
+        :placeholder="placeholder"
+        @focus="placeholder = ''"
+        @blur="placeholder = '搜索馆关键字、活动、研学旅行'"
+        shape="round"
+        @search="onSearch()"
+      />
       <div class="type_box">
         <div @click="handleCourseMore()">
           <img src="@/assets/service/homeicon1.png" alt="" />
@@ -33,10 +40,10 @@
           <img src="@/assets/service/homeicon4.png" alt="" />
           <p>官方资讯</p>
         </div>
-        <div @click="handleTeacher()">
+        <!-- <div @click="handleTeacher()">
           <img src="@/assets/service/homeicon5.png" alt="" />
           <p>研学导师</p>
-        </div>
+        </div> -->
       </div>
       <div class="infomation_box">
         <img class="news" src="@/assets/service/news.png" @click="handleNewMore()" alt="" />
@@ -115,6 +122,7 @@ export default {
   },
   data() {
     return {
+      placeholder: '搜索馆关键字、活动、研学旅行',
       tieshi: true,
       navActive: 1,
       swipeImgs: '',
diff --git a/src/views/Service/AbroadDetailNext/AbroadDetail.scss b/src/views/Service/AbroadDetailNext/AbroadDetail.scss
index ec34937..3627192 100644
--- a/src/views/Service/AbroadDetailNext/AbroadDetail.scss
+++ b/src/views/Service/AbroadDetailNext/AbroadDetail.scss
@@ -584,6 +584,19 @@
             margin-bottom: 44px;
         }
     }
+    .contact_btn {
+        position: fixed;
+        bottom: 36px;
+        left: 15px;
+        width: 720px;
+        height: 92px;
+        text-align: center;
+        line-height: 92px;
+        background: rgb(22, 190, 142);
+        border-radius: 46px;
+        font-size: 36px;
+        color: #fff;
+      }
     .Collection2 {
         position: fixed;
         bottom: 0;
diff --git a/src/views/Service/AbroadDetailNext/AbroadDetailNext.vue b/src/views/Service/AbroadDetailNext/AbroadDetailNext.vue
index e73da38..0d61264 100644
--- a/src/views/Service/AbroadDetailNext/AbroadDetailNext.vue
+++ b/src/views/Service/AbroadDetailNext/AbroadDetailNext.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
     <package v-if="courseId" :courseId="courseId" :packageArr="packageArr"></package>
-    <p class="tip">如有特殊需求请联系【客服】</p>
+    <p class="tip" @click="handleContact">如有特殊需求请联系【客服】</p>
     <div class="package top_border" v-if="packageArr.length > 0 && packageArr[packageActive].comboInfoList.length > 1">
       <div class="package_box">
         <div style="overflow: auto">
@@ -84,12 +84,8 @@
     <!-- 基地信息 -->
     <abroad-base v-if="detailData" :baseId="detailData.baseId"></abroad-base>
 
-    <div class="Collection2">
-      <div class="box">
-        <div class="btn" @click="handleShare"></div>
-        <div class="btn" @click="handleContact"></div>
-      </div>
-    </div>
+    <div class="contact_btn" @click="handleContact">联系客服</div>
+
     <!-- <div class="Collection" v-if="detailData">
       <ShareBox type="button" :detailData="detailData" v-if="showShareBox" @hiddenShare="showShareBox=false" @showShareDes="showShareDes=true"></ShareBox>
       <div class="box box1">
@@ -626,14 +622,23 @@ export default {
     handleContact() {
       let mobile = this.baseDetailData.mobile[0]
       if (mobile) {
-        ZWJSBridge.phoneCall({
-          corpId: mobile,
+        this.$dialog.confirm({
+          title: '提示',
+          message: '是否拨打客服电话',
         })
-          .then((res) => {
-            console.log(res)
+          .then(() => {
+            ZWJSBridge.phoneCall({
+              corpId: mobile,
+            })
+              .then((res) => {
+                console.log(res)
+              })
+              .catch((err) => {
+                console.log(err)
+              })
           })
-          .catch((err) => {
-            console.log(err)
+          .catch(() => {
+            // on cancel
           })
       } else {
         this.$toast('暂无联系方式')
@@ -644,7 +649,17 @@ export default {
 </script>
 <style lang="scss">
 .elder {
-  .abroad_detail .uni_text .address,.abroad_detail .uni_text .rate > span,.package .period_nodata,.abroad_detail .package .package_title,.abroad_detail .tip,.abroad_detail .cardCont .day_tag,.abroad_detail .cardCont table td,.abroad_detail .tag_item .tag_title,.abroad_detail .tag_item .tag_text,.abroad_detail .base .center .address,.abroad_detail .base .center .tag {
+  .abroad_detail .uni_text .address,
+  .abroad_detail .uni_text .rate > span,
+  .package .period_nodata,
+  .abroad_detail .package .package_title,
+  .abroad_detail .tip,
+  .abroad_detail .cardCont .day_tag,
+  .abroad_detail .cardCont table td,
+  .abroad_detail .tag_item .tag_title,
+  .abroad_detail .tag_item .tag_text,
+  .abroad_detail .base .center .address,
+  .abroad_detail .base .center .tag {
     font-size: 36px !important;
   }
 }
diff --git a/src/views/Service/BaseDetail/BaseDetail.scss b/src/views/Service/BaseDetail/BaseDetail.scss
index d10806f..9028bdf 100644
--- a/src/views/Service/BaseDetail/BaseDetail.scss
+++ b/src/views/Service/BaseDetail/BaseDetail.scss
@@ -1,255 +1,268 @@
 .base_detail {
-    padding-bottom: 200px;
-    .header {
-        img {
-            width: 100%;
-        }
+  padding-bottom: 200px;
+  .header {
+    img {
+      width: 100%;
+    }
+  }
+  .uni_text {
+    width: 100%;
+    background: #fff;
+    padding: 24px 34px;
+    box-sizing: border-box;
+    .course_name {
+      font-size: 34px;
+      font-weight: bold;
+    }
+    .course_info {
+      font-size: 24px;
+      color: #999;
+      margin-top: 16px;
+    }
+    .address {
+      font-size: 24px;
+      color: #999;
+      margin-top: 16px;
+      width: 100%;
+      height: 88px;
+      line-height: 88px;
+      background: url('../../../assets/service/address_bg.png') 100%/100% no-repeat;
+      box-sizing: border-box;
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 20px;
+      .icon {
+        color: #333;
+        // color: #000;
+      }
+    }
+    .rate {
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+      div > span {
+        font-size: 30px;
+        color: #ffcc00;
+        margin-left: 30px;
+      }
+      > span {
+        font-size: 26px;
+      }
     }
-    .uni_text {
-        width: 100%;
+    .tag_box {
+      padding-top: 10px;
+      .tag {
+        display: inline-block;
+        margin-top: 10px;
+        margin-right: 12px;
+        color: #4092ff;
+        font-size: 24px;
+        border-radius: 8px;
+        border: 2px solid #4092ff;
+        padding: 2px 10px;
+      }
+    }
+  }
+  .content_box {
+    position: relative;
+    .content_all {
+      overflow: hidden;
+      font-size: 31px !important;
+      line-height: 40px !important;
+      letter-spacing: 1.6px;
+      color: #666;
+      img {
+        display: block;
+        max-width: 100%;
+        margin: 0 auto;
+      }
+      &.active_box {
+        white-space: nowrap;
+        overflow: auto;
+        &::-webkit-scrollbar {
+          width: 0;
+        }
+        &::-webkit-scrollbar {
+          display: none;
+        }
+      }
+      .active_item {
+        display: inline-block;
+        width: 287px;
+        cursor: pointer;
         background: #fff;
-        padding: 24px 34px;
-        box-sizing: border-box;
-        .course_name {
-            font-size: 34px;
-            font-weight: bold;
+        transition: 0.3s ease;
+        margin-right: 14px;
+        vertical-align: top;
+        &:last-of-type {
+          margin-right: 0;
         }
-        .course_info {
-            font-size: 24px;
-            color: #999;
-            margin-top: 16px;
+        .bg_box {
+          width: 287px;
+          height: 216px;
+          background-size: cover;
+          background-position: center;
         }
-        .address {
-            font-size: 24px;
-            color: #999;
-            margin-top: 16px;
-            width: 100%;
-            height: 88px;
-            line-height: 88px;
-            background: url('../../../assets/service/address_bg.png') 100%/100% no-repeat;
-            box-sizing: border-box;
-            margin-top: 20px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 0 20px;
-            .icon {
-                color: #333;
-                // color: #000;
-            }
+        .text_box {
+          padding: 10px;
+          white-space: break-spaces;
         }
-        .rate {
-            margin-top: 20px;
-            display: flex;
-            justify-content: space-between;
-            div>span {
-                font-size: 30px;
-                color: #ffcc00;
-                margin-left: 30px;
-            }
-            >span {
-                font-size: 26px;
-            }
+        .tag {
+          display: block;
+          margin-top: 10px;
+          // margin-right: 12px;
+          font-size: 20px;
+          line-height: 42px;
+          color: #65768c;
+          background: #f3f7fd;
+          border-radius: 2px;
+          padding: 0 10px;
         }
-        .tag_box {
-            padding-top: 10px;
-            .tag {
-                display: inline-block;
-                margin-top: 10px;
-                margin-right: 12px;
-                color: #4092ff;
-                font-size: 24px;
-                border-radius: 8px;
-                border: 2px solid #4092ff;
-                padding: 2px 10px;
-            }
+        .count_box {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .count {
+            color: #999999;
+            font-size: 20px;
+          }
+          .reserve_btn {
+            font-size: 22px;
+            color: #f03c3c;
+          }
         }
-    }
-    .content_box {
-        position: relative;
-        .content_all {
-            overflow: hidden;
-            font-size: 31px !important;
-            line-height: 40px !important;
-            letter-spacing: 1.6px;
-            color: #666;
-            img {
-                display: block;
-                max-width: 100%;
-                margin: 0 auto;
-            }
-            &.active_box {
-                white-space: nowrap;
-                overflow: auto;
-                &::-webkit-scrollbar {
-                    width: 0;
-                }
-                &::-webkit-scrollbar {
-                    display: none;
-                }
-            }
-            .active_item {
-                display: inline-block;
-                width: 287px;
-                cursor: pointer;
-                background: #fff;
-                transition: 0.3s ease;
-                margin-right: 14px;
-                vertical-align: top;
-                &:last-of-type {
-                    margin-right: 0;
-                }
-                .bg_box {
-                    width: 287px;
-                    height: 216px;
-                    background-size: cover;
-                    background-position: center;
-                }
-                .text_box {
-                    padding: 10px;
-                    white-space: break-spaces;
-                }
-                .tag {
-                    display: block;
-                    margin-top: 10px;
-                    // margin-right: 12px;
-                    font-size: 20px;
-                    line-height: 42px;
-                    color: #65768c;
-                    background: #f3f7fd;
-                    border-radius: 2px;
-                    padding: 0 10px;
-                }
-                .count_box {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    .count {
-                        color: #999999;
-                        font-size: 20px;
-                    }
-                    .reserve_btn {
-                        font-size: 22px;
-                        color: #f03c3c;
-                    }
-                }
-                .title {
-                    font-size: 28px;
-                    font-weight: bold;
-                    line-height: 40px;
-                    margin: 0;
-                    color: #000;
-                    white-space: initial;
-                overflow: hidden;
-            }
-            }
-            .teacher_box {
-                .teacher_item {
-                    padding: 14px;
-                    width: 702px;
-                    height: 240px;
-                    background: #F9F9F9;
-                    border-radius: 20px;
-                    box-sizing: border-box;
-                    margin-bottom: 16px;
-                }
-                .teacher_img_box {
-                    width: 168px;
-                    height: 212px;
-                    border-radius: 12px;
-                    position: relative;
-                    overflow: hidden;
-                    float: left;
-                    margin-right: 18px;
-                }
-                .teacher_img {
-                    height: 100%;
-                    position: absolute;
-                    top: 0;
-                    left: 50%;
-                    transform: translate(-50%);
-                    max-width: initial;
-                }
-                .teacher_name {
-                    font-size: 30px;
-                    line-height: 42px;
-                }
-                .teacher_info {
-                    font-size: 26px;
-                    line-height: 36px;
-                    color: #999;
-                    margin-top: 4px;
-                }
-                .teacher_level {
-                    font-size: 24px;
-                    line-height: 34px;
-                    margin-top: 10px;
-                }
-                .teacher_location {
-                    font-size: 24px;
-                    line-height: 34px;
-                    margin-top: 10px;
-                }
-            }
+        .title {
+          font-size: 28px;
+          font-weight: bold;
+          line-height: 40px;
+          margin: 0;
+          color: #000;
+          white-space: initial;
+          overflow: hidden;
         }
-    }
-    .tag_item {
-        padding: 22px;
-        .tag_title {
-            font-size: 34px;
-            font-weight: bold;
-            margin-bottom: 32px;
+      }
+      .teacher_box {
+        .teacher_item {
+          padding: 14px;
+          width: 702px;
+          height: 240px;
+          background: #f9f9f9;
+          border-radius: 20px;
+          box-sizing: border-box;
+          margin-bottom: 16px;
         }
-        .tag_text {
-            // font-size: 24px;
-            // line-height: 40px;
-            font-size: 28px !important;
-            line-height: 44px !important;
-            padding: 16px 0;
+        .teacher_img_box {
+          width: 168px;
+          height: 212px;
+          border-radius: 12px;
+          position: relative;
+          overflow: hidden;
+          float: left;
+          margin-right: 18px;
         }
-    }
-    .top_border {
-        border-top: 16px solid #f6f7fa;
-         ::v-deep.van-tab {
-            .van-tab__text {
-                font-size: 34px !important;
-            }
+        .teacher_img {
+          height: 100%;
+          position: absolute;
+          top: 0;
+          left: 50%;
+          transform: translate(-50%);
+          max-width: initial;
         }
-    }
-    .Collection {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        padding: 28px 22px;
-        box-sizing: border-box;
-        padding-bottom: 50px;
-        z-index: 500;
-        box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.34);
-        .box {
-            background: url(../../../assets/btn.png) 100%/100% no-repeat;
-            width: 702px;
-            height: 92px;
-            .btn {
-                display: inline-block;
-                width: 50%;
-                height: 100%;
-            }
+        .teacher_name {
+          font-size: 30px;
+          line-height: 42px;
+        }
+        .teacher_info {
+          font-size: 26px;
+          line-height: 36px;
+          color: #999;
+          margin-top: 4px;
+        }
+        .teacher_level {
+          font-size: 24px;
+          line-height: 34px;
+          margin-top: 10px;
+        }
+        .teacher_location {
+          font-size: 24px;
+          line-height: 34px;
+          margin-top: 10px;
         }
+      }
     }
-    .share_mask {
-        width: 100%;
-        height: 100%;
-        position: fixed;
-        top: 0;
-        left: 0;
-        background: rgba(0, 0, 0, 0.4);
-        z-index: 999;
+  }
+  .tag_item {
+    padding: 22px;
+    .tag_title {
+      font-size: 34px;
+      font-weight: bold;
+      margin-bottom: 32px;
+    }
+    .tag_text {
+      // font-size: 24px;
+      // line-height: 40px;
+      font-size: 28px !important;
+      line-height: 44px !important;
+      padding: 16px 0;
     }
-    .share_des {
-        position: absolute;
-        top: 50px;
-        right: 100px;
-        width: 516px;
+  }
+  .top_border {
+    border-top: 16px solid #f6f7fa;
+    ::v-deep.van-tab {
+      .van-tab__text {
+        font-size: 34px !important;
+      }
+    }
+  }
+  .contact_btn {
+    position: fixed;
+    bottom: 36px;
+    left: 15px;
+    width: 720px;
+    height: 92px;
+    text-align: center;
+    line-height: 92px;
+    background: rgb(22, 190, 142);
+    border-radius: 46px;
+    font-size: 36px;
+    color: #fff;
+  }
+  .Collection {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    padding: 28px 22px;
+    box-sizing: border-box;
+    padding-bottom: 50px;
+    z-index: 500;
+    box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.34);
+    .box {
+      background: url(../../../assets/btn.png) 100%/100% no-repeat;
+      width: 702px;
+      height: 92px;
+      .btn {
+        display: inline-block;
+        width: 50%;
+        height: 100%;
+      }
     }
-}
\ No newline at end of file
+  }
+  .share_mask {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 999;
+  }
+  .share_des {
+    position: absolute;
+    top: 50px;
+    right: 100px;
+    width: 516px;
+  }
+}
diff --git a/src/views/Service/BaseDetail/BaseDetail.vue b/src/views/Service/BaseDetail/BaseDetail.vue
index 2ea378c..4335250 100644
--- a/src/views/Service/BaseDetail/BaseDetail.vue
+++ b/src/views/Service/BaseDetail/BaseDetail.vue
@@ -36,12 +36,13 @@
     </div>
     <!-- 商品详情 -->
     <base-des v-if="detailData" :detailData="detailData"></base-des>
-    <div class="Collection">
+    <div class="contact_btn" @click="handleContact">联系客服</div>
+    <!-- <div class="Collection">
       <div class="box">
         <div class="btn" @click="handleShare"></div>
         <div class="btn" @click="handleContact"></div>
       </div>
-    </div>
+    </div> -->
     <div class="share_mask" v-if="showShareDes" @click="showShareDes = false">
       <img class="share_des" src="@/assets/home/share.png" alt="" />
     </div>
@@ -163,16 +164,25 @@ export default {
     // 点击联系方式
     handleContact() {
       let mobile = this.detailData.mobile[0]
+
       if (mobile) {
-        // window.location.href = `tel:${mobile}`
-        ZWJSBridge.phoneCall({
-          corpId: mobile,
+        this.$dialog.confirm({
+          title: '提示',
+          message: '是否拨打客服电话',
         })
-          .then((res) => {
-            console.log(res)
+          .then(() => {
+            ZWJSBridge.phoneCall({
+              corpId: mobile,
+            })
+              .then((res) => {
+                console.log(res)
+              })
+              .catch((err) => {
+                console.log(err)
+              })
           })
-          .catch((err) => {
-            console.log(err)
+          .catch(() => {
+            // on cancel
           })
       } else {
         this.$toast('暂无联系方式')
@@ -187,9 +197,14 @@ export default {
 <style lang="scss">
 // 长辈版
 .elder {
-  .base_detail .tag_item .tag_text,.base_detail .uni_text .tag_box .tag,.base_detail .uni_text .address,.base_detail .content_box .content_all .teacher_box .teacher_name,.base_detail .content_box .content_all .teacher_box .teacher_level,.base_detail .content_box .content_all .teacher_box .teacher_info,.base_detail .content_box .content_all .teacher_box .teacher_location{
+  .base_detail .tag_item .tag_text,
+  .base_detail .uni_text .tag_box .tag,
+  .base_detail .uni_text .address,
+  .base_detail .content_box .content_all .teacher_box .teacher_name,
+  .base_detail .content_box .content_all .teacher_box .teacher_level,
+  .base_detail .content_box .content_all .teacher_box .teacher_info,
+  .base_detail .content_box .content_all .teacher_box .teacher_location {
     font-size: 36px;
   }
-  
 }
-</style>
\ No newline at end of file
+</style>
--
libgit2 0.21.0