Skip to content

I
integral-mall
Commit 13ca5208 by zhangmeng
Options

init

parent 2797b811
Showing with 93 additions and 38 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.c2e813e6ae86c7080f885907588f7340.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.a20331e9a41a0dff9f5d.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.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.cda7bfdbbfcd87f61e52.js></script></body></html>
\ No newline at end of file
dist/static/js/app.a20331e9a41a0dff9f5d.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.cda7bfdbbfcd87f61e52.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/mall/common/express.vue
......@@ -9,7 +9,7 @@
<div class="clearfix express--order__info" v-if="!editShow">
<div class="fl pr20">快递公司：{{info.logisticsCompanyName || '--'}}</div>
<div class="fl">运单号码：{{info.courierNumber || '--'}}</div>
<el-button class="fr express--order__info--btn" type="text" @click="editExpress">修改运单信息</el-button>
<el-button class="fr express--order__info--btn" type="text" v-if="!isInfo" @click="editExpress">修改运单信息</el-button>
</div>
<div class="express--order__info" v-else>
<span class="pr10">快递公司：
......@@ -53,6 +53,10 @@ import {formateDateTimeByType,numberToWeekChinese} from '@/utils/index.js';
id:{
type:String,
default:''
},
isInfo:{
type:Boolean,
default:false
}
},
watch:{
......
src/views/mall/coupon/info.js
......@@ -13,8 +13,8 @@ export default {
integralMallProId:'',
proReferId:'',
proName:'', // String 商品名字，优惠券就是所选券的名字。 (必填)
integralCost:100, // Number 100 积分费用 (必填)
cashCost:1, // Number 现金费用，两位小数
integralCost:0, // Number 100 积分费用 (必填)
cashCost:0, // Number 现金费用，两位小数
memberGradeArr:[], // array 适用会员 这里是数组 传给后台要拼接为字符串数组逗号隔开
limitTimes:0,
exchangeDateType:1,
......@@ -32,7 +32,7 @@ export default {
rules:{
integralCost:{required:true,type:'number',min:0,message:'请输入积分费用',trigger:'blur'},
cashCost:{required:true,type:'number',min:0,message:'请输入现金费用',trigger:'blur'},
memberGradeArr:{required:true,type:'array',min:0,message:'请选择适用会员',trigger:'blur'},
memberGradeArr:{required:true,type:'array',message:'请选择适用会员',trigger:'blur'},
},
memberGradeOptions:[],
exchangeDateWeekOptions:['1','2','3','4','5','6','7'],
......@@ -152,7 +152,18 @@ export default {
delTimeRange(index) {
this.timeRangeList.splice(index,1);
},
submit() {
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitService();
} else {
console.log('表单未提交完整');
}
});
},
submitService() {
if (!this.form.proReferId ) {
this.$tips({type:'warning',message:'请选择优惠券'});
return;
......@@ -191,9 +202,19 @@ export default {
return;
}
} else if (params.exchangeDateType === 3) {
params.exchangeDateDay = this.form.exchangeDateDayArr.length > 0 ? this.form.exchangeDateDayArr.join(','):'';
if (this.form.exchangeDateDayArr.length > 0 ) {
params.exchangeDateDay = this.form.exchangeDateDayArr.join(',');
} else {
this.$tips({type:'warning',message:'兑换每月日期不能为空'});
return;
}
} else if (params.exchangeDateType === 4) {
params.exchangeDateWeek = this.form.exchangeDateWeekArr.length > 0 ? this.form.exchangeDateWeekArr.join(','):'';
if (this.form.exchangeDateWeekArr.length > 0) {
params.exchangeDateWeek = this.form.exchangeDateWeekArr.join(',');
} else {
this.$tips({type:'warning',message:'兑换每周日期不能为空'});
return;
}
}
// 判断 兑换时段
......@@ -219,12 +240,17 @@ export default {
}
}
// 判断发送时间
if (params.releaseType === 2) {
params.limitTimeBegin = formateDateTimeByType(this.form.limitTimeBegin,'yyyy-MM-dd-HH-mm-ss');
if (this.form.limitTimeBegin) {
params.limitTimeBegin = formateDateTimeByType(this.form.limitTimeBegin,'yyyy-MM-dd-HH-mm-ss');
} else {
this.$tips({type:'warning',message:'定时发布时间不能为空'});
return;
}
}
// 门店分组
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
......
src/views/mall/gift/info.js
......@@ -18,9 +18,9 @@ export default {
code:'' // giftImageFiledCodes
},
proCategoryId:'', // String 礼品的分类 (必填)
integralCost:100, // Number 100 积分费用 (必填)
cashCost:1, // Number 现金费用，两位小数
costValue:1, // Number 礼品成本，两位小数
integralCost:0, // Number 100 积分费用 (必填)
cashCost:0, // Number 现金费用，两位小数
costValue:0, // Number 礼品成本，两位小数
memberGradeArr:[], // array 适用会员 这里是数组 传给后台要拼接为字符串数组逗号隔开
limitTimes:0,
exchangeDateType:1,
......@@ -201,14 +201,29 @@ export default {
delTimeRange(index) {
this.timeRangeList.splice(index,1);
},
submit() {
if (this.cashCost - this.costValue < 0) {
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitService();
}
});
},
submitService(){
console.log(this.form.cashCost,this.form.costValue)
if (this.form.costValue - this.form.cashCost < 0) {
this.$tips({type:'warning',message:'礼品成本要大于等于现金费用'});
return;
}
if (!this.form.giftImg.code) {
this.$tips({type:'warning',message:'礼品主图不能为空'});
return;
}
console.log(this.timeRangeList)
let params = {
integralMallProId:this.form.integralMallProId || '',
proType:2, // 商品类型 1 优惠券，2礼品，3实物
......@@ -246,9 +261,19 @@ export default {
return;
}
} else if (params.exchangeDateType === 3) {
params.exchangeDateDay = this.form.exchangeDateDayArr.length > 0 ? this.form.exchangeDateDayArr.join(','):'';
if (this.form.exchangeDateDayArr.length > 0 ) {
params.exchangeDateDay = this.form.exchangeDateDayArr.join(',');
} else {
this.$tips({type:'warning',message:'兑换每月日期不能为空'});
return;
}
} else if (params.exchangeDateType === 4) {
params.exchangeDateWeek = this.form.exchangeDateWeekArr.length > 0 ? this.form.exchangeDateWeekArr.join(','):'';
if (this.form.exchangeDateWeekArr.length > 0) {
params.exchangeDateWeek = this.form.exchangeDateWeekArr.join(',');
} else {
this.$tips({type:'warning',message:'兑换每周日期不能为空'});
return;
}
}
// 判断 兑换时段
......@@ -263,7 +288,7 @@ export default {
}
})
if (flag) {
this.$tips({message:'部分时段未填写完整'});
this.$tips({type:'warning',message:'部分时段未填写完整'});
return;
}
// 如果数组为1的话也要传 #分割
......@@ -275,11 +300,14 @@ export default {
}
// 判断发送时间
if (params.releaseType === 2) {
params.limitTimeBegin = formateDateTimeByType(this.form.limitTimeBegin,'yyyy-MM-dd-HH-mm-ss');
if (this.form.limitTimeBegin) {
params.limitTimeBegin = formateDateTimeByType(this.form.limitTimeBegin,'yyyy-MM-dd-HH-mm-ss');
} else {
this.$tips({type:'warning',message:'定时发布时间不能为空'});
return;
}
}
// 门店分组
......@@ -295,13 +323,6 @@ export default {
}
}
console.log(params)
createIntegralProService(params).then(res => {
if(res.errorCode === 0) {
......
src/views/mall/gift/info.vue
......@@ -69,13 +69,13 @@
</el-radio-group>
</el-form-item>
<el-form-item prop="proShowStatus" label="显示状态">
<el-form-item prop="proShowStatus" label="显示状态" class="is-required">
<el-radio-group v-model="form.proShowStatus">
<el-radio :label="1">上架状态就显示</el-radio>
<el-radio :label="2">兑换状态下显示</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="releaseType" label="发布时间">
<el-form-item prop="releaseType" label="发布时间" class="is-required">
<el-radio-group v-model="form.releaseType">
<el-radio :label="1">立即发布</el-radio>
<el-radio :label="2">定时发布
......@@ -83,7 +83,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="changeType" label="兑换方式">
<el-form-item prop="changeType" label="兑换方式" class="is-required">
<el-radio-group v-model="form.changeType">
<div class="mb10">
<el-radio :label="2">快递发货，库存
......
src/views/mall/goods/list.vue
......@@ -67,18 +67,20 @@
<span v-else-if="scope.row.status === 3">已发货</span>
<span v-else-if="scope.row.status === 0">已取消</span>
<span v-else-if="scope.row.status === 11">待付款</span>
<span v-else-if="scope.row.status === -1">自动关闭</span>
<span v-else>--</span>
</p>
<p>
<el-button type="text" v-if="scope.row.status === 1" @click="cancelOrder(scope.row)">取消订单</el-button>
<el-button type="text" v-if="scope.row.status === 3" @click="queryExpress(scope.row,true)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 0" @click="queryExpress(scope.row,false)">查看详情</el-button>
<el-button type="text" v-if="scope.row.status === 3 && scope.row.changeType === 2" @click="queryExpress(scope.row,false)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 3 && scope.row.changeType !== 2" @click="queryExpress(scope.row,true)">查看详情</el-button>
<el-button type="text" v-if="scope.row.status === 0" @click="queryExpress(scope.row,true)">查看详情</el-button>
</p>
</template>
</el-table-column>
</el-table>
<el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<express :show.sync="expressShow" :id="expressId"></express>
<express :show.sync="expressShow" :id="expressId" :isInfo="isInfo"></express>
<sendGoods :show.sync="sendGoodsShow" :id="expressId" @refresh="refresh"></sendGoods>
</section>
</template>
......@@ -115,6 +117,7 @@ export default {
expressShow:false,
sendGoodsShow:false,
expressId:'',
isInfo:false,
dateTime:['','']
}
},
......@@ -196,8 +199,9 @@ export default {
this.expressId = row.integralMallProExchangeId;
},
// 查看快递
queryExpress(row) {
queryExpress(row,flag) {
this.expressShow = true;
this.isInfo = flag;
this.expressId = row.integralMallProExchangeId;
},
// 导出列表
......
src/views/mall/goods/send-goods.vue
......@@ -11,8 +11,8 @@
<p>运单号码：<el-input class="vertical-middle w300" v-model="params.courierNumber" placeholder="请输入快递单号"></el-input></p>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">确 定</el-button>
<el-button @click="close">关 闭</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
......
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