|
|
|
|
@ -193,7 +193,11 @@
|
|
|
|
|
</template>
|
|
|
|
|
</xy-dialog>
|
|
|
|
|
|
|
|
|
|
<Modal v-model="isShowMerchantSelect" title="所属商户选择">
|
|
|
|
|
<Modal v-model="isShowMerchantSelect" title="所属商户选择">
|
|
|
|
|
<div class="searchMerchants">
|
|
|
|
|
<el-input type="text" v-model="merchantKeyword" placeholder="请输入关键词查找商户"></el-input>
|
|
|
|
|
<el-button type="primary" @click="searchMerchants">查询</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
<Table size="small" highlight-row ref="currentRowTable" :columns="merchantTable" :data="merchants"
|
|
|
|
|
@on-current-change="merchantSelect" />
|
|
|
|
|
<Page :current="merchantIndex" :total="merchantTotal" simple
|
|
|
|
|
@ -338,7 +342,8 @@
|
|
|
|
|
key: 'state',
|
|
|
|
|
sortable: true
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
],
|
|
|
|
|
merchantKeyword:"",
|
|
|
|
|
merchantIndex: 1,
|
|
|
|
|
merchantTotal: 0,
|
|
|
|
|
}
|
|
|
|
|
@ -407,10 +412,14 @@
|
|
|
|
|
async getMerchants() {
|
|
|
|
|
const res = await merchantIndex({
|
|
|
|
|
page_size: 10,
|
|
|
|
|
page: this.merchantIndex
|
|
|
|
|
page: this.merchantIndex,
|
|
|
|
|
keyword:this.merchantKeyword
|
|
|
|
|
})
|
|
|
|
|
this.merchantTotal = res.total
|
|
|
|
|
this.merchants = res.data
|
|
|
|
|
},
|
|
|
|
|
searchMerchants(){
|
|
|
|
|
this.getMerchants()
|
|
|
|
|
},
|
|
|
|
|
merchantPageChange(e) {
|
|
|
|
|
this.merchantIndex = e
|
|
|
|
|
@ -491,7 +500,7 @@
|
|
|
|
|
if (this.type === 'editor'||this.type === 'copy') {
|
|
|
|
|
this.getDetail()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
// this.$refs['tinymce'].setContent(' ')
|
|
|
|
|
this.$refs['dialog'].reset()
|
|
|
|
|
@ -513,7 +522,16 @@
|
|
|
|
|
::v-deep .el-input-number .el-input__inner {
|
|
|
|
|
text-align: left !important;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.searchMerchants{
|
|
|
|
|
display: flex;
|
|
|
|
|
justify-content: space-between;
|
|
|
|
|
margin-bottom:16px;
|
|
|
|
|
.el-input{
|
|
|
|
|
width:80%
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
</style>
|
|
|
|
|
|
|
|
|
|
<style>
|
|
|
|
|
|
