活动页面完善

src/views/modules/order/buyorder-mergeorder.vue

@@ -16,7 +16,7 @@
                         <el-button type="primary" size="mini" @click="submit" :disabled="buttonDisable">批量合并发货</el-button>
                     </el-radio-group>
                 </div>
-                <ul style="height: 500px; overflow-y:scroll;">
+                <ul style="">
                     <li class="flexbox " v-for="(de, index) in ruleForm.list" :key="index"
                         style="border:1px solid #CFF3ED;  margin-bottom: 5px;">
                         <div class="flexbox" style="align-items: center; padding: 0 10px; width: 34px; border-right: 1px solid #CFF3ED;">

src/views/modules/order/buyorder.vue

@@ -52,9 +52,11 @@
           :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </span>
       <span style="" v-if="tabChange.tabActiveName == 1">
+        <el-badge :value="mergeList.length" class="item">
         <router-link :to="{ path: 'buyorder-mergeorder', query: {} }">
           <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary">合并发货</el-button>
         </router-link>
+      </el-badge>
       </span>
       <span style="" v-if="tabChange.tabActiveName == 1">
         <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary"