4个页面

pages/login/setup.vue

@@ -1,22 +1,24 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
+		<nav-bar title="设置" :inner2="true" @goIn="goIn"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">服务器地址</view>
+				<view class="setup-item">
+					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">刷新时间(s)</view>
-					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				<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">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view> -->
 			</view>
 		</view>
-		<view class="submit-bar">
-		  <button class="submit-button" @click="_submit">确认</button>
+		<view class="zd-row submit-bar">
+		  <button class="zd-col-24 button-primary" @click="_submit">确认</button>
 		</view>
 	</view>
 </template>
@@ -29,9 +31,8 @@
 		},
 		data() {
 			return {
-				options: [],
-				index: '',
 				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
 				setTime: this.$store.getters.setTime / 1000
 			};
 		},
@@ -44,7 +45,14 @@
 			_submit () {
 				if (this.addrip === '') {
 					uni.showToast({
-						title: '服务器地址',
+						title: '请填写服务器地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.acsip === '') {
+					uni.showToast({
+						title: '请填写ACS地址',
 						icon: 'none'
 					})
 					return
@@ -57,7 +65,7 @@
 					return
 				}
 				// 存值
-				this.$store.dispatch('setConfig',{baseUrl: this.addrip, setTime: this.setTime * 1000, setPrintName: this.index})
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000})
 				uni.redirectTo({
 					url: '/pages/login/login'
 				})
@@ -68,15 +76,16 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
-.input-wrap
+.setup-item
 	width 100%
-	_fj()
-.input-label
-	wh(200rpx, 58rpx)
-	_font(28rpx,58rpx,#464646)
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
 .setup-input
-	_wh(calc(100% - 200rpx), 58rpx)
+	_wh(100%, 80rpx)
 	background #fff
-	_font(28rpx,58rpx,#323232)
-	padding 0 10rpx
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
 </style>