diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 5ed6212..f5f431d 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -2,34 +2,39 @@
   <div class="order-details">
     <title-block title="寄存画作">
       <template #left>
-        <div> <image style="width: 112rpx;height: 52rpx" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" @click="back"></image></div>
+        <div>
+          <image style="width: 112rpx;height: 52rpx"
+                 src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png"
+                 @click="back"></image>
+        </div>
       </template>
     </title-block>
     <div class="content2">
-      <image src="../../static/zu709@3x.png"></image>
+      <image :src="info.artworkImg"></image>
     </div>
     <tm-poup height="700" v-model="show_2" position="bottom">
       <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>
+            <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 class="wrap1">
-            <div class="wrap1_1">某某某某某某某地方</div>
-            <div class="wrap1_2">*剩余12位置</div>
+          <div v-for="(item,index) in addressList" :key="index" class="wrap1">
+            <div class="wrap1_1">{{item.address}}</div>
+            <div class="wrap1_2">*剩余{{item.leftNum}}位置</div>
           </div>
-          <div class="wrap1 active">
+<!--          <div class="wrap1 active">
             <div class="wrap1_1">某某某某某某某地方</div>
             <div class="wrap1_2">剩余12位置</div>
-          </div>
-          <div class="wrap1 disabled">
+          </div>-->
+<!--          <div class="wrap1 disabled">
             <div class="wrap1_1">某某某某某某某地方</div>
             <div class="wrap1_2">*已满员</div>
-          </div>
+          </div>-->
         </div>
         <div class="content2"></div>
         <div class="content6">
@@ -42,7 +47,8 @@
         <div class="content1">
           <div class="wrap1">请选择您的寄存时限</div>
           <div @click="show_1=false" class="wrap2">
-            <image src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/d84593b3-10a8-4d86-be8c-b048b03b22c7.png"></image>
+            <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>
@@ -63,15 +69,21 @@
           <div class="wrap3">日</div>
         </div>
         <div style="margin-left: -30rpx;margin-right: -30rpx">
-          <picker-view   indicator-class="test" :value="value"  @change="changeData" class="picker-view">
+          <picker-view indicator-class="test" :value="value" @change="changeData" class="picker-view">
             <picker-view-column>
-              <view style="display: flex;align-items: center;justify-content: center" class="item" :class="[isDateFont(item,0)?'fontDate':'']" v-for="(item,index) in years" :key="index">{{item}}年</view>
+              <view style="display: flex;align-items: center;justify-content: center" class="item"
+                    :class="[isDateFont(item,0)?'fontDate':'']" v-for="(item,index) in years" :key="index">{{ item }}年
+              </view>
             </picker-view-column>
             <picker-view-column>
-              <view style="display: flex;align-items: center;justify-content: center" class="item" :class="[isDateFont(item,1)?'fontDate':'']" v-for="(item,index) in months" :key="index">{{item}}月</view>
+              <view style="display: flex;align-items: center;justify-content: center" class="item"
+                    :class="[isDateFont(item,1)?'fontDate':'']" v-for="(item,index) in months" :key="index">{{ item }}月
+              </view>
             </picker-view-column>
             <picker-view-column>
-              <view style="display: flex;align-items: center;justify-content: center" class="item" :class="[isDateFont(item,2)?'fontDate':'']" v-for="(item,index) in days" :key="index">{{item}}日</view>
+              <view style="display: flex;align-items: center;justify-content: center" class="item"
+                    :class="[isDateFont(item,2)?'fontDate':'']" v-for="(item,index) in days" :key="index">{{ item }}日
+              </view>
             </picker-view-column>
           </picker-view>
         </div>
@@ -88,7 +100,7 @@
           <div class="wrap1_1_1">画作编号</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画作编号" />
+            <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkNum"/>
           </div>
           <div class="wrap1_1_4"></div>
         </div>
@@ -96,7 +108,7 @@
           <div class="wrap1_1_1">画作名称</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画作名称" />
+            <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkName"/>
           </div>
           <div class="wrap1_1_4"></div>
         </div>
