From a4ca589613d9db44e5a215520792a8489a54a319 Mon Sep 17 00:00:00 2001
From: 233boy <31657650+233boy@users.noreply.github.com>
Date: Sat, 23 Mar 2019 14:26:24 +0800
Subject: [PATCH] optimize display

---
 src/jqcmd.sh |  7 +++++--
 src/qr.sh    | 17 +++++++++++++----
 v2ray.sh     |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/jqcmd.sh b/src/jqcmd.sh
index d1d1f80..caa4175 100644
--- a/src/jqcmd.sh
+++ b/src/jqcmd.sh
@@ -126,9 +126,12 @@ jq_printvmess() {
             local _ps="${_MAKPREFIX}${ADDRESS}/${_NETTRIM}"
             local _VMESS=$(echo "vmess://"$(echo $IN | jq -c '{"v":"2","ps":"'${_ps}'","add":"'${ADDRESS}'","port":.port,"id":.settings.clients['${CLINTIDX}'].id,"aid":.settings.clients['${CLINTIDX}'].alterId,"net":.streamSettings.network|"tcp","type":'${_TYPE}',"host":'${_HOST}',"path":'${_PATH}',"tls":'${_TLS}'}' | base64 -w0))
             _green "VMESS链接（v2rayN/v2rayNG）: ${EMAIL//\"/}"
-            echo ${_VMESS}
+            echo
+            _cyan "${_VMESS}"
+            echo
             _green "二维码链接【浏览器打开】（v2rayN/v2rayNG）"
-            echo "https://233boy.github.io/tools/qr.html#${_VMESS}"
+            echo
+            _cyan "https://233boy.github.io/tools/qr.html#${_VMESS}"
             echo
         done
     done
diff --git a/src/qr.sh b/src/qr.sh
index 24383a7..794ce03 100644
--- a/src/qr.sh
+++ b/src/qr.sh
@@ -4,10 +4,14 @@ _qr_create() {
 	echo
 	echo "---------- V2Ray 二维码链接 适用于 V2RayNG v0.4.1+ / Kitsunebi -------------"
 	echo
-	echo -e ${cyan}$link${none}
 	echo
+	_cyan "$link"
 	echo
-	echo -e "$red 友情提醒: 请务必核对扫码结果 (V2RayNG 除外) $none"
+	echo
+	_yellow "没看到二维码啊???用浏览器打开上面的链接啊...."
+	echo
+	echo
+	_red "友情提醒: 请务必核对扫码结果 (V2RayNG 除外)"
 	echo
 	echo
 	echo " V2Ray 客户端使用教程: https://v2ray6.com/post/4/"
@@ -21,9 +25,14 @@ _ss_qr() {
 	echo
 	echo "---------- Shadowsocks 二维码链接 -------------"
 	echo
-	echo -e "$yellow 链接 = $cyan$link$none"
 	echo
-	echo -e " 温馨提示...$red Shadowsocks Win 4.0.6 $none客户端可能无法识别该二维码"
+	_cyan "$link"
+	echo
+	echo
+	_yellow "没看到二维码啊???用浏览器打开上面的链接啊...."
+	echo
+	echo
+	_red " 温馨提示... Shadowsocks Win 4.0.6 客户端可能无法识别该二维码"
 	echo
 	echo
 }
diff --git a/v2ray.sh b/v2ray.sh
index 492a6f2..f33739c 100755
--- a/v2ray.sh
+++ b/v2ray.sh
@@ -2570,6 +2570,7 @@ get_v2ray_multi_vmess_URL_QR() {
 
 get_v2ray_vmess_URL_link() {
 
+	echo
 	echo "---------- V2Ray vmess URL / V2RayNG v0.4.1+ / V2RayN v2.1+ / 仅适合部分客户端 -------------"
 	get_ip
 	_load jqcmd.sh