diff --git a/App.vue b/App.vue
index adde646..a638731 100644
--- a/App.vue
+++ b/App.vue
@@ -26,14 +26,13 @@ export default {
   justify-content: center;
   align-items: center;
 }
+.tm-poup-wk{
+  height: initial!important;
+}
 .u-upload__button{
   width: 404rpx!important;
   height: 306rpx!important;
 }
-.u-tabbar__content {
-  height: 166rpx;
-}
-.u-border-top {
-  border: none !important;
-}
+
+
 </style>
diff --git a/components/uiq-tabbar/uiq-tabbar.vue b/components/uiq-tabbar/uiq-tabbar.vue
index ad0686f..6ea6404 100644
--- a/components/uiq-tabbar/uiq-tabbar.vue
+++ b/components/uiq-tabbar/uiq-tabbar.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="tabbar">
-    <u-tabbar class="tabbar-ios-fix" :border-top="false" activeColor='#22bf8e' :value="current?current:0" :fixed="true"
-              :placeholder="true" :safeAreaInsetBottom="true" @change="handleTabClick">
+    <u-tabbar :border="false" class="tabbar-ios-fix"  activeColor='#22bf8e' :value="current?current:0" :fixed="true"
+                @change="handleTabClick">
       <u-tabbar-item v-for='(item,index) in tabList' :key="index" :text="item.text">
-        <image slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
+        <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
         </image>
-        <image slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
+        <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
         </image>
       </u-tabbar-item>
     </u-tabbar>
@@ -42,7 +42,7 @@ export default {
 }
 
 
-/*.tabbar-ios-fix {
+.tabbar-ios-fix {
   bottom: calc(120rpx + env(safe-area-inset-bottom));
-}*/
+}
 </style>
diff --git a/pages.json b/pages.json
index 2448966..9c57531 100644
--- a/pages.json
+++ b/pages.json
@@ -157,22 +157,23 @@
 	},
 	"uniIdRouter": {},
 	"tabBar": {
+		"custom": true,
 		"list": [
 			{
-			"pagePath": "pages/home/index",
-			"text": "首页"
+			"pagePath": "pages/home/index"
+
 			},
 			{
-				"pagePath": "pages/mine/index",
-				"text": "首页"
+				"pagePath": "pages/mine/index"
+
 			},
 			{
-				"pagePath": "pages/contract/index",
-				"text": "首页"
+				"pagePath": "pages/contract/index"
+
 			},
 			{
-				"pagePath": "pages/order-goods/index",
-				"text": "首页"
+				"pagePath": "pages/order-goods/index"
+
 			}
 		]
 	}
diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue
index 655c1cc..9e45015 100644
--- a/pages/confirm-order/index.vue
+++ b/pages/confirm-order/index.vue
@@ -153,8 +153,9 @@ export default {
     console.log(this.orderingInfo,'orderingInfo')
     if (this.$mp.query.ID) {
       this.ID=this.$mp.query.ID
+      this.getData()
     }
-    this.getData()
+
     uni.createSelectorQuery().select('.title-block').boundingClientRect(data => {
       let res = uni.getSystemInfoSync();
       const distance = res.windowHeight - data.bottom;
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 079f2a1..c5a621a 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -17,16 +17,22 @@
           name="6"
           multiple
           :maxCount="1"
-          width="250"
-          height="150"
+          width="404rpx"
+          height="306rpx"
       >
-        <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
-               mode="widthFix" style="width: 404rpx;height: 306rpx;"></image>
+        <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>
+<!--        <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
+               mode="widthFix" style="width: 404rpx;height: 306rpx;"></image>-->
       </u-upload>
 <!--      <image :src="info.artworkImg"></image>-->
     </div>
-    <tm-poup height="700" v-model="show_2" position="bottom">
-      <div class="poup1">
+    <tm-poup  v-model="show_2" position="bottom">
+      <div class="poup1" >
         <div class="content1">
           <div class="wrap1">更换您的寄存地址</div>
           <div @click="show_2=false" class="wrap2">
@@ -116,7 +122,7 @@
           <div class="wrap1_1_1">画作编号</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkNum"  placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkNum"/>
+            <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkNum"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
           </div>
           <div class="wrap1_1_4"></div>
         </div>
@@ -124,7 +130,7 @@
           <div class="wrap1_1_1">画作名称</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input style="color: #939393;font-size: 24rpx;"  v-model="info.artworkName" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkName"/>
+            <input style="color: #939393;font-size: 24rpx;"  v-model="info.artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
           </div>
           <div class="wrap1_1_4"></div>
         </div>
@@ -132,7 +138,7 @@
           <div class="wrap1_1_1">画家名称</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input style="color: #939393;font-size: 24rpx;" v-model="info.artistName"   placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artistName"/>
+            <input style="color: #939393;font-size: 24rpx;" v-model="info.artistName"   placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
           </div>
           <div class="wrap1_1_4">
           </div>
@@ -141,7 +147,7 @@
           <div class="wrap1_1_1">画作平尺数</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkSquareSize"  placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkSquareSize"/>
+            <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkSquareSize"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
           </div>
         </div>
       </div>
@@ -149,29 +155,28 @@
     </div>
     <div class="content4">
       <div class="wrap1">
-        <div class="wrap1_1">
+        <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   placeholder-style="color: #939393;font-size: 24rpx;"
-                   :placeholder="warehouseID?addressList.find(x=>x.ID===warehouseID).address:'寄存地址'"/>
+            <input style="color: #939393;font-size: 24rpx;" disabled :value="warehouseID?addressList.find(x=>x.ID===warehouseID).address:''"  placeholder-style="color: #939393;font-size: 24rpx;"
+                   placeholder="请选择寄存地址"/>
           </div>
           <div class="wrap1_1_4"></div>
-          <div @click="show_2=true" class="wrap1_1_5">
+          <div  class="wrap1_1_5">
             <image src="../../static/zu611@3x.png"></image>
           </div>
         </div>
-        <div class="wrap1_1">
+        <div class="wrap1_1" @click="show_1=true">
           <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="cycleId?cycleList.find(x=>x.ID===cycleId).name:'寄存时限'"/>
+            <input style="color: #939393;font-size: 24rpx;" :value="cycleId?cycleList.find(x=>x.ID===cycleId).name:''" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时限"/>
           </div>
-          <div @click="show_1=true" class="wrap1_1_5">
+          <div  class="wrap1_1_5">
             <image src="../../static/zu612@3x.png"></image>
           </div>
-          <div class="wrap1_1_4">
-          </div>
+
         </div>
       </div>
       <div class="wrap2"></div>
@@ -231,11 +236,6 @@ export default {
       url: ''//二维码扫码的结果用户发起请求的body体
     }
   },
-  onLoad(e) {
-    if (e) {
-      this.url = e.url
-    }
-  },
   watch:{
     cycleId(newValue){
       this.obtainAmount()
@@ -244,7 +244,8 @@ export default {
   },
   mounted() {
     this.getCycle()
-    if (this.url){
+    if (this.$mp.query.url){
+      this.url=this.$mp.query.url
       this.getDetailUrl()
     }
     this.getAddress()
@@ -268,9 +269,8 @@ export default {
         });
       })
     },
-    // 删除图片
-    deletePic(event) {
-      this[`fileList${event.name}`].splice(event.index, 1)
+    deletePic() {
+      this.fileList1=[]
     },
     // 新增图片
     async afterRead(event) {
@@ -297,7 +297,42 @@ export default {
       }
     },
    async signContract(){
-
+     const checks = [
+       {
+         value: this.fileList1.length>0,
+         message: '请上传画作图片'
+       },
+       {
+         value: this.info.artworkSquareSize,
+         message: '请输入画作平尺数'
+       },
+       {
+         value: this.info.artistName,
+         message: '请输入画家名称'
+       },
+       {
+         value: this.info.artworkName,
+         message: '请输入画作名称'
+       },
+       {
+         value: this.info.artworkNum,
+         message: '请输入画作编号'
+       },{
+       value: this.warehouseID,
+       message: '请选择寄存地址'
+     }, {
+       value: this.cycleId,
+       message: '请选择寄存时限'
+     }]
+     for (const check of checks) {
+       if (!check.value) {
+         uni.showToast({
+           title: check.message,
+           icon: 'none'
+         })
+         return
+       }
+     }
      const data={
        cycleId:this.cycleId,
        warehouseID:this.warehouseID,
@@ -492,6 +527,7 @@ picker-view {
     padding-top: 28rpx;
     padding-left: 30rpx;
     padding-right: 30rpx;
+    margin-bottom: 72rpx;
 
     & > .content6 {
       margin-top: 26rpx;
@@ -593,6 +629,7 @@ picker-view {
   }
 
   .poup {
+    margin-bottom: 72rpx;
     padding-top: 28rpx;
     padding-left: 30rpx;
     padding-right: 30rpx;
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 700ecb4..65249e6 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -219,13 +219,22 @@ export default {
       }
     },
     touchMove(e, index) {
+      if (this.mainList[index].artworkStatus!==5){
+        return
+      }
       this.mainList[index].distanceX = e.touches[0].clientX - this.startX;
     },
     touchStart(e, index) {
+      if (this.mainList[index].artworkStatus!==5){
+        return
+      }
       this.mainList[index].isRight = true
       this.startX = e.touches[0].clientX;
     },
     touchEnd(index) {
+      if (this.mainList[index].artworkStatus!==5){
+        return
+      }
       if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) {
         this.mainList[index].distanceX = -((144 / 750) * this.windowWidth);
       } else {
diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue
index 79ea4a2..6828276 100644
--- a/pages/order-goods/order-details.vue
+++ b/pages/order-goods/order-details.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="order-details" >
-    <title-block class="title-block" title="2订单库">
+    <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>
@@ -8,7 +8,7 @@
 <div :style="{height:`${distance}px`}" style="overflow-y: auto">
   <div style="padding-bottom: 128rpx">
   <div class="content2">
-    <image src="../../static/zu709@3x.png"></image>
+    <image :src="info.artworkImg"></image>
   </div>
   <div class="content3">
     <div class="wrap1">
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index a3fc7be..ad53e63 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -7,7 +7,7 @@
     />
     <view class="info">
       <view>
-        <image src="../../static/bbj1@3x.png" mode="scaleToFill" style="width:191rpx;height:146rpx"/>
+        <image :src="info.artworkImg" mode="scaleToFill" style="width:191rpx;height:146rpx"/>
       </view>
       <view class="info-right">
         <view class="info-right-item">
@@ -48,10 +48,10 @@
     </view>
     <view class="tips">*请携带您的画作在时限之前到达寄存地</view>
     <view class="btns">
-      <view style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
+      <view @click="goHome" style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
         <u-button text="返回首页" shape="circle" color="#626262"></u-button>
       </view>
-      <view style="width: 280rpx;height:64rpx;border-radius: 40rpx">
+      <view @click="goDetails" style="width: 280rpx;height:64rpx;border-radius: 40rpx">
         <u-button text="查看订单详情" shape="circle" color="#699A70"></u-button>
       </view>
     </view>
@@ -72,6 +72,16 @@ export default {
     this.getData()
   },
   methods: {
+    goDetails(){
+      uni.navigateTo({
+        url: `/pages/order-goods/order-details?ID=${this.$mp.query.ID}`,
+      });
+    },
+    goHome(){
+      uni.switchTab({
+        url: "/pages/home/index",
+      });
+    },
     async getData() {
       const data1 = {
         ID: Number(this.$mp.query.ID)
diff --git a/static/zu142@3x.png b/static/zu142@3x.png
new file mode 100644
index 0000000..9aadea3
Binary files /dev/null and b/static/zu142@3x.png differ
diff --git a/util/tabbar.js b/util/tabbar.js
index 1f2b891..5a9f07c 100644
--- a/util/tabbar.js
+++ b/util/tabbar.js
@@ -7,21 +7,21 @@ let tab1 = [{
     {
         "text": "订单",
         "pagePath": "pages/order-goods/index",
-        "iconPath": "../../static/tabbar/home.png",
-        "selectedIconPath": "../../static/tabbar/home-active.png"
+        "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/cf65acab-6d46-4d2a-af07-3f1daf09139c.png",
+        "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/a5710018-3791-4e0c-b698-caee9bbb642b.png"
     },
     {
         "text": "合同",
         "pagePath": "pages/contract/index",
-        "iconPath": "../../static/tabbar/home.png",
-        "selectedIconPath": "../../static/tabbar/home-active.png"
+        "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/17b5895b-6572-49de-b710-4b318fe0776c.png",
+        "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/c37e0bb7-8702-4d6f-8caf-d62abcf07845.png"
     }
     ,
     {
         "text": "我的",
         "pagePath": "pages/mine/index",
-        "iconPath": "../../static/tabbar/home.png",
-        "selectedIconPath": "../../static/tabbar/home-active.png"
+        "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/bc489115-daba-4457-a8de-f151d7caf610.png",
+        "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/91cae751-1b5a-441d-aa09-aecca60c8519.png"
     }
 ]
 export default tab1
diff --git a/uview-ui/components/u-tabbar/u-tabbar.vue b/uview-ui/components/u-tabbar/u-tabbar.vue
index 953f33a..8ea0cff 100644
--- a/uview-ui/components/u-tabbar/u-tabbar.vue
+++ b/uview-ui/components/u-tabbar/u-tabbar.vue
@@ -40,7 +40,7 @@
 	 * @property {Boolean}			fixed				是否固定在底部（默认 true ）
 	 * @property {Boolean}			placeholder			fixed定位固定在底部时，是否生成一个等高元素防止塌陷（默认 true ）
 	 * @property {Object}			customStyle			定义需要用到的外部样式
-	 * 
+	 *
 	 * @example <u-tabbar :value="value2" :placeholder="false" @change="name => value2 = name" :fixed="false" :safeAreaInsetBottom="false"><u-tabbar-item text="首页" icon="home" dot ></u-tabbar-item></u-tabbar>
 	 */
 	export default {
@@ -112,7 +112,6 @@
 		}
 	}
 </script>
-
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
 
@@ -120,11 +119,11 @@
 		@include flex(column);
 		flex: 1;
 		justify-content: center;
-		
+
 		&__content {
 			@include flex(column);
 			background-color: #fff;
-			
+
 			&__item-wrapper {
 				height: 50px;
 				@include flex(row);