订单高级搜索调整

src/router/index.js

@@ -70,7 +70,7 @@ router.beforeEach((to, from, next) => {
       msgId: GetQueryString('msgId') // 安卓消息id
     }
     store.commit('setLinkInfo', linkInfo)
-    console.log(linkInfo)
+    // console.log(linkInfo)
   } else {
     let linkInfo = {
       userId: GetQueryString('userId'), // APP用户的登录ID

src/views/myOrder/components/HighSearch.vue

@@ -13,15 +13,15 @@
             <!-- <textarea :value="consignor" class="inputInfo" type="text"></textarea> -->
             <div contenteditable="false" placeholder="请选择货主" class="inputInfo">{{consignor}}</div>
           </div>
+          <div class="high-info" @click="showPost('supplier')">
+            <div class="title font-bold font-16">供应商</div>
+            <div contenteditable="false" placeholder="请选择供应商" class="inputInfo">{{supplier}}</div>
+          </div>
           <div class="high-info">
             <div class="title font-bold font-16">请输入订单号</div>
             <!-- <div contenteditable="true" class="inputInfo">{{orderNo}}</div> -->
             <input v-model="moreSearchInfo.orderNo" placeholder="请输入订单号" class="input" type="text">
           </div>
-          <div class="high-info" @click="showPost('supplier')">
-            <div class="title font-bold font-16">供应商</div>
-            <div contenteditable="false" placeholder="请选择供应商" class="inputInfo">{{supplier}}</div>
-          </div>
           <div class="high-info" @click="showPost('goods')">
             <div class="title font-bold font-16">商品</div>
             <div contenteditable="false" placeholder="请选择商品" class="inputInfo">{{goods}}</div>

src/views/myOrder/components/goodsHighSearch.vue

@@ -32,6 +32,10 @@
           <input  type="text" placeholder="请输入生产企业" class="search-input" >
         </div>
       </div>
+      <div class="action-bottom">
+        <van-button type="default" @click="onCleanClick">重置</van-button>
+        <van-button type="info" class="submit" @click="onSearchClick">查询</van-button>
+      </div>
     </van-popup>
   </div>
 </template>
@@ -57,6 +61,28 @@ export default {
     searchShow (val) {
       this.$emit('input', val)
     }
+  },
+  methods: {
+    onSearchClick() {
+      // this.moreSearchShow = false
+      // this.$emit('onsearch', this.moreSearchInfo)
+    },
+    onCleanClick() {
+      // this.moreSearchInfo = {
+      //   supplier: '', // 供应商
+      //   consignor: [], // 货主
+      //   goods: '', // 商品
+      //   client: '', // 客户
+      //   orderNo: '',
+      //   time: {
+      //     start: getFormateDate(new Date(), 'yyyy-MM-dd'),
+      //     end: getFormateDate(new Date(), 'yyyy-MM-dd')
+      //   },
+      // }
+      // console.log(this.moreSearchInfo)
+      // this.moreSearchShow = false
+      // this.$emit('onsearch', this.moreSearchInfo)
+    },
   }
 }
 </script>
@@ -81,5 +107,15 @@ export default {
         border: none;
       }
     }
+    .action-bottom {
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      display: flex;
+
+      button {
+        flex: 1;
+      }
+    }
   }
 </style>

src/views/myOrder/detail/goodsInfo.vue

@@ -25,7 +25,7 @@
       <div class="sum-amount">金额总计：<span style="font-size: 16PX;">￥{{orderTotalAmount}}</span></div>
       
     </div>
-    <!-- <goods-high-search v-model="showHighSearch" /> -->
+    <goods-high-search v-model="showHighSearch" />
    
   </div>
 </template>
@@ -162,7 +162,12 @@ export default {
         if (res.code === 200 && res.data && res.data.code === '00000' &&
           res.data.entity && res.data.entity.orderList && res.data.entity.orderList.length > 0) {
           this.detailData = res.data.entity.orderList[0]
-          console.log(this.detailData)
+          // let array = []
+          // for (var i = 0; i < 10; i++) {
+          //   array.push(this.detailData.goodsInfos[0])
+          //   array.push(this.detailData.goodsInfos[1])
+          // }
+          // this.detailData.goodsInfos = array
         } else {
           console.log('订单详情', '请求失败')
         }

src/views/myOrder/orderListItem.vue

@@ -42,11 +42,11 @@
           <div class="price">总计：￥<span style="color:red;">{{item.orderTotalAmount}}</span></div>
         </div>
         <van-divider :style="{ color: '#999999', borderColor: '#999999', margin: '10PX 0 10PX 0'}"/>
-        <div class="btnInfo" style="text-align: right;">
+        <!-- <div class="btnInfo" style="text-align: right;">
           <van-button v-if="item.isInvoice === 'TRUE'" @click="btnAction('invoice')" style="border-radius: 5PX;height: 25PX; line-height: 25PX" plain size="small" type="info">查看发票</van-button>
           <van-button v-if="item.isDelivered === 'TRUE'" @click="btnAction('logistics')" style="border-radius: 5PX;height: 25PX; line-height: 25PX" plain size="small" type="info">查看物流</van-button>
           <van-button v-if="item.isWeb === 'TRUE'" @click="btnAction('clearance')" style="border-radius: 5PX;height: 25PX; line-height: 25PX" plain size="small" type="info">清货单</van-button>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>