From 45d901e8fcc16bb32a19c7fe4f895f4196f82492 Mon Sep 17 00:00:00 2001
From: Penny <2500338766@qq.com>
Date: Tue, 8 Aug 2023 01:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=8D=93=E5=8E=9F?=
 =?UTF-8?q?=E7=94=9F=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   6 +-
 manifest.json                                 |  63 ++-
 .../test/android/scanCode-release.aar         | Bin 0 -> 20404 bytes
 pages/scan/Book.vue                           |   7 +-
 pages/scan/{Scan.vue => Scan.nvue}            |  69 ++-
 pages/setting/Setting.vue                     | 400 +++++++++++-------
 6 files changed, 365 insertions(+), 180 deletions(-)
 create mode 100644 nativeplugins/test/android/scanCode-release.aar
 rename pages/scan/{Scan.vue => Scan.nvue} (55%)

diff --git a/App.vue b/App.vue
index ca77364..26d8505 100644
--- a/App.vue
+++ b/App.vue
@@ -1,13 +1,13 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
+			//console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
+			//console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
+			//console.log('App Hide')
 		}
 	}
 </script>
diff --git a/manifest.json b/manifest.json
index 7a468ce..37c36e6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__44D25EC",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -38,12 +38,67 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "minSdkVersion" : 21,
+                "targetSdkVersion" : 28
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        },
+        "nativePlugins" : {
+            "Mpaas-Scan" : {
+                "AppId" : "ALIPUB292A079010931",
+                "License" : "KXaY6vzdsbbpso9o+9XOdpbiWPfgWstqa2NFfXVxEJZ4sVFaH33wvGUvLELnwibqFU3LEeWQPm+nW5TOfHNIOVnrUVji+bZoDuRTvPGFnVupqKpZRiF3kNB76pXHy9LuqAkH0h/eI44ZapbQNj15/Jma4WR5bffSdNKuTUnbDiaQSpBp9A38TGeWJ222eQL+RjGvFm15MZntBou93IspOnN58cDAvk75A6hUydJupKqYDl7UgQurm5pRKvB0UMYQOFcymuUVJH6N8a8pyJkvgP98oy3MskMcdJtYAzbjbdQi8/4ZuhPwbjqhVqzM3Pq2ebA2QcH/zbGT4LuvnQKXLw==",
+                "WorkspaceId" : "default",
+                "__plugin_info__" : {
+                    "name" : "支付宝原生扫码插件",
+                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
+                    "android_package_name" : "uni.UNI44D25EC",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2636",
+                    "parameters" : {
+                        "AppId" : {
+                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
+                            "key" : "mobilegw.appid",
+                            "value" : ""
+                        },
+                        "License" : {
+                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
+                            "key" : "mpaasConfigLicense",
+                            "value" : ""
+                        },
+                        "WorkspaceId" : {
+                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
+                            "key" : "workspaceId",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "scanCode" : {
+                "__plugin_info__" : {
+                    "name" : "scanCode",
+                    "description" : "测试插件流程",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */
diff --git a/nativeplugins/test/android/scanCode-release.aar b/nativeplugins/test/android/scanCode-release.aar
new file mode 100644
index 0000000000000000000000000000000000000000..16bdba2fc2b1239442295e912039608de45762be
GIT binary patch
literal 20404
zcmV)AK*YaLO9KQ7000OG0000%0A3HBhJ{7|0K~-s00jU508%b=cy#T3+j87E(&qg>
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
I)ENNqKh|vrssI20

literal 0
HcmV?d00001

diff --git a/pages/scan/Book.vue b/pages/scan/Book.vue
index 53fc598..7801124 100644
--- a/pages/scan/Book.vue
+++ b/pages/scan/Book.vue
@@ -54,10 +54,13 @@
 			}
 		},
 		onLoad() {
-
+			this.loadPage();
 		},
 		methods: {
-
+			
+			loadPage(){
+				console.log('11111')
+			}
 		}
 	}
 </script>
diff --git a/pages/scan/Scan.vue b/pages/scan/Scan.nvue
similarity index 55%
rename from pages/scan/Scan.vue
rename to pages/scan/Scan.nvue
index 7234583..d65b9bb 100644
--- a/pages/scan/Scan.vue
+++ b/pages/scan/Scan.nvue
@@ -1,13 +1,9 @@
 <template>
 	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">{{title}}</text>
-		</view>
 		<tn-button shape="round" backgroundColor="#01BEFF" fontColor="#080808" @click="jumpToPage('/pages/scan/Barcode')">跳转Barcode页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Book')">跳转Book页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Calendar')">跳转Calendar页面</tn-button>
-		<tn-button shape="round" @click="jumpToPage('/pages/scan/Contacts')">跳转Contacts页面</tn-button>
+		<tn-button shape="round" @clicksss="jumpToPage('/pages/scan/Contacts')">跳转Contacts页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Email')">跳转Email页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Location')">跳转Location页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Paypal')">跳转Paypal页面</tn-button>
@@ -17,8 +13,11 @@
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Text')">跳转Text页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Url')">跳转Url页面</tn-button>
 		<tn-button shape="round" @click="jumpToPage('/pages/scan/Wifi')">跳转Wifi页面</tn-button>
