From 39e850b22f0528414f9101475ebd197a6c40d9f0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 20 四月 2024 12:48:53 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 14 +++++++-------
pages/order/orderPakin.vue | 24 +++++++++++++++++++++---
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 34dc1ee..5525a0a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -38,13 +38,13 @@
// cuIcon: 'order',
// url: '/pakin/pickAgain'
// },
- // {
- // title: '璁㈠崟鍏ュ簱',
- // name: 'orderPakin',
- // color: 'red',
- // cuIcon: 'pullup',
- // url: '/order/orderPakin'
- // },
+ {
+ title: '璁㈠崟鍏ュ簱',
+ name: 'orderPakin',
+ color: 'red',
+ cuIcon: 'pullup',
+ url: '/order/orderPakin'
+ },
// {
// title: '缁勬墭涓婃灦',
// name: 'putOn',
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 24be376..e698924 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -15,6 +15,17 @@
<!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
</view>
</view>
+ <view class="item">
+ <view class="code-decs">婊℃墭:</view>
+ <radio-group @change="isFrozen">
+ <label>
+ <radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
+ </view>
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -40,7 +51,7 @@
</view>
<view class="list-left-item">
<view class="desc">鍚嶇О锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="left-item" style="word-break: break-all;">{{item.maktx}}</view>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
@@ -169,7 +180,10 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- removeNum: 0
+ removeNum: 0,
+ ck1: true,
+ ck2: false,
+ isFull: true
}
},
onShow() {
@@ -287,6 +301,9 @@
this.content = '鏄惁鐜板湪鍏ュ簱!'
this.$refs.combConfirm.open()
},
+ isFrozen() {
+ this.isFull = !this.isFull
+ },
comb() {
uni.vibrateShort();
let that = this;
@@ -311,6 +328,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
+ isFull: that.isFull,
combMats: that.dataList
}),
method: 'POST',
@@ -442,7 +460,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
--
Gitblit v1.9.1