From b32ac491bbafb75b447575b8fa896c81a1b39463 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 13:16:52 +0800
Subject: [PATCH] #
---
static/img/newLogo1.png | 0
pages/login/login.vue | 2 +-
pages/order/orderPakin.vue | 15 ++-------------
pages/pakin/pakin.vue | 29 ++++++-----------------------
4 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 78e9ddc..e304597 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,7 +9,7 @@
<!-- logo -->
<view class="logo">
<view class="logo-box">
- <image src="../../static/img/logo.png" mode="aspectFit"></image>
+ <image src="../../static/img/newLogo1.png" mode="aspectFit"></image>
</view>
</view>
<view class="content">
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index eaa3ac7..9e3d608 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -15,17 +15,6 @@
<!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
</view>
</view>
- <view class="item">
- <view class="code-decs">婊℃墭:</view>
- <radio-group @change="floor">
- <label>
- <radio :checked="ck1"/><text>鏄�</text>
- </label>
- <label>
- <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
- </label>
- </radio-group>
- </view>
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -456,7 +445,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 210rpx;
+ min-height: 140rpx;
background-color: #FFF;
z-index: 10;
}
@@ -495,7 +484,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 9c3458a..7b19595 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -15,17 +15,6 @@
<uni-icons type="right" color="#c1c1c1"></uni-icons>
</view>
</view>
- <view class="item">
- <view class="code-decs">婊℃墭:</view>
- <radio-group @change="floor">
- <label>
- <radio :checked="ck1"/><text>鏄�</text>
- </label>
- <label>
- <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
- </label>
- </radio-group>
- </view>
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -167,9 +156,6 @@
matFocus: false,
matData: '',
removeNum: 0,
- ck1: true,
- ck2: false,
- isFull: true
}
},
onLoad() {
@@ -180,12 +166,6 @@
this.token = uni.getStorageSync('token');
},
methods: {
- floor() {
- var temp = this.ck1
- this.ck1 = this.ck2
- this.ck2 = temp
- this.isFull = !temp
- },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -412,7 +392,6 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
- isFull: that.isFull,
combMats: that.dataList
}),
method: 'POST',
@@ -471,11 +450,15 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+
+ .list:first-child {
+ margin-top: 320rpx;
+ }
.code {
width: 100%;
position: fixed;
- min-height: 210rpx;
+ min-height: 140rpx;
background-color: #FFF;
z-index: 10;
}
@@ -515,7 +498,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/static/img/newLogo1.png b/static/img/newLogo1.png
new file mode 100644
index 0000000..ddec72c
--- /dev/null
+++ b/static/img/newLogo1.png
Binary files differ
--
Gitblit v1.9.1