From b11480387eec4fd09f2da49fb9500be4231d2c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <n551wv1@163.com>
Date: Mon, 26 Jul 2021 19:53:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E8=80=85=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/c-developer/c-developer.vue    | 29 +++-------
 ldcake-ui/libs/utils/common.js                | 31 ++++++++++
 utils/common.js                               | 57 ++++++++++---------
 3 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/ldcake-ui/components/c-developer/c-developer.vue b/ldcake-ui/components/c-developer/c-developer.vue
index e9d633e..4e060d2 100644
--- a/ldcake-ui/components/c-developer/c-developer.vue
+++ b/ldcake-ui/components/c-developer/c-developer.vue
@@ -28,7 +28,8 @@
 
 <script>
 	import {
-		isEmpty
+		isEmpty,
+		$showToast
 	} from "../../libs/utils/common.js"
 	export default {
 		name: "c-developer",
@@ -87,7 +88,6 @@
 				customValue: '',
 				isCustom: false,
 				systemInfo: {},
-				isLock: false,
 				warningMap: {
 					'zh-CN': '暂未设置开发者模式数据',
 					'zh-US': '暫未設置開發者模式數據',
@@ -196,9 +196,9 @@
 					} catch (e) {
 						title = 'You can enter the developer mode in ${num} step'
 					}
-					uni.showToast({
+					$showToast({
 						title: title.replace('${num}', (countNum - this.clickNum)),
-						icon: "none",
+						mask: false,
 						duration: 800
 					});
 				}
@@ -214,17 +214,8 @@
 					} catch (e) {
 						developerTitle = 'You are in developer mode now'
 					}
-					this.isLock = true
-					setTimeout(()=>{
-						this.isLock = false
-					}, 3000)
-					uni.showToast({
-						title: developerTitle,
-						icon: "none",
-						duration: 3000,
-						complete: () => {
-							this.isShow = true
-						}
+					$showToast({title:developerTitle}).then(()=>{
+						this.isShow = true
 					})
 				}
 				setTimeout(() => {
@@ -232,7 +223,7 @@
 				}, this.effectiveTime * 1000)
 			},
 			close() {
-				if(!this.isLock) this.isShow = false
+				this.isShow = false
 			},
 			reset() {
 				this.isCustom = false
@@ -250,11 +241,7 @@
 					} catch (e) {
 						verificationTitle = 'Please fill in custom data'
 					}
-					uni.showToast({
-						title: verificationTitle,
-						icon: "none",
-						duration: 3000
-					})
+					$showToast({title:verificationTitle})
 					return
 				}
 				this.close()
diff --git a/ldcake-ui/libs/utils/common.js b/ldcake-ui/libs/utils/common.js
index 4607d85..685be13 100644
--- a/ldcake-ui/libs/utils/common.js
+++ b/ldcake-ui/libs/utils/common.js
@@ -13,8 +13,39 @@ export const isEmpty = (val) => {
 	return !(!!val ? typeof val === 'object' ? Array.isArray(val) ? !!val.length : !!Object.keys(val).length : true : false);
 }
 
+// 显示提示框
+export const $showToast = ({
+	title, 
+	icon='none',
+	mask=true,
+	duration=2000,
+}) => {
+	return new Promise((resolve, reject) => {
+		uni.showToast({
+			title,
+			icon,
+			mask,
+			duration,
+			success: (res) => {
+				resolve(res)
+			},
+			fail: (error) => {
+				reject(error)
+			}
+		})
+	})
+
+}
+
+//隐藏提示框
+export const $hideToast = () => {
+	uni.hideToast()
+}
+
 export default {
 	rpx2px,
 	px2rpx,
 	isEmpty,
+	$showToast,
+	$hideToast,
 }
\ No newline at end of file
diff --git a/utils/common.js b/utils/common.js
index 590b1e8..8e596af 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1,17 +1,21 @@
 const config = require('./config')
 