+		 
 		
-		<!-- <tn-button type="primary" @click="scanCode()">扫码</tn-button> -->
+		<tn-button type="primary" @click="scanCode()">扫码</tn-button>
+		<tn-button type="primary" @click="testAdd">相加</tn-button>
+		<tn-toast ref="toast"></tn-toast>
 	</view>
 </template>
 
@@ -29,10 +28,23 @@
 				title: 'Scan'
 			}
 		},
-		onLoad() {
-
+		created() {
+			// this.scanCode();
 		},
 		methods: {
+			
+			testAdd(){
+				const testModule = uni.requireNativePlugin('scanCode');
+				testModule.add({
+					a:1,
+					b:2
+				},res => {
+					uni.showToast({
+						title: '提示',
+						content: JSON.stringify(res)
+					})
+				})
+			},	
 			//根据扫码返回结果判断跳转到哪个指定页面
 			jumpToPage(url){
 				uni.navigateTo({
@@ -41,20 +53,41 @@
 			},
 			
 			//扫码
-			scanCode(){
-				// 允许从相机和相册扫码
-				uni.scanCode({
-					success: function (res) {
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
-					}
-				});
-			}
+			// scanCode(){
+			// 	// 允许从相机和相册扫码
+			// 	uni.scanCode({
+			// 		success: function (res) {
+			// 			console.log(JSON.stringify(res))
+			// 			console.log('条码类型：' + res.scanType);
+			// 			console.log('条码内容：' + res.result);
+			// 		}
+			// 	});
+			// }
+			
+			scanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，不设置，默认识别所有
+					// 'scanType': ['qrCode', 'barCode'],
+					// 是否隐藏相册，默认false不隐藏
+					'hideAlbum': false,
+					},
+					(ret) => {
+						console.log(JSON.stringify(ret))
+						this.$refs.toast.show({
+						          title: '支付成功',
+						          content: JSON.stringify(ret),
+						          icon: 'success',
+						          duration: 2000
+						        });
+						console.log('24123123')
+						})
+			},
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
diff --git a/pages/setting/Setting.vue b/pages/setting/Setting.vue
index d878caa..22a45e6 100644
--- a/pages/setting/Setting.vue
+++ b/pages/setting/Setting.vue
@@ -2,136 +2,145 @@
 	<view class="content">
 		
 		<!-- 顶部通用设置模块 -->
-		<view class="headLine">General Settings</view>
-		<tn-list-view :card="cardMode" class="settingList" unlined="all">
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Beep</view>
-						 <view class="list-left-text-two">Beep when the scan is successfull.</view> 
-					  </view>
-				    </view>
-					<!-- 右边操作按钮部分 -->
-					<view class="list-right">
-						<tn-switch v-model="beepChecked" :inactiveValue="0" :activeValue="1"
-						:inactiveColor="inactiveColor" :activeColor="activeColor"></tn-switch> 
+		<view>
+			<view class="headLine">General Settings</view>
+			<tn-list-view :card="cardMode" class="settingList" unlined="all">
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-circle-fill tn-color-gray"></view>
+						  <view class="list-left-text">
+							 <view class="list-left-text-one">Beep</view>
+							 <view class="list-left-text-two">Beep when the scan is successfull.</view> 
+						  </view>
+					    </view>
+						<!-- 右边操作按钮部分 -->
+						<view class="list-right">
+							<tn-switch v-model="beepChecked" :inactiveValue="0" :activeValue="1"
+							:inactiveColor="inactiveColor" :activeColor="activeColor"></tn-switch> 
+						</view>
 					</view>
-				</view>
-			</tn-list-cell>
-			
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Auto-copied to clipboard</view>
-					  </view>
-				    </view>
-					<!-- 右边操作按钮部分 -->
-					<view class="list-right">
-						<tn-switch v-model="ClipboardCheked" :inactiveValue="0" :activeValue="1"
-						:inactiveColor="inactiveColor" :activeColor="activeColor"></tn-switch> 
+				</tn-list-cell>
+				
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
+						  <view class="list-left-text">
+							 <view class="list-left-text-one">Auto-copied to clipboard</view>
+						  </view>
+					    </view>
+						<!-- 右边操作按钮部分 -->
+						<view class="list-right">
+							<tn-switch v-model="ClipboardCheked" :inactiveValue="0" :activeValue="1"
+							:inactiveColor="inactiveColor" :activeColor="activeColor"></tn-switch> 
+						</view>
 					</view>
-				</view>
-			</tn-list-cell>
-			
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Search Engine</view>
-					  </view>
-				    </view>
-					<!-- 右边操作按钮部分 -->
-					<view class="list-right">
-						<!-- <tn-switch v-model="checked" :inactiveValue="0" :activeValue="1"></tn-switch> -->
+				</tn-list-cell>
+				
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-search tn-color-gray"></view>
+						  <view class="list-left-select-text">
+							 <view class="list-left-select-text-one">Search Engine</view>
+						  </view>
+					    </view>
+						<!-- 右边操作按钮部分 -->
+						<view class="list-right">
+							<text class="list-right-text">{{ webEngineLabel }}</text><text class="tn-icon-down-triangle list-right-icon" @click="openWebSelectView"></text>
+							<tn-select title="Select Browser" :confirmText="confirmText" :cancelText="cancelText"
+							v-model="webEngine" mode="single" :list="webEngineList" @confirm="selectWebEngine" :searchShow="searchEngineFlag" :searchPlaceholder="placeholderText"></tn-select>
+						</view>
 					</view>
-				</view>
-			</tn-list-cell>
-			
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Dark Mode</view>
-					  </view>
-				    </view>
-					<!-- 右边操作按钮部分 -->
-					<view class="list-right">
-						<tn-switch v-model="DarkModeChecked" :inactiveValue="0" :activeValue="1"
-						:inactiveColor="inactiveColor" :activeColor="activeColor"></tn-switch> 
+				</tn-list-cell>
+				
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-moon-fill tn-color-gray"></view>
+						  <view class="list-left-text">
+							 <view class="list-left-text-one">Dark Mode</view>
+						  </view>
+					    </view>
+						<!-- 右边操作按钮部分 -->
+						<view class="list-right">
+							<tn-switch v-model="DarkModeChecked" :inactiveValue="0" :activeValue="1"
+							:inactiveColor="inactiveColor" :activeColor="activeColor"></tn-switch> 
+						</view>
 					</view>
-				</view>
-			</tn-list-cell>
-			
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Language options</view>
-					  </view>
-				    </view>
-					<!-- 右边操作按钮部分 -->
-					<view class="list-right">
-						<!-- <tn-switch v-model="checked" :inactiveValue="0" :activeValue="1"></tn-switch> -->
+				</tn-list-cell>
+				
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-english tn-color-gray"></view>
+						  <view class="list-left-select-text">
+							 <view class="list-left-select-text-one">Language options</view>
+						  </view>
+					    </view>
+						<!-- 右边操作按钮部分 -->
+						<view class="list-right">
+							<text class="list-right-text">{{ languageLabel }}</text><text class="tn-icon-down-triangle list-right-icon" @click="openLanguageSelectView"></text>
+							<tn-select title="Select Language" :confirmText="confirmText" :cancelText="cancelText"
+							v-model="language" mode="single" :list="languageList" @confirm="selectLanauage" :searchShow="searchLanguageFlag" :searchPlaceholder="placeholderText"></tn-select>
+						</view>
 					</view>
-				</view>
-			</tn-list-cell>
-		</tn-list-view>
+				</tn-list-cell>
+			</tn-list-view>
+		</view>
+		
 		
 		
 		<!-- 底部Help帮助模块 -->
 		
 		
-		<view class="headLine">Help</view>
-		<tn-list-view :card="cardMode" class="settingList">
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">FAQ</view>
-					  </view>
-				    </view>
-				</view>
-			</tn-list-cell>
-			
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Feedback</view>
-						 <view class="list-left-text-two">Report bugs and tell us what to improve</view> 
-					  </view>
-				    </view>
-				</view>
-			</tn-list-cell>
-			
-			<tn-list-cell class="listItem">
-				<view class="list-icon-text">
-					<!-- 左边图标文本显示部分 -->
-				    <view class="list-left">
-					  <view class="list-left-icon tn-icon-discover tn-color-gray"></view>
-					  <view class="list-left-text">
-						 <view class="list-left-text-one">Provacy policy</view>
-					  </view>
-				    </view>
-				</view>
-			</tn-list-cell>
-		</tn-list-view>
+		<view>
+			<view class="headLine">Help</view>
+			<tn-list-view :card="cardMode" class="settingList">
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-help tn-color-gray"></view>
+						  <view class="list-left-text">
+							 <view class="list-left-text-one">FAQ</view>
+						  </view>
+					    </view>
+					</view>
+				</tn-list-cell>
+				
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-edit-form tn-color-gray"></view>
+						  <view class="list-left-feedback-text">
+							 <view class="list-left-feedback-text-one">Feedback</view>
+							 <view class="list-left-feedback-text-two">Report bugs and tell us what to improve.</view> 
+						  </view>
+					    </view>
+					</view>
+				</tn-list-cell>
+				
+				<tn-list-cell class="listItem">
+					<view class="list-icon-text">
+						<!-- 左边图标文本显示部分 -->
+					    <view class="list-left">
+						  <view class="list-left-icon tn-icon-safe-fill tn-color-gray"></view>
+						  <view class="list-left-text">
+							 <view class="list-left-text-one">Provacy policy</view>
+						  </view>
+					    </view>
+					</view>
+				</tn-list-cell>
+			</tn-list-view>
+		</view>
 	</view>
 </template>
 
@@ -145,14 +154,90 @@
 				DarkModeChecked: true,
 				unlined: false,
 				inactiveColor: 'grey',
-				activeColor: 'darkblue'
+				activeColor: 'royalblue',
+				webEngine: false, //打开浏览器列表
+				searchEngineFlag: true, //打开浏览器搜索框
+				webEngineLabel: 'Google', //默认浏览器选择文本
+				webEngineValue: 0, //默认浏览器选择结果
+				placeholderText: 'search which you like', //搜索文本占位文字
+				confirmText: 'Confirm', //搜索确认文本
+				cancelText: 'Cancel', //搜索取消文本
+				language: false,  //打开语言列表
+				languageLabel: 'English', //默认语言选择文本
+				languageValue: 0, //默认语言选择结果
+				searchLanguageFlag: true, //打开语言搜索框
+				
+				webEngineList:[
+					{
+						"value": 0,
+						"label": "Google"
+					},
+					{
+						"value": 1,
+						"label": "Yahoo"
+					},
+					{
+						"value": 2,
+						"label": "Bing"
+					}
+				],
+				
+				languageList:[
+					{
+						"value": 0,
+						"label": "English"
+					},
+					{
+						"value": 1,
+						"label": "Deutsch"
+					},
+					{
+						"value": 2,
+						"label": "A"
+					},
+					{
+						"value": 3,
+						"label": "B"
+					},
+					{
+						"value": 4,
+						"label": "C"
+					},
+					{
+						"value": 5,
+						"label": "D"
+					},
+				]
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
-
+			
+			//选择搜索引擎
+			selectWebEngine(e){
+				console.log('选择了浏览器',e[0].label);
+				this.webEngineLabel = e[0].label;
+				this.webEngineValue = e[0].value;
+			},
+			
+			//打开选择搜索引擎界面
+			openWebSelectView(){
+				this.webEngine = true;
+			},
+			
+			//打开选择语言界面
+			openLanguageSelectView(){
+				this.language = true;
+			},
+			
+			//选择语言
+			selectLanauage(e){
+				console.log('选择了语言',e[0].label);
+				this.languageLabel = e[0].label;
+				this.languageValue = e[0].value;
+			}
 		}
 	}
 </script>
