Merge branch 'feature/buttonName'

components/Index/IndexItem.vue

@@ -16,11 +16,9 @@
       <img :src="listItem.companyLogo" alt="" />
       <div class="itembar-bottom__companyname">{{ listItem.companyName }}</div>
       <van-button
-        :class="{ gray: listItem.isDelivery === 1 }"
         class="itembar-bottom__button"
         :style="{ '--bgc': color.bgc }"
-        :disabled="listItem.isDelivery === 1"
-        @click.stop="submit"
+        @click.stop="detail"
         >{{ translateButton }}</van-button
       >
     </div>
@@ -100,16 +98,16 @@ export default {
       }
     },
     translateButton() {
-      if (this.listItem.isDelivery === 1) {
-        return '已投递'
-      } else {
-        return '立即投递'
-      }
+      // if (this.listItem.isDelivery === 1) {
+      //   return '已投递'
+      // } else {
+      return '立即查看'
+      // }
     },
   },
   methods: {
-    submit() {
-      this.$emit('submit', this.submitId)
+    detail() {
+      this.$emit('detail', this.submitId)
     },
   },
 }
@@ -201,4 +199,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

components/Index/IndexList.vue

@@ -15,8 +15,7 @@
       :submit-id="item.id"
       :list-item="list[index]"
       :color="color"
-      @submit="submit"
-      @click.native="detail(item.id)"
+      @detail="detail"
     ></index-item>
     <div v-if="!hasMore" class="finish-text">没有更多了</div>
     <!-- </van-list> -->
@@ -53,9 +52,9 @@ export default {
     return {}
   },
   methods: {
-    submit(submitId) {
-      this.$emit('submit', submitId)
-    },
+    // submit(submitId) {
+    //   this.$emit('submit', submitId)
+    // },
     detail(submitId) {
       this.$emit('detail', submitId)
     },
@@ -70,4 +69,4 @@ export default {
   line-height: 0.66667rem;
   text-align: center;
 }
-</style>
\ No newline at end of file
+</style>