From 5411bd7850f9e25ae7a04c40a13cbe233a86ec11 Mon Sep 17 00:00:00 2001
From: Phoenix <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 8 Apr 2024 14:35:31 +0800
Subject: [PATCH] submit

---
 pages/consignment-painting/index.vue | 77 +++++++++++++++++-----------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 5e0b008..e9711b8 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -91,7 +91,7 @@
             <div class="wrap1_1_1">画作平尺数</div>
             <div class="wrap1_1_2"></div>
             <div class="wrap1_1_3">
-              <input  type="number" style="color: #939393;font-size: 24rpx;" v-model="listPaintings[index].artworkSquareSize"  @input="(e)=>{inputConfirm(e,index)}"  placeholder-style="color: #939393;font-size: 24rpx;z-index:0" placeholder="请输入画作平尺数"/>
+              <input type="number" style="color: #939393;font-size: 24rpx;" v-model="listPaintings[index].artworkSquareSize"  @input="(e)=>{inputConfirm(e,index)}"  placeholder-style="color: #939393;font-size: 24rpx;z-index:0" placeholder="请输入画作平尺数"/>
             </div>
           </div>
         </div>
@@ -134,30 +134,8 @@
         </div>
         <div class="wrap2">添加</div>
       </div>
-      <u-popup :round="15" :show="show_2" mode="bottom"  @open="()=>{show_2=true}">
-      <div class="poup1" >
-        <div class="content1">
-          <div class="wrap1">更换您的寄存地址</div>
-          <div @click="show_2=false" class="wrap2">
-            <image
-                src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/d84593b3-10a8-4d86-be8c-b048b03b22c7.png"></image>
-          </div>
-        </div>
-        <div class="content2"></div>
-        <div class="content3">
-          <div v-for="(itemaddress,index1) of addressList" @click="selectAddress(itemaddress,index)"
-               :class="[listPaintings[index].warehouseID===itemaddress.ID?'active':'']" :key="index1" class="wrap1">
-            <div class="wrap1_1">{{ itemaddress.address }}</div>
-            <div class="wrap1_2">*剩余{{ itemaddress.leftNum }}位置</div>
-          </div>
-        </div>
-        <div class="content2"></div>
-        <div class="content6" @click="confirmAddress">
-          <div class="wrap1">确定</div>
-        </div>
-      </div>
-      </u-popup>
-      <u-picker v-if="show_1" :show="show_1" ref="uPicker" :columns="columns" @confirm="(e)=>{confirmDate(e,index)}" @cancel="closeClick" @change="(e)=>{changeHandler(e,index)}"></u-picker>
+
+
     </div>
   </scroll-view>
     <div class="content5" @click="expand1">
@@ -176,6 +154,30 @@
       </div>
       <div class="wrap2" @click.stop="signContract">确认金额并签署合同</div>
     </div>
+    <u-popup :round="15" :show="show_2" mode="bottom"  @open="()=>{show_2=true}">
+      <div class="poup1" >
+        <div class="content1">
+          <div class="wrap1">更换您的寄存地址</div>
+          <div @click="show_2=false" class="wrap2">
+            <image
+                src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/d84593b3-10a8-4d86-be8c-b048b03b22c7.png"></image>
+          </div>
+        </div>
+        <div class="content2"></div>
+        <div class="content3">
+          <div v-for="(itemaddress,index1) of addressList" @click="selectAddress(itemaddress)"
+               :class="[listPaintings[currentIndex].warehouseID===itemaddress.ID?'active':'']" :key="index1" class="wrap1">
+            <div class="wrap1_1">{{ itemaddress.address }}</div>
+            <div class="wrap1_2">*剩余{{ itemaddress.leftNum }}位置</div>
+          </div>
+        </div>
+        <div class="content2"></div>
+        <div class="content6" @click="confirmAddress">
+          <div class="wrap1">确定</div>
+        </div>
+      </div>
+    </u-popup>
+    <u-picker v-if="show_1" :show="show_1" ref="uPicker" :columns="columns" @confirm="(e)=>{confirmDate(e)}" @cancel="closeClick" @change="(e)=>{changeHandler(e)}"></u-picker>
     <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在进入法大大签署..."></u-loading-page>
   </div>
 </template>
@@ -193,7 +195,7 @@ export default {
       columns: [
         [180],
         ['*'],
-        [1,2,3,4,5],
+        [1,2,3,4,5,6,7,8,9,10,11],
         ['='],
         [180]
       ],
@@ -279,7 +281,14 @@ export default {
   },
   methods: {
     inputConfirm: _.debounce(function (event,index) {
-      this.obtainAmount(index)
+      this.listPaintings[index].artworkSquareSize=event.target.value.replace(/\D/g, '')
+      let number = parseInt(this.listPaintings[index].artworkSquareSize, 10);
+      if (isNaN(number) || number <= 0) {
+        this.listPaintings[index].artworkSquareSize=''
+      }else {
+        this.obtainAmount(index)
+      }
+
     }, 1000),
     addDaysToCurrentDate(days) {
       return dayjs().add(days, 'day').format('YYYY-MM-DD');
@@ -330,7 +339,7 @@ export default {
         picker = this.$refs.uPicker
       } = e
       if (columnIndex === 2) {
-        picker[this.currentIndex].setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
+        picker.setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
       }
     },
     itemDelete(index){
@@ -499,6 +508,7 @@ export default {
            })
            return
          }
+
          if (!item[check.value]) {
 
            uni.showToast({
@@ -507,6 +517,15 @@ export default {
            })
            return
          }
+         if (check.value==='artworkSquareSize'){
+           if (Number(item[check.value])<1){
+             uni.showToast({
+               title: `第${index+1}条数据的${check.message}应大于0`,
+               icon: 'none'
+             })
+             return
+           }
+         }
        }
      }
      this.loading=true
@@ -576,7 +595,7 @@ export default {
     confirmAddress() {
       this.show_2 = false
     },
-    selectAddress(item,index) {
+    selectAddress(item) {
       this.listPaintings[this.currentIndex].warehouseID = item.ID
       if (this.currentIndex===0){
         this.listPaintings.forEach((x)=>{