Skip to content

I
integral-mall
Commit 9095de02 by damodmg
Options

更新新内容

parent 0e949d6a
Showing with 61 additions and 27 deletions
dist/index.html
<!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.38b4aa9866a52577bc2b04ff3260ee67.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.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.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.8cb93e9c65162fccdcab.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.2fdb8aca6fd409b54d025af163f812a9.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.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.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.7e2ec8aba8120871bdc4.js></script></body></html>
\ No newline at end of file
dist/static/css/app.2fdb8aca6fd409b54d025af163f812a9.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.38b4aa9866a52577bc2b04ff3260ee67.css 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.7e2ec8aba8120871bdc4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.8cb93e9c65162fccdcab.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/tinymce-edit.vue
......@@ -106,6 +106,10 @@ export default {
methods: {
// 上传图片
handleImgUpload(blobInfo, success, failure) {
if (blobInfo.blob().size > 5 * 1024 * 1024) {
failure('请上传小于 5 M 文件');
return false;
}
var that = this;
let formdata = new FormData();
formdata.set('upload_file', blobInfo.blob());
......
src/views/goods/gift/addSku.vue
......@@ -44,7 +44,7 @@
</div>
</div>
</div>
<div class="add-sku-btn" v-show="skuJson.length < 3">
<div class="add-sku-btn" v-show="skuJson.length < 3 && giftType === 1">
<el-button type="primary" size="small" @click="addSku">添加规格</el-button>
<span class="tip-warm ml20">如有颜色、尺码等多种规格，请添加规格</span>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">公众号积分商城不支持此功能，小程序积分商城请升级至V3.0.0及以上版本</span>
......@@ -116,6 +116,9 @@ export default {
},
isStdImg: {
type: Boolean
},
giftType: {
type: Number
}
},
data() {
......
src/views/goods/gift/info.vue
......@@ -14,7 +14,7 @@
</h3>
</div>
<div class="section">
<el-form :model="giftForm" :rules="giftRules" ref="giftForm" label-width="140px" class="demo-ruleForm" label-position="right">
<el-form :model="giftForm" :rules="giftRules" ref="giftForm" label-width="150px" class="demo-ruleForm" label-position="right">
<div class="section-content">
<h3>基础信息</h3>
<el-form-item label="礼品名称" prop="proName">
......@@ -57,8 +57,8 @@
</div>
<div class="section-content">
<h3>销售信息</h3>
<el-form-item label="礼品规格">
<addSku :skuJson="giftProStandardJson" @getSpuStock="getSpuStock" @getStandradList="getStandradList" @getSkuList="getSkuList" @IsAgreeUpload="IsAgreeUpload" :isStdImg="isStdImg" :skuList="skuList"></addSku>
<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>
</el-form-item>
<el-form-item label="礼品编码">
<table class="spu-table">
......@@ -97,7 +97,7 @@
</el-form-item>
<el-form-item label="市场价">
<el-input-number class="w-350" :precision="2" :min="0" :max="9999999" v-model="giftForm.marketPrice"></el-input-number>
<el-popover placement="top-start" width="200" trigger="hover">
<el-popover placement="top-start" width="347" trigger="hover">
<img src="../../../../static/img/eg.png" alt="" />
<el-button slot="reference" type="text" style="margin-left:15px;">查看示例</el-button>
</el-popover>
......@@ -197,20 +197,20 @@
</el-form-item>
<!-- 虚拟礼品 -->
<el-form-item label="配送方式" required v-else>
<!-- <el-form-item label="配送方式" required v-else>
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3">在线发货 </el-radio>
<el-radio :label="1">微信兑换券</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="配送方式" required v-if="giftType !== 1">
</el-form-item> -->
<el-form-item label="配送方式" required v-if="giftType !== 1">
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3" v-if="giftForm.changeType !== 5">在线发货 </el-radio>
<el-radio :label="1" v-if="giftForm.changeType !== 5">微信兑换券</el-radio>
<el-radio :label="5" v-if="giftForm.changeType === 5">文本券码</el-radio>
</el-radio-group>
<el-button type="primary" size="mini" v-if="giftForm.changeType === 5" style="margin-left:20px;">批量导入</el-button>
</el-form-item> -->
</el-form-item>
<!-- <el-form-item label="配送方式" required>
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="2" v-if="giftType === 1">快递发货</el-radio>
......@@ -247,9 +247,12 @@
</div>
</div>
<div class="section-content">
<div class="section-content section-tip-content">
<h3>售后服务</h3>
<el-form-item label="支持买家申请退款" required>
<el-form-item label="支持买家申请退款 " required>
<el-tooltip class="tip-content" effect="dark" content="若商品不支持买家退款，则在下单时系统会提醒买家此商品不支持退款或退货。" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
</el-tooltip>
<el-radio-group v-model="giftForm.refundType" :disabled="refundTypeStatus">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
......@@ -423,7 +426,7 @@ export default {
this.giftForm.changeType = 2;
} else if (this.giftType === 0) {
//虚拟
this.giftForm.changeType = 3;
this.giftForm.changeType = 5;
}
if (this.mallProId !== '-1') {
this.getInfo();
......@@ -1551,6 +1554,10 @@ export default {
padding: 20px 15px;
vertical-align: middle;
}
.tip-content {
position: absolute;
left: -25px;
}
</style>
<style>
.upload-list-box .el-upload--picture-card {
......@@ -1561,4 +1568,7 @@ export default {
.select-shop__right {
line-height: 28px !important;
}
.section-tip-content .el-form-item__label {
text-align: left !important;
}
</style>
src/views/order/couponExchange.vue
......@@ -58,7 +58,7 @@
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<!-- status： 1是未领取，2是已领取 -->
<p style="font-size:13px;color:#909399"><span v-if="scope.row.cardType === 2">已领取</span><span v-if="scope.row.cardType <= 0">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<p style="font-size:13px;color:#909399"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 2">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<!-- <p class="category-ellipsis">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p>
......
src/views/order/orderDetail.vue
......@@ -112,14 +112,15 @@
<span v-if="orderDetail.changeType === 2" class="order-item-detail-mess">快递发货</span>
<span v-if="orderDetail.changeType === 3" class="order-item-detail-mess">在线发货</span>
<span v-if="orderDetail.changeType === 4" class="order-item-detail-mess">门店自提</span>
<span v-if="orderDetail.changeType === 5" class="order-item-detail-mess">文本卡券</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType !== 4">
<p class="order-mess-item" v-if="orderDetail.changeType !== 4 && orderDetail.changeType !== 5">
<span>收货信息：</span><span class="order-item-detail-mess">{{ orderDetail.receivingAddress }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货人：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPerson }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<p class="order-mess-item" v-if="orderDetail.changeType === 4 && orderDetail.changeType !== 5">
<span>提货手机：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPhone }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
......@@ -131,6 +132,12 @@
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货时间：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡号：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡密/券码：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
</div>
<div class="order-operate">
<!-- 待付款 或者 待发货没申请退款-->
......
src/views/setting/editDeliver.vue
......@@ -23,7 +23,7 @@
<!-- <el-radio v-model="radio" label="1">手动新增自提点</el-radio> -->
</template>
</el-form-item>
<el-form-item label="选择门店" required v-if="integralMallPickUpPointId === '-1'">
<el-form-item label="选择门店" required v-if="integralMallPickUpPointId === '-1'" class="shop-content">
<vue-gic-store-new :options="options" :isAdd="isAdd" :uuid.sync="uuid" ref="storeGroup" @store-chane="storeChange"></vue-gic-store-new>
</el-form-item>
<el-form-item label="自提点名称" required v-if="integralMallPickUpPointId !== '-1'">
......@@ -110,7 +110,8 @@ import getInputVal from '../../utils/common.js';
export default {
data() {
let timeHoursValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
// var reg = /^[1-9]\d*$/;
var reg = /^\+?(0|[1-9][0-9]*)$/;
if (this.form.radio === 2) {
if (!value) {
callback();
......@@ -121,15 +122,16 @@ export default {
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入1-23之间的整数'));
callback(new Error('请输入0-23之间的整数'));
} else if (Number(value) > 23) {
callback(new Error('请输入1-23之间的整数'));
callback(new Error('请输入0-23之间的整数'));
} else {
callback();
}
};
let timeMinuterValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
// var reg = /^[1-9]\d*$/;
var reg = /^\+?(0|[1-9][0-9]*)$/;
if (this.form.radio === 2) {
if (!value) {
callback();
......@@ -140,15 +142,16 @@ export default {
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入1-59之间的整数'));
callback(new Error('请输入0-59之间的整数'));
} else if (Number(value) > 59) {
callback(new Error('请输入1-59之间的整数'));
callback(new Error('请输入0-59之间的整数'));
} else {
callback();
}
};
let timeDayValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
// var reg = /^\+?(0|[1-9][0-9]*)$/;
if (this.form.radio === 1) {
if (!value) {
callback();
......@@ -167,11 +170,12 @@ export default {
}
};
let orderTimeHoursValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
// var reg = /^[1-9]\d*$/;
var reg = /^\+?(0|[1-9][0-9]*)$/;
if (!reg.test(Number(value))) {
callback(new Error('请输入1-90之间的整数'));
callback(new Error('请输入0-90之间的整数'));
} else if (Number(value) > 90) {
callback(new Error('请输入1-90之间的整数'));
callback(new Error('请输入0-90之间的整数'));
} else {
callback();
}
......@@ -524,7 +528,13 @@ export default {
border-radius: 4px;
border: 1px solid #e4e7ed;
}
/* .time-range .el-date-editor .el-range__close-icon {
display: none !important;
} */
</style>
<style>
.shop-content .dm-store__inputtag--total {
top: 2px;
}
</style>
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