app php01 1 month ago
parent
commit
49400a6e66
46 changed files with 825 additions and 729 deletions
  1. 3 0
      .hbuilderx/launch.json
  2. 103 87
      App.vue
  3. 19 1
      components/orderItem/orderItem.vue
  4. 19 1
      components/orderItemA/orderItemA.vue
  5. 18 1
      components/orderItemB/orderItemB.vue
  6. 16 2
      components/orderItemC/orderItemC.vue
  7. 4 4
      locale/yuenan.json
  8. 4 4
      locale/zh-Hans.json
  9. 4 4
      locale/zh-Hant.json
  10. 3 52
      manifest.json
  11. 2 0
      pages/index/index.vue
  12. 44 8
      pages/user/Usermanager.vue
  13. BIN
      static/logo.png
  14. BIN
      unpackage/debug/android_debug.apk
  15. 0 0
      unpackage/dist/build/app-plus/app-config-service.js
  16. 0 0
      unpackage/dist/build/app-plus/app-service.js
  17. 0 0
      unpackage/dist/build/app-plus/app-view.js
  18. 0 0
      unpackage/dist/build/app-plus/manifest.json
  19. 0 0
      unpackage/dist/build/app-plus/pages/imcall/audioCall.js
  20. 0 0
      unpackage/dist/build/app-plus/pages/map/MapboxNav.js
  21. 0 0
      unpackage/dist/build/app-plus/pages/map/mapboxView.js
  22. BIN
      unpackage/dist/build/app-plus/static/logo.png
  23. 0 0
      unpackage/dist/build/app-plus/view.css
  24. 0 0
      unpackage/dist/build/app-plus/view.umd.min.js
  25. 0 0
      unpackage/dist/dev/app-plus/app-config-service.js
  26. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  27. 586 565
      unpackage/dist/dev/app-plus/app-view.js
  28. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  29. BIN
      unpackage/dist/dev/app-plus/static/logo.png
  30. BIN
      unpackage/res/icons/1024x1024.png
  31. BIN
      unpackage/res/icons/120x120.png
  32. BIN
      unpackage/res/icons/144x144.png
  33. BIN
      unpackage/res/icons/152x152.png
  34. BIN
      unpackage/res/icons/167x167.png
  35. BIN
      unpackage/res/icons/180x180.png
  36. BIN
      unpackage/res/icons/192x192.png
  37. BIN
      unpackage/res/icons/20x20.png
  38. BIN
      unpackage/res/icons/29x29.png
  39. BIN
      unpackage/res/icons/40x40.png
  40. BIN
      unpackage/res/icons/58x58.png
  41. BIN
      unpackage/res/icons/60x60.png
  42. BIN
      unpackage/res/icons/72x72.png
  43. BIN
      unpackage/res/icons/76x76.png
  44. BIN
      unpackage/res/icons/80x80.png
  45. BIN
      unpackage/res/icons/87x87.png
  46. BIN
      unpackage/res/icons/96x96.png

+ 3 - 0
.hbuilderx/launch.json

