Skip to content

I
integral-mall
Commit b8d24423 by 萱草
Options

update: 联调

parent 1c289a98
Showing with 80 additions and 52 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.86f01facf26d4fd5d3fa8258e7c0ad5a.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.33aa2078dfb240f7b794.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.6cebe0dbfc11f2a7cd3f6e52eb92b494.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.2b4b90a2533985177c79.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2b4b90a2533985177c79.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.33aa2078dfb240f7b794.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/goodsSelect.vue
......@@ -80,7 +80,8 @@
</el-table>
<div class="pagination-conteiner" v-show="tableData.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" small background @current-change="getInfo" hide-on-single-page layout="prev, pager, next"></el-pagination>
<!-- <el-pagination v-if="total != 0" small @current-change="getInfo('1')" hide-on-single-page layout="prev, pager, next" :total="total"></el-pagination> -->
<el-pagination v-if="total != 0" small @current-change="changeCurrent" hide-on-single-page layout="prev, pager, next" :total="total"></el-pagination>
</div>
</div>
<div style="margin-top: 20px;text-align:right">
......@@ -123,7 +124,8 @@ export default {
tableData: [],
selectArr: [], // 全选数据
selectArr2: [], // 全选数据
val: []
val: [],
total: 0
};
},
created() {
......@@ -135,6 +137,12 @@ export default {
}
},
methods: {
changeCurrent(value) {
if (value) {
this.query.currentPage = value;
}
this.getInfo();
},
getInfo() {
let params;
this.loading = true;
......@@ -153,6 +161,7 @@ export default {
} else {
this.tableData = [];
}
this.total = res.data.result.total;
this.loading = false;
} else {
this.$message.error(res.data.message);
......
src/router/index.js
......@@ -65,7 +65,10 @@ const router = new Router({
{
path: '/flashSale',
name: 'flashSale',
component: flashSale
component: flashSale,
meta: {
useMenuLimit: true
}
},
{
path: '/flashSaleInfo',
......
src/views/activities/flashSale/detail.vue
......@@ -20,9 +20,10 @@
<span slot="suffix">{{ proNameLen }}/9</span>
</el-input>
</el-form-item>
<el-form-item label="数据对话">
<!-- 数据对话厅现在不接入，统一传值为空 -->
<!-- <el-form-item label="数据对话">
<dm-activity-select :repProjectName="projectName" width="300" :actId.sync="flashSaleForm.dataTalkId" :showAdd="false"></dm-activity-select>
</el-form-item>
</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-form-item>
......@@ -136,26 +137,26 @@
<el-table-column label="参与活动">
<template slot-scope="{ row }">
<el-switch v-if="!isEdit && row.isShow" v-model="row.activityProStatus"></el-switch>
<el-switch v-if="row.isShow && isEdit" v-model="row.activityProStatus" :disabled="activityProStatus === 2 ? true : false"></el-switch>
<el-switch v-if="row.isShow && isEdit" v-model="row.activityProStatus" disabled></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" min-width="90px">
<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" class="mr20" @click="updateSkuStock(row)">调整库存</el-button>
<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">
<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:-1px;" controls-position="right" :min="0" :max="999999"></el-input-number>
<el-input-number v-model="stock" width="140" style="margin-left:-4px;" controls-position="right" :min="0" :max="999999"></el-input-number>
</div>
<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="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
</div>
<el-button slot="reference" type="text" v-if="!row.giftType && isEdit" class="mr20">调整库存</el-button>
<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">
<div>
......@@ -163,16 +164,22 @@
<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:-1px;" controls-position="right" :min="0" :max="999999"></el-input-number>
<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.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>
<el-option label="减少" :value="0"></el-option>
</el-select>
</el-input-number> -->
</div>
<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="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
</div>
<el-button slot="reference" type="text" v-if="row.giftType && !row.children && !row.isShow && isEdit" class="mr20">调整库存</el-button>
<el-button slot="reference" type="text" v-if="row.giftType && row.children && !row.children.length && !row.isShow && isEdit && !overStatus" class="mr20">调整库存</el-button>
</el-popover>
<el-button type="text" v-if="!row.giftType" @click="deleteSelectList(row)">删除</el-button>
<el-button type="text" v-if="row.giftType && !row.isShow" class="mr12" @click="deleteSelectList(row)">删除</el-button>
<el-button type="text" v-if="!row.giftType && !overStatus" @click="deleteSelectList(row)">删除</el-button>
<el-button type="text" v-if="row.giftType && !row.isShow && !overStatus" class="mr12" @click="deleteSelectList(row)">删除</el-button>
<el-button type="text" v-if="row.giftType && row.children && row.children.length && isExpand" @click="changeExpand(row)">收起</el-button>
<el-button type="text" v-if="row.giftType && row.children && row.children.length && !isExpand" @click="changeExpand(row)">展开</el-button>
</div>
......@@ -182,7 +189,7 @@
</div>
<div class="add-sku">
<div class="add-sku-button">
<el-button @click="addGoods" type="text">添加商品&nbsp;({{ selectList.length }}/20)</el-button>
<el-button @click="addGoods" type="text" :disabled="isEdit || selectList.length === 20">添加商品&nbsp;({{ selectList.length }}/20)</el-button>
</div>
</div>
</div>
......@@ -274,7 +281,8 @@ export default {
skuStockDialog: false, // 开启和关闭修改实物礼品多规格sku
skuStockData: [], // 修改实物礼品过规格数据
activityProList: [],
activityId: ''
activityId: '',
overStatus: false // 编辑时判断活动是否已结束，true为结束，false为未结束
};
},
created() {
......@@ -299,28 +307,23 @@ export default {
};
request.post('/api-integral-mall/get-activity-detail', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
// this.$message.success('保存成功');
console.log(res.data.result);
let resResult = res.data.result;
// flashSaleForm: {
// activityName: '',
// dataTalkId: '', // 数据对话id
// beginTime: '',
// endTime: '',
// memberSearchType: 1, // 会员类型
// limit: [], // 购买限制
// ignoreLimitFlag: 0,
// activityBackGround: 0,
// activityImageUrl: '' // 活动列表顶图
// },
this.flashSaleForm.activityName = resResult.activityName;
this.flashSaleForm.dataTalkId = resResult.dataTalkId;
// this.flashSaleForm.dataTalkId = resResult.dataTalkId;
this.flashSaleForm.dataTalkId = '';
this.flashSaleForm.memberSearchType = resResult.memberSearchType;
this.flashSaleForm.limit = resResult.ignoreLimitFlag ? ['1'] : [];
this.flashSaleForm.activityBackGround = resResult.activityBackGround;
this.flashSaleForm.activityImageUrl = resResult.activityImageUrl;
this.flashSaleForm.beginTime = resResult.beginTime;
this.flashSaleForm.endTime = resResult.endTime;
//编辑时根据活动结束时间与当前时间做对比，判断是否已结束，已结束活动编辑时只能查看，不能进行调整库存及删除操作
let time = new Date();
if (this.flashSaleForm.endTime < time.getTime()) {
this.overStatus = true;
} else {
this.overStatus = false;
}
// this.flashSaleForm.activityName = resResult.memberSearchType ,
if (resResult.memberSearchType === 2) {
this.defaltSelected = resResult.memberSearchParams;
......@@ -674,7 +677,8 @@ export default {
if (valid) {
let params = {
activityName: this.flashSaleForm.activityName,
dataTalkId: this.flashSaleForm.dataTalkId, // 数据对话id
// dataTalkId: this.flashSaleForm.dataTalkId, // 数据对话id
dataTalkId: '', // 数据对话id
beginTime: this.flashSaleForm.beginTime,
endTime: this.flashSaleForm.endTime,
memberSearchType: this.flashSaleForm.memberSearchType, // 会员类型
......
src/views/activities/flashSale/list.vue
......@@ -96,7 +96,7 @@ export default {
activityName: '',
beginTime: '',
endTime: '',
activityStatus: '',
activityStatus: 1,
currentPage: 1,
pageSize: 20,
sort: ''
......
src/views/goods/coupon/info.vue
......@@ -1222,7 +1222,12 @@ export default {
// } else {
// this.confirmDetail(params);
// }
this.confirmDetail(params);
if (this.isDifferentialPricing) {
this.confirmDetail(params);
} else {
this.submitLoading = true;
this.saveDeatail(params);
}
} else {
return false;
}
......
src/views/goods/gift/info.vue
......@@ -2100,7 +2100,12 @@ export default {
// } else {
// this.confirmDetail(params);
// }
this.confirmDetail(params);
if(this.isDifferentialPricing){
this.confirmDetail(params);
}else{
this.submitLoading = true;
this.saveDeatail(params);
}
} else {
return false;
}
......
src/views/goods/soldStatistics/statistics.vue
......@@ -36,7 +36,7 @@
<img :src="row.giftProImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.giftProName }}</p>
<p class="category-ellipsis">编码：{{ giftProCode }}</p>
<p class="category-ellipsis">编码：{{ row.giftProCode }}</p>
</div>
</div>
</template>
......@@ -45,9 +45,10 @@
<template slot-scope="{ row }">{{ formatDate(row.createTime) }}</template>
</el-table-column>
<el-table-column label="当前人数" prop="count" sortable="custom" :render-header="renderHeader">
<template slot-scope="{ row }"
><span @click="removeMutil(row)">{{ row.count }}</span></template
>
<template slot-scope="{ row }">
<!-- <span @click="removeMutil(row)">{{ row.count }}</span> -->
<span>{{ row.count }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="{ row }"><el-button type="text" @click="checkDistribution(row)">查看分布</el-button></template>
......@@ -123,7 +124,7 @@ export default {
},
methods: {
renderHeader(h, { column, $index }, index) {
return h('span', {}, [h('span', {}, '当前人数'), h('el-popover', { props: { placement: 'top-start', width: '200', trigger: 'hover', content: '点击次数将会根据会员去重。' } }, [h('i', { slot: 'reference', class: 'iconfont icon-xinxixianshi' }, '')])]);
return h('span', {}, [h('span', {}, '当前人数'), h('el-popover', { props: { placement: 'top-start', width: '200', trigger: 'hover', content: '订阅成功次数将会根据会员去重。' } }, [h('i', { slot: 'reference', class: 'iconfont icon-xinxixianshi' }, '')])]);
},
getSearchList(value) {
if (value) {
......@@ -165,17 +166,17 @@ export default {
})
.finally(() => (this.dialogLoading = false));
},
removeMutil(value) {
console.log(value);
let params = {
giftProId: value.giftProId
};
request.get('/api-integral-mall/distinct-subscribe', { params }).then(res => {
if (res.data.errorCode === 0) {
console.log(res.data.result);
}
});
},
// removeMutil(value) {
// console.log(value);
// let params = {
// giftProId: value.giftProId
// };
// request.get('/api-integral-mall/distinct-subscribe', { params }).then(res => {
// if (res.data.errorCode === 0) {
// console.log(res.data.result);
// }
// });
// },
sortChange(value) {
// this.sortColumn = value.prop;
if (value.order == 'ascending') {
......
src/views/order/refundList.vue
......@@ -219,7 +219,8 @@ export default {
receivingAddress: '', //收货地址
logisticsCompanyId: '',
logisticsCode: '',
otherLogisticsCompanyName: ''
otherLogisticsCompanyName: '',
courierNumber: ''
},
shopDialogVisible: false, //门店自提
shopIntegralMallProExchangeId: '', //门店自提订单id
......
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