Skip to content

I
integral-mall
Commit 5941f15e by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !11
parents ecc7fdce fdceef6d
Showing with 170 additions and 14 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.2a05194edda3489b2b7f8f351686332e.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.b2d5add275329279664d.js></script><script type=text/javascript src=/integral-mall/static/js/app.30df3dfdceed27bb8194.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.0bd27768f9a263265816d415aa08962e.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.b2d5add275329279664d.js></script><script type=text/javascript src=/integral-mall/static/js/app.b120b76a4aafe97f90e5.js></script></body></html>
\ No newline at end of file
src/views/mall/common/express.vue
......@@ -13,15 +13,19 @@
</div>
<div class="express--order__info" v-else>
<span class="pr10">快递公司：
<el-select class="vertical-middle w100" v-model="params.logisticsCompanyId" placeholder="选择快递">
<el-option v-for="v in logisticsOptions" :key="v.logisticsCompanyCode" :label="v.logisticsCompanyName" :value="v.logisticsCompanyId"></el-option>
<el-select class="vertical-middle w100" v-model="params.logisticsCompanyId" placeholder="选择快递" @change="changeLogistics">
<el-option v-for="v in logisticsOptions" :key="v.logisticsCompanyId" :label="v.logisticsCompanyName" :value="v.logisticsCompanyId"></el-option>
</el-select>
<div style="margin:0 0 10px 0px;display:inline-block" v-show="otherLogistics">
<el-input class="vertical-middle w150" v-model="params.otherLogisticsCompanyName" placeholder="请输入快递公司" @input="(value)=>logisticsNameLimit(value)"></el-input>
</div>
</span>
<span>运单号码：
<el-input class="vertical-middle w150" v-model="params.courierNumber" placeholder="请输入快递单号"></el-input>
</span>
<el-button class="vertical-middle" type="primary" size="small" @click="submitExpress">确 认</el-button>
<el-button class="vertical-middle" size="small" @click="editShow = false">取 消</el-button>
<span style="font-size:12px;color:rgb(144, 147, 153);display:block;margin-left:180px" v-show="otherLogistics">若设置为其他快递公司，则系统不提供物流信息的查询</span>
</div>
</div>
......@@ -76,7 +80,9 @@ import {formateDateTimeByType,numberToWeekChinese} from '@/utils/index.js';
logisticsCompanyId:'',
logisticsCompanyCode:'',
courierNumber:'',
otherLogisticsCompanyName:'',
},
otherLogistics:false,
editShow:false
}
},
......@@ -97,6 +103,30 @@ import {formateDateTimeByType,numberToWeekChinese} from '@/utils/index.js';
courierNumber:this.info.courierNumber
};
},
//限制物流公司的名称
logisticsNameLimit(value){
this.$nextTick(() => {
this.params.otherLogisticsCompanyName = this.getInputVal2(value,8)
})
},
//快递公司下拉
changeLogistics(value){
console.log('物流id',value)
if ( value ) {
let code = this.logisticsOptions.find( item => {
return item.logisticsCompanyId ===value
} ).logisticsCompanyCode
if(code==='QITA'){
this.otherLogistics=true
}else{
this.otherLogistics=false
this.params.otherLogisticsCompanyName=''
}
} else {
this.otherLogistics=false
this.params.otherLogisticsCompanyName=''
}
},
// 提交按钮
submitExpress() {
if (!this.params.logisticsCompanyId) {
......@@ -112,13 +142,30 @@ import {formateDateTimeByType,numberToWeekChinese} from '@/utils/index.js';
this.params.logisticsCompanyCode = v.logisticsCompanyCode;
}
})
if ( this.params.logisticsCompanyCode ==='QITA' ) {
if ( this.params.otherLogisticsCompanyName==='' ) {
this.$tips({type:'warning',message:'请填写快递公司'});
return;
}
}
let logisticsCompanyName
if ( this.params.logisticsCompanyCode ==='QITA'){
logisticsCompanyName=this.params.otherLogisticsCompanyName
}else{
logisticsCompanyName = this.logisticsOptions.find( item => {
return item.logisticsCompanyId === this.params.logisticsCompanyId
}).logisticsCompanyName
}
let params = {
optType:3,
integralMallProExchangeId:this.id,
logisticsCompanyId:this.params.logisticsCompanyId,
logisticsCompanyCode:this.params.logisticsCompanyCode,
courierNumber:this.params.courierNumber
courierNumber:this.params.courierNumber,
logisticsCompanyName:logisticsCompanyName
};
console.log(1111,params)
orderOptService(params).then(res => {
if (res.errorCode === 0) {
this.$tips({type:'success',message:'修改快递信息成功'});
......@@ -127,6 +174,21 @@ import {formateDateTimeByType,numberToWeekChinese} from '@/utils/index.js';
}
});
},
//输入框的输入限制
getInputVal2: function(val, max) {
var returnValue = '';
var byteValLen = 0;
for (var i = 0; i < val.length; i++) {
if (val[i].match(/[^\x00-\xff]/ig) != null)
byteValLen += 1;
else
byteValLen += 0.5;
if (byteValLen > max)
break;
returnValue += val[i];
}
return returnValue;
},
// 获取快递列表
async getLogisticsList() {
let res = await getLogisticsList();
......
src/views/mall/coupon/info.js
......@@ -10,6 +10,8 @@ export default {
form: {
integralMallProId: '',
proReferId: '',
cardType:0,
cardName:'',
proName: '', // String 商品名字，优惠券就是所选券的名字。 (必填)
integralCost: 0, // Number 100 积分费用 (必填)
cashCost: 0, // Number 现金费用，两位小数
......@@ -93,6 +95,10 @@ export default {
this.form.exchangeDateDayArr = result.exchangeDateDay ? result.exchangeDateDay.split(',') : [];
this.form.exchangeDateWeekArr = result.exchangeDateWeek ? result.exchangeDateWeek.split(',').filter(v => v) : [];
this.form.limitTimeBegin = result.limitTimeBegin || '';
this.form.cardType = result.cardType
console.log('333333',this.form.cardType)
// result.showStore = 2;
this.sendChildData = {
......@@ -142,7 +148,9 @@ export default {
},
// 获取卡券组件回调的对象
getCardActiveObjFun(val) {
console.log(val)
if (val.hasOwnProperty('cardType')) {
this.form.cardType = val.cardType
}
if (val.coupCardId && this.isAdd) {
this.form.virtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
......@@ -178,7 +186,7 @@ export default {
this.$tips({ type: 'warning', message: '请选择优惠券' });
return;
}
console.log(4444444,this.form.cardType)
console.log(this.timeRangeList)
let params = {
integralMallProId: this.form.integralMallProId || '',
......@@ -200,7 +208,10 @@ export default {
virtualStock: this.form.virtualStock || 0, //库存
cardType :this.form.cardType
}
console.log(22222,params)
// 判断 兑换日期
if (params.exchangeDateType === 2) {
......
src/views/mall/gift/info.js
......@@ -33,7 +33,7 @@ export default {
proShowStatus: 1,
changeType: 2, // Number 兑换方式1:微信兑换 2:快递发货 3:在线发货
releaseType: 1,
cardType:0,
exchangeFixDate: ['', ''], // exchangeFixDateBegin // exchangeFixDateEnd,
exchangeDateDayArr: [],
exchangeDateWeekArr: [],
......@@ -179,6 +179,7 @@ export default {
this.form.limitTimeBegin = result.limitTimeBegin || '';
this.form.weChatVirtualStock = this.form.virtualStock = result.virtualStock || 0;
this.form.detailDescription=result.detailDescription//图文详情的数据
this.form.cardType = result.cardType
// result.showStore = 2;
this.sendChildData = {
......@@ -231,6 +232,9 @@ export default {
},
// 获取卡券组件回调的对象
getCardActiveObjFun(val) {
if (val.hasOwnProperty('cardType')) {
this.form.cardType = val.cardType
}
if (this.isAdd) {
this.form.weChatVirtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
......@@ -313,6 +317,7 @@ export default {
storeIds: '', // 选中的门店信息，多个逗号拼接
virtualStock: this.form.changeType === 1 ? this.form.weChatVirtualStock : this.form.virtualStock, //库存
detailDescription:this.form.detailDescription,//图文详情
cardType :this.form.cardType
}
......
src/views/mall/gift/list.vue
......@@ -29,7 +29,7 @@
</el-switch>
</template>
</el-table-column>
<el-table-column label="礼品信息" align="left" prop="proName" min-width="140">
<el-table-column label="礼品信息" align="left" prop="proName" min-width="260">
<template slot-scope="scope">
<div class="ellipsis-100" >
<img class="vertical-middle table__avatar--gift" :src="scope.row.mainImageUrl || defaultAvatar" width="60" height="60" />
......
src/views/mall/goods/send-goods.vue
<template>
<el-dialog class="express dialog__body__nopadding" title="查看物流信息" :visible.sync="show" width="40%" :before-close="close">
<el-dialog class="express dialog__body__nopadding" title="发货" :visible.sync="show" width="40%" :before-close="close">
<div class="express--info">
<p>收件人：<span style="color:#606266">{{info.consignee || '--'}}</span></p>
<p>联系方式：<span style="color:#606266">{{info.consigneePhone || '--'}}</span></p>
<p>收货地址：<span style="color:#606266">{{info.receivingAddress || '--'}}</span></p>
<p class="pb10">快递公司：<el-select class="vertical-middle w300" v-model="params.logisticsCompanyId" placeholder="选择快递">
<el-option v-for="v in logisticsOptions" :key="v.logisticsCompanyCode" :label="v.logisticsCompanyName" :value="v.logisticsCompanyId"></el-option>
</el-select>
<p class="pb10">快递公司：
<el-select
class="vertical-middle w300"
v-model="params.logisticsCompanyId"
placeholder="选择快递"
@change="changeLogistics">
<el-option
v-for="v in logisticsOptions"
:key="v.logisticsCompanyId"
:label="v.logisticsCompanyName"
:value="v.logisticsCompanyId">
</el-option>
</el-select>
<div style="margin:0 0 10px 75px" v-show="otherLogistics">
<el-input class="vertical-middle w300" v-model="params.otherLogisticsCompanyName" placeholder="请输入快递公司" @input="(value)=>logisticsNameLimit(value)"></el-input>
<span style="font-size:12px;color:rgb(144, 147, 153);display:block;margin-top:5px">若设置为其他快递公司，则系统不提供物流信息的查询</span>
</div>
</p>
<p>运单号码：<el-input class="vertical-middle w300" v-model="params.courierNumber" placeholder="请输入快递单号" @input="(value)=>courierNumberLimit(value)"></el-input></p>
</div>
......@@ -46,7 +60,9 @@ import {getLogisticsInfo,getLogisticsList,orderOptService} from '@/service/api/m
logisticsCompanyId:'',
logisticsCompanyCode:'',
courierNumber:'',
otherLogisticsCompanyName:'',
},
otherLogistics:false
}
},
created() {
......@@ -55,6 +71,34 @@ import {getLogisticsInfo,getLogisticsList,orderOptService} from '@/service/api/m
methods: {
close() {
this.$emit('update:show',false);
this.otherLogistics=false
this.params.otherLogisticsCompanyName=''//快递公司
this.params.logisticsCompanyId=''//运单id
this.params.courierNumber=''//运单bain好
},
//限制物流公司的名称
logisticsNameLimit(value){
this.$nextTick(() => {
this.params.otherLogisticsCompanyName = this.getInputVal2(value,8)
})
},
//快递公司下拉
changeLogistics(value){
console.log('物流id',value)
if ( value ) {
let code = this.logisticsOptions.find( item => {
return item.logisticsCompanyId ===value
} ).logisticsCompanyCode
if(code==='QITA'){
this.otherLogistics=true
}else{
this.otherLogistics=false
this.params.otherLogisticsCompanyName=''
}
} else {
this.otherLogistics=false
this.params.otherLogisticsCompanyName=''
}
},
submit() {
if (!this.params.logisticsCompanyId) {
......@@ -70,13 +114,32 @@ import {getLogisticsInfo,getLogisticsList,orderOptService} from '@/service/api/m
this.params.logisticsCompanyCode = v.logisticsCompanyCode;
}
})
if ( this.params.logisticsCompanyCode ==='QITA' ) {
if ( this.params.otherLogisticsCompanyName==='' ) {
this.$tips({type:'warning',message:'请填写快递公司'});
return;
}
}
let logisticsCompanyName
if ( this.params.logisticsCompanyCode ==='QITA'){
logisticsCompanyName=this.params.otherLogisticsCompanyName
}else{
logisticsCompanyName = this.logisticsOptions.find( item => {
return item.logisticsCompanyId === this.params.logisticsCompanyId
}).logisticsCompanyName
}
let params = {
optType:1,
integralMallProExchangeId:this.id,
logisticsCompanyId:this.params.logisticsCompanyId,
logisticsCompanyCode:this.params.logisticsCompanyCode,
courierNumber:this.params.courierNumber
courierNumber:this.params.courierNumber,
logisticsCompanyName:logisticsCompanyName
};
console.log(1111,params)
orderOptService(params).then(res => {
if (res.errorCode === 0) {
this.$tips({type:'success',message:'发货成功'});
......@@ -105,6 +168,21 @@ import {getLogisticsInfo,getLogisticsList,orderOptService} from '@/service/api/m
}
return returnValue;
},
//输入框的输入限制
getInputVal2: function(val, max) {
var returnValue = '';
var byteValLen = 0;
for (var i = 0; i < val.length; i++) {
if (val[i].match(/[^\x00-\xff]/ig) != null)
byteValLen += 1;
else
byteValLen += 0.5;
if (byteValLen > max)
break;
returnValue += val[i];
}
return returnValue;
},
async getLogisticsList() {
let res = await getLogisticsList();
if (res.errorCode === 0) {
......
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