bug修改

pages/login/login.vue

@@ -9,13 +9,13 @@
 			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password" autocomplete=“off”>
 			<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
 	    </div>
-		<view class="radio-box">
+		<view class="zd-row radio-box">
-			<view class="radio-wrap">
+			<view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser">
-				<span class="iconfont icon_unchecked" :class="{'icon_checked': saveUser}"  @tap="toSaveUser">&#xe66b;</span>
+				<uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons>
-				<text class="radio-label">记住用户名</text>
 			</view>
-			<text class="setup-text" @tap="setup">设置</text>
+			<view class="zd-col-13 radio-label">记住用户名</view>
-			<text class="setup-text" @tap="isUpdate">升级版本</text>
+			<view class="zd-col-4 setup-text" @tap="setup">设置</view>
+			<view class="zd-col-5 setup-text" @tap="isUpdate">升级版本</view>
 		</view>
 		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
 		<view v-if="version !== ''" class="version-name">v{{version}}</view>
@@ -131,7 +131,7 @@
   _font(40rpx,75rpx,#444,666)
   padding-top: 190rpx
 .p2
-  _font(46rpx,1,#444,600)
+  _font(44rpx,1,#444,600)
   padding: 10rpx 0 55rpx 0
 .input-box
   _fj()
@@ -143,19 +143,19 @@
 	_font(32rpx,74rpx,#999)
 	padding-left 10rpx
 .radio-box
-	_fj()
+	margin 25rpx 0 70rpx 0
-	margin: 25rpx 0 70rpx 0
+.radio-icon-wrap
-	height: 34rpx
+	_wh(34rpx, 34rpx)
-.radio-wrap
+	border 1rpx solid #999
-	_fj(flex-start)
+	border-radius 4rpx
-	height: 34rpx
+	text-align center
-	flex: 2
+	line-height 40rpx
+.radio-icon-wrap_checked
+	border-color $red
 .radio-label
 	_font(28rpx, 28rpx,#333)
-	padding-left: 10rpx
 .setup-text
 	_font(28rpx, 28rpx,$red,,right)
-	padding-left 25rpx
 .bg
 	background-color: #fff;
 	_bis('../../static/image/login_bg.png', 100%,,bottom)

pages/login/setup.vue

@@ -7,6 +7,10 @@
 					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
+				<view class="setup-item">
+					<view class="setup-label">ACS地址</view>
+					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
+				</view>
 				<view class="setup-item">
 					<view class="setup-label">打印地址</view>
 					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model="printip">
@@ -32,6 +36,7 @@
 		data() {
 			return {
 				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
 				printip: this.$store.getters.printUrl,
 				setTime: this.$store.getters.setTime / 1000
 			};
@@ -50,6 +55,13 @@
 					})
 					return
 				}
+				if (this.acsip === '') {
+					uni.showToast({
+						title: '请填写ACS地址',
+						icon: 'none'
+					})
+					return
+				}
 				if (this.printip === '') {
 					uni.showToast({
 						title: '请填写打印地址',
@@ -65,7 +77,7 @@
 					return
 				}
 				// 存值
-				this.$store.dispatch('setConfig',{baseUrl: this.addrip, printUrl: this.printip,setTime: this.setTime * 1000})
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, printUrl: this.printip,setTime: this.setTime * 1000})
 				uni.redirectTo({
 					url: '/pages/login/login'
 				})

pages/manage/group-in-storage.vue

@@ -264,6 +264,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this._queryExistGroup()
 				} catch (e) {
 					this.disabled2 = false
 				}

pages/manage/out-storage-confirm.vue

@@ -76,8 +76,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 ||!val4}" :disabled="disabled1" @tap="_emptyInStore">出库确认</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 ||!val4}" :disabled="disabled1" @tap="_fullVehicleOutConfirm">出库确认</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 ||!val4}" :disabled="disabled2" @tap="_emptyInStore">回库</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 ||!val4}" :disabled="disabled2" @tap="_vehicleGoBack">回库</button>
 		</view>
 	</view>
 </template>

