Skip to content

I
integral-mall
Commit 00efc275 by caoyanzhi
Options

Merge branch 'feature/乔丹体育bug转需求'

parents b3799843 de6164f7
Showing with 24 additions and 7 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.4449a8ba8bf67c55ef76b2ccd4a6c3f4.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.6612a3e678afe56b7450.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.daf3acdf02579385201e5212fc677316.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.3df5861e8a3b6487ec42.js></script></body></html>
\ No newline at end of file
dist/static/css/app.4449a8ba8bf67c55ef76b2ccd4a6c3f4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.daf3acdf02579385201e5212fc677316.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.3df5861e8a3b6487ec42.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.6612a3e678afe56b7450.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/store/store-part.vue
......@@ -122,7 +122,8 @@ export default {
let params = {
pageSize: this.pageSize,
currentPage: this.currentPage,
search: this.search
search: this.search,
isValid: 1
};
request.post('/api-integral-mall/page-pick-up-points', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
......
src/components/store/store.vue
......@@ -166,9 +166,9 @@ export default {
//门店类型切换
handleChange() {
this.selectData = [];
if (this.storeType === 0) {
this.$emit('getArr', this.selectData, this.storeType);
}
// if (this.storeType === 0 || this.storeType === 3) {
this.$emit('getArr', this.selectData, this.storeType);
// }
}
},
components: {
......
src/views/setting/deliverSet.vue
......@@ -35,6 +35,12 @@
<div class="search-item">
<el-input v-model="searchValue" placeholder="请输入自提点名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<div class="search-item">
<el-select v-model="isValid" placeholder="自提点状态" clearable class="w-140" @change="getSearchList">
<el-option label="失效" :value="0"></el-option>
<el-option label="正常" :value="1"></el-option>
</el-select>
</div>
</div>
<div class="fr">
<el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
......@@ -53,6 +59,11 @@
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span>{{ scope.row.isValid === 1 ? '正常' : '失效' }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div>
......@@ -104,6 +115,7 @@ export default {
data() {
return {
searchValue: '',
isValid: '',
currentPage: 1,
pageSizes: [20, 40, 60, 80],
pageSize: 20,
......@@ -268,7 +280,8 @@ export default {
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
search: this.searchValue
search: this.searchValue,
isValid: this.isValid
};
this.loading = true;
request.post('/api-integral-mall/page-pick-up-points', qs.stringify(params)).then(res => {
......@@ -330,6 +343,9 @@ export default {
};
</script>
<style scoped>
.w-140 {
width: 140px;
}
.section {
background: #fff;
margin: 24px;
......
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