Skip to content

I
integral-mall
Commit 92f2f0e9 by 萱草
Options

update: 更改

parent f4648b80
Showing with 52 additions and 30 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.cbefc0c90c5728d838bf57ddea95ee0b.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.3987bc5e2ffbddab8b06.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.608bd7f8e497c4d84c2bd532704fbd93.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.e62d3f2ef2dcdad8e7ea.js></script></body></html>
\ No newline at end of file
dist/static/css/app.608bd7f8e497c4d84c2bd532704fbd93.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.cbefc0c90c5728d838bf57ddea95ee0b.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.3987bc5e2ffbddab8b06.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.e62d3f2ef2dcdad8e7ea.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/activities/flashSale/detail.vue
......@@ -25,7 +25,7 @@
<dm-activity-select :repProjectName="projectName" width="300" :actId.sync="flashSaleForm.dataTalkId" :showAdd="false"></dm-activity-select>
</el-form-item> -->
<el-form-item label="时间范围" required>
<el-date-picker :default-time="['00:00:00', '23:59:59']" :disabled="isEdit" class="date-picker" style="width:400px" v-model="dateValue" type="datetimerange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" :disabled="isEdit" class="date-picker" style="width:400px" v-model="dateValue" type="datetimerange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="适用对象" label-width="120px" class="label-icons" prop="memberSearchType">
<el-tooltip class="tips-content" popper-class="store-tips" effect="dark" content="秒杀活动将忽略商品设置的会员等级，以活动适用对象为主" placement="top-start">
......@@ -65,17 +65,20 @@
</el-form-item>
<el-form-item label="活动列表顶图">
<el-upload class="avatar-uploader" with-credentials :action="uploadAction" :headers="headersUpload" :show-file-list="false" :on-success="handleSuccess" :before-upload="beforeUpload">
<!-- <i class="el-icon-zoom-in preview-picture"></i> -->
<img v-if="flashSaleForm.activityImageUrl" :src="flashSaleForm.activityImageUrl" class="avatar" />
<div class="preview-picture" v-if="flashSaleForm.activityImageUrl">
<i class="el-icon-zoom-in" @click.stop="previewPicture"></i>
<i class="el-icon-delete" style="margin-left:6px" @click.stop="deletePicture"></i>
</div>
<img v-if="flashSaleForm.activityImageUrl" :src="flashSaleForm.activityImageUrl" class="avatar" style="width:100px;height:100px" />
<div v-else class="avatar-icon">
<i class="el-icon-plus avatar-uploader-icon"></i>
<span style="display:block;font-size:12px;color:#606266;line-height: 17px;">上传图片</span>
</div>
</el-upload>
<p class="avatar-text">图片宽度≥700px，高度≤1500px，大小不超过 2 MB，未上传展示默认图</p>
<!-- <el-dialog :visible.sync="dialogVisibleImg">
<img width="100%" :src="dialogEnlargeImageUrl" alt />
</el-dialog> -->
<el-dialog :visible.sync="dialogVisibleImg">
<img width="100%" :src="flashSaleForm.activityImageUrl" alt />
</el-dialog>
</el-form-item>
<el-form-item label="活动商品设置">
<div class="add-sku-content">
......@@ -132,7 +135,7 @@
<template slot-scope="{ row }">
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit"><el-input v-model.trim="row.activityStock" placeholder="输入库存" size="small" class="w-110"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10"><el-input v-model.trim="row.activityExchangeLimit" placeholder="输入限兑数量" size="small" class="w-110"></el-input></div>
<span v-if="isEdit">{{ row.activityStock }}/{{ row.commonStock }}</span>
<span v-if="isEdit">{{ row.activityStock }}/{{ row.activityTotalStock }}</span>
</template>
</el-table-column>
<el-table-column label="限兑数量" v-if="isEdit">
......@@ -148,27 +151,28 @@
<template slot-scope="{ row }">
<div style="font-size:0px">
<el-button type="text" v-if="row.giftType && row.children && row.children.length && !row.isShow && isEdit && !overStatus" class="mr20" @click="updateSkuStock(row)">调整库存</el-button>
<el-popover placement="top" trigger="click" ref="popover3">
<el-popover placement="top" trigger="click" ref="popover2" @show="getStockDetail(row.activityProId)">
<div>
<el-select v-model="stockType" style="width:100px;">
<el-option label="增加" :value="1"></el-option>
<!-- <el-option label="减少" :value="0"></el-option> -->
</el-select>
<el-input-number v-model="stock" width="140" style="margin-left:-4px;" controls-position="right" :min="0" :max="999999"></el-input-number>
<el-input-number v-model="stock" width="140" style="margin-left:-6px;" controls-position="right" :min="0" :max="999999"></el-input-number>
</div>
<!-- <p>当前商品库存：</p> -->
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small" @click="$refs.popover3.showPopper = false">取消</el-button>
<el-button type="dafault" size="small" @click="$refs.popover2.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
</div>
<el-button slot="reference" type="text" v-if="!row.giftType && isEdit && !overStatus" class="mr20">调整库存</el-button>
</el-popover>
<el-popover placement="top" trigger="click" ref="popover3">
<el-popover placement="top" trigger="click" ref="popover3" @show="getStockDetail(row.activityProId)">
<div>
<el-select v-model="stockType" style="width:100px;">
<el-option label="增加" :value="1"></el-option>
<!-- <el-option label="减少" :value="0"></el-option> -->
</el-select>
<el-input-number v-model="stock" width="140" style="margin-left:-4px;" controls-position="right" :min="0" :max="999999"></el-input-number>
<el-input-number v-model="stock" width="140" style="margin-left:-6px;" controls-position="right" :min="0" :max="999999"></el-input-number>
<!-- <el-input-number v-model.trim="stock" width="140" clearable controls-position="right" :min="0" :max="999999">
<el-select v-model="stockType" slot="prepend" style="width:100px;">
<el-option label="增加" :value="1"></el-option>
......@@ -227,6 +231,14 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
//disabledDate 文档上：设置禁用状态，参数为当前日期，要求返回 Boolean
// return time.getTime() > Date.now()//选当前时间之前的时间
return time.getTime() < Date.now(); //选当前时间之后的时间
}
},
dialogVisibleImg: false,
stockType: 1,
stock: '',
isEdit: false,
......@@ -347,13 +359,14 @@ export default {
activityIntegral: item.activityIntegral,
activityPrice: item.activityPrice,
activityStock: item.activityStock,
commonStock: item.commonStock,
activityTotalStock: item.activityTotalStock,
integralMallProId: item.giftProId,
giftProType: item.giftProType,
giftType: 1,
mainImageUrl: item.giftImageUrl,
proCode: item.giftCode,
proName: item.proName,
activityProId: item.activityProId,
children: []
});
if (item.activityProSkuList && item.activityProSkuList.length) {
......@@ -365,7 +378,7 @@ export default {
activityIntegral: it.activityIntegral,
activityPrice: it.activityPrice,
activityStock: it.activityStock,
commonStock: it.commonStock,
activityTotalStock: it.activityTotalStock,
integralMallProId: it.giftProSkuId,
// giftProType: item.giftProType,
giftType: 1,
......@@ -384,7 +397,7 @@ export default {
activityIntegral: item.activityIntegral,
activityPrice: item.activityPrice,
activityStock: item.activityStock,
commonStock: item.commonStock,
activityTotalStock: item.activityTotalStock,
integralMallProId: item.giftProId,
giftType: 0,
giftProType: item.giftProType,
......@@ -557,11 +570,12 @@ export default {
console.log(value);
},
// 预览
handlePictureCardPreview(file) {
console.log(file);
// this.giftForm.images = file.url;
previewPicture() {
this.dialogVisibleImg = true;
},
deletePicture() {
this.flashSaleForm.activityImageUrl = '';
},
beforeUpload(file) {
if (file.size > 2 * 1024 * 1024) {
this.$message.error('请上传小于2MB的图片');
......@@ -842,11 +856,17 @@ export default {
}
.preview-picture {
position: absolute;
top: 50%;
left: 50%;
width: 100px;
height: 100px;
color: #fff;
line-height: 100px;
vertical-align: middle;
display: none;
font-size: 20px;
background: rgba(0, 0, 0, 0.5);
z-index: 30;
}
.avatar-uploader:hover {
.avatar-uploader:hover .preview-picture {
display: block;
}
.avatar-text {
......
src/views/activities/flashSale/list.vue
......@@ -80,7 +80,7 @@
</el-table>
<div class="pagination-conteiner" v-show="tableData.length > 0">
<div class="pagination">
<dm-pagination v-if="total != 0" background @size-change="getSearchList('1')" @current-change="getSearchList" :current-page="query.currentPage" :page-sizes="pageSizes" :page-size="query.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
<dm-pagination v-if="total != 0" background hide-on-single-page @size-change="getSearchList('1')" @current-change="getSearchList" :current-page="query.currentPage" :page-sizes="pageSizes" :page-size="query.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</div>
</div>
</div>
......@@ -105,6 +105,7 @@ export default {
pageSize: 20,
sort: ''
},
total: '',
getTimeAll: getInputVal.formatDate,
loading: false,
tableData: []
......@@ -130,7 +131,7 @@ export default {
if (res.data.errorCode === 0) {
if (res.data.result.result) {
this.tableData = res.data.result.result;
this.total = res.data.result.total;
this.total = res.data.result.totalCount;
} else {
this.tableData = [];
this.total = 0;
......
src/views/goods/coupon/info.vue
......@@ -511,6 +511,8 @@ export default {
});
});
// console.log(this.ladderMemberGradeChange);
this.setLadder();
this.submitLadderList = copy(this.list3);
},
changeladder(value) {
if (value.length) {
......@@ -518,8 +520,6 @@ export default {
} else {
this.isDifferentialPricing = 0;
}
this.setLadder();
this.submitLadderList = copy(this.list3);
},
setLadder() {
if (!this.cardCouponList.length) {
......
src/views/goods/gift/info.vue
......@@ -683,6 +683,8 @@ export default {
gradeName: item.gradeName
});
});
this.setLadder();
this.submitLadderList = copy(this.list3);
},
changeladder(value) {
if (value.length) {
......@@ -690,8 +692,6 @@ export default {
} else {
this.isDifferentialPricing = 0;
}
this.setLadder();
this.submitLadderList = copy(this.list3);
},
setLadder() {
let submitSkuJsonTwo = []; // 未选sku时使用
......@@ -781,10 +781,11 @@ export default {
});
});
}
console.log(222);
},
saveLadderDetail() {
this.submitLadderList = copy(this.list3);
// console.log(this.submitLadderList);
console.log(this.submitLadderList);
this.$message.success('保存成功');
this.$refs.popover.showPopper = false;
// if (this.isTable) {
......
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