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

1、修复了部分bug

Browse Source 
2、优化了数据库sql文件
3、优化了部分文件
This commit is contained in:
张乐
2020-08-19 18:23:49 +08:00
parent 26781bc81e
commit 67dc28961c
46 changed files with 491 additions and 8077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin/src/api/distribution.js
View File

@@ -14,18 +14,7 @@ export function configApi() {
/**
* @description 分销设置 -- 表单提交
*/
export function configUpdateApi(params) {
return request({
url: '/admin/marketing/coupon/list',
method: 'get',
params
})
}
/**
* @description 分销设置 -- 表单提交
*/
export function productCheckApi(data) {
export function configUpdateApi(data) {
return request({
url: '/admin/store/retail/spread/manage/set',
method: 'post',

6
admin/src/utils/request.js
View File

@@ -59,9 +59,9 @@ service.interceptors.response.use(
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
if (res.code === 401) {
// to re-login
MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or integralLog in again', 'Confirm logout', {
confirmButtonText: 'Re-Login',
cancelButtonText: 'Cancel',
MessageBox.confirm('您已经登出，您可以取消停留在这个页面，或重新登录', '退出', {
confirmButtonText: '或重新登录',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
store.dispatch('user/resetToken').then(() => {

23
admin/src/views/distribution/config/index.vue
View File

@@ -46,7 +46,7 @@
<i class="el-icon-warning-outline" />
</el-tooltip>
</span>
<el-input-number v-model="promoterForm.storeBrokerageRatio" :precision="2" :step="0.1" class="selWidth" placeholder="订单交易成功后给上级返佣的比例0 - 100,例:5 = 反订单金额的5%"></el-input-number>
<el-input-number v-model="promoterForm.storeBrokerageRatio" class="selWidth" placeholder="订单交易成功后给上级返佣的比例0 - 100,例:5 = 反订单金额的5%"></el-input-number>
<span>%</span>
</el-form-item>
<el-form-item prop="storeBrokerageTwo">
@@ -56,7 +56,7 @@
<i class="el-icon-warning-outline" />
</el-tooltip>
</span>
<el-input-number v-model="promoterForm.storeBrokerageTwo" :precision="2" :step="0.1" class="selWidth" placeholder="订单交易成功后给上级返佣的比例0 ~ 100,例:5 = 反订单金额的5%"></el-input-number>
<el-input-number v-model="promoterForm.storeBrokerageTwo" class="selWidth" placeholder="订单交易成功后给上级返佣的比例0 ~ 100,例:5 = 反订单金额的5%"></el-input-number>
<span>%</span>
</el-form-item>
<el-form-item prop="userExtractMinPrice">
@@ -91,14 +91,14 @@
</span>
<el-input-number v-model="promoterForm.extractTime" :precision="2" :step="0.1" class="selWidth" placeholder="佣金冻结时间(天)"></el-input-number>
</el-form-item>
<el-form-item prop="extension_two_rate">
<el-form-item prop="storeBrokeragePrice">
<span slot="label">
<span>满额分销最低金额：</span>
<el-tooltip class="item" effect="dark" content="满额分销满足金额开通分销权限" placement="top-start">
<i class="el-icon-warning-outline" />
</el-tooltip>
</span>
<el-input-number v-model="promoterForm.extension_two_rate" placeholder="满额分销满足金额开通分销权限" :precision="2" :step="0.1" class="selWidth"></el-input-number>
<el-input-number v-model="promoterForm.storeBrokeragePrice" placeholder="满额分销满足金额开通分销权限" :precision="2" :step="0.1" class="selWidth"></el-input-number>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" :loading="loading" @click="submitForm('promoterForm')">立即创建</el-button>
@@ -146,13 +146,14 @@
this.loading = true
configUpdateApi(this.promoterForm).then(res => {
this.loading = false
this.$modalSure('提交成功，是否自动下架商户低于此佣金比例的商品').then(() => {
productCheckApi().then(({ message }) => {
this.$message.success(message)
}).catch(({ message }) => {
this.$message.error(message)
})
})
this.$message.success('提交成功')
// this.$modalSure('提交成功，是否自动下架商户低于此佣金比例的商品').then(() => {
// productCheckApi().then(({ message }) => {
// this.$message.success(message)
// }).catch(({ message }) => {
// this.$message.error(message)
// })
// })
}).catch((res) => {
this.$message.error(res.message)
this.loading = false

3
admin/src/views/marketing/integral/config/index.vue
View File

@@ -6,6 +6,7 @@
:is-create="isCreate"
:edit-data="editData"
@submit="handlerSubmit"
v-if="isShow"
/>
</el-card>
</div>
@@ -19,6 +20,7 @@
components: { zbParser },
data() {
return {
isShow: false,
isCreate: 0,
editData: {},
formId: 109
@@ -43,7 +45,6 @@
'sort': 0,
'status': true
}
console.log(_pram)
configSaveForm(_pram).then(res => {
this.getFormInfo()
this.$message.success('操作成功')

2
admin/src/views/systemSetting/setting/index.vue
View File

@@ -208,7 +208,7 @@ export default {
})
},
handlerGetTreeList() {
const _pram = { type: constants.categoryType[5].value, status: -1 }
const _pram = { type: constants.categoryType[5].value, status: 1 }
this.loading = true
categoryApi.treeCategroy(_pram).then(data => {
this.treeList = this.handleAddArrt(data)

58
admin/src/views/user/list/index.vue
View File

@@ -51,12 +51,12 @@
<el-form-item label="国家：">
<el-select v-model="userFrom.country" placeholder="请选择" class="selWidth" clearable @on-change="changeCountry">
<el-option value="" label="全部"></el-option>
<el-option value="domestic" label="中国"></el-option>
<el-option value="abroad" label="外国"></el-option>
<el-option value="CN" label="中国"></el-option>
<el-option value="OTHER" label="其他"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col v-bind="grid" v-if="userFrom.country ==='domestic'">
<el-col v-bind="grid" v-if="userFrom.country ==='CN'">
<el-form-item label="省份：">
<el-cascader :options="addresData" :props="propsCity" v-model="address" @change="handleChange" class="selWidth"></el-cascader>
</el-form-item>
@@ -69,13 +69,16 @@
<el-radio-button label="">
<span>全部</span>
</el-radio-button>
<el-radio-button label="0">
<span>未知</span>
</el-radio-button>
<el-radio-button label="1">
<span>男</span>
</el-radio-button>
<el-radio-button label="2">
<span>女</span>
</el-radio-button>
<el-radio-button label="0">
<el-radio-button label="3">
<span>保密</span>
</el-radio-button>
</el-radio-group>
@@ -101,10 +104,10 @@
<el-col v-bind="grid">
<el-form-item label="访问情况：">
<el-select v-model="userFrom.accessType" placeholder="请选择" class="selWidth" clearable>
<el-option value="" label="全部"></el-option>
<el-option value="visitno" label="时间段未访问"></el-option>
<el-option value="visit" label="时间段访问过"></el-option>
<el-option value="add_time" label="首次访问"></el-option>
<el-option :value="0" label="全部"></el-option>
<el-option :value="1" label="首次访问"></el-option>
<el-option :value="2" label="时间段访问过"></el-option>
<el-option :value="3" label="时间段未访问"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -180,7 +183,7 @@
<span>{{ props.row.createTime | filterEmpty }}</span>
</el-form-item>
<el-form-item label="近次访问：">
<span>{{ props.row.lastLoginTime | filterEmpty }}</span>
<span>{{ props.row.updateTime | filterEmpty }}</span>
</el-form-item>
<el-form-item label="身份证号：">
<span>{{ props.row.cardId | filterEmpty }}</span>
@@ -232,8 +235,14 @@
>
<template slot-scope="scope">
<span>{{scope.row.nickname | filterEmpty}}</span>
<span></span>
<span></span>
</template>
</el-table-column>
<el-table-column
label="性别"
min-width="60"
>
<template slot-scope="scope">
<span>{{scope.row.sex | sexFilter}}</span>
</template>
</el-table-column>
<el-table-column
@@ -397,16 +406,17 @@
export default {
name: 'UserIndex',
components:{ editFrom, userDetails },
// filters: {
// typeFilter(status) {
// const statusMap = {
// 'wechat': '微信用户',
// 'routine': '小程序用户',
// 'h5': 'H5用户'
// }
// return statusMap[status]
// }
// },
filters: {
sexFilter(status) {
const statusMap = {
0: '未知',
1: '男',
2: '女',
3: '保密'
}
return statusMap[status]
}
},
data() {
return {
pickerOptions: {
@@ -517,7 +527,7 @@
isPromoter: '',
country: '',
payCount: '',
accessType: '',
accessType: 0,
dateLimit: '',
keywords: '',
province: '',
@@ -583,7 +593,7 @@
isPromoter: '',
country: '',
payCount: '',
accessType: '',
accessType: 0,
dateLimit: '',
keywords: '',
province: '',
@@ -731,7 +741,7 @@
},
// 选择国家
changeCountry () {
if (this.userFrom.country === 'abroad' || !this.userFrom.country) {
if (this.userFrom.country === 'OTHER' || !this.userFrom.country) {
this.selectedData = [];
this.userFrom.province = '';
this.userFrom.city = '';