车辆列表

common/libs/request.js

@@ -1,5 +1,5 @@
-const devBaseUrl = "http://192.168.1.17:8080";
-const proBaseUrl = "http://192.168.1.17:8080";
+const devBaseUrl = "http://192.168.1.44:39520";
+const proBaseUrl = "http://192.168.1.44:39520";
 //const proBaseUrl = "http://61.163.210.202:39510";
 // const devBaseUrl = "http://218.3.230.230:39510";
 // const proBaseUrl = "http://218.3.230.230:39510"; 

manifest.json

@@ -68,5 +68,20 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "devServer" : {
+            "port" : 39520,
+            "proxy" : {
+                "/apis" : {
+                    "target" : "http://192.168.1.44:51106",
+                    "changeOrigin" : true, //是否跨域
+                    "secure" : false, // 设置支持https协议的代理
+                    "pathRewrite" : {
+                        "^/apis" : ""
+                    }
+                }
+            }
+        }
+    }
 }

package.json

@@ -1,7 +1,7 @@
 {
     "name": "uView",
     "version": "1.8.6",
-    "description": "",
+    "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
     "main": "index.js",
     "keywords": [
         "uview",

pages.json

@@ -48,6 +48,24 @@
 			"style": {
 				"navigationBarTitleText": "都能运"
 			}
+		},
+		{
+			"path" : "pages/index/myTruckList",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "我的车辆",
+				"enablePullDownRefresh": true
+			}
+			
+		},
+		{
+			"path" : "pages/index/addTruck",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "新增车辆",
+				"enablePullDownRefresh": false
+			}
+			
 		}
 	],
 	"globalStyle": {

pages/index/addTruck.vue

@@ -0,0 +1,76 @@
+<template>
+	<view>
+		<u--form labelPosition="top" labelWidth="100" :model="truckInfo" :rules="rules" ref="uForm">
+			<u-form-item label="货车类型" prop="truckInfo.idTruckType" borderBottom @click="showTruckType = true"
+				ref="itemTruckType">
+				<u--input v-model="truckInfo.truckTypeName" disabled disabledColor="#ffffff" placeholder="请选择货车类型"
+					border="none"></u--input>
+				<u-icon slot="right" name="arrow-right"></u-icon>
+			</u-form-item>
+			<u-form-item label="车牌号" prop="truckInfo.truckCode" borderBottom ref="itemTruckCode">
+				<u--input v-model="truckInfo.truckCode" border="none"></u--input>
+			</u-form-item>
+			<u-form-item label="能源类型" prop="truckInfo.energyType" borderBottom ref="itemEnergyType">
+				<u--input v-model="truckInfo.energyType" border="none"></u--input>
+			</u-form-item>
+			<u-form-item label="备注" prop="truckInfo.truckMemo" borderBottom ref="itemMemo">
+				<u--textarea v-model="truckInfo.truckMemo" placeholder="请输入备注" border="none"></u--textarea>
+			</u-form-item>
+			
+			<u-button type="primary" size="large" text="提交"></u-button>
+		</u--form>
+		<u-picker :show="showTruckType" :columns="pickerColumns" closeOnClickOverlay @close="onPickerClose" @cancel="onPickerClose" @confirm="onPickerConfirm"
+			keyName="truckTypeName"></u-picker>
+	</view>
+</template>
+
+<script>
+	import request from '@/common/libs/request.js';
+
+	export default {
+		mounted() {
+			this.initData()
+		},
+		data() {
+			return {
+				truckInfo: {
+					id: 0,
+					idTruckType: 0,
+					truckTypeName: '',
+					truckCode: '',
+					energyType: '',
+					truckMemo: ''
+				},
+				showTruckType: false,
+				pickerColumns:[],
+				truckTypes: []
+
+			}
+		},
+		methods: {
+			initData() {
+				let _that = this;
+				request.httpPost("/apis/dnyDriver/getTruckTypeList", {}).then(res => {
+					if (res.httpCode == 200) {
+						_that.truckTypes = res.data
+						_that.pickerColumns.push(_that.truckTypes)
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "error"
+						})
+					}
+				});
+			},
+			onPickerClose() {
+				this.showTruckType = false
+			},
+			onPickerConfirm(item) {
+				console.log(item)
+				this.truckInfo.idTruckType = item.value[0].id
+				this.truckInfo.truckTypeName = item.value[0].truckTypeName
+				this.showTruckType = false
+			}
+		}
+	}
+</script>

pages/index/me.vue

@@ -7,50 +7,57 @@
 				</u-col>
 				<u-col span="8">
 					<view class="avatar-txt">