@@ -4,6 +4,9 @@
     "version" : "0.0",
     "configurations" : [
         {
+            "app" : {
+                "launchtype" : "local"
+            },
             "app-plus" : {
                 "launchtype" : "remote"
             },

+ 103 - 87
App.vue

@@ -3,10 +3,11 @@ const toast = uni.requireNativePlugin('Ba-Toast');//android
 const callerID = uni.requireNativePlugin('Ba-CallerID');//android
 const KJPip = uni.requireNativePlugin('KJ-Pip');//ios
 //const bugly = uni.requireNativePlugin("LX-Bugly");
-import {
-	UTSKeepalive
-} from "@/uni_modules/wrs-uts-keepalive"
-let keepalive = new UTSKeepalive()
+// import {
+// 	UTSKeepalive
+// } from "@/uni_modules/wrs-uts-keepalive"
+
+// let keepalive = new UTSKeepalive()
 	import {
 		setRiderposition,
 		changeLanguages,
@@ -77,24 +78,24 @@ let keepalive = new UTSKeepalive()
 		}
 		if(this.isAndroid){
 			// 设置回调
-			UTSKeepalive.setCallback((resp)=>{
-			    console.log('--------',resp)
-			    let opt  = resp.opt 
-			    switch (opt){
-			        // 定位改变
-			        case "onLocationChanged":
-			        if(this.isAndroid) {
-			            let location = resp.location
-						this.androidRecvitude(location.longitude,location.latitude);
-			        } else {
-			            let locations = resp.locations
-			        }
-			            break;
-			        default:
-			            break;
-			    }
-			})
-			this.kaiqibaohuo();
+			// UTSKeepalive.setCallback((resp)=>{
+			//     console.log('--------',resp)
+			//     let opt  = resp.opt 
+			//     switch (opt){
+			//         // 定位改变
+			//         case "onLocationChanged":
+			//         if(this.isAndroid) {
+			//             let location = resp.location
+			// 			this.androidRecvitude(location.longitude,location.latitude);
+			//         } else {
+			//             let locations = resp.locations
+			//         }
+			//             break;
+			//         default:
+			//             break;
+			//     }
+			// })
+			// this.kaiqibaohuo();
 		}
 		
 		
@@ -429,6 +430,9 @@ let keepalive = new UTSKeepalive()
 		//android-------------------------------------------------
 		showFW(obj,isInit) { //显示
 			var that = this;
+			if(!callerID){
+				return
+			}
 			callerID.show({
 					gravity: 1, //显示位置:0中间 1上 2下
 					name:obj.name,//用户昵称 ,
@@ -455,6 +459,9 @@ let keepalive = new UTSKeepalive()
 		},
 		hideFW() { //隐藏
 			this.androidflType=0;
+			if(!callerID){
+				return
+			}
 			callerID.hide(
 				(res) => {
 					console.log(res);
@@ -466,12 +473,18 @@ let keepalive = new UTSKeepalive()
 				});
 		},
 		permissionFW() { //申请悬浮窗权限
+		if(!callerID){
+			return
+		}
 			callerID.permission(
 				(res) => {
 					console.log(res);
 				});
 		},
 		goPermissionFW() { //跳转到悬浮窗权限页面
+		if(!callerID){
+			return
+		}
 			callerID.goPermission(
 				(res) => {
 					console.log(res);
@@ -479,6 +492,9 @@ let keepalive = new UTSKeepalive()
 		},
 		isPermissionFW() { //是否申请悬浮窗权限
 			var that = this;
+			if(!callerID){
+				return
+			}
 			callerID.isPermission(
 				(res) => {
 					console.log(res);
@@ -747,59 +763,59 @@ let keepalive = new UTSKeepalive()
 			]);
 			
 		} else {
-			var authorizationStatus = UTSKeepalive.getAuthorizationStatus();
-			if (authorizationStatus == 0) {// 没有授权过定位时,请求定位权限
-				keepalive.requestLocationAuthorization()
-			}
+		// 	var authorizationStatus = UTSKeepalive.getAuthorizationStatus();
+		// 	if (authorizationStatus == 0) {// 没有授权过定位时,请求定位权限
+		// 		keepalive.requestLocationAuthorization()
+		// 	}
 		
-			// 监听app前后台状态
-			UTSKeepalive.listenerApp((resp) => {
-				let opt = resp.opt
-				switch (opt) {
-					// app进入后台
-					case "enterBackground": {
-						var authorizationStatus = UTSKeepalive.getAuthorizationStatus();
+		// 	// 监听app前后台状态
+		// 	UTSKeepalive.listenerApp((resp) => {
+		// 		let opt = resp.opt
+		// 		switch (opt) {
+		// 			// app进入后台
+		// 			case "enterBackground": {
+		// 				var authorizationStatus = UTSKeepalive.getAuthorizationStatus();
 		
-						console.log("authorizationStatus:" + authorizationStatus)
+		// 				console.log("authorizationStatus:" + authorizationStatus)
 		
-						// app进入后台,此时采用定位保活还是采用播放音乐保活可以根据自己业务决定
-						if (authorizationStatus == 3) { // 当定位权限是总是一直定位时采用定位来保活
-							console.log("定位保活")
-							keepalive.startLocation({
-								desiredAccuracy: "NearestTenMeters",
-								allowsBackgroundLocationUpdates: true, // 允许后台更新位置
-								pausesLocationUpdatesAutomatically: false // 不允许自动暂停更新位置
-							})
-						} else { // 采用播放音乐保活
-							console.log("播放音乐保活")
-							UTSKeepalive.setCategory("playback")
-							var url = plus.io.convertLocalFileSystemURL('_www/static/bgmusic.mp3');
+		// 				// app进入后台,此时采用定位保活还是采用播放音乐保活可以根据自己业务决定
+		// 				if (authorizationStatus == 3) { // 当定位权限是总是一直定位时采用定位来保活
+		// 					console.log("定位保活")
+		// 					keepalive.startLocation({
+		// 						desiredAccuracy: "NearestTenMeters",
+		// 						allowsBackgroundLocationUpdates: true, // 允许后台更新位置
+		// 						pausesLocationUpdatesAutomatically: false // 不允许自动暂停更新位置
+		// 					})
+		// 				} else { // 采用播放音乐保活
+		// 					console.log("播放音乐保活")
+		// 					UTSKeepalive.setCategory("playback")
+		// 					var url = plus.io.convertLocalFileSystemURL('_www/static/bgmusic.mp3');
 				
-							keepalive.playMusic({
-								url: url,
-								numberOfLoops: -1, // 循环此时,-1表示无限循环
-								volume: 0 // 音量,0
-							});
-						}
-						// 通知系统开始后台任务
-						UTSKeepalive.beginBackgroundTask()
-					}
-					break;
-					// app回到前台
-					case "enterForeground": {
-						// 停止播放音乐
-						keepalive.stopMusic()
-						// 停止定位
-						keepalive.stopLocation()
-						// 通知系统结束后台任务
-						UTSKeepalive.endBackgroundTask()
-					}
+		// 					keepalive.playMusic({
+		// 						url: url,
+		// 						numberOfLoops: -1, // 循环此时,-1表示无限循环
+		// 						volume: 0 // 音量,0
+		// 					});
+		// 				}
+		// 				// 通知系统开始后台任务
+		// 				UTSKeepalive.beginBackgroundTask()
+		// 			}
+		// 			break;
+		// 			// app回到前台
+		// 			case "enterForeground": {
+		// 				// 停止播放音乐
+		// 				keepalive.stopMusic()
+		// 				// 停止定位
+		// 				keepalive.stopLocation()
+		// 				// 通知系统结束后台任务
+		// 				UTSKeepalive.endBackgroundTask()
+		// 			}
 		
-					break;
-					default:
-						break;
-				}
-			})
+		// 			break;
+		// 			default:
+		// 				break;
+		// 		}
+		// 	})
 		}
 	},
 	requestPermission: function(permissions) {
@@ -812,7 +828,7 @@ let keepalive = new UTSKeepalive()
 					//console.log('已获取的权限:' + grantedPermission);
 				}
 				if(resultObj.granted.length>=5){
-					that.keepAlive();
+					// that.keepAlive();
 					return;
 				}
 				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
@@ -847,24 +863,24 @@ let keepalive = new UTSKeepalive()
 	},
 	keepAlive() {
 		console.log('keepAlive')
-		let params = this.getAndroidNotification();
-		console.log(params)
-		UTSKeepalive.startForegroundService(params)
+	// 	let params = this.getAndroidNotification();
+	// 	console.log(params)
+	// 	UTSKeepalive.startForegroundService(params)
 	
-		UTSKeepalive.startJobService(params)
-		UTSKeepalive.startLocalService(params)
-		UTSKeepalive.startRemoteService(params)
+	// 	UTSKeepalive.startJobService(params)
+	// 	UTSKeepalive.startLocalService(params)
+	// 	UTSKeepalive.startRemoteService(params)
 	
-		UTSKeepalive.startScreenLockReceiver();
-		// 后台定位功能,用不到后台定位可以不需要调用
-		let locationParams = {}
-		locationParams.notification = params
-		locationParams.location = {
-		    provider: "gps", // 支持gps、fused
-		    minTimeMs:10000, // 间隔时间,这里为了测试效果,设置为500毫秒,实际情况根据自己业务设置
-		    minDistanceM: 5.0 // 间隔距离,这里为了测试效果,设置为0.5米,实际情况根据自己业务设置
-		}
-		UTSKeepalive.startLocstionService(locationParams)
+	// 	UTSKeepalive.startScreenLockReceiver();
+	// 	// 后台定位功能,用不到后台定位可以不需要调用
+	// 	let locationParams = {}
+	// 	locationParams.notification = params
+	// 	locationParams.location = {
+	// 	    provider: "gps", // 支持gps、fused
+	// 	    minTimeMs:10000, // 间隔时间,这里为了测试效果,设置为500毫秒,实际情况根据自己业务设置
+	// 	    minDistanceM: 5.0 // 间隔距离,这里为了测试效果,设置为0.5米,实际情况根据自己业务设置
+	// 	}
+	// 	UTSKeepalive.startLocstionService(locationParams)
 	},
 	//开启定位权限------------------------------
 	kaiqidingwei(){

+ 19 - 1
components/orderItem/orderItem.vue

@@ -77,7 +77,12 @@
 					<text class="jiedanText">IM Call</text>
 				</view>
 			</view>
+			
 		</view>
+		<uni-popup style="z-index: 9999;" ref="popNav" type="center" :isMaskClick="true" :safeArea="true">
+			<disanfanfNav :lat="lat" :lon="lon" :cityName="addrName" v-on:ENavOpen="NavOpen"></disanfanfNav>
+		</uni-popup>
+		
 	</view>
 </template>
 
@@ -94,7 +99,10 @@
 		},
 		data() {
 			return {
-				isAndroid:true
+				isAndroid:true,
+				lat:0,
+				lon:0,
+				addrName:''
 			};
 		},
 		mounted() {
@@ -266,6 +274,12 @@
 				})
 			},
 			gotoNav(store){
+				this.lat = store.latitude;
+				this.lon = store.longitude;
+				this.addrName = store.address;
+				this.$refs.popNav.open('center');
+				
+				return;
 				var navData={
 					latitude:store.latitude,
 					longitude:store.longitude,
@@ -288,6 +302,10 @@
 				
 			},
 			
+			NavOpen(){
+				this.$refs.popNav.close();
+			},
+			
 			handlePosition(lat,lon,cityName) {
 				//如果是Andrios的设备
 				if (plus.os.name == 'Android') {

+ 19 - 1
components/orderItemA/orderItemA.vue

@@ -93,6 +93,9 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup style="z-index: 9999;" ref="popNav" type="center" :isMaskClick="true" :safeArea="true">
+			<disanfanfNav :lat="lat" :lon="lon" :cityName="addrName" v-on:ENavOpen="NavOpen"></disanfanfNav>
+		</uni-popup>
 	</view>
 </template>
 
@@ -111,7 +114,10 @@
 			return {
 				isAndroid:true,
 				annexList:[],
-				actId:''
+				actId:'',
+				lat:0,
+				lon:0,
+				addrName:''
 			};
 		},
 		mounted() {
@@ -312,6 +318,14 @@
 			},
 			
 			gotoNav(store){
+				
+				this.lat = store.latitude;
+				this.lon = store.longitude;
+				this.addrName = store.posName;
+				this.$refs.popNav.open('center');
+				
+				return;
+				
 				var navData={
 					latitude:store.latitude,
 					longitude:store.longitude,
@@ -323,6 +337,10 @@
 				})
 				
 			},
+			
+			NavOpen(){
+				this.$refs.popNav.close();
+			},
 		},
 	}
 </script>

+ 18 - 1
components/orderItemB/orderItemB.vue

@@ -104,6 +104,9 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup style="z-index: 9999;" ref="popNav" type="center" :isMaskClick="true" :safeArea="true">
+			<disanfanfNav :lat="lat" :lon="lon" :cityName="addrName" v-on:ENavOpen="NavOpen"></disanfanfNav>
+		</uni-popup>
 	</view>
 </template>
 
@@ -124,7 +127,10 @@
 			return {
 				isAndroid:true,
 				annexList:[],
-				actobj:''
+				actobj:'',
+				lat:0,
+				lon:0,
+				addrName:''
 			};
 		},
 		mounted() {
@@ -373,6 +379,12 @@
 				})
 			},
 			gotoNav(store){
+				this.lat = store.latitude;
+				this.lon = store.longitude;
+				this.addrName = store.address;
+				this.$refs.popNav.open('center');
+				
+				return;
 				var navData={
 					latitude:store.latitude,
 					longitude:store.longitude,
@@ -387,6 +399,11 @@
 			},
 			
 			
+			NavOpen(){
+				this.$refs.popNav.close();
+			},
+			
+			
 			handlePosition(lat,lon,cityName) {
 				//如果是Andrios的设备
 				if (plus.os.name == 'Android') {

+ 16 - 2
components/orderItemC/orderItemC.vue

@@ -91,7 +91,9 @@
 				</view>
 			</view>
 		</view>
-		
+		<uni-popup style="z-index: 9999;" ref="popNav" type="center" :isMaskClick="true" :safeArea="true">
+			<disanfanfNav :lat="lat" :lon="lon" :cityName="addrName" v-on:ENavOpen="NavOpen"></disanfanfNav>
+		</uni-popup>
 	</view>
 </template>
 
@@ -108,7 +110,10 @@
 		},
 		data() {
 			return {
-				isAndroid:true
+				isAndroid:true,
+				lat:0,
+				lon:0,
+				addrName:''
 			};
 		},
 		mounted() {
@@ -300,6 +305,12 @@
 				})
 			},
 			gotoNav(store){
+				this.lat = store.latitude;
+				this.lon = store.longitude;
+				this.addrName = store.address;
+				this.$refs.popNav.open('center');
+				
+				return;
 				var navData={
 					latitude:store.latitude,
 					longitude:store.longitude,
@@ -312,6 +323,9 @@
 				})
 				//this.handlePosition(store.latitude,store.longitude,store.address);
 			},