utils/getData2.js

@@ -185,6 +185,7 @@ export const taskConfirm = (code1, code2) => request({
 // 查询未完成指令
 export const pdaInsts = (keyword, scode, ncode) => request({
 	url:'api/pda/insts',
+	acsurl: true,
 	data: {
 		keyword: keyword,
 		start_devicecode: scode,
@@ -195,6 +196,7 @@ export const pdaInsts = (keyword, scode, ncode) => request({
 // 指令操作
 export const pdaInst = (type, uuid) => request({
 	url:'api/pda/inst',
+	acsurl: true,
 	data: {
 		type: type,
 		inst_uuid: uuid

utils/mork2.js

@@ -1,3 +1,12 @@
+export const handLogin = (user, password) => {
+	let res = {
+		user: {
+			user: {username: 'admin'},
+		},
+		token: 'abcd'
+	}
+	return res
+}
 export const getVehicleType = () => {
 	let res = [
     {
@@ -63,6 +72,13 @@ export const queryVehicleGroup = () => {
 return res
 }
 
+export const groupLink = (arr) => {
+	let res = {
+    "message": "tempor elit adipisicing cillum nisi"
+	}
+	return res
+}
+
 export const pdaPrintf = (code) => {
 	let res = {
 	  "vehicle_code": "91",

utils/request.js

@@ -5,17 +5,7 @@ const request = (params) => {
 	let url = params.url;
 	let method = params.method || 'POST';
 	let data = params.data || {};
-	// data.token = "default-access_token"
+	let acsurl = params.acsurl
-	// if (!params.token) {
-	// 	let token = uni.getStorageSync('token');
-	// 	if (!token) {
-	// 		uni.navigateTo({
-	// 			url: '/pages/login/login'
-	// 		});
-	// 	} else {
-	// 		data.token = '179509245-9c91827e0224bdc18d0b118b8be1b5af';
-	// 	}
-	// }
 	let token = ''
 	if (store.getters.saveToken !== '') {
 		token = store.getters.saveToken
@@ -34,7 +24,10 @@ const request = (params) => {
 		}
 		// data = qs.stringify(data)
 	}
-	const requestUrl = `${store.getters.baseUrl}/` + url;
+	let requestUrl  = `${store.getters.baseUrl}/` + url;
+	if (acsurl) {
+		requestUrl = `${store.getters.acsUrl}/` + url;
+	}
 	uni.showLoading({
 		title: '加载中...'
 	});

vuex/modules/user.js

@@ -1,9 +1,11 @@
 import * as types from '../types'
 
 const baseUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://10.1.3.90:8010'
+const acsUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://10.1.3.90:8010'
 const printUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://10.1.3.90:8010'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
+	acsUrl: uni.getStorageSync('acsUrl') || acsUrl,
 	printUrl: uni.getStorageSync('printUrl') || printUrl,
 	setTime: uni.getStorageSync('setTime') || 5000,
 	loginName: uni.getStorageSync('loginName') ? uni.getStorageSync('loginName') : '',
@@ -12,6 +14,7 @@ const state = {
 }
 const getters = {
 	baseUrl: state => state.baseUrl,
+	acsUrl: state => state.acsUrl,
 	printUrl: state => state.printUrl,
     setTime: state => state.setTime,
 	loginName: state => state.loginName,
@@ -21,6 +24,7 @@ const getters = {
 const actions = {
 	setConfig ({commit}, res) {
 	    uni.setStorageSync('baseUrl', res.baseUrl)
+		uni.setStorageSync('acsUrl', res.acsUrl)
 		uni.setStorageSync('printUrl', res.printUrl)
 	    uni.setStorageSync('setTime', res.setTime)
 	    commit(types.COM_CONFIG, res)
@@ -50,6 +54,7 @@ const actions = {
 const mutations = {
 	[types.COM_CONFIG] (state, res) {
 	    state.baseUrl = res.baseUrl
+		state.acsUrl = res.acsUrl
 		state.printUrl = res.printUrl
 	    state.setTime = res.setTime
 	},