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

# Conflicts:
#	config/index.js

common/appUpdate.js

@@ -62,6 +62,17 @@ export default function appUpdate() {
 										force: false
 									}, function() {
 										plus.nativeUI.toast("热更新成功");
+										uni.clearStorageSync();
+										plus.nativeUI.toast("缓存清除成功");
+										that.$api.doRequest('post', '/auth/api/logout').then(res => {
+											if (res.data.data) {
+												that.$store.commit('logout')
+												that.$api.logout()
+												plus.nativeUI.toast("登出成功");
+												plus.runtime.restart();
+												plus.nativeUI.toast("重启成功");
+											}
+										})
 										plus.runtime.restart();
 									}, function(e) {
 										console.log(e)

config/index.js

@@ -3,6 +3,8 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.119:9100/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/edit_quality_testing.vue

@@ -17,7 +17,9 @@
 			<view class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
-					{{gridList.customerName}}({{gridList.customerPhone}})
+					<view  @click='gocustomer'>
+						{{gridList.customerName}}({{gridList.customerPhone}})
+					</view>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -359,9 +361,30 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		onShow() {
-
+			if (uni.getStorageSync('checkcustomer')) {
+			
+				let _customerInfo = uni.getStorageSync('checkcustomer')
+				if (_customerInfo.shipperName) {
+					this.gridList.identityId = _customerInfo.id
+					//点击登记客户
+					this.gridList.customerName = _customerInfo.shipperName
+					this.gridList.customerPhone = _customerInfo.shipperPhone
+					this.gridList.carNumber=_customerInfo.carNo
+				} else {
+					//点击搜索客户
+					this.gridList.customerName = _customerInfo.customerName
+					this.gridList.customerPhone = _customerInfo.customerPhone
+				}
+			
+				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
+			}
 		},
 		methods: {
+			gocustomer() {
+				uni.navigateTo({
+					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList.warehouseName + '&goodsName=' + this.gridList.goodsName+'&status=edit'
+				})
+			},
 			print() {
 				uni.navigateTo({
 					url: '/pages/erpbusiness/bleConnect'