From bd06e91920bf4d72b74ecc6aa710b4a0ad19d38e Mon Sep 17 00:00:00 2001
From: Penny <2500338766@qq.com>
Date: Mon, 11 Sep 2023 12:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidPrivacy.json                |   3 +
 js_sdk/wa-permission/permission.js | 296 ++++++++++++++++++++
 manifest.json                      |  73 +++--
 pages.json                         |  35 +++
 pages/history/History.vue          | 197 +++++++-------
 pages/policy/Policy.vue            | 119 ++++++++
 pages/rights/RightsOpen.vue        |  75 ++++++
 pages/rights/RightsSetting.vue     | 100 +++++++
 pages/scan/Barcode.vue             |  65 ++---
 pages/scan/Calendar.vue            | 124 ++++++---
 pages/scan/Contacts.vue            |  67 ++---
 pages/scan/Email.vue               |  64 ++---
 pages/scan/Location.vue            |  77 +++---
 pages/scan/Product.vue             |  73 ++---
 pages/scan/Scan.nvue               |  92 +++++--
 pages/scan/Sms.vue                 |  72 +++--
 pages/scan/Tel.vue                 |  60 ++---
 pages/scan/Text.vue                |  83 +++---
 pages/scan/Url.vue                 |  62 +++--
 pages/scan/Wifi.vue                |  62 ++---
 pages/setting/Setting.vue          | 418 +++++++++++++++++------------
 static/album.png                   | Bin 3425 -> 3516 bytes
 static/flashLightOff.png           | Bin 5176 -> 968 bytes
 static/flashLightOn.png            | Bin 3464 -> 863 bytes
 uni_modules/vv-schedule/index.js   | 186 +++++++++++++
 uni_modules/vv-schedule/readme.md  |  13 +
 26 files changed, 1765 insertions(+), 651 deletions(-)
 create mode 100644 androidPrivacy.json
 create mode 100644 js_sdk/wa-permission/permission.js
 create mode 100644 pages/policy/Policy.vue
 create mode 100644 pages/rights/RightsOpen.vue
 create mode 100644 pages/rights/RightsSetting.vue
 create mode 100644 uni_modules/vv-schedule/index.js
 create mode 100644 uni_modules/vv-schedule/readme.md

diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..a78485c
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,3 @@
+{
+    "prompt" : "none"
+}
diff --git a/js_sdk/wa-permission/permission.js b/js_sdk/wa-permission/permission.js
new file mode 100644
index 0000000..ee694f2
--- /dev/null
+++ b/js_sdk/wa-permission/permission.js
@@ -0,0 +1,296 @@
+/**
+ * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
+ */
+
+var isIos
+// #ifdef APP-PLUS
+isIos = (plus.os.name == "iOS")
+// #endif
+
+// 判断推送权限是否开启
+function judgeIosPermissionPush() {
+	var result = false;
+	var UIApplication = plus.ios.import("UIApplication");
+	var app = UIApplication.sharedApplication();
+	var enabledTypes = 0;
+	if (app.currentUserNotificationSettings) {
+		var settings = app.currentUserNotificationSettings();
+		enabledTypes = settings.plusGetAttribute("types");
+		console.log("enabledTypes1:" + enabledTypes);
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		plus.ios.deleteObject(settings);
+	} else {
+		enabledTypes = app.enabledRemoteNotificationTypes();
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启!");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		console.log("enabledTypes2:" + enabledTypes);
+	}
+	plus.ios.deleteObject(app);
+	plus.ios.deleteObject(UIApplication);
+	return result;
+}
+
+// 判断定位权限是否开启
+function judgeIosPermissionLocation() {
+	var result = false;
+	var cllocationManger = plus.ios.import("CLLocationManager");
+	var status = cllocationManger.authorizationStatus();
+	result = (status != 2)
+	console.log("定位权限开启：" + result);
+	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
+	/* var enable = cllocationManger.locationServicesEnabled();
+	var status = cllocationManger.authorizationStatus();
+	console.log("enable:" + enable);
+	console.log("status:" + status);
+	if (enable && status != 2) {
+		result = true;
+		console.log("手机定位服务已开启且已授予定位权限");
+	} else {
+		console.log("手机系统的定位没有打开或未给予定位权限");
+	} */
+	plus.ios.deleteObject(cllocationManger);
+	return result;
+}
+
+// 判断麦克风权限是否开启
+function judgeIosPermissionRecord() {
+	var result = false;
+	var avaudiosession = plus.ios.import("AVAudioSession");
+	var avaudio = avaudiosession.sharedInstance();
+	var permissionStatus = avaudio.recordPermission();
+	console.log("permissionStatus:" + permissionStatus);
+	if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
+		console.log("麦克风权限没有开启");
+	} else {
+		result = true;
+		console.log("麦克风权限已经开启");
+	}
+	plus.ios.deleteObject(avaudiosession);
+	return result;
+}
+
+// 判断相机权限是否开启
+function judgeIosPermissionCamera() {
+	var result = false;
+	var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+	var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相机权限已经开启");
+	} else {
+		console.log("相机权限没有开启");
+	}
+	plus.ios.deleteObject(AVCaptureDevice);
+	return result;
+}
+
+// 判断相册权限是否开启
+function judgeIosPermissionPhotoLibrary() {
+	var result = false;
+	var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+	var authStatus = PHPhotoLibrary.authorizationStatus();
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相册权限已经开启");
+	} else {
+		console.log("相册权限没有开启");
+	}
+	plus.ios.deleteObject(PHPhotoLibrary);
+	return result;
+}
+
+// 判断通讯录权限是否开启
+function judgeIosPermissionContact() {
+	var result = false;
+	var CNContactStore = plus.ios.import("CNContactStore");
+	var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+	if (cnAuthStatus == 3) {
+		result = true;
+		console.log("通讯录权限已经开启");
+	} else {
+		console.log("通讯录权限没有开启");
+	}
+	plus.ios.deleteObject(CNContactStore);
+	return result;
+}
+
+// 判断日历权限是否开启
+function judgeIosPermissionCalendar() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("日历权限已经开启");
+	} else {
+		console.log("日历权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// 判断备忘录权限是否开启
+function judgeIosPermissionMemo() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("备忘录权限已经开启");
+	} else {
+		console.log("备忘录权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// Android权限查询
+function requestAndroidPermission(permissionID) {
+	return new Promise((resolve, reject) => {
+		plus.android.requestPermissions(
+			[permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
+			function(resultObj) {
+				var result = 0;
+				for (var i = 0; i < resultObj.granted.length; i++) {
+					var grantedPermission = resultObj.granted[i];
+					console.log('已获取的权限：' + grantedPermission);
+					result = 1
+				}
+				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+					var deniedPresentPermission = resultObj.deniedPresent[i];
+					console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+					result = 0
+				}
+				for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+					var deniedAlwaysPermission = resultObj.deniedAlways[i];
+					console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+					result = -1
+				}
+				resolve(result);
+				// 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
+				// if (result != 1) {
+				// gotoAppPermissionSetting()
+				// }
+			},
+			function(error) {
+				console.log('申请权限错误：' + error.code + " = " + error.message);
+				resolve({
+					code: error.code,
+					message: error.message
+				});
+			}
+		);
+	});
+}
+
+//权限设置专用检查(解决onShow循环问题)
+function queryRightsSettingPermission(permissionID){
+	plus.android.requestPermissions([permissionID], function(e){
+		if(e.granted.length>0){	//权限被允许
+			//调用依赖获取定位权限的代码
+			console.log('granted!!! '+e.granted.toString());
+			return 1;
+		}
+		if(e.deniedAlways.length>0){	//权限被永久拒绝
+			// 弹出提示框解释为何需要定位权限，引导用户打开设置页面开启
+			console.log('Always Denied!!! '+e.deniedAlways.toString());
+			return -1;
+		}
+		if(e.deniedPresent.length>0){	//权限被临时拒绝
+			// 弹出提示框解释为何需要定位权限，可再次调用plus.android.requestPermissions申请权限
+			console.log('Present Denied!!! '+e.deniedPresent.toString());
+			return 0;
+		}
+	}, function(e){
+	    console.log('Request Permissions error:'+JSON.stringify(e));
+	});
+}
+
+// 使用一个方法，根据参数判断权限
+function judgeIosPermission(permissionID) {
+	if (permissionID == "location") {
+		return judgeIosPermissionLocation()
+	} else if (permissionID == "camera") {
+		return judgeIosPermissionCamera()
+	} else if (permissionID == "photoLibrary") {
+		return judgeIosPermissionPhotoLibrary()
+	} else if (permissionID == "record") {
+		return judgeIosPermissionRecord()
+	} else if (permissionID == "push") {
+		return judgeIosPermissionPush()
+	} else if (permissionID == "contact") {
+		return judgeIosPermissionContact()
+	} else if (permissionID == "calendar") {
+		return judgeIosPermissionCalendar()
+	} else if (permissionID == "memo") {
+		return judgeIosPermissionMemo()
+	}
+	return false;
+}
+
+// 跳转到**应用**的权限页面
+function gotoAppPermissionSetting() {
+	if (isIos) {
+		var UIApplication = plus.ios.import("UIApplication");
+		var application2 = UIApplication.sharedApplication();
+		var NSURL2 = plus.ios.import("NSURL");
+		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
+		var setting2 = NSURL2.URLWithString("app-settings:");
+		application2.openURL(setting2);
+
+		plus.ios.deleteObject(setting2);
+		plus.ios.deleteObject(NSURL2);
+		plus.ios.deleteObject(application2);
+	} else {
+		// console.log(plus.device.vendor);
+		var Intent = plus.android.importClass("android.content.Intent");
+		var Settings = plus.android.importClass("android.provider.Settings");
+		var Uri = plus.android.importClass("android.net.Uri");
+		var mainActivity = plus.android.runtimeMainActivity();
+		var intent = new Intent();
+		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+		intent.setData(uri);
+		mainActivity.startActivity(intent);
+	}
+}
+
+// 检查系统的设备服务是否开启
+// var checkSystemEnableLocation = async function () {
+function checkSystemEnableLocation() {
+	if (isIos) {
+		var result = false;
+		var cllocationManger = plus.ios.import("CLLocationManager");
+		var result = cllocationManger.locationServicesEnabled();
+		console.log("系统定位开启:" + result);
+		plus.ios.deleteObject(cllocationManger);
+		return result;
+	} else {
+		var context = plus.android.importClass("android.content.Context");
+		var locationManager = plus.android.importClass("android.location.LocationManager");
+		var main = plus.android.runtimeMainActivity();
+		var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+		var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
+		console.log("系统定位开启:" + result);
+		return result
+	}
+}
+
+module.exports = {
+	judgeIosPermission: judgeIosPermission,
+	requestAndroidPermission: requestAndroidPermission,
+	checkSystemEnableLocation: checkSystemEnableLocation,
+	gotoAppPermissionSetting: gotoAppPermissionSetting,
+	queryRightsSettingPermission: queryRightsSettingPermission
+}
diff --git a/manifest.json b/manifest.json
index 2d99cf2..fcbc3f2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
-    "name" : "scanCode",
+    "name" : "QR Scanner",
     "appid" : "__UNI__44D25EC",
-    "description" : "",
+    "description" : "扫码工具",
     "versionName" : "1.0.0",
     "versionCode" : 101,
     "transformPx" : false,
@@ -12,7 +12,7 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : true,
+            "waiting" : false,
             "autoclose" : true,
             "delay" : 0
         },
@@ -21,11 +21,7 @@
             "SQLite" : {},
             "Barcode" : {},
             "Camera" : {},
-            "Share" : {},
-            "Contacts" : {},
-            "Geolocation" : {},
-            "Maps" : {},
-            "Messaging" : {}
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -34,36 +30,30 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_APN_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
                 ],
                 "minSdkVersion" : 21,
