pad真机测试更改

App.vue

@@ -18,6 +18,7 @@
 	@import "style/css/flex-main.css";
 	@import "/style/iconfont.css";
 	
+
 	/deep/.uni-select {
 		background-color: #fff;
 	}

components/drag_demo/Inform.vue

@@ -69,7 +69,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="less" scoped>
 .info {
 	text-indent: 2em;
 	font-size: 28upx;

components/head-view/head-view.vue

@@ -23,7 +23,7 @@
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
 	.headInfo {
 		position: relative;
 		background-color: #fff;

main.js

@@ -22,29 +22,6 @@ import liuStepBar from './uni_modules/liu-step-bar/components/liu-step-bar/liu-s
 Vue.component('uni-pop', uniPop)
 Vue.component('liu-step-bar', liuStepBar)
 
-import Vant from 'vant';
-import 'vant/lib/index.less';
-Vue.use(Vant);
-import {
-	RadioGroup,
-	Radio,
-	Button,
-	Uploader,
-	Field,
-	Checkbox,
-	CheckboxGroup,
-	Progress
-} from 'vant';
-
-Vue.use(Radio);
-Vue.use(RadioGroup);
-Vue.use(Button);
-Vue.use(Uploader);
-Vue.use(Field);
-Vue.use(Checkbox);
-Vue.use(CheckboxGroup);
-
-
 const app = new Vue({
 	store,
 	...App

manifest.json

@@ -38,7 +38,8 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {},
@@ -62,9 +63,7 @@
                 "desc" : "获取当前定位判断距离"
             }
         },
-		"requiredPrivateInfos": [
+        "requiredPrivateInfos" : [ "getLocation" ],
-			"getLocation"
-		],
         "plugins" : {
             "ocr-plugin" : {
                 "version" : "3.1.1",

pages/discharge/index.vue

@@ -31,7 +31,7 @@
 	};
 </script>
 
-<style>
+<style lang="less" scoped>
 	.container {
 		display: flex;
 	}

pages/login/index.vue

@@ -1,12 +1,10 @@
 <template>
 	<view class="login">
 		<view class="loginBox">
-			<van-field v-model="account" left-icon="manager" placeholder="请输入账号"
+			<uni-easyinput prefixIcon="person-filled" v-model="account" placeholder="请输入账号"></uni-easyinput>
-				:rules="[{ required: true, message: '请输入账号' }]" />
+			<uni-easyinput type="password" prefixIcon="locked-filled" suffixIcon="search" v-model="account"
-			<van-field v-model="password" type="password" left-icon="lock" right-icon="eye" placeholder="请输入密码"
+				placeholder="请输入密码">
-				:rules="[{ required: true, message: '请输入密码' }]" @click-right-icon="rightIcon" v-if="!pwdType" />
+			</uni-easyinput>
-			<van-field v-model="password" left-icon="lock" right-icon="closed-eye" placeholder="请输入密码"
-				:rules="[{ required: true, message: '请输入密码' }]" @click-right-icon="rightIcon" v-else />
 			<view class="button" @click="loginGo('center')">登录</view>
 			<uni-popup ref="popup" background-color="#fff" @change="change">
 				<view class="popupBox">
@@ -37,8 +35,6 @@
 				account: 'rtoswuhan1',
 				// 123456
 				password: '123456',
-				// 密码状态
-				pwdType: false,
 				// 弹框状态
 				type: "",
 				portList: [],
@@ -63,10 +59,6 @@
 			]
 		},
 		methods: {
-			// 点击密码框右侧按钮
-			rightIcon() {
-				this.pwdType = !this.pwdType
-			},
 			// 登录
 			loginGo(type) {
 				if (this.account == "rtoswuhan1" && this.password == "123456") {
@@ -123,7 +115,7 @@
 			margin: 0 auto;
 			padding: 30px;
 
-			/deep/.van-cell {
+			/deep/.is-input-border {
 				margin-top: 20px;
 			}
 

pages/shipWork/index.vue

@@ -5,19 +5,14 @@
 			<side-bar path='3'></side-bar>
 			<view class="content">
 				<view class="form">
-					<!-- <view class="select">
-						<uni-data-select v-model="pamValue" :localdata="pamList" @change="pamChange"
-							placeholder="请选择港口">
-						</uni-data-select>
-					</view> -->
 					<view class="select">
 						<superwei-combox :candidates="shipList" :isJSON="true" keyName="spmName" placeholder="请选择船名航次"
 							v-model="shipName" @input="input_json" @select="select_json"></superwei-combox>
 					</view>
-					<van-button type="default" @click="search">搜索</van-button>
+					<button class="searchBtn" type="default" @click="search">搜索</button>
 				</view>
 				<view class="itemList">
-					<template v-if="total != 0">
+					<template v-if="itemList.length > 0">
 						<view v-for="(item, index) in itemList" :key="index" class="item" @click="toGo(item)">
 							<view class="title">
 								<view class="name">
@@ -71,10 +66,8 @@
 								</view>
 								<view class="footer">
 									<view class="footer">
-										<van-button class="fitem" type="default"
+										<button class="fitem" type="default" @click.stop="download(item)">下载</button>
-											@click.stop="download(item)">下载</van-button>
+										<button class="fitem" type="default" @click.stop="upload(item)">上传</button>
-										<van-button class="fitem" type="default"
-											@click.stop="upload(item)">上传</van-button>
 									</view>
 								</view>
 							</view>
@@ -82,7 +75,7 @@
 					</template>
 					<o-empty v-else height="70vh" bg="#f5f6fa" />
 				</view>
-				<view class="pageBox" v-if="total != 0">
+				<view class="pageBox" v-if="itemList.length > 0">
 					<uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current"
 						@change="changePage" />
 				</view>
@@ -122,7 +115,6 @@
 		},
 		mounted() {
 			this.pamValue = uni.getStorageSync('portObj').portId
-			// this.getPam();
 		},
 		methods: {
 			// 获取船的数据
@@ -161,28 +153,6 @@
 				this.current = e.current;
 				this.initData()
 			},
-			// 获取港区下拉数据
-			// getPam() {
-			// 	uni.request({
-			// 		url: this.$local + '/api/shipOperate/queryPortArea',
-			// 		header: {
-			// 			'Content-Type': 'application/json' //自定义请求头信息
-			// 		},
-			// 		method: 'GET', //请求方式，必须为大写
-			// 		success: (res) => {
-			// 			console.log('接口返回------', res);
-			// 			if (res.statusCode === 200) {
-			// 				let arr = res.data.data;
-			// 				arr.forEach((v, index) => {
-			// 					this.pamList.push({
-			// 						text: v.pamName,
-			// 						value: v.pamId
-			// 					})
-			// 				})
-			// 			}
-			// 		}
-			// 	})
-			// },
 			// 获取船名航次下拉数据
 			getShip() {
 				uni.request({
@@ -211,7 +181,17 @@
 			},
 			// 点击搜索
 			search() {
-				this.initData()
+				this.itemList = [{
+					uploadTime: "1",
+					uploadStatusDesc: "2",
+					actualBerthageName: "3",
+					planBerthageName: "4",
+					outTradeTypeName: "5",
+					outVvyName: "6",
+					inTradeTypeName: "7",
+					inVvyName: "8"
+				}]
+				// this.initData()
 			},
 			// 下载
 			download(item) {
@@ -468,9 +448,10 @@
 				margin-left: 15px;
 			}
 
-			/deep/.van-button {
+			.searchBtn {
 				height: 35px;
 				line-height: 35px;
+				margin-left: 0;
 			}
 		}
 

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -2,10 +2,8 @@
 	<view class="uni-date">
 		<view class="uni-date-editor" @click="show">
 			<slot>
-				<view
+				<view class="uni-date-editor--x"
-          class="uni-date-editor--x"
+					:class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}">
-          :class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}"
-        >
 					<view v-if="!isRange" class="uni-date-x uni-date-single">
 						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
 						<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
@@ -13,11 +11,15 @@
 
 					<view v-else class="uni-date-x uni-date-range">
 						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
-            <view class="uni-date__x-input text-center">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+						<view class="uni-date__x-input text-center">
+							{{ displayRangeValue.startDate || startPlaceholderText }}
+						</view>
 
 						<view class="range-separator">{{rangeSeparator}}</view>
 
-            <view class="uni-date__x-input text-center">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+						<view class="uni-date__x-input text-center">
+							{{ displayRangeValue.endDate || endPlaceholderText }}
+						</view>
 					</view>
 
 					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
@@ -38,16 +40,16 @@
 						:placeholder="selectDateText" />
 
 					<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
-						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond"
-						<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
+						style="width: 100%;">
-							:disabled="!inputDate" />
+						<input class="uni-date__input text-center" type="text" v-model="pickerTime"
+							:placeholder="selectTimeText" :disabled="!inputDate" />
 					</time-picker>
 				</view>
 
 				<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
 					:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange"
-          :default-value="defaultValue"
+					:default-value="defaultValue" style="padding: 0 8px;" />
-					style="padding: 0 8px;" />
 
 				<view v-if="hasTime" class="popup-x-footer">
 					<text class="confirm-text" @click="confirmSingleChange">{{okText}}</text>
@@ -61,8 +63,8 @@
 						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
 							:placeholder="startDateText" />
 
-						<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime" :border="false"
+						<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime"
-            :disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							:border="false" :disabled="!tempRange.startDate" :hideSecond="hideSecond">
 							<input class="uni-date__input uni-date-range__input" type="text"
 								v-model="tempRange.startTime" :placeholder="startTimeText"
 								:disabled="!tempRange.startDate" />
@@ -102,8 +104,7 @@
 
 		<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
 			:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
-      :startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder"
+			:startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder" :default-value="defaultValue"
-      :default-value="defaultValue"
 			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
 			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" />
 	</view>
@@ -133,9 +134,19 @@
 	 **/
 	import Calendar from './calendar.vue'
 	import TimePicker from './time-picker.vue'
-	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
 	import i18nMessages from './i18n/index.js'
-  import { getDateTime, getDate, getTime, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat } from './util'
+	import {
+		getDateTime,
+		getDate,
+		getTime,
+		getDefaultSecond,
+		dateCompare,
+		checkDate,
+		fixIosDateFormat
+	} from './util'
 
 	export default {
 		name: 'UniDatetimePicker',
@@ -373,7 +384,8 @@
 				return this.i18nT("uni-datetime-picker.clear")
 			},
 			showClearIcon() {
-				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this.displayRangeValue.endDate))
+				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this
+					.displayRangeValue.endDate))
 			}
 		},
 		created() {
@@ -454,7 +466,9 @@
 					this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
 					return
 				}
-				const { windowWidth } = uni.getSystemInfoSync()
+				const {
+					windowWidth
+				} = uni.getSystemInfoSync()
 				this.isPhone = windowWidth <= 500
 				this.windowWidth = windowWidth
 			},
@@ -624,7 +638,10 @@
 			},
 			mobileChange(e) {
 				if (this.isRange) {
-					const {before, after} = e.range
+					const {
+						before,
+						after
+					} = e.range
 
 					if (!before || !after) {
 						return
@@ -818,6 +835,7 @@
 		width: 100%;
 		flex: 1;
 	}
+
 	.uni-date-x {
 		display: flex;
 		flex-direction: row;
@@ -832,6 +850,7 @@
 		.icon-calendar {
 			padding-left: 3px;
 		}
+
 		.range-separator {
 			height: 35px;
 			/* #ifndef MP */