-						<span>张某某(<b style="color: #e4493c;">未审核</b>)</span>
-						<span>豫A99uk68</span>
+						<span>{{driverInfo.driverName}}(<b
+								style="color: #e4493c;">{{driverInfo.driverState == 1? '已审核' : '未审核'}}</b>)</span>
+						<span>{{driverInfo.defaultTruckCode}}</span>
 					</view>
 				</u-col>
 			</u-row>
 		</view>
 		<view class="list-con">
 			<u-cell-group>
-				<u-cell
-					:isLink="true"
-					title="我的资料"
-					icon="account"
-				></u-cell>
-				<u-cell
-					:isLink="true"
-					title="我的车辆"
-					icon="car"
-				></u-cell>
-				<u-cell
-					:isLink="true"
-					title="已配送订单(当月)"
-					icon="order"
-				></u-cell>
+				<u-cell :isLink="true" title="我的资料" icon="account"></u-cell>
+				<u-cell :isLink="true" title="我的车辆" icon="car" url="/pages/index/myTruckList"></u-cell>
+				<u-cell :isLink="true" title="已配送订单(当月)" icon="order"></u-cell>
 			</u-cell-group>
 		</view>
 
 		<view class="padding-lr padding-tb-xs">
-			
 			<button class="cu-btn block shadow bg-white margin text-red" @tap="logout">退出登录</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import request from '@/common/libs/request.js';
 	export default {
+		mounted() {
+			this.initData()
+		},
 		data() {
 			return {
 				src: 'http://dn-dounengyin.qbox.me/Fvz4y4_hhBt0CaY9_8PMm8IeXc8p',
+				driverInfo: {
+					driverName: '',
+					driverState: 0,
+					defaultTruckCode: ''
+				}
+
 			}
 		},
 		methods: {
-			bluetoothSetting() {
-				uni.navigateTo({
-					url: "../userconfig/bluetoothPrintConfig"
+			initData() {
+				let _that = this;
+				request.httpPost("/apis/dnyDriver/getDriverInfo", {}).then(res => {
+					if (res.httpCode == 200) {
+						console.log("3333", res.data)
+						_that.driverInfo = res.data
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "error"
+						})
+					}
 				});
 			},
 			logout() {
@@ -64,17 +71,20 @@
 </script>
 
 <style>
-	.cu-bar{
+	.cu-bar {
 		padding-left: 60rpx;
 		padding-top: 30rpx;
 	}
-	.avatar-txt span{
+
+	.avatar-txt span {
 		display: block;
 		width: 100;
 	}
-	.list-con{
+
+	.list-con {
 		margin-top: 50rpx;
 	}
+
 	.w-h-100 {
 		height: 100%;
 		width: 100%;
@@ -91,4 +101,4 @@
 	.flex-item-70 {
 		flex-basis: 70%;
 	}
-</style>
+</style>

pages/index/myTruckList.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="w-h-100">
+		<view class="u-page">
+			<u-list>
+				<u-list-item v-for="(item, index) in truckList" :key="index">
+					<u-cell :title="item.truckCode + '-' + item.truckTypeName">
+						<u-avatar slot="icon" shape="square" size="35" :src="item.url? item.url: defaultAvatar"
+							customStyle="margin: -3px 5px -3px 0"></u-avatar>
+					</u-cell>
+				</u-list-item>
+				<u-list-item :key="10000">
+					<u-cell size="large" title="新增车辆" isLink url="/pages/index/addTruck"> </u-cell>
+				</u-list-item>
+			</u-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from '@/common/libs/request.js';
+	export default {
+		mounted() {
+			this.initData()
+		},
+		data() {
+			return {
+				defaultAvatar: 'http://dn-dounengyin.qbox.me/Fvz4y4_hhBt0CaY9_8PMm8IeXc8p',
+				truckList: [
+
+				]
+
+			}
+		},
+		methods: {
+			initData() {
+				let _that = this;
+				request.httpPost("/apis/dnyDriver/getTruckInfoList", {}).then(res => {
+					if (res.httpCode == 200) {
+						_that.truckList = res.data
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "error"
+						})
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.cu-bar {
+		padding-left: 60rpx;
+		padding-top: 30rpx;
+	}
+
+	.avatar-txt span {
+		display: block;
+		width: 100;
+	}
+
+	.list-con {
+		margin-top: 50rpx;
+	}
+
+	.w-h-100 {
+		height: 100%;
+		width: 100%;
+	}
+
+	.uni-row .flex-item-30 {
+		color: #8799a3;
+	}
+
+	.flex-item-30 {
+		flex-basis: 30%;
+	}
+
+	.flex-item-70 {
+		flex-basis: 70%;
+	}
+</style>

pages/index/workTable.vue

@@ -66,7 +66,7 @@
 		},
 		mounted: function(option) {
 			console.log("111111111111")
-			this.getCurrentItems();
+			// this.getCurrentItems();
 			//不再这里调用，由主页刷新获取
 			// this.getIndexCardPanelData();
 		},