Merge remote-tracking branch 'origin/main'

fuintAdmin/src/views/EventMarketing/center/index.vue

@@ -7,7 +7,7 @@
       </div>
     </div>
       <div class="rp-box"  >
-        <div class="bai-box">
+        <div class="bai-box" v-show="tabindex == 0">
           <div class="d-s">
             <div class="gang"></div>
             <div style="font-weight: bold">会员营销</div>
@@ -193,6 +193,124 @@
             </div>
           </div>
         </div>
+        <div class="bai-box" >
+            <div class="b-d">
+                <div class="d-s">
+                  <el-input v-model="ruleForm.input" placeholder="请输入活动名称" style=" width: 260px; margin-right: 15px"></el-input>
+                  <el-select v-model="ruleForm.value" placeholder="请选择活动类型"  style=" width: 260px; margin-right: 15px">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                  <el-select v-model="ruleForm.value" placeholder="请选择状态" style=" width: 260px; margin-right: 15px">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div class="d-s">
+                  <el-button type="primary" icon="el-icon-search">搜索</el-button>
+                  <el-button  icon="el-icon-refresh-right">重置</el-button>
+                </div>
+            </div>
+          <el-table
+            :data="tableData"
+            border
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              width="55">
+            </el-table-column>
+            <el-table-column
+              type="index"
+              label="序号"
+              width="55">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="活动类型"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="活动名称"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="活动内容"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="date"
+              label="活动时间"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="适用会员等级"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="活动详情"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="已领数量"
+             >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="状态"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="创建人"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="date"
+              label="创建时间"
+             >
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="地址">
+            </el-table-column>
+            <el-table-column prop="date" label="操作" align="center" >
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+
+                >修改</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+
+                  slot="reference"
+                >下架</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+
+
+                >查看订单记录</el-button>
+              </template>
+
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="bai-box" v-show="tabindex == 2"></div>
       </div>
 
 <!--    <div class="fji" >-->
@@ -279,8 +397,42 @@ export default {
   name: 'Exchange',
   data() {
     return{
+      ruleForm:{},
       value:1,
       tabindex:0,
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }],
       tablist:[
         "营销活动",
         "当前活动列表",
@@ -481,4 +633,11 @@ export default {
   box-sizing: border-box;
   padding: 5px;
 }
+.b-d{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+
+}
 </style>