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

components/uview-ui/libs/util/area.js

@@ -1,10 +1,4 @@
 var areaData = [
-	[
-		[{
-			"label": "全部",
-			"value": "110100"
-		}]
-	],
 	[
 		[{
 			"label": "东城区",

components/uview-ui/libs/util/province.js

@@ -1 +1 @@
-var provinceData=[{"label":"全部","value":"10"},{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;
+var provinceData=[{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	// baseUrl: 'http://192.168.1.120:8090/',
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://192.168.1.110:8090/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageD/myRelease/sellDetails.vue

@@ -198,7 +198,7 @@
 				liIndex: 0,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: 0,
-				pinType: ['一等品', '二等品', '三等品', '等外'],
+				pinType: [ '一等品', '二等品', '三等品', '等外'],
 				nianIndex: 3,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'

pageD/warehousings/ex_warehouse.vue

@@ -235,6 +235,7 @@
 				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
 				btnLoading: false, //防止重复点击
 				imgUrls: [],
+				binNumber:[],
 				warehouse: [],
 				warehouseIndex: -1,
 				warehouse1: [],
@@ -387,6 +388,7 @@
 				id: id,
 			}).then(res => {
 				if(res.data.code == 200 ){
+					that.binNumber=res.data.data.warehousePositionInfoList
 					var arr = []
 					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
 						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
@@ -413,6 +415,7 @@
 				this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 					id: id,
 				}).then(res => {
+					this.binNumber=res.data.data
 					var arr = []
 					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
 						// console.log(res.data.data.warehousePositionInfoList[i])
@@ -423,9 +426,15 @@
 			},
 			warehouseChange1(e) {
 				var id = ''
+				
 				this.warehouseIndex1 = e.detail.value
 				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
 				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
+				// for (var i = 0; i < this.binNumber.length; i++) {
+				// 	if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
+				// 		this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
+				// 	}
+				// }
 			},
 
 			DateChange(e) {
@@ -713,6 +722,7 @@
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 3
 				this.WarehouseInOutInfo.pcFlag = 0
+				// this.WarehouseInOutInfo.warehouseType=0
 				this.WarehouseInOutInfo.taskType = "出库任务"
 				uni.showLoading({
 					title: "正在提交"

pages/public/code.vue

@@ -173,7 +173,9 @@
 					    if(res.data.code==200){
 							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 							password: "y123456",
-							username: "13333333333"}).then(res => {})
+							username: "13333333333"}).then(res1 => {
+								uni.setStorageSync('pcUserInfo', res1.data.data)
+							})
 							uni.setStorageSync('userInfo', res.data.data)
 					        that.$store.commit('login', res.data.data)
 					        // that.liangxinLogin()

pages/public/login_account_number.vue

@@ -101,8 +101,8 @@
 						uni.setStorageSync('userInfo', res.data.data)
 						this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 password: "y123456",
-username: "13333333333"}).then(res => {
-							
+username: "13333333333"}).then(res1 => {
+							uni.setStorageSync('pcUserInfo', res1.data.data)
 						})
 						that.$store.commit('login', res.data.data)
 						// that.liangxinLogin()

pages/public/register.vue

@@ -224,7 +224,9 @@
 								// pc登录
 								this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 								password: "y123456",
-								username: "13333333333"}).then(res => {})
+								username: "13333333333"}).then(res1 => {
+									uni.setStorageSync('pcUserInfo', res1.data.data)
+								})
 								uni.setStorageSync('userInfo', res.data)
 								that.$store.commit('login', res.data)
 								// that.liangxinLogin()

pages/public/reset.vue

@@ -146,7 +146,9 @@
 						if(res.data.code==200){
 							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 							password: "y123456",
-							username: "13333333333"}).then(res => {})
+							username: "13333333333"}).then(res1 => {
+								uni.setStorageSync('pcUserInfo', res1.data.data)
+							})
 							uni.setStorageSync('userInfo', req.data.data)
 							that.$store.commit('login', req.data.data)
 							// that.liangxinLogin()

websocket_sdk.js

@@ -251,12 +251,30 @@ export default class Websocket {
     }
 	getTips(){
 		return new Promise(resolve => {
+			let baseUrl = config.def().baseUrl
+			let baseUrlNew = config.def().baseUrlNew
 			var userInfo
 			if (!userInfo || !userInfo.accessToken) {
 				userInfo = uni.getStorageSync('userInfo')
 			}
+			var pcUserInfo=uni.getStorageSync('pcUserInfo')
+			if(!pcUserInfo){
+				uni.request({
+					url: baseUrlNew + '/auth/api/loginEnhanced',
+					data: {
+						companyName: "易粮易运",
+						password: "y123456",
+						username: "13333333333"
+					},
+					method: 'POST',
+					success: (res) => {						
+						if (res.statusCode === 200) {
+							uni.setStorageSync('pcUserInfo', res.data)
+						}
+					}
+				})
+			}
 			let accessToken = userInfo ? userInfo.accessToken : ''
-			let baseUrl = config.def().baseUrl
 			var data = {}
 			var _mt = 'getTips'
 			var _gp = 'integral'