+			NavOpen(){
+				this.$refs.popNav.close();
+			},
 		},
 	}
 </script>

+ 4 - 4
locale/yuenan.json

@@ -216,8 +216,6 @@
 "tixian.zijinanquan": "An ninh tài chính",
 "user.anquanzhongxin": "Trung tâm an toàn ",
 "user.anzhuangsbcs": "Cài đặt không thành công vui lòng thử lại sau",
-"user.appleNav": "Bản đồ Apple",
-"user.baiduNav": "Bản đồ Baidu",
 "user.bangdingsj": "Số điện thoại liên kết",
 "user.caozuojid": "Hoạt động dễ dàng",
 "user.chengyaojm": "Chân Thành Mời Bạn Tham Gia!",
@@ -233,10 +231,8 @@
 "user.dengluzhuce": "Đăng nhập/Đăng ký",
 "user.duolaodd": "Làm nhiều có nhiều thu nhập phong phú",
 "user.fadan": "Đơn phạt ",
-"user.gaodeNav": "Bản đồ Cao Đức",
 "user.gerenxinxi": "Thông tin cá nhân",
 "user.gerenzhongxin": "Trung tâm cá nhân",
-"user.googleNav": "Bản đồ Google",
 "user.hailiangdd": "Nhiều đơn đặt hàng",
 "user.huoquyanzhegm": "Lấy mã xác thực",
 "user.huoquzxbb": "Phiên bản mới nhất",
