Merge branch '0601Action'

src/views/categroyManager/vipNewActive.vue

@@ -383,6 +383,7 @@
       <el-button type="info" @click="onReSet">重置</el-button>
       <!-- <div class="okBtn"
            @click="submitFrom">确定</div> -->
+           <!--  -->
     </div>
   </div>
 </template>