1

src/components/setup/AddsetupActicity.vue

@@ -357,7 +357,7 @@
             this.msg.value.push(res.data.data.StartTime)
             this.msg.value.push(res.data.data.EndTime)
             this.msg.Way = res.data.data.Way.toString()
-            this.msg.ActiveObject = res.data.data.ActiveObject.toString()
+            this.msg.ActiveObject =res.data.data.ActiveObject &&  res.data.data.ActiveObject.toString()
 
 
             if (res.data.data.RangeType == 1) {
@@ -366,8 +366,8 @@
               this.getProductCategoryTreeList();
               for (let i = 0; i < ProductList.length; i++) {
                 this.checkedkeys.push(ProductList[i].Id)
-
                 var objList = this.getObjById(this.ProductCategoryTreeList, ProductList[i].Id);
+
                 if (objList) {
                   this.AppointList.push({
                     ProductId: objList.Id,

src/components/setup/setupActivityList.vue

@@ -3,6 +3,7 @@
     <div class="el-card__header">
       <span>活动管理</span>
       <div style="display: flex;flex-direction: row;align-items: center">
+        <el-button type="primary" class="el-button--small" @click="gowinning()">中奖列表</el-button>
         <el-button type="primary" class="el-button--small" @click="addRecharge">新增</el-button>
       </div>
     </div>
@@ -200,6 +201,10 @@
       addRecharge(){
         this.$router.push('/AddsetupActicity');
 
+      },
+      gowinning(){
+        this.$router.push('/winningList');
+
       },
       grant(row,type){
         this.apipost(

src/components/setup/winningList.vue

@@ -18,20 +18,27 @@
             </el-input>
             <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
           </div>
+<!--          <div class="searchInput" style="width:250px">-->
+<!--            <el-input style="display:inline-block;width:225px;height:30px"-->
+<!--                      placeholder="请输入用户ID"-->
+<!--                      v-model="msg.UserId"-->
+<!--                      size="small"-->
+<!--                      @clear="getList"-->
+<!--                      @keyup.enter.native="getList"-->
+<!--                      clearable>-->
+<!--            </el-input>-->
+<!--            <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>-->
+<!--          </div>-->
+          <span style="margin-left:15px">状态：</span>
+          <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="getList"
+                     placeholder="请选择">
+            <el-option label="不限" :value="0"></el-option>
+            <el-option v-for="item in tableData2" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
           <div class="searchInput" style="width:250px">
             <el-input style="display:inline-block;width:225px;height:30px"
-                      placeholder="请输入用户ID"
-                      v-model="msg.UserId"
-                      size="small"
-                      @clear="getList"
-                      @keyup.enter.native="getList"
-                      clearable>
-            </el-input>
-            <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
-          </div>
-          <div class="searchInput" style="width:250px">
-            <el-input style="display:inline-block;width:225px;height:30px"
-                      placeholder="请输入验证码"
+                      placeholder="请输入中奖码"
                       v-model="msg.Code"
                       size="small"
                       @clear="getList"
@@ -73,7 +80,9 @@
           label="封面图">
           <template slot-scope="scope">
             <div class="app-image" :style="{backgroundImage:'url(' + scope.row.CoverImage + ')',backgroundSize:'cover'}"></div>
-
+            <div flex="dir:left cross:center">
+              {{scope.row.ActivityName}}
+            </div>
           </template>
         </el-table-column>
         <el-table-column
@@ -88,11 +97,11 @@
         </el-table-column>
         <el-table-column
           prop="Type"
-          label="State">
+          label="状态">
           <template slot-scope="scope">
             <div v-if="scope.row.State==1">未兑换</div>
             <div v-if="scope.row.State==2">已兑换</div>
-            <div v-if="scope.row.State==2">已过期</div>
+            <div v-if="scope.row.State==3">已过期</div>
           </template>
         </el-table-column>
 
@@ -121,7 +130,7 @@
           label="中奖订单"
           prop="RangeType" width="300">
           <template slot-scope="scope">
-            <span style="font-size: 12px;color: #409EFF" v-for="(x,y) in scope.row.OrderList" :key="y">{{x.OrderNo}}{{y+1==scope.row.OrderList.length?'':'、'}}</span>
+            <span style="font-size: 12px;color: #409EFF" v-for="(x,y) in scope.row.OrderList" :key="y">{{x.OrderId}}{{y+1==scope.row.OrderList.length?'':'、'}}</span>
           </template>
         </el-table-column>
 
@@ -163,20 +172,42 @@
           pageIndex:1,
           pageSize:20,
           ActivityName:'',
-          UserId:'',
+          UserId:0,
           State:0,
           Code:'',
         },
         tableData:[],
+        tableData2:[],
         count:0,
-        loading:false
+        loading:false,
+        msg2: {
+          pageIndex: 1,
+          pageSize: 20,
+          Name: '',
+          Source: 0,
+          MemberGrade: 0,
+          Id: 0,
+          Moblie: ''
+        },
       }
     },
     created(){
       this.getDateList();
-
+      this.getNameList()
     },
     methods:{
+      ChangeListName(val) {
+        this.msg2.Name = val;
+        this.getNameList();
+      },
+      getNameList() {
+        this.apipost("/api/user/GetMemberUserDropDownList", this.msg2, res => {
+          if (res.data.resultCode == 1) {
+            let pageData = res.data.data.pageData;
+            this.tableData2 = pageData;
+          }
+        })
+      },
       getDateList(){
         this.loading=true;
         this.apipost("/api/product/GetGoodsActivityGetUserPageList", this.msg, res => {