-                "targetSdkVersion" : 32
+                "targetSdkVersion" : 32,
+                "abiFilters" : [ "armeabi-v7a" ]
             },
             /* ios打包配置 */
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -76,6 +66,48 @@
                     }
                 },
                 "maps" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "",
+                    "ipad" : {
+                        "app" : "",
+                        "app@2x" : "",
+                        "notification" : "",
+                        "notification@2x" : "",
+                        "proapp@2x" : "",
+                        "settings" : "",
+                        "settings@2x" : "",
+                        "spotlight" : "",
+                        "spotlight@2x" : ""
+                    },
+                    "iphone" : {
+                        "app@2x" : "",
+                        "app@3x" : "",
+                        "notification@2x" : "",
+                        "notification@3x" : "",
+                        "settings@2x" : "",
+                        "settings@3x" : "",
+                        "spotlight@2x" : "",
+                        "spotlight@3x" : ""
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "F:/次元节点doc/扫码项目文件/icon/splash-480x762.png",
+                    "xhdpi" : "F:/次元节点doc/扫码项目文件/icon/splash-720x1242.png",
+                    "xxhdpi" : "F:/次元节点doc/扫码项目文件/icon/splash-1080x1882.png"
+                },
+                "useOriginalMsgbox" : false,
+                "iosStyle" : "common"
             }
         },
         "nativePlugins" : {
@@ -117,5 +149,6 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "locale" : "en"
 }
diff --git a/pages.json b/pages.json
index a15b766..c22ece1 100644
--- a/pages.json
+++ b/pages.json
@@ -24,6 +24,27 @@
 				 "enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/policy/Policy",
+			"style": {
+				 "navigationBarTitleText": "Policy",
+				 "enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/rights/RightsSetting",
+			"style": {
+				 "navigationBarTitleText": "RightsSetting",
+				 "enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/rights/RightsOpen",
+			"style": {
+				 "navigationBarTitleText": "RightsOpen",
+				 "enablePullDownRefresh": false
+			}
+		},
 		// {
 		// 	"path": "pages/create/Create",
 		// 	"style": {
@@ -166,6 +187,20 @@
 				"iconPath": "static/setting-default.png",
 				"selectedIconPath": "static/setting-select.png",
 				"text": "Setting"
+			},
+			{
+				"pagePath": "pages/rights/RightsOpen",
+				"iconPath": "static/setting-default.png",
+				"selectedIconPath": "static/setting-select.png",
+				"text": "RightsOpen",
+				"visible": false
+			},
+			{
+				"pagePath": "pages/rights/RightsSetting",
+				"iconPath": "static/setting-default.png",
+				"selectedIconPath": "static/setting-select.png",
+				"text": "RightsSetting",
+				"visible": false
 			}
 		]
 	}
diff --git a/pages/history/History.vue b/pages/history/History.vue
index 833fc4c..432bf16 100644
--- a/pages/history/History.vue
+++ b/pages/history/History.vue
@@ -29,7 +29,7 @@
 					<view class="list-icon-text">
 						<!-- 左边图标文本显示部分 -->
 					    <view class="list-left">
-						  <view class="list-left-icon tn-icon-circle-fill tn-color-gray"></view>
+						  <view class="tn-color-gray"></view>
 						  <view class="list-left-text" @click="getHistory(item.category,item.content)">
 							 <view class="list-left-text-one">{{ item.category }}</view>
 							 <view class="list-left-text-two">{{ item.content }}</view> 
@@ -48,7 +48,8 @@
 </template>
 
 <script>
-	import { openSqlite,closedb,getPageList,updateSql} from "@/utils/database";
+	// import { openSqlite,closedb,getPageList,updateSql} from "@/utils/database";
+	import { openSqlite,closedb,getPageList} from "@/utils/database";
 	export default {
 		data() {
 			return {
@@ -62,44 +63,44 @@
 				pages:0,
 				total:0,
 				cardMode: true,
-				favoritesList:[
-					{
-						"icon":"grid-item-icon tn-icon-empty-network",
-						"text":"https://test1.com",
-						"sort":"0",
-						"label":"URL"
-					},
-					{
-						"icon":"grid-item-icon tn-icon-empty-network",
-						"text":"https://test2.com",
-						"sort":"1",
-						"label":"URL"
-					},
-					{
-						"icon":"grid-item-icon tn-icon-empty-network",
-						"text":"https://test3.com",
-						"sort":"2",
-						"label":"URL"
-					},
-					{
-						"icon":"grid-item-icon tn-icon-empty-network",
-						"text":"https://test4.com",
-						"sort":"3",
-						"label":"URL"
-					},
-					{
-						"icon":"grid-item-icon tn-icon-empty-network",
-						"text":"https://test5.com",
-						"sort":"4",
-						"label":"URL"
-					},
-					{
-						"icon":"grid-item-icon tn-icon-empty-network",
-						"text":"https://test6.com",
-						"sort":"5",
-						"label":"URL"
-					},
-				],
+				// favoritesList:[
+				// 	{
+				// 		"icon":"grid-item-icon tn-icon-empty-network",
+				// 		"text":"https://test1.com",
+				// 		"sort":"0",
+				// 		"label":"URL"
+				// 	},
+				// 	{
+				// 		"icon":"grid-item-icon tn-icon-empty-network",
+				// 		"text":"https://test2.com",
+				// 		"sort":"1",
+				// 		"label":"URL"
+				// 	},
+				// 	{
+				// 		"icon":"grid-item-icon tn-icon-empty-network",
+				// 		"text":"https://test3.com",
+				// 		"sort":"2",
+				// 		"label":"URL"
+				// 	},
+				// 	{
+				// 		"icon":"grid-item-icon tn-icon-empty-network",
+				// 		"text":"https://test4.com",
+				// 		"sort":"3",
+				// 		"label":"URL"
+				// 	},
+				// 	{
+				// 		"icon":"grid-item-icon tn-icon-empty-network",
+				// 		"text":"https://test5.com",
+				// 		"sort":"4",
+				// 		"label":"URL"
+				// 	},
+				// 	{
+				// 		"icon":"grid-item-icon tn-icon-empty-network",
+				// 		"text":"https://test6.com",
+				// 		"sort":"5",
+				// 		"label":"URL"
+				// 	},
+				// ],
 				historyList: []
 			}
 		},
@@ -114,8 +115,24 @@
 			let that = this;
 			that.closedb();
 		},
+		onBackPress(options){
+			let that = this;
+				if (options.from === 'navigateBack') {  
+				    return false;  
+				}  
+				that.back();  
+				return true;	
+			
+		},
 		methods: {
 			
+			//返回主页
+			back() {  
+			    uni.switchTab({
+					url: '/pages/scan/Scan'
+				});
+			}, 
+			
 			//查看指定记录历史信息
 			getHistory(category,data){
 				//console.log('category',category)
@@ -201,25 +218,25 @@
 			},
 			
 			// 修改数据
-			async changeData(){
-				let that = this;
-			    // fid 是自增id
-			    try{
-			        let res = await getPageList(that.tableName,{current:1,size:1},{},"fid desc")
-			        console.log("最后一页数据",res.data.data)
-			        await updateSql(that.tableName,{title:"updated data"},{fid:res.data.data.records[0].fid})
-			        uni.showToast({
-			            title:"update ok",
-			            icon:"none"
-			        });
-			    }catch(e){
-			        uni.showToast({
-			            title:"update error",
-			            icon:"none"
-			        });
-			        console.error("修改报错",e)
-			    }
-			},
+			// async changeData(){
+			// 	let that = this;
+			//     // fid 是自增id
+			//     try{
+			//         let res = await getPageList(that.tableName,{current:1,size:1},{},"fid desc")
+			//         console.log("最后一页数据",res.data.data)
+			//         await updateSql(that.tableName,{title:"updated data"},{fid:res.data.data.records[0].fid})
+			//         uni.showToast({
+			//             title:"update ok",
+			//             icon:"none"
+			//         });
+			//     }catch(e){
+			//         uni.showToast({
+			//             title:"update error",
+			//             icon:"none"
+			//         });
+			//         console.error("修改报错",e)
+			//     }
+			// },
 		}
 	}
 </script>
@@ -229,18 +246,18 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		justify-content: center;
+		justify-content: start;
 		background-color: #1F222B;
 		// height:1400rpx;
 		height: 100vh;
 		overflow: scroll;
 		
 		.headLine{
-			color: royalblue;
-			font-size: 36rpx;
+			color: #fff;
+			font-size: 48rpx;
 			//padding-top:30px;
 			//margin-right:200px;
-			margin-top:60rpx;
+			margin-top:30rpx;
 			//border: 2px solid purple;
 		}
 		
@@ -249,12 +266,12 @@
 			width: 660rpx;
 			//height:300px;
 			height: auto;
-			//margin-top: 10px;
+			margin-top: 60rpx;
 			//background-color: #141b29;
 			
 			.listItem{
 				//border: 2px solid yellow;
-				height: 100rpx;
+				height: 200rpx;
 				//margin-top: 30px;	
 				background-color: #141b29;
 				color: #fff;
@@ -275,13 +292,13 @@
 						.list-left-text{
 							width: 420rpx;
 							.list-left-text-one{
-								font-size: 30rpx;
+								font-size: 36rpx;
 								//border: 2px solid blue;
 							}
 							
 							.list-left-text-two{
 								color: grey;
-								font-size:26rpx;
+								font-size: 36rpx;
 								//border: 2px solid lightsalmon;
 							}
 						}
@@ -289,50 +306,50 @@
 						.list-left-feedback-text{
 							width: 480rpx;
 							.list-left-feedback-text-one{
-								font-size: 30rpx;
+								font-size: 36rpx;
 								//border: 2px solid blue;
 							}
 							
 							.list-left-feedback-text-two{
 								color: grey;
-								font-size: 26rpx;
+								font-size: 30rpx;
 								//border: 2px solid lightsalmon;
 							}
 						}
 						
 						
-						.list-left-icon{
-							//border: 2px solid blueviolet;
-							margin-right: 20rpx;
-							font-size: 50rpx;
-						}
+						// .list-left-icon{
+						// 	//border: 2px solid blueviolet;
+						// 	margin-right: 20rpx;
+						// 	font-size: 100rpx;
+						// }
 						
 						.list-left-select-text{
 							width: 320rpx;
 							.list-left-select-text-one{
-								font-size: 30rpx;
+								font-size: 36rpx;
 								//border: 2px solid blue;
 							}
 						}
 					}
 					
