lilei 2 anos atrás
pai
commit
dcfe845475
8 arquivos alterados com 530 adições e 13 exclusões
  1. 80 0
      App.vue
  2. 8 0
      api/user.js
  3. 300 0
      libs/jgPush.js
  4. 126 0
      manifest.json
  5. 12 1
      pages/login/login.vue
  6. 4 4
      pages/userCenter/index.vue
  7. 0 2
      store/index.js
  8. 0 6
      证书/ios/AuthKey_GWHMFQ99LL.p8

+ 80 - 0
App.vue

@@ -1,4 +1,5 @@
 <script>
+	import skJGPush from '@/libs/jgPush.js'
 	export default {
 		globalData: {  
 			baseUrl: '',
@@ -24,6 +25,57 @@
 		},
 		onLaunch: function() {
 			console.log('App launch')
+			if(uni.getSystemInfoSync().platform == "ios"){
+				// 请求定位权限
+				let locationServicesEnabled = skJGPush.locationServicesEnabled()
+				let locationAuthorizationStatus = skJGPush.getLocationAuthorizationStatus()
+				console.log('locationAuthorizationStatus',locationAuthorizationStatus)	
+				if (locationServicesEnabled == true && locationAuthorizationStatus < 3) {
+					skJGPush.requestLocationAuthorization((result)=>{
+						console.log('定位权限',result.status)
+					})
+				}
+				skJGPush.requestNotificationAuthorization((result)=>{
+					let status = result.status
+					if (status < 2) {
+						uni.showToast({
+							icon: 'none',
+							title: '您还没有打开通知权限',
+							duration: 3000
+						})
+						skJGPush.openSettingsForNotification()
+					}
+				})
+			}
+			
+			// 极光推送-init
+			skJGPush.initJPushService()
+			 
+			// 极光推送-打开debug
+			skJGPush.openDebug()
+			 
+			// 极光推送-获取rid
+			skJGPush.getRegistrationID(result => {
+				console.log('【业务getRegistrationID】', result)
+			})
+			
+			// 极光推送-通知事件回调
+			skJGPush.addNotificationListener(result => {
+				console.log('【业务addNotificationListener】', result)
+				// 收到消息,创建本地通知
+				if(result.notificationEventType == 'notificationOpened'){
+					this.setRead(result)
+				} 
+			})
+			
+			// 极光推送-标签别名事件回调
+			skJGPush.addTagAliasListener(result => {
+				console.log('【业务addTagAliasListener】', result)
+			})	
+			
+			skJGPush.isNotificationEnabled(result => {
+				console.log('是否开启通知', result)
+			})
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -31,6 +83,34 @@
 		onHide: function() {
 			console.log('App Hide')
 		},
+		methods:{
+			toAction (data) {
+			  // 急送订单
+			  if (data.extras.bizType == 'TEMP_ORDER') {
+				uni.navigateTo({ url: '/pages/sales/edit?pageType=detail&data='+JSON.stringify({ salesBillSn: data.extras.bizSn }) })
+			  }
+			  // 补货订单
+			  if (data.extras.bizType == 'SHELF_REPLENISH') {
+				uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_CONFIRM' })
+			  }
+			  // 货架订单
+			  if (data.extras.bizType == 'SHELF_ORDER') {
+				uni.navigateTo({ url: '/pages/shelfOrder/orderDetail?pageType=detail&orderBillSn='+data.extras.bizSn })
+			  }
+			  // 货架异常
+			  if (data.extras.bizType == 'SHELF_WARN') {
+				const shelfName = data.content.split('已经超过')[0]
+				uni.navigateTo({ url: '/pages/shelfOrder/shelfOrder?bizType=SHELF_WARN&shelfSn='+data.extras.bizSn+'&shelfName='+shelfName })
+			  }
+			},
+			setRead(item){
+				const api = require("@/api/user.js")
+				api.setReadNotice({'noticeId': item.extras.noticeId}).then(res => {
+					console.log(res,'setRead')                                                                                     
+					this.toAction(item)
+				})
+			},
+		}
 	}
 </script>
 

+ 8 - 0
api/user.js

@@ -121,6 +121,14 @@ export const hasRead = params => {
     method: 'get'
   })
 }
