Skip to content

I
integral-mall
Commit f4ae35ab by damodmg
Options

add :6月份优化功能

parent 92e5a4af
Showing with 153 additions and 45 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.86eb04947c1c826ffe1c17e3af0412c2.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.004002929420cab45e15.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.6f200d512a060b3384c3b1ae476e1e89.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.03.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.f557804b3b431ffd06bf.js></script></body></html>
\ No newline at end of file
dist/static/css/app.6f200d512a060b3384c3b1ae476e1e89.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.86eb04947c1c826ffe1c17e3af0412c2.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.004002929420cab45e15.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.f557804b3b431ffd06bf.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -19,7 +19,7 @@
<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-linkage.2.0.03.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/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.03.js"></script>
......
src/assets/theme/index.css
......@@ -81803,4 +81803,4 @@
.w200 {
width: 200px;
}
\ No newline at end of file
}
src/views/goods/coupon/coupon.vue
......@@ -38,7 +38,7 @@
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="40"> </el-table-column>
<el-table-column label="礼品信息" min-width="310px">
<el-table-column label="礼品信息" min-width="220px">
<template slot-scope="scope">
<div class="gift-info">
<!-- <p v-if="scope.row.cardType === 2" style="display:inline-block">
......@@ -88,7 +88,18 @@
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column label="操作" min-width="175px">
<el-table-column prop="sort" label="排序" sortable="custom" min-width="140px" :render-header="renderHeader">
<template slot-scope="scope">
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">{{ scope.row.sort }}<i class="el-icon-edit" @click="editNumber(scope.row)"></i></p>
<div v-if="scope.row.editStatus">
<el-input v-if="scope.row.editStatus" v-model="scope.row.sort" placeholder="" size="mini" class="w-180" type="number" style="width:60px"></el-input>
<span class="operate-span" @click="editNumSubmit(scope.row)">确定</span>
<span class="operate-span" @click="editNumCancel(scope.row)">取消</span>
</div>
<span style="display:none">{{ refash }}</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="180px">
<template slot-scope="scope">
<div>
<el-button type="text" @click="getLink(scope.row)">推广</el-button>
......@@ -153,6 +164,7 @@ export default {
pageSizes: [20, 40, 60, 80],
pageSize: 20,
total: 0,
refash: false,
modalData: {
//推广数据
show: false,
......@@ -381,6 +393,33 @@ export default {
window.localStorage.setItem('couponListObj', JSON.stringify(this.couponListObj));
this.$router.push({ name: 'couponInfo', query: { giftId: item.integralMallProId, coupCardId: item.proReferId } });
},
//编辑序号
editNumber(item) {
item.editStatus = true;
this.refash = !this.refash;
},
// 确定编辑序号
editNumSubmit(item) {
let params = {
integralMallProId: item.integralMallProId,
sort: item.sort
};
request.post('/api-integral-mall/update-integral-sort', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('更新成功');
item.editStatus = false;
this.refash = !this.refash;
this.getList(); //拉取列表
} else {
this.$message.error(res.data.message);
}
});
},
// 取消编辑序号
editNumCancel(item) {
item.editStatus = false;
this.refash = !this.refash;
},
handleTable(item, type) {
if (type === 1) {
this.editInfoModal.num = item.integralCost;
......@@ -428,8 +467,7 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 70%;
margin-left: 5px;
width: 58%;
}
.pro-ellipsis {
color: #303133;
......
src/views/goods/gift/gift.vue
......@@ -47,7 +47,7 @@
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="40"> </el-table-column>
<el-table-column label="礼品信息" min-width="330px">
<el-table-column label="礼品信息" min-width="340px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.mainImageUrl" alt="" />
......@@ -91,7 +91,7 @@
<template slot-scope="scope">
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">{{ scope.row.sort }}<i class="el-icon-edit" @click="editNumber(scope.row)"></i></p>
<div v-if="scope.row.editStatus">
<el-input v-if="scope.row.editStatus" v-model="scope.row.sort" placeholder="" size="small" class="w-180" type="number" style="width:60px"></el-input>
<el-input v-if="scope.row.editStatus" v-model="scope.row.sort" placeholder="" size="mini" class="w-180" type="number" style="width:60px"></el-input>
<span class="operate-span" @click="editNumSubmit(scope.row)">确定</span>
<span class="operate-span" @click="editNumCancel(scope.row)">取消</span>
</div>
......@@ -660,7 +660,7 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 71%;
width: 72%;
}
.pro-ellipsis {
color: #303133;
......
src/views/goods/gift/importCoupon.vue
......@@ -13,7 +13,7 @@
</div>
<p class="import-info" v-show="importMess">
本次共导入&nbsp;<span style="font-weight:600">{{ errornumber + correctNumber }}</span
>&nbsp;个商品，其中成功&nbsp;<span style="font-weight:600">{{ correctNumber }}</span
>&nbsp;个券码，其中成功&nbsp;<span style="font-weight:600">{{ correctNumber }}</span
>&nbsp;个，失败&nbsp;<span style="color:#f5222d">{{ errornumber }}</span
>&nbsp;个<a href="javaScript:void(0)" v-show="errornumber > 0" style="margin-left:10px" @click="showInfo">查看失败原因</a>
</p>
......
src/views/goods/gift/info.vue
......@@ -188,10 +188,10 @@
<!-- 实物礼品 -->
<el-form-item label="配送方式" required v-if="giftType === 1" prop="changeTypeList">
<el-checkbox-group v-model="giftForm.changeTypeList" :disabled="editChangeTypeStatus" @change="handleStatus">
<el-checkbox-group v-model="giftForm.changeTypeList" :disabled="editChangeTypeStatus">
<el-checkbox label="2">快递发货</el-checkbox>
<el-checkbox v-if="giftForm.changeType === 1" label="1">微信兑换券</el-checkbox>
<!-- <el-checkbox v-if="giftForm.changeType !== 1" label="4">门店自提</el-checkbox> -->
<el-checkbox v-if="giftForm.changeType !== 1" label="4" @change="handleStatus">门店自提</el-checkbox>
</el-checkbox-group>
</el-form-item>
......@@ -1070,26 +1070,44 @@ export default {
this.giftForm.virtualStock = this.textStock;
},
// 勾选自提点
handleStatus() {
if (this.giftForm.changeTypeList.length) {
if (this.giftForm.changeTypeList[0] === '4') {
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
//0关闭1开启
this.dialogVisibleLink = true;
for (let i = 0; i < this.giftForm.changeTypeList.length; i++) {
if (this.giftForm.changeTypeList[i] === '4') {
this.giftForm.changeTypeList.splice(i, 1);
}
handleStatus(val) {
if (val) {
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
//0关闭1开启
this.dialogVisibleLink = true;
for (let i = 0; i < this.giftForm.changeTypeList.length; i++) {
if (this.giftForm.changeTypeList[i] === '4') {
this.giftForm.changeTypeList.splice(i, 1);
}
}
} else {
this.$message.error(res.data.message);
}
});
}
} else {
this.$message.error(res.data.message);
}
});
}
// if (this.giftForm.changeTypeList.length) {
// if (this.giftForm.changeTypeList[0] === '4') {
// request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
// if (res.data.errorCode === 0) {
// if (res.data.result.status === 0) {
// //0关闭1开启
// this.dialogVisibleLink = true;
// for (let i = 0; i < this.giftForm.changeTypeList.length; i++) {
// if (this.giftForm.changeTypeList[i] === '4') {
// this.giftForm.changeTypeList.splice(i, 1);
// }
// }
// }
// } else {
// this.$message.error(res.data.message);
// }
// });
// }
// }
},
// 跳转到设置自提点
goDeliverSet() {
......
src/views/order/couponExchange.vue
......@@ -77,7 +77,7 @@
<p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="definedCode" label="订单编号" width="200px">
<el-table-column prop="definedCode" label="订单编号" width="170px">
<template slot-scope="scope">
<el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span>
......@@ -99,7 +99,15 @@
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态">
<el-table-column prop="refundStatus" label="售后">
<template slot-scope="scope">
<p style="line-height:18px" v-if="scope.row.refundStatus === 0">退款中</p>
<p style="line-height:18px" v-else-if="scope.row.refundStatus === 1">退款成功</p>
<p style="line-height:18px" v-else-if="scope.row.refundStatus === 2">退款关闭</p>
<p style="line-height:18px" v-else-if="scope.row.refundStatus === -1">--</p>
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态" width="170px">
<template slot-scope="scope">
<p style="line-height:18px">
<span v-if="scope.row.status <= 0">交易关闭</span>
......
src/views/order/giftExchange.vue
......@@ -24,7 +24,7 @@
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:160px;">
<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="4"></el-option>
<el-option label="文本券码" :value="5"></el-option>
</el-select>
</div>
......@@ -67,7 +67,7 @@
<p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="definedCode" label="订单编号" width="200px">
<el-table-column prop="definedCode" label="订单编号" width="170px">
<template slot-scope="scope">
<el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list">
<span class="el-dropdown-link">
......@@ -96,7 +96,19 @@
</p> -->
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态">
<el-table-column prop="refundStatus" label="售后">
<template slot-scope="scope">
<p style="line-height:18px" v-if="scope.row.refundStatus === 0">退款中</p>
<!-- <span class="go-link" v-if="scope.row.refundStatus === 0" style="line-height:18px" @click="goRefundList(scope.row)">退款中</span>
<span class="go-link" v-if="scope.row.refundStatus === 1" style="line-height:18px" @click="goRefundList(scope.row)">退款成功</span>
<span class="go-link" v-if="scope.row.refundStatus === 2" style="line-height:18px" @click="goRefundList(scope.row)">退款关闭</span> -->
<p style="line-height:18px" v-else-if="scope.row.refundStatus === 1">退款成功</p>
<p style="line-height:18px" v-else-if="scope.row.refundStatus === 2">退款关闭</p>
<!-- <p style="line-height:18px" v-else-if="scope.row.refundStatus === -1">--</p> -->
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态" width="170px">
<template slot-scope="scope">
<p style="line-height:18px">
<span v-if="scope.row.status === 11">待付款</span>
......
src/views/order/refundList.vue
......@@ -59,7 +59,7 @@
<p style="line-height:18px" class="gray-color">{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="orderRefundNumber" label="退款编号" min-width="140px">
<el-table-column prop="orderRefundNumber" label="退款编号" width="170px">
<template slot-scope="scope">
<el-dropdown placement="bottom-end" class="drop-list" trigger="click">
<span class="el-dropdown-link"> {{ scope.row.refundNumber }}<i class="iconfont icon-icon-"></i> </span>
......@@ -86,7 +86,7 @@
<p v-if="scope.row.refundType === 2">退货退款</p>
</template>
</el-table-column>
<el-table-column prop="definedCode" label="申请金额">
<el-table-column prop="definedCode" label="申请金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.maxRefundPoints }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.maxRefundPrice }}</p>
......@@ -101,7 +101,7 @@
</p> -->
</template>
</el-table-column>
<el-table-column prop="complete" label="退款状态">
<el-table-column prop="complete" label="退款状态" width="120px">
<template slot-scope="scope">
<p style="line-height:18px;margin-bottom:5px" v-if="scope.row.refundStatus === 0">待退款</p>
<p style="line-height:18px;" v-if="scope.row.refundStatus === 1">退款成功</p>
......@@ -397,7 +397,7 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 65%;
width: 74%;
}
.pro-ellipsis {
color: #303133;
......
src/views/setting/deliverSet.vue
......@@ -14,9 +14,18 @@
</div>
<div class="section">
<div class="header-top">
<span>门店自提</span>
<span>门店自提 </span>
<el-switch v-model="pickStatus" @change="changeStatus"> </el-switch>
</div>
<div class="header-top">
<span
>会员自助核销
<el-tooltip effect="dark" content="如开启会员自助核销，则会员可在到门店，在小程序端，输入导购代码进行提货核销" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
</el-tooltip>
</span>
<el-switch v-model="cancelStatus" @change="changeCancelStatus" :disabled="!pickStatus"> </el-switch>
</div>
<div v-show="pickStatus">
<div class="operate-top">
<div class="fl">
......@@ -91,6 +100,7 @@ export default {
pageSize: 20,
total: 2,
pickStatus: true, //自提状态
cancelStatus: false, //核销状态
loading: false,
selectList: [], //复选框选中的数据
tableDate: [],
......@@ -149,6 +159,11 @@ export default {
} else if (res.data.result.status === 1) {
this.pickStatus = true;
}
if (res.data.result.memberVerification === 0) {
this.cancelStatus = false;
} else if (res.data.result.memberVerification === 1) {
this.cancelStatus = true;
}
this.getList();
} else {
this.$message.error(res.data.message);
......@@ -163,9 +178,25 @@ export default {
request.get('/api-integral-mall/set-pick-up-point-switch-status', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('设置成功');
this.getStatus();
this.getList();
} else {
this.pickStatus = true;
this.pickStatus = !this.pickStatus;
this.$message.error(res.data.message);
}
});
},
//开启关闭会员核销
changeCancelStatus() {
let params = {
status: this.cancelStatus ? 1 : 0
};
request.get('/api-integral-mall/set-pick-up-point-member-verification', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('设置成功');
// this.getList();
} else {
this.cancelStatus = !this.cancelStatus;
this.$message.error(res.data.message);
}
});
......@@ -237,7 +268,7 @@ export default {
margin: 15px 0 22px 0;
}
.header-top span {
width: 80px;
width: 130px;
display: inline-block;
}
</style>
src/views/setting/editDeliver.vue
......@@ -36,8 +36,10 @@
<el-input v-model="form.pickUpPointAddress" class="w-600" type="text" disabled> </el-input>
</el-form-item>
<el-form-item label="自提点图片" required v-if="integralMallPickUpPointId !== '-1'">
<div v-for="(item, index) in form.pickUpPointImageList" :key="index" class="img-list">
<img :src="item" alt="" />
<div style="width:700px">
<div v-for="(item, index) in form.pickUpPointImageList" :key="index" class="img-list">
<img :src="item" alt="" />
</div>
</div>
</el-form-item>
<el-form-item label="营业时间" required v-if="integralMallPickUpPointId !== '-1'" class="time-range">
......
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