@@ -104,7 +116,7 @@
           <div class="wrap1_1_1">画家名称</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画家名称" />
+            <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artistName"/>
           </div>
           <div class="wrap1_1_4">
           </div>
@@ -113,7 +125,7 @@
           <div class="wrap1_1_1">画作平尺数</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="画作平尺数" />
+            <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkSquareSize"/>
           </div>
         </div>
       </div>
@@ -121,19 +133,11 @@
     </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 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 placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="寄存地址" />
+            <input placeholder-style="color: #939393;font-size: 24rpx;" placeholder="寄存地址"/>
           </div>
           <div class="wrap1_1_4"></div>
           <div @click="show_2=true" class="wrap1_1_5">
@@ -144,7 +148,7 @@
           <div class="wrap1_1_1">寄存时限</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input placeholder-style="color: #939393;font-size: 24rpx;"  placeholder="寄存时限" />
+            <input placeholder-style="color: #939393;font-size: 24rpx;" placeholder="寄存时限"/>
           </div>
           <div @click="show_1=true" class="wrap1_1_5">
             <image src="../../static/zu612@3x.png"></image>
@@ -165,9 +169,11 @@
   </div>
 </template>
 <script>
+import {postDataByParams} from "../../http/service";
+
 export default {
   name: "order-details",
-  data(){
+  data() {
     const date = new Date()
     const years = []
     const year = date.getFullYear()
@@ -185,9 +191,11 @@ export default {
       days.push(i)
     }
     return {
-      show_2:false,
-      data:[],
-      show_1:false,
+      addressList:[],
+      info: {},
+      show_2: false,
+      data: [],
+      show_1: false,
       title: 'picker-view',
       years,
       year,
@@ -197,54 +205,82 @@ export default {
       day,
       value: [9999, month - 1, day - 1],
       visible: true,
-      url:''//二维码扫码的结果用户发起请求的body体
+      url: ''//二维码扫码的结果用户发起请求的body体
     }
   },
   onLoad(e) {
-    if(e){
+    if (e) {
       this.url = e.url
     }
   },
-  mounted(){
+  mounted() {
+    this.getDetailUrl()
+    this.getAddress()
     const today = new Date();
-    this.value= [today.getFullYear() - 1990, today.getMonth(),today.getDate()-1]
-    this.data=[today.getFullYear(),today.getMonth() + 1,today.getDate()]
+    this.value = [today.getFullYear() - 1990, today.getMonth(), today.getDate() - 1]
+    this.data = [today.getFullYear(), today.getMonth() + 1, today.getDate()]
   },
-  methods:{
-    isDateFont(item,num){
-      if (Array.isArray&&this.data.length===3){
-        return this.data[num]===item
+  methods: {
+    async getAddress() {
+      const res = await postDataByParams('/api/warehouse/address')
+      if (res.code===200){
+        this.addressList=res.data.data
+      }
+      console.log(res, 'getAddress')
+    },
+    async getDetailUrl() {
+      const data = {
+        url: this.url
+      }
+      const res = await postDataByParams('/api/warehouse/ocr', data)
+      if (res.code === 200) {
+        this.info = res.data
+      } else {
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+      }
+      console.log(res, 'getDetailUrl')
+    },
+    isDateFont(item, num) {
+      if (Array.isArray && this.data.length === 3) {
+        return this.data[num] === item
       }
     },
-    changeData(e){
-      this.data=[e.detail.value[0]+1990,e.detail.value[1]+1,e.detail.value[2]+1]
+    changeData(e) {
+      this.data = [e.detail.value[0] + 1990, e.detail.value[1] + 1, e.detail.value[2] + 1]
     },
-    back(){
-      uni.navigateBack({ delta: 2 })
+    back() {
+      uni.navigateBack({delta: 2})
     }
   }
 }
 </script>
 <style scoped lang="scss">
-.fontDate{
+.fontDate {
   color: #fff;
 }
+
 /deep/ .pickerSelected {
   color: #ffffff !important;
   z-index: 2;
 }
-/deep/ .test{
+
+/deep/ .test {
   display: flex;
   justify-content: center;
   align-items: center;
- z-index: -1;
+  z-index: -1;
   background: #A9D897;
   color: #fff;
-    height: 62rpx;
+  height: 62rpx;
 }
+
 uni-picker-view {
   display: block;
 }
+
 uni-picker-view .uni-picker-view-wrapper {
   display: flex;
   position: relative;
@@ -252,20 +288,24 @@ uni-picker-view .uni-picker-view-wrapper {
   height: 100%;
   background-color: white;
 }
+
 uni-picker-view[hidden] {
   display: none;
 }
+
 picker-view {
   width: 100%;
   // height: 600upx;
   height: 400rpx;
-  margin-top: 20upx;
+  margin-top: 20 upx;
 }
+
 .item {
-  line-height: 100upx;
+  line-height: 100 upx;
   text-align: center;
 }
-.order-details{
+
+.order-details {
   background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
   box-sizing: border-box;
   overflow: hidden;
@@ -274,7 +314,8 @@ picker-view {
   background-size: cover;
   width: 100vw;
   height: 100vh;
-  &>.content5{
+
+  & > .content5 {
     align-items: center;
     left: 0;
     background: #fff;
@@ -284,7 +325,7 @@ picker-view {
     height: 172rpx;
     display: flex;
 
-    .wrap2{
+    .wrap2 {
       border-radius: 40rpx;
       display: flex;
       justify-content: center;
@@ -293,33 +334,39 @@ picker-view {
       height: 56rpx;
       color: #fff;
       font-size: 32rpx;
-      background:#76C458;
+      background: #76C458;
     }
-    .wrap1{
+
+    .wrap1 {
       margin-left: 58rpx;
       margin-right: 70rpx;
-    display: flex;
+      display: flex;
       flex-direction: column;
       align-items: start;
-      .wrap1_1{
+
+      .wrap1_1 {
         color: #939393;
         font-size: 16rpx;
       }
-      .wrap1_2{
+
+      .wrap1_2 {
         font-size: 32rpx;
         color: #76C458;
       }
     }
   }
-  .poup1{
+
+  .poup1 {
     padding-top: 28rpx;
     padding-left: 30rpx;
     padding-right: 30rpx;
-    &>.content6{
+
+    & > .content6 {
       margin-top: 26rpx;
       display: flex;
       justify-content: center;
-      .wrap1{
+
+      .wrap1 {
         color: #fff;
         font-size: 28rpx;
         width: 436rpx;
@@ -331,81 +378,98 @@ picker-view {
         border-radius: 30rpx;
       }
     }
-    &>.content3{
+
+    & > .content3 {
       margin-bottom: 70rpx;
-.wrap1{
-  margin-bottom: 18rpx;
-  border-radius: 32rpx;
-  height: 80rpx;
-  box-sizing: border-box;
-  border: 2px solid #76C458;
-  padding-left: 44rpx;
-  padding-right:42rpx ;
-    display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .wrap1_2{
-    color: #76C458;
-    font-size: 26rpx;
-  }
-  .wrap1_1{
-    font-size: 28rpx;
-    color: #000;
-  }
-  &.disabled{
-    border:none ;
-    background:#D8D8D8 ;
-    .wrap1_1{
-      color: #626262;
-      font-size: 28rpx;
-    }
-    .wrap1_2{
-      color: #626262;
-      font-size: 16rpx;
-    }
-  }
-  &.active{
-    background:#76C458 ;
-    .wrap1_2{
-      color: #fff;
-      font-size: 26rpx;
-    }
-    .wrap1_1{
-      font-size: 28rpx;
-      color: #fff;
-    }
-  }
-}
+
+      .wrap1 {
+        margin-bottom: 18rpx;
+        border-radius: 32rpx;
+        height: 80rpx;
+        box-sizing: border-box;
+        border: 2px solid #76C458;
+        padding-left: 44rpx;
+        padding-right: 42rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .wrap1_2 {
+          color: #76C458;
+          font-size: 26rpx;
+        }
+
+        .wrap1_1 {
+          font-size: 28rpx;
+          color: #000;
+        }
+
+        &.disabled {
+          border: none;
+          background: #D8D8D8;
+
+          .wrap1_1 {
+            color: #626262;
+            font-size: 28rpx;
+          }
+
+          .wrap1_2 {
+            color: #626262;
+            font-size: 16rpx;
+          }
+        }
+
+        &.active {
+          background: #76C458;
+
+          .wrap1_2 {
+            color: #fff;
+            font-size: 26rpx;
+          }
+
+          .wrap1_1 {
+            font-size: 28rpx;
+            color: #fff;
+          }
+        }
+      }
     }
-    &>.content1{
+
+    & > .content1 {
       margin-bottom: 36rpx;
       display: flex;
       justify-content: space-between;
-      .wrap1{
+
+      .wrap1 {
         color: #000;
         font-size: 32rpx;
       }
-      .wrap2{
-        image{
+
+      .wrap2 {
+        image {
           width: 48rpx;
           height: 48rpx;
         }
       }
     }
-    &>.content2{
+
+    & > .content2 {
       margin-bottom: 36rpx;
       height: 1rpx;
-      background:#626262 ;
+      background: #626262;
     }
   }
-  .poup{
+
+  .poup {
     padding-top: 28rpx;
     padding-left: 30rpx;
     padding-right: 30rpx;
-    &>.content3{
+
+    & > .content3 {
       display: flex;
       flex-wrap: wrap;
-      .wrap4{
+
+      .wrap4 {
         margin-bottom: 40rpx;
         border-radius: 32rpx;
         margin-top: 30rpx;
@@ -414,18 +478,21 @@ picker-view {
         background: #D8D8D8;
         display: flex;
         flex-direction: column;
-      align-items: center;
+        align-items: center;
         justify-content: center;
-        .wrap4_1{
+
+        .wrap4_1 {
           color: #626262;
           font-size: 28rpx;
         }
-        .wrap4_2{
+
+        .wrap4_2 {
           color: #BE7E7E;
           font-size: 16rpx;
         }
       }
-      .wrap1{
+
+      .wrap1 {
         box-sizing: border-box;
         flex-shrink: 0;
         margin-right: 16rpx;
@@ -437,21 +504,24 @@ picker-view {
         align-items: center;
         width: 220rpx;
         height: 84rpx;
-        &:nth-child(3){
+
+        &:nth-child(3) {
           margin-right: 0;
         }
 
-        &.active{
+        &.active {
           color: #fff;
-          background:#76C458 ;
+          background: #76C458;
         }
       }
     }
-    &>.content6{
+
+    & > .content6 {
       margin-top: 26rpx;
       display: flex;
       justify-content: center;
-      .wrap1{
+
+      .wrap1 {
         color: #fff;
         font-size: 28rpx;
         width: 436rpx;
@@ -463,22 +533,16 @@ picker-view {
         border-radius: 30rpx;
       }
     }
-    &>.content5{
+
+    & > .content5 {
       margin-top: 36rpx;
       height: 66rpx;
       display: flex;
       align-items: center;
       border-bottom: 1rpx solid #BABABA;
       border-top: 1rpx solid #BABABA;
-    .wrap1{
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      flex-grow: 1;
-      color: #4E964D;
-      font-size: 28rpx;
-    }
-      .wrap2{
+
+      .wrap1 {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -486,7 +550,17 @@ picker-view {
         color: #4E964D;
         font-size: 28rpx;
       }
-      .wrap3{
+
+      .wrap2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-grow: 1;
+        color: #4E964D;
+        font-size: 28rpx;
+      }
+
+      .wrap3 {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -495,42 +569,51 @@ picker-view {
         font-size: 28rpx;
       }
     }
-    &>.content4{
+
+    & > .content4 {
       font-size: 32rpx;
       color: #000;
     }
-    &>.content2{
+
+    & > .content2 {
       margin-bottom: 36rpx;
       height: 1rpx;
-      background:#626262 ;
+      background: #626262;
     }
-    &>.content1{
+
+    & > .content1 {
       margin-bottom: 36rpx;
       display: flex;
       justify-content: space-between;
-      .wrap1{
+
+      .wrap1 {
         color: #000;
         font-size: 32rpx;
       }
-      .wrap2{
-        image{
+
+      .wrap2 {
+        image {
           width: 48rpx;
           height: 48rpx;
         }
       }
     }
   }
- &>.content4{
+
+  & > .content4 {
     margin-top: 60rpx;
-    .wrap1{
+
+    .wrap1 {
       border: 1rpx dashed #DFE9F0;
       background-color: #fff;
-      .wrap1_1{
+
+      .wrap1_1 {
         position: relative;
         height: 114rpx;
         display: flex;
         align-items: center;
-        .wrap1_1_4{
+
+        .wrap1_1_4 {
           left: 50%;
           transform: translateX(-50%);
           bottom: 0;
@@ -539,22 +622,26 @@ picker-view {
           width: 636rpx;
           border-bottom: 0.5px solid #626262;
         }
-        .wrap1_1_5{
+
+        .wrap1_1_5 {
           right: 42rpx;
           position: absolute;
-          image{
+
+          image {
             width: 46.34rpx;
             height: 20rpx;
           }
         }
-        .wrap1_1_2{
+
+        .wrap1_1_2 {
           margin-right: 36rpx;
           width: 0;
           height: 66rpx;
           border-left: 0.5px solid #626262;
 
         }
-        .wrap1_1_1{
+
+        .wrap1_1_1 {
           width: 210rpx;
           padding-left: 32rpx;
 
@@ -564,22 +651,27 @@ picker-view {
       }
     }
   }
-  &>.content3{
+
+  & > .content3 {
     margin-top: 60rpx;
-    .prompt{
+
+    .prompt {
       color: #4E964D;
       font-size: 16rpx;
       margin-bottom: 4rpx;
     }
-    .wrap1{
+
+    .wrap1 {
       border: 1rpx dashed #DFE9F0;
       background-color: #fff;
-      .wrap1_1{
+
+      .wrap1_1 {
         position: relative;
         height: 114rpx;
         display: flex;
         align-items: center;
-        .wrap1_1_4{
+
+        .wrap1_1_4 {
           left: 50%;
           transform: translateX(-50%);
           bottom: 0;
@@ -588,14 +680,16 @@ picker-view {
           width: 636rpx;
           border-bottom: 0.5px solid #626262;
         }
-        .wrap1_1_2{
+
+        .wrap1_1_2 {
           margin-right: 36rpx;
           width: 0;
           height: 66rpx;
           border-left: 0.5px solid #626262;
 
         }
-        .wrap1_1_1{
+
+        .wrap1_1_1 {
           width: 210rpx;
           padding-left: 32rpx;
 
@@ -605,11 +699,13 @@ picker-view {
       }
     }
   }
-  &>.content2{
+
+  & > .content2 {
     margin-top: 42rpx;
     display: flex;
     justify-content: center;
-    image{
+
+    image {
       width: 404rpx;
       height: 306rpx;
     }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index ac57868..3e6f77e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -8,9 +8,9 @@
         <image src="@/static/image/write.png" mode="scaleToFill" style="width: 63rpx;height: 62rpx" />
         <view style="color: #fff;margin-top:10rpx">填写下单</view>
       </view>
-      <view class="order-item" style="background:#76C458 ;">
+      <view class="order-item" style="background:#76C458 ;" @click.stop="scanOrder">
         <image src="@/static/image/scan.png" mode="scaleToFill" style="width: 57rpx;height: 57rpx" />
-        <view style="color: #fff;margin-top:10rpx" @click="scanOrder">扫码下单</view>
+        <view style="color: #fff;margin-top:10rpx" >扫码下单</view>
       </view>
     </view>
     <view class="list">
@@ -51,7 +51,9 @@ export default {
       uni.scanCode({
         onlyFromCamera: false,
         success: res => {
+          console.log(res.result,' res.result')
           console.log("条码类型：" + res.scanType);
+          console.log(res.scanType,'scanType')
           console.log("条码内容：" + res.result);
           uni.navigateTo({
             url: "/pages/consignment-painting/index?url=" + res.result