@@ -171,7 +256,10 @@
 		.headLine{
 			color: royalblue;
 			font-size: 18px;
-			padding-top:30px;
+			//padding-top:30px;
+			//margin-right:200px;
+			margin-top:30px;
+			//border: 2px solid purple;
 		}
 		
 		.settingList{
@@ -179,7 +267,7 @@
 			width: 330px;
 			//height:300px;
 			height: auto;
-			margin-top: 50px;
+			//margin-top: 10px;
 			//background-color: #141b29;
 			
 			.listItem{
@@ -216,6 +304,20 @@
 							}
 						}
 						
+						.list-left-feedback-text{
+							width: 240px;
+							.list-left-feedback-text-one{
+								font-size: 15px;
+								//border: 2px solid blue;
+							}
+							
+							.list-left-feedback-text-two{
+								color: grey;
+								font-size:13px;
+								//border: 2px solid lightsalmon;
+							}
+						}
+						
 						
 						.list-left-icon{
 							//border: 2px solid blueviolet;
@@ -223,42 +325,34 @@
 							font-size: 25px;
 						}
 						
-						
-						
+						.list-left-select-text{
+							width: 160px;
+							.list-left-select-text-one{
+								font-size: 15px;
+								//border: 2px solid blue;
+							}
+						}
 					}
 					
 					.list-right{
 						//border: 2px solid pink;
+						color: royalblue;
+						font-size: 20px;
+						
+						.list-right-icon{
+							//border: 2px solid gainsboro;
+							font-size: 25px;
+							margin-left: 15px;
+						}
+						
+						.list-right-text{
+							//border: 2px solid green;
+							//margin-right: 30px;
+							//padding-right: 30px;
+						}
 					}
-				  
-				  // .list {
-				  //   &__left {
-				  //     display: flex;
-				  //     align-items: center;
-				  //     justify-content: flex-start;
-				      
-				  //     &__icon, &__image {
-				  //       margin-right: 18rpx;
-						// font-size: 25px;
-				  //     }
-				  //   }
-				    
-				  //   &__right {
-				  //     display: flex;
-				  //     align-items: center;
-				  //     justify-content: flex-end;
-				  //   }
-				  // }
 				}
-				
 			}
-			
-			// .icon{
-			// 	color: dimgrey;
-			// 	font-size: 25px;
-			// 	display: flex;
-			// }
-			
 		}
 	}