Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing…

Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing into feature/8月-奥莱定制

src/views/card/addStoreDialog.vue

@@ -62,11 +62,12 @@ export default {
           });
           await addStore({ storeList: res })
             .then(res => {
+              this.$tips({ type: 'success', message: res.message });
               this.loadings = false;
               this.handleClose();
             })
             .catch(err => {
-              this.$tips({ type: 'error', message: err.message || '操作失败' });
+              this.$tips({ type: 'error', message: '操作失败' });
               this.loadings = false;
             });
         } else {

src/views/card/writeOffStore.vue

@@ -23,7 +23,7 @@
         </el-table-column>
       </el-table>
       <dm-pagination v-show="tableData.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="params.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="params.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
-      <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableData" :type="2" :excelUrl="excelUrl" :params="paramsex" :projectName="projectName"></vue-gic-export-excel>
+      <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableData" :type="1" :excelUrl="excelUrl" :params="paramsex" :projectName="projectName"></vue-gic-export-excel>
     </div>
   </div>
 </template>

src/views/popup/list.vue

@@ -168,6 +168,7 @@ export default {
       const res = await popPlanList(params);
       if (res.errorCode === 0 && res.result) {
         this.tableList = res.result.result;
+        this.total = res.result.totalCount;
       }
     },
     goForm(group, type) {