diff --git a/components/title-block/title-block.vue b/components/title-block/title-block.vue
index f61245b..61108d2 100644
--- a/components/title-block/title-block.vue
+++ b/components/title-block/title-block.vue
@@ -20,7 +20,7 @@ export default {
 </script>
 <style scoped lang="scss">
 .content1{
-  height: 52rpx;
+  height: 60rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
diff --git a/pages.json b/pages.json
index 38d7a78..2448966 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
 {
 	"easycom": {
+
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
 		"^tm-(.*)": "@/tm-vuetify/components/tm-$1/tm-$1.vue"
 	},
@@ -78,11 +79,31 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/signwebview/index",
+			"style": {
+
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/confirm-order/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/order-goods/order-details",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
+			},
+			"app-plus":{
+				"bounce":"none"
 			}
 		},
 		{
@@ -136,19 +157,22 @@
 	},
 	"uniIdRouter": {},
 	"tabBar": {
-
-		// list 每一项
-		"list": [{
-			"pagePath": "pages/home/index"
-		},
+		"list": [
+			{
+			"pagePath": "pages/home/index",
+			"text": "首页"
+			},
 			{
-				"pagePath": "pages/mine/index"
+				"pagePath": "pages/mine/index",
+				"text": "首页"
 			},
 			{
-				"pagePath": "pages/contract/index"
+				"pagePath": "pages/contract/index",
+				"text": "首页"
 			},
 			{
-				"pagePath": "pages/order-goods/index"
+				"pagePath": "pages/order-goods/index",
+				"text": "首页"
 			}
 		]
 	}
diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue
new file mode 100644
index 0000000..c470ae2
--- /dev/null
+++ b/pages/confirm-order/index.vue
@@ -0,0 +1,345 @@
+<template>
+  <div class="confirm-order" >
+    <title-block class="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>
+      </template>
+    </title-block>
+    <div :style="{height:`${distance}px`}" style="overflow-y: auto">
+      <div style="padding-bottom: 128rpx">
+        <div class="content2">
+          <image src="../../static/zu709@3x.png"></image>
+        </div>
+        <div class="content3">
+          <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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="orderingInfo.info.artworkNum"/>
+              </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="orderingInfo.info.artworkName"/>
+              </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="orderingInfo.info.artistName"/>
+              </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="orderingInfo.info.artworkSquareSize"/>
+              </div>
+            </div>
+          </div>
+          <div class="wrap2"></div>
+        </div>
+        <div class="content3" >
+          <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 disabled placeholder-style="color: #76C458;font-size: 24rpx;" :placeholder="orderingInfo.addressName"/>
+              </div>
+              <div class="wrap1_1_4">
+              </div>
+            </div>
+            <div class="wrap1_1" style="position: relative;">
+              <div class="wrap1_1_1" >寄存时限</div>
+              <div class="wrap1_1_2"></div>
+              <div class="wrap1_1_3" >
+                <div class="wrap1_1_3_1" style="position: absolute;display: flex;top: 50%;transform: translateY(-50%);">
+                  <div class="wrap1_1_3_1_1" style="width: 70rpx;color:#fff;height: 30rpx;background: #76C458;font-size: 16rpx;display: flex;justify-content: center;align-items: center;margin-right: 2rpx">{{orderingInfo.cycleName}}</div>
+<!--                  <div class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx">{{`${orderingInfo.info.startAt}-${orderingInfo.info.endAt}`}}</div>-->
+                </div>
+              </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="`${orderingInfo.money}元`"/>
+              </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="`${orderingInfo.dayMoney}元`"/>
+              </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="`${info.dayMoney}`"/>
+              </div>
+              <div class="wrap1_1_4">
+              </div>
+            </div>-->
+          </div>
+          <div class="wrap2"></div>
+        </div>
+      </div>
+    </div>
+    <div class="content5">
+      <div class="wrap1">
+        <div class="wrap1_1">*仅微信付款</div>
+        <div class="wrap1_2">总计 ¥{{orderingInfo.expectedPayment}}</div>
+      </div>
+      <div class="wrap2" @click="signContract">付款</div>
+    </div>
+  </div>
+</template>
+<script>
+import {postDataByParams} from "../../http/service";
+
+export default {
+  name: "confirm-order",
+  data(){
+    return{
+      orderingInfo:uni.getStorageSync('orderingInfo'),
+      expectedPayment:'',
+      distance:'',
+      ID:'',
+      info: {},
+      statusValue: [{label: '全部状态', value: 0}, {label: '待入库', value: 1,style:'color: #FFBA00;font-size: 24rpx'}, {
+        label: '已入库',
+        value: 2,
+        style:'color: #76C458;font-size: 24rpx'
+      }, {label: '即将到期', value: 3,style:'color: #FF4848;font-size: 24rpx'}, {label: '延期待补款', value: 4,style:'color: #FF4848;font-size: 24rpx'}, {label: '已取出', value: 5}]
+    }
+  },
+  computed:{
+    daysRemainingStyle(){
+      switch (this.info.artworkStatus){
+        case 1:
+        case 2:
+        case 3:
+        case 5:
+          return  'color: #939393;font-size: 24rpx;'
+        case 4:{
+          return  'color: #FF4848;font-size: 24rpx;'
+        }
+
+      }
+
+    }
+  },
+  mounted() {
+    console.log(this.orderingInfo,'orderingInfo')
+    if (this.$mp.query.ID) {
+      this.ID=this.$mp.query.ID
+    }
+    this.getData()
+    uni.createSelectorQuery().select('.title-block').boundingClientRect(data => {
+      let res = uni.getSystemInfoSync();
+      const distance = res.windowHeight - data.bottom;
+      this.distance = distance
+    }).exec()
+
+
+  },
+  methods: {
+  async  signContract(){
+    const data1={
+      artworkName:this.orderingInfo.info.artworkName,
+      artworkNum:this.orderingInfo.info.artworkNum,
+      artistName:this.orderingInfo.info.artistName,
+      artworkSize:this.orderingInfo.info.artworkSize,
+      warehouseID:this.orderingInfo.warehouseID,
+      cycleID:this.orderingInfo.cycleID,
+      artworkImg:this.orderingInfo.info.artworkImg,
+      artworkSizeL:this.orderingInfo.info.artworkSizeL,
+      artworkSizeW:this.orderingInfo.info.artworkSizeW,
+      artworkSquareSize:this.orderingInfo.info.artworkSquareSize,
+      contractTransactionId:this.orderingInfo.transactionId
+    }
+    const res1 = await postDataByParams('/api/warehouse/create',data1)
+      if (res1.code===200){
+        const res2 = await postDataByParams('/api/warehouse/paid',{
+          ID:res1.data.ID
+        })
+        if (res2.code===200){
+          uni.navigateTo({
+            url: "/pages/paySuccess/paySuccess",
+          });
+        }
+      }
+    },
+    async obtainAmount(){
+      const data={
+        cycleID:this.cycleId,
+        artworkSquareSize:this.info.artworkSquareSize
+      }
+      const res = await postDataByParams('/api/warehouse/calculate',data)
+      if (res.code===200){
+        this.expectedPayment=res.data.money
+      }
+    },
+    back(){
+      uni.navigateBack()
+    },
+    async getData() {
+      const res = await postDataByParams('/api/warehouse/detail',{ID:Number(this.ID)})
+      if (res.code===200){
+        this.info=res.data
+      }else {
+        uni.showToast({
+          title: res.msg,
+          icon:'none'
+        })
+      }
+      console.log(res, 'res')
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.confirm-order {
+  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;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  background-size: cover;
+  width: 100vw;
+  height: 100vh;
+  & > .content5 {
+    align-items: center;
+    left: 0;
+    background: #fff;
+    width: 750rpx;
+    position: fixed;
+    bottom: 0;
+    height: 172rpx;
+    display: flex;
+
+    .wrap2 {
+      border-radius: 40rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 392rpx;
+      height: 56rpx;
+      color: #fff;
+      font-size: 32rpx;
+      background: #76C458;
+    }
+    .wrap1 {
+      margin-left: 58rpx;
+      margin-right: 70rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: start;
+      .wrap1_1 {
+        color: #939393;
+        font-size: 16rpx;
+      }
+
+      .wrap1_2 {
+        font-size: 32rpx;
+        color: #76C458;
+      }
+    }
+  }
+  .content3 {
+    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_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 {
+    margin-top: 42rpx;
+    display: flex;
+    justify-content: center;
+
+    image {
+      width: 404rpx;
+      height: 306rpx;
+    }
+  }
+
+  .content1 {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .wrap1 {
+      image {
+        width: 112rpx;
+        height: 52rpx;
+      }
+    }
+
+    .wrap2 {
+      color: #4E964D;
+      font-size: 32rpx;
+    }
+
+    .wrap3 {
+      image {
+        width: 40rpx;
+        height: 40rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 5ed6212..46e4378 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -2,37 +2,43 @@
   <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>
-          <div class="wrap1 active">
-            <div class="wrap1_1">某某某某某某某地方</div>
-            <div class="wrap1_2">剩余12位置</div>
-          </div>
-          <div class="wrap1 disabled">
-            <div class="wrap1_1">某某某某某某某地方</div>
-            <div class="wrap1_2">*已满员</div>
+          <div v-for="(item,index) in addressList" @click="selectAddress(item)"
+               :class="[warehouseID===item.ID?'active':'']" :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_1">某某某某某某某地方</div>
+                      <div class="wrap1_2">剩余12位置</div>
+                    </div>-->
+          <!--          <div class="wrap1 disabled">
+                      <div class="wrap1_1">某某某某某某某地方</div>
+                      <div class="wrap1_2">*已满员</div>
+                    </div>-->
         </div>
         <div class="content2"></div>
-        <div class="content6">
+        <div class="content6" @click="confirmAddress">
           <div class="wrap1">确定</div>
         </div>
       </div>
@@ -42,41 +48,50 @@
         <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>
         <div class="content3">
-          <div class="wrap1">1个月</div>
-          <div class="wrap1">3个月</div>
-          <div class="wrap1 active">6个月</div>
-          <div class="wrap4">
-            <div class="wrap4_1">12个月</div>
-            <div class="wrap4_2">*暂时不可选</div>
+          <div v-for="(item,index) in cycleList" @click="selectionPeriod(item)" :key="index"
+               :class="[cycleId===item.ID?'active':'']" class="wrap1">{{ item.name }}
           </div>
+          <!--          <div class="wrap1"></div>
+                    <div class="wrap1 active">6个月</div>-->
+          <!--          <div class="wrap4">
+                      <div class="wrap4_1">12个月</div>
+                      <div class="wrap4_2">*暂时不可选</div>
+                    </div>-->
         </div>
-        <div class="content2"></div>
-        <div class="content4">起始日期</div>
-        <div class="content5">
-          <div class="wrap1">年份</div>
-          <div class="wrap2">月</div>
-          <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-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>
-            </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>
-            </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>
-            </picker-view-column>
-          </picker-view>
-        </div>
-        <div class="content2"></div>
-        <div class="content6">
+        <!--        <div class="content2"></div>
+                <div class="content4">起始日期</div>
+                <div class="content5">
+                  <div class="wrap1">年份</div>
+                  <div class="wrap2">月</div>
+                  <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-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>
+                    </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>
+                    </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>
+                    </picker-view-column>
+                  </picker-view>
+                </div>
+                <div class="content2"></div>-->
+        <div class="content6" @click="confirmCycle">
           <div class="wrap1">确定</div>
         </div>
       </div>
@@ -88,7 +103,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="info.artworkNum"/>
           </div>
           <div class="wrap1_1_4"></div>
         </div>
@@ -96,7 +111,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="info.artworkName"/>
           </div>
           <div class="wrap1_1_4"></div>
         </div>
@@ -104,7 +119,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="info.artistName"/>
           </div>
           <div class="wrap1_1_4">
           </div>
@@ -113,7 +128,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="info.artworkSquareSize"/>
           </div>
         </div>
       </div>
@@ -121,19 +136,12 @@
     </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="warehouseID?addressList.find(x=>x.ID===warehouseID).address:'寄存地址'"/>
           </div>
           <div class="wrap1_1_4"></div>
           <div @click="show_2=true" class="wrap1_1_5">
@@ -144,7 +152,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="cycleId?cycleList.find(x=>x.ID===cycleId).name:'寄存时限'"/>
           </div>
           <div @click="show_1=true" class="wrap1_1_5">
             <image src="../../static/zu612@3x.png"></image>
@@ -158,16 +166,18 @@
     <div class="content5">
       <div class="wrap1">
         <div class="wrap1_1">*仅微信付款</div>
-        <div class="wrap1_2">预计 ¥600.00</div>
+        <div class="wrap1_2">预计 ¥{{expectedPayment}}</div>
       </div>
-      <div class="wrap2">确认金额并签署合同</div>
+      <div class="wrap2" @click="signContract">确认金额并签署合同</div>
     </div>
   </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 +195,16 @@ export default {
       days.push(i)
     }
     return {
-      show_2:false,
-      data:[],
-      show_1:false,
+      dayMoney:'',
+      expectedPayment:'',
+      warehouseID: '',
+      cycleId: '',
+      cycleList: [],
+      addressList: [],
+      info: {},
+      show_2: false,
+      data: [],
+      show_1: false,
       title: 'picker-view',
       years,
       year,
@@ -197,54 +214,145 @@ 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(){
+  watch:{
+    cycleId(newValue){
+      this.obtainAmount()
+
+    }
+  },
+  mounted() {
+    this.getCycle()
+    if (this.url){
+      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 signContract(){
+
+     const data={
+       cycleId:this.cycleId,
+       warehouseID:this.warehouseID,
+       artworkSquareSize:this.info.artworkSquareSize
+     }
+      const res = await postDataByParams('/api/warehouse/fdd/contract/h5',data)
+     if (res.code===200){
+       uni.setStorageSync("jumpUrl", res.data.jumpUrl)
+       uni.setStorageSync("orderingInfo", {
+         cycleID:this.cycleId,
+         warehouseID:this.warehouseID,
+         transactionId:res.data.transactionId,
+         dayMoney:this.dayMoney,
+         info:this.info,
+         expectedPayment:this.expectedPayment,
+         addressName:this.addressList.find(x=>x.ID===this.warehouseID).address,
+         cycleName:this.cycleList.find(x=>x.ID===this.cycleId).name
+       })
+       uni.navigateTo({
+         url: `/pages/signwebview/index`,
+       });
+     }
+
+    },
+   async obtainAmount(){
+     const data={
+       cycleID:this.cycleId,
+       artworkSquareSize:this.info.artworkSquareSize
+     }
+      const res = await postDataByParams('/api/warehouse/calculate',data)
+     if (res.code===200){
+       this.expectedPayment=res.data.money
+       this.dayMoney=res.data.dayMoney
+     }
+    },
+    confirmCycle() {
+      this.show_1 = false
+    },
+    confirmAddress() {
+      this.show_2 = false
+    },
+    selectAddress(item) {
+      this.warehouseID = item.ID
+    },
+    selectionPeriod(item) {
+      this.cycleId = item.ID
+    },
+    async getCycle() {
+      const res = await postDataByParams('/api/warehouse/cycle')
+      if (res.code === 200) {
+        this.cycleList = res.data.data
+      }
+    },
+    async getAddress() {
+      const res = await postDataByParams('/api/warehouse/address')
+      if (res.code === 200) {
+        this.addressList = res.data.data
       }
     },
-    changeData(e){
-      this.data=[e.detail.value[0]+1990,e.detail.value[1]+1,e.detail.value[2]+1]
+    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
+      }
     },
-    back(){
-      uni.navigateBack({ delta: 2 })
+    changeData(e) {
+      this.data = [e.detail.value[0] + 1990, e.detail.value[1] + 1, e.detail.value[2] + 1]
+    },
+    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 +360,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 +386,9 @@ picker-view {
   background-size: cover;
   width: 100vw;
   height: 100vh;
-  &>.content5{
+
+  & > .content5 {
+
     align-items: center;
     left: 0;
     background: #fff;
@@ -284,7 +398,7 @@ picker-view {
     height: 172rpx;
     display: flex;
 
-    .wrap2{
+    .wrap2 {
       border-radius: 40rpx;
       display: flex;
       justify-content: center;
@@ -293,33 +407,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 +451,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 +551,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 +577,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 +606,25 @@ 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;
+        flex-grow: 1;
+        color: #4E964D;
+        font-size: 28rpx;
+      }
+
+      .wrap2 {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -486,7 +632,8 @@ picker-view {
         color: #4E964D;
         font-size: 28rpx;
       }
-      .wrap3{
+
+      .wrap3 {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -495,42 +642,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 +695,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 +724,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 +753,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 +772,13 @@ picker-view {
       }
     }
   }
-  &>.content2{
+
+  & > .content2 {
     margin-top: 42rpx;
     display: flex;
     justify-content: center;
-    image{
+
+    image {
       width: 404rpx;
       height: 306rpx;
     }
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index 1040621..154048e 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -1,27 +1,29 @@
 <template>
   <div class="contract" >
     <title-block title="待签署合同">
-      <template #left>
-        <div class="wrap3">
+<!--      <template #left>
+        <div class="wrap3" style="display: flex;align-items: center">
           <image src="../../static/zu567@3x.png"></image>
         </div>
-      </template>
+      </template>-->
     </title-block>
 
     <div class="content2">
       <div class="wrap1">合同名称</div>
       <div class="wrap2">合同编号</div>
-      <div class="wrap3">签署倒计时</div>
+      <div class="wrap3">签署日期</div>
     </div>
-    <scroll-view style="margin-top: 20rpx;height: 1400rpx"  class="scrollbox" :scroll-y="true" @scrolltolower="loadMore">
-    <div class="content3">
+
+    <div class="content3" >
+      <scroll-view :style="{height:`${elementBottom}rpx`}"  :scroll-y="true" @scrolltolower="loadMore">
       <div class="wrap1" v-for="(item,index) in mainList" :key="index">
-        <div class="wrap1_1">合同的名称</div>
-        <div class="wrap1_2">937329883</div>
-        <div class="wrap1_3"><div class="wrap1_3_1">剩余23:59:59</div></div>
+        <div class="wrap1_1">{{item.contractTile}}</div>
+        <div class="wrap1_2">{{item.contractId.length>10?`${item.contractId.slice(0,10)}...`:item.contractId}}</div>
+        <div class="wrap1_3"><div class="wrap1_3_1">{{item.signDate}}</div></div>
       </div>
+      </scroll-view>
     </div>
-    </scroll-view>
+
     <tabbar :current="2"></tabbar>
   </div>
 </template>
@@ -36,13 +38,21 @@ export default {
     return{
       page:1,
       pageSize:999,
-      mainList:[]
+      mainList:[],
+      elementBottom:''
     }
   },
   mounted(){
     this.getData()
+    this.getDistanceFromTopToPageBottom('.content3')
+
   },
   methods:{
+    async getDistanceFromTopToPageBottom(classValue) {
+      const { windowHeight, windowWidth } = await uni.getSystemInfo();
+      const [{ top }] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
+      this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
+    },
     loadMore(){
 
     },
@@ -75,7 +85,9 @@ export default {
   width: 100vw;
   height: 100vh;
   .content3{
+    margin-top: 20rpx;
     margin-bottom: 166rpx;
+
     .wrap1{
       margin-bottom: 20rpx;
      border-radius: 20rpx;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 6880966..c93dc05 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,5 +1,3 @@
-
-
 <template>
 <div class="mine" :style="{background:'url('+'../../static/bbj1@3x.png'+')'}">
   <div class="content1">
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 03b917a..5dfcb10 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -4,7 +4,7 @@
       <template #left>
         <u-action-sheet
             :show="show"
-            :actions="this.statusValue.map(x=>({name:x.label,value:x.value}))"
+            :actions="statusValue.map(x=>({name:x.label,value:x.value}))"
             title="请选择状态"
             @close="show = false"
             @select="statusSelect"
@@ -12,10 +12,9 @@
         </u-action-sheet>
         <div @click="openStatus" class="wrap1">
           <div class="wrap1_1">
-            <div class="wrap1_1_1">{{ statusValue.find(x => x.value === status).label }}</div>
+            <div class="wrap1_1_1">{{ statusValue.find(x => x.value === artworkStatus).label }}</div>
             <image style="width: 12rpx;height: 8rpx" src="../../static/dbx2@3x.png"></image>
           </div>
-
         </div>
       </template>
     </title-block>
@@ -33,8 +32,9 @@
       </div>
 
     </div>
-    <scroll-view style="   margin-top: 28rpx;" class="scrollbox" :scroll-y="true" @scrolltolower="loadMore">
-      <div class="content3">
+
+    <div class="content3">
+      <scroll-view :style="{height:`${elementBottom}rpx`}" class="scrollbox" :scroll-y="true" @scrolltolower="loadMore">
         <div
             v-for="(item,index) in mainList" :key="index"
             @touchstart="(e)=>{touchStart(e,index)}"
@@ -43,36 +43,40 @@
             @click="goRouter(item)"
             :style="{transform: `translateX(${item.distanceX}px)`}" class="wrap1">
           <div class="wrap1_1">
-            <image src="../../static/jx632@3x.png"></image>
+            <image :src="item.artworkImg?item.artworkImg:'../../static/jx632@3x.png'"></image>
           </div>
           <div class="wrap1_2">
-            <div class="wrap1_2_1">{{item.artworkName}}</div>
-            <div class="wrap1_2_2">订单号:{{item.artworkName}}</div>
-            <div class="wrap1_2_3">{{item.artworkSquareSize}}平尺</div>
-            <div class="wrap1_2_4">{{item.startAt.replaceAll('-','.')}}-{{item.endAt.replaceAll('-','.')}}</div>
+            <div class="wrap1_2_1">{{ item.artworkName }}</div>
+            <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>
+            <div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div>
+            <div class="wrap1_2_4">{{ item.startAt }}-{{ item.endAt }}</div>
           </div>
-          <div class="wrap1_3" :class="[`status${item.status}`]">
-            <div class="wrap1_3_1" v-if="item.status===4">
-              <div class="wrap1_3_1_1">2023.09.28</div>
-              <div class="wrap1_3_1_2">已超时</div>
-              <div class="wrap1_3_1_3">点击补款</div>
+          <div class="wrap1_3" :class="[`status${item.artworkStatus}`]">
+            <div class="wrap1_3_1" v-if="item.artworkStatus===4">
+              <div class="wrap1_3_1_1">{{ item.endAt }}</div>
+              <div class="wrap1_3_1_2">已延期</div>
+              <div class="wrap1_3_1_3" @click.stop="openShow2(item)">点击补款</div>
             </div>
-            <div class="wrap1_3_3" v-if="item.status!==4">
-              <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.status).label }}</div>
+            <div class="wrap1_3_3" v-if="item.artworkStatus!==4">
+              <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.artworkStatus).label }}</div>
             </div>
             <div class="wrap1_3_2">
               <div class="wrap1_3_2_1">货架号:</div>
-              <div class="wrap1_3_2_2">12-02-13</div>
+              <div class="wrap1_3_2_2">{{ item.shelvesNum }}</div>
             </div>
           </div>
 
-          <div class="wrap1_4" v-if="item.isRight&&item.status===5">
+          <div class="wrap1_4" v-if="item.isRight&&item.artworkStatus===5" @click.stop="openDelete(item)">
             <image style="width: 80rpx;height: 80rpx" src="../../static/zu154@3x.png"></image>
           </div>
         </div>
-      </div>
-    </scroll-view>
-
+      </scroll-view>
+    </div>
+    <uni-popup ref="alertDialog" type="dialog">
+      <uni-popup-dialog :type="'info'" cancelText="关闭" confirmText="确认" title="提示" :content="messageText"
+                        @confirm="popForward"
+      ></uni-popup-dialog>
+    </uni-popup>
     <tabbar :current="1"></tabbar>
   </div>
 </template>
@@ -85,18 +89,22 @@ export default {
   name: "index",
   data() {
     return {
+      messageText: '',
+      show_1: false,
       show: false,
       mobileKey: '',
       startX: 0,
       windowWidth: 0,
       page: 1,
-      status: 0,
+      elementBottom: '',
+      item: null,
+      artworkStatus: 0,
       pageSize: 999,
       mainList: [],
-      statusValue: [{label: '全部状态', value: 0}, {label: '未入库', value: 1}, {
+      statusValue: [{label: '全部状态', value: 0}, {label: '待入库', value: 1}, {
         label: '已入库',
         value: 2
-      }, {label: '即将到期', value: 3}, {label: '超时', value: 4}, {label: '已取货', value: 5}]
+      }, {label: '即将到期', value: 3}, {label: '已延期', value: 4}, {label: '已取出', value: 5}]
     }
   },
   components: {UImage, tabbar},
@@ -107,18 +115,81 @@ export default {
         this.windowWidth = res.windowWidth
       }
     })
+    this.getDistanceFromTopToPageBottom('.content3')
   },
+  computed: {},
   methods: {
-    goRouter(){
-			uni.navigateTo({
-				url:'/pages/order-goods/order-details'
-			})
+    popForward() {
+
+      if (this.messageText === '确认补款吗') {
+        this.supplementaryPayment()
+      } else if (this.messageText === '确认删除吗') {
+        this.deleteClick()
+      }
+    },
+    openShow2(item) {
+      this.item = item
+      this.messageText = `确认补款吗`
+      this.$refs.alertDialog.open()
+    },
+    async supplementaryPayment() {
+      const data = {
+        ID: this.item.ID
+      }
+      const res = await postDataByParams('/api/warehouse/supply/paid', data)
+      if (res.code===200){
+        uni.showToast({
+          title: '补款成功',
+          icon: 'none'
+        })
+      }else {
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+      }
+    },
+    async getDistanceFromTopToPageBottom(classValue) {
+      const {windowHeight, windowWidth} = await uni.getSystemInfo();
+      const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
+      this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
+    },
+    openDelete(item) {
+      this.messageText = `确认删除吗`
+      this.$refs.alertDialog.open()
+      this.item = item
+    },
+    async deleteClick() {
+      this.show_1 = false
+      const data = {
+        ID: this.item.ID
+      }
+      const res = await postDataByParams('/api/warehouse/remove', data)
+      if (res.code === 200) {
+        this.getData()
+        uni.showToast({
+          title: '删除成功',
+          icon: 'none'
+        })
+      } else {
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+      }
+
+
+    },
+    goRouter(item) {
+      uni.navigateTo({
+        url: `/pages/order-goods/order-details?ID=${item.ID}`
+      })
     },
     search() {
       this.getData()
     },
     statusSelect(data) {
-      this.status = data.value
+      this.artworkStatus = data.value
       this.getData()
     },
     openStatus() {
@@ -131,7 +202,7 @@ export default {
       const data = {
         page: this.page, //分页
         pageSize: this.pageSize, //每页数据量
-        status: this.status, //状态(1-未入库  2-已入库 3-即将到期 4-超时 5-已取货)
+        status: this.artworkStatus, //状态(1-待入库  2-已入库 3-即将到期 4-已延期 5-已取出)
         mobileKey: this.mobileKey
       }
       const res = await postDataByParams('/api/warehouse/list', data)
@@ -141,10 +212,10 @@ export default {
           this.$set(x, 'distanceX', 0)
           this.$set(x, 'isRight', false)
         })
-      }else {
+      } else {
         uni.showToast({
           title: res.msg,
-          icon:'none'
+          icon: 'none'
         })
       }
     },
@@ -180,9 +251,9 @@ export default {
   height: 100vh;
 
   .content3 {
-    height: 2000rpx;
+    margin-top: 20rpx;
 
-    margin-bottom: 166rpx;
+    margin-bottom: 300rpx;
 
     .wrap1 {
       margin-bottom: 20rpx;
@@ -216,6 +287,14 @@ export default {
         width: 144rpx;
         height: 228rpx;
 
+        &.status5 {
+          background: #939393;
+
+          .wrap1_3_3_1 {
+            color: #939393;
+          }
+        }
+
         &.status1 {
           background: #FFBA00;
 
@@ -239,6 +318,7 @@ export default {
             color: #FF4848;
           }
         }
+
         &.status4 {
           background: #FF4848;
 
diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue
index 1b3460d..79ea4a2 100644
--- a/pages/order-goods/order-details.vue
+++ b/pages/order-goods/order-details.vue
@@ -1,56 +1,135 @@
 <template>
-  <div class="order-details" :style="{background:'url('+'../../static/bbj1@3x.png'+')'}">
-    <div class="content1">
-      <div class="wrap1">
-        <image src="../../static/zu506@3x.png"></image>
+  <div class="order-details" >
+    <title-block class="title-block" title="2订单库">
+      <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>
+      </template>
+    </title-block>
+<div :style="{height:`${distance}px`}" style="overflow-y: auto">
+  <div style="padding-bottom: 128rpx">
+  <div class="content2">
+    <image src="../../static/zu709@3x.png"></image>
+  </div>
+  <div class="content3">
+    <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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkNum"/>
+        </div>
+        <div class="wrap1_1_4"></div>
       </div>
-      <div class="wrap2">
-        订单号的详情
+      <div class="wrap1_1">
+        <div class="wrap1_1_1">画作名称</div>
+        <div class="wrap1_1_2"></div>
+        <div class="wrap1_1_3">
+          <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkName"/>
+        </div>
+        <div class="wrap1_1_4"></div>
       </div>
-      <div class="wrap3">
-        <image src="../../static/zu594@3x.png"></image>
+      <div class="wrap1_1">
+        <div class="wrap1_1_1">画家名称</div>
+        <div class="wrap1_1_2"></div>
+        <div class="wrap1_1_3">
+          <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artistName"/>
+        </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkSquareSize"/>
+        </div>
       </div>
     </div>
-    <div class="content2">
-      <image src="../../static/zu709@3x.png"></image>
-    </div>
-    <div class="content3">
-      <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 class="wrap2"></div>
+  </div>
+  <div class="content3" >
+    <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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkNum"/>
         </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="画作名称"/>
-          </div>
-          <div class="wrap1_1_4"></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 disabled :placeholder-style="statusValue.find(x=>x.value===info.artworkStatus).style" :placeholder="statusValue.find(x=>x.value===info.artworkStatus).label"/>
         </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="画家名称"/>
-          </div>
-          <div class="wrap1_1_4">
-          </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 disabled placeholder-style="color: #76C458;font-size: 24rpx;" :placeholder="info.warehouseName"/>
+        </div>
+        <div class="wrap1_1_4">
         </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="画作平尺数"/>
+      </div>
+      <div class="wrap1_1" style="position: relative;">
+        <div class="wrap1_1_1" >寄存时限</div>
+        <div class="wrap1_1_2"></div>
+        <div class="wrap1_1_3" >
+          <div class="wrap1_1_3_1" style="position: absolute;display: flex;top: 50%;transform: translateY(-50%);">
+            <div class="wrap1_1_3_1_1" style="width: 70rpx;color:#fff;height: 30rpx;background: #76C458;font-size: 16rpx;display: flex;justify-content: center;align-items: center;margin-right: 2rpx">{{info.cycleName}}</div>
+            <div class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx">{{`${info.startAt}-${info.endAt}`}}</div>
           </div>
         </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 disabled :placeholder-style="daysRemainingStyle" :placeholder="info.levelDays"/>
+        </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="`${info.money}元`"/>
+        </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 disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="`${info.dayMoney}元`"/>
+        </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 disabled placeholder-style="color: #FF4848;font-size: 24rpx;" :placeholder="`${info.supplementMoney}元`"/>
+        </div>
+        <div class="wrap1_1_4">
+        </div>
       </div>
-      <div class="wrap2"></div>
     </div>
+    <div class="wrap2"></div>
+  </div>
+  </div>
+</div>
+
+
   </div>
 </template>
 <script>
@@ -58,12 +137,63 @@ import {postDataByParams} from "../../http/service";
 
 export default {
   name: "order-details",
+  data(){
+    return{
+      distance:'',
+      ID:'',
+      info: {},
+      statusValue: [{label: '全部状态', value: 0}, {label: '待入库', value: 1,style:'color: #FFBA00;font-size: 24rpx'}, {
+        label: '已入库',
+        value: 2,
+        style:'color: #76C458;font-size: 24rpx'
+      }, {label: '即将到期', value: 3,style:'color: #FF4848;font-size: 24rpx'}, {label: '延期待补款', value: 4,style:'color: #FF4848;font-size: 24rpx'}, {label: '已取出', value: 5}]
+    }
+  },
+  computed:{
+    daysRemainingStyle(){
+      switch (this.info.artworkStatus){
+        case 1:
+        case 2:
+        case 3:
+        case 5:
+           return  'color: #939393;font-size: 24rpx;'
+        case 4:{
+         return  'color: #FF4848;font-size: 24rpx;'
+        }
+
+      }
+
+    }
+  },
   mounted() {
+
+    if (this.$mp.query.ID) {
+this.ID=this.$mp.query.ID
+    }
     this.getData()
+      uni.createSelectorQuery().select('.title-block').boundingClientRect(data => {
+        let res = uni.getSystemInfoSync();
+        const distance = res.windowHeight - data.bottom;
+        this.distance = distance
+      }).exec()
+
+
   },
   methods: {
+
+    back(){
+      uni.navigateBack()
+    },
     async getData() {
-      const res = await postDataByParams('/api/warehouse/detail')
+      const res = await postDataByParams('/api/warehouse/detail',{ID:Number(this.ID)})
+      if (res.code===200){
+      this.info=res.data
+      }else {
+        uni.showToast({
+          title: res.msg,
+          icon:'none'
+        })
+      }
       console.log(res, 'res')
     }
   }
@@ -71,14 +201,14 @@ export default {
 </script>
 <style scoped lang="scss">
 .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;
-  padding-top: 46rpx;
+  overflow: hidden;
   padding-left: 30rpx;
   padding-right: 30rpx;
   background-size: cover;
   width: 100vw;
   height: 100vh;
-
   .content3 {
     margin-top: 60rpx;
 
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index 277e831..628895d 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -59,7 +59,22 @@
 </template>
 
 <script>
-export default {};
+export default {
+  name:'paySuccess',
+  data(){
+    return{
+
+    }
+  },
+  mounted(){
+    this.getData()
+  },
+  methods:{
+    getData(){
+
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -125,4 +140,4 @@ export default {};
     justify-content: space-between;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/signwebview/index.vue b/pages/signwebview/index.vue
new file mode 100644
index 0000000..1748f0d
--- /dev/null
+++ b/pages/signwebview/index.vue
@@ -0,0 +1,28 @@
+
+<template>
+  <web-view :src="url" @message="getMessage"></web-view>
+</template>
+<script>
+export default {
+  name: "index",
+  data(){
+    return{
+url:''
+    }
+  },
+  mounted(){
+    this.url=uni.getStorageSync("jumpUrl")
+  },
+  methods:{
+    getMessage(e){
+      console.log(e,'getMessage')
+    }
+  }
+
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>