Skip to content

I
integral-mall
Commit 98dcd195 by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !51
parents ab849b83 af43fc14
Showing with 322 additions and 50 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.2f716ce0234f92d6719eb5b2de5d8c68.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 src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.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.5c5b8b5e1875fb282ce7.js></script></body></html>
\ No newline at end of file
dist/static/css/app.2f716ce0234f92d6719eb5b2de5d8c68.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.5c5b8b5e1875fb282ce7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -19,11 +19,12 @@
<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>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.js"></script>
<!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> -->
<!-- built files will be auto injected -->
</body>
......
src/App.vue
......@@ -5,10 +5,59 @@
</template>
<script>
import request from './service/request.js';
export default {
name: 'App',
data() {
return {};
},
methods: {
// 保存用户id，串号标志
getUserId() {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
const useId = res.data.result.userId;
localStorage.setItem('useId', useId);
} else {
this.$message.error(res.data.message);
}
});
},
// 浏览器tab切换检查uid是否变化
changeTab() {
document.addEventListener('visibilitychange', () => {
if (document.visibilityState === 'visible') {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
const useId = res.data.result && res.data.result.userId;
if (localStorage.getItem('useId') !== useId) {
// 串号
this.$confirm('出现窜号情况，请首先核对好是哪个商户再进行操作！', '提示', {
type: 'error',
closeOnClickModal: false,
showClose: false
})
.then(() => {
localStorage.setItem('useId', useId);
window.location.reload();
})
.catch(() => {
window.location.reload();
});
} else {
localStorage.setItem('useId', useId);
}
} else {
this.$message.error(res.data.message);
}
});
}
});
}
},
created() {
this.getUserId();
this.changeTab();
}
};
</script>
......
src/assets/theme/index.css
......@@ -81803,4 +81803,4 @@
.w200 {
width: 200px;
}
\ No newline at end of file
}
src/router/index.js
......@@ -75,5 +75,10 @@ const router = new Router({
}
]
});
// router.beforeEach((to, from, next) => {
// // ...
// console.log(123456789, to);
// next();
// });
export default router;
src/service/request.js
......@@ -27,7 +27,6 @@ request.interceptors.request.use(
requestProject: 'integral-mall',
...config.params
};
if (store.state.token) {
config.headers.Authorization = `token ${store.state.token}`;
}
......@@ -36,7 +35,6 @@ request.interceptors.request.use(
}else{
config.headers.sign = ''
}
// config.headers.sign = localStorage.getItem('sign')
return config;
},
err => {
......
src/utils/common.js
......@@ -50,6 +50,16 @@ export default {
date >= 10 ? (date = date) : (date = '0' + date); //判断小于10日的情况
return year + '-' + month + '-' + date;
},
getTime2: function(time) {
if (!isNaN(time)) time = Number(time);
var now = new Date(time);
var year = now.getFullYear();
var month = now.getMonth() + 1;
month >= 10 ? (month = month) : (month = '0' + month); //判断小于10月份的情况
var date = now.getDate();
date >= 10 ? (date = date) : (date = '0' + date); //判断小于10日的情况
return year + '.' + month + '.' + date;
},
// 时间戳转换成时分秒
getSeconds: function(time) {
if (!isNaN(time)) time = Number(time);
......
src/views/goods/coupon/coupon.vue
......@@ -16,7 +16,7 @@
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-input v-model="searchValue" placeholder="请输入优惠券名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
<el-input v-model.trim="searchValue" placeholder="请输入优惠券名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<div class="search-item">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getListCurr">
......@@ -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" @blur="value => limitSort(value, scope.row)" 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,
......@@ -189,6 +201,9 @@ export default {
this.getList();
},
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' }, '')])]);
},
//跳转到兑换记录
goRecord(item) {
this.$router.push({ name: 'couponExchange', query: { integralMallProId: item.integralMallProId } });
......@@ -381,6 +396,43 @@ 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;
},
limitSort(value, item) {
var reg = /^([1-9]\d*|[0]{1,1})$/; //含0正整数
if (!reg.test(item.sort)) {
this.$message.error('序号必须是正整数');
this.$nextTick(() => {
item.sort = 0;
});
return false;
}
},
// 确定编辑序号
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 +480,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/coupon/info.vue
......@@ -103,6 +103,15 @@
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="会员筛选">
<div style="margin-right:24px;">
<vue-gic-people :projectName="projectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" :isAdd="operateType" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn"> </vue-gic-people>
<div class="gic-people--button" v-show="toggleTag">
<el-button size="small" type="primary" @click="getData">确 定</el-button>
<el-button size="small" @click="cancelFilter">取 消</el-button>
</div>
</div>
</el-form-item> -->
<el-form-item label="展现门店" required>
<vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
</el-form-item>
......@@ -201,6 +210,7 @@ export default {
return {
getTimeAll: getInputVal.formatDate,
getTime: getInputVal.getTime,
getTime2: getInputVal.getTime2,
getHours: getInputVal.getHours,
fixedWidth: document.documentElement.clientWidth - 200,
// 卡券数据
......@@ -271,6 +281,18 @@ export default {
costValueStatus: true,
couponCardStock: '', //优惠券库存
couponStatus: false //卡券状态
// 人群筛选器
// // 可传参数
// // projectName: 'integral-mall', // 当前项目名
// getSaveData: '',
// sceneValue: 'member', // 场景值
// useId: '', // 模板id
// hasSearchData: '', // 当前页回显的数据(接口返回)
// operateType: true, // 编辑的时候是false 新增是true 例如列表筛选是开始true 编辑改成false
// toggleTag: false, // 控制(确认取消)按钮显示的参数,仅供参考,可自行修改
// saveTag: false, // 控制(保存)按钮显示的参数,仅供参考,可自行修改
// searchParams: {}, //查询数据数据
// responseParams: [] //回显的数据
};
},
created() {
......@@ -332,6 +354,20 @@ export default {
//库存
this.couponForm.virtualStock = res.data.result.virtualStock;
this.couponForm.detailDescription = res.data.result.detailDescription; //图文详情
// if (res.data.result.searchParams) {
// this.searchParams = res.data.result.searchParams; //会员筛选
// } else {
// this.searchParams = {};
// }
// if (res.data.result.responseParams) {
// this.responseParams = res.data.result.responseParams;
// } else {
// this.responseParams = [];
// }
// this.useId = res.data.result.integralMallProId;
this.hasSearchData = res.data.result.searchParams;
//适用会员
if (res.data.result.memberGrade) {
this.couponForm.memberGrade = res.data.result.memberGrade.split(',');
......@@ -432,8 +468,8 @@ export default {
if (this.cardList) {
this.couponForm.cardType = this.cardList[0].cardType;
for (let item of this.cardList) {
item.beginDate = this.getTimeAll(item.beginDate);
item.endDate = this.getTimeAll(item.endDate);
item.beginDate = this.getTime2(item.beginDate);
item.endDate = this.getTime2(item.endDate);
}
}
if (res.data.result.status === 0) {
......@@ -656,7 +692,10 @@ export default {
giftImageUrls.push(item.imageUrl);
giftImageFiledCodes.push(item.imageCode);
}
// if (this.toggleTag && !this.getSaveData) {
// this.$message.error('请选中人群筛选器的数据');
// return false;
// }
this.$refs[couponForm].validate(valid => {
if (valid) {
let params = {
......@@ -685,6 +724,8 @@ export default {
proShowStatus: this.couponForm.proShowStatus, //显示状态
releaseType: this.couponForm.releaseType, //上架状态
limitTimeBegin: this.couponForm.releaseType === 2 ? this.getTimeAll(this.couponForm.limitTimeBegin) : '' //定时上架时间
// searchParams: JSON.stringify(this.searchParams) === '{}' ? null : this.searchParams, //会员筛选
// responseParams: this.responseParams.length ? this.responseParams : null
};
// 门店分类
if (this.sendChildData.storeType === 1) {
......@@ -734,6 +775,50 @@ export default {
name: 'coupon'
});
}
// //人群筛选器使用的方法
// // 父组件调用子组件方法,触发父组件事件
// getData() {
// var that = this;
// that.$refs.peopleFilter.confirmSet();
// // that.usePeopleFilter = true;
// },
// // 子组件触发父组件事件,返回过滤条件数据
// findFilter(value) {
// // var that = this;
// this.searchParams = value;
// },
// // 取消
// cancelFilter() {
// var that = this;
// that.$refs.peopleFilter.cancelSet();
// },
// // 获取需要回显的数据, 供保存时候使用
// getBackData(val) {
// this.responseParams = val;
// this.getSaveData = val;
// },
// // 显示编辑,保存按钮隐藏,确认按钮显示 (子组件会调用)
// editShow() {
// var that = this;
// that.toggleTag = true;
// that.saveTag = false;
// },
// // 显示保存按钮,隐藏确认按钮显示 (子组件会调用)
// editHide() {
// var that = this;
// that.toggleTag = false;
// that.saveTag = true;
// },
// // 隐藏保存按钮和确认按钮 (子组件会调用)
// // 传个参数给父组件 来查数据
// hideBtn(refresh) {
// if (refresh === 0) {
// this.memberSearchStr = -1;
// this.toggleTag = false;
// // 查数据的方法
// // this.getList();
// }
// }
},
components: {
tinymceEdit
......@@ -897,4 +982,20 @@ export default {
height: 104px;
line-height: 104px;
}
.upload-list-box .el-upload--picture-card {
width: 104px;
height: 104px;
line-height: 104px;
}
.select-shop__right {
line-height: 28px !important;
}
.section-tip-content .el-form-item__label {
text-align: left !important;
}
/* 人群筛选器
.gic-people--button {
background: #f2f3f4;
padding: 0 0 20px 124px;
} */
</style>
src/views/goods/gift/addSku.vue
......@@ -79,7 +79,7 @@
<td v-for="(item2, index2) in item1" :key="index2" style="width:120px" v-if="item1.length - index2 > 1">
<!-- {{ item1[7] }} -->
<span v-if="item1.length - index2 < 7">
<el-input size="small" v-model="item2.valueName" @blur="skuInput(item1, item2, index1, index2)" @input="setSkuValueName"> </el-input>
<el-input size="small" v-model.trim="item2.valueName" @blur="skuInput(item1, item2, index1, index2)" @input="setSkuValueName"> </el-input>
</span>
<!-- <span v-else-if="item1.length === index2 + 1" style="color:red">{{ item2.valueName ? item2.valueName : '' }}</span> -->
......
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="" />
......@@ -87,11 +87,11 @@
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" sortable="custom" min-width="140px" :render-header="renderHeader">
<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="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" @blur="value => limitSort(value, scope.row)" style="width:60px"></el-input>
<span class="operate-span" @click="editNumSubmit(scope.row)">确定</span>
<span class="operate-span" @click="editNumCancel(scope.row)">取消</span>
</div>
......@@ -224,7 +224,7 @@ export default {
this.pageSize = this.giftListObj.pageSize;
this.total = this.giftListObj.total;
this.shelf = this.giftListObj.shelf;
this.searchValue = this.giftListObj.searchValue;
this.searchValue = this.giftListObj.searchValue.trim();
this.giftType = this.giftListObj.giftType;
this.sortType = this.giftListObj.sortType;
this.sortColumn = this.giftListObj.sortColumn;
......@@ -255,7 +255,7 @@ export default {
pageSize: this.pageSize,
sortType: this.sortType,
sortColumn: this.sortColumn,
giftName: this.searchValue,
giftName: this.searchValue.trim(),
giftType: this.giftType ? this.giftType : -1,
shelf: this.shelf ? this.shelf : -1, //上架状态
goodsType: this.goodsType //商品类型
......@@ -476,7 +476,7 @@ export default {
total: this.total,
shelf: this.shelf,
giftType: this.giftType,
searchValue: this.searchValue,
searchValue: this.searchValue.trim(),
sortType: this.sortType,
sortColumn: this.sortColumn
};
......@@ -488,6 +488,16 @@ export default {
item.editStatus = true;
this.refash = !this.refash;
},
limitSort(value, item) {
var reg = /^([1-9]\d*|[0]{1,1})$/; //含0正整数
if (!reg.test(item.sort)) {
this.$message.error('序号必须是正整数');
this.$nextTick(() => {
item.sort = 0;
});
return false;
}
},
// 确定编辑序号
editNumSubmit(item) {
let params = {
......@@ -660,7 +670,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/order/couponExchange.vue
......@@ -27,7 +27,7 @@
</el-select>
</div> -->
<div class="search-item">
<el-input v-model="searchValue" style="width:260px;" placeholder="请输入会员/卡券/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input v-model.trim="searchValue" style="width:260px;" placeholder="请输入会员/卡券/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
</div>
</div>
<div class="fr">
......@@ -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,7 @@
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态">
<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,12 +24,12 @@
<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>
<div class="search-item">
<el-input style="width:260px;" v-model="searchValue" placeholder="请输入会员/商品/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input style="width:260px;" v-model.trim="searchValue" placeholder="请输入会员/商品/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
</div>
</div>
<div class="fr">
......@@ -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.refundStatusNowLog === 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.refundStatusNowLog === 1">退款成功</p>
<p style="line-height:18px" v-else-if="scope.row.refundStatusNowLog === 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/orderDetail.vue
......@@ -209,10 +209,10 @@
</td>
<td>{{ orderDetail.goodsNum }}</td>
<td>
<span v-if="orderDetail.refundStatus === 0">退款中</span>
<span v-else-if="orderDetail.refundStatus === 1">退款成功</span>
<span v-else-if="orderDetail.refundStatus === 2">退款关闭</span>
<span v-else-if="orderDetail.refundStatus === -1">--</span>
<span v-if="orderDetail.refundStatusNowLog === 0">退款中</span>
<span v-else-if="orderDetail.refundStatusNowLog === 1">退款成功</span>
<span v-else-if="orderDetail.refundStatusNowLog === 2">退款关闭</span>
<!-- <span v-else-if="orderDetail.refundStatusNowLog === -1">--</span> -->
</td>
<td>
<div>￥{{ orderDetail.cashShouldPay }}</div>
......
src/views/order/refundList.vue
......@@ -27,7 +27,7 @@
</el-select>
</div>
<div class="search-item">
<el-input class="w-340" v-model="searchValue" placeholder="请输入商品/会员/订单/退款编号进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input class="w-340" v-model.trim="searchValue" placeholder="请输入商品/会员/订单/退款编号进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
</div>
</div>
</div>
......@@ -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
......@@ -13,11 +13,23 @@
</h3>
</div>
<div class="section">
<div class="header-top">
<span>门店自提</span>
<el-switch v-model="pickStatus" @change="changeStatus"> </el-switch>
<div style="border-bottom:1px solid #dcdfe6;padding:24px;">
<div class="header-top" style="display:inline-block;margin-right:30px;padding:12px 0px">
<span style="width:80px;">门店自提 </span>
<el-switch v-model="pickStatus" @change="changeStatus"> </el-switch>
</div>
<div class="header-top" v-show="pickStatus" style="display:inline-block;background:#F0F2F5;padding:12px 20px">
<span
>会员自助核销
<el-tooltip effect="dark" content="如开启会员自助核销，则会员可在到门店后，在小程序端输入导购代码进行提货核销；但不建议此方式！！推荐导购直接使用好办APP（2.0版本）进行扫码核销。" 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>
<div v-show="pickStatus">
<div v-show="pickStatus" style="padding:24px;">
<div class="operate-top">
<div class="fl">
<div class="search-item">
......@@ -91,6 +103,7 @@ export default {
pageSize: 20,
total: 2,
pickStatus: true, //自提状态
cancelStatus: false, //核销状态
loading: false,
selectList: [], //复选框选中的数据
tableDate: [],
......@@ -149,6 +162,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 +181,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);
}
});
......@@ -231,13 +265,13 @@ export default {
.section {
background: #fff;
margin: 24px;
padding: 24px;
/* padding: 24px; */
}
.header-top {
margin: 15px 0 22px 0;
/* 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