@@ -280,6 +276,10 @@
 "user.shezhishibai": "Thiết lập không thành công",
 "user.shifbaiduNav": "Mở 'Baidu Map' để điều hướng không?",
 "user.shifgaodeNav": "Mở 'Gauder bản đồ' để điều hướng?",
+"user.gaodeNav":"Định vị dẫn đường Amap",
+"user.baiduNav":"Định vị Baidu Maps",
+"user.googleNav":"Google Maps dẫn đường",
+"user.appleNav":"Chỉ đường trên bản đồ của Apple",
 "user.shifougengxin": "Bạn có muốn cập nhật lên phiên bản mới nhất không?",
 "user.shimingwsmrz": " Định danh cá nhân",
 "user.shirkek": "Thu nhập xứng đáng",

+ 4 - 4
locale/zh-Hans.json

@@ -216,8 +216,6 @@
 "tixian.zijinanquan":"资金安全",
 "user.anquanzhongxin":"安全中心",
 "user.anzhuangsbcs":"安装失败请稍候重试",
-"user.appleNav":"苹果地图",
-"user.baiduNav":"百度地图",
 "user.bangdingsj":"绑定手机",
 "user.caozuojid":"操作简单",
 "user.chengyaojm":"诚邀您加盟!",
@@ -233,10 +231,8 @@
 "user.dengluzhuce":"登录/注册",
 "user.duolaodd":"收入丰厚多劳多得",
 "user.fadan":"罚单",
