diff --git a/app.js b/app.js
index 46624a4..8c77500 100644
--- a/app.js
+++ b/app.js
@@ -15,7 +15,7 @@ App({
globalData: {
// 本地环境
- baseUrl: 'http://192.168.51.4:8201/mall-portal',
+ baseUrl: 'http://192.168.51.6:8201/mall-portal',
// 线上环境
// baseUrl:'https://portal-api.macrozheng.com',
token: '',
diff --git a/app.wxss b/app.wxss
index fd6e2ee..a876eb7 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,12 +1,12 @@
/**app.wxss**/
page{
- background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1)
+ background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f4f4f4)
}
.box{
- background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1);
+ background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f4f4f4);
min-height: 1400rpx;
- padding: 20rpx;
+ padding: 5rpx 15rpx;
font-size: 28rpx;
}
diff --git a/images/saoma.png b/images/saoma.png
new file mode 100644
index 0000000..6e4947c
Binary files /dev/null and b/images/saoma.png differ
diff --git a/pages/freiLogistics/freiLogistics.json b/pages/freiLogistics/freiLogistics.json
index 59d9f03..7067bc5 100644
--- a/pages/freiLogistics/freiLogistics.json
+++ b/pages/freiLogistics/freiLogistics.json
@@ -1,4 +1,4 @@
{
"usingComponents": {},
- "navigationBarTitleText": "物流签收"
+ "navigationBarTitleText": "三力货运物流"
}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 36416cb..4d523f0 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -138,10 +138,6 @@ Page({
url = '../queryfrei/queryfrei'
}
- //合作物流
- if(tag == 'goOtherLogistics'){
- url = '../otherLogistics/otherLogistics'
- }
wx.navigateTo({
url: url,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3e925d3..9e3c09b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -44,13 +44,7 @@
货运查询
-
-
-
- 合作物流
-
-
-
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 728c87d..6dffb1f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -48,7 +48,9 @@ page {
background-color: #3ec6c9;
color: #fff;
margin-top: 10rpx;
- padding: 30rpx 10rpx;
+ padding: 25rpx 10rpx;
+ font-size: 35rpx;
+ letter-spacing: 2rpx;
width: 98% !important;
}
diff --git a/pages/meLogistics/meLogistics.wxml b/pages/meLogistics/meLogistics.wxml
index 4303646..6704550 100644
--- a/pages/meLogistics/meLogistics.wxml
+++ b/pages/meLogistics/meLogistics.wxml
@@ -1,21 +1,18 @@
-
-
-
-
- 扫 码
-
+
+
+
+
+
+
-
+
总计:{{sampleCount}}/管数
-
-
-
@@ -75,7 +72,6 @@
-
- 数 量:
+ 数 量:
@@ -152,14 +148,14 @@
- 备 注:
+ 备 注:
-
+
-
+
\ No newline at end of file
diff --git a/pages/meLogistics/meLogistics.wxss b/pages/meLogistics/meLogistics.wxss
index 6b756f0..c90282f 100644
--- a/pages/meLogistics/meLogistics.wxss
+++ b/pages/meLogistics/meLogistics.wxss
@@ -7,17 +7,18 @@
}
.top input {
- border: 1rpx #333 solid;
+ background-color: #fff;
+ border-radius: 40rpx !important;
height: 60rpx;
width: 700rpx;
border-radius: 5rpx;
- padding: 5rpx 10rpx;
+ padding: 3rpx 30rpx;
+ font-size: 24rpx;
}
.top view {
- width: 305rpx;
+ width: 120rpx;
margin-left: 20rpx;
- background-color: #eee;
display: flex;
justify-content: center;
align-items: center;
@@ -29,8 +30,9 @@
.form {
background-color: #fff;
border-radius: 15rpx;
- padding: 0rpx 30rpx;
+ padding: 10rpx 30rpx;
margin-bottom: 15rpx;
+ margin-top: 15rpx;
}
.form .from-con {
@@ -46,6 +48,7 @@
color: red;
font-weight: 900;
font-size: 28rpx;
+ width: 30%;
}
.from-con text {
@@ -60,6 +63,10 @@
.from-con input {
text-align: right;
padding: 10rpx;
+ /* background-color: #23c559; */
+ position: relative;
+ left: 28%;
+ width: 70%;
}
.place {
@@ -70,7 +77,7 @@
display: flex;
justify-content: space-between;
align-items: center;
- padding-left: 40rpx;
+ padding-left: 30rpx;
}
.bush button {
@@ -85,36 +92,41 @@
}
.bush-img {
-
display: flex;
flex-wrap: wrap;
justify-content: space-around;
- padding: 20rpx 10rpx;
+ padding:10rpx;
width: 100%;
}
.bush-img image {
- width: 100rpx;
- height: 100rpx;
+ width: 120rpx;
+ height: 120rpx;
margin-top: 5rpx;
- border: 1rpx solid #999;
- border-radius: 5rpx;
+ /* border: 10rpx solid #eee;
+ background-color: #eee; */
+ border: 1rpx solid #ddd;
+ /* background-color: #ddd; */
+ border-radius: 10rpx;
}
.back {
- margin-top: 15rpx;
+ margin-top: 10rpx;
}
.back_img_box {
- margin-top: 20rpx;
+ margin-top: 15rpx;
padding-top: 10rpx;
- background-color: #e6e6e6;
- border-radius: 5rpx;
+ background-color: #f6f6f6;
+ /* background-color: #fff; */
+ border-radius: 15rpx;
}
.con {
display: flex;
align-items: center;
+ padding: 0 20rpx;
+ font-size: 26rpx;
}
.con button {
@@ -129,6 +141,8 @@
}
.bottomButton {
+ width: 100% !important;
+ height: 90rpx;
margin-top: 30rpx;
margin-bottom: 80rpx;
padding: 0rpx 10rpx;
@@ -137,13 +151,15 @@
align-items: center;
justify-content: center;
text-align: center;
- background-color: #7f96d3;
+ background-color:#4eb8b9;
+ color: #fff;
+ border-radius: 50rpx;
}
.tabel {
margin-top: 20rpx;
width: 100%;
- border: 1rpx #ddd solid;
+ /* border: 1rpx #eee solid; */
}
@@ -170,7 +186,7 @@
background-color: #51bdbe;
color: #fff;
font-weight: 700;
- font-size: 28rpx;
+ font-size: 26rpx !important;
}
.td1 {
diff --git a/pages/otherLogistics/otherLogistics.wxss b/pages/otherLogistics/otherLogistics.wxss
index c6a8cc1..3f6a7bf 100644
--- a/pages/otherLogistics/otherLogistics.wxss
+++ b/pages/otherLogistics/otherLogistics.wxss
@@ -5,7 +5,7 @@
font-size: 28rpx;
}
.top input{
- border: 1rpx #333 solid;
+ border: 1rpx #f1f1f1 solid;
height: 60rpx;
width: 700rpx;
border-radius: 5rpx;
diff --git a/pages/threeLogistics/threeLogistics.json b/pages/threeLogistics/threeLogistics.json
index 59d9f03..79b2825 100644
--- a/pages/threeLogistics/threeLogistics.json
+++ b/pages/threeLogistics/threeLogistics.json
@@ -1,4 +1,4 @@
{
"usingComponents": {},
- "navigationBarTitleText": "物流签收"
+ "navigationBarTitleText": "三力第三方物流"
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 4d863e9..09fba3c 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -83,6 +83,20 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/meLogistics/meLogistics",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/threeLogistics/threeLogistics",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}