Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.106",
-    "versionCode" : 21106,
+    "versionName" : "2.1.107",
+    "versionCode" : 21107,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -216,6 +216,20 @@
                     "pid" : "2018",
                     "parameters" : {}
                 }
+            },
+            "service-keep-live" : {
+                "__plugin_info__" : {
+                    "name" : "【推荐】安卓保活插件 防杀  增强保活，黑屏防睡眠（测试黑屏传数据一天多没问题）",
+                    "description" : "如果你的应用希望能够一直在后台运行而不被系统自动杀死的话，可以尝试一下。群485147231(已满) 598812409",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=3422",
+                    "android_package_name" : "uni.UNI7297DA2",
+                    "ios_bundle_id" : "uni.UNI7297DA2",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "3422",
+                    "parameters" : {}
+                }
             }
         }
     }

pages/erp/exWarehousing/exWarehousing.vue

@@ -562,7 +562,7 @@
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName
 				if (this.detailData.inOutType == '销售出库') {
 					this.weightbills.buyer = this.inOutNoList[e[0]].buyer
-					this.weightbills.seller = uni.getStorageSync('compName')
+					this.weightbills.seller = uni.getStorageSync('compName1')
 					if (this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer) {
 						this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer +
 							'（ ' +
@@ -573,7 +573,7 @@
 					}
 				} else if (this.detailData.inOutType == '移库出库') {
 					this.weightbills.buyer = this.inOutNoList[e[0]].receiveWarehouse
-					this.weightbills.seller = uni.getStorageSync('compName')
+					this.weightbills.seller = uni.getStorageSync('compName1')
 					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse
 				}
 			},

pages/erpbusiness/add_quality_testing.vue

@@ -583,7 +583,7 @@
 			this.gridList.warehouseName = options.warehouseName
 			// this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 			this.cangid = options.cangid
-			this.gridList.compName = uni.getStorageSync('compName')
+			this.gridList.compName = uni.getStorageSync('compName1')
 			this.gridList.person= options.personCharge
 			this.gridList.personPhone= options.personPhone
 			this.gridList.qualityInspector= uni.getStorageSync("userInfo").userName

pages/user/user.vue

@@ -397,11 +397,14 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onShow() {
-			if (uni.getStorageSync('compName')) {
-				this.haveCompany = true
-			} else {
-				this.haveCompany = false
-			}
+			console.log("uni.getStorageSync('compName1')")
+			// console.log(uni.getStorageSync("compName1"))
+			
+			// if (uni.getStorageSync("compName1")) {
+			// 	this.haveCompany = true
+			// } else {
+			// 	this.haveCompany = false
+			// }
 			this.isShow();
 			uni.hideKeyboard()
 			uni.showTabBar()
@@ -409,7 +412,8 @@
 				index: 4
 			})
 			this.loadData()
-			console.log("hasLogin", this.hasLogin)
+			console.log("hasLogin", this.hasLogin)				
+			var that = this
 			if (this.userInfo) {
 				if (!this.userInfo.avatarUrl) {
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
@@ -419,7 +423,6 @@
 				this.username = this.userInfo.userName ? this.userInfo.userName : uni.getStorageSync("userInfo").data
 					.userName
 				this.userphone = this.userInfo.phone ? this.userInfo.phone : uni.getStorageSync("userInfo").data.phone
-				var that = this
 				this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 					console.log("noticeNumber", res)
 					if (res.data.data) {
@@ -449,22 +452,39 @@
 						// });
 					}
 				})
-				if (!uni.getStorageSync('compName')) {
-					this.$api.doRequest('get', '/commonUser/getCompOwn', {
-						phone: this.userInfo.phone
-					}).then(res => {
-						if (res.data.data) {
-							this.companyList = res.data.data
-							if (this.companyList.length > 0) {
-								this.compName = this.companyList[0].compName
-								uni.setStorageSync('compName', this.companyList[0].compName)
-								this.haveCompany = true
-							}
+									console.log("this.1111")
+				uni.getStorage({
+					key: 'compName1',
+					success: function (res) {
+									console.log("this.2222")
+						console.log(res.data);
+						if(res.data){
+							that.compName = res.data
+							that.haveCompany = true
 						}
-					})
-				} else {
-					this.compName = uni.getStorageSync('compName')
-				}
+					},
+					fail() {
+						that.$api.doRequest('get', '/commonUser/getCompOwn', {
+							phone: that.userInfo.phone
+						}).then(res => {
+							if (res.data.data) {
+								that.companyList = res.data.data
+									console.log("that.3333")
+									console.log(that.companyList)
+								if (that.companyList.length > 0) {
+									that.compName = that.companyList[0].compName
+									console.log("this.compName")
+									console.log(that.compName)
+									uni.setStorageSync('compName1', that.companyList[0].compName)
+									that.haveCompany = true
+								}
+								else{
+									that.haveCompany = false
+								}
+							}
+						})
+					}
+				});
 
 			} else {
 				this.headUrl = "../../static/img/myimg/YongHu@3x.png"
@@ -491,7 +511,7 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						uni.setStorageSync('pcUserInfo', res1.data.data)
-						uni.setStorageSync('compName', that.companyList[e[0]].compName)
+						uni.setStorageSync('compName1', that.companyList[e[0]].compName)
 						that.compName = that.companyList[e[0]].compName
 						helper.getListByUserId()
 						that.$api.msg('切换成功')
@@ -502,7 +522,7 @@
 							veriCode: "123456",
 						}).then(res2 => {
 							uni.setStorageSync('pcUserInfo', res2.data.data)
-							uni.setStorageSync('compName', that.companyList[e[0]].compName)
+							uni.setStorageSync('compName1', that.companyList[e[0]].compName)
 							that.compName = that.companyList[e[0]].compName
 							helper.getListByUserId()
 							that.$api.msg('切换成功')