-"user.gaodeNav":"高德地图",
 "user.gerenxinxi":"个人信息",
 "user.gerenzhongxin":"个人中心",
-"user.googleNav":"谷歌地图",
 "user.hailiangdd":"海量订单",
 "user.huoquyanzhegm":"获取验证码",
 "user.huoquzxbb":"最新版本",
@@ -280,6 +276,10 @@
 "user.shezhishibai":"设置失败",
 "user.shifbaiduNav":"是否打开“百度地图”进行导航?",
 "user.shifgaodeNav":"是否打开“高德地图”进行导航?",
+"user.gaodeNav":"高德地图导航",
+"user.baiduNav":"百度地图导航",
+"user.googleNav":"Google地图导航",
+"user.appleNav":"苹果地图导航",
 "user.shifougengxin":"是否更新到最新版本?",
 "user.shimingwsmrz":"实名认证",
 "user.shirkek":"收入可靠",

+ 4 - 4
locale/zh-Hant.json

@@ -216,8 +216,6 @@
 "tixian.zijinanquan":"資金安全",
 "user.anquanzhongxin":"安全中心",
 "user.anzhuangsbcs":"安裝失敗請稍候重試",
-"user.appleNav":"蘋果地圖",
-"user.baiduNav":"百度地圖",
 "user.bangdingsj":"綁定手機",
 "user.caozuojid":"操作簡單",
 "user.chengyaojm":"誠邀您加盟!",
