submit

pages/confirm-order/index.vue

@@ -645,9 +645,13 @@ export default {
       this.data = [e.detail.value[0] + 1990, e.detail.value[1] + 1, e.detail.value[2] + 1]
     },
     back() {
+      if (this.type==='detail'){
+        uni.redirectTo({url: '/pages/home/index'})
+      }else {
         uni.navigateBack({delta: 2})
       }
     }
+  }
 }
 </script>
 <style scoped lang="scss">

pages/consignment-painting/index.vue

@@ -92,7 +92,7 @@
             <div class="wrap1_1_1">画作平尺数</div>
             <div class="wrap1_1_2"></div>
             <div class="wrap1_1_3">
-              <input style="color: #939393;font-size: 24rpx;" v-model="listPaintings[index].artworkSquareSize"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
+              <input  type="number" style="color: #939393;font-size: 24rpx;" v-model="listPaintings[index].artworkSquareSize"   placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
             </div>
           </div>
         </div>
@@ -127,7 +127,7 @@
         </div>
         <div class="wrap2"></div>
       </div>
-      <div class="content7" @click="addPainting">
+      <div class="content7" v-if="index===listPaintings.length-1" @click="addPainting">
         <div class="wrap1">
           <div class="horizontal"></div>
           <div class="vertical"></div>
@@ -136,8 +136,6 @@
       </div>
     </div>
   </scroll-view>
-
-
     <div class="content5">
       <div class="wrap4" v-show="isExpand1" :style="{top:`-${152*listPaintings.length}rpx`}">
         <div class="item" v-for="(item,index) in listPaintings">
@@ -594,7 +592,15 @@ export default {
      }]
      for (const [index,item] of this.listPaintings.entries()) {
        for (const check of checks) {
+         if (check.value==='fileList1'&&item.fileList1.length<1){
+           uni.showToast({
+             title: `请完善第${index+1}条数据的${check.message}`,
+             icon: 'none'
+           })
+           return
+         }
          if (!item[check.value]) {
+
            uni.showToast({
              title: `请完善第${index+1}条数据的${check.message}`,
              icon: 'none'
@@ -640,7 +646,7 @@ export default {
      }
       const res = await postDataByParams('/api/v2/warehouse/calculate',data)
      if (res.code===200){
-       this.listPaintings[this.currentIndex].expectedPayment=res.data.orders?.[0]?.money
+       this.listPaintings[this.currentIndex].expectedPayment=Number(res.data.orders?.[0]?.money)
      }
     },
     confirmCycle() {