-export const $showToast = (title, _callback) => {
-	uni.showToast({
-		title,
-		icon: 'none',
-		mask: true,
-		duration: 2000,
-		success: () => {
-			if (isFunction(_callback)) {
-				_callback()
+export const $showToast = (title) => {
+	return new Promise((resolve, reject) => {
+		uni.showToast({
+			title,
+			icon: 'none',
+			mask: true,
+			duration: 2000,
+			success: (res) => {
+				resolve(res)
+			},
+			fail: (error) => {
+				reject(error)
 			}
-		}
+		})
 	})
+
 }
 
 export const $hideToast = () => {
@@ -26,20 +30,23 @@ export const $showModal = ({
 	cancelColor = '#000000',
 	confirmText = '确定',
 	confirmColor = config['main_color']
-}, _callback) => {
-	uni.showModal({
-		title,
-		content,
-		showCancel,
-		cancelText,
-		cancelColor,
-		confirmText,
-		confirmColor,
-		success: (res) => {
-			if (isFunction(_callback)) {
-				_callback(res)
+}) => {
+	return new Promise((resolve, reject) => {
+		uni.showModal({
+			title,
+			content,
+			showCancel,
+			cancelText,
+			cancelColor,
+			confirmText,
+			confirmColor,
+			success: (res) => {
+				resolve(res)
+			},
+			fail: (error) => {
+				reject(error)
 			}
-		}
+		})
 	})
 }
 
@@ -53,7 +60,3 @@ export const $showLoading = (title) => {
 export const $hideLoading = () => {
 	uni.hideLoading()
 }
-
-const isFunction = (obj) => {
-	return typeof obj === 'function'
-}
-- 
Gitee


From a4ae3d64312fd8c4d5df0de8da4132be5e0b062c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <n551wv1@163.com>
Date: Mon, 26 Jul 2021 19:54:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/common.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/common.js b/utils/common.js
index 8e596af..8ed44dc 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -15,7 +15,6 @@ export const $showToast = (title) => {
 			}
 		})
 	})
-
 }
 
 export const $hideToast = () => {
-- 
Gitee


From dd8ff0705b21f20d02de732703c231e139d30c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <n551wv1@163.com>
Date: Mon, 26 Jul 2021 21:44:00 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/c-developer/c-developer.vue    | 66 ++++++++++---------
 ldcake-ui/libs/utils/clipboard.js             |  2 +-
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/ldcake-ui/components/c-developer/c-developer.vue b/ldcake-ui/components/c-developer/c-developer.vue
index 4e060d2..532f6d9 100644
--- a/ldcake-ui/components/c-developer/c-developer.vue
+++ b/ldcake-ui/components/c-developer/c-developer.vue
@@ -87,45 +87,45 @@
 				defaultColor: '',
 				customValue: '',
 				isCustom: false,
-				systemInfo: {},
+				language: '',
 				warningMap: {
-					'zh-CN': '暂未设置开发者模式数据',
-					'zh-US': '暫未設置開發者模式數據',
-					'zh-TW': '暫未設置開發者模式數據',
-					'zh-HK': '暫未設置開發者模式數據',
-					'zh-MO': '暫未設置開發者模式數據',
-					'zh-SG': '暫未設置開發者模式數據'
+					'zhCN': '暂未设置开发者模式数据',
+					'zhUS': '暫未設置開發者模式數據',
+					'zhTW': '暫未設置開發者模式數據',
+					'zhHK': '暫未設置開發者模式數據',
+					'zhMO': '暫未設置開發者模式數據',
+					'zhSG': '暫未設置開發者模式數據'
 				},
 				countDownTitleMap: {
-					'zh-CN': '只需${num}步操作即可进入开发者模式',
-					'zh-US': '只需${num}步操作即可進入開發者模式',
-					'zh-TW': '只需${num}步操作即可進入開發者模式',
-					'zh-HK': '只需${num}步操作即可進入開發者模式',
-					'zh-MO': '只需${num}步操作即可進入開發者模式',
-					'zh-SG': '只需${num}步操作即可進入開發者模式'
+					'zhCN': '只需${num}步操作即可进入开发者模式',
+					'zhUS': '只需${num}步操作即可進入開發者模式',
+					'zhTW': '只需${num}步操作即可進入開發者模式',
+					'zhHK': '只需${num}步操作即可進入開發者模式',
+					'zhMO': '只需${num}步操作即可進入開發者模式',
+					'zhSG': '只需${num}步操作即可進入開發者模式'
 				},
 				developerTitleMap: {
-					'zh-CN': '您现在处于开发者模式',
-					'zh-US': '您現在處於開發者模式',
-					'zh-TW': '您現在處於開發者模式',
-					'zh-HK': '您現在處於開發者模式',
-					'zh-MO': '您現在處於開發者模式',
-					'zh-SG': '您現在處於開發者模式'
+					'zhCN': '您现在处于开发者模式',
+					'zhUS': '您現在處於開發者模式',
+					'zhTW': '您現在處於開發者模式',
+					'zhHK': '您現在處於開發者模式',
+					'zhMO': '您現在處於開發者模式',
+					'zhSG': '您現在處於開發者模式'
 				},
 				verificationTitleMap: {
-					'zh-CN': '请填写自定义数据',
-					'zh-US': '請填寫自定義數據',
-					'zh-TW': '請填寫自定義數據',
-					'zh-HK': '請填寫自定義數據',
-					'zh-MO': '請填寫自定義數據',
-					'zh-SG': '請填寫自定義數據'
+					'zhCN': '请填写自定义数据',
+					'zhUS': '請填寫自定義數據',
+					'zhTW': '請填寫自定義數據',
+					'zhHK': '請填寫自定義數據',
+					'zhMO': '請填寫自定義數據',
+					'zhSG': '請填寫自定義數據'
 				}
 			}
 		},
 		mounted() {
-			this.systemInfo = uni.getSystemInfoSync();
+			this.language = (uni.getSystemInfoSync().language).replace('-','').replace('_','')
 			this.developerList = this.list
-			this.defaultColor = this.$c.color.primary;
+			this.defaultColor = this.$c.color.primary
 			this.reset()
 		},
 		methods: {
@@ -174,7 +174,7 @@
 				if (!this.developerList.length) {
 					let warn = ''
 					try {
-						warn = this.warningMap[this.lang||this.systemInfo.language]
+						warn = this.warningMap[this.lang||this.language]
 						if (isEmpty(warn)) {
 							warn = 'Developer mode data is not set yet'
 						}
@@ -189,11 +189,15 @@
 				if (this.clickNum > (countNum - countNum / 2) && this.clickNum < countNum) {
 					let title = ''
 					try {
-						title = this.countDownTitleMap[this.lang||this.systemInfo.language]
+						title = this.countDownTitleMap[this.lang||this.language]
+						console.log(this.lang)
+						console.log(this.language)
+						console.log(this.countDownTitleMap[this.lang||this.language])
 						if (isEmpty(title)) {
 							title = 'You can enter the developer mode in ${num} step'
 						}
 					} catch (e) {
+						console.warn(e)
 						title = 'You can enter the developer mode in ${num} step'
 					}
 					$showToast({
@@ -207,7 +211,7 @@
 					this.reset()
 					let developerTitle = ''
 					try {
-						developerTitle = this.developerTitleMap[this.lang||this.systemInfo.language]
+						developerTitle = this.developerTitleMap[this.lang||this.language]
 						if (isEmpty(developerTitle)) {
 							developerTitle = 'You are in developer mode now'
 						}
@@ -234,7 +238,7 @@
 				if (this.$c.isEmpty(this.customValue) && this.isCustom) {
 					let verificationTitle = ''
 					try {
-						verificationTitle = this.verificationTitleMap[this.lang||this.systemInfo.language]
+						verificationTitle = this.verificationTitleMap[this.lang||this.language]
 						if (isEmpty(verificationTitle)) {
 							verificationTitle = 'Please fill in custom data'
 						}
diff --git a/ldcake-ui/libs/utils/clipboard.js b/ldcake-ui/libs/utils/clipboard.js
index 73d87cb..1bf374d 100644
--- a/ldcake-ui/libs/utils/clipboard.js
+++ b/ldcake-ui/libs/utils/clipboard.js
@@ -51,7 +51,7 @@ export const setClipboardData = (data, lang) => {
 			textarea.select()
 			textarea.setSelectionRange(0, data.length)
 			document.execCommand('copy')
-			const res = uni.getSystemInfoSync();
+			const res = uni.getSystemInfoSync()
 			let title = 'Content copied'
 			const titleMap = {
 				'zh-CN': '内容已复制',
-- 
Gitee


From dcc5ff70d8426fe9f523c36d668a412f9ebcd840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <n551wv1@163.com>
Date: Mon, 26 Jul 2021 21:50:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ldcake-ui/components/c-developer/c-developer.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ldcake-ui/components/c-developer/c-developer.vue b/ldcake-ui/components/c-developer/c-developer.vue
index 532f6d9..826caa4 100644
--- a/ldcake-ui/components/c-developer/c-developer.vue
+++ b/ldcake-ui/components/c-developer/c-developer.vue
@@ -123,13 +123,16 @@
 			}
 		},
 		mounted() {
-			this.language = (uni.getSystemInfoSync().language).replace('-','').replace('_','')
+			this.language = this.formatLanguage(uni.getSystemInfoSync().language)
 			this.developerList = this.list
 			this.defaultColor = this.$c.color.primary
 			this.reset()
 		},
 		methods: {
 			returnHandle() {},
+			formatLanguage(val){
+				return val.replace('-','').replace('_','')
+			},
 			radioChange(e) {
 				const value = e.detail.value
 				const index = this.getIndexByName(value)
@@ -174,7 +177,7 @@
 				if (!this.developerList.length) {
 					let warn = ''
 					try {
-						warn = this.warningMap[this.lang||this.language]
+						warn = this.warningMap[this.formatLanguage(this.lang)||this.language]
 						if (isEmpty(warn)) {
 							warn = 'Developer mode data is not set yet'
 						}
@@ -189,10 +192,7 @@
 				if (this.clickNum > (countNum - countNum / 2) && this.clickNum < countNum) {
 					let title = ''
 					try {
-						title = this.countDownTitleMap[this.lang||this.language]
-						console.log(this.lang)
-						console.log(this.language)
-						console.log(this.countDownTitleMap[this.lang||this.language])
+						title = this.countDownTitleMap[this.formatLanguage(this.lang)||this.language]
 						if (isEmpty(title)) {
 							title = 'You can enter the developer mode in ${num} step'
 						}
@@ -211,7 +211,7 @@
 					this.reset()
 					let developerTitle = ''
 					try {
-						developerTitle = this.developerTitleMap[this.lang||this.language]
+						developerTitle = this.developerTitleMap[this.formatLanguage(this.lang)||this.language]
 						if (isEmpty(developerTitle)) {
 							developerTitle = 'You are in developer mode now'
 						}
@@ -238,7 +238,7 @@
 				if (this.$c.isEmpty(this.customValue) && this.isCustom) {
 					let verificationTitle = ''
 					try {
-						verificationTitle = this.verificationTitleMap[this.lang||this.language]
+						verificationTitle = this.verificationTitleMap[this.formatLanguage(this.lang)||this.language]
 						if (isEmpty(verificationTitle)) {
 							verificationTitle = 'Please fill in custom data'
 						}
-- 
Gitee


From 6483c7f3783df834d011b2d9ccc46eed93797343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <n551wv1@163.com>
Date: Mon, 26 Jul 2021 22:45:35 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=AA=90=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ldcake-ui/components/c-developer/c-developer.vue | 1 -
 ldcake-ui/package.json                           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ldcake-ui/components/c-developer/c-developer.vue b/ldcake-ui/components/c-developer/c-developer.vue
index 826caa4..23936c6 100644
--- a/ldcake-ui/components/c-developer/c-developer.vue
+++ b/ldcake-ui/components/c-developer/c-developer.vue
@@ -197,7 +197,6 @@
 							title = 'You can enter the developer mode in ${num} step'
 						}
 					} catch (e) {
-						console.warn(e)
 						title = 'You can enter the developer mode in ${num} step'
 					}
 					$showToast({
diff --git a/ldcake-ui/package.json b/ldcake-ui/package.json
index 550bc9c..297c423 100644
--- a/ldcake-ui/package.json
+++ b/ldcake-ui/package.json
@@ -1,6 +1,6 @@
 {
 		"name": "ldcake-ui",
-		"version": "1.1.4",
+		"version": "1.1.5",
 		"description": "基于uni-app的UI组件库",
 		"main": "index.js",
 		"scripts": {
-- 
Gitee


From 454dcfe795ae74992be787a02de1917c0c987460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <n551wv1@163.com>
Date: Tue, 27 Jul 2021 00:10:19 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/c-developer/c-developer.vue    | 66 ++++++++++++++++++-
 ldcake-ui/package.json                        |  2 +-
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/ldcake-ui/components/c-developer/c-developer.vue b/ldcake-ui/components/c-developer/c-developer.vue
index 23936c6..033c103 100644
--- a/ldcake-ui/components/c-developer/c-developer.vue
+++ b/ldcake-ui/components/c-developer/c-developer.vue
@@ -3,7 +3,7 @@
 		<view :class="{'developerMask': isShow}" @click="close" @touchmove.stop.prevent="returnHandle">
 			<view class="c-developer__content" :class="{'developerShow':isShow}" @touchmove.stop.prevent="returnHandle"
 				@tap.stop="returnHandle">
-				<view class="c-developer__content-title">开发者模式</view>
+				<view class="c-developer__content-title">{{title}}</view>
 				<view class="c-developer__content-padding">
 					<radio-group @change="radioChange">
 						<label class="c-developer__content-cell" v-for="(item,index) in developerList" :key="index"
@@ -17,9 +17,9 @@
 						placeholder="请输入自定义服务器地址(注意使用英文标点符号)" type="text" v-model="customValue" v-if="isCustom" />
 				</view>
 				<view class="c-developer__footer" @touchmove.stop.prevent="returnHandle" @tap.stop="returnHandle">
-					<view class="c-developer__footer-view c-developer__footer-cancel" @click="reset">重置</view>
+					<view class="c-developer__footer-view c-developer__footer-cancel" @click="reset">{{footer.reset}}</view>
 					<view class="c-developer__footer-view c-developer__footer-confirm" :style="[{backgroundColor: themeColor||defaultColor}]"
-						@click="confirm">确认</view>
+						@click="confirm">{{footer.confirm}}</view>
 				</view>
 			</view>
 		</view>
@@ -88,6 +88,42 @@
 				customValue: '',
 				isCustom: false,
 				language: '',
+				title: '',
+				footer: {},
+				titleMap: {
+					'zhCN': '开发者模式',
+					'zhUS': '開發者模式',
+					'zhTW': '開發者模式',
+					'zhHK': '開發者模式',
+					'zhMO': '開發者模式',
+					'zhSG': '開發者模式'
+				},
+				footerMap: {
+					'zhCN': {
+						reset: '重置',
+						confirm: '确认'
+					},
+					'zhUS': {
+						reset: '重置',
+						confirm: '確定'
+					},
+					'zhTW': {
+						reset: '重置',
+						confirm: '確定'
+					},
+					'zhHK': {
+						reset: '重置',
+						confirm: '確定'
+					},
+					'zhMO': {
+						reset: '重置',
+						confirm: '確定'
+					},
+					'zhSG': {
+						reset: '重置',
+						confirm: '確定'
+					},
+				},
 				warningMap: {
 					'zhCN': '暂未设置开发者模式数据',
 					'zhUS': '暫未設置開發者模式數據',
@@ -126,10 +162,34 @@
 			this.language = this.formatLanguage(uni.getSystemInfoSync().language)
 			this.developerList = this.list
 			this.defaultColor = this.$c.color.primary
+			this.handleStaticValue()
 			this.reset()
 		},
 		methods: {
 			returnHandle() {},
+			handleStaticValue(){
+				let title = ''
+				let footer = {}
+				try {
+					title = this.titleMap[this.formatLanguage(this.lang)||this.language]
+					footer = this.footerMap[this.formatLanguage(this.lang)||this.language]
+					if (isEmpty(title)) {
+						title = 'Developer Mode'
+						footer = {
+							reset: 'Reset',
+							confirm: 'Confirm'
+						}
+					}
+				} catch (e) {
+					title = 'Developer Mode'
+					footer = {
+						reset: 'Reset',
+						confirm: 'Confirm'
+					}
+				}
+				this.title = title
+				this.footer = footer
+			},
 			formatLanguage(val){
 				return val.replace('-','').replace('_','')
 			},
diff --git a/ldcake-ui/package.json b/ldcake-ui/package.json
index 297c423..6604bda 100644
--- a/ldcake-ui/package.json
+++ b/ldcake-ui/package.json
@@ -1,6 +1,6 @@
 {
 		"name": "ldcake-ui",
-		"version": "1.1.5",
+		"version": "1.1.6",
 		"description": "基于uni-app的UI组件库",
 		"main": "index.js",
 		"scripts": {
-- 
Gitee