Skip to content

I
integral-mall
Commit 804c1dba by 萱草
Options

是否退款和版本校验

parent 3ce7bfaa
Showing with 89 additions and 41 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.1c5b4fed695ae4df7eeea0601a801e7d.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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.125012b55087ce7a4283.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.b5028744881a3e118726d742e0c9999a.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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.87bf44939b69c120ea68.js></script></body></html>
\ No newline at end of file
dist/static/css/app.b5028744881a3e118726d742e0c9999a.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.87bf44939b69c120ea68.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/eqCode.vue
......@@ -32,17 +32,27 @@ export default {
default() {
return '';
}
},
saleType: {
type: String,
default() {
return '';
}
}
},
data() {
return {
// loading:true,
forceIntegralMallProId: ''
forceIntegralMallProId: '',
forceType: ''
};
},
watch: {
integralMallProId: function(value) {
this.forceIntegralMallProId = value;
},
saleType: function(value) {
this.forceType = value;
}
},
methods: {
......@@ -53,9 +63,10 @@ export default {
this.$message.error('复制失败');
},
force() {
console.log(this.forceType);
let params = {
integralMallProId: this.forceIntegralMallProId,
type: 'gift',
type: this.forceType,
isForce: '1'
};
this.modalData.show = true;
......
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" :integralMallProId="integralMallProId"></eqCode>
<eqCode :modalData="modalData" :integralMallProId="integralMallProId" :saleType="saleType"></eqCode>
<!-- 调整积分费用 -->
<editInfo :editInfoModal="editInfoModal" @getList="getList"></editInfo>
<!-- <stockModal :intergralModal="intergralModal" @getList="getList"></stockModal> -->
......@@ -206,7 +220,8 @@ export default {
packageData: {
integralMallProId: ''
},
integralMallProId: ''
integralMallProId: '',
saleType: ''
};
},
created() {
......@@ -303,6 +318,7 @@ 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/gift/gift.vue
......@@ -170,7 +170,7 @@
<!-- 修改礼品名称 -->
<editName :editInfoModal="editInfoModal" @getList="getList"></editName>
<!-- 推广 -->
<eqCode :modalData="modalData" :integralMallProId="integralMallProId"></eqCode>
<eqCode :modalData="modalData" :integralMallProId="integralMallProId" :saleType="saleType"></eqCode>
<!-- 新增礼品 -->
<selectType :addModalData="addModalData"></selectType>
<!-- 调整积分费用 -->
......@@ -249,7 +249,8 @@ export default {
couponListSearch: '',
couponCurrentPage: 1,
couponPageSize: 20,
integralMallProId: ''
integralMallProId: '',
saleType: ''
};
},
created() {
......@@ -362,6 +363,7 @@ export default {
getLink(item) {
this.modalData.loading = true;
this.integralMallProId = item.integralMallProId;
this.saleType = 'gift';
let params = {
integralMallProId: item.integralMallProId,
type: 'gift'
......
src/views/goods/gift/info.vue
......@@ -248,7 +248,7 @@
</el-tooltip>
</el-radio>
<el-radio :label="1" v-if="giftForm.changeType === 1">微信兑换券</el-radio>
<el-radio :label="5" v-if="giftForm.changeType !== 1">
<el-radio :label="5" v-if="giftForm.changeType !== 1" @change="textCode">
文本券码
<el-tooltip effect="dark" content="上架虚拟商品时，若选择文本券码，则可预先上传券码等信息，买家下单后，系统会自动将券码发给买家并完成交易，无需商户在后台点击发货。" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
......@@ -388,7 +388,7 @@ export default {
proShowStatus: 1, //显示状态
releaseType: 1, //上架时间
limitTimeBegin: '', //上架时间具体
changeType: 5, //配送方式T
changeType: 0, //配送方式T
pickUpPointType: 1,
pickUpPoint: [],
changeTypeList: [], //配东方式
......@@ -542,9 +542,9 @@ export default {
this.giftForm.changeType = 2;
} else if (this.giftType === 0) {
//虚拟
this.giftForm.changeType = 5;
this.stockDisabled = this.giftForm.changeType === 5 ? true : false;
this.refundTypeStatus = this.giftForm.changeType === 5 ? true : false;
// this.giftForm.changeType = 5;
// this.stockDisabled = this.giftForm.changeType === 5 ? true : false;
// this.refundTypeStatus = this.giftForm.changeType === 5 ? true : false;
}
if (this.giftId !== '-1') {
// setTimeout(() => {
......@@ -1300,19 +1300,19 @@ export default {
this.giftForm.pickUpPointType = 1;
}
let code = {
integralRefund:true
}
request.get('api-integral-mall/check-function-version',qs.stringify(code)).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if(res.data.result.now !== ''){
this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
}else{
this.$message.error('该商户未开通小程序功能');
}
integralRefund: true
};
request.get('api-integral-mall/check-function-version', qs.stringify(code)).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if (res.data.result.now !== '') {
this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
} else {
this.$message.error('该商户未开通小程序功能');
}
}
});
}
});
// if (this.giftForm.changeTypeList.length) {
// if (this.giftForm.changeTypeList[0] === '4') {
// request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
......@@ -1333,6 +1333,22 @@ export default {
// }
// }
},
textCode(){
let code = {
textCode: true
};
request.get('api-integral-mall/check-function-version', qs.stringify(code)).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if (res.data.result.now !== '') {
this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
} else {
this.$message.error('该商户未开通小程序功能');
}
}
}
});
},
afterSale() {
let code = {
pickUpPoint: true
......
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: {
......
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