ccj hace 2 años
padre
commit
10d3c6d13f
Se han modificado 3 ficheros con 50 adiciones y 44 borrados
  1. 1 1
      main.js
  2. 4 3
      manifest.json
  3. 45 40
      pages/user/depotMonitoring.vue

+ 1 - 1
main.js

@@ -64,7 +64,7 @@ let jweixin = require('./components/jweixin-module')
 let jwx = require('./components/jweixin-module/jwx')
 Vue.mixin({
 	onShow() {
-		jwx.configWeiXin(jwx => {})
+		// jwx.configWeiXin(jwx => {})
 	}
 })
 //#endif

+ 4 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.188",
-    "versionCode" : 21188,
+    "versionName" : "2.1.192",
+    "versionCode" : 21192,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -202,7 +202,8 @@
             "Geolocation" : {},
             "LivePusher" : {},
             "Camera" : {},
-            "Gallery" : {}
+            "Gallery" : {},
+            "Barcode" : {}
         },
         "splashscreen" : {
             "waiting" : false

+ 45 - 40
pages/user/depotMonitoring.vue

@@ -86,47 +86,52 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession", res)
-				if (res.data.data == "INVALID") {
-					this.isShowAlert = true;
-					// uni.showModal({
-					// 	title: '提示',
-					// 	content: '当前登入信息验证失败,是否重新登录?',
-					// 	showCancel: true,
-					// 	confirmText: '登录',
-					// 	success: (e) => {
-					// 		if (e.confirm) {
-					// 			uni.navigateTo({
-					// 				url: '/pages/public/login'
-					// 			})
-					// 		}
-					// 	},
-					// 	fail: () => {},
-					// 	complete: () => {}
-					// })
-				}
-			})
-			var that = this
-			uni.request({
-				url: 'https://live.eliangeyun.com/api/v1/device/channellist',
-				method: 'GET',
-				success: (res) => {
-					if (res.statusCode === 200) {
-						that.videoList = res.data.ChannelList
+			let companyName = uni.getStorageSync('compName1').company;
+			console.log(companyName)
+			if(companyName == '黑龙江中天昊元贸易有限公司'||companyName == '吉林昊友城元粮食贸易有限公司'){
+				this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+					console.log("checkSession", res)
+					if (res.data.data == "INVALID") {
+						this.isShowAlert = true;
+						// uni.showModal({
+						// 	title: '提示',
+						// 	content: '当前登入信息验证失败,是否重新登录?',
+						// 	showCancel: true,
+						// 	confirmText: '登录',
+						// 	success: (e) => {
+						// 		if (e.confirm) {
+						// 			uni.navigateTo({
+						// 				url: '/pages/public/login'
+						// 			})
+						// 		}
+						// 	},
+						// 	fail: () => {},
+						// 	complete: () => {}
+						// })
 					}
-				},
-				fail: (res) => {
-					console.log("fail::", res)
-				}
-			})
-			this.$api.doRequest('get', '/openServiceInfo/selectCommonCompany', {
-				phone: this.userInfo.phone
-			}).then(res => {
-				if (res.data.code == 200) {
-					this.init(res.data.data[0].compId)
-				}
-			})
+				})
+				var that = this
+				uni.request({
+					url: 'https://live.eliangeyun.com/api/v1/device/channellist',
+					method: 'GET',
+					success: (res) => {
+						if (res.statusCode === 200) {
+							that.videoList = res.data.ChannelList
+						}
+					},
+					fail: (res) => {
+						console.log("fail::", res)
+					}
+				})
+				this.$api.doRequest('get', '/openServiceInfo/selectCommonCompany', {
+					phone: this.userInfo.phone
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.init(res.data.data[0].compId)
+					}
+				})
+			}
+			
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {