Commit a7782606 by damodmg

更新

parent a94b2c85
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.794a52d9033c9851d762af3bbf923bc9.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.8e6e449442518fe47d27.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=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.5a2e56ffae6d2ea313ed3c53dc4a7d2b.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.54c8df1e543ffef6ff27.js></script></body></html>
\ No newline at end of file
......@@ -209,59 +209,58 @@ input:focus {
color: #a3adb6;
margin:14px 0;
}
.pagination-conteiner{
height:32px;
/* width:100%; */
padding:30px 0 10px 0;
}
.pagination{
width:100%;
text-align: right;
display:inline-block;
}
.w-260{
width:260px;
}
.user-header-pop {
min-width: 95px;
}
.el-popover.user-header-pop {
min-width: 95px;
}
/*页面头部*/
.mall-section-container{
flex:1;
/*margin-bottom:40px;*/
}
.mall-content-section{
height:100%;
}
.mall-content-title{
height:85px;
background:#fff;
border-bottom:1px solid #e4e7ed;
padding:15px 0 0 25px;
}
.mall-content-title h3{
color:#303133;
font-size:20px;
padding:24px 0;
font-weight:500;
}
.mall-content-title h3 span{
color:#303133;
font-size:20px;
font-weight:500;
}
.mall-content-title h3 i{
.pagination-conteiner{
height:32px;
width:100%;
padding:30px 0 10px 0;
}
.pagination{
float:right;
}
.w-260{
width:260px;
}
.user-header-pop {
min-width: 95px;
}
.el-popover.user-header-pop {
min-width: 95px;
}
/*页面头部*/
.mall-section-container{
flex:1;
/*margin-bottom:40px;*/
}
.mall-content-section{
height:100%;
}
.mall-content-title{
height:85px;
background:#fff;
border-bottom:1px solid #e4e7ed;
padding:15px 0 0 25px;
}
.mall-content-title h3{
color:#303133;
font-size:20px;
color:#c0c4ce;
cursor: pointer;
}
.mall-content-title h3 i:hover{
color:#909399;
}
padding:24px 0;
font-weight:500;
}
.mall-content-title h3 span{
color:#303133;
font-size:20px;
font-weight:500;
}
.mall-content-title h3 i{
font-size:20px;
color:#c0c4ce;
cursor: pointer;
}
.mall-content-title h3 i:hover{
color:#909399;
}
/*编辑按钮*/
.el-icon-edit{
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -119,6 +119,9 @@ export default {
},
giftType: {
type: Number
},
giftId: {
type: String
}
},
data() {
......@@ -625,6 +628,19 @@ export default {
item2.valueName = '';
}
item2.valueName = item2.valueName.slice(0, 32);
let params = {
proCode: item2.valueName,
integralMallProId: this.giftId == '-1' ? '' : this.giftId
};
request.get('/api-integral-mall/check-pro-code-exsits', { params }).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result) {
this.$message.warning('当前编码已存在,不影响保存');
}
} else {
this.$message.error(res.data.message);
}
});
} else if (item1.length - index2 === 2) {
//商品条形码
if (!reg.test(item2.valueName)) {
......
......@@ -57,7 +57,7 @@
<div class="section-content">
<h3>销售信息</h3>
<el-form-item label="礼品规格" v-if="giftType === 1 || submitSkuJson.length">
<addSku :skuJson="giftProStandardJson" :giftType="giftType" @getSpuStock="getSpuStock" @getStandradList="getStandradList" @getSkuList="getSkuList" @IsAgreeUpload="IsAgreeUpload" :isStdImg="isStdImg" :skuList="skuList"></addSku>
<addSku :giftId="giftId" :skuJson="giftProStandardJson" :giftType="giftType" @getSpuStock="getSpuStock" @getStandradList="getStandradList" @getSkuList="getSkuList" @IsAgreeUpload="IsAgreeUpload" :isStdImg="isStdImg" :skuList="skuList"></addSku>
</el-form-item>
<el-form-item label="礼品编码">
<table class="spu-table">
......@@ -971,6 +971,21 @@ export default {
if (!reg.test(this.giftForm.proCode)) {
this.$message.error('请输入数字或者字母或-');
this.giftForm.proCode = '';
} else {
//校验是否重复给出提示
let params = {
proCode: this.giftForm.proCode,
integralMallProId: this.giftId === '-1' ? '' : this.giftId
};
request.get('/api-integral-mall/check-pro-code-exsits', { params }).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result) {
this.$message.warning('当前编码已存在,不影响保存');
}
} else {
this.$message.error(res.data.message);
}
});
}
},
limitCostType() {
......
......@@ -35,6 +35,8 @@
<el-option label="商品名称" :value="2"></el-option>
<el-option label="会员名" :value="3"></el-option>
<el-option label="会员卡号" :value="4"></el-option>
<el-option label="收件人手机号" :value="5"></el-option>
<el-option label="快递单号" :value="6"></el-option>
</el-select>
</el-input>
<!-- <el-input style="width:240px;" v-model.trim="searchValue" placeholder="请输入会员/商品/订单搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
......
......@@ -130,6 +130,9 @@
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货地址:</span><span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
</p>
<p class="order-mess-item">
<span>买家留言:</span><span class="order-item-detail-mess">{{ orderDetail.buyerRemark ? orderDetail.buyerRemark : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货时间:</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
......
......@@ -209,59 +209,58 @@ input:focus {
color: #a3adb6;
margin:14px 0;
}
.pagination-conteiner{
height:32px;
/* width:100%; */
padding:30px 0 10px 0;
}
.pagination{
width:100%;
text-align: right;
display:inline-block;
}
.w-260{
width:260px;
}
.user-header-pop {
min-width: 95px;
}
.el-popover.user-header-pop {
min-width: 95px;
}
/*页面头部*/
.mall-section-container{
flex:1;
/*margin-bottom:40px;*/
}
.mall-content-section{
height:100%;
}
.mall-content-title{
height:85px;
background:#fff;
border-bottom:1px solid #e4e7ed;
padding:15px 0 0 25px;
}
.mall-content-title h3{
color:#303133;
font-size:20px;
padding:24px 0;
font-weight:500;
}
.mall-content-title h3 span{
color:#303133;
font-size:20px;
font-weight:500;
}
.mall-content-title h3 i{
.pagination-conteiner{
height:32px;
width:100%;
padding:30px 0 10px 0;
}
.pagination{
float:right;
}
.w-260{
width:260px;
}
.user-header-pop {
min-width: 95px;
}
.el-popover.user-header-pop {
min-width: 95px;
}
/*页面头部*/
.mall-section-container{
flex:1;
/*margin-bottom:40px;*/
}
.mall-content-section{
height:100%;
}
.mall-content-title{
height:85px;
background:#fff;
border-bottom:1px solid #e4e7ed;
padding:15px 0 0 25px;
}
.mall-content-title h3{
color:#303133;
font-size:20px;
color:#c0c4ce;
cursor: pointer;
}
.mall-content-title h3 i:hover{
color:#909399;
}
padding:24px 0;
font-weight:500;
}
.mall-content-title h3 span{
color:#303133;
font-size:20px;
font-weight:500;
}
.mall-content-title h3 i{
font-size:20px;
color:#c0c4ce;
cursor: pointer;
}
.mall-content-title h3 i:hover{
color:#909399;
}
/*编辑按钮*/
.el-icon-edit{
......
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