-					.list-right{
-						//border: 2px solid pink;
-						color: royalblue;
-						font-size: 40rpx;
+					// .list-right{
+					// 	//border: 2px solid pink;
+					// 	color: royalblue;
+					// 	font-size: 36rpx;
 						
-						.list-right-icon{
-							//border: 2px solid gainsboro;
-							font-size: 50rpx;
-							margin-left: 30rpx;
-						}
+					// 	.list-right-icon{
+					// 		//border: 2px solid gainsboro;
+					// 		font-size: 36rpx;
+					// 		margin-left: 30rpx;
+					// 	}
 						
-						.list-right-text{
-							//border: 2px solid green;
-							//margin-right: 30px;
-							//padding-right: 30px;
-						}
-					}
+					// 	.list-right-text{
+					// 		//border: 2px solid green;
+					// 		//margin-right: 30px;
+					// 		//padding-right: 30px;
+					// 	}
+					// }
 				}
 			}
 		}
diff --git a/pages/policy/Policy.vue b/pages/policy/Policy.vue
new file mode 100644
index 0000000..e8e0d69
--- /dev/null
+++ b/pages/policy/Policy.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="content">
+		<!-- <view class="radioStyle">
+			<tn-radio-group v-model="radioValue" width="100%" wrap :size="radioGroupSize">
+				<tn-radio :iconSize="iconSize" :labelSize="labelSize" v-for="(item, index) in radioList" :key="index" :name="item.name" :disabled="item.disabled">
+					<view class="radioFont">{{ item.name }}</view>
+				</tn-radio>
+			</tn-radio-group>
+		</view>
+		<view class="radioBtn">
+			<tn-button @click="submitFeedback()" backgroundColor="#0186ff" width="600rpx" height="100rpx"
+			:fontSize="btnFontSize">Submit</tn-button>
+		</view>
+		<tn-toast ref="toast"></tn-toast> -->
+		<text style="color: #fff; font-size: 48rpx;"> this is policy</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				radioGroupSize: 45,
+				labelSize: 45,
+				iconSize: 40,
+				btnFontSize: 36,
+				radioValue: '',
+				radioList:[
+					{
+						'name': 'Scan faild',
+						'disabled': false
+					},
+					{
+						'name': 'Too many ads',
+						'disabled': false
+					},
+					{
+						'name': 'Need more infomation',
+						'disabled': false
+					},
+					{
+						'name': 'Bugs',
+						'disabled': false
+					},
+					{
+						'name': 'Other',
+						'disabled': false
+					}
+				]
+			}
+		},
+		onLoad() {
+			//更改starTipStatus状态
+			//this.setStarTipStatus(false);
+		},
+		onHide() {
+			
+		},
+		methods: {
+			
+			//设置弹窗状态结果
+			// setStarTipStatus(value){
+			// 	uni.setStorageSync('starTipStatus', value);
+			// },
+			
+			//提交反馈
+			// submitFeedback(){
+			// 	let that = this;
+			// 	if(that.radioValue == '' || that.radioValue == null){
+			// 		that.$refs.toast.show({
+			// 		    title: 'Fail',
+			// 		    content: 'please select one!',
+			// 		    icon: 'fail',
+			// 		    duration: 3000
+			// 		})
+			// 	}else{
+			// 		that.$refs.toast.show({
+			// 		    title: 'Success',
+			// 		    content: 'Thanks for feedback!',
+			// 		    icon: 'success',
+			// 		    duration: 3000
+			// 		})
+			// 		//返回上一个页面
+			// 		setTimeout(() =>{
+			// 			uni.navigateBack();
+			// 		}, 3000);
+			// 	}
+			// }
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: flex-start;
+		background-color: #1F222B;
+		height:100vh;
+	}
+	
+	.radioStyle{
+		//border: 1px solid red;
+		margin-top: 50rpx;
+		margin-left: 50rpx;
+		padding-top: 100rpx;
+	}
+	
+	.radioFont{
+		color: #fff;
+		//margin-top: 50rpx;
+	}
+	
+	.radioBtn{
+		//border: 1px solid yellow;
+		margin-top: 600rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/rights/RightsOpen.vue b/pages/rights/RightsOpen.vue
new file mode 100644
index 0000000..34e5930
--- /dev/null
+++ b/pages/rights/RightsOpen.vue
@@ -0,0 +1,75 @@
+<template>
+	<view class="content">
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 48rpx;">Need permissions?</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 36rpx;">Camera permission is requeired to</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #0186FF; font-size: 36rpx;">QR Code Scanner & barcode Reader.</text>
+		</view>
+		<view class="textBoard">
+			<tn-button @click="openPermission()" :backgroundColor="btnBackgroundColor" :fontColor="btnFontColor" width="300rpx" height="100rpx"
+			:fontSize="btnFontSize">Allow</tn-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	export default {
+		data() {
+			return {
+				btnFontSize: 36,
+				btnBackgroundColor: '#0186ff',
+				btnFontColor: '#fff'
+			}
+		},
+		onLoad() {
+			
+		},
+		onHide() {
+			
+		},
+		methods: {
+			
+			//打开授权
+			async openPermission(){
+				let that = this;
+				console.log('打开授权')
+				var result = await permision.requestAndroidPermission('android.permission.CAMERA')
+				if (result == 1) {
+					//有权限,跳转到扫码界面
+					that.jumpToRights('/pages/scan/Scan');
+				}else if(result == -1) {
+					//禁止权限，跳转到权限设置页面
+				    that.jumpToRights('/pages/rights/RightsSetting');
+				}
+			},
+			
+			//跳转到授权设置页面
+			jumpToRights(url){
+				uni.switchTab({
+					url: url
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #1F222B;
+		height:100vh;
+	}
+	
+	.textBoard{
+		margin-top: 1vh;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/rights/RightsSetting.vue b/pages/rights/RightsSetting.vue
new file mode 100644
index 0000000..aaa0208
--- /dev/null
+++ b/pages/rights/RightsSetting.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="content">
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 48rpx;">Need permissions?</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 36rpx;">Camera permission is requeired to</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #0186FF; font-size: 36rpx;">QR Code Scanner & barcode Reader.</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 36rpx;">1.Open settings</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 36rpx;">2.Tap permissions</text>
+		</view>
+		<view class="textBoard">
+			<text style="color: #fff; font-size: 36rpx;">3.Turn on Camera</text>
+		</view>
+		<view class="textBoard">
+			<tn-button @click="setPermission()" :backgroundColor="btnBackgroundColor" :fontColor="btnFontColor" width="300rpx" height="100rpx"
+			:fontSize="btnFontSize">Open settings</tn-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	export default {
+		data() {
+			return {
+				btnFontSize: 36,
+				btnBackgroundColor: '#0186ff',
+				btnFontColor: '#fff',
+				hasRequestedPermission: false
+			}
+		},
+    	async onShow(){
+			let that = this;
+			if (!that.hasRequestedPermission) {
+				console.log('进入了判断setting权限',that.hasRequestedPermission) 
+				 await that.requestAndroidPermission('android.permission.CAMERA');
+			}
+			// else{
+			// 	console.log('setting权限状态已变更为true，进入扫码页',that.hasRequestedPermission) 
+			// 	that.jumpToRights('/pages/scan/Scan');
+			// }
+		},
+		onHide() {
+			this.hasRequestedPermission = false;
+			console.log('onHide')
+		},
+		onUnload(){
+			console.log('onUnload')
+		},
+		methods: {
+			
+			//打开设置权限界面
+			setPermission(){
+				permision.gotoAppPermissionSetting();
+			},
+			
+			//判断是否有相机权限
+			async requestAndroidPermission(permisionID) {
+				let that = this;
+			    var result = await permision.requestAndroidPermission(permisionID)
+				console.log('setting判断权限结果',result) 
+				that.hasRequestedPermission = true;
+			    if (result == 1) {
+			    	//有权限,跳转到扫码界面
+			    	that.jumpToRights('/pages/scan/Scan');
+			    }
+			},
+			
+			//跳转到授权设置页面
+			jumpToRights(url){
+				uni.switchTab({
+					url: url
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #1F222B;
+		height:100vh;
+	}
+	
+	.textBoard{
+		margin-top: 1vh;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/scan/Barcode.vue b/pages/scan/Barcode.vue
index 34cdfd4..520598a 100644
--- a/pages/scan/Barcode.vue
+++ b/pages/scan/Barcode.vue
@@ -1,33 +1,30 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-qr-barcode" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-qr-barcode" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
-			   <view>{{ barcodeInfo.message }}</view>
+			   <view style="font-size: 36rpx;">{{ barcodeInfo.message }}</view>
 		   </tn-list-cell>
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 				    <block>
 						<tn-grid-item class="toolItem" @click="openWeb()">
 						    <view class="tn-icon-search"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Web Search</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		   <!-- <view class="cutline"></view> -->
+		   <!-- <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -40,10 +37,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -98,6 +95,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -142,9 +140,6 @@
 				  summary: this.barcodeInfo.message,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -160,8 +155,8 @@
 				let that = this;
 				console.log('that.barcodeInfo.message',that.barcodeInfo.message)
 				uni.navigateTo({
-					 url: '/pages/webview/webview?url=https://www.baidu.com/s?wd=' + that.barcodeInfo.message 
-					 //url: '/pages/webview/webview?url=http://www.google.com?wd=' +  that.textInfo.message
+					 //url: '/pages/webview/webview?url=https://www.baidu.com/s?wd=' + that.barcodeInfo.message 
+					 url: '/pages/webview/webview?url=https://www.google.com.hk/search?q=' +  that.barcodeInfo.message
 				});
 			},
 			
@@ -288,11 +283,11 @@
 			width: 660rpx;
 			height:1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 160rpx;
@@ -304,12 +299,12 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -324,7 +319,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -334,7 +329,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -348,27 +343,35 @@
 				
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
 		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Calendar.vue b/pages/scan/Calendar.vue
index a17154d..90b7ee7 100644
--- a/pages/scan/Calendar.vue
+++ b/pages/scan/Calendar.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-calendar" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-calendar" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
 			   <view>Subject: {{ calendarInfo.Theme }}</view>
@@ -12,26 +12,23 @@
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 				    <block>
-						<tn-grid-item class="toolItem" @click="addEvent()">
+						<tn-grid-item class="toolItem" @click="addActivity()">
 						    <view class="tn-icon-calendar"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Add to events</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		  <!-- <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -44,10 +41,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -56,7 +53,13 @@
 </template>
 
 <script>
+	// var calanderURL = "content://com.android.calendar/calendars";
+	// var calanderEventURL = "content://com.android.calendar/events";
+	// var calanderRemiderURL = "content://com.android.calendar/reminders";
+	// var calId; //日历账户id
 	import { openSqlite,executeSql,closedb,isTable,addSql} from "@/utils/database";
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	import {addSchedule} from '@/uni_modules/vv-schedule'
 	export default {
 		data() {
 			return {
@@ -102,6 +105,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -141,7 +145,20 @@
 			},
 			
 			//添加活动
-			addEvent(){
+			async addActivity(){
+				 let that = this;
+				await addSchedule({
+				    title: that.calendarInfo.Theme,
+				    description: that.calendarInfo.AbstractInfo,
+				    dtstart: new Date(that.calendarInfo.startTime).getTime(),
+				    dtend: new Date(that.calendarInfo.closeTime).getTime(),
+				})
+				that.$refs.toast.show({
+				    title: 'Success',
+				    content: 'Add calander success!',
+				    icon: 'success',
+				    duration: 1500
+				})
 				
 			},
 			
@@ -151,9 +168,6 @@
 				  summary: this.calendarInfo,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -277,7 +291,43 @@
 				const data = JSON.parse(params);
 				that.calendarInfo = data;
 				that.textImgUrl = 'file://'+that.calendarInfo.imgUrl;
-			}
+			},
+			
+			// * 获取日历权限 *
+				getCalendarJurisdiction() {
+							return new Promise((resolve, reject) => {
+								plus.android.requestPermissions(['android.permission.READ_CALENDAR',
+										'android.permission.WRITE_CALENDAR'
+									],
+									function(e) {
+										if (e.deniedAlways.length > 0) { //权限被永久拒绝
+											// 弹出提示框解释为何需要定位权限，引导用户打开设置页面开启
+											console.log('Always Denied!!! ' + e.deniedAlways.toString());
+											reject({
+												data: -1,
+												message: "权限被永久拒绝了"
+											})
+										}
+										if (e.deniedPresent.length > 0) { //权限被临时拒绝
+											reject({
+												data: 0,
+												message: "权限被临时拒绝了"
+											})
+											// 弹出提示框解释为何需要定位权限，可再次调用plus.android.requestPermissions申请权限
+											console.log('Present Denied!!! ' + e.deniedPresent.toString());
+										}
+										if (e.granted.length > 0) { //权限被允许
+											//调用依赖获取定位权限的代码
+											resolve({
+												data: 1,
+												message: "ok"
+											})
+										}
+									})
+							})
+						},
+			
+			
 		}
 	}
 </script>
@@ -297,14 +347,15 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
+			overflow: auto; 
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid green;
-				height: 260rpx;
+				height: auto;
 				text-align: start;
 			}
 			
@@ -314,12 +365,12 @@
 				//margin-top: 30px;	
 				//padding-top: 30px;	
 				width: 660rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -335,7 +386,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -345,7 +396,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -358,25 +409,34 @@
 				}
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 120rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Contacts.vue b/pages/scan/Contacts.vue
index f7d38f9..9b26c48 100644
--- a/pages/scan/Contacts.vue
+++ b/pages/scan/Contacts.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-my" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-my" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
 			   <view>Name: {{ contactsInfo.peopleName }}</view>
@@ -15,29 +15,25 @@
 				    <block>
 						<tn-grid-item class="toolItem" @click="addContact()">
 						    <view class="tn-icon-my-circle-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Add to contacts</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="sendEmail()">
 						    <view class="tn-icon-email"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Send email</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="call()">
 						    <view class="tn-icon-tel"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Call</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		  <!-- <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -50,10 +46,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -104,10 +100,12 @@
 			let that = this;
 			//判断评分弹窗条件是否达到要求
 			let starTipStatus = that.getStarTipStatus();
-			console.log('starTipStatus',starTipStatus)
+			console.log('starTipStatus',JSON.stringify(starTipStatus));
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				//更改starTipStatus状态
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -117,12 +115,12 @@
 			
 			//获取弹窗状态结果
 			getStarTipStatus(){
-				return uni.getStorageSync('starTipStatus');
+				 return uni.getStorageSync('starTipStatus');
 			},
 			
 			//设置弹窗状态结果
 			setStarTipStatus(value){
-				uni.setStorageSync('starTipStatus', value);
+				 uni.setStorageSync('starTipStatus', value);
 			},
 			
 			//提交反馈
@@ -316,7 +314,7 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		background-color: #000000;
+		background-color: #1F222B;
 		height:100vh;
 		
 		.listView{
@@ -325,11 +323,11 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 360rpx;
@@ -341,12 +339,12 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -361,7 +359,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -371,7 +369,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -384,25 +382,34 @@
 				}
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 120rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 50rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Email.vue b/pages/scan/Email.vue
index 6a7309c..cc80bad 100644
--- a/pages/scan/Email.vue
+++ b/pages/scan/Email.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-email" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-email" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
 			   <view>To: {{ emailInfo.addressInfo }}</view>
@@ -12,29 +12,25 @@
 				    <block>
 						<tn-grid-item class="toolItem" @click="sendEmail()">
 						    <view class="tn-icon-email"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Send email</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="addContact()">
 						    <view class="tn-icon-my-circle-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Add to contacts</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		   <!-- <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -47,10 +43,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -105,6 +101,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -182,9 +179,6 @@
 				  summary: this.emailInfo.addressInfo,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -328,14 +322,15 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
+			overflow: auto; 
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
-				height: 160rpx;
+				height: auto;
 				text-align: start;
 			}
 			
@@ -344,12 +339,12 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -365,7 +360,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -375,7 +370,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -389,25 +384,34 @@
 				
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Location.vue b/pages/scan/Location.vue
index 2b0fe3a..e2039b6 100644
--- a/pages/scan/Location.vue
+++ b/pages/scan/Location.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-location" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-location" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
 			   <view>Lng: {{ locationInfo.Longitude }}</view>
@@ -9,31 +9,27 @@
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 				    <block>
-						<tn-grid-item class="toolItem" @click="showMap()">
+						<!-- <tn-grid-item class="toolItem" @click="showMap()">
 						    <view class="tn-icon-map"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Show map</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="getDirection()">
 						    <view class="tn-icon-share"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Navigation</view>
-						</tn-grid-item>
+						</tn-grid-item> -->
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		  <!-- <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -46,10 +42,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -104,6 +100,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -143,25 +140,22 @@
 			},
 			
 			//打开地图
-			showMap(){
+			// showMap(){
 				
-			},
+			// },
 			
 			//获取方位
-			getDirection(){
+			// getDirection(){
 				
-			},
+			// },
 			
 			//分享
 			share(){
 				uni.shareWithSystem({
-				  summary: '',
-				  href: 'https://uniapp.dcloud.io',
+				  summary: this.locationInfo,
+				  //href: 'https://uniapp.dcloud.io',
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -296,11 +290,11 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 160rpx;
@@ -312,12 +306,12 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -334,7 +328,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -344,7 +338,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -357,25 +351,34 @@
 				}
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Product.vue b/pages/scan/Product.vue
index 7657ec2..d937f93 100644
--- a/pages/scan/Product.vue
+++ b/pages/scan/Product.vue
@@ -1,38 +1,34 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-all" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-all" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
-			   <view>code: {{ productInfo.message }}</view>
+			   <view style="font-size: 36rpx;">{{ productInfo.message }}</view>
 		   </tn-list-cell>
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 				    <block class="block1">
 						<tn-grid-item class="toolItem" @click="openShoping()">
-						    <view class="tn-icon-shop"></view>
-							<view class="cutline"></view>
-							<view class="toolText">View in store</view>
+						    <view class="tn-icon-shopbag"></view>
+							<view class="toolText">Shopping</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="openWeb()">
 						    <view class="tn-icon-search"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Web Search</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		<!--   <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -45,10 +41,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -103,6 +99,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -147,7 +144,7 @@
 				console.log('that.textInfo.message',that.productInfo.message)
 				uni.navigateTo({
 					 url: '/pages/webview/webview?url=https://www.amazon.com/s?k=' + that.productInfo.message 
-					 //url: '/pages/webview/webview?url=http://www.google.com?wd=' +  that.textInfo.message
+					 //url: '/pages/webview/webview?url=https://www.google.com.hk/search?q=' +  that.textInfo.message
 				});
 			},
 			
@@ -157,9 +154,6 @@
 				  summary: this.productInfo.message ,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -175,8 +169,8 @@
 				let that = this;
 				console.log('that.textInfo.message',that.productInfo.message)
 				uni.navigateTo({
-					 url: '/pages/webview/webview?url=https://www.baidu.com/s?wd=' + that.productInfo.message 
-					 //url: '/pages/webview/webview?url=http://www.google.com?wd=' +  that.textInfo.message
+					 //url: '/pages/webview/webview?url=https://www.baidu.com/s?wd=' + that.productInfo.message 
+					 url: '/pages/webview/webview?url=https://www.google.com.hk/search?q=' +  that.productInfo.message
 				});
 			},
 			
@@ -304,11 +298,11 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 160rpx;
@@ -321,14 +315,14 @@
 				width: 660rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 			}
 			
 				
 			.toolItem{
 				//border: 2px solid red;
-				background-color: #141b29;
+				background-color: #1F222B;
 				font-size: 60rpx;
 				color: #8f8f94;
 				height: 120rpx;
@@ -343,7 +337,7 @@
 			
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -353,7 +347,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -367,28 +361,37 @@
 				
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
 		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
+		
 	}
 </style>
 
diff --git a/pages/scan/Scan.nvue b/pages/scan/Scan.nvue
index f7c888a..29ae16f 100644
--- a/pages/scan/Scan.nvue
+++ b/pages/scan/Scan.nvue
@@ -12,9 +12,13 @@
 				<!-- </view> -->
 		 		<!-- 扫码框下方图片按钮 -->
 		 		<view class="scan_frame_bottom_btn">
-		 			<image class="btn" src="../../static/flashLightOn.png" @click="lightOff()" v-if="flashLightFlag === true"></image>
-					<image class="btn" src="../../static/flashLightOff.png" @click="lightOn()" v-if="flashLightFlag === false"></image>
-					<image class="btn" src="../../static/album.png" @click="photoAlbum()"></image>
+					<view class="imgBack">
+						<image class="btnLight" src="../../static/flashLightOn.png" @click="lightOff()" v-if="flashLightFlag === true"></image>
+						<image class="btnLight" src="../../static/flashLightOff.png" @click="lightOn()" v-if="flashLightFlag === false"></image>
+					</view>
+					<view class="imgBack">
+						<image class="btnAlbum" src="../../static/album.png" @click="photoAlbum()"></image>
+					</view>
 		 		</view>
 		 	</view>
 		 </view>
@@ -33,6 +37,7 @@
 
 <script>
 	import { openSqlite,executeSql,closedb} from "@/utils/database";
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	const hwscan = uni.requireNativePlugin('LY-HWScan')
 	export default {
 		data() {
@@ -54,29 +59,63 @@
 				sleep: 1,//连续扫描间隔
 				code: "",
 				path:'',//扫描图片
-				flashLightFlag: true
+				flashLightFlag: true,
+				hasPermission: false
 			}
 		},
-		async onShow(){
+		 async onShow(){
 			let that = this;
 			//打开db
 			await that.openSqlite();
-			if(this.$refs.scanComponent){
-				this.$refs.scanComponent.remoteResume();
+			if(that.$refs.scanComponent){
+				setTimeout(function(){
+					that.$refs.scanComponent.remoteResume();
+				},300);
 			}
+			if (!that.hasPermission) {
+				console.log('进入了判断scan权限',that.hasPermission)  
+				//判断是否有权限
+				await that.requestAndroidPermission('android.permission.CAMERA')
+			}
+			//TODO 有权限就是扫码页面，没权限跳转到权限提示
+			// else{
+			// 	console.log('scan权限状态已变更为true，进入扫码页',that.hasPermission)  
+			// 	//that.jumpToRights('/pages/scan/Scan');
+			// }
+			
 		},
 		onHide() {
 			let that = this;
 			that.closedb();
-			if(this.$refs.scanComponent){
-				this.$refs.scanComponent.remotePause();
+			if(that.$refs.scanComponent){
+				that.$refs.scanComponent.remotePause();
 			}
+			
+			//that.hasPermission = false;
 		},
 		onUnload() {
 			// this.$refs.scanComponent.releaseAssets()
 		},
 		methods: {
 			
+			//判断是否有相机权限
+			async requestAndroidPermission(permisionID) {
+				let that = this;
+			    var result = await permision.requestAndroidPermission(permisionID)
+			    	console.log('scan判断权限结果',result) 
+				that.hasPermission = true;
+				if (result == 0) {
+					//无权限，跳转到引导打开权限
+					that.jumpToRights('/pages/rights/RightsOpen');
+			    }else if(result == -1) {
+					//禁止权限，跳转到权限设置页面
+					 that.jumpToRights('/pages/rights/RightsSetting');
+			    }else{
+					//有权限,跳转到扫码界面
+					that.jumpToRights('/pages/scan/Scan');
+				}
+			},
+			
 			// 识别完成回调 ------ res.detail.data是组装好的数据
 			scanResult(res) {
 				console.log(res.detail.data)
@@ -220,6 +259,13 @@
 				});
 			},
 			
+			//跳转到授权设置页面(type: 0->非tabbar页面；1->tabbar页面)
+			jumpToRights(url,type){
+				uni.switchTab({
+					url: url
+				})
+			},
+			
 			//mlkit扫码
 			// scanCode(){
 			// 	let that = this;
@@ -290,8 +336,9 @@
 	}
 	
 	.scan_frame {
-		width: 450px; 
-		height: 450px; 
+		width: 500vh; 
+		height: 500vh; 
+		margin-right: 10vh;
 	}
 	.scan_frame_bottom_btn{
 		position: absolute;
@@ -303,13 +350,28 @@
 		padding-left: 30px;
 		padding-right: 30px;
 		justify-content: space-between;
+		
+	}
+	.btnLight{
+		width: 40vh;
+		height: 40vh;
+		margin-left: 6vh;
+		margin-top: 6vh;
 	}
-	.btn{
-		width: 100rpx;
-		height: 100rpx;
-		margin-top: 200rpx;
+	
+	.btnAlbum{
+		width: 30vh;
+		height: 30vh;
+		margin-left: 10vh;
+		margin-top: 10vh;
+	}
+	
+	.imgBack{
+		width: 50vh;
+		height: 50vh;
 		background-color: #000000;
 		border-radius: 100%;
+		margin-top: 100vh;
 	}
 	
 	
diff --git a/pages/scan/Sms.vue b/pages/scan/Sms.vue
index 6cdcb12..a3bb099 100644
--- a/pages/scan/Sms.vue
+++ b/pages/scan/Sms.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-message" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-message" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
 			   <view>Tel: {{ smsInfo.destPhoneNumber }}</view>
@@ -11,24 +11,21 @@
 				    <block>
 						<tn-grid-item class="toolItem" @click="sendMessage()">
 						    <view class="tn-icon-email"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Send SMS</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		<!--   <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -41,10 +38,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -88,6 +85,20 @@
 			let that = this;
 			that.closedb();
 		},
+		onBackPress(e){
+			let that = this;
+			//判断评分弹窗条件是否达到要求
+			let starTipStatus = that.getStarTipStatus();
+			console.log('starTipStatus',starTipStatus)
+			if(starTipStatus === null || starTipStatus === ""){
+				//达到要求
+				that.showStarTip = true;
+				that.setStarTipStatus(false);
+				return true;
+			}else{
+				return false;
+			}
+		},
 		methods: {
 			
 			//获取弹窗状态结果
@@ -135,9 +146,6 @@
 				  summary: this.smsInfo,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -272,14 +280,15 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
+			overflow: auto; 
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
-				height: 160rpx;
+				height: auto;
 				text-align: start;
 			}
 			
@@ -288,12 +297,12 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -310,7 +319,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -320,7 +329,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -333,25 +342,30 @@
 				}
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Tel.vue b/pages/scan/Tel.vue
index bf0633c..46a4eef 100644
--- a/pages/scan/Tel.vue
+++ b/pages/scan/Tel.vue
@@ -1,26 +1,23 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-tel" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-tel" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
-				<view>Telephone number: {{ telInfo.TelPhoneNumber }}</view>
+				<view style="font-size: 36rpx;">{{ telInfo.TelPhoneNumber }}</view>
 		   </tn-list-cell>
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 				    <block>
 						<tn-grid-item class="toolItem" @click="addConnect()">
 						    <view class="tn-icon-my-circle-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Add to contacts</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="call()">
 						    <view class="tn-icon-tel"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Call</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
@@ -31,8 +28,8 @@
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		  <!-- <view class="cutline"></view>
+		  <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -45,10 +42,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -103,6 +100,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -180,9 +178,6 @@
 				  summary: this.telInfo.TelPhoneNumber,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -316,15 +311,15 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 160rpx;
-				text-align: start;
+				text-align: center;
 			}
 			
 			.listItem{
@@ -332,12 +327,12 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -353,7 +348,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -363,7 +358,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -376,25 +371,30 @@
 				}
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Text.vue b/pages/scan/Text.vue
index 8b2bbe4..bb97207 100644
--- a/pages/scan/Text.vue
+++ b/pages/scan/Text.vue
@@ -1,33 +1,33 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-level" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-level" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
-			   <view>{{ textInfo.message }}</view>
+			   <tn-read-more ref="readMore" :showHeight="400" openText="More" closeText="Close" :closeBtn="true" :shadowStyle="shdowStyle">
+			      <rich-text style="color:#fff" :nodes="textInfo.message" ></rich-text>
+			    </tn-read-more>
+			  <!-- <view>{{ textInfo.message }}</view> -->
 		   </tn-list-cell>
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 					<block>
 						<tn-grid-item class="toolItem" @click="openWeb()">
 						    <view class="tn-icon-search"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Web Search</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 						    <view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 						    <view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 							<view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		   <!-- <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			  <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -40,10 +40,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -60,6 +60,12 @@
 				textInfo:{},
 				tableName: 'scan_code',
 				textImgUrl: '',
+				shdowStyle: {
+					paddingTop: "300rpx",
+					marginTop: "-300rpx"
+				},
+				// openFont: 'More',
+				// closeFont: 'Close',
 				
 				starRateValue: 5,   //评分星星数量
 				showStarTip: false, //评分展示开关
@@ -82,6 +88,10 @@
 				//查看历史页面
 				await that.getHistoryData(option.data);
 			}
+			
+			that.$nextTick(() => {
+			    that.$refs.readMore.init()
+			})
 		},
 		onHide() {
 			let that = this;
@@ -98,6 +108,8 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				//更改starTipStatus状态
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -143,9 +155,6 @@
 				  summary: this.textInfo.message,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -161,8 +170,8 @@
 				let that = this;
 				//console.log('that.textInfo.message',that.textInfo.message)
 				uni.navigateTo({
-					 url: '/pages/webview/webview?url=https://www.baidu.com/s?wd=' + that.textInfo.message 
-					 //url: '/pages/webview/webview?url=http://www.google.com?wd=' +  that.textInfo.message
+					 //url: '/pages/webview/webview?url=https://www.baidu.com/s?wd=' + that.textInfo.message 
+					 url: '/pages/webview/webview?url=https://www.google.com.hk/search?q=' +  that.textInfo.message
 				});
 			},
 			
@@ -290,14 +299,15 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
+			overflow: auto; 
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
-				height: 160rpx;
+				height: auto;
 				text-align: start;
 			}
 			