@@ -233,10 +231,8 @@
 "user.dengluzhuce":"登錄/註冊",
 "user.duolaodd":"收入豐厚多勞多得",
 "user.fadan":"罰單",
-"user.gaodeNav":"高德地圖",
 "user.gerenxinxi":"個人信息",
 "user.gerenzhongxin":"個人中心",
-"user.googleNav":"谷歌地圖",
 "user.hailiangdd":"海量訂單",
 "user.huoquyanzhegm":"獲取驗證碼",
 "user.huoquzxbb":"最新版本",
@@ -280,6 +276,10 @@
 "user.shezhishibai":"設置失敗",
 "user.shifbaiduNav":"是否打開「百度地圖」進行導航?",
 "user.shifgaodeNav":"是否打開「高德地圖」進行導航?",
+"user.gaodeNav":"高德地圖導航",
+"user.baiduNav":"百度地圖導航",
+"user.googleNav":"Google地圖導航",
+"user.appleNav":"蘋果地圖導航",
 "user.shifougengxin":"是否更新到最新版本?",
 "user.shimingwsmrz":"實名認證",
 "user.shirkek":"收入可靠",

+ 3 - 52
manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "CTE.partner",
+    "name" : "美食达骑手",
     "appid" : "__UNI__18051F0",
-    "description" : "CTE. partner",
+    "description" : "美食达骑手",
     "versionName" : "1.1.05",
     "versionCode" : 1105,
     "transformPx" : false,
@@ -10,7 +10,7 @@
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
-		"screenOrientation" : [ "portrait-primary" ],
+        "screenOrientation" : [ "portrait-primary" ],
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
@@ -145,55 +145,6 @@
                     "pid" : "7774",
                     "parameters" : {}
                 }
-            },
-            "Ba-CallerID" : {
-                "__plugin_info__" : {
-                    "name" : "来电显示悬浮窗插件(支持锁屏) Ba-CallerID",
-                    "description" : "Ba-CallerID 是一款定制的来电显示悬浮窗插件插件,有其他定制需要可联系作者。",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=11933",
-                    "android_package_name" : "com.cityexpress1688.ptqs",
-                    "ios_bundle_id" : "com.paotuiwang.qishou",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "11933",
-                    "parameters" : {}
-                }
-            },
-            "KJ-Pip" : {
-                "__plugin_info__" : {
-                    "name" : "应用外、全局、后台悬浮窗、画中画、在其他应用上层显示(ios)",
-                    "description" : "应用外、全局、后台悬浮窗、画中画、在其他应用上层显示(ios) 、请试用合适再购买、请试用合适再购买、请试用合适再购买",
-                    "platforms" : "iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=12064",
-                    "android_package_name" : "com.cityexpress1688.ptqs",
-                    "ios_bundle_id" : "com.paotuiwang.qishou",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "12064",
-                    "parameters" : {}
-                }
-            },
-            "MapBox-Plugin" : {
-                "MapBox AccessToken" : "sk.eyJ1IjoiY2l0eWV4cHJlc3MxNjg4IiwiYSI6ImNseDA5bmt2MzBkdW4ya3F1b2ZpYmpudm8ifQ.LnJW7X5-9hnTvhSSdI45LA",
-                "__plugin_info__" : {
-                    "name" : "MapBox地图导航插件(Android和iOS)",
-                    "description" : "MapBox地图导航双端插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=10465",
-                    "android_package_name" : "com.cityexpress1688.ptqs",
-                    "ios_bundle_id" : "com.paotuiwang.qishou",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "10465",
-                    "parameters" : {
-                        "MapBox AccessToken" : {
-                            "des" : "MBXAccessToken",
-                            "key" : "MBXAccessToken",
-                            "value" : ""
-                        }
-                    }
-                }
             }
         }
     },

