Skip to content

W
welfare
Commit 7bffa718 by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/app.0428b1a1.js
#	dist/js/card-package.f087adab.js
#	dist/js/card-package~gic-card.639ac33a.js
#	dist/js/card-package~gic-card.80c5b211.js
#	dist/js/card-package~gic-card.86e28e0d.js
#	dist/js/chunk-0d4ebdfa.a9a3c30a.js
#	dist/js/chunk-331988dc.2033440e.js
#	dist/js/chunk-331988dc.5501d5e7.js
#	dist/js/chunk-331988dc.6f323b38.js
#	dist/js/chunk-53f4695c.00b1ac67.js
#	dist/js/chunk-53f4695c.4126a972.js
#	dist/js/chunk-53f4695c.5d60e90c.js
#	dist/js/chunk-edf46648.12333243.js
#	dist/js/chunk-edf46648.1a2c97a9.js
#	dist/js/chunk-edf46648.3f09ffff.js
#	dist/js/chunk-f95812e2.0b074d03.js
#	dist/js/gic-card.54f2109d.js
parents 4565e5f2 731c39c5
Showing with 19 additions and 20 deletions
dist/css/chunk-342a4127.2aad20d9.css 0 → 100644
.step-text[data-v-a1c6e794]{color:#000;font-size:14px}.dash-style[data-v-a1c6e794]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-a1c6e794]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-a1c6e794]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-a1c6e794]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-a1c6e794]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a1c6e794]{padding:0}.w-630[data-v-a1c6e794]{width:630px}.mb56[data-v-a1c6e794]{margin-bottom:56px}.from-content[data-v-a1c6e794]{position:relative}.from-content .demo-ruleForm .form-section[data-v-a1c6e794]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-a1c6e794]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-a1c6e794]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-a1c6e794]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-a1c6e794]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-a1c6e794]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-a1c6e794]{margin-top:12px}.from-content .anchor-link[data-v-a1c6e794]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-a1c6e794]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-a1c6e794]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-a1c6e794]:hover{color:#2f54ed}.ml20[data-v-a1c6e794]{margin-left:20px}.mr10[data-v-a1c6e794]{margin-right:10px}.tips-content[data-v-a1c6e794]{position:absolute;left:-4px;top:6px}.store-tips[data-v-a1c6e794]{width:200px;position:absolute;left:-10px}.underline[data-v-a1c6e794]{text-decoration:underline}.pickup-upload[data-v-a1c6e794]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-a1c6e794]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-a1c6e794]{font-size:14px}.pickup-upload .pickup-list[data-v-a1c6e794]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a1c6e794]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a1c6e794]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
dist/css/chunk-c6c65a2a.6eb3ea7f.css deleted 100644 → 0
.step-text[data-v-1a6ea031]{color:#000;font-size:14px}.dash-style[data-v-1a6ea031]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-1a6ea031]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-1a6ea031]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-1a6ea031]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-1a6ea031]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-1a6ea031]{padding:0}.w-630[data-v-1a6ea031]{width:630px}.mb56[data-v-1a6ea031]{margin-bottom:56px}.from-content[data-v-1a6ea031]{position:relative}.from-content .demo-ruleForm .form-section[data-v-1a6ea031]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-1a6ea031]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-1a6ea031]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-1a6ea031]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-1a6ea031]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-1a6ea031]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-1a6ea031]{margin-top:12px}.from-content .anchor-link[data-v-1a6ea031]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-1a6ea031]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-1a6ea031]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-1a6ea031]:hover{color:#2f54ed}.ml20[data-v-1a6ea031]{margin-left:20px}.mr10[data-v-1a6ea031]{margin-right:10px}.tips-content[data-v-1a6ea031]{position:absolute;left:-4px;top:6px}.store-tips[data-v-1a6ea031]{width:200px;position:absolute;left:-10px}.underline[data-v-1a6ea031]{text-decoration:underline}.pickup-upload[data-v-1a6ea031]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-1a6ea031]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-1a6ea031]{font-size:14px}.pickup-upload .pickup-list[data-v-1a6ea031]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-1a6ea031]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-1a6ea031]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
src/views/gift-manage/virtual-gift-detail.vue
......@@ -4,11 +4,11 @@
<el-form :model="goodsForm" :rules="goodsRules" ref="goodsForm" label-width="150px" class="demo-ruleForm" label-position="right" v-loading="loading">
<div class="form-section">
<h3>基础信息</h3>
<el-form-item label="福利渠道:" class="w-630">{{ enterpriseName }}</el-form-item>
<el-form-item label="礼品名称:" class="w-630" prop="giftName">
<el-form-item label="福利渠道" class="w-630">{{ enterpriseName }}</el-form-item>
<el-form-item label="礼品名称" class="w-630" prop="giftName">
<dm-input :byte-type="1" type="text" v-model="goodsForm.giftName" :maxlength="30" placeholder="请输入礼品名称"></dm-input>
</el-form-item>
<el-form-item label="礼品主图:" required>
<el-form-item label="礼品主图" required>
<div class="member-upload-image">
<div class="member-upload-image">
<dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @deleteImage="deleteImage"></dm-upload-picture>
......@@ -16,19 +16,19 @@
<span class="tip-warm" style="display:block">图片宽度800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
</div>
</el-form-item>
<el-form-item label="礼品详情:" prop="giftDescrption">
<el-form-item label="礼品详情" prop="giftDescrption">
<dm-editor :width="editorWidth" :value="goodsForm.giftDescrption" @change="handleChange"></dm-editor>
</el-form-item>
</div>
<div class="form-section">
<h3>库存信息</h3>
<el-form-item label="成本:" class="w-630" prop="costPrice">
<el-form-item label="成本" class="w-630" prop="costPrice">
<dm-input-amount v-model="goodsForm.costPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
</el-form-item>
<el-form-item label="库存:" class="w-630" prop="stock">
<el-form-item label="库存" class="w-630" prop="stock">
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" disabled placeholder="上传文件后自动填充"></dm-input-number>
</el-form-item>
<el-form-item prop="marketPrice" label="市场价:">
<el-form-item prop="marketPrice" label="市场价">
<dm-input-amount v-model="goodsForm.marketPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
<div>
<span class="tip-warm">市场价在礼品详情会以划线形式显示。</span>
......@@ -38,17 +38,17 @@
</el-popover>
</div>
</el-form-item>
<el-form-item label="礼品编码:" class="w-630" prop="giftNo">
<el-form-item label="礼品编码" class="w-630" prop="giftNo">
<el-input style="width:260px" v-model="goodsForm.giftNo" placeholder="请输入" :min="0" :max="999999" :precision="2"></el-input>
</el-form-item>
<el-form-item label="礼品条形码:" class="w-630" prop="giftBarNo">
<el-form-item label="礼品条形码" class="w-630" prop="giftBarNo">
<el-input style="width:260px" v-model="goodsForm.giftBarNo" placeholder="请输入" :min="0" :max="999999" :precision="2"></el-input>
</el-form-item>
</div>
<div class="form-section">
<h3>福利设置</h3>
<!-- 虚拟 -->
<el-form-item label="发货内容:" required>
<el-form-item label="发货内容" required>
<template>
<div style="display:flex;">
<dm-editor width="500" height="300" :value="goodsForm.template" :placeholder="template" @change="handleChange2" :readonly="readonly"></dm-editor>
......@@ -68,13 +68,11 @@
</el-step>
<el-step>
<div slot="description">
<div>
<!-- <div>
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<el-upload class="upload-ele inline-block" :action="uploadAction" :show-file-list="false" :on-change="beforeUploadFile" with-credentials>
<!-- <div class="upload-ele"> -->
<el-button class="block" @click="templateUpload"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button>
<span class="block">{{fileName}}</span>
<!-- </div> -->
</el-upload>
<el-popover placement="top" trigger="hover">
<div style="font-size:6px">
......@@ -84,9 +82,8 @@
</div>
<el-button slot="reference" type="text">查看导入规则</el-button>
</el-popover>
<!-- <el-button type="text">查看导入规则</el-button> -->
</div>
<el-button type="text" class="block" @click="checkUploadDetail">查看内容</el-button>
<el-button type="text" class="block" @click="checkUploadDetail">查看内容</el-button> -->
<div class="pickup-upload">
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<dm-upload-file
......@@ -127,7 +124,7 @@
<!-- <el-button class="mt10" type="primary" @click="saveDescription">保存</el-button> -->
</template>
</el-form-item>
<el-form-item label="库存消耗方式:" prop="checkList">
<el-form-item label="库存消耗方式" prop="checkList">
<template>
<el-checkbox-group v-model="goodsForm.checkList" @change="changeStockUse" :disabled="isEdit">
<el-checkbox label="0">
......@@ -148,7 +145,7 @@
</div>
<div class="form-section">
<h3>售后服务</h3>
<el-form-item prop="refundFlag" label="支持申请退货:" required>
<el-form-item prop="refundFlag" label="支持申请退货" required>
<template>
<div>
<el-radio v-model="goodsForm.refundFlag" :label="1">是</el-radio>
......@@ -160,7 +157,7 @@
</div>
<div class="form-section mb56">
<h3>权限设置</h3>
<el-form-item label="操作人权限:" required>
<el-form-item label="操作人权限" required>
<dm-acc-group-select :etype.sync="goodsForm.operAuthType" :group-ids.sync="goodsForm.operAuthPre" />
</el-form-item>
</div>
......@@ -480,6 +477,8 @@ export default {
this.goodsForm.template = resResult.template; // 虚拟礼品模板
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ 1, 2 ] : (resResult.stockUseType == 1 ? [ 1 ] : [ 0 ]); // 库存消耗方式
this.goodsForm.deliveryType = resResult.deliveryType;
this.goodsForm.giftImages = resResult.giftImages;
this.goodsForm.stockUseType = resResult.stockUseType;
let img = resResult.giftImages.split(',');
// this.goodsForm.giftImages = [];
if (img.length) {
......
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