Skip to content

I
integral-mall
Commit 3b046264 by damodmg
Options

调整bug

parent c1864bd0
Showing with 81 additions and 7 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.7547356f5bc2e5bb155a551c7817f29a.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.12294154552ee42cc39e.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.b872e63d75aaecb49d4311495648175a.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.99964bf2a2583ea9de7c.js></script></body></html>
\ No newline at end of file
dist/static/js/app.12294154552ee42cc39e.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.99964bf2a2583ea9de7c.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
......@@ -13,9 +13,12 @@
</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>
......@@ -76,7 +79,9 @@ import {formateDateTimeByType,numberToWeekChinese} from '@/utils/index.js';
logisticsCompanyId:'',
logisticsCompanyCode:'',
courierNumber:'',
otherLogisticsCompanyName:'',
},
otherLogistics:false,
editShow:false
}
},
......@@ -97,6 +102,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 +141,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 +173,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/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
......@@ -119,13 +119,26 @@ import {getLogisticsInfo,getLogisticsList,orderOptService} from '@/service/api/m
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:'发货成功'});
......
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