jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

紧急修复了一些bug

Browse Source
This commit is contained in:
张乐
2020-08-17 15:28:28 +08:00
parent b17ad9443e
commit a0311f57f3
122 changed files with 1235 additions and 3297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin/src/views/sms/smsConfig/components/tableList.vue
View File

@@ -51,11 +51,8 @@
<el-table-column
label="发送时间"
min-width="150"
>
<template slot-scope="scope">
<span>{{scope.row.creatTime}}</span>
</template>
</el-table-column>
prop="createTime"
/>
<el-table-column
prop="resultcode"
label="状态码"

44
admin/src/views/sms/smsConfig/index.vue
View File

@@ -1,43 +1,41 @@
<template>
<div class="divBox">
<el-card v-if="isShowList" v-loading="fullscreenLoading" class="box-card">
<div slot="header" class="clearfix">
<div class="content acea-row row-middle">
<div class="demo-basic--circle acea-row row-middle">
<el-avatar :size="50" :src="circleUrl" class="mr20" />
<div class="dashboard-workplace-header-tip">
<div class="dashboard-workplace-header-tip-title">{{ smsAccount }}，祝您每一天开心！</div>
<div class="dashboard-workplace-header-tip-desc">
<span class="mr10">修改密码</span>
<span @click="signOut">退出登录</span>
</div>
<div class="content acea-row row-middle">
<div class="demo-basic--circle acea-row row-middle">
<el-avatar :size="50" :src="circleUrl" class="mr20" />
<div class="dashboard-workplace-header-tip">
<div class="dashboard-workplace-header-tip-title">{{ smsAccount }}，祝您每一天开心！</div>
<div class="dashboard-workplace-header-tip-desc">
<span class="mr10">修改密码</span>
<span @click="signOut">退出登录</span>
</div>
</div>
<div class="dashboard-workplace-header-extra">
<el-row type="flex" justify="center" align="middle" :gutter="12">
<el-col :span="8">
</div>
<div class="dashboard-workplace-header-extra">
<el-row type="flex" justify="center" align="middle" :gutter="12">
<el-col :span="8">
<span class="pfont acea-row row-middle">
<el-avatar icon="el-icon-user-solid" size="small" class="mr10" />
<span>剩余条数</span>
</span>
<span class="rR" v-text="numbers" />
</el-col>
<el-col :span="8">
<span class="rR" v-text="numbers" />
</el-col>
<el-col :span="8">
<span class="pfont acea-row row-middle">
<el-avatar icon="el-icon-user-solid" size="small" class="mr10" />
<span>已发送</span>
</span>
<span class="rR" v-text="sendTotal" />
</el-col>
<el-col :span="8">
<span class="rR" v-text="sendTotal" />
</el-col>
<el-col :span="8">
<span class="pfont acea-row row-middle">
<el-avatar icon="el-icon-user-solid" size="small" class="mr10" />
<span>总条数</span>
</span>
<span class="rR" v-text="amount" />
</el-col>
</el-row>
</div>
<span class="rR" v-text="amount" />
</el-col>
</el-row>
</div>
</div>
</el-card>

30
admin/src/views/sms/smsTemplate/index.vue
View File

@@ -3,18 +3,20 @@
<div class="divBox" v-if="isLogin">
<el-card v-loading="fullscreenLoading" class="box-card">
<div slot="header" class="clearfix">
<div class="filter-container">
<div class="demo-input-suffix acea-row">
<span class="seachTiele">模板状态：</span>
<el-select v-model="tableFrom.status" placeholder="请选择" clearable class="filter-item selWidth mr20" @change="userSearchs">
<el-option value="1">可用</el-option>
<el-option value="0">不可用</el-option>
</el-select>
<span class="seachTiele">模板名称：</span>
<el-input v-model="tableFrom.title" placeholder="请输入商品名称，关键字，产品编号" class="selWidth">
<el-button slot="append" icon="el-icon-search" @change="userSearchs" />
</el-input>
</div>
<div class="container">
<el-form :inline="true">
<el-form-item label="模板状态：" class="mr10">
<el-select v-model="tableFrom.status" placeholder="请选择" clearable class="filter-item selWidth mr20" @change="userSearchs">
<el-option value="1" label="可用"></el-option>
<el-option value="0" label="不可用"></el-option>
</el-select>
</el-form-item>
<el-form-item label="模板名称：" class="mr10">
<el-input v-model="tableFrom.title" placeholder="请输入模板名称" class="selWidth">
<el-button slot="append" icon="el-icon-search" @click="userSearchs" />
</el-input>
</el-form-item>
</el-form>
</div>
<el-button size="mini" type="primary" @click="add">添加短信模板</el-button>
</div>
@@ -105,8 +107,8 @@ export default {
filters: {
statusFilter(status) {
const statusMap = {
0: '没有',
1: '有'
0: '不可用',
1: '可用'
}
return statusMap[status]
},