+ 2 - 0
pages/index/index.vue

@@ -105,6 +105,8 @@
 			<uni-popup-dialog type="NOMLE" :cancelText="$t('index.quxiao')" :confirmText="$t('index.queren')" :title="noteMsg.title" :content="noteMsg.msg" @confirm="dialogConfirm"
 				@close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
+		
+		
 	</view>
 </template>
 

+ 44 - 8
pages/user/Usermanager.vue

@@ -63,7 +63,7 @@
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
 				</view>
 			</view> -->
-			<view class="contentInRowS Itemcontent" @click="zhuxiaozh">
+			<!-- <view class="contentInRowS Itemcontent" @click="zhuxiaozh">
 				<text class="titleText">{{$t('user.zhuxiaozh')}}</text>
 				<view class="contentInRowR">
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
@@ -74,7 +74,7 @@
 				<view class="contentInRowR">
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
 				</view>
-			</view>
+			</view> -->
 			<view class="contentInRowS Itemcontent" @click="yueduyszc">
 				<text class="titleText">{{$t('index.yinsizc')}}</text>
 				<view class="contentInRowR">
@@ -88,24 +88,24 @@
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
 				</view>
 			</view> -->
-			<view class="contentInRowS Itemcontent" @click="openwebV(2)">
+			<!-- <view class="contentInRowS Itemcontent" @click="openwebV(2)">
 				<text class="titleText">{{$t('user.fuwutiaok')}}</text>
 				<view class="contentInRowR">
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
 				</view>
-			</view>
-			<view class="contentInRowS Itemcontent" @click="openwebV(3)">
+			</view> -->
+			<!-- <view class="contentInRowS Itemcontent" @click="openwebV(3)">
 				<text class="titleText">{{$t('user.caozuogz')}}</text>
 				<view class="contentInRowR">
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
 				</view>
-			</view>
-			<view class="contentInRowS Itemcontent" @click="openwebV(4)">
+			</view> -->
+			<!-- <view class="contentInRowS Itemcontent" @click="openwebV(4)">
 				<text class="titleText">{{$t('user.zengyihts')}}</text>
 				<view class="contentInRowR">
 					<image class="jiantouImg" src="/static/imags/youjian@3x.png" mode="scaleToFill"></image>
 				</view>
-			</view>
+			</view> -->
 			<view class="contentInRowS Itemcontent" @click="openwebV(5)">
 				<text class="titleText">{{$t('user.guanyuwm')}}</text>
 				<view class="contentInRowR">
@@ -114,6 +114,15 @@
 			</view>
 			
 		</view>
+		
+		<view class="contentInRowC" style="margin-top: 80rpx;width: 80%;margin-left: 10%;">
+			<text class="zhuceBt" @click="tuichudengl">{{$t('user.tuichudengl')}}</text>
+		</view>
+		
+		<view class="contentInRowC" style="margin-top: 40rpx;">
+			<text class="sanchuzh" @click="zhuxiaozh">{{$t('user.zhuxiaozh')}}</text>
+		</view>
+		
 		<view style="height: 140rpx;"></view>
 		<view class="versionV">
 			<view class="versionitem">
@@ -553,4 +562,31 @@
 		color: blue;
 		text-decoration:underline;
 	}
+	
+	.zhuceBt{
+		margin-top: 30rpx;
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: solid #40AE36;
+		border-width: 0px 0px 6rpx 0px;
+		text-align: center;
+		justify-content: center;
+		background-color: #40AE36;
+		color: white;
+		box-shadow: 0rpx 0rpx 10rpx 0rpx #40AE36;
+	}
+	
+	.sanchuzh{
+		width:80%;
+		text-align: center;
+		font-size: 36rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: white;
+		background-color:crimson;
+		border-radius: 10rpx;
+	}
 </style>

BIN
static/logo.png


BIN
unpackage/debug/android_debug.apk


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/pages/imcall/audioCall.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/pages/map/MapboxNav.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/pages/map/mapboxView.js


BIN
unpackage/dist/build/app-plus/static/logo.png


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/view.css


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/view.umd.min.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 586 - 565
unpackage/dist/dev/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


BIN
unpackage/dist/dev/app-plus/static/logo.png


BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png


Some files were not shown because too many files changed in this diff