submit

pages/confirm-order/index.vue

@@ -100,7 +100,7 @@
         </div>
         <div class="content4">
           <div class="wrap1">
-            <div class="wrap1_1" >
+            <div class="wrap1_1">
               <div class="wrap1_1_1">寄存地址</div>
               <div class="wrap1_1_2"></div>
               <div class="wrap1_1_3">
@@ -634,7 +634,6 @@ export default {
           icon: 'none'
         })
       }
-      console.log(res, 'getDetailUrl')
     },
     isDateFont(item, num) {
       if (Array.isArray && this.data.length === 3) {
@@ -646,7 +645,7 @@ export default {
     },
     back() {
       if (this.type==='detail'){
-        uni.redirectTo({url: '/pages/home/index'})
+        uni.switchTab({url: '/pages/home/index'})
       }else {
         uni.navigateBack({delta: 2})
       }

pages/consignment-painting/index.vue

@@ -38,7 +38,7 @@
     <div class="content-scroll" v-for="(item,index) of listPaintings" :id="`item-${index}`">
       <div class="painting-name" v-if="listPaintings.length>1">
         <div class="wrap1">画作{{index+1}}：</div>
-        <div class="wrap2" @click="itemDelete">删除</div>
+        <div class="wrap2" @click="itemDelete(index)">删除</div>
       </div>
       <div class="content2">
         <u-upload
@@ -100,7 +100,7 @@
       </div>
       <div class="content4">
         <div class="wrap1">
-          <div class="wrap1_1" @click="show_2=true">
+          <div class="wrap1_1" @click="show2Click(index)">
             <div class="wrap1_1_1">寄存地址</div>
             <div class="wrap1_1_2"></div>
             <div class="wrap1_1_3">
@@ -112,7 +112,7 @@
               <image src="../../static/zu611@3x.png"></image>
             </div>
           </div>
-          <div class="wrap1_1" @click="openShow1()">
+          <div class="wrap1_1" @click="openShow1(index)">
             <div class="wrap1_1_1">寄存时长</div>
             <div class="wrap1_1_2"></div>
             <div class="wrap1_1_3">
@@ -163,7 +163,7 @@
         </div>
         <div class="content2"></div>
         <div class="content3">
-          <div v-for="(item,index) in addressList" @click="selectAddress(item)"
+          <div v-for="(item,index) in addressList" @click="selectAddress(item,index)"
                :class="[listPaintings[currentIndex].warehouseID===item.ID?'active':'']" :key="index" class="wrap1">
             <div class="wrap1_1">{{ item.address }}</div>
             <div class="wrap1_2">*剩余{{ item.leftNum }}位置</div>
@@ -399,6 +399,10 @@ export default {
     })
   },
   methods: {
+    show2Click(index){
+      this.currentIndex=index
+      this.show_2=true
+    },
     closeClick(){
       this.show_1=false
     },
@@ -444,9 +448,10 @@ export default {
         picker.setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
       }
     },
-    itemDelete(){
-      this.listPaintings.splice(this.currentIndex,1)
+    itemDelete(index){
+      this.listPaintings.splice(index,1)
       this.currentIndex=0
+      this.scrollId=`item-0`
       if (this.listPaintings.length===1){
         this.contentListHeight=0
       }
@@ -509,10 +514,15 @@ export default {
     },
     confirmDate(data){
       this.listPaintings[this.currentIndex].endAt=data.value[data.value.length-1]
+      if (this.currentIndex===0){
+        for (let listPainting of this.listPaintings) {
+          listPainting.endAt=data.value[data.value.length-1]
+        }
+      }
       this.obtainAmount()
       this.show_1=false
     },
-    openShow1(){
+    openShow1(index){
       if (!this.listPaintings[this.currentIndex].artworkSquareSize){
         uni.showToast({
           title: "请先填写画作平尺数",
@@ -521,6 +531,7 @@ export default {
         });
         return
       }
+      this.currentIndex=index
       this.show_1=true
     },
     uploadFilePromise(url, type = null) {
@@ -656,7 +667,15 @@ export default {
       this.show_2 = false
     },
     selectAddress(item) {
+
       this.listPaintings[this.currentIndex].warehouseID = item.ID
+      if (this.currentIndex===0){
+        console.log(this.listPaintings,'this.listPaintings')
+        this.listPaintings.forEach((x)=>{
+          x.warehouseID=item.ID
+        })
+      }
+      this.$forceUpdate()
     },
     selectionPeriod(item) {
       this.cycleId = item.ID

pages/paySuccess/paySuccess.vue

@@ -102,14 +102,16 @@ export default {
   flex-direction: column;
   .content{
     margin-top: 110rpx;
-    max-height: 768rpx;
+    max-height: 800rpx;
     overflow-y: scroll;
     .content1{
       box-sizing: border-box;
       width: 686rpx;
-      height: 374rpx;
+      height: 390rpx;
       background-color: #fff;
       border-radius: 20rpx;
+      padding-bottom: 20rpx;
+      padding-top: 15rpx;
       padding-left: 18rpx;
       padding-right: 24rpx;
     &:not(:first-child){