From b59585071fd68ceefab39c1f5ccb1b9247805c0a Mon Sep 17 00:00:00 2001
From: lilu <534466569@qq.com>
Date: Tue, 21 Jun 2022 15:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=88=B9=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=20+=20less=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                      |  6 +-
 common/css/common.less                       | 78 ++++++++----------
 common/css/variables.less                    |  6 ++
 main.js                                      |  1 -
 pages/homePage/home/home.vue                 | 15 ----
 pages/homePage/index/index.vue               |  4 +-
 pages/homePage/moveTrace/moveTrace.vue       |  5 +-
 pages/manifest/cabinHistory/cabinHistory.vue | 15 +++-
 pages/manifest/cabinQuery/cabinQuery.vue     | 87 +++++++++++++++++++-
 vue.config.js                                | 13 +++
 10 files changed, 159 insertions(+), 71 deletions(-)
 create mode 100644 common/css/variables.less
 create mode 100644 vue.config.js

diff --git a/App.vue b/App.vue
index d6e440e..7631042 100644
--- a/App.vue
+++ b/App.vue
@@ -41,9 +41,7 @@
 	}
 </script>
 
-<style lang="scss">
-	// @import "@/uni_modules/uview-ui/index.scss";
-	// @import "common/css/demo.scss";
+<style lang="less">
 	@import "common/css/iconfont.css";
-	// @import "common/css/common.less";
+	@import "common/css/common.less";
 </style>
