submit

.hbuilderx/launch.json

@@ -4,7 +4,6 @@
     "configurations": [{
      	"default" : 
      	{
-			
      		"launchtype" : "local"
      	},
      	"mp-weixin" : 

pages.json

@@ -5,7 +5,7 @@
 		"^tm-(.*)": "@/tm-vuetify/components/tm-$1/tm-$1.vue"
 	},
 	"pages": [
-		
+
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -51,7 +51,7 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": false		
+				"enablePullDownRefresh": false
 			}
 		},
 		{

pages/contract/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="contract">
-    <title-block title="待签署合同">
+    <title-block title="已签署合同">
       <!--      <template #left>
               <div class="wrap3" style="display: flex;align-items: center">
                 <image src="../../static/zu567@3x.png"></image>
@@ -10,17 +10,13 @@
 
     <div class="content2">
       <div class="wrap1">合同名称</div>
-      <div class="wrap2">合同编号</div>
       <div class="wrap3">签署日期</div>
     </div>
 
     <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" @click="previewContract(item)">
-          <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_1">{{ item.artworkNum }}</div>
           <div class="wrap1_3">
             <div class="wrap1_3_1">{{ item.signDate }}</div>
           </div>

pages/order-goods/index.vue

@@ -72,6 +72,9 @@
             <div class="wrap1_3_2" v-if="!item.shelvesNum">
               <div class="wrap1_3_2_2">{{item.warehouseName}}</div>
             </div>
+            <div class="wrap1_3_4" v-if="![1,5].includes(item.artworkStatus)" @click.stop="pickUp(item)">
+              {{item.isUserApplyPickUp?'申请取货':'取消申请'}}
+            </div>
           </div>
           <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>
@@ -130,6 +133,30 @@ export default {
 
   computed: {},
   methods: {
+   async pickUp(item){
+     let url=''
+     if (item.isUserApplyPickUp){
+       url='/api/warehouse/apply/pickup'
+     }else {
+       url='/api/warehouse/apply/pickup/cancel'
+     }
+     const data={
+       ID:item.ID
+     }
+      const res = await postDataByParams(url, data)
+     if (res.code===200){
+       uni.showToast({
+        title: '请求成功',
+        icon: 'none'
+      })
+     }else {
+       uni.showToast({
+         title:res.msg,
+         icon: 'none'
+       })
+     }
+     this.getData()
+    },
     popForward() {
 
       if (this.messageText === '确认补款吗') {
@@ -359,7 +386,20 @@ export default {
             color: #FF4848;
           }
         }
-
+        .wrap1_3_4{
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 8rpx;
+          color: #fff;
+          width: 110rpx;
+          height: 35rpx;
+          background-color: #000;
+          left: 20rpx;
+          position: absolute;
+          bottom: 16rpx;
+          font-size: 18rpx;
+        }
         .wrap1_3_2 {
           display: flex;
           flex-direction: column;