@@ -306,13 +316,13 @@
 				height: 160rpx;
 				//margin-top: 30px;	
 				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -328,7 +338,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -338,7 +348,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -351,26 +361,35 @@
 				}
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
 			
-		}
+		// }
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 300rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
+		
+		.starTipText{
+			color: #fff;
+			font-size: 48rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Url.vue b/pages/scan/Url.vue
index b5a044a..f523fe1 100644
--- a/pages/scan/Url.vue
+++ b/pages/scan/Url.vue
@@ -1,33 +1,30 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-link" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-link" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
-			   <view>Url: {{ urlInfo.LinkValue }}</view>
+			   <view>{{ urlInfo.LinkValue }}</view>
 		   </tn-list-cell>
 		   <tn-list-cell class="listItem">
 			   <tn-grid align="center" :col="col">
 				    <block>
 						<tn-grid-item class="toolItem" @click="openUrl()">
-							<view class="tn-icon-plane"></view>
-							<view class="cutline"></view>
+							<view class="tn-icon-share-square"></view>
 						    <view class="toolText">Open</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 							<view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 						    <view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyValue()">
 							<view class="tn-icon-copy-fill"></view>
-							<view class="cutline"></view>
 						    <view class="toolText">Copy</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		   <!-- <view class="cutline"></view> -->
+		<!--   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -40,10 +37,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -69,6 +66,7 @@
 		},
 		async onLoad(option) {
 			let that = this;
+			console.log('option',option)
 			//打开db
 			await that.openSqlite();
 			//判断是否存在表
@@ -98,6 +96,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -150,9 +149,6 @@
 				  summary: this.urlInfo.LinkValue ,
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -286,11 +282,11 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 360rpx;
@@ -300,14 +296,12 @@
 			.listItem{
 				//border: 2px solid yellow;
 				height: 160rpx;
-				//margin-top: 30px;	
-				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -322,7 +316,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -332,7 +326,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -346,23 +340,23 @@
 				
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 80rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
@@ -372,5 +366,9 @@
 			color: #fff;
 			font-size: 48rpx;
 		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
 	}
 </style>
diff --git a/pages/scan/Wifi.vue b/pages/scan/Wifi.vue
index 1f4ec94..72a4657 100644
--- a/pages/scan/Wifi.vue
+++ b/pages/scan/Wifi.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<tn-avatar class="icon tn-icon-wifi" size="xl"></tn-avatar>
+		<!-- <tn-avatar class="icon tn-icon-wifi" size="xl"></tn-avatar> -->
 		<tn-list-view :card="true" unlined="all" class="listView">
 		   <tn-list-cell class="listItem-1">
 			   <view>Network name: {{ wifiInfo.ssidNumber }}</view>
@@ -11,24 +11,21 @@
 				    <block>
 						<tn-grid-item class="toolItem" @click="connectWifi()">
 							<view class="tn-icon-wifi"></view>
-							<view class="cutline"></view>
 						    <view class="toolText">Connect to Wifi</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="share()">
 							<view class="tn-icon-share-triangle"></view>
-							<view class="cutline"></view>
 						    <view class="toolText">Share</view>
 						</tn-grid-item>
 						<tn-grid-item class="toolItem" @click="copyPassword()">
 							<view class="tn-icon-coupon"></view>
-							<view class="cutline"></view>
 						    <view class="toolText">Copy password</view>
 						</tn-grid-item>
 					</block>
 			   </tn-grid>
 		   </tn-list-cell>
-		   <view class="cutline"></view>
-		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell>
+		   <!-- <view class="cutline"></view>
+		   <tn-list-cell class="listItem-ad">我是谷歌ad部分</tn-list-cell> -->
 		   <tn-list-cell class="listItemBottom">
 			   <image :src="textImgUrl" class="buttomImg"/>
 		   </tn-list-cell>
@@ -41,10 +38,10 @@
 			  	<view class="starTipText">Do you like this app?</view>
 			  </view>
 		    <view slot="center" class="tn-icon tn-icon-about-fill">
-				<tn-rate v-model="starRateValue" :size="80" :allowHalf="true" activeColor="#0186FF"></tn-rate>
+				<tn-rate v-model="starRateValue" :size="80" :allowHalf="false" activeColor="#0186FF"></tn-rate>
 			</view>
 		    <view slot="right" class="tn-icon tn-icon-about-fill">
-				<tn-button :fontSize="36" margin="30rpx" height="46rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
+				<tn-button :fontSize="50" margin="80rpx" height="100rpx" backgroundColor="#0186FF" fontColor="tn-color-white" @click="starTipSubmit()">submit</tn-button>
 		    </view>
 		  </view>
 		</tn-modal>
@@ -99,6 +96,7 @@
 			if(starTipStatus === null || starTipStatus === ""){
 				//达到要求
 				that.showStarTip = true;
+				that.setStarTipStatus(false);
 				return true;
 			}else{
 				return false;
@@ -165,9 +163,6 @@
 				  summary: JSON.stringify(this.wifiInfo),
 				  success(){
 				    // 分享完成，请注意此时不一定是成功分享
-					uni.showToast({
-						title: 'share success!'
-					});
 				  },
 				  fail(){
 				    // 分享失败
@@ -304,11 +299,11 @@
 			width: 660rpx;
 			height: 1300rpx;
 			margin-top: 100rpx;
-			background-color: #141b29;
+			background-color: #1F222B;
 			
 			.listItem-1{
 				margin-top: 120rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				//border: 2px solid yellow;
 				height: 160rpx;
@@ -318,14 +313,12 @@
 			.listItem{
 				//border: 2px solid yellow;
 				height: 160rpx;
-				//margin-top: 30px;	
-				//padding-top: 30px;	
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				
 				.toolItem{
 					//border: 2px solid red;
-					background-color: #141b29;
+					background-color: #1F222B;
 					font-size: 60rpx;
 					color: #8f8f94;
 					height: 120rpx;
@@ -340,7 +333,7 @@
 			}
 			
 			.listItem-ad{
-				background-color: #141b29;
+				background-color: #1F222B;
 				text-align: center;
 				color: #fff;
 				//border: 2px solid red;
@@ -350,7 +343,7 @@
 			.listItemBottom{
 				height: 400rpx;
 				margin-top: 20rpx;
-				background-color: #141b29;
+				background-color: #1F222B;
 				color: #fff;
 				display: flex;
 				flex-direction: column;
@@ -364,27 +357,36 @@
 				
 			}
 		}
-		.icon{
-			z-index: 1;
-			position: absolute;
-			margin-top: -620rpx;
-			background-color: #3e444d;
-			font-size: 120rpx;
-			color: #fff;
-			text-align: center;
-		}
+		// .icon{
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	margin-top: -620rpx;
+		// 	background-color: #3e444d;
+		// 	font-size: 120rpx;
+		// 	color: #fff;
+		// 	text-align: center;
+		// }
 		
 		
 		.bottomText{
 			color: #fff;
 			text-align: center;
 			font-size: 24rpx;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
+			//margin-top: 40rpx;
+			margin-bottom: 240rpx;
 		}
 		.cutline{
 			border: 1px solid #8f8f94;
 		}
 		
+		.starTipText{
+			color: #fff;
+			font-size: 50rpx;
+		}
+		
+		.startTipContent{
+			margin-bottom: 30rpx;
+		}
+		
 	}
 </style>
\ No newline at end of file
diff --git a/pages/setting/Setting.vue b/pages/setting/Setting.vue
index 484cd8d..3d76e4d 100644
--- a/pages/setting/Setting.vue
+++ b/pages/setting/Setting.vue
@@ -3,11 +3,11 @@
 		
 		<!-- 顶部通用设置模块 -->
 		<view>
-			<view class="headLine">General Settings</view>
-			<tn-list-view :card="cardMode" class="settingList" unlined="all">
-				<tn-list-cell class="listItem">
+			<view class="headLine">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">
@@ -15,84 +15,105 @@
 							 <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>
-				</tn-list-cell>
+				</tn-list-cell> -->
 				
-				<tn-list-cell class="listItem">
+				<!-- <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>
-				</tn-list-cell>
+				</tn-list-cell> -->
 				
-				<tn-list-cell class="listItem">
+				<!-- <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>
-				</tn-list-cell>
+				</tn-list-cell> -->
 				
-				<tn-list-cell class="listItem">
+				<!-- <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>
-				</tn-list-cell>
+				</tn-list-cell> -->
 				
-				<tn-list-cell class="listItem">
-					<view class="list-icon-text">
+				<view class="tn-margin-top-sm">
+				<tn-list-cell class="listView" :radius="true">
+					<view class="list-box">
 						<!-- 左边图标文本显示部分 -->
-					    <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-text">Language</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>
+						<!-- <view class="list-select">
+							<text class="list-select-text">{{ languageLabel }}</text><text class="tn-icon-down-triangle list-select-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>
+				</tn-list-cell>
+				</view>
+				
+				<view class="tn-margin-top-sm">
+				<tn-list-cell class="listView" :radius="true">
+					<view>
+						<!--  左边图标文本显示部分 -->
+						<view @click="gotoFeedback()">
+							<view class="list-text">Feedback</view>
 						</view>
 					</view>
 				</tn-list-cell>
-			</tn-list-view>
+				</view>
+				
+				<view class="tn-margin-top-sm">
+				<tn-list-cell class="listView" :radius="true">
+					<view>
+						<!-- 左边图标文本显示部分 -->
+						  <view @click="gotoPolicy()">
+							 <view class="list-text">Provacy policy</view>
+						  </view>
+					</view>
+				</tn-list-cell>
+				</view>
+			<!-- </tn-list-view> -->
 		</view>
 		
 		
@@ -101,11 +122,11 @@
 		
 		
 		<view>
-			<view class="headLine">Help</view>
-			<tn-list-view :card="cardMode" class="settingList">
+			<!-- <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">
@@ -113,11 +134,11 @@
 						  </view>
 					    </view>
 					</view>
-				</tn-list-cell>
+				</tn-list-cell> -->
 				
-				<tn-list-cell class="listItem">
+				<!-- <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">
@@ -126,11 +147,11 @@
 						  </view>
 					    </view>
 					</view>
-				</tn-list-cell>
+				</tn-list-cell> -->
 				
-				<tn-list-cell class="listItem">
+			<!-- 	<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">
@@ -138,8 +159,8 @@
 						  </view>
 					    </view>
 					</view>
-				</tn-list-cell>
-			</tn-list-view>
+				</tn-list-cell> 
+			</tn-list-view>-->
 		</view>
 	</view>
 </template>
@@ -212,21 +233,52 @@
 		},
 		onLoad() {
 
+		},
+		onBackPress(options){
+			let that = this;
+				if (options.from === 'navigateBack') {  
+				    return false;  
+				}  
+				that.back();  
+				return true;	
+			
 		},
 		methods: {
+			//返回主页
+			back() {  
+			    uni.switchTab({
+					url: '/pages/scan/Scan'
+				});
+			}, 
 			
-			//选择搜索引擎
-			selectWebEngine(e){
-				console.log('选择了浏览器',e[0].label);
-				this.webEngineLabel = e[0].label;
-				this.webEngineValue = e[0].value;
+			//跳转反馈页面
+			gotoFeedback(){
+				uni.navigateTo({
+					url: '/pages/feedback/Feedback'
+				});
 			},
 			
-			//打开选择搜索引擎界面
-			openWebSelectView(){
-				this.webEngine = true;
+			//跳转反馈页面
+			gotoPolicy(){
+				uni.navigateTo({
+					url: '/pages/policy/Policy'
+				});
 			},
 			
+			
+			
+			//选择搜索引擎
+			// 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;
@@ -243,157 +295,167 @@
 </script>
 
 <style lang="scss">
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background-color: #1F222B;
-		height:100vh;
+	// .content {
+	// 	display: flex;
+	// 	flex-direction: column;
+	// 	align-items: center;
+	// 	justify-content: start;
+	// 	background-color: #1F222B;
+	// 	height:100vh;
 		
 		
 		
-		.headLine{
-			color: royalblue;
-			font-size: 36rpx;
-			//padding-top:30px;
-			//margin-right:200px;
-			margin-top: 60rpx;
-			//border: 2px solid purple;
-		}
+	// 	.headLine{
+	// 		color: #fff;
+	// 		font-size: 48rpx;
+	// 		//padding-top:30px;
+	// 		//margin-right:200px;
+	// 		margin-top: 60rpx;
+	// 		//border: 2px solid purple;
+	// 	}
 		
-		.settingList{
-			//border: 2px solid red;
-			width: 660rpx;
-			//height:300px;
-			height: auto;
-			//margin-top: 10px;
-			//background-color: #141b29;
+	// 	.settingList{
+	// 		//border: 2px solid red;
+	// 		width: 660rpx;
+	// 		//height:300px;
+	// 		height: auto;
+	// 		margin-top: 60rpx;
+	// 		//background-color: #141b29;
 			
-			.listItem{
-				//border: 2px solid yellow;
-				height: 100rpx;
-				//margin-top: 30px;	
-				background-color: #141b29;
-				color: #fff;
-				text-align: start;
+	// 		.listItem{
+	// 			border: 2px solid yellow;
+	// 			height: 130rpx;
+	// 			margin-top: 30rpx;	
+	// 			background-color: #161A23;
+	// 			color: #fff;
+	// 			text-align: start;
 				
-				.list-icon-text {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
+	// 			.list-icon-text {
+	// 				display: flex;
+	// 				align-items: center;
+	// 				justify-content: space-between;
 					
 				
-					.list-left{
-						//border: 2px solid green;
-						display: flex;
-						align-items: center;
-						justify-content: flex-start;
+	// 				.list-left{
+	// 					//border: 2px solid green;
+	// 					display: flex;
+	// 					align-items: center;
+	// 					justify-content: flex-start;
 						
-						.list-left-text{
-							width: 420rpx;
-							.list-left-text-one{
-								font-size: 30rpx;
-								//border: 2px solid blue;
-							}
+	// 					.list-left-text{
+	// 						width: 420rpx;
+	// 						.list-left-text-one{
+	// 							font-size: 40rpx;
+	// 							//border: 2px solid blue;
+	// 						}
 							
-							.list-left-text-two{
-								color: grey;
-								font-size: 26rpx;
-								//border: 2px solid lightsalmon;
-							}
-						}
+	// 						.list-left-text-two{
+	// 							color: grey;
+	// 							font-size: 40rpx;
+	// 							//border: 2px solid lightsalmon;
+	// 						}
+	// 					}
 						
-						.list-left-feedback-text{
-							width: 480rpx;
-							.list-left-feedback-text-one{
-								font-size: 30rpx;
-								//border: 2px solid blue;
-							}
+	// 					.list-left-feedback-text{
+	// 						width: 480rpx;
+	// 						.list-left-feedback-text-one{
+	// 							font-size: 40rpx;
+	// 							//border: 2px solid blue;
+	// 						}
 							
-							.list-left-feedback-text-two{
-								color: grey;
-								font-size: 26rpx;
-								//border: 2px solid lightsalmon;
-							}
-						}
+	// 						.list-left-feedback-text-two{
+	// 							color: grey;
+	// 							font-size: 30rpx;
+	// 							//border: 2px solid lightsalmon;
+	// 						}
+	// 					}
 						
 						
-						.list-left-icon{
-							//border: 2px solid blueviolet;
-							margin-right: 20rpx;
-							font-size: 50rpx;
-						}
+	// 					.list-left-icon{
+	// 						//border: 2px solid blueviolet;
+	// 						margin-right: 20rpx;
+	// 						font-size: 100rpx;
+	// 					}
 						
-						.list-left-select-text{
-							width: 320rpx;
-							.list-left-select-text-one{
-								font-size: 30rpx;
-								//border: 2px solid blue;
-							}
-						}
-					}
+	// 					.list-left-select-text{
+	// 						width: 320rpx;
+	// 						.list-left-select-text-one{
+	// 							font-size: 40rpx;
+	// 							//border: 2px solid blue;
+	// 						}
+	// 					}
+	// 				}
 					
-					.list-right{
-						//border: 2px solid pink;
-						color: royalblue;
-						font-size: 40rpx;
+	// 				.list-right{
+	// 					//border: 2px solid pink;
+	// 					color: royalblue;
+	// 					font-size: 48rpx;
 						
-						.list-right-icon{
-							//border: 2px solid gainsboro;
-							font-size: 50rpx;
-							margin-left: 30rpx;
-						}
+	// 					.list-right-icon{
+	// 						//border: 2px solid gainsboro;
+	// 						font-size: 50rpx;
+	// 						margin-left: 30rpx;
+	// 					}
 						
-						.list-right-text{
-							//border: 2px solid green;
-							//margin-right: 30px;
-							//padding-right: 30px;
-						}
-					}
-				}
-			}
+	// 					.list-right-text{
+	// 						//border: 2px solid green;
+	// 						//margin-right: 30px;
+	// 						//padding-right: 30px;
+	// 					}
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// }
+	
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: start;
+		background-color: #000000;
+		height:100vh;
+		
+		.listView{
+			height: auto;
+			width: 660rpx;
+			margin-top: 60rpx;	
+			background-color: #161A23;
+			text-align: start;
+			//border: 1px solid red;
 		}
 	}
 	
-	// .message {
-	//   display: flex;
-	//   flex-direction: row;
-	//   align-items: center;
-	//   justify-content: space-around;
-	  
-	//   &__left {
-	//     width: 10%;
-	//   }
-	//   &__middle {
-	//     width: 80%;
-	//     padding-left: 20rpx;
-	//     padding-right: 40rpx;
-	//   }
-	//   &__right {
-	//     width: 10%;
-	//     display: flex;
-	//     flex-direction: column;
-	//     align-items: center;
-	//     justify-content: center;
-	//   }
-	  
-	//   &__name {
-	//     font-size: 32rpx;
-	//     margin-bottom: 8rpx;
-	//   }
-	//   &__content {
-	// 	//margin-top: 20px;
-	//     font-size: 26rpx;
-	//     color: #838383;
-	//   }
-	//   &__tips {
-	//     &__icon {
-	//       font-size: 36rpx;
-	//       color: #AAAAAA;
-	//     }
-	//   }
-	// }
-
+	.headLine{
+		color: #fff;
+		font-size: 48rpx;
+		margin-top: 60rpx;
+	}
+	
+	.list-text{
+		
+		color: #fff;
+		font-size: 36rpx;
+		background-color: #161A23;
+		//border: 1px solid greenyellow;
+	}
+	
+	.list-select{
+		//border: 2px solid pink;
+		color: royalblue;
+		font-size: 36rpx;
+		
+		.list-select-icon{
+			//border: 2px solid gainsboro;
+			font-size: 50rpx;
+			margin-left: 30rpx;
+		}
+	}
+	
+	.list-box{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 	
 </style>
diff --git a/static/album.png b/static/album.png
index 6f7346ed37aa0fffd9f108ad297ae2328debf059..2f2e786323e09242f0b6f6ada1965125c7d5d814 100644
GIT binary patch
literal 3516
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
F`44iVXVd@y

literal 3425
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

diff --git a/static/flashLightOff.png b/static/flashLightOff.png
index ca7057a1f2036f821b87a69ce21770d62d527130..c3f6af0d8569cca4b48c8566d18bf4c5a2181231 100644
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&f=NU{RCr$Pn(a~KFbsyJPN0*c5}=ZUN{&vBPM{MpViLxi$c|oFHaoM)-}Tzo
zV}099H~#UB%TFhOQv+_Cz-a<Et^jkKporWN(VtG(pUnK;Imhnr!%aX${wD~(Zv2Ir
zUo#;L1t22-i0CPE!$kCusR^S2NV4!c-5WDMXU!W1AR<r9{8rnD{!T=y0oh-w8H4~7
zs$D$|5&0k@b$;ciC-(^uQGnYye%AyHyWT;loIa$wBBD`49ccNzGxGxg@Ng)k0hLYd
z>~aZvy7}_-pp&aO(C3!f9ZG8qKmn*gk3{rh%yn_XTL{dIuC;TZ=o}s((57_4MKBb?
zD{^ufCgc%b$G`xB5Qv%G&adJ??~yr%0ze^nH?z!Zg-^(VBI|`TU|j$)2k)jTsWaq2
zy=#R{pj;puf{1LLpB6#)h)~GbE)B@mgju1l1e5|G%O_aQZ$#)D0-zT{CG=_i-z<N7
zE5j5GP(QGSsHjiq=o@Hw)hH3_6LbSu(qk=J)Kh=QdK5w<#YX&DC{knqSeqUyd<a6N
zc0h#Jv7s_K13($JeiK3{S?U7d$=MNea5hi>8a)ElfKaO33&3i4?lyuzXz9I(sPI-L
z8nXYcOt9j(S{)*HDQ!V$ILeUiuWN)gppvyUPa>)b%m1{+w*9(0L_GjP4T}hbN{*0H
zBZL4{oS$125eSVC8MgcGRJhWx@LXGIPY+I(3<xR0hn=8NvU-!2j65Nn_F9{SO`zeB
zra;JUi@^YvT)!5NhePl#;2jqNP(aYji|x&gwYD|pqQ{RoMz3(5abW<S$%~GW)#x0S
zF(P}L1z>kgUhDMC)`VFAwil%r8QhZQYGMP2NaVCrqCjLpBW(WE3`LCBsYCsQ$ey}u
z0q>%ftntSIZqnRvp5WcjcHD3ir~vqOfSw$Gv`?4;z;u8}c{>uq3;;U^xU{;rj~`S!
ztL5z|2r~d|%VsT_tT%&)wfzVPLjiyfrCdF|288)d(Id|b0D#I{142mna5;P=c##5o
z9!k0!DdoBa1ih6CzZ)EF0@hQxQjSBrZ^16F<h+M6H4ivwoOB5v6?htegZsXVj4w-=
z$UMVL;GlB^IlYKr-v0~(ury7qo1?1{enu2nZ-dq+^U!-i?<w|-8>#_48=Ljt6TmFe
q*SgNB0oQsmv-Wjrz%0_&y3QAPDm`C-^jXaS0000<MNUMnLSTX+OSFvu

literal 5176
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
YRp7_IiV(vx@KYdQL$Jp;TKH1`3ve<r+5i9m

diff --git a/static/flashLightOn.png b/static/flashLightOn.png
index 7cba1d00b126846514e289c23e85c1fb974b322d..2a90ff79d8ed550fc4a9ccadc552861de96bb7c3 100644
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&8A(JzRCr$PTJ3e+FbEZ!G@CS&w3(#IB+VwxCe0@F&|~+wGT1^~q~zH8`(&QD
zz~w`ta`8nM*T38V+#Yao1nv;HxC4wKL1z9^O8FWD`<;m1f--iWr-uMD{{kq#9{ibz
zUXUQ90>I2aODW%x2QH;NB0V7+00t{B;$Dg92_-iT0A?1;iwB?=Gz>BU_+3g7^4l)4
z+`9u20kD?w@k79{zRPu)S+a%@=ytsk(W3*v)2%5UV3427a)yj2B6>a5%CR8}fF1b}
zk?X&hIV__E2iKum1RCz|vK%6WTFxqaG62xX?}3P#$&Z=CGNu54upB~0tMYIUFv?yp
z`DvxIOU6t9YT|OIErtA~33~7-<=G4407TkC$nYo+4FQd~I#S<`{Jb)z0DvGaLx%MK
zhwX2)GlYbIL4MxU*E=_m^eSa`*PI{>0HS6$WO%)~D^nl<(1sq~$`3I(>1vY^0EBCH
zt?u`lzjsg)0susQ-ht^4Wkw))xj1J9I0}G9TwMogu{bk}^3TfNuJ{kt0S0loh8`_S
zuX_%NvMct(9)K8nv;wf)D@c)4FL$Y33+N7kQ3DG(uu*3~dW0?j4Dt)PqU8+-7c1Ry
zzx}UX0JMQc&$X4*3+A9CgY+OF0Lt6tsL{zHy)Xa=gw)Du>pqjf4wMg*UKoIdl&pO0
z0l`d}#!L`GdJq6MAjsuKeRHFMpzTrng>2G;0pKyUku`P|;|S851;DP`s|j!v>CFP5
zPMiOc*+|lx1wh?0|0BR9t4LE-^F#{i4F}-ts%$jreG~xx65wp*L+x;D7SOszA;4Lr
zH^T#V1h|a4>&FjrHh86XW~i=a=uGJLccpKTrb&A<I9&Pk5O6+}N*kpe87$QU8~{Li
zdyi+Xd$R#(nfIp*Qd+^t20$B}Y|l0&?!yzIR&-AWC)1TrCBc*XJ{f~a+&8})Y6ac9
zFD(R4CP&jqZ)hQecr)a+sCR#w2P{(~>F~a7p3J|XUwV2K9_j(n!;Sbp)dNN-5dDuE
pfGC2W{rlSkKDz~@=fAuM`~ga?pHLcMr(OU6002ovPDHLkV1h<VfO!A_

literal 3464
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
Vz@BKtUtntmu`;(at1%%Z{s#zA8eaea

diff --git a/uni_modules/vv-schedule/index.js b/uni_modules/vv-schedule/index.js
new file mode 100644
index 0000000..5de0ba1
--- /dev/null
+++ b/uni_modules/vv-schedule/index.js
@@ -0,0 +1,186 @@
+export async function addSchedule(data) {
+	//#ifdef APP-PLUS
+	const {platform} = uni.getSystemInfoSync()
+	if (platform == 'android') {
+		return androidSchedule(data)
+	} else if (platform == 'ios') {
+		return iosSchedule(data)
+	}
+	//#endif
+}
+
+async function androidSchedule (data) {
+	const calendarURL = 'content://com.android.calendar/calendars'
+	const calendarEventURL = 'content://com.android.calendar/events'
+	const calendarRemiderURL = 'content://com.android.calendar/reminders'
+	const CalendarContract = plus.android.import('android.provider.CalendarContract')
+	const account = await createAccountData()
+	const main = plus.android.runtimeMainActivity()
+	const timeZone = plus.android.invoke('java.util.TimeZone', 'getDefault')
+	const timeZoneId = plus.android.invoke(timeZone, 'getID')
+	await checkPermission()
+	let accountId = getAccount()
+	if (!accountId) {
+		accountId = addAccount()
+	}
+	if (!accountId) return
+	const calendarId = insertCalendar({
+		calendar_id: accountId,
+		title: data.title,
+		description: data.description,
+		dtstart: data.dtstart,
+		dtend: data.dtend,
+	})
+	if (!calendarId) return
+	insertReminder({event_id: calendarId})
+	// insertAlarm(data.dtstart)
+
+	async function checkPermission() {
+		return new Promise((resolve) => {
+			plus.android.requestPermissions(['android.permission.READ_CALENDAR', 'android.permission.WRITE_CALENDAR'], ({deniedAlways, deniedPresent, granted}) => {
+				if (deniedAlways.length > 0) { //权限被永久拒绝
+					// 弹出提示框解释为何需要权限，引导用户打开设置页面开启
+					uni.showModal({
+						title: '提示',
+						content: '请打开日历权限',
+						success: ({confirm}) => {
+							if (!confirm) return
+							const intent = plus.android.newObject("android.content.Intent")
+							const Settings = plus.android.newObject("android.provider.Settings")
+							const action = plus.android.getAttribute(Settings, 'ACTION_APPLICATION_DETAILS_SETTINGS')
+							plus.android.invoke(intent, 'setAction', action)
+							const uri = plus.android.invoke('android.net.Uri', 'fromParts', 'package', main.getPackageName(), null)
+							plus.android.invoke(intent, 'setData', uri)
+							main.startActivity(intent)
+						}
+					})
+				} else if (deniedPresent.length > 0) { //权限被临时拒绝
+					uni.showToast({title: '您拒绝了日历写入权限', icon: 'none'})
+				} else if (granted.length > 0) { //权限被允许
+					resolve()
+				}
+			}, err => {
+				uni.showToast({title: `申请权限错误：${err.code} ${err.message}`, icon: 'none'})
+			})
+		})
+	}
+	function createAccountData() {
+		return new Promise((resolve) => {
+			plus.runtime.getProperty(plus.runtime.appid, ({appid, name}) => {
+				resolve({
+					name,
+					account_name: appid,
+					account_type: CalendarContract.ACCOUNT_TYPE_LOCAL,
+					display_name: name,
+				})
+			})
+		})
+	}
+	function getAccount() {
+		const uri = plus.android.invoke('android.net.Uri', 'parse', calendarURL)
+		const userCursor = plus.android.invoke(main.getContentResolver(), "query", uri, null, null, null, null)
+		while (plus.android.invoke(userCursor, 'moveToNext')) {
+			const _account_name = plus.android.invoke(userCursor, 'getString', plus.android.invoke(userCursor, 'getColumnIndex', 'account_name'))
+			const _account_type = plus.android.invoke(userCursor, 'getString', plus.android.invoke(userCursor, 'getColumnIndex', 'account_type'))
+			const _id = plus.android.invoke(userCursor, 'getString', plus.android.invoke(userCursor, 'getColumnIndex', '_id'))
+			if (_account_name == account.account_name && _account_type == account.account_type) {
+				return _id
+			}
+		}
+	}
+	function addAccount() {
+		const value = plus.android.newObject('android.content.ContentValues')
+		plus.android.invoke(value, 'put', 'name', account.name)
+		plus.android.invoke(value, 'put', 'account_name', account.account_name)
+		plus.android.invoke(value, 'put', 'account_type', account.account_type)
+		plus.android.invoke(value, 'put', 'calendar_displayName', account.display_name)
+		plus.android.invoke(value, 'put', 'visible', 1)
+		plus.android.invoke(value, 'put', 'sync_events', 1)
+		plus.android.invoke(value, 'put', 'calendar_timezone', timeZoneId)
+		plus.android.invoke(value, 'put', 'ownerAccount', account.account_name)
+		// plus.android.invoke(value, 'put', 'canOrganizerRespond', 0)
+		// plus.android.invoke(value, 'put', 'calendar_color', -9206951)
+		// plus.android.invoke(value, 'put', 'calendar_access_level', 700)
+		const calendarUri = plus.android.invoke('android.net.Uri', 'parse', calendarURL)
+		const buildUpon = plus.android.invoke(calendarUri, "buildUpon")
+		plus.android.invoke(buildUpon, "appendQueryParameter", CalendarContract.CALLER_IS_SYNCADAPTER, "true")
+		plus.android.invoke(buildUpon, "appendQueryParameter", "account_name", account.account_name)
+		plus.android.invoke(buildUpon, "appendQueryParameter", "account_type", account.account_type)
+		const build = plus.android.invoke(buildUpon, "build")
+		const newAccoutList = plus.android.invoke(main.getContentResolver(), "insert", build, value)
+		const newAccout_id = plus.android.invoke(plus.android.invoke(newAccoutList, "getPathSegments"), "get", 1)
+		return newAccout_id
+	}
+	function insertCalendar({calendar_id, title, description, dtstart, dtend}) {
+		const value = plus.android.newObject('android.content.ContentValues')
+		const systemInfo = uni.getSystemInfoSync()
+		plus.android.invoke(value, 'put', 'calendar_id', (systemInfo.brand || '').toLowerCase() == 'xiaomi' ? 1 : calendar_id)
+		plus.android.invoke(value, 'put', 'title', title)
+		plus.android.invoke(value, 'put', 'description', description)
+		plus.android.invoke(value, 'put', 'dtstart', dtstart)
+		plus.android.invoke(value, 'put', 'dtend', dtend)
+		plus.android.invoke(value, 'put', 'eventTimezone', timeZoneId)
+		// plus.android.invoke(value, 'put', 'allDay', 1)
+		// plus.android.invoke(value, 'put', 'rrule', 'FREQ=MONTHLY;BYMONTHDAY=24')
+		//rrule参考 https://www.cnblogs.com/ice5/p/14023771.html
+		plus.android.invoke(value, 'put', 'hasAlarm', 1) //是否闹钟提醒 默认提醒 因为大部分手机未实现此功能 故未实现
+		const calendarEventUri = plus.android.invoke('android.net.Uri', 'parse', calendarEventURL)
+		const newEvent = plus.android.invoke(main.getContentResolver(), 'insert', calendarEventUri, value)
+		const id = plus.android.invoke(newEvent, 'getLastPathSegment')
+		return id
+	}
+	function insertReminder({event_id}) {
+		const value = plus.android.newObject('android.content.ContentValues')
+		plus.android.invoke(value, 'put', 'event_id', event_id)
+		plus.android.invoke(value, 'put', 'minutes', 5)
+		plus.android.invoke(value, 'put', 'method', 1)
+		const calendarRemiderUri = plus.android.invoke('android.net.Uri', 'parse', calendarRemiderURL)
+		const res = plus.android.invoke(main.getContentResolver(), 'insert', calendarRemiderUri, value)
+		return res
+	}
+	function insertAlarm(dtstart) {
+		const AlarmManager = plus.android.importClass("android.app.AlarmManager")
+		const Context = plus.android.importClass("android.content.Context")
+		const alarm = main.getSystemService(Context.ALARM_SERVICE)
+		const intent = plus.android.newObject("android.content.Intent")
+		const PendingIntent = plus.android.importClass("android.app.PendingIntent")
+		const pendingIntent = PendingIntent.getActivity(main, 0, intent, 0)
+		alarm.set(AlarmManager.RTC_WAKEUP, dtstart, pendingIntent)
+	}
+}
+function iosSchedule(data) {
+	return new Promise((resolve) => {
+		const eventStore = plus.ios.newObject('EKEventStore')
+		// const hasMethod = plus.ios.invoke(eventStore, 'respondsToSelector:', plus.ios.newObject('@selector', 'requestAccessToEntityType:completion:'))
+		plus.ios.invoke(eventStore, 'requestAccessToEntityType:completion:', 0, () => {
+			const calendar = plus.ios.invoke(eventStore, 'defaultCalendarForNewEvents')
+			if (!calendar) {
+				// uni.showModal({
+				// 	title: '提示',
+				// 	content: '请打开日历权限',
+				// 	success: ({confirm}) => {
+				// 		if (!confirm) return
+				// 		plus.runtime.openURL('app-settings://')
+				// 	}
+				// })
+				return
+			}
+			const event = plus.ios.invoke('EKEvent', 'eventWithEventStore:', eventStore)
+			// const date = plus.ios.newObject('NSDate')
+			event.plusSetAttribute('title', data.title)
+			// event.plusSetAttribute('location', 'location')
+			event.plusSetAttribute('notes', data.description)
+			const startDate = plus.ios.invoke('NSDate', 'dateWithTimeIntervalSince1970:', data.dtstart /1000)
+			event.plusSetAttribute('startDate', startDate)
+			const endDate = plus.ios.invoke('NSDate', 'dateWithTimeIntervalSince1970:', data.dtend /1000)
+			event.plusSetAttribute('endDate', endDate)
+			const alarm = plus.ios.invoke('EKAlarm', 'alarmWithRelativeOffset:', -5)
+			plus.ios.invoke(event, 'addAlarm:', alarm)
+			plus.ios.invoke(event, 'setCalendar:', calendar)
+			const res = plus.ios.invoke(eventStore, 'saveEvent:span:error:', event, 0, null)
+			if (res) {
+				return resolve(res)
+			}
+		})
+	})
+}
\ No newline at end of file
diff --git a/uni_modules/vv-schedule/readme.md b/uni_modules/vv-schedule/readme.md
new file mode 100644
index 0000000..85d22af
--- /dev/null
+++ b/uni_modules/vv-schedule/readme.md
@@ -0,0 +1,13 @@
+# vv-schedule
+### 用法：
+```
+import {addSchedule} from '@/uni_modules/vv-schedule'
+
+await addSchedule({
+	title: 'vvv',
+	description: 'eee',
+	dtstart: new Date('2021/8/28 5:00').getTime(),
+	dtend: new Date('2021/8/28 6:00').getTime(),
+})
+uni.showToast({title: '日程添加成功'})
+```
\ No newline at end of file