diff --git a/common/css/common.less b/common/css/common.less
index e7d095c..e7cd42f 100644
--- a/common/css/common.less
+++ b/common/css/common.less
@@ -1,5 +1,8 @@
 
 
+
+@import url("@/common/css/variables.less");
+
 Page{
 	font-family: "PingFang-SC-Regular";
 	height: 100%;
@@ -234,34 +237,52 @@ view{
 	color: #3f3f3f;
 }
 
-.col-low-down{
-	color: #898989;
+.col-nor{
+	color: @uni-color-normal;
 }
-
 .col-ye{
-	color: #f58f13;
+	color: @uni-color-yellow;
+}
+.col-ori{
+	color: @uni-color-origin;
 }
-
 .col-red{
-	color: #E25153!important;
+	color: @uni-color-red;
 }
-
-.col-redNew{
-	color: #db4e3c!important;
+.col-green{
+	color: @uni-color-green;
+}
+.col-blue{
+	color: @uni-color-blue;
 }
 
+.bg-nor{
+	background-color: @uni-color-normal;
+}
+.bg-ye{
+	background-color: @uni-color-yellow;
+}
+.bg-ori{
+	background-color: @uni-color-origin;
+}
+.bg-red{
+	background-color: @uni-color-red;
+}
+.bg-green{
+	background-color: @uni-color-green;
+}
+.bg-blue{
+	background-color: @uni-color-blue;
+}
 .bg-w{
 	background-color: #fff;
 }
-
 .bg-h{
 	background-color: #2f2f2f;
 }
-
 .bg-low{
 	background-color: #3f3f3f;
 }
-
 .bg-low-down{
 	background-color: #898989;
 }
@@ -269,35 +290,8 @@ view{
 	background-color: #d4d4d4;
 }
 
-.bg-ye{
-	background-color: #f58f13;
-}
-
-.bg-red{
-	background-color: #fa2807!important;
-}
-.bg-green{
-	background-color: #00c45d;
-}
-
 .bg-normal{
-	background-color: rgba(243,244,245,1)!important;
-}
-
-.grad {
-    background-image: linear-gradient(rgb(253,118,6),rgb(252,29,12));
-}
-.newGrad{
-	background-image: linear-gradient(to right, #ff933e , #ea5757)!important;
-}
-.saveNewGrad{
-	background-image: linear-gradient(to right, rgb(252,85,40) , rgb(243,50,71))!important;
-}
-.newGradStop{
-	background-image: linear-gradient(to right, #ffc67f , #ef6a72);
-}
-.blueGrad{
-	background-image: linear-gradient(to right, #7C98F7 , #4055EF);
+	background-color: rgba(243,244,245,1) !important;
 }
 
 .centers{
@@ -308,10 +302,10 @@ view{
 	color:#333;
 }
 .fn-c-6{
-	color:#333;
+	color:#666;
 }
 .fn-c-9{
-	color:#333;
+	color:#999;
 }
 
 /deep/.uni-scroll-view ::-webkit-scrollbar {
diff --git a/common/css/variables.less b/common/css/variables.less
new file mode 100644
index 0000000..95b38f1
--- /dev/null
+++ b/common/css/variables.less
@@ -0,0 +1,6 @@
+@uni-color-normal: #2c96fb;
+@uni-color-yellow: #ffc827;
+@uni-color-origin: #ff8213;
+@uni-color-red: #ff4e20;
+@uni-color-blue: #12c8fd;
+@uni-color-green: #42bfac;
\ No newline at end of file
diff --git a/main.js b/main.js
index d3667b3..93c0eea 100644
--- a/main.js
+++ b/main.js
@@ -9,7 +9,6 @@ import validate from '@/common/js/utils/ys-validate.js'
 import util from '@/common/js/utils/utils.js'
 // import '@/common/js/utils/navigateTo.js'
 
-
 Vue.prototype.$store = store
 Vue.prototype.$validate = validate
 Vue.prototype.$util = util;
diff --git a/pages/homePage/home/home.vue b/pages/homePage/home/home.vue
index 8d2f55d..a2c6ca6 100644
--- a/pages/homePage/home/home.vue
+++ b/pages/homePage/home/home.vue
@@ -1,18 +1,9 @@
 <template>
 	<view class="container">
 			<swiper class="main"  :autoplay="false" :current="currentPage" :duration="duration" easing-function="linear" @change="changeSwiper">
-				<!-- <swiper-item>
-					<manifest></manifest>
-				</swiper-item>
-				<swiper-item>
-					<moveTrace></moveTrace>
-				</swiper-item> -->
 				<swiper-item>
 					<index @changeTab="getChangeTab"></index>
 				</swiper-item>
-				<!-- <swiper-item>
-					<vgm></vgm>
-				</swiper-item> -->
 				<swiper-item>
 					<mine></mine>
 				</swiper-item>
@@ -25,9 +16,6 @@
 	import tabBar from "@/components/tabBar/tabBar.vue"
 	import index from "@/pages/homePage/index/index.vue"
 	import mine from "@/pages/homePage/mine/mine.vue"
-	// import manifest from "@/pages/homePage/manifest/manifest.vue" // 航运
-	// import moveTrace from "@/pages/homePage/moveTrace/moveTrace.vue" // 运踪
-	// import vgm from "@/pages/homePage/vgm/vgm.vue"
 
 	import {
 		getUserInfo
@@ -42,9 +30,6 @@
 			tabBar,
 			index,
 			mine,
-			// manifest,
-			// moveTrace,
-			// vgm
 		},
 		data() {
 			return {
diff --git a/pages/homePage/index/index.vue b/pages/homePage/index/index.vue
index 9852024..a0b870c 100644
--- a/pages/homePage/index/index.vue
+++ b/pages/homePage/index/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<!-- <view class="content-bg"></view> -->
+		<view class="view-bg"></view>
 		<image class="content-bg" src="@/static/image/index_bg.png" mode=""></image>
 		<view class="content-top">
 			<view class="banner">
@@ -96,7 +96,7 @@
 			width: 100%;
 			height: 240rpx;
 			margin-top: -4rpx;
-			// background: #2c96fb;
+			// background: @uni-color-normal;
 			// background: #7ec0ff;
 		}
 		.content-top{
diff --git a/pages/homePage/moveTrace/moveTrace.vue b/pages/homePage/moveTrace/moveTrace.vue
index 953bdac..ebd6ef1 100644
--- a/pages/homePage/moveTrace/moveTrace.vue
+++ b/pages/homePage/moveTrace/moveTrace.vue
@@ -150,7 +150,8 @@
 <style lang="scss" scoped>
 	.Main {
 		background: #f2f2f2;
-		height: calc(100% - 175rpx);
+		// height: calc(100% - 175rpx);
+		height: 100%;
 		padding: 1rem 1rem;
 		padding-bottom: 0;
 		box-sizing: border-box;
@@ -330,7 +331,7 @@
 		.AddBox {
 			position: fixed;
 			left: 50%;
-			bottom: 165rpx;
+			bottom: 100rpx;
 			transform: translate(-50%, 0);
 			width: 30%;
 			height: 2.2rem;
diff --git a/pages/manifest/cabinHistory/cabinHistory.vue b/pages/manifest/cabinHistory/cabinHistory.vue
index 33b56e6..c88bcd4 100644
--- a/pages/manifest/cabinHistory/cabinHistory.vue
+++ b/pages/manifest/cabinHistory/cabinHistory.vue
@@ -91,7 +91,7 @@
 		watch:{
 			fromData: {
 				handler(newValue, oldValue) {
-					this.getHistory();
+					// this.getHistory();
 				},
 				deep: true,
 				immediate: true
@@ -124,9 +124,9 @@
 						status: 'loading',
 					},
 					'COSCO': {
-						name: '法国达飞',
-						code: 'CMA',
-						image: '../../../static/image/logo/cma.png',
+						name: '中远',
+						code: 'COSCO',
+						image: '../../../static/image/logo/cosco.png',
 						list: [],
 						status: 'loading',
 					},
@@ -142,6 +142,13 @@
 		},
 		onLoad(op){
 			this.fromData = JSON.parse(op.data);
+			this.getHistory();
+		},
+		onUnload(){
+			Object.keys(this.webCode).map((item,index)=>{
+				this.webCode[item].status = 'loading';
+			});
+			console.log('== 页面卸载 ==', this.webCode)
 		},
 		methods: {
 			reset(){
diff --git a/pages/manifest/cabinQuery/cabinQuery.vue b/pages/manifest/cabinQuery/cabinQuery.vue
index a342d5b..df171e5 100644
--- a/pages/manifest/cabinQuery/cabinQuery.vue
+++ b/pages/manifest/cabinQuery/cabinQuery.vue
@@ -27,6 +27,15 @@
 					<text class="icon iconfont icon-daoda"></text>
 				</view>
 			</view>
+			
+			<view class="choice-btn"  @click="openInputSerch('webCode')">
+				<view class="left"><text class="iconfont icon-a-jizhuangxiang1"></text><text class="tip">船公司</text></view>
+				<view class="right">
+					<text class="gk" v-if="fromData.webCode">{{fromData.webCodeName }}</text>
+					<text class="gk"  v-else>请选择船公司</text>
+					<text class="icon iconfont icon-daoda"></text>
+				</view>
+			</view>
 
 			<view class="choice-btn">
 				<view class="left"><text class="iconfont icon-shijian"></text><text class="tip">开始时间</text></view>
@@ -138,6 +147,8 @@
 					portArrival: '',
 					portArrivalCode: '',
 					boxType: '',
+					webCode: '',
+					webCodeName: '',
 					// portArrival: 'GDANSK, POLAND',
 					// portArrivalCode: 'PLGDN',
 					// boxType: '22G1',
@@ -154,6 +165,43 @@
 					history: null,
 				},
 				inputSearchRes: {},
+				webCodeData:[
+						{
+							name: '马士基',
+							code: 'MSK',
+							image: '../../../static/image/logo/msk.png',
+							list: [],
+							status: 'loading',
+						},
+						{
+							name: 'MCC',
+							code: 'MCC',
+							image: '../../../static/image/logo/MCC.png',
+							list: [],
+							status: 'loading',
+						},
+						{
+							name: '法国达飞',
+							code: 'CMA',
+							image: '../../../static/image/logo/cma.png',
+							list: [],
+							status: 'loading',
+						},
+						{
+							name: '中远',
+							code: 'COSCO',
+							image: '../../../static/image/logo/cosco.png',
+							list: [],
+							status: 'loading',
+						},
+						{
+							name: 'OOCL',
+							code: 'OOCL',
+							image: '../../../static/image/logo/oocl.png',
+							list: [],
+							status: 'loading',
+						}
+					],
 			}
 		},
 		watch: {
@@ -279,6 +327,19 @@
 						} : null,
 					}
 					this.$set(this, 'inputSearchData' , data)
+				}else if(type == 'webCode'){
+					let data = {
+						placeholder: '请输入船公司',
+						dataList: [],
+						showName: 'name',
+						type: 'webCode',
+						history: this.fromData.webCode ? {
+							name: this.fromData.webCodeName,
+							code: this.fromData.webCode,
+						} : null,
+					}
+					this.$set(this, 'inputSearchData' , data)
+					this.$set(this.inputSearchData, 'dataList', this.webCodeData);
 				}
 			},
 			
@@ -302,7 +363,7 @@
 						this.$set(this.inputSearchData, 'dataList', []);
 						this.$refs.inputView.$data.inLoading = false;
 					})
-				}else{
+				}else if(this.inputSearchData.type == 'boxType'){
 					realBox({
 						name: key,
 					}).then(res =>{
@@ -319,6 +380,27 @@
 						this.$set(this.inputSearchData, 'dataList', []);
 						this.$refs.inputView.$data.inLoading = false;
 					})
+				}else if(this.inputSearchData.type == 'webCode'){
+					let newData = [];
+					this.webCodeData.map((item,index)=>{
+						if(item.name.includes(key)){
+							newData.push(item)
+						}
+					})
+					console.log(newData)
+					if(newData.length > 0){
+						setTimeout(()=>{
+							this.$set(this.inputSearchData, 'dataList', newData);
+							this.$refs.inputView.$data.inLoading = false;
+							this.$forceUpdate()
+						},300)
+					}else{
+						setTimeout(()=>{
+							this.$set(this.inputSearchData, 'dataList', []);
+							this.$refs.inputView.$data.inLoading = false;
+							this.$forceUpdate()
+						},300)
+					}
 				}
 			},
 			
@@ -332,6 +414,9 @@
 					this.fromData.portArrivalCode  = data.code;
 				}else if(this.inputSearchData.type == 'boxType'){
 					this.fromData.boxType = data.Code;
+				}else if(this.inputSearchData.type == 'webCode'){
+					this.fromData.webCode = data.code;
+					this.fromData.webCodeName  = data.name;
 				}
 				this.inputSearchShow = false;
 				this.inputSearchData = {
diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..e3ec40d
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,13 @@
+const path = require("path");
+
+module.exports = {
+  pluginOptions: {
+    "style-resources-loader": {
+      preProcessor: "less",
+      patterns: [
+        // 全局变量路径，不能使用路径别名
+        path.resolve(__dirname, "./common/css/variables.less"),
+      ],
+    },
+  },
+};
\ No newline at end of file