Merge remote-tracking branch 'origin/master'

doum

3 天以前 0d0e67818a45161af14114211f43aafd232a6da2

 admin/src/views/business/activity.vue

@@ -39,7 +39,7 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:activity:create', 'business:activity:delete']">
        <li><el-button type="primary" @click="$refs.operaActivityWindow.open('新建')" icon="el-icon-plus" v-permissions="['business:activity:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:activity:delete']">删除</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:activity:delete']">删除</el-button></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
@@ -89,7 +89,7 @@
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaActivityWindow.open('编辑', row)" icon="el-icon-edit" v-permissions="['business:activity:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:activity:delete']">删除</el-button>
            <el-button type="text" style="color: red;" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:activity:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -126,7 +126,7 @@
        endtime: '',
        type: 1 //类型0商家活动 1平台活动 2探店 3资讯
      },
      

      activityStatus: [
        // 0未开始 1报名中,2报名结束,3活动进行中,4活动已结束
        { label: '未开始', id: 0 },
@@ -166,7 +166,7 @@
      this.search()
    },
    shopDetail(row) {
      

    }
  },
}