Skip to content

I
integral-mall
Commit 92f8db8b by zhangmeng
Options

修复bug

parent aeaa3260
Showing with 69 additions and 49 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.a5ff52e64b683c3b25f3a7d6f44cc4a3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.567b5be279b1403c5cc7.js></script><script type=text/javascript src=/integral-mall/static/js/app.5aeea5a4f56fb30a20af.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="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.99e98dbcfaba86106fe861cdb7992e01.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.567b5be279b1403c5cc7.js></script><script type=text/javascript src=/integral-mall/static/js/app.a87007337d3ff84410c4.js></script></body></html>
\ No newline at end of file
dist/static/js/app.5aeea5a4f56fb30a20af.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a87007337d3ff84410c4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/reset.scss
......@@ -410,6 +410,13 @@ img::after {
.border-radius__default{
border-radius: 4px;
}
.cursor-hover{
cursor: pointer;
&:hover {
color:$primary-color;
}
}
/*隐藏滚轮*/
// ::-webkit-scrollbar {
// display: none;
......
src/service/api/mallApi.js
......@@ -65,3 +65,6 @@ export const setHotStatusService = (params) => requests(PREFIX + 'update-hot-sta
// 新建礼品分类
export const createCategoryService = (params) => requests(PREFIX + 'create-gift-category', params);
// 删除礼品分类
export const delCategoryService = (params) => requests(PREFIX + 'del-gift-category', params);
src/views/mall/common/update-count.vue
......@@ -58,7 +58,7 @@ export default {
},
edit() {
this.model[this.theType + 'Flag'] = true;
this.model.inputValue = this.model[this.theType];
this.$set(this.model,'inputValue',this.model[this.theType]);
}
},
......
src/views/mall/coupon/info.vue
......@@ -5,15 +5,15 @@
<card-temp pbSize="pb15" :activeId.sync="form.proReferId" @emitActiveObj="getCardActiveObjFun" :showPagination="false" :cardLimitType="3"></card-temp>
</div>
<el-form-item prop="integralCost" label="积分费用">
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.integralCost" class="w300" :precison="0" :min="0"></el-input-number>
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.integralCost" class="w300" :precision="0" :min="0"></el-input-number>
</el-form-item>
<el-form-item prop="cashCost" label="现金费用">
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.cashCost" class="w300" :precison="2" :min="0"></el-input-number>
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.cashCost" class="w300" :precision="2" :min="0"></el-input-number>
</el-form-item>
<el-form-item prop="limitTimes" label="次数显示">
<el-checkbox :disabled="isInfo" v-model="isLimitTimes"> 每个会员限制兑换
</el-checkbox>
<el-input-number controls-position="right" :disabled="isInfo || !isLimitTimes" v-model="form.limitTimes" class="w100" :precison="0" :min="0"></el-input-number> 次
<el-input-number controls-position="right" :disabled="isInfo || !isLimitTimes" v-model="form.limitTimes" class="w100" :precision="0" :min="0"></el-input-number> 次
</el-form-item>
<el-form-item prop="memberGradeArr" label="适用会员">
<el-select v-model="form.memberGradeArr" multiple placeholder="请选择" class="w300">
......@@ -56,7 +56,6 @@
<p><el-button type="text" @click="addTimeRange">添加时间段</el-button></p>
</el-radio-group>
</el-form-item>
<el-form-item prop="proShowStatus" label="显示状态">
<el-radio-group v-model="form.proShowStatus">
<el-radio :label="1">上架状态就显示</el-radio>
......
src/views/mall/gift/info.js
import {getGradeList,getCategoryList,createIntegralProService,getIntegralMallProInfo,createCategoryService} from '@/service/api/mallApi.js';
import {getGradeList,getCategoryList,createIntegralProService,getIntegralMallProInfo,createCategoryService,delCategoryService} from '@/service/api/mallApi.js';
import cardTemp from '../common/card-temp.vue';
import dmUploadAvatar from '@/components/upload/avatar';
import {formateDateTimeByType} from '@/utils/index.js';
......@@ -82,10 +82,48 @@ export default {
},
},
methods:{
// 删除分组
deleteGroup(id) {
this.$tips({type:'warning',message:'TODO'})
// 删除分类
deleteCategory(id) {
delCategoryService({integralMallCategoryId:id}).then(res => {
if (res.errorCode === 0) {
this.getCategoryList();
this.$tips({type:'success',message:'删除分组成功'});
} else {
this.$tips({type:'success',message:'删除分组失败'});
}
});
},
// 获取分类列表
async getCategoryList() {
let res = await getCategoryList();
if (res.errorCode === 0) {
this.categoryOptions = res.result || [];
}
},
// 新建分类
createCategory() {
this.$prompt('请输入分组名称', '新建分组', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder:'请输入分组名称',
inputErrorMessage:'分组名称不能为空',
inputValidator:function(value) {
return !!value;
}
}).then(({ value }) => {
createCategoryService({categoryName:value}).then(res => {
if (res.errorCode === 0) {
this.$tips({type:'success',message:'新建分组成功'});
this.getCategoryList();
} else {
this.$tips({type:'error',message:'新建分组失败'});
}
})
}).catch(err => {
console.log(err);
});
},
// 获取礼品详情
async getIntegralMallProInfo() {
let res = await getIntegralMallProInfo({integralMallProId:this.$route.params.id});
if (res.errorCode === 0) {
......@@ -155,36 +193,7 @@ export default {
this.sendChildData.storeGroupIds = val.storeGroupIds || ''
this.sendChildData.storeIds = val.storeIds || []
},
// 获取分类列表
async getCategoryList() {
let res = await getCategoryList();
if (res.errorCode === 0) {
this.categoryOptions = res.result || [];
}
},
// 新建分类
createNewGroup() {
this.$prompt('请输入分组名称', '新建分组', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder:'请输入分组名称',
inputErrorMessage:'分组名称不能为空',
inputValidator:function(value) {
return !!value;
}
}).then(({ value }) => {
createCategoryService({categoryName:value}).then(res => {
if (res.errorCode === 0) {
this.$tips({type:'success',message:'新建分组成功'});
this.getCategoryList();
} else {
this.$tips({type:'error',message:'新建分组失败'});
}
})
}).catch(err => {
console.log(err);
});
},
// 获取适用会员列表
async getGradeList() {
let res = await getGradeList();
if (res.errorCode === 0) {
......@@ -198,14 +207,16 @@ export default {
this.form.proReferId = val.coupCardId || '';
console.log(val)
},
// 新增兑换时段-部分时段
addTimeRange() {
let length = this.timeRangeList.length;
this.$set(this.timeRangeList,length,{timeRange:['','']})
},
// 删除兑换时段-部分时段
delTimeRange(index) {
this.timeRangeList.splice(index,1);
},
// 提交验证
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -213,6 +224,7 @@ export default {
}
});
},
// 提交保存
submitService(){
console.log(this.form.cashCost,this.form.costValue)
......
src/views/mall/gift/info.vue
......@@ -10,25 +10,24 @@
<el-select v-model="form.proCategoryId" placeholder="请选择" class="w300">
<el-option v-for="(v,i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
<span class="fl">{{v.categoryName}}</span>
<el-button class="fr" type="text" @click.stop="deleteGroup">x</el-button>
<el-button class="fr" type="text" @click.stop="deleteCategory(v.integralMallCategoryId)">x</el-button>
</el-option>
</el-select>
<el-button type="text" @click="createNewGroup">新建分组</el-button>
<el-button type="text" @click="createCategory">新建分组</el-button>
</el-form-item>
<el-form-item prop="integralCost" label="积分费用">
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.integralCost" class="w300" :precison="0" :min="0"></el-input-number>
<el-input-number class="w300" controls-position="right" v-model="form.integralCost" :precision="0" :step="1" :min="0" :disabled="isInfo"></el-input-number>
</el-form-item>
<el-form-item prop="cashCost" label="现金费用">
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.cashCost" class="w300" :precison="2" :min="0"></el-input-number>
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.cashCost" class="w300" :precision="2" :step="0.1" :min="0"></el-input-number>
</el-form-item>
<el-form-item prop="costValue" label="礼品成本">
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.costValue" class="w300" :precison="2" :min="form.cashCost"></el-input-number>
<el-input-number controls-position="right" :disabled="isInfo" v-model="form.costValue" class="w300" :precision="2" :step="0.1" :min="form.cashCost"></el-input-number>
</el-form-item>
<el-form-item prop="limitTimes" label="次数显示">
<el-checkbox :disabled="isInfo" v-model="isLimitTimes"> 每个会员限制兑换
</el-checkbox>
<el-input-number controls-position="right" :disabled="isInfo || !isLimitTimes" v-model="form.limitTimes" class="w100" :precison="0" :min="0"></el-input-number> 次
<el-input-number controls-position="right" :disabled="isInfo || !isLimitTimes" v-model="form.limitTimes" class="w100" :precision="0" :min="0"></el-input-number> 次
</el-form-item>
<el-form-item prop="memberGradeArr" label="适用会员">
<el-select v-model="form.memberGradeArr" multiple placeholder="请选择" class="w300">
......
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