From 4f7569682549da899202075d51442e241f48384a Mon Sep 17 00:00:00 2001
From: jarvis <2221237281@qq.com>
Date: Thu, 30 Sep 2021 14:21:02 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=99=BB[C=E5=BD=95=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=99=BB=E5=BD=95=E6=97=B6=E6=8F=90=E7=A4=BA=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=90=88=E5=B9=B6=E8=B4=A6=E5=8F=B7=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6=E5=90=88=E5=B9=B6=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../PrettyExchange/PrettyExchange.vue         |  2 +-
 src/pages/phone-bind/phone-bind.vue           | 36 ++++++-------------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2048101..49e884a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
  - | 导入项目,更新项目 | 5e06adf
  - | 导入项目后提示并打开项目详情页 | 410f527
  - | 导入wbs | 1224fcb
+ - | 登录提示是否合并账号 | 6a9b054
  - | 点击日历日期查询项目列表 | c458385
  - | 定期任务面板骨架屏添加 | b2698c0
  富文本插件 | 富文本插件demo测试 | ed3d644
diff --git a/src/components/PrettyExchange/PrettyExchange.vue b/src/components/PrettyExchange/PrettyExchange.vue
index 945242e..3975f80 100644
--- a/src/components/PrettyExchange/PrettyExchange.vue
+++ b/src/components/PrettyExchange/PrettyExchange.vue
@@ -156,7 +156,7 @@ export default {
         color: '#909399',
         fontSize: 28,
       },
-      menuList: [{ text: '' }, { text: '编辑' }, { text: '删除' }, { text: '置顶' }, { text: '排序' }],
+      menuList: [{ text: '复制' }, { text: '编辑' }, { text: '删除' }, { text: '置顶' }, { text: '排序' }],
       // show: false,
       border: 'border border-blue-500 shadow rounded-md',
       showBorder: false,
diff --git a/src/pages/phone-bind/phone-bind.vue b/src/pages/phone-bind/phone-bind.vue
index 6343cc5..9b09987 100644
--- a/src/pages/phone-bind/phone-bind.vue
+++ b/src/pages/phone-bind/phone-bind.vue
@@ -23,20 +23,22 @@
     <u-verification-code :seconds="seconds" ref="uCode" @change="codeChange"></u-verification-code>
 
     <u-top-tips ref="uTips"></u-top-tips>
-    <u-popup v-model="bindingPhone" mode="center" width="200px" height="200px" closeable style="padding: 15px" border-radius="15">
-      <view class="isBindingPhone"> 该手机号已经注册过账号，是否将账号合并 </view>
-      <div class="btns">
+    <u-popup v-model="bindingPhone" mode="center" closeable class="p-4 ml-7 mr-7" border-radius="14">
+      <view class="p-4 pt-10"> 该手机号已经注册过账号，是否将账号合并? </view>
+      <div class="flex justify-between pb-3 mt-3">
         <u-button size="mini" @click="noMerge()">取消</u-button>
         <u-button type="primary" size="mini" @click="yesMerge()">确定</u-button>
       </div>
     </u-popup>
-    <u-popup v-model="mergePop" mode="center" closeable style="padding: 15px" width="350px" height="250px" border-radius="15">
-      <view class="isBindingPhoneOk">
+    <u-popup v-model="mergePop" mode="center" closeable class="p-4 ml-7 mr-7" border-radius="14">
+      <view class="pt-10 p-4">
         <p>1、您可以选择合并账号完成手机号的绑定，系统会为您自动合并两个账号的数据信息</p>
+        <br />
         <p>2、如果选择不合并，已注册手机号的已有数据可能会被清空</p>
-        <p class="subtitle">注意：合并账号可能会带来不确定的数据丢失</p>
+        <br />
+        <p class="text-red-500">注意：合并账号可能会带来不确定的数据丢失</p>
       </view>
-      <div class="btns">
+      <div class="flex justify-between mt-3 pb-3">
         <u-button size="mini" @click="isMerge(1)">取消合并</u-button>
         <u-button type="primary" size="mini" @click="isMerge(0)">确定合并</u-button>
       </div>
@@ -52,9 +54,9 @@ export default {
   data() {
     return {
       model: {
-        phone: '', // 手机号
+        phone: '13593134793', // 手机号
         imageValue: '', // 图形验证码计算结果
-        code: '', // 短信验证码
+        code: '1111', // 短信验证码
       },
       codeId: '', // 图形验证码的id
 
@@ -243,20 +245,4 @@ export default {
     color: $u-tips-color;
   }
 }
-.isBindingPhone {
-  padding: 15px;
-  margin-top: 40px;
-}
-.btns {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 30px;
-}
-.isBindingPhoneOk {
-  margin-top: 35px;
-  padding: 15px;
-}
-.subtitle {
-  color: red;
-}
 </style>