From 5b54793690a1200e9b5d33b4a07a83e901a03b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Tue, 21 Mar 2023 11:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=AF=9D=20MSG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/msg/index.js              | 4 ++++
 components/msg/index.wxml            | 2 +-
 pages/customer/detail/index.wxml     | 5 +++--
 pages/customer/filterList/index.wxml | 5 +++--
 pages/customer/index.wxml            | 9 +++++----
 pages/index/index.wxml               | 8 ++++----
 pages/order/detail/index.wxml        | 5 +++--
 pages/order/index.wxml               | 2 +-
 8 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/components/msg/index.js b/components/msg/index.js
index b9c4626..85f4648 100644
--- a/components/msg/index.js
+++ b/components/msg/index.js
@@ -24,6 +24,10 @@ Component({
       type: Boolean,
       value: false
     },
+    isCustomTabBar: { //是否有底部自定义TabBar
+      type: Boolean,
+      value: false
+    },
     iconType: { //图标
       type: String,
       value: ''
diff --git a/components/msg/index.wxml b/components/msg/index.wxml
index 90191c7..02bbd10 100644
--- a/components/msg/index.wxml
+++ b/components/msg/index.wxml
@@ -10,7 +10,7 @@
   <view slot="opt">这里是插入到组件slot中的内容</view> -->
 <view class="lcb-msg" style="{{isShow?'display:block':'display:none'}}" catchmove="aaa">
   <view class="msgBg" style="background-color: rgba(0, 0, 0, .6);"></view>
-  <view class="msgMain {{isShow?'active':''}}" style="{{isTransparent?'background-color: transparent;':''}}" catchmove="aaa">
+  <view class="msgMain {{isShow?'active':''}}" style="{{isTransparent?'background-color: transparent;':''}}{{isCustomTabBar?'margin-top: -95rpx;':''}}" catchmove="aaa">
     <block wx:if="{{isHasClose !=''}}">
       <view wx:if="{{isHasClose=='up'}}" class="close up">
         <text class="iconfont icon-guanbi1 color-fff" bindtap="close"></text>
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 0419a4d..7651969 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -526,8 +526,9 @@
 <!-- 拨打电话 -->
 <lcb-msg isShow="{{isShowCall}}">
   <view slot="content">
-    <view class="pt70 pb50">
-      <view class="font-36 text-center">现在呼叫 {{phoneNumber}} ？</view>
+    <view class="pt50 pb40">
+      <view class="font-36 text-center">号码绑定成功</view>
+      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
diff --git a/pages/customer/filterList/index.wxml b/pages/customer/filterList/index.wxml
index b2dd814..a086976 100644
--- a/pages/customer/filterList/index.wxml
+++ b/pages/customer/filterList/index.wxml
@@ -193,8 +193,9 @@
 <!-- 拨打电话 -->
 <lcb-msg isShow="{{isShowCall}}">
   <view slot="content">
-    <view class="pt70 pb50">
-      <view class="font-36 text-center">现在呼叫 {{phoneNumber}} ？</view>
+    <view class="pt50 pb40">
+      <view class="font-36 text-center">号码绑定成功</view>
+      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml
index 2bc91e2..b61f00a 100644
--- a/pages/customer/index.wxml
+++ b/pages/customer/index.wxml
@@ -339,7 +339,7 @@
 
 <lcb-changeMobile isShow="{{isShowMobile}}"></lcb-changeMobile>
 
-<lcb-msg isShow="{{isShowEmployees}}">
+<lcb-msg isShow="{{isShowEmployees}}" isCustomTabBar="{{true}}">
 	<view slot="content">
 		<view class="inner30">
       <view class="mt10 font-28 text-center fn-flex" wx:if="{{distributetabs.length > 0}}">
@@ -417,10 +417,11 @@
 </page-container>
 
 <!-- 拨打电话 -->
-<lcb-msg isShow="{{isShowCall}}">
+<lcb-msg isShow="{{isShowCall}}" isCustomTabBar="{{true}}">
   <view slot="content">
-    <view class="pt70 pb50">
-      <view class="font-36 text-center">现在呼叫 {{phoneNumber}} ？</view>
+    <view class="pt50 pb40">
+      <view class="font-36 text-center">号码绑定成功</view>
+      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index fd07e10..7d85533 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -203,7 +203,7 @@
 <lcb-shopTabBarNav currentIndex='0'></lcb-shopTabBarNav>
 
 <!-- 客服提示 -->
-<lcb-msg isShow="{{!isShowVersionInfo&&isShowNotice}}">
+<lcb-msg isShow="{{!isShowVersionInfo&&isShowNotice}}" isCustomTabBar="{{true}}">
 	<view slot="content">
     <view class="mt40 text-center relative overflowhidden" style="height:100px;">
       <!-- <image class='img-w-280' show-menu-by-longpress='true' lazy-load="{{true}}" mode="widthFix" src="https://qs.haodian.cn/wechat_app/lichebao/index/jrKF-code2.jpg"></image> -->
@@ -224,7 +224,7 @@
 </lcb-msg>
 
 <!-- 调拨提醒 盘点提醒 -->
-<lcb-msg isShow="{{!isShowVersionInfo&&isShowReport}}">
+<lcb-msg isShow="{{!isShowVersionInfo&&isShowReport}}" isCustomTabBar="{{true}}">
 	<view slot="content">
     <swiper class='wp100' style="height:550rpx;" autoplay circular bindchange="bannerChange">
       <swiper-item class="relative" wx:for="{{remindMsg}}" wx:key="index">
@@ -250,7 +250,7 @@
 </lcb-msg>
 
 <!-- 库存提醒 -->
-<lcb-msg isShow="{{!isShowVersionInfo&&!isShowReport&&isShowGoods}}">
+<lcb-msg isShow="{{!isShowVersionInfo&&!isShowReport&&isShowGoods}}" isCustomTabBar="{{true}}">
 	<view slot="content" class="inner40" style="width:550rpx;">
     <view class="text-center font-36">{{warning.title}}</view>
     <view class="mt10 text-center font-22 color-f9394d">{{warning.note}}</view>
@@ -283,7 +283,7 @@
 </lcb-msg>
 
 <!-- 更新新版本提醒 -->
-<lcb-msg isShow="{{isShowVersionInfo}}" isBottomOpt="{{true}}" closeWord="我知道了" bind:closeevent="closeVersionInfo">
+<lcb-msg isShow="{{isShowVersionInfo}}" isBottomOpt="{{true}}" closeWord="我知道了" bind:closeevent="closeVersionInfo" isCustomTabBar="{{true}}">
 	<view slot="content" class="inner40 text-center" style="width:550rpx;">
     <view class="font-36">狸车宝 {{versionInfo.number}} 更新说明</view>
     <view class="inline-block mt10 font-28 color-666">
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 57756d3..1da1195 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -391,8 +391,9 @@
 <!-- 拨打电话 -->
 <lcb-msg isShow="{{isShowCall}}">
   <view slot="content">
-    <view class="pt70 pb50">
-      <view class="font-36 text-center">现在呼叫 {{phoneNumber}} ？</view>
+    <view class="pt50 pb40">
+      <view class="font-36 text-center">号码绑定成功</view>
+      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index 3ebb8f2..a088e51 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -228,7 +228,7 @@
 
 <view class="search-bg fixed left-0 right-0 top-0 bottom-0" bindtap="optfilter" hidden="{{!isShowfilter}}" style="background-color:rgba(0,0,0,.5);"></view>
 
-<lcb-msg isShow="{{isShowTransfer}}">
+<lcb-msg isShow="{{isShowTransfer}}" isCustomTabBar="{{true}}">
 	<view slot="content">
 		<view class="inner30">
       <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">