页面修改

src/components/pintuan/pintuanList.vue

@@ -2,7 +2,8 @@
   <div class="pintuanActive">
     <div class="head-title">
       拼团活动
-      <el-button style="float:right;margin-top: -5px;" size="small" @click="CommonJump('pintuanActive')" type="primary">新建活动</el-button>
+      <el-button style="float:right;margin-top: -5px;" size="small" @click="CommonJump('pintuanActive')" type="primary">
+        新建活动</el-button>
     </div>
     <div class="content">
       <div>
@@ -21,12 +22,12 @@
         </el-date-picker>
         <div class="searchInput" style="width:250px;margin-right: 0px;">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px"
-            placeholder="请输入商品名称搜索" v-model="msg.keyword" @clear="msg.pageIndex=1,getList()" size="small" clearable>
+            placeholder="请输入商品名称搜索" v-model="msg.QGoodName" @clear="msg.pageIndex=1,getList()" size="small" clearable>
           </el-input>
           <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
-        <span @click="Clearconditions" v-if="msg.keyword!='' || (dateList && dateList.length>0)"
+        <span @click="Clearconditions" v-if="msg.QGoodName!='' || (dateList && dateList.length>0)"
           class='blue point'>清空筛选条件</span>
       </div>
       <div style="margin-top:15px">
@@ -38,31 +39,30 @@
         style="width: 100%;margin:20px 0">
         <el-table-column type="selection" width="55">
         </el-table-column>
-        <el-table-column prop="id" width="120" sortable label="商品ID">
+        <el-table-column prop="GoodId" width="120" sortable label="商品ID">
         </el-table-column>
         <el-table-column label="商品名称" width="320">
           <template slot-scope="scope">
             <div class="cell">
               <div flex="box:first">
                 <div style="padding-right:10px;">
-                  <div class="app-image" :style="{backgroundImage:'url(' + scope.row.goods_cover_pic + ')'}"></div>
-                  <!-- <div class="app-image" :style="{backgroundImage:'url(' +domainManager().ImageUrl+ scope.row.goods_cover_pic + ')'}"></div> -->
+                  <div class="app-image" :style="{backgroundImage:'url(' + scope.row.Cover_Img + ')'}"></div>
                 </div>
                 <div class="app-ellipsis">
-                  <div class="vue-line-clamp" style="word-break:break-all;-webkit-line-clamp: 2;">
-                    {{scope.row.goods_name}}</div>
+                  <div class="vue-line-clamp" style="word-break:break-all;-webkit-line-clamp: 2;" >
+                    {{scope.row.QGoodName}}</div>
                 </div>
               </div>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="goods_stock" label="库存">
+        <el-table-column prop="Goods_stock" label="库存">
         </el-table-column>
         <el-table-column label="活动时间">
           <template slot-scope="scope">
             <div style="width:160px;">
-                <div>{{scope.row.open_date}}至</div>
-                <div>{{scope.row.end_date}}</div>
+              <div>{{scope.row.StartTimeStr}}至</div>
+              <div>{{scope.row.EndTimeStr}}</div>
             </div>
           </template>
         </el-table-column>
@@ -77,9 +77,9 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="status_cn" width="100" label="活动状态">
+        <el-table-column prop="GoodsStatusStr" width="100" label="活动状态">
           <template slot-scope="scope">
-            <el-tag>{{scope.row.status_cn}}</el-tag>
+            <el-tag>{{scope.row.GoodsStatusStr}}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="address" label="操作">
@@ -88,8 +88,7 @@
               <img style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="活动数据" placement="top">
-              <img style="width:32px;height:32px;margin:0 10px"
-                src="../../assets/img/userman/order.png" alt="">
+              <img style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/order.png" alt="">
             </el-tooltip>
           </template>
         </el-table-column>
@@ -112,48 +111,32 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
-          keyword: '', //商品名称
-          date_start: '', //开始日期
-          date_end: '', //结束日期
+          QGoodName: '', //商品名称
+          QStartDate: '', //开始日期
+          QEndDate: '', //结束日期
         },
+        tableData:[],//列表数据
         total: 0,
-        tableData: [{
-          id: 178355,
-          goods_name: '日本珂润（Curel）润浸保湿 滋养乳霜 40g 敏感肌专用 神经酰胺护理 抵抗外部刺激',
-          goods_cover_pic: 'https://cdnimg.iotweixin.com/uploads/mall1285/20200503/979653726a7bc1df0e24464f94b404bd.jpg',
-          open_date: '2020-07-26 00:00:00',
-          end_date: '2020-10-31 00:00:00',
-          status_cn: '进行中',
-          goods_stock: 276,
-          groups: [{
-              people_num: 2,
-              price: "180.00"
-            },
-            {
-              people_num: 3,
-              price: "175.00"
-            }
-          ]
-        }],
         loading: false,
       }
     },
     created() {
-      //this.getList();
+      this.getList();
     },
     methods: {
       //获取数据
       getList() {
         if (this.dateList && this.dateList.length > 0) {
-          this.msg.date_start = this.dateList[0];
-          this.msg.date_end = this.dateList[1];
+          this.msg.QStartDate = this.dateList[0];
+          this.msg.QEndDate = this.dateList[1];
         } else {
-          this.msg.date_start = '';
-          this.msg.date_end = '';
+          this.msg.QStartDate = '';
+          this.msg.QEndDate = '';
         }
         this.loading = true;
-        this.apipost("/api/product/GetProductGoodsPageList", this.msg, res => {
+        this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => {
           this.loading = false;
+          console.log("res", res);
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             let pageData = res.data.data.pageData;
@@ -162,7 +145,9 @@
         })
       },
       // 上架 下架 删除
-      tableSet(num) {},
+      tableSet(num) {
+
+      },
       //切换活动状态
       handleClick(val) {
         this.msg.pageIndex = 1
@@ -174,7 +159,7 @@
       },
       //清空筛选条件
       Clearconditions() {
-        this.msg.keyword = '';
+        this.msg.QGoodName = '';
         this.dateList = [];
         this.getList();
       },

src/components/pintuan/pintuanSet.vue

@@ -663,7 +663,10 @@
       },
       //删除
       RemmoveRole(index) {
-        this.msg.BannerList.splice(index, 1);
+        let that = this;
+        that.Confirm("确认要退出系统吗?", function () {
+          that.msg.BannerList.splice(index, 1);
+        });
       },
       //新窗口打开链接
       openNewUrl(path) {