Skip to content

I
integral-mall
Commit 53ec3101 by wangyusheng
Options

build

parents cc15d2e1 a9b3bbb7
Showing with 446 additions and 169 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.4b2628a0607e02bb3695e4be2ada387e.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.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/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.451aecb7500fefa94ef3.js></script><script type=text/javascript src=./static/js/app.16a983c2e75c1fa4706b.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.b12cff848a899ff2b6d60d23af0a1e86.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.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/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.4809b2320b3f3d3aa326.js></script><script type=text/javascript src=./static/js/app.3e73018e924e49c48bae.js></script></body></html>
\ No newline at end of file
dist/static/css/app.4b2628a0607e02bb3695e4be2ada387e.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.b12cff848a899ff2b6d60d23af0a1e86.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.16a983c2e75c1fa4706b.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.3e73018e924e49c48bae.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.451aecb7500fefa94ef3.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/vendor.4809b2320b3f3d3aa326.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -7,6 +7,14 @@
<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>
<!-- GrowingIO Analytics code version 2.1 -->
<!-- Copyright 2015-2018 GrowingIO, Inc. More info available at http://www.growingio.com -->
<!-- <script type='text/javascript'>
!function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
gio('init','8be12240a3749eab', {});
gio('send');
</script> -->
<!-- End GrowingIO Analytics code version: 2.1 -->
</head>
<body>
<div id="app"></div>
......@@ -23,7 +31,7 @@
<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.06.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.18.js"></script>
......
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -56,6 +56,7 @@
"friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1",
"node-notifier": "^5.1.2",
"node-sass": "^4.12.0",
"onchange": "^5.2.0",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
......@@ -65,6 +66,7 @@
"postcss-url": "^7.2.1",
"prettier": "^1.16.4",
"rimraf": "^2.6.0",
"sass-loader": "^8.0.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^1.1.1",
......
src/components/eqCode.vue
......@@ -4,38 +4,81 @@
<div class="wechat-url" style="margin-bottom:30px;">
<p style="font-weight: 600;margin-bottom:15px">页面链接</p>
<div style="display:flex;align-items: center">
<el-input type="textarea" :rows="2" v-model="modalData.pageUrl" disabled> </el-input>
<a href="javaScript:void(0)" style="width:40px;margin-left:20px" v-clipboard:copy="modalData.pageUrl" v-clipboard:success="onCopy" v-clipboard:error="onError">
复制
</a>
<el-input type="textarea" :rows="2" v-model="modalData.pageUrl" disabled></el-input>
<a href="javaScript:void(0)" style="width:40px;margin-left:20px" v-clipboard:copy="modalData.pageUrl" v-clipboard:success="onCopy" v-clipboard:error="onError">复制</a>
</div>
</div>
<div class="wechat-img-box" v-loading="modalData.loading">
<p style="font-weight: 600;margin-bottom:15px">小程序二维码</p>
<img :src="modalData.imgUrl" class="wechat-img" style="width:140px;height:140px;" />
</div>
<div class="wechat-force">
<el-button type="primary" @click="force">重新生成</el-button>
</div>
</div>
</el-dialog>
</template>
<script>
// import request from '../../../service/request.js';
import request from '../service/request';
export default {
props: {
modalData: {
type: Object
},
integralMallProId: {
type: String,
default() {
return '';
}
},
saleType: {
type: String,
default() {
return '';
}
}
},
data() {
return {
// loading:true,
forceIntegralMallProId: '',
forceType: ''
};
},
watch: {
integralMallProId: function(value) {
this.forceIntegralMallProId = value;
},
saleType: function(value) {
this.forceType = value;
}
},
methods: {
onCopy(e) {
this.$message.success('复制成功');
},
onError(e) {
this.$message.error('复制失败');
},
force() {
let params = {
integralMallProId: this.forceIntegralMallProId,
type: this.forceType,
isForce: '1'
};
this.modalData.show = true;
request.get('/api-integral-mall/get-qRCode', { params }).then(res => {
if (res.data.errorCode === 0) {
this.modalData.show = true;
this.modalData.pageUrl = res.data.result.page;
this.modalData.imgUrl = res.data.result.url;
this.modalData.loading = false;
} else {
this.$message.error(res.data.message);
}
});
}
}
};
......@@ -49,4 +92,16 @@ export default {
width: 200px;
height: 200px;
}
.wechat-force {
margin: 30px auto 50px;
text-align: center;
}
/* .force-button {
background: #1890ff;
color: #fff;
border-color: #1890ff;
font-size: 14px;
line-height: 14px;
padding: 8px 15px;
} */
</style>
src/components/store/store-group.vue
......@@ -190,14 +190,8 @@ export default {
removeSelect(item, index) {
// item.disabled = false;
// this.$set(this.leftList, 'item', false);
this.selectRightList.splice(
copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId),
1
);
this.selectLeftList.splice(
this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId),
1
);
this.selectRightList.splice(copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId), 1);
this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId), 1);
this.selectIdList = [];
for (let item of this.selectLeftList) {
this.selectIdList.push(item.storeGroupId);
......
src/components/store/store-part.vue
......@@ -185,10 +185,7 @@ export default {
// 移除
removeItem(item, index) {
this.selectRightList.splice(index, 1);
this.selectLeftList.splice(
this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId),
1
);
this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId), 1);
//取消表格选中数据
let obj = this.tableData.find(i => {
return i.integralMallPickUpPointId === item.integralMallPickUpPointId;
......
src/config/index.js 0 → 100644
export default {
// eslint-disable-next-line
api: process.env['NODE_ENV'] === 'development' ? 'http://gicdev.demogic.com/' : window.location.protocol + '//' + window.location.host + '/' || ''
// /dmApi/
// http://gicdev.demogic.com/
};
src/main.js
......@@ -13,6 +13,7 @@ import store from './store';
import 'element-ui/lib/theme-chalk/index.css';
import './assets/theme/index.css';
import '../static/fonts/iconfont.js';
import limit from '@/utils/limiting';
Vue.use(ElementUI);
Vue.use(VueAxios, axios);
// import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage';
......@@ -21,10 +22,23 @@ Vue.use(VueAxios, axios);
Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
Vue.config.productionTip = false;
/* eslint-disable no-new */
new Vue({
el: '#app',
router,
store,
components: { App },
template: '<App/>'
/* eslint-disable no-new */
limit({
createApp() {
new Vue({
el: '#app',
router,
store,
components: { App },
template: '<App/>'
});
}
});
// new Vue({
// el: '#app',
// router,
// store,
// components: { App },
// template: '<App/>'
// });
src/router/index.js
import Vue from 'vue';
import Router from 'vue-router';
// import store from '@/store/index';
// import bus from '../assets/eventBus.js';
import VueClipboard from 'vue-clipboard2';
import main from '../views/main';
import gift from '../views/goods/gift/gift';
......@@ -16,6 +18,9 @@ import recordList from '../views/setting/recordList';
import convenSet from '../views/setting/convenSet';
Vue.use(VueClipboard);
/**
* meta useMenuLimit 被上标记为true的路由，进入时将会与store中允许的菜单路由进行比较，如果不存在将会被重定向
*/
const router = new Router({
routes: [
{
......@@ -26,7 +31,10 @@ const router = new Router({
{
path: '/gift',
name: 'gift',
component: gift
component: gift,
meta: {
useMenuLimit: true
}
},
{
path: '/giftInfo',
......@@ -36,7 +44,10 @@ const router = new Router({
{
path: '/coupon',
name: 'coupon',
component: coupon
component: coupon,
meta: {
useMenuLimit: true
}
},
{
path: '/couponInfo',
......@@ -46,7 +57,10 @@ const router = new Router({
{
path: '/giftExchange',
name: 'giftExchange',
component: giftExchange
component: giftExchange,
meta: {
useMenuLimit: true
}
},
{
path: '/orderDetail',
......@@ -56,17 +70,26 @@ const router = new Router({
{
path: '/couponExchange',
name: 'couponExchange',
component: couponExchange
component: couponExchange,
meta: {
useMenuLimit: true
}
},
{
path: '/refundList',
name: 'refundList',
component: refundList
component: refundList,
meta: {
useMenuLimit: true
}
},
{
path: '/deliverSet',
name: 'deliverSet',
component: deliverSet
component: deliverSet,
meta: {
useMenuLimit: true
}
},
{
path: '/editDeliver',
......@@ -76,21 +99,37 @@ const router = new Router({
{
path: '/recordList',
name: 'recordList',
component: recordList
component: recordList,
meta: {
useMenuLimit: true
}
},
{
path: '/convenSet',
name: 'convenSet',
component: convenSet
component: convenSet,
meta: {
useMenuLimit: true
}
}
]
}
]
});
// router.beforeEach((to, from, next) => {
// // ...
// console.log(123456789, to);
// next();
// if (to.meta.useMenuLimit == true) {
// if (store.state.product.canUseMenuUrl.includes(to.path)) {
// next();
// } else {
// // 不允许访问则重置到menu的第一个路由
// // 全部不选（没有积分商城任何菜单时，limit.js catch
// bus.$emit('updateLeft', store.state.product.canUseMenuUrl[0]); // 更新左侧
// next(store.state.product.canUseMenuUrl[0]);
// }
// } else {
// next();
// }
// });
export default router;
src/service/request.js
......@@ -6,8 +6,9 @@ import router from '../router';
// axios 配置
// axios.defaults.timeout = 5000;
// let adminUrl = 'http://gicdev.demogic.com'
// let adminUrl = process.env.NODE_ENV === 'production' ? '':'http://111.231.99.90:8880/app/mock/19'
// let adminUrl = process.env.NODE_ENV === 'production' ? '':'localhost:8080/'
let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://gicdev.demogic.com';
let request;
request = axios.create({
......@@ -48,7 +49,6 @@ request.interceptors.response.use(
if (response.status == 200 && response.data.errorCode === 401) {
window.location.href = window.location.origin + '/gic-web';
// window.location.href = 'http://gicdev.com/gic-web'
}
return response;
......
src/store/vuex/product.js
......@@ -2,7 +2,8 @@
const state = {
all: 0,
cartData: [],
total: 0
total: 0,
canUseMenuUrl: []
};
// getters
......@@ -53,6 +54,10 @@ const mutations = {
state.cartData.splice(i, 1);
}
}
},
// 更新可用菜单可用url
mutations_updateMenuUrl(state, url) {
state.canUseMenuUrl = url;
}
};
......
src/utils/limiting.js 0 → 100644
// import request from '@/service/request.js';
// import globalConfig from '@/config/index';
// import store from '@/store/index';
export default config => {
const { createApp } = config;
createApp();
// window.onload = async function() {
// try {
// let path = window.location.hash.split('/')[1];
// path = path.indexOf('?') !== -1 ? path.substring(0, path.indexOf('?')) : path;
// // 获取用户菜单信息
// let loginUserRes = await request.get(`/api-auth/get-current-memu-data?project=integral-mall&path=${path}&requestProject=integral-mall`);
// const leftMenu = loginUserRes.data.result.leftMenu || [];
// let _leftMenuLimit = [];
// leftMenu.forEach(element => {
// if (element.level4List) {
// element.level4List.forEach(level4 => {
// _leftMenuLimit.push(`/${level4.menuUrl}`);
// });
// } else {
// _leftMenuLimit.push(`/${element.menuUrl}`);
// }
// });
// _leftMenuLimit = [...new Set(_leftMenuLimit)];
// store.commit('mutations_updateMenuUrl', _leftMenuLimit); // 更新菜单url
// createApp();
// } catch (error) {
// // 未登录
// window.location.href = globalConfig.api + 'gic-web/';
// }
// };
};
src/views/goods/coupon/coupon.vue
......@@ -3,7 +3,9 @@
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item>优惠券</el-breadcrumb-item>
......@@ -16,7 +18,7 @@
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-input v-model.trim="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">
......@@ -41,7 +43,7 @@
</div>
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50" :selectable="selectInit"> </el-table-column>
<el-table-column type="selection" width="50" :selectable="selectInit"></el-table-column>
<el-table-column label="礼品信息" min-width="260px">
<template slot-scope="scope">
<div class="gift-info">
......@@ -52,11 +54,11 @@
<p style="display:inline-block" v-if="scope.row.cardType === 0">
<img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" alt="" />
<img v-else src="../../../../static/img/quan01.png" alt="" />
</p> -->
<img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" alt="" />
<img v-if="scope.row.cardType === 2 && !scope.row.mainImageUrl" src="../../../../static/img/quan02.png" alt="" />
<img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt="" />
<img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt="" />
</p>-->
<img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" alt />
<img v-if="scope.row.cardType === 2 && !scope.row.mainImageUrl" src="../../../../static/img/quan02.png" alt />
<img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt />
<img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
......@@ -68,17 +70,26 @@
<el-table-column prop="integralCost" label="积分费用" sortable="custom" min-width="110px">
<template slot-scope="scope">
<!-- <editInfo :popoverType='1' :popoverNum="scope.row.integralCost"><editInfo> -->
<p class="intergral-edit">{{ scope.row.integralCost }}积分<i class="el-icon-edit" @click="updataCash(scope.row)" v-if="scope.row.canEdit"></i></p>
<p class="intergral-edit">
{{ scope.row.integralCost }}积分
<i class="el-icon-edit" @click="updataCash(scope.row)" v-if="scope.row.canEdit"></i>
</p>
</template>
</el-table-column>
<el-table-column prop="cashCost" label="现金费用" sortable="custom" min-width="110px">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.cashCost }}元<i class="el-icon-edit" @click="updataCash(scope.row)" v-if="scope.row.canEdit"></i></p>
<p class="intergral-edit">
{{ scope.row.cashCost }}元
<i class="el-icon-edit" @click="updataCash(scope.row)" v-if="scope.row.canEdit"></i>
</p>
</template>
</el-table-column>
<el-table-column prop="sortCost" label="库存" sortable="custom">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.virtualStock }}<i class="el-icon-edit" @click="handleTable(scope.row, 3)" v-if="scope.row.canEdit"></i></p>
<p class="intergral-edit">
{{ scope.row.virtualStock }}
<i class="el-icon-edit" @click="handleTable(scope.row, 3)" v-if="scope.row.canEdit"></i>
</p>
</template>
</el-table-column>
<el-table-column prop="sortTimes" label="兑换次数" sortable="custom" min-width="110px">
......@@ -98,9 +109,12 @@
</el-table-column>
<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)" v-if="scope.row.canEdit"></i></p>
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">
{{ scope.row.sort }}
<i class="el-icon-edit" @click="editNumber(scope.row)" v-if="scope.row.canEdit"></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>
<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>
......@@ -124,7 +138,7 @@
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text" v-if="scope.row.canEdit">删除</el-button>
</el-popover> -->
</el-popover>-->
</div>
</template>
</el-table-column>
......@@ -139,7 +153,7 @@
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<dm-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </dm-pagination>
<dm-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</div>
</div>
</div>
......@@ -147,7 +161,7 @@
</div>
<!-- 推广 -->
<eqCode :modalData="modalData"></eqCode>
<eqCode :modalData="modalData" :integralMallProId="integralMallProId" :saleType="saleType"></eqCode>
<!-- 调整积分费用 -->
<editInfo :editInfoModal="editInfoModal" @getList="getList"></editInfo>
<!-- <stockModal :intergralModal="intergralModal" @getList="getList"></stockModal> -->
......@@ -205,7 +219,9 @@ export default {
packageDialog: false,
packageData: {
integralMallProId: ''
}
},
integralMallProId: '',
saleType: ''
};
},
created() {
......@@ -301,6 +317,8 @@ export default {
// 商品链接
getLink(item) {
this.modalData.loading = true;
this.integralMallProId = item.integralMallProId;
this.saleType = 'card';
let params = {
integralMallProId: item.integralMallProId,
type: 'card'
......
src/views/goods/coupon/info.vue
......@@ -34,7 +34,9 @@
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope"> {{ scope.row.cardLimit }}张/人 </template>
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
</template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">
......@@ -344,10 +346,7 @@ export default {
couponRules: {
integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }],
cashCost: [{ required: true, message: '请输入现金费用', trigger: 'blur' }],
virtualStock: [
{ required: true, message: '请输入库存', trigger: 'blur' },
{ validator: stockValidator, trigger: 'blur' }
],
virtualStock: [{ required: true, message: '请输入库存', trigger: 'blur' }, { validator: stockValidator, trigger: 'blur' }],
gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],
......@@ -891,7 +890,7 @@ export default {
return arr;
},
// 提交数据
submitForm(couponForm) {
async submitForm(couponForm) {
this.couponForm.detailDescription = this.$refs.tinymceWrap.tinymceHtml;
let proReferIdArr = [];
if (this.cardList.length === 0) {
......@@ -927,6 +926,13 @@ export default {
return false;
}
}
if (this.useNewStoreWidget === 1) {
let data = await this.$refs.storeCard.getRightList();
if (!data.length) {
this.$message.error('请选择展示门店');
return;
}
}
if (this.cardList.length > 1) {
if (this.couponForm.images.length === 0) {
this.$message.error('券包上传商品主图');
......
src/views/goods/coupon/testStore.vue 0 → 100644
<template>
<div class="mall-section-container">
<pickUp-store :pickUpPointType="pickUpPointType" :selectData="selectData" @getArr="getArr"></pickUp-store>
</div>
</template>
<script>
import pickUpStore from '../../../components/store/store';
export default {
data() {
return {
pickUpPointType: 0,
selectData: []
// 门店区域数据测试
// selectData: [
// {
// id: '320000',
// label: '江苏省'
// },
// {
// id: '620800',
// label: '平凉市'
// }
// ]
// 门店分组数据测试
// selectData: [
// {
// storeGroupId: 'ff80808161c24e8c0161c6b043b00010',
// storeGroupName: '杭州2'
// },
// {
// storeGroupId: 'ff80808165ea5e530165ebedbd9c0072',
// storeGroupName: '长沙萨达萨'
// }
// ]
// 自提点数据
// selectData: [
// {
// integralMallPickUpPointId: 'ff808081720d8e2801721206883f0f54',
// pickUpPointName: '测试门店2592845'
// },
// {
// integralMallPickUpPointId: 'ff808081720d8e280172120688380e41',
// pickUpPointName: '测试门店8674606'
// }
// ]
};
},
methods: {
//调用获取数据
getArr(arr, type) {}
},
components: {
pickUpStore
}
};
</script>
<style scoped>
.mall-section-container {
padding: 50px;
background: #fff;
height: 600px;
}
</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.trim="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> -->
......@@ -174,10 +174,28 @@ export default {
},
//添加规格
addSku() {
this.skuJson.push({
standardId: '',
standardName: '',
valueList: [{ valueName: '', valueId: '', propImg: '' }]
let code = 'add-standard';
request.get(`/api-integral-mall/check-function-version?code=${code}`).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if (res.data.result.now !== '') {
// this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
this.$confirm('您当前小程序版本低于功能适用版本，设置在小程序无法正常生效，请进行版本升级', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
});
} else {
this.$message.error('该商户未开通小程序功能');
}
} else {
this.skuJson.push({
standardId: '',
standardName: '',
valueList: [{ valueName: '', valueId: '', propImg: '' }]
});
}
}
});
},
//删除规格
......@@ -350,46 +368,34 @@ export default {
list.push(item.valueList);
}
}
list.push([
{
valueName: '',
valueId: ''
}
]);
list.push([
{
valueName: '',
valueId: ''
}
]);
list.push([
{
valueName: '',
valueId: ''
}
]);
list.push([
{
valueName: '',
valueId: ''
}
]);
list.push([
{
valueName: '',
valueId: ''
}
]);
list.push([
{
valueName: '',
valueId: ''
}
]);
let len = 6;
while (len--) {
list.push([{ valueName: '', valueId: '' }]);
}
} else {
list = [];
}
this.skuList = copy(this.combine(copy(list)));
// 获取有效的valueId转换成xxx-xxx的字符串
const getKey = arr => {
return arr
.filter(i => i.valueId)
.map(i => i.valueId)
.join('-');
};
// 以valueId字符串为唯一标识符的数据原本
let map = (this.skuList || []).reduce((map, el) => {
if (Array.isArray(el)) {
let key = getKey(el);
key && map.set(key, el);
}
return map;
}, new Map());
let skuList = copy(this.combine(copy(list)));
this.skuList = skuList.map(el => {
// 如果新的skuList中的valueId key在数据原本中存在，为保留之前填充的值，需返回旧数据
let key = getKey(el);
return map.get(key) || el;
});
},
// 表格里面的图片上传成功
tableUploadSuccess(response, file, fileList, item2) {
......
src/views/goods/gift/gift.vue
......@@ -3,7 +3,9 @@
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item>礼品</el-breadcrumb-item>
......@@ -15,11 +17,11 @@
<div class="section">
<!-- <div class="page-info">
<h3><i class="el-icon-info"></i>优惠券已支持主图和图文详情，如需再发布以“微信兑换券”来配送的礼品，请直接前往优惠券中设置</h3>
</div> -->
</div>-->
<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="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">
......@@ -56,13 +58,16 @@
</div>
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50" :selectable="selectInit"> </el-table-column>
<el-table-column type="selection" width="50" :selectable="selectInit"></el-table-column>
<el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.mainImageUrl" alt="" />
<img :src="scope.row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis intergral-edit">{{ scope.row.proName }}<i class="el-icon-edit" @click="editProName(scope.row)"></i></p>
<p class="pro-ellipsis intergral-edit">
{{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i>
</p>
<p class="category-ellipsis">编码：{{ scope.row.proCode }}</p>
</div>
</div>
......@@ -70,17 +75,26 @@
</el-table-column>
<el-table-column prop="integralCost" label="积分费用" sortable="custom" min-width="110px">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.integralCost }}积分<i class="el-icon-edit" @click="handleTable(scope.row, 'cash')" v-if="scope.row.canEdit"></i></p>
<p class="intergral-edit">
{{ scope.row.integralCost }}积分
<i class="el-icon-edit" @click="handleTable(scope.row, 'cash')" v-if="scope.row.canEdit"></i>
</p>
</template>
</el-table-column>
<el-table-column prop="cashCost" label="现金费用" sortable="custom" min-width="110px">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.cashCost }}元<i class="el-icon-edit" v-if="scope.row.canEdit" @click="handleTable(scope.row, 'cash')"></i></p>
<p class="intergral-edit">
{{ scope.row.cashCost }}元
<i class="el-icon-edit" v-if="scope.row.canEdit" @click="handleTable(scope.row, 'cash')"></i>
</p>
</template>
</el-table-column>
<el-table-column prop="sortCost" label="库存" sortable="custom">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.virtualStock }}<i class="el-icon-edit" v-if="scope.row.giftType === 1 && scope.row.canEdit" @click="handleTable(scope.row, 'stock')"></i></p>
<p class="intergral-edit">
{{ scope.row.virtualStock }}
<i class="el-icon-edit" v-if="scope.row.giftType === 1 && scope.row.canEdit" @click="handleTable(scope.row, 'stock')"></i>
</p>
</template>
</el-table-column>
<el-table-column prop="sortTimes" label="兑换次数" sortable="custom" min-width="110px">
......@@ -102,9 +116,12 @@
</el-table-column>
<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" v-if="scope.row.canEdit" @click="editNumber(scope.row)"></i></p>
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">
{{ scope.row.sort }}
<i class="el-icon-edit" v-if="scope.row.canEdit" @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>
<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>
......@@ -129,7 +146,7 @@
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text" v-if="scope.row.canEdit">删除</el-button>
</el-popover> -->
</el-popover>-->
</div>
</template>
</el-table-column>
......@@ -144,7 +161,7 @@
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<dm-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </dm-pagination>
<dm-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</div>
</div>
</div>
......@@ -153,7 +170,7 @@
<!-- 修改礼品名称 -->
<editName :editInfoModal="editInfoModal" @getList="getList"></editName>
<!-- 推广 -->
<eqCode :modalData="modalData"></eqCode>
<eqCode :modalData="modalData" :integralMallProId="integralMallProId" :saleType="saleType"></eqCode>
<!-- 新增礼品 -->
<selectType :addModalData="addModalData"></selectType>
<!-- 调整积分费用 -->
......@@ -231,7 +248,9 @@ export default {
},
couponListSearch: '',
couponCurrentPage: 1,
couponPageSize: 20
couponPageSize: 20,
integralMallProId: '',
saleType: ''
};
},
created() {
......@@ -343,6 +362,8 @@ export default {
// 商品链接
getLink(item) {
this.modalData.loading = true;
this.integralMallProId = item.integralMallProId;
this.saleType = 'gift';
let params = {
integralMallProId: item.integralMallProId,
type: 'gift'
......
src/views/main.vue
......@@ -3,7 +3,7 @@
<vue-gic-header :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-gic-header>
<div class="mall-content-container">
<div class="left-menu">
<vue-gic-aside-menu :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag="collapseFlag" style="display:inline-block;height:100%"></vue-gic-aside-menu>
<vue-gic-aside-menu ref="leftmenu" :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag="collapseFlag" style="display:inline-block;height:100%"></vue-gic-aside-menu>
</div>
<div class="goods-manege-content" :style="{ marginLeft: widthData }">
<div :style="{ minHeight: mallHeight + 'px' }">
......@@ -34,6 +34,10 @@ export default {
bus.$on('widthData', function(widthData) {
that.widthData = widthData;
});
bus.$on('updateLeft', key => {
// 刷新左侧菜单
that.$refs.leftmenu.handleSelect(key);
});
},
computed: {},
methods: {
......
src/views/order/agreeRefund.vue
......@@ -59,14 +59,8 @@ export default {
refundPoint: '',
refundMoney: '',
modalRules: {
refundPoint: [
{ required: true, message: '请输入积分', trigger: 'blur' },
{ validator: refundPointValidator, trigger: 'blur' }
],
refundMoney: [
{ required: true, message: '请输入金额', trigger: 'blur' },
{ validator: refundMoneyValidator, trigger: 'blur' }
]
refundPoint: [{ required: true, message: '请输入积分', trigger: 'blur' }, { validator: refundPointValidator, trigger: 'blur' }],
refundMoney: [{ required: true, message: '请输入金额', trigger: 'blur' }, { validator: refundMoneyValidator, trigger: 'blur' }]
},
submitLoading: false //按钮禁止重复提交
};
......
src/views/order/couponExchange.vue
......@@ -144,7 +144,7 @@
<!-- 关闭订单 -->
<!-- <closeOrder :refunOrderdModal="refunOrderdModal" @getList="getList"></closeOrder> -->
<!-- 导出订单 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName2"></vue-gic-export-excel>
<!-- 导出优惠券所有 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisibleAll" :type="2" :excelUrl="excelUrlAll" :params="paramsAll" :projectName="projectName"></vue-gic-export-excel>
</div>
......@@ -177,6 +177,7 @@ export default {
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()],
// 导出数据控件
projectName: 'integral-mall', // 当前项目名
projectName2: '', // 当前项目名,跳转企业管理下的报表中心需要
dialogVisible: false,
excelUrl: '/api-integral-mall/download-exchange-list-execl', // 下载数据的地址
excelUrlAll: '/api-integral-mall/download-integral-online-excel', //下载数据
......
src/views/order/giftExchange.vue
......@@ -302,9 +302,11 @@ export default {
dialogVisible: false
},
// 导出数据控件
projectName: 'integral-mall', // 当前项目名
// projectName: 'integral-mall', // 当前项目名
projectName: '', // 当前项目名
dialogVisible: false,
excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址
// excelUrl: 'http://gicdev.demogic.com/api-integral-mall/download-integral-online-excel', // 下载数据的地址
params: {}, // 传递的参数
orderInfo: {}, //订单信息
deliverdModal: {
......
src/views/order/orderDetail.vue
......@@ -3,7 +3,9 @@
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/giftExchange' }">礼品</el-breadcrumb-item>
......@@ -88,17 +90,20 @@
<span>{{ orderDetail.definedCode }}</span>
<el-popover placement="bottom" trigger="hover">
<p>
<span>商户支付号：</span><span>{{ orderDetail.payNumber ? orderDetail.payNumber : '--' }}</span>
<span>商户支付号：</span>
<span>{{ orderDetail.payNumber ? orderDetail.payNumber : '--' }}</span>
</p>
<p>
<span>支付流水号：</span><span>{{ orderDetail.transactionId ? orderDetail.transactionId : '--' }}</span>
<span>支付流水号：</span>
<span>{{ orderDetail.transactionId ? orderDetail.transactionId : '--' }}</span>
</p>
<!-- <el-button slot="reference" type="text" class="iconfont icon-icon-"></el-button> -->
<i slot="reference" class="iconfont icon-icon-"></i>
</el-popover>
</p>
<p class="order-mess-item">
<span>会员名称：</span><span class="order-item-detail-mess">{{ orderDetail.memberName }}</span>
<span>会员名称：</span>
<span class="order-item-detail-mess">{{ orderDetail.memberName }}</span>
</p>
<p class="order-mess-item">
<span>买家卡号：</span>
......@@ -116,34 +121,44 @@
<span v-if="orderDetail.changeType === 5" class="order-item-detail-mess">文本卡券</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType !== 4 && orderDetail.changeType !== 5">
<span>收货信息：</span><span class="order-item-detail-mess">{{ orderDetail.receivingAddress }}</span>
<span>收货信息：</span>
<span class="order-item-detail-mess">{{ orderDetail.receivingAddress }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货人：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPerson }}</span>
<span>提货人：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsPerson }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货手机：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPhone }}</span>
<span>提货手机：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsPhone }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>自提点：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPoint }}</span>
<span>自提点：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsPoint }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货地址：</span><span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
<span>提货地址：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
</p>
<p class="order-mess-item">
<span>买家留言：</span><span class="order-item-detail-mess">{{ orderDetail.buyerRemark ? orderDetail.buyerRemark : '--' }}</span>
<span>买家留言：</span>
<span class="order-item-detail-mess">{{ orderDetail.buyerRemark ? orderDetail.buyerRemark : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货时间：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
<span>提货时间：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>过期时间：</span><span class="order-item-detail-mess">{{ orderDetail.overTime ? getTimeAll(orderDetail.overTime) : '--' }}</span>
<span>过期时间：</span>
<span class="order-item-detail-mess">{{ orderDetail.overTime ? getTimeAll(orderDetail.overTime) : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡号：</span><span class="order-item-detail-mess">{{ orderDetail.cardNumber ? orderDetail.cardNumber : '--' }}</span>
<span>卡号：</span>
<span class="order-item-detail-mess">{{ orderDetail.cardNumber ? orderDetail.cardNumber : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡密/券码：</span><span class="order-item-detail-mess">{{ orderDetail.cardPassWord ? orderDetail.cardPassWord : '--' }}</span>
<span>卡密/券码：</span>
<span class="order-item-detail-mess">{{ orderDetail.cardPassWord ? orderDetail.cardPassWord : '--' }}</span>
</p>
</div>
<div class="order-operate">
......@@ -199,12 +214,12 @@
<tr>
<td>
<div class="order-goods-info">
<img :src="orderDetail.photoUrl" alt="" />
<img :src="orderDetail.photoUrl" alt />
<div class="order-goods-mess">
<p class="goods-name">{{ orderDetail.proName }}</p>
<p v-for="(item, index) in orderDetail.sku" :key="index" class="goods-sku">
<span>{{ item.proName }}</span
>:{{ item.valueName }}
<span>{{ item.proName }}</span>
:{{ item.valueName }}
</p>
<p class="goods-procode">{{ orderDetail.proCode }}</p>
</div>
......@@ -215,10 +230,10 @@
</td>
<td>{{ orderDetail.goodsNum }}</td>
<td>
<span v-if="orderDetail.refundStatusNowLog === 0">退款中</span>
<span v-if="orderDetail.refundStatus === 0">不支持退款</span>
<span v-else-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>
......@@ -235,13 +250,16 @@
<div class="logistics-info" v-if="showLogistics">
<div class="logistics-item">
<p class="logistics-info-item">
<span>快递：</span><span>{{ logisticsInfo.changeLog.logisticsCompanyName }}</span>
<span>快递：</span>
<span>{{ logisticsInfo.changeLog.logisticsCompanyName }}</span>
</p>
<p class="logistics-info-item">
<span>物流单号：</span><span>{{ logisticsInfo.changeLog.courierNumber }}</span>
<span>物流单号：</span>
<span>{{ logisticsInfo.changeLog.courierNumber }}</span>
</p>
<p class="logistics-info-item">
<span>发货时间：</span><span>{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '--' }}</span>
<span>发货时间：</span>
<span>{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '--' }}</span>
</p>
</div>
<div class="logisticsList">
......@@ -273,7 +291,8 @@
<!-- 门店自提核销 -->
<el-dialog title="发货并核销" :visible.sync="shopDialogVisible" width="450px">
<p style="margin-bottom:20px">
请确认买家出示的提货码为：<span style="color:#f5222d">{{ orderDetail.writeOffCode }}</span>
请确认买家出示的提货码为：
<span style="color:#f5222d">{{ orderDetail.writeOffCode }}</span>
</p>
<p style="margin-bottom:20px">确认无误后，将商品交付给买家，确认核销，则订单交易完成</p>
<span slot="footer" class="dialog-footer">
......
src/views/setting/editDeliver.vue
......@@ -277,14 +277,8 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [
{ required: true, message: '请输入时间', trigger: 'blur' },
{ validator: orderTimeHoursValidator, trigger: 'blur' }
],
overTime: [
{ required: true, message: '请输入提货有效期', trigger: 'blur' },
{ validator: overTimeValidator, trigger: 'blur' }
]
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
},
validateTime,
// 门店控件
......
src/views/setting/pickedAuto.vue
......@@ -218,14 +218,8 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [
{ required: true, message: '请输入时间', trigger: 'blur' },
{ validator: orderTimeHoursValidator, trigger: 'blur' }
],
overTime: [
{ required: true, message: '请输入提货有效期', trigger: 'blur' },
{ validator: overTimeValidator, trigger: 'blur' }
]
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
},
submitLoading: false,
clearableBtn: false,
......
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