From 6f2bae6d5bad299c6f62e7a406b5d25564c9ea91 Mon Sep 17 00:00:00 2001
From: Phoenix <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 2 Apr 2024 20:09:12 +0800
Subject: [PATCH] submit

---
 App.vue                              |   8 +-
 pages/confirm-order/index.vue        | 613 ++++++++++++++-------------
 pages/consignment-painting/index.vue | 557 +++++++++++++-----------
 3 files changed, 633 insertions(+), 545 deletions(-)

diff --git a/App.vue b/App.vue
index 6d25df6..043cac8 100644
--- a/App.vue
+++ b/App.vue
@@ -2,7 +2,13 @@
 import tabBar from "./util/tabbar";
 
 export default {
-  onLaunch: function() {
+  onLaunch: function(options) {
+  /*  if (['pages/confirm-order/index'].includes(options.path)){
+      uni.redirectTo({
+        url: `pages/consignment-painting/index?type=confirm`
+      })
+    }
+    console.log(options,'options')*/
   //  uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2NjlHMEtKcFlKNE1qWGhyNEh5cHhBUSIsIk5pY2tOYW1lIjoi5YiY5bCP5benIiwiVGVsTnVtIjoiMTUyNjI0ODE0OTgiLCJBdmF0YXIiOiJodHRwczovL2NkbnMuZm9udHJlZS5jbi9pbnZlbnRvcnkvZmlsZXMvaW1nL2MzNWQ1ODVhLTVjNTMtMTFlZS04OGRmLTAyNDJhYzEzMDAyNS5qcGciLCJJRE51bSI6IjMyMDMyNDE5OTAwNTA5NjY0WCIsImV4cCI6MTY5NTgxMTk4NCwiaXNzIjoibWFsbCJ9.QDDAiN5xFtL7BelKfgbnej_nO52T_UxQ7GFicHnQA2U')
     uni.hideTabBar();
     uni.setStorageSync("tabBar", tabBar);
diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue
index 9f9e59c..717f6d9 100644
--- a/pages/confirm-order/index.vue
+++ b/pages/confirm-order/index.vue
@@ -34,106 +34,110 @@
         </div>
       </div>
     </div>
-    <div class="content-center" :style="{marginTop:`${contentListHeight+10}px`,marginBottom:`${type==='detail'?10:180}px`}">
-      <div class="painting-name" v-if="listPaintings.length>1">
-        <div class="wrap1">画作{{currentIndex+1}}：</div>
-        <div class="wrap2" style="display: none" @click="itemDelete">删除</div>
-      </div>
-      <div class="content2">
-        <u-upload
-            :fileList="listPaintings[currentIndex].fileList1"
-            @afterRead="afterRead"
-            @delete="deletePic"
-            name="6"
-            multiple
-            :maxCount="1"
-            width="404rpx"
-            height="306rpx"
-        >
-          <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
-            <div style="margin-bottom: 14rpx">
-              <image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
-            </div>
-            <div style="font-size: 32rpx;color: #fff">上传画作图片</div>
-          </div>
-
-        </u-upload>
-      </div>
-      <div class="content3">
-        <div class="prompt">*扫描自动填入</div>
-        <div class="wrap1">
-          <div class="wrap1_1">
-            <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[currentIndex].artworkNum" disabled  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
-            </div>
-            <div class="wrap1_1_4"></div>
-          </div>
-          <div class="wrap1_1">
-            <div class="wrap1_1_1">画作名称</div>
-            <div class="wrap1_1_2"></div>
-            <div class="wrap1_1_3">
-              <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[currentIndex].artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
-            </div>
-            <div class="wrap1_1_4"></div>
-          </div>
-          <div class="wrap1_1">
-            <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[currentIndex].artistName" disabled  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
-            </div>
-            <div class="wrap1_1_4">
-            </div>
-          </div>
-          <div class="wrap1_1">
-            <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[currentIndex].artworkSquareSize" disabled  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
-            </div>
-          </div>
+    <scroll-view class="content-center" :style="{marginTop:`${contentListHeight+10}px`,marginBottom:type==='detail'?'30rpx':'180rpx'}"  @scroll="scrollDetail" :scroll-into-view="scrollId" scroll-y="true">
+      <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" style="display: none" @click="itemDelete">删除</div>
         </div>
-        <div class="wrap2"></div>
-      </div>
-      <div class="content4">
-        <div class="wrap1">
-          <div class="wrap1_1" >
-            <div class="wrap1_1_1">寄存地址</div>
-            <div class="wrap1_1_2"></div>
-            <div class="wrap1_1_3">
-              <input style="color: #939393;font-size: 24rpx;" disabled :value="listPaintings[currentIndex].warehouseID?addressList.find(x=>x.ID===listPaintings[currentIndex].warehouseID).address:''"  placeholder-style="color: #939393;font-size: 24rpx;"
-                     placeholder="请选择寄存地址"/>
+        <div class="content2">
+          <u-upload
+              :fileList="listPaintings[index].fileList1"
+              @afterRead="(e)=>{afterRead(e,index)}"
+              @delete="(e)=>{deletePic(e,index)}"
+              name="6"
+              multiple
+              :maxCount="1"
+              width="404rpx"
+              height="306rpx"
+          >
+            <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
+              <div style="margin-bottom: 14rpx">
+                <image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
+              </div>
+              <div style="font-size: 32rpx;color: #fff">上传画作图片</div>
+            </div>
+
+          </u-upload>
+        </div>
+        <div class="content3">
+          <div class="prompt">*扫描自动填入</div>
+          <div class="wrap1">
+            <div class="wrap1_1">
+              <div class="wrap1_1_1">画作编号</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3">
+                <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[index].artworkNum"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
+              </div>
+              <div class="wrap1_1_4"></div>
+            </div>
+            <div class="wrap1_1">
+              <div class="wrap1_1_1">画作名称</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3">
+                <input style="color: #939393;font-size: 24rpx;" disabled  v-model="listPaintings[index].artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
+              </div>
+              <div class="wrap1_1_4"></div>
+            </div>
+            <div class="wrap1_1">
+              <div class="wrap1_1_1">画家名称</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3">
+                <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[index].artistName"   placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
+              </div>
+              <div class="wrap1_1_4">
+              </div>
+            </div>
+            <div class="wrap1_1">
+              <div class="wrap1_1_1">画作平尺数</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3">
+                <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[index].artworkSquareSize"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
+              </div>
             </div>
-            <div class="wrap1_1_4"></div>
-<!--            <div  class="wrap1_1_5">
-              <image src="../../static/zu611@3x.png"></image>
-            </div>-->
           </div>
-          <div class="wrap1_1" >
-            <div class="wrap1_1_1">寄存时长</div>
-            <div class="wrap1_1_2"></div>
-            <div class="wrap1_1_3">
-              <input style="color: #939393;font-size: 24rpx;" :value="listPaintings[currentIndex].endAt" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时长"/>
+          <div class="wrap2"></div>
+        </div>
+        <div class="content4">
+          <div class="wrap1">
+            <div class="wrap1_1" >
+              <div class="wrap1_1_1">寄存地址</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3">
+                <input style="color: #939393;font-size: 24rpx;" disabled :value="listPaintings[index].warehouseID?addressList.find(x=>x.ID===listPaintings[index].warehouseID).address:''"  placeholder-style="color: #939393;font-size: 24rpx;"
+                       placeholder="请选择寄存地址"/>
+              </div>
+              <div class="wrap1_1_4"></div>
+<!--              <div  class="wrap1_1_5">
+                <image src="../../static/zu611@3x.png"></image>
+              </div>-->
+            </div>
+            <div class="wrap1_1">
+              <div class="wrap1_1_1">寄存时长</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3">
+                <input style="color: #939393;font-size: 24rpx;" :value="listPaintings[index].endAt" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时长"/>
+              </div>
+<!--              <div  class="wrap1_1_5">
+                <image src="../../static/zu612@3x.png"></image>
+              </div>-->
+
             </div>
-<!--            <div  class="wrap1_1_5">
-              <image src="../../static/zu612@3x.png"></image>
-            </div>-->
 
           </div>
-
+          <div class="wrap2"></div>
         </div>
-        <div class="wrap2"></div>
+<!--        <div class="content7" @click="addPainting">
+          <div class="wrap1">
+            <div class="horizontal"></div>
+            <div class="vertical"></div>
+          </div>
+          <div class="wrap2">添加</div>
+        </div>-->
       </div>
-<!--      <div class="content7" @click="addPainting">
-        <div class="wrap1">
-          <div class="horizontal"></div>
-          <div class="vertical"></div>
-        </div>
-        <div class="wrap2">添加</div>
-      </div>-->
-    </div>
+    </scroll-view>
+
+
     <div class="content5" v-if="type!=='detail'">
       <div class="wrap4" v-show="isExpand1" :style="{top:`-${152*listPaintings.length}rpx`}">
         <div class="item" v-for="(item,index) in listPaintings">
@@ -146,7 +150,7 @@
       <div class="wrap3" @click="expand1" :style="{transform:`${isExpand1?'':'rotate(180deg)'}`}">  <img src="https://cdns.fontree.cn/fonchain-main/prod/image/default/approval/13639162-2871-4187-abc5-71c2d9f01ac2.png" alt=""></div>
       <div class="wrap1">
         <div class="wrap1_1">*仅微信付款</div>
-        <div class="wrap1_2">预计 ¥{{totalMoney}}</div>
+        <div class="wrap1_2">预计 ¥{{totalMoney||'0'}}</div>
       </div>
       <div class="wrap2" @click="signContract">付款</div>
     </div>
@@ -243,12 +247,13 @@
           </div>
         </u-popup>-->
     <u-picker :show="show_1" ref="uPicker" :columns="columns" @confirm="confirmDate" @close="show_1=false" @change="changeHandler"></u-picker>
-    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在进入法大大签署..."></u-loading-page>
+    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在调起微信付款..."></u-loading-page>
   </div>
 </template>
 <script>
 import http from "@/http/api";
 import {postDataByParams} from "../../http/service";
+import {type} from "../../uni_modules/uni-forms/components/uni-forms/utils";
 
 export default {
   name: "order-details",
@@ -270,7 +275,15 @@ export default {
       days.push(i)
     }
     return {
-      columns: [],
+      itemHeight:0,
+      scrollId:'item-0',
+      columns: [
+        [180],
+        ['*'],
+        [1,2,3,4,5],
+        ['='],
+        [180]
+      ],
       currentIndex:0,
       listPaintings:[{
         expectedPayment:'',
@@ -282,12 +295,12 @@ export default {
         warehouseID:'',
         endAt:''
       }],
-      type:'',
       contentListHeight: 0,
       isExpand:false,
       isExpand1:false,
       listHeight:308,
       minDate:'',
+      type:'',
       show: false,
       value1: '',
       loading:false,
@@ -346,54 +359,75 @@ export default {
       }
     },
     currentEndAt(newValue, oldValue) {
+      console.log(newValue,oldValue)
       if (newValue !== oldValue) {
         this.obtainAmount()
       }
     },
   },
   onLoad(load){
+    if (load.url){
+      this.url=load.url
+      this.getDetailUrl()
+    }
     if (load.type==='detail'){
       this.getData()
       this.type=load.type
-    }else {
-      this.listPaintings=uni.getStorageSync('orderingInfo').listPaintings
     }
+
+    if (load.type==='scan'){
+      this.listPaintings=uni.getStorageSync('scanlist')?.map((x)=>{
+        return {
+          ...x,
+          expectedPayment:'',
+          warehouseID:'',
+          fileList1:[ { url:x.artworkImg }]
+        }
+      })
+    }
+    this.listPaintings=uni.getStorageSync('orderingInfo').listPaintings
+
   },
   mounted() {
-    this.columns=[
-      [180],
-      ['*'],
-      [1,2,3,4,5],
-      ['='],
-      [180]
-    ]
     this.getCycle()
     if (this.$mp.query.url){
       this.url=this.$mp.query.url
       this.getDetailUrl()
     }
     this.getAddress()
-
-
-    this.$nextTick(()=>{
+    this.$nextTick(async ()=>{
+      this.itemHeight=  await this.getElementHeight('.content-scroll')
       this.getheight()
     })
   },
   methods: {
+    getElementHeight(selector) {
+      return new Promise((resolve, reject) => {
+        const query = uni.createSelectorQuery();
+        query.select(selector).boundingClientRect(data => {
+          if (data) {
+            resolve(data.height); // 成功获取高度时，通过 Promise 返回
+          } else {
+            reject(new Error('无法获取元素高度')); // 如果找不到元素或获取高度失败时，通过 Promise 返回错误
+          }
+        }).exec();
+      });
+    },
+    async scrollDetail(event){
+      const scrollTop = event.detail.scrollTop;  // 获取当前滚动位置
+      const totalHeight = this.listPaintings.length * this.itemHeight;
+      const scrollPercent = (scrollTop / totalHeight) * 100;
+      const index = Math.floor(scrollTop / this.itemHeight); // 计算索引
+      /* console.log(`滚动了 ${scrollPercent}%`);
+       console.log(`滚动到了第 ${index} 个元素的位置`);*/
+      this.currentIndex=index
+    },
     async getData() {
       const data1 = {
         ID: Number(this.$mp.query.ID)
       }
       const res1 = await postDataByParams('/api/v2/warehouse/detail', data1)
       if (res1.code === 200) {
-        this.listPaintings = res1.data?.map((x)=>{
-          return {
-            ...x,
-            expectedPayment:x.money,
-            endAt:x.days,
-            fileList1: [{url:x.artworkImg}]
-          }
-        })
         this.info = res1.data
       }
     },
@@ -422,6 +456,7 @@ export default {
 
     },
     itemClick(index){
+      this.scrollId=`item-${index}`
       this.currentIndex=index
     },
     addPainting(){
@@ -432,8 +467,8 @@ export default {
         artworkName:'',
         artistName:'',
         artworkSquareSize:'',
-        warehouseID:'',
-        endAt:''
+        warehouseID: this.listPaintings[0].warehouseID,
+        endAt:this.listPaintings[0].endAt
       })
       this.$nextTick(()=>{
         this.getheight()
@@ -473,6 +508,7 @@ export default {
     },
     confirmDate(data){
       this.listPaintings[this.currentIndex].endAt=data.value[data.value.length-1]
+      this.obtainAmount()
       this.show_1=false
     },
     openShow1(){
@@ -495,7 +531,6 @@ export default {
           success: (res) => {
             const { path } = JSON.parse(res.data).data;
             resolve(path);
-
           },
         });
       })
@@ -504,12 +539,12 @@ export default {
       this.fileList1=[]
     },
     // 新增图片
-    async afterRead(event) {
+    async afterRead(event,index) {
       // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
       let lists = [].concat(event.file)
-      let fileListLen = this.listPaintings[this.currentIndex].fileList1.length
+      let fileListLen = this.listPaintings[index].fileList1.length
       lists.map((item) => {
-        this.listPaintings[this.currentIndex].fileList1.push({
+        this.listPaintings[index].fileList1.push({
           ...item,
           status: 'uploading',
           message: '上传中'
@@ -517,8 +552,8 @@ export default {
       })
       for (let i = 0; i < lists.length; i++) {
         const result = await this.uploadFilePromise(lists[i].url, 'check')
-        let item = this.listPaintings[this.currentIndex].fileList1[fileListLen]
-        this.listPaintings[this.currentIndex].fileList1.splice(fileListLen, 1, Object.assign(item, {
+        let item = this.listPaintings[index].fileList1[fileListLen]
+        this.listPaintings[index].fileList1.splice(fileListLen, 1, Object.assign(item, {
           status: 'success',
           message: '',
           url: result
@@ -1124,186 +1159,192 @@ picker-view {
 
   .content-center{
     overflow-y: scroll;
-    .painting-name{
-      margin-top: 48rpx;
-      align-items: center;
-      display: flex;
-      justify-content: space-between;
-      .wrap1{
-        color: rgba(0, 0, 0, 1);
-        font-size: 28rpx;
+
+    .content-scroll{
+      .painting-name{
+        margin-top: 48rpx;
+        align-items: center;
+        display: flex;
+        justify-content: space-between;
+        .wrap1{
+          color: rgba(0, 0, 0, 1);
+          font-size: 28rpx;
+        }
+        .wrap2{
+          font-size: 28rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: rgba(118, 196, 88, 1);
+          border-radius: 40rpx;
+          background-color: #fff;
+          width: 148rpx;
+          height: 56rpx;
+          border: 1px solid rgba(118, 196, 88, 1);
+        }
       }
-      .wrap2{
-        font-size: 28rpx;
+      & > .content4 {
+        margin-bottom: 24rpx;
+        margin-top: 60rpx;
+
+        .wrap1 {
+          border: 1rpx dashed #DFE9F0;
+          background-color: #fff;
+
+          .wrap1_1 {
+            position: relative;
+            height: 114rpx;
+            display: flex;
+            align-items: center;
+
+            .wrap1_1_4 {
+              left: 50%;
+              transform: translateX(-50%);
+              bottom: 0;
+              position: absolute;
+              height: 0;
+              width: 636rpx;
+              border-bottom: 0.5px solid #626262;
+            }
+
+            .wrap1_1_5 {
+              right: 42rpx;
+              position: absolute;
+
+              image {
+                width: 46.34rpx;
+                height: 20rpx;
+              }
+            }
+
+            .wrap1_1_2 {
+              margin-right: 36rpx;
+              width: 0;
+              height: 66rpx;
+              border-left: 0.5px solid #626262;
+
+            }
+
+            .wrap1_1_1 {
+              width: 210rpx;
+              padding-left: 32rpx;
+
+              color: #626262;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+
+      & > .content3 {
+        margin-top: 60rpx;
+
+        .prompt {
+          color: #4E964D;
+          font-size: 16rpx;
+          margin-bottom: 4rpx;
+        }
+
+        .wrap1 {
+          border: 1rpx dashed #DFE9F0;
+          background-color: #fff;
+
+          .wrap1_1 {
+            position: relative;
+            height: 114rpx;
+            display: flex;
+            align-items: center;
+
+            .wrap1_1_4 {
+              left: 50%;
+              transform: translateX(-50%);
+              bottom: 0;
+              position: absolute;
+              height: 0;
+              width: 636rpx;
+              border-bottom: 0.5px solid #626262;
+            }
+
+            .wrap1_1_2 {
+              margin-right: 36rpx;
+              width: 0;
+              height: 66rpx;
+              border-left: 0.5px solid #626262;
+
+            }
+
+            .wrap1_1_1 {
+              width: 210rpx;
+              padding-left: 32rpx;
+
+              color: #626262;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+
+      & > .content2 {
+
+        display: flex;
+        justify-content: center;
+
+        image {
+          width: 404rpx;
+          height: 306rpx;
+        }
+      }
+      &>.content7{
+        margin: 0 auto;
+        background-color: #fff;
+        border-radius: 40rpx;
+        width: 228rpx;
+        height: 56rpx;
+        border: 3rpx solid rgba(118, 196, 88, 1);
         display: flex;
         justify-content: center;
         align-items: center;
-        color: rgba(118, 196, 88, 1);
-        border-radius: 40rpx;
-        background-color: #fff;
-        width: 148rpx;
-        height: 56rpx;
-        border: 1px solid rgba(118, 196, 88, 1);
-      }
-    }
-    &>.content7{
-      margin: 0 auto;
-      background-color: #fff;
-      border-radius: 40rpx;
-      width: 228rpx;
-      height: 56rpx;
-      border: 3rpx solid rgba(118, 196, 88, 1);
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      .wrap2{
-        color: rgba(118, 196, 88, 1);
-        font-size: 28rpx;
-      }
-      .wrap1{
-        margin-right: 20rpx;
-        box-sizing: border-box;
-        width: 32rpx;
-        height: 32rpx;
-        border: 3rpx solid rgba(118, 196, 88, 1);
-        border-radius: 50%;
-        background: transparent;
-
-        position: relative;
-        .horizontal {
-          position: absolute;
-          left: 50%;
-          top: 50%;
-          transform: translate(-50%,-50%);
-          width: 18rpx;
-          height: 2rpx;
-          background-color: rgba(118, 196, 88, 1);
+        .wrap2{
+          color: rgba(118, 196, 88, 1);
+          font-size: 28rpx;
         }
+        .wrap1{
+          margin-right: 20rpx;
+          box-sizing: border-box;
+          width: 32rpx;
+          height: 32rpx;
+          border: 3rpx solid rgba(118, 196, 88, 1);
+          border-radius: 50%;
+          background: transparent;
 
-        .vertical {
-          position: absolute;
-          left: 50%;
-          top: 50%;
-          transform: translate(-50%,-50%);
-          width: 2rpx;
-          height: 18rpx;
-          background-color: rgba(118, 196, 88, 1);
-        }
-
-
-      }
-    }
-    & > .content4 {
-      margin-bottom: 24rpx;
-      margin-top: 60rpx;
-
-      .wrap1 {
-        border: 1rpx dashed #DFE9F0;
-        background-color: #fff;
-
-        .wrap1_1 {
           position: relative;
-          height: 114rpx;
-          display: flex;
-          align-items: center;
-
-          .wrap1_1_4 {
+          .horizontal {
+            position: absolute;
             left: 50%;
-            transform: translateX(-50%);
-            bottom: 0;
+            top: 50%;
+            transform: translate(-50%,-50%);
+            width: 18rpx;
+            height: 2rpx;
+            background-color: rgba(118, 196, 88, 1);
+          }
+
+          .vertical {
             position: absolute;
-            height: 0;
-            width: 636rpx;
-            border-bottom: 0.5px solid #626262;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%,-50%);
+            width: 2rpx;
+            height: 18rpx;
+            background-color: rgba(118, 196, 88, 1);
           }
 
-          .wrap1_1_5 {
-            right: 42rpx;
-            position: absolute;
 
-            image {
-              width: 46.34rpx;
-              height: 20rpx;
-            }
-          }
-
-          .wrap1_1_2 {
-            margin-right: 36rpx;
-            width: 0;
-            height: 66rpx;
-            border-left: 0.5px solid #626262;
-
-          }
-
-          .wrap1_1_1 {
-            width: 210rpx;
-            padding-left: 32rpx;
-
-            color: #626262;
-            font-size: 24rpx;
-          }
         }
       }
     }
 
-    & > .content3 {
-      margin-top: 60rpx;
 
-      .prompt {
-        color: #4E964D;
-        font-size: 16rpx;
-        margin-bottom: 4rpx;
-      }
 
-      .wrap1 {
-        border: 1rpx dashed #DFE9F0;
-        background-color: #fff;
-
-        .wrap1_1 {
-          position: relative;
-          height: 114rpx;
-          display: flex;
-          align-items: center;
-
-          .wrap1_1_4 {
-            left: 50%;
-            transform: translateX(-50%);
-            bottom: 0;
-            position: absolute;
-            height: 0;
-            width: 636rpx;
-            border-bottom: 0.5px solid #626262;
-          }
-
-          .wrap1_1_2 {
-            margin-right: 36rpx;
-            width: 0;
-            height: 66rpx;
-            border-left: 0.5px solid #626262;
-
-          }
-
-          .wrap1_1_1 {
-            width: 210rpx;
-            padding-left: 32rpx;
-
-            color: #626262;
-            font-size: 24rpx;
-          }
-        }
-      }
-    }
-
-    & > .content2 {
-
-      display: flex;
-      justify-content: center;
-
-      image {
-        width: 404rpx;
-        height: 306rpx;
-      }
-    }
   }
 }
 </style>
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 9638aed..1880c97 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -34,106 +34,110 @@
           </div>
       </div>
     </div>
-<div class="content-center" :style="{marginTop:`${contentListHeight+10}px`}">
-  <div class="painting-name" v-if="listPaintings.length>1">
-    <div class="wrap1">画作{{currentIndex+1}}：</div>
-    <div class="wrap2" @click="itemDelete">删除</div>
-  </div>
-  <div class="content2">
-    <u-upload
-        :fileList="listPaintings[currentIndex].fileList1"
-        @afterRead="afterRead"
-        @delete="deletePic"
-        name="6"
-        multiple
-        :maxCount="1"
-        width="404rpx"
-        height="306rpx"
-    >
-      <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
-        <div style="margin-bottom: 14rpx">
-          <image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
-        </div>
-        <div style="font-size: 32rpx;color: #fff">上传画作图片</div>
+  <scroll-view class="content-center" :style="{marginTop:`${contentListHeight+10}px`}" @scroll="scrollDetail" :scroll-into-view="scrollId" scroll-y="true">
+    <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>
+      <div class="content2">
+        <u-upload
+            :fileList="listPaintings[index].fileList1"
+            @afterRead="(e)=>{afterRead(e,index)}"
+            @delete="(e)=>{deletePic(e,index)}"
+            name="6"
+            multiple
+            :maxCount="1"
+            width="404rpx"
+            height="306rpx"
+        >
+          <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
+            <div style="margin-bottom: 14rpx">
+              <image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
+            </div>
+            <div style="font-size: 32rpx;color: #fff">上传画作图片</div>
+          </div>
 
-    </u-upload>
-  </div>
-  <div class="content3">
-    <div class="prompt">*扫描自动填入</div>
-    <div class="wrap1">
-      <div class="wrap1_1">
-        <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[currentIndex].artworkNum"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
-        </div>
-        <div class="wrap1_1_4"></div>
+        </u-upload>
       </div>
-      <div class="wrap1_1">
-        <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[currentIndex].artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
+      <div class="content3">
+        <div class="prompt">*扫描自动填入</div>
+        <div class="wrap1">
+          <div class="wrap1_1">
+            <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].artworkNum"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
+            </div>
+            <div class="wrap1_1_4"></div>
+          </div>
+          <div class="wrap1_1">
+            <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].artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
+            </div>
+            <div class="wrap1_1_4"></div>
+          </div>
+          <div class="wrap1_1">
+            <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].artistName"   placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
+            </div>
+            <div class="wrap1_1_4">
+            </div>
+          </div>
+          <div class="wrap1_1">
+            <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="请输入画作平尺数"/>
+            </div>
+          </div>
         </div>
-        <div class="wrap1_1_4"></div>
+        <div class="wrap2"></div>
       </div>
-      <div class="wrap1_1">
-        <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[currentIndex].artistName"   placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
-        </div>
-        <div class="wrap1_1_4">
+      <div class="content4">
+        <div class="wrap1">
+          <div class="wrap1_1" @click="show_2=true">
+            <div class="wrap1_1_1">寄存地址</div>
+            <div class="wrap1_1_2"></div>
+            <div class="wrap1_1_3">
+              <input style="color: #939393;font-size: 24rpx;" disabled :value="listPaintings[index].warehouseID?addressList.find(x=>x.ID===listPaintings[index].warehouseID).address:''"  placeholder-style="color: #939393;font-size: 24rpx;"
+                     placeholder="请选择寄存地址"/>
+            </div>
+            <div class="wrap1_1_4"></div>
+            <div  class="wrap1_1_5">
+              <image src="../../static/zu611@3x.png"></image>
+            </div>
+          </div>
+          <div class="wrap1_1" @click="openShow1()">
+            <div class="wrap1_1_1">寄存时长</div>
+            <div class="wrap1_1_2"></div>
+            <div class="wrap1_1_3">
+              <input style="color: #939393;font-size: 24rpx;" :value="listPaintings[index].endAt" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时长"/>
+            </div>
+            <div  class="wrap1_1_5">
+              <image src="../../static/zu612@3x.png"></image>
+            </div>
+
+          </div>
+
         </div>
+        <div class="wrap2"></div>
       </div>
-      <div class="wrap1_1">
-        <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[currentIndex].artworkSquareSize"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
+      <div class="content7" @click="addPainting">
+        <div class="wrap1">
+          <div class="horizontal"></div>
+          <div class="vertical"></div>
         </div>
+        <div class="wrap2">添加</div>
       </div>
     </div>
-    <div class="wrap2"></div>
-  </div>
-  <div class="content4">
-    <div class="wrap1">
-      <div class="wrap1_1" @click="show_2=true">
-        <div class="wrap1_1_1">寄存地址</div>
-        <div class="wrap1_1_2"></div>
-        <div class="wrap1_1_3">
-          <input style="color: #939393;font-size: 24rpx;" disabled :value="listPaintings[currentIndex].warehouseID?addressList.find(x=>x.ID===listPaintings[currentIndex].warehouseID).address:''"  placeholder-style="color: #939393;font-size: 24rpx;"
-                 placeholder="请选择寄存地址"/>
-        </div>
-        <div class="wrap1_1_4"></div>
-        <div  class="wrap1_1_5">
-          <image src="../../static/zu611@3x.png"></image>
-        </div>
-      </div>
-      <div class="wrap1_1" @click="openShow1()">
-        <div class="wrap1_1_1">寄存时长</div>
-        <div class="wrap1_1_2"></div>
-        <div class="wrap1_1_3">
-          <input style="color: #939393;font-size: 24rpx;" :value="listPaintings[currentIndex].endAt" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时长"/>
-        </div>
-        <div  class="wrap1_1_5">
-          <image src="../../static/zu612@3x.png"></image>
-        </div>
+  </scroll-view>
 
-      </div>
 
-    </div>
-    <div class="wrap2"></div>
-  </div>
-  <div class="content7" @click="addPainting">
-    <div class="wrap1">
-      <div class="horizontal"></div>
-      <div class="vertical"></div>
-    </div>
-    <div class="wrap2">添加</div>
-  </div>
-</div>
     <div class="content5">
       <div class="wrap4" v-show="isExpand1" :style="{top:`-${152*listPaintings.length}rpx`}">
         <div class="item" v-for="(item,index) in listPaintings">
@@ -242,7 +246,7 @@
         </div>
       </div>
     </u-popup>-->
-    <u-picker :show="show_1" ref="uPicker" :columns="columns" @confirm="confirmDate" @close="show_1=false" @change="changeHandler"></u-picker>
+    <u-picker :show="show_1" ref="uPicker" :columns="columns" @confirm="confirmDate" @cancel="closeClick" @change="changeHandler"></u-picker>
     <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在进入法大大签署..."></u-loading-page>
   </div>
 </template>
@@ -270,6 +274,8 @@ export default {
       days.push(i)
     }
     return {
+      itemHeight:0,
+      scrollId:'item-0',
       columns: [
         [180],
         ['*'],
@@ -363,7 +369,11 @@ export default {
       this.getDetailUrl()
     }
     if (load.type==='detail'){
-this.getData()
+      this.getData()
+      this.type=load.type
+    }
+    if (load.type==='confirm'){
+      this.listPaintings=uni.getStorageSync('orderingInfo').listPaintings
     }
     if (load.type==='scan'){
       this.listPaintings=uni.getStorageSync('scanlist')?.map((x)=>{
@@ -385,11 +395,36 @@ this.getData()
       this.getDetailUrl()
     }
     this.getAddress()
-    this.$nextTick(()=>{
+    this.$nextTick(async ()=>{
+      this.itemHeight=  await this.getElementHeight('.content-scroll')
       this.getheight()
     })
   },
   methods: {
+    closeClick(){
+      this.show_1=false
+    },
+    getElementHeight(selector) {
+      return new Promise((resolve, reject) => {
+        const query = uni.createSelectorQuery();
+        query.select(selector).boundingClientRect(data => {
+          if (data) {
+            resolve(data.height); // 成功获取高度时，通过 Promise 返回
+          } else {
+            reject(new Error('无法获取元素高度')); // 如果找不到元素或获取高度失败时，通过 Promise 返回错误
+          }
+        }).exec();
+      });
+    },
+   async scrollDetail(event){
+      const scrollTop = event.detail.scrollTop;  // 获取当前滚动位置
+      const totalHeight = this.listPaintings.length * this.itemHeight;
+      const scrollPercent = (scrollTop / totalHeight) * 100;
+      const index = Math.floor(scrollTop / this.itemHeight); // 计算索引
+     /* console.log(`滚动了 ${scrollPercent}%`);
+      console.log(`滚动到了第 ${index} 个元素的位置`);*/
+     this.currentIndex=index
+    },
     async getData() {
       const data1 = {
         ID: Number(this.$mp.query.ID)
@@ -424,6 +459,7 @@ this.getData()
 
     },
     itemClick(index){
+      this.scrollId=`item-${index}`
       this.currentIndex=index
     },
     addPainting(){
@@ -506,12 +542,12 @@ this.getData()
       this.fileList1=[]
     },
     // 新增图片
-    async afterRead(event) {
+    async afterRead(event,index) {
       // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
       let lists = [].concat(event.file)
-      let fileListLen = this.listPaintings[this.currentIndex].fileList1.length
+      let fileListLen = this.listPaintings[index].fileList1.length
       lists.map((item) => {
-        this.listPaintings[this.currentIndex].fileList1.push({
+        this.listPaintings[index].fileList1.push({
           ...item,
           status: 'uploading',
           message: '上传中'
@@ -519,8 +555,8 @@ this.getData()
       })
       for (let i = 0; i < lists.length; i++) {
         const result = await this.uploadFilePromise(lists[i].url, 'check')
-        let item = this.listPaintings[this.currentIndex].fileList1[fileListLen]
-        this.listPaintings[this.currentIndex].fileList1.splice(fileListLen, 1, Object.assign(item, {
+        let item = this.listPaintings[index].fileList1[fileListLen]
+        this.listPaintings[index].fileList1.splice(fileListLen, 1, Object.assign(item, {
           status: 'success',
           message: '',
           url: result
@@ -1171,186 +1207,191 @@ color: rgba(98, 98, 98, 1);
 .content-center{
   overflow-y: scroll;
   margin-bottom: 180rpx;
-  .painting-name{
-    margin-top: 48rpx;
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-    .wrap1{
-      color: rgba(0, 0, 0, 1);
-font-size: 28rpx;
+  .content-scroll{
+    .painting-name{
+      margin-top: 48rpx;
+      align-items: center;
+      display: flex;
+      justify-content: space-between;
+      .wrap1{
+        color: rgba(0, 0, 0, 1);
+        font-size: 28rpx;
+      }
+      .wrap2{
+        font-size: 28rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: rgba(118, 196, 88, 1);
+        border-radius: 40rpx;
+        background-color: #fff;
+        width: 148rpx;
+        height: 56rpx;
+        border: 1px solid rgba(118, 196, 88, 1);
+      }
     }
-    .wrap2{
-      font-size: 28rpx;
+    & > .content4 {
+      margin-bottom: 24rpx;
+      margin-top: 60rpx;
+
+      .wrap1 {
+        border: 1rpx dashed #DFE9F0;
+        background-color: #fff;
+
+        .wrap1_1 {
+          position: relative;
+          height: 114rpx;
+          display: flex;
+          align-items: center;
+
+          .wrap1_1_4 {
+            left: 50%;
+            transform: translateX(-50%);
+            bottom: 0;
+            position: absolute;
+            height: 0;
+            width: 636rpx;
+            border-bottom: 0.5px solid #626262;
+          }
+
+          .wrap1_1_5 {
+            right: 42rpx;
+            position: absolute;
+
+            image {
+              width: 46.34rpx;
+              height: 20rpx;
+            }
+          }
+
+          .wrap1_1_2 {
+            margin-right: 36rpx;
+            width: 0;
+            height: 66rpx;
+            border-left: 0.5px solid #626262;
+
+          }
+
+          .wrap1_1_1 {
+            width: 210rpx;
+            padding-left: 32rpx;
+
+            color: #626262;
+            font-size: 24rpx;
+          }
+        }
+      }
+    }
+
+    & > .content3 {
+      margin-top: 60rpx;
+
+      .prompt {
+        color: #4E964D;
+        font-size: 16rpx;
+        margin-bottom: 4rpx;
+      }
+
+      .wrap1 {
+        border: 1rpx dashed #DFE9F0;
+        background-color: #fff;
+
+        .wrap1_1 {
+          position: relative;
+          height: 114rpx;
+          display: flex;
+          align-items: center;
+
+          .wrap1_1_4 {
+            left: 50%;
+            transform: translateX(-50%);
+            bottom: 0;
+            position: absolute;
+            height: 0;
+            width: 636rpx;
+            border-bottom: 0.5px solid #626262;
+          }
+
+          .wrap1_1_2 {
+            margin-right: 36rpx;
+            width: 0;
+            height: 66rpx;
+            border-left: 0.5px solid #626262;
+
+          }
+
+          .wrap1_1_1 {
+            width: 210rpx;
+            padding-left: 32rpx;
+
+            color: #626262;
+            font-size: 24rpx;
+          }
+        }
+      }
+    }
+
+    & > .content2 {
+
+      display: flex;
+      justify-content: center;
+
+      image {
+        width: 404rpx;
+        height: 306rpx;
+      }
+    }
+    &>.content7{
+      margin: 0 auto;
+      background-color: #fff;
+      border-radius: 40rpx;
+      width: 228rpx;
+      height: 56rpx;
+      border: 3rpx solid rgba(118, 196, 88, 1);
       display: flex;
       justify-content: center;
       align-items: center;
-      color: rgba(118, 196, 88, 1);
-      border-radius: 40rpx;
-      background-color: #fff;
-      width: 148rpx;
-      height: 56rpx;
-      border: 1px solid rgba(118, 196, 88, 1);
-    }
-  }
-  &>.content7{
-    margin: 0 auto;
-    background-color: #fff;
-    border-radius: 40rpx;
-    width: 228rpx;
-    height: 56rpx;
-    border: 3rpx solid rgba(118, 196, 88, 1);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    .wrap2{
-      color: rgba(118, 196, 88, 1);
-      font-size: 28rpx;
-    }
-    .wrap1{
-      margin-right: 20rpx;
-      box-sizing: border-box;
-      width: 32rpx;
-      height: 32rpx;
-      border: 3rpx solid rgba(118, 196, 88, 1);
-      border-radius: 50%;
-      background: transparent;
-
-      position: relative;
-      .horizontal {
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%,-50%);
-        width: 18rpx;
-        height: 2rpx;
-        background-color: rgba(118, 196, 88, 1);
+      .wrap2{
+        color: rgba(118, 196, 88, 1);
+        font-size: 28rpx;
       }
+      .wrap1{
+        margin-right: 20rpx;
+        box-sizing: border-box;
+        width: 32rpx;
+        height: 32rpx;
+        border: 3rpx solid rgba(118, 196, 88, 1);
+        border-radius: 50%;
+        background: transparent;
 
-      .vertical {
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%,-50%);
-        width: 2rpx;
-        height: 18rpx;
-        background-color: rgba(118, 196, 88, 1);
-      }
-
-
-    }
-  }
-  & > .content4 {
-    margin-bottom: 24rpx;
-    margin-top: 60rpx;
-
-    .wrap1 {
-      border: 1rpx dashed #DFE9F0;
-      background-color: #fff;
-
-      .wrap1_1 {
         position: relative;
-        height: 114rpx;
-        display: flex;
-        align-items: center;
-
-        .wrap1_1_4 {
+        .horizontal {
+          position: absolute;
           left: 50%;
-          transform: translateX(-50%);
-          bottom: 0;
+          top: 50%;
+          transform: translate(-50%,-50%);
+          width: 18rpx;
+          height: 2rpx;
+          background-color: rgba(118, 196, 88, 1);
+        }
+
+        .vertical {
           position: absolute;
-          height: 0;
-          width: 636rpx;
-          border-bottom: 0.5px solid #626262;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%,-50%);
+          width: 2rpx;
+          height: 18rpx;
+          background-color: rgba(118, 196, 88, 1);
         }
 
-        .wrap1_1_5 {
-          right: 42rpx;
-          position: absolute;
 
-          image {
-            width: 46.34rpx;
-            height: 20rpx;
-          }
-        }
-
-        .wrap1_1_2 {
-          margin-right: 36rpx;
-          width: 0;
-          height: 66rpx;
-          border-left: 0.5px solid #626262;
-
-        }
-
-        .wrap1_1_1 {
-          width: 210rpx;
-          padding-left: 32rpx;
-
-          color: #626262;
-          font-size: 24rpx;
-        }
       }
     }
   }
 
-  & > .content3 {
-    margin-top: 60rpx;
 
-    .prompt {
-      color: #4E964D;
-      font-size: 16rpx;
-      margin-bottom: 4rpx;
-    }
 
-    .wrap1 {
-      border: 1rpx dashed #DFE9F0;
-      background-color: #fff;
-
-      .wrap1_1 {
-        position: relative;
-        height: 114rpx;
-        display: flex;
-        align-items: center;
-
-        .wrap1_1_4 {
-          left: 50%;
-          transform: translateX(-50%);
-          bottom: 0;
-          position: absolute;
-          height: 0;
-          width: 636rpx;
-          border-bottom: 0.5px solid #626262;
-        }
-
-        .wrap1_1_2 {
-          margin-right: 36rpx;
-          width: 0;
-          height: 66rpx;
-          border-left: 0.5px solid #626262;
-
-        }
-
-        .wrap1_1_1 {
-          width: 210rpx;
-          padding-left: 32rpx;
-
-          color: #626262;
-          font-size: 24rpx;
-        }
-      }
-    }
-  }
-
-  & > .content2 {
-
-    display: flex;
-    justify-content: center;
-
-    image {
-      width: 404rpx;
-      height: 306rpx;
-    }
-  }
 }
 }
 </style>