diff --git a/canteen/pages.json b/canteen/pages.json
index 34cc2bf..9ad48ed 100644
--- a/canteen/pages.json
+++ b/canteen/pages.json
@@ -15,7 +15,8 @@
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#11D189",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "white",
+ "navigationStyle": "custom"
}
},
{
diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue
index 00ec440..c5a7394 100644
--- a/canteen/pages/delivery/apply.vue
+++ b/canteen/pages/delivery/apply.vue
@@ -21,6 +21,7 @@
width="max-content" height="80vh"
v-if="contents.length">
+
@@ -211,6 +212,7 @@
justify-content: center;
align-items: center;
border-top: 1rpx solid #E5E5E5;
+ background-color: #fff;
.btn{
width: 320rpx;
height: 82rpx;
diff --git a/canteen/pages/login/index.vue b/canteen/pages/login/index.vue
index 2cbaf58..2b92bf2 100644
--- a/canteen/pages/login/index.vue
+++ b/canteen/pages/login/index.vue
@@ -1,6 +1,11 @@
-
+
+
+ 登录
+
+
+
@@ -14,7 +19,7 @@
:adjust-position="false"
:auto-blur="true"
placeholder="请输入账号"
- @focus="inputFocus(170)"
+ @focus="inputFocus(190)"
@blur="inputBlur" />
@@ -28,7 +33,7 @@
:auto-blur="true"
placeholder="请输入密码"
:password="true"
- @focus="inputFocus(220)"
+ @focus="inputFocus(230)"
@blur="inputBlur"
@confirm="login" />
@@ -55,12 +60,6 @@
onLoad(options){
// todo 优化：input输入后有clear按钮
},
- onReady(){
- // #ifndef MP
- var a = document.getElementsByClassName('uni-page-head-hd')[0];
- a.style.display = 'none';
- // #endif
- },
methods: {
inputFocus(scrollTop){
time = setTimeout(() => {
@@ -103,9 +102,26 @@
margin-top: 60rpx;
}
.head{
- height: 604rpx;
+ height: 750rpx;
width: 750rpx;
background-color: #11D189;
+ position: relative;
+ image{
+ width: 626.5rpx;
+ height: 582rpx;
+ position: absolute;
+ top: calc(50% - 240rpx);
+ left: calc(50% - 313rpx);
+ z-index: 0;
+ }
+ .nav{
+ text-align: center;
+ padding-top: 70rpx;
+ padding-bottom: 34rpx;
+ color: #FFFFFF;
+ font-size: 32rpx;
+ font-weight: bold;
+ }
}
.content{
width: 686rpx;
@@ -120,10 +136,12 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ position: relative;
+ z-index: 2;
.input{
// padding: 20rpx 0;
border-bottom: 1rpx solid #e5e5e5;
- font-size: 60rpx;
+ font-size: 48rpx;
/* #ifdef MP */
height: 90rpx;
line-height: 90rpx;
diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue
index 7f46978..1ae6de9 100644
--- a/canteen/pages/purchase/order.vue
+++ b/canteen/pages/purchase/order.vue
@@ -97,10 +97,15 @@
stateClass(){
return function(val){
let class_name = {
- '等待接单': 'quoted-price',
- '等待发货': 'wait',
- '已完成': 'passed',
- '已退单': 'refuse'
+ '待发单': 'quoted-price',
+ '待审核': 'quoted-price',
+ '待接单': 'quoted-price',
+ '备货中': 'wait',
+ '已发货': 'wait',
+ '已收货': 'passed',
+ '已入库': 'passed',
+ '已退单': 'refuse',
+ '已撤销': 'refuse'
}
return class_name[val];
}
diff --git a/canteen/static/images/login_bg.png b/canteen/static/images/login_bg.png
new file mode 100644
index 0000000..81e65f9
Binary files /dev/null and b/canteen/static/images/login_bg.png differ
diff --git a/canteen/uview-ui/components/u-tabs/u-tabs.vue b/canteen/uview-ui/components/u-tabs/u-tabs.vue
index 883865d..f0897ef 100644
--- a/canteen/uview-ui/components/u-tabs/u-tabs.vue
+++ b/canteen/uview-ui/components/u-tabs/u-tabs.vue
@@ -11,7 +11,7 @@
{{ item[name] || item['name']}}
-
+
diff --git a/supplier/pages.json b/supplier/pages.json
index e3fb38a..efaf2cf 100644
--- a/supplier/pages.json
+++ b/supplier/pages.json
@@ -6,17 +6,16 @@
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true
+ "navigationBarTitleText": ""
}
},
{
"path": "pages/login/index",
"style": {
"navigationBarTitleText": "登录",
- "enablePullDownRefresh": true,
"navigationBarBackgroundColor":"#1833F2",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "white",
+ "navigationStyle": "custom"
}
},
{
diff --git a/supplier/pages/login/index.vue b/supplier/pages/login/index.vue
index bf97f63..18681f7 100644
--- a/supplier/pages/login/index.vue
+++ b/supplier/pages/login/index.vue
@@ -1,6 +1,11 @@
-
+
+
+ 登录
+
+
+
@@ -14,7 +19,7 @@
:adjust-position="false"
:auto-blur="true"
placeholder="请输入账号"
- @focus="inputFocus(170)"
+ @focus="inputFocus(190)"
@blur="inputBlur" />
@@ -28,7 +33,7 @@
:auto-blur="true"
placeholder="请输入密码"
:password="true"
- @focus="inputFocus(220)"
+ @focus="inputFocus(230)"
@blur="inputBlur"
@confirm="login" />
@@ -52,12 +57,6 @@
user_pw: ''
}
},
- onReady(){
- // #ifndef MP
- var a = document.getElementsByClassName('uni-page-head-hd')[0];
- a.style.display = 'none';
- // #endif
- },
methods: {
inputFocus(scrollTop){
time = setTimeout(() => {
@@ -100,9 +99,26 @@
margin-top: 60rpx;
}
.head{
- height: 604rpx;
+ height: 750rpx;
width: 750rpx;
background-color: #1833F2;
+ position: relative;
+ image{
+ width: 626.5rpx;
+ height: 582rpx;
+ position: absolute;
+ top: calc(50% - 240rpx);
+ left: calc(50% - 313rpx);
+ z-index: 0;
+ }
+ .nav{
+ text-align: center;
+ padding-top: 70rpx;
+ padding-bottom: 34rpx;
+ color: #FFFFFF;
+ font-size: 32rpx;
+ font-weight: bold;
+ }
}
.content{
width: 686rpx;
@@ -117,10 +133,12 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ position: relative;
+ z-index: 2;
.input{
// padding: 20rpx 0;
border-bottom: 1rpx solid #e5e5e5;
- font-size: 60rpx;
+ font-size: 48rpx;
/* #ifdef MP */
height: 90rpx;
line-height: 90rpx;
diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue
index d339fff..0b2e8e4 100644
--- a/supplier/pages/offer/index.vue
+++ b/supplier/pages/offer/index.vue
@@ -34,6 +34,7 @@
@onInputChange="onInputChange"
width="100%" height="80vh">
+
@@ -101,7 +102,6 @@
}
},
onLoad(options){
- // todo 编辑的处理
this.code = options.code || '';
this.type = options.type || 0;
if(options.type == 1){
@@ -128,6 +128,11 @@
that.node_top = num;
}).exec()
},
+ onPageScroll(){
+ if(this.is_show){
+ this.is_show = false;
+ }
+ },
methods: {
// 获取物资列表
getMaterialList(){
@@ -336,6 +341,7 @@
justify-content: center;
align-items: center;
border-top: 1rpx solid #E5E5E5;
+ background-color: #fff;
.btn{
width: 320rpx;
height: 82rpx;
@@ -380,7 +386,7 @@
padding: 0 32rpx;
border-bottom: 1rpx solid #E5E5E5;
color: #222222;
- font-size: 24rpx;
+ font-size: 28rpx;
}
}
}
diff --git a/supplier/pages/order/detail.vue b/supplier/pages/order/detail.vue
index ac57c38..b3544d2 100644
--- a/supplier/pages/order/detail.vue
+++ b/supplier/pages/order/detail.vue
@@ -1,6 +1,10 @@
+
+ 批次号
+ {{ order.batch_sn }}
+
订单编号
{{ order.q_sn }}
@@ -31,7 +35,7 @@
-
+
报价已通过
报价已被拒绝
diff --git a/supplier/pages/order/index.vue b/supplier/pages/order/index.vue
index a3ecd5c..0153876 100644
--- a/supplier/pages/order/index.vue
+++ b/supplier/pages/order/index.vue
@@ -17,6 +17,9 @@
订单状态
{{ item.state }}
+
+ 批次号 {{ item.batch_sn }}
+
报价单号 {{ item.q_sn }}
{{ item.deadline }}
diff --git a/supplier/static/images/login_bg.png b/supplier/static/images/login_bg.png
new file mode 100644
index 0000000..3d24cc3
Binary files /dev/null and b/supplier/static/images/login_bg.png differ
diff --git a/supplier/uview-ui/components/u-tabs/u-tabs.vue b/supplier/uview-ui/components/u-tabs/u-tabs.vue
index 883865d..f0897ef 100644
--- a/supplier/uview-ui/components/u-tabs/u-tabs.vue
+++ b/supplier/uview-ui/components/u-tabs/u-tabs.vue
@@ -11,7 +11,7 @@
{{ item[name] || item['name']}}
-
+