+// 设置已读消息
+export const setReadNotice = params => {
+  return axios.request({
+    url: `noticeUser/setReadNotice`,
+	data: params,
+    method: 'post'
+  })
+}
 // 查询所有消息
 export const getMessage = params => {
   let url = `noticeUser/queryLike/${params.pageNo}/${params.pageSize}`

+ 300 - 0
libs/jgPush.js

@@ -0,0 +1,300 @@
+// 引用方式
+var jpushModule = uni.requireNativePlugin("JG-JPush");
+console.log('【sk】【引用方式】【jpushModule】【requireNativePlugin】')
+ 
+// 开启 debug 模式,默认是关闭
+function openDebug() {
+    jpushModule.setLoggerEnable(true);
+}
+ 
+// 关闭 debug 模式,默认是关闭
+function closeDebug() {
+    jpushModule.setLoggerEnable(false);
+}
+
+function isNotificationEnabled(skBack){
+	jpushModule.isNotificationEnabled(result=>{//number
+		console.log('检查当前应用的通知开关是否开启 =>',result)
+		skBack(result.code)
+	});
+}
+
+function requestLocationAuthorization(skBack){
+	jpushModule.requestLocationAuthorization(result=>{//number
+		console.log('定位权限',result)
+		skBack(result)
+	});
+}
+
+function requestNotificationAuthorization(skBack){
+	jpushModule.requestNotificationAuthorization(result=>{//number
+		console.log('是否打开通知权限',result)
+		skBack(result)
+	});
+}
+ 
+// 获取 RegistrationID,只有当应用程序成功注册到 JPush 的服务器时才返回对应的值,否则返回空字符串
+function getRegistrationID(skBack) {
+    jpushModule.getRegistrationID(result=>{
+        // code number  状态码 0 - 成功, 1011 - iOS模拟器调用会报此错误
+        // registerID   string  返回的 registrationID
+        console.log('【sk】获取 RegistrationID=>',result)
+        skBack(result.registerID)
+    })
+}
+ 
+// 跳转至系统设置页面,0 - 成功 1 - 失败
+function openSettingsForNotification() {
+    jpushModule.openSettingsForNotification((result)=>{
+        // code number  0 - 成功 1 - 失败
+        console.log('【sk】跳转至系统设置页面result=>',result.code)
+    })
+}
+ 
+// 初始化SDK iOS 说明:如果在mainfest.json里 将JPUSH_DEFAULTINITJPUSH_IOS值配置为"true",插件内部将默认初始化JPush,用户则不需要调用该初始化方法。
+function initJPushService() {
+    console.log(jpushModule)
+    jpushModule.initJPushService()
+}
+ 
+// 连接状态回调,true - 已连接, false - 未连接
+function addConnectEventListener(skBack) {
+    jpushModule.addConnectEventListener(result=>{
+        // connectEnable    boolean true - 已连接, false - 未连接
+        console.log('【sk】连接状态回调=>',result.connectEnable)
+        skBack(result.connectEnable);
+    })
+}
+ 
+// 通知事件回调
+function addNotificationListener(skBack) {
+    jpushModule.addNotificationListener(result=>{
+        // messageID    string  唯一标识通知消息的 ID
+        // title    string  对应 Portal 推送通知界面上的“通知标题”字段
+        // content  string  对应 Portal 推送通知界面上的“通知内容”字段
+        // badge    string  对应 Portal 推送通知界面上的可选设置里面的“badge”字段 (ios only)
+        // ring string  推送通知界面上的可选设置里面的“sound”字段 (ios only)
+        // extras   dictionary  对应 Portal 推送消息界面上的“可选设置”里的附加字段
+        // iOS  dictionary  对应原生返回的通知内容,如需要更多字段请查看该字段内容
+        // android  dictionary  对应原生返回的通知内容,如需要更多字段请查看该字段内容
+        // notificationEventType    string  分为notificationArrived和notificationOpened两种
+        console.log('【sk】通知事件回调result=>',result)
+        skBack(result);
+    })
+}
+ 
+// 自定义消息事件回调
+function addCustomMessageListener(skBack) {
+    jpushModule.addCustomMessageListener(result=>{
+        // messageID    string  唯一标识通知消息的 ID
+        // content  string  对应 Portal 推送通知界面上的“通知内容”字段
+        // extras   dictionary  对应 Portal 推送消息界面上的“可选设置”里的附加字段
+        console.log('【sk】自定义消息事件回调result=>',result)
+        skBack(result);
+    })
+}
+ 
+// 应用内消息回调
+function addInMessageListener(skBack) {
+    jpushModule.addInMessageListener(result=>{
+        // eventType    string  show - 应用内消息展示 disappear - 应用内消息已消失 click - 应用内消息点击
+        // messageType  string  消息类型, eventType 不为 disappear时返回, inMessageNoti - 通知类型的inMessage
+        // content  dictionary  应用内消息内容, eventType 不为 disappear 时返回
+        console.log('【sk】应用内消息回调result=>',result)
+        skBack(result);
+    })
+}
+ 
+// 本地通知事件回调
+function addLocalNotificationListener(skBack) {
+    jpushModule.addLocalNotificationListener(result=>{
+        // messageID    string  唯一标识通知消息的ID
+        // title    string  对应“通知标题”字段
+        // content  string  对应“通知内容”字段
+        // extras   dictionary  对应“附加内容”字段
+        console.log('【sk】本地通知事件回调result=>',result)
+        skBack(result);
+    })
+}
+ 
+// 添加一个本地通知
+function addLocalNotification(e) {
+	console.log('添加一个本地通知',e)
+    jpushModule.addLocalNotification({
+        messageID: e.messageID ? e.messageID : '', // 唯一标识通知消息的ID
+        title: e.title ? e.title : '', // 对应“通知标题”字段
+        content: e.content ? e.content : '', // 对应“通知内容”字段
+        extras: e.extras ? e.extras : {name: '', age: ''} // 对应“附加内容”字段
+    })
+}
+ 
+// 移除指定的本地通知
+function removeLocalNotification(e) {
+    jpushModule.removeLocalNotification({
+        messageID: e.messageID ? e.messageID : '' // 唯一标识通知消息的ID
+    })
+}
+ 
+// 移除所有的本地通知
+function clearLocalNotifications() {
+    jpushModule.clearLocalNotifications()
+}
+ 
+// 标签别名事件回调
+function addTagAliasListener(skBack) {
+    jpushModule.addTagAliasListener(result=>{
+        // code number  请求状态码 0 - 成功
+        // sequence number  请求时传入的序列号,会在回调时原样返回
+        // tags StringArray 执行tag数组操作时返回
+        // tag  string  执行查询指定tag(queryTag)操作时会返回
+        // tagEnable    boolean 执行查询指定tag(queryTag)操作时会返回是否可用
+        // alias    string  对alias进行操作时返回
+        console.log('【sk】标签别名事件回调result=>',result)
+        skBack(result);
+    })
+}
+ 
+// 新增标签
+function addTags(e) {
+    jpushModule.addTags({
+        'tags': e.tags ? e.tags : [], // StringArray  string类型的数组
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 覆盖标签
+function updateTags(e) {
+    jpushModule.updateTags({
+        'tags': e.tags ? e.tags : [], // StringArray  string类型的数组
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 删除指定标签
+function deleteTags(e) {
+    jpushModule.deleteTags({
+        'tags': e.tags ? e.tags : [], // StringArray  string类型的数组
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 清除所有标签
+function cleanTags(e) {
+    jpushModule.cleanTags({
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 查询指定 tag 与当前用户绑定的状态
+function queryTag(e) {
+    jpushModule.queryTag({
+        'tag': e.tag ? e.tag : '', // string  需要查询的标签
+        'sequence': e.sequence ? sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 查询所有标签
+function getAllTags(e) {
+    jpushModule.getAllTags({
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 设置别名
+function setAlias(e) {
+    console.log('设置别名',e)
+    jpushModule.setAlias({
+        'alias': e.alias ? e.alias : '', // string  有效的别名组成:字母(区分大小写)、数字、下划线、汉字、特殊字符@!#$&*+=.|
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 删除别名
+function deleteAlias(e) {
+    jpushModule.deleteAlias({
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 查询别名
+function queryAlias(e) {
+    jpushModule.queryAlias({
+        'sequence': e.sequence ? e.sequence : 1 // number  请求时传入的序列号,会在回调时原样返回
+    })
+}
+ 
+// 开启 CrashLog 上报
+function initCrashHandler() {
+    jpushModule.initCrashHandler()
+}
+ 
+// 设置地理围栏的最大个数
+function setMaxGeofenceNumber(e) {
+    jpushModule.setMaxGeofenceNumber(e.geofenceNumber ? e.geofenceNumber : 10) // 默认值为 10 ,iOS系统默认地理围栏最大个数为20
+}
+ 
+// 删除指定id的地理围栏
+function deleteGeofence(e) {
+    jpushModule.deleteGeofence(e.geofence ? e.geofence : '') // 删除指定id的地理围栏
+}
+ 
+// 设置 Badge
+function setBadge(e) {
+    jpushModule.setBadge(e.badge ? e.badge : 0) // number
+}
+ 
+// 设置手机号码
+function setMobileNumber(e) {
+    jpushModule.setMobileNumber({
+        sequence: e.sequence ? e.sequence : 1, // number  请求时传入的序列号,会在回调时原样返回
+        mobileNumber: e.mobileNumber ? e.mobileNumber : '' // string  手机号码 会与用户信息一一对应。可为空,为空则清除号码。
+    })
+}
+ 
+// 设置手机号码回调
+function addMobileNumberListener(skBack) {
+    jpushModule.addMobileNumberListener(result=>{
+        // code number  状态码 0 - 成功
+        // sequence number  请求时传入的序列号,会在回调时原样返回
+        console.log('【sk】设置手机号码回调result=>',result)
+        skBack(result);
+    })
+}
+ 
+ 
+module.exports = {
+    openDebug: openDebug,
+    closeDebug: closeDebug,
+    getRegistrationID: getRegistrationID,
+    openSettingsForNotification: openSettingsForNotification,
+    initJPushService: initJPushService,
+	isNotificationEnabled: isNotificationEnabled,
+    addConnectEventListener: addConnectEventListener,
+    addNotificationListener: addNotificationListener,
+    addCustomMessageListener: addCustomMessageListener,
+    addInMessageListener: addInMessageListener,
+    addLocalNotificationListener: addLocalNotificationListener,
+    addLocalNotification: addLocalNotification,
+    removeLocalNotification: removeLocalNotification,
+    clearLocalNotifications: clearLocalNotifications,
+    addTagAliasListener: addTagAliasListener,
+    addTags: addTags,
+    updateTags: updateTags,
+    deleteTags: deleteTags,
+    cleanTags: cleanTags,
+    queryTag: queryTag,
+    getAllTags: getAllTags,
+    setAlias: setAlias,
+    deleteAlias: deleteAlias,
+    queryAlias: queryAlias,
+    initCrashHandler: initCrashHandler,
+    setMaxGeofenceNumber: setMaxGeofenceNumber,
+    deleteGeofence: deleteGeofence,
+    setBadge: setBadge,
+    setMobileNumber: setMobileNumber,
+    addMobileNumberListener: addMobileNumberListener,
+	locationServicesEnabled: ()=> jpushModule.locationServicesEnabled(),
+	getLocationAuthorizationStatus: ()=> jpushModule.getLocationAuthorizationStatus(),
+	requestLocationAuthorization: requestLocationAuthorization,
+	requestNotificationAuthorization: requestNotificationAuthorization
+}

+ 126 - 0
manifest.json

@@ -167,6 +167,132 @@
                     "pid" : "2683",
                     "parameters" : {}
                 }
+            },
+            "JG-JCore" : {
+                "JPUSH_APPKEY_IOS" : "a8ad1620a88ff2493a2f8fda",
+                "JPUSH_CHANNEL_IOS" : "developer-default",
+                "JPUSH_APPKEY_ANDROID" : "a8ad1620a88ff2493a2f8fda",
+                "JPUSH_CHANNEL_ANDROID" : "developer-default",
+                "__plugin_info__" : {
+                    "name" : "JG-JCore",
+                    "description" : "极光推送JCore插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道,不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道,不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "JG-JPush" : {
+                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_ADVERTISINGID_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
+                "JPUSH_OPPO_APPKEY" : "",
+                "JPUSH_OPPO_APPID" : "",
+                "JPUSH_OPPO_APPSECRET" : "",
+                "JPUSH_VIVO_APPKEY" : "",
+                "JPUSH_VIVO_APPID" : "",
+                "JPUSH_MEIZU_APPKEY" : "",
+                "JPUSH_MEIZU_APPID" : "",
+                "JPUSH_XIAOMI_APPKEY" : "",
+                "JPUSH_XIAOMI_APPID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JPush",
+                    "description" : "极光推送Hbuilder插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_ISPRODUCTION_IOS" : {
+                            "des" : "[iOS]是否是生产环境,是填true,不是填false或者不填",
+                            "key" : "JPush:ISPRODUCTION",
+                            "value" : ""
+                        },
+                        "JPUSH_ADVERTISINGID_IOS" : {
+                            "des" : "[iOS]广告标识符(IDFA)如果不需要使用IDFA,可不填",
+                            "key" : "JPush:ADVERTISINGID",
+                            "value" : ""
+                        },
+                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
+                            "des" : "[iOS]是否默认初始化,是填true,不是填false或者不填",
+                            "key" : "JPush:DEFAULTINITJPUSH",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPKEY" : {
+                            "des" : "厂商OPPO-appkey,示例:OP-12345678",
+                            "key" : "OPPO_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPID" : {
+                            "des" : "厂商OPPO-appId,示例:OP-12345678",
+                            "key" : "OPPO_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPSECRET" : {
+                            "des" : "厂商OPPO-appSecret,示例:OP-12345678",
+                            "key" : "OPPO_APPSECRET",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-appkey,示例:12345678",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-appId,示例:12345678",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPKEY" : {
+                            "des" : "厂商MEIZU-appKey,示例:MZ-12345678",
+                            "key" : "MEIZU_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPID" : {
+                            "des" : "厂商MEIZU-appId,示例:MZ-12345678",
+                            "key" : "MEIZU_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPKEY" : {
+                            "des" : "厂商XIAOMI-appKey,示例:MI-12345678",
+                            "key" : "XIAOMI_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPID" : {
+                            "des" : "厂商XIAOMI-appId,示例:MI-12345678",
+                            "key" : "XIAOMI_APPID",
+                            "value" : ""
+                        }
+                    }
+                }
             }
         }
     },

+ 12 - 1
pages/login/login.vue

@@ -47,6 +47,7 @@ import { checkVersionToLoadUpdate, setStorageForAppVersion,clzConfirm } from '@/
 import { isvalidNumLetter } from '@/libs/validate.js';
 import { login } from '@/api/user.js';
 import { getSysVersion } from '@/api/data.js'
+import skJGPush from '@/libs/jgPush.js'
 export default {
 	data() {
 		return {
@@ -66,6 +67,13 @@ export default {
 			return this.form.username == '' || this.form.password == ''
 		}
 	},
+	onLoad() {
+		const token = this.$store.state.vuex_token
+		console.log(token)
+		if(token){
+			this.toMain();
+		}
+	},
 	onShow() {
 		this.isRemember = this.$store.state.vuex_isRemember;
 		this.envTips = getApp().globalData.envTips;
@@ -146,11 +154,14 @@ export default {
 			login(_this.form).then(res => {
 				uni.hideLoading();
 				if (res.status == 200) {
-					console.log(_this.fiterAuthCode(res.data.auth_user))
+					// console.log(_this.fiterAuthCode(res.data.auth_user))
 					_this.$u.vuex('vuex_userData', _this.fiterAuthCode(res.data.auth_user));
 					_this.$u.vuex('vuex_token', res.data.access_token);
 					_this.$u.vuex('vuex_authOrgs',res.data.auth_orgs);
 					getApp().globalData.token = res.data.access_token;
+					console.log(res.data.auth_user)
+					// 设置别名
+					skJGPush.setAlias({'alias':'user_'+ getApp().globalData.buildType +'_' + res.data.auth_user.userid ,'sequence': new Date().getTime()})
 					//登录成功将用户名密码存储到用户本地
 					if (_this.isRemember) {
 						//用户勾选“记住密码”

+ 4 - 4
pages/userCenter/index.vue

@@ -167,12 +167,12 @@
 					console.log(res);
 					if (res.status == 200) {
 						// this.$store.commit("$closeWebsocket")
-						this.$store.state.vuex_token = '';
-						this.$store.state.vuex_userData = '';
-						this.$u.vuex('vuex_authOrgs','');
-						getApp().globalData.token = '';
 						this.$set(getApp().globalData,'changeOrg','')
 						uni.setStorageSync('setStatusIndexFunc', 0);
+						this.$u.vuex('vuex_userData', '');
+						this.$u.vuex('vuex_token', '');
+						this.$u.vuex('vuex_authOrgs','');
+						getApp().globalData.token = '';
 						setTimeout(function() {
 							uni.reLaunch({
 								url: '/pages/login/login'

+ 0 - 2
store/index.js

@@ -63,8 +63,6 @@ const SocketInit = function($store,state,wsUrl){
 		  let ret = JSON.parse(e.data)
 		  console.log('ws接收!', ret)
 		  state.vuex_wsMessageData = ret
-		  // 入厂车辆拍照识别
-		  if (ret.type == 'enter_store_vehicle'){}
 		  // 新未读消息
 		  if (ret.type == 'no_read_count'){
 			state.vuex_messagUnReadCount = ret.data.no_read_count

+ 0 - 6
证书/ios/AuthKey_GWHMFQ99LL.p8

@@ -1,6 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgJ2s+3nwJU4GcK+OY
-jjN5ciHq9YcSCxCcR5dDL1RkIgegCgYIKoZIzj0DAQehRANCAARXh8C0AesqFP53
-J3cjyIFyqFY3W0y0d+KIw6kCBeAUeJ+1ZfcaglUEWoo+FqKBLo0i9zBK/7aAGlhh
-0kOQ4VC6
------END PRIVATE KEY-----