Commit 80a3dadb by damodmg

更新

parent c66d2d19
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.2eaddca6cb2d97bff93dea5cedd31103.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.1466955dfd19f534c77e.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.1c0b3c47e9cd55ea19ba6ed82815f77e.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.d3322920f379621febe5.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -51,8 +51,8 @@
<el-tab-pane label="待付款" name="11" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="已付款" name="12" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px">
<template slot-scope="scope">
......@@ -133,10 +133,10 @@
</div>
</template>
</el-table>
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</el-tabs>
......@@ -193,7 +193,8 @@ export default {
requestProject: 'integral-mall',
placement: 'top-start',
showSelfStatus: false,
showFlag: false
showFlag: false,
loading: false
};
},
watch: {
......
......@@ -55,8 +55,8 @@
<el-tab-pane label="已发货" name="3" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易成功" name="4" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px">
<template slot-scope="scope">
......@@ -158,10 +158,10 @@
</div>
</template>
</el-table>
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</el-tabs>
......@@ -360,6 +360,7 @@ export default {
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false, //门店自提确认按钮
loading: false,
giftOrderObj: {}, //缓存数据
showSelfStatus: false,
showFlag: false
......
......@@ -48,8 +48,8 @@
<el-tab-pane label="待退款" name="0" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款成功" name="1" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款关闭" name="2" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope">
......@@ -135,10 +135,10 @@
</div>
</template>
</el-table>
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</el-tabs>
......
......@@ -42,43 +42,45 @@
<el-button type="primary" @click="addStore('-1')">新增自提点</el-button>
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
<el-table-column prop="canChooseTime" label="自提时间可选">
<template slot-scope="scope">
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deletePoint(scope.row, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
<el-table-column prop="canChooseTime" label="自提时间可选">
<template slot-scope="scope">
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deletePoint(scope.row, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
</div>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
......
......@@ -24,37 +24,39 @@
</div>
</div>
</div>
<el-table :data="tableDate" style="width: 100%" v-loading="loading">
<el-table-column prop="author" label="操作人"> </el-table-column>
<el-table-column prop="integralMallProName" label="礼品/卡券名称">
<template slot-scope="scope">
<P>{{ scope.row.integralMallProName }}</P>
<P>{{ scope.row.integralMallProSku }}</P>
</template>
</el-table-column>
<el-table-column prop="createTime" label="操作时间">
<template slot-scope="scope">
<p>{{ getTime(scope.row.createTime) }}</p>
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="message" label="变更明细">
<template slot-scope="scope">
<p>{{ scope.row.message }}</p>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
<div v-loading="loading">
<el-table :data="tableDate" style="width: 100%">
<el-table-column prop="author" label="操作人"> </el-table-column>
<el-table-column prop="integralMallProName" label="礼品/卡券名称">
<template slot-scope="scope">
<P>{{ scope.row.integralMallProName }}</P>
<P>{{ scope.row.integralMallProSku }}</P>
</template>
</el-table-column>
<el-table-column prop="createTime" label="操作时间">
<template slot-scope="scope">
<p>{{ getTime(scope.row.createTime) }}</p>
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="message" label="变更明细">
<template slot-scope="scope">
<p>{{ scope.row.message }}</p>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
<p>暂无数据</p>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment