Merge branch 'dev' of gitlab.33.cn:chenqikuai/fns_front_2 into dev

src/components/Mine/Branch/branch.vue

@@ -68,12 +68,13 @@
           >{{ weekDays }} 丨 {{ dailyTime }}</span>
         </template>
         <template v-else>
-          <div class="text-red">{{ errorReason }}</div>
+          <div class="text-red">{{ error }}</div>
+          <!-- <div class="text-red">{{ errorReason }}</div> -->
         </template>
       </div>
     </div>
     <!-- 底部操作 -->
-    <div class="flex text-center py-3 text-gray-800 bg-branch-tab-bg rounded-b-2xl">
+    <div class="flex text-center py-3 text-gray-800 bg-branch-tab-bg rounded-b-2xl" v-if="is_normal_work">
       <p class="w-1/2 border-r border-gray-200 mb-0" @click="handleClickChatWithClientManager">联系客服</p>
       <p class="w-1/2 mb-0" :class="isOpen ? 'text-app-blue' : 'text-gray-800'" @click="toCall">电话咨询</p>
     </div>
@@ -178,7 +179,7 @@ const isOpen = computed(() => {
     return false
   }
 })
-
+const error="由于施工原因，本营业厅暂时不营业搬迁中"
 const errorReason = ref('')
 const getErrorNote = () => {
   if (props.is_normal_work) return

src/views/withMenu/Mine/setting.vue

@@ -9,7 +9,7 @@
       <!-- 手机号码 -->
       <div class="px-5 py-5 flex justify-between items-center border-b border-gray-200">
         <span class=" text-sm font-semibold">手机号码</span>
-        <span class=" text-sm">130****5978</span>
+        <span class=" text-sm">{{getPhone}}</span>
       </div>
       <!-- 登陆密码 -->
        <div class="px-5 py-2 items-center border-b border-gray-200">
@@ -49,6 +49,10 @@ export default defineComponent({
   computed: {
     hasPassword(): eAccountType {
       return eAccountType.REG_PDSET
+    },
+    getPhone(){
+      const phone =getUserMsg()?.userInfo.phone
+      return phone
     }
   },
   setup() {