Parcourir la source

refactor: add new input fields for item details and enhance layout in PageFour component

Yannay il y a 2 mois
Parent
commit
3ba13921dc

+ 79 - 46
pages/orderDetailRefactored/components/PageFour.vue

@@ -9,6 +9,57 @@
9 9
         </view>
10 10
 
11 11
         <!-- 编码、快递单号、物流图片 -->
12
+
13
+
14
+        <!-- 收单物品、收单类型 -->
15
+        <u-row class="info-row" justify="space-between">
16
+          <u-col span="5.8">
17
+            <u-form-item label="收单物品" prop="item">
18
+              <u--input v-model="warehouseInfo.item" placeholder="请输入收单物品" class="info-input" />
19
+            </u-form-item>
20
+          </u-col>
21
+          <view @tap="selectCustomerServiceName">
22
+            <u-col span="5.8">
23
+              <u-form-item label="收单类型" prop="customerServiceNameLabel">
24
+                <view class="click-wrapper">
25
+                  <u--input v-model="warehouseInfo.customerServiceNameLabel" placeholder="点击选择收单类型" class="info-input"
26
+                    disabled />
27
+                </view>
28
+              </u-form-item>
29
+              <u-picker :show="showCustomerServicePicker" :columns="customerServiceColumns" confirm keyName="label"
30
+                @confirm="handleConfirmCustomerService" @cancel="showCustomerServicePicker = false" />
31
+            </u-col>
32
+          </view>
33
+        </u-row>
34
+
35
+        <!-- 类别、是否需要查码 -->
36
+        <u-row class="info-row" justify="space-between">
37
+          <u-col span="5.8">
38
+            <view @tap="selectCategory">
39
+              <u-form-item label="类别" prop="category">
40
+                <view class="click-wrapper">
41
+                  <u--input v-model="warehouseInfo.categoryLabel" placeholder="点击选择类别" class="info-input" disabled />
42
+                </view>
43
+              </u-form-item>
44
+              <u-picker :show="showCategoryPicker" :columns="categoryColumns" confirm keyName="label"
45
+                @confirm="handleConfirmCategory" @cancel="showCategoryPicker = false" />
46
+            </view>
47
+          </u-col>
48
+          <u-col span="5.8">
49
+            <view @tap="selectNeedCheckCode">
50
+              <u-form-item label="是否需要查码" prop="needCheckCode">
51
+                <view class="click-wrapper">
52
+                  <u--input v-model="warehouseInfo.needCheckCodeLabel" placeholder="点击选择是否需要查码" class="info-input"
53
+                    disabled />
54
+                </view>
55
+              </u-form-item>
56
+              <u-picker :show="showNeedCheckCodePicker" :columns="needCheckCodeColumns" confirm keyName="label"
57
+                @confirm="handleConfirmNeedCheckCode" @cancel="showNeedCheckCodePicker = false" />
58
+            </view>
59
+          </u-col>
60
+        </u-row>
61
+
62
+
12 63
         <u-row class="info-row" justify="space-between">
13 64
           <u-col span="4.5">
14 65
             <u-form-item label="编码" prop="codeStorage">
@@ -32,48 +83,6 @@
32 83
           </u-col>
33 84
         </u-row>
34 85
 
