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

config/index.js

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

pageB/contract/collectLook.vue

@@ -40,7 +40,6 @@
 					<text class="tit">净重(吨)</text>
 					<view style="font-size: 18px;margin-left: 80px;">{{item.loadNetWeight}}<text class="hair">发</text></view>
 					<view class="con-list">
-						
 						<view v-if="item.confirmFlag == 1" style="color: #FE6430;">未收货</view>
 						<view v-if="item.confirmFlag == 3" style="color: #22C572;">已收货</view>
 					</view>

pageD/warehousings/ex_warehouse.vue

@@ -305,7 +305,7 @@
 		},
 		onShow() {	
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
-				compId: '2710b21efc1e4393930c5dc800010dc4',
+				compId: 'cb271576afa8418fb7a2f328adc1ecc2',
 				warehouseType: 1,
 			}).then(res => {
 				if (res.data.code == 200) {

pageD/warehousings/warehousings.vue

@@ -215,7 +215,7 @@ import upload from '@/components/upload.vue';
 					contractNo: {},
 					carNo: {},
 				},
-				//pinIndex: '不限（默认）',
+				pinIndex: '一等品',
 				pinTypes: '',
 				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: '采购入库',
@@ -264,7 +264,7 @@ import upload from '@/components/upload.vue';
 				}
 			},
 			onShow(){
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:'2710b21efc1e4393930c5dc800010dc4',warehouseType:1,}).then(res => {
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:'cb271576afa8418fb7a2f328adc1ecc2',warehouseType:1,}).then(res => {
 				 if(res.data.code==200){
 					 var arr=[]
 					 for(var i=0;i<res.data.data.length;i++){

pages/public/code.vue

@@ -171,9 +171,9 @@
 					})
 					this.$api.doRequest('get','/commonUser/loginVerifyCode',{phone:this.phone,verifyCode:this.inputList}).then(res => {
 					    if(res.data.code==200){
-							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "佳屹农",
+							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 password: "y123456",
-username: "jyn"}).then(res1 => {
+username: "13333333333"}).then(res1 => {
 								uni.setStorageSync('pcUserInfo', res1.data.data)
 							})
 							uni.setStorageSync('userInfo', res.data.data)

pages/public/login_account_number.vue

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

pages/public/register.vue

@@ -222,9 +222,9 @@
 							
 							if(res.data.code==200){
 								// pc登录
-								this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "佳屹农",
+								this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 password: "y123456",
-username: "jyn"}).then(res1 => {
+username: "13333333333"}).then(res1 => {
 									uni.setStorageSync('pcUserInfo', res1.data.data)
 								})
 								uni.setStorageSync('userInfo', res.data)

pages/public/reset.vue

@@ -144,9 +144,9 @@
 						})
 						this.$api.doRequest('get','/commonUser/login',{phone:this.phone,password:this.password}).then(req => {
 						if(res.data.code==200){
-							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "佳屹农",
+							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
 password: "y123456",
-username: "jyn"}).then(res1 => {
+username: "13333333333"}).then(res1 => {
 								uni.setStorageSync('pcUserInfo', res1.data.data)
 							})
 							uni.setStorageSync('userInfo', req.data.data)

websocket_sdk.js

@@ -262,9 +262,12 @@ export default class Websocket {
 				uni.request({
 					url: baseUrlNew + '/auth/api/loginEnhanced',
 					data: {
-						companyName: "佳屹农",
+						// companyName: "佳屹农",
+						// password: "y123456",
+						// username: "jyn"
+						companyName: "易粮易运",
 						password: "y123456",
-						username: "jyn"
+						username: "13333333333"
 					},
 					method: 'POST',
 					success: (res) => {