35
-        <!-- 收单物品、收单类型 -->
36
-        <u-row class="info-row" justify="space-between">
37
-          <u-col span="5.8">
38
-            <u-form-item label="收单物品" prop="item">
39
-              <u--input v-model="warehouseInfo.item" placeholder="请输入收单物品" class="info-input" />
40
-            </u-form-item>
41
-          </u-col>
42
-          <u-col span="5.8">
43
-            <u-form-item label="收单类型" prop="customerServiceNameLabel">
44
-              <view class="click-wrapper" @tap="selectCustomerServiceName">
45
-                <u--input v-model="warehouseInfo.customerServiceNameLabel" placeholder="点击选择收单类型" class="info-input"
46
-                  disabled />
47
-              </view>
48
-            </u-form-item>
49
-            <u-picker :show="showCustomerServicePicker" :columns="customerServiceColumns" confirm keyName="label"
50
-              @confirm="handleConfirmCustomerService" @cancel="showCustomerServicePicker = false" />
51
-          </u-col>
52
-        </u-row>
53
-
54
-        <!-- 类别、是否需要查码 -->
55
-        <u-row class="info-row" justify="space-between">
56
-          <u-col span="5.8">
57
-            <u-form-item label="类别" prop="category">
58
-              <view class="click-wrapper" @tap="selectCategory">
59
-                <u--input v-model="warehouseInfo.categoryLabel" placeholder="点击选择类别" class="info-input" disabled />
60
-              </view>
61
-            </u-form-item>
62
-            <u-picker :show="showCategoryPicker" :columns="categoryColumns" confirm keyName="label"
63
-              @confirm="handleConfirmCategory" @cancel="showCategoryPicker = false" />
64
-          </u-col>
65
-          <u-col span="5.8">
66
-            <u-form-item label="是否需要查码" prop="needCheckCode">
67
-              <view class="click-wrapper" @tap="selectNeedCheckCode">
68
-                <u--input v-model="warehouseInfo.needCheckCodeLabel" placeholder="点击选择是否需要查码" class="info-input"
69
-                  disabled />
70
-              </view>
71
-            </u-form-item>
72
-            <u-picker :show="showNeedCheckCodePicker" :columns="needCheckCodeColumns" confirm keyName="label"
73
-              @confirm="handleConfirmNeedCheckCode" @cancel="showNeedCheckCodePicker = false" />
74
-          </u-col>
75
-        </u-row>
76
-
77 86
         <!-- 表款、查码费 -->
78 87
         <u-row class="info-row" justify="space-between">
79 88
           <u-col span="5.8">
@@ -144,8 +153,8 @@
144 153
         <u-row class="info-row">
145 154
           <u-col span="12">
146 155
             <u-form-item label="收单备注">
147
-              <u--textarea v-model="warehouseInfo.remarks" placeholder="请输入收单备注" class="info-input" confirmType="done"
148
-                rows="4" />
156
+              <u--textarea v-model="warehouseInfo.remarks" placeholder="请输入收单备注" class="info-textarea"
157
+                confirmType="done" rows="4" />
149 158
             </u-form-item>
150 159
           </u-col>
151 160
         </u-row>
@@ -156,7 +165,7 @@
156 165
     <view class="card-wrap">
157 166
       <view class="address-section">
158 167
         <view class="address-header add-button-container">
159
-            <text class="address-title">分成信息</text>
168
+          <text class="address-title">分成信息</text>
160 169
 
161 170
           <view class="add-button" @click="addSplit">
162 171
             <u-icon name="plus" size="24rpx" color="#108cff" />
@@ -791,6 +800,30 @@ export default {
791 800
   box-sizing: border-box;
792 801
 }
793 802
 
803
+.info-textarea {
804
+  width: 100%;
805
+  box-sizing: border-box;
806
+
807
+  ::v-deep .u-textarea {
808
+    min-height: 200rpx;
809
+    border-radius: 8rpx;
810
+    border: 1rpx solid #e5e7eb;
811
+    padding: 20rpx 16rpx;
812
+    line-height: 1.5;
813
+  }
814
+
815
+  ::v-deep textarea {
816
+    min-height: 200rpx;
817
+    border-radius: 8rpx;
818
+    border: 1rpx solid #e5e7eb;
819
+    padding: 20rpx 16rpx;
820
+    width: 100%;
821
+    box-sizing: border-box;
822
+    line-height: 1.5;
823
+    font-size: 28rpx;
824
+  }
825
+}
826
+
794 827
 .click-wrapper {
795 828
   width: 100%;
796 829
   cursor: pointer;
@@ -908,7 +941,7 @@ export default {
908 941
   border-radius: 11px;
909 942
 }
910 943
 
911
-.add-button-container{
944
+.add-button-container {
912 945
   justify-content: space-between;
913 946
 }
914 947
 </style>

+ 1 - 8
pages/orderDetailRefactored/components/PageOne.vue

@@ -2,14 +2,7 @@
2 2
   <view class="page-one-container">
3 3
     <!-- 图片资料标题 -->
4 4
     <view class="page-header">
5
-      <!-- <text class="page-title">图片资料</text>
6
-      <u-button 
7
-        size="small" 
8
-        @click="handleSaveAllImages"
9
-        class="save-all-btn"
10
-      >
11
-        保存实物图
12
-      </u-button> -->
5
+    
13 6
       <view class="detail-image-header">
14 7
         <text class="detail-image-title">图片资料</text>
15 8
         <view class="copy-btn" @click="handleSaveAllImages">