Skip to content

I
integral-mall
Commit ce5b6d01 by zhangmeng
Options

bug

parent f9d153f2
Showing with 126 additions and 12 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.83e601e6706306d2b179b491198c1e92.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.4eb568c3cf727e0cc117.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="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.234af4485d06afbf75d813066a4bf510.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.242cb35ecfd6a7954be2.js></script></body></html>
\ No newline at end of file
src/views/mall/gift/info.js
......@@ -172,7 +172,11 @@ export default {
this.form.weChatVirtualStock = this.form.virtualStock = result.virtualStock || 0;
// result.showStore = 2;
this.sendChildData.storeType = result.showStore || 0;
this.sendChildData = {
storeType: result.showStore || 0
}
if (result.showStore === 1) {
this.sendChildData.storeGroupIds = result.storeGroupIds || '';
......@@ -193,10 +197,11 @@ export default {
this.$set(this.timeRangeList, i, { timeRange: [arr[0], arr[1]] })
});
}
console.log(this.sendChildData)
this.isLimitTimes = this.form.limitTimes > 0;
console.log(this.form)
this.form.costValue = result.costValue || 0;
console.log(this.form, this.form.costValue, result.costValue)
this.$nextTick(_ => {
debugger;
this.$refs.cardTemp.getCardList();
})
}
......@@ -218,9 +223,11 @@ export default {
},
// 获取卡券组件回调的对象
getCardActiveObjFun(val) {
this.form.weChatVirtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
this.form.costValue = val.costValue;
if (this.isAdd) {
this.form.weChatVirtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
this.form.costValue = val.costValue || 0;
}
},
// 新增兑换时段-部分时段
addTimeRange() {
......@@ -256,7 +263,6 @@ export default {
this.$tips({ type: 'warning', message: '礼品主图不能为空' });
return;
}
let params = {
integralMallProId: this.form.integralMallProId || '',
proType: this.form.changeType === 1 ? 2 : 3, // 商品类型 1 优惠券，2礼品，3实物
......
src/views/mall/goods/list.vue
......@@ -71,10 +71,17 @@
<span v-else>--</span>
</p>
<p>
<!-- 0 取消订单 -->
<el-button type="text" v-if="scope.row.status === 1" @click="cancelOrder(scope.row)">取消订单</el-button>
<!-- 1 在线发货 已发货 详情 -->
<el-button type="text" v-if="scope.row.status === 3 && scope.row.changeType !== 2" @click="queryOrderInfo(scope.row,1)">查看详情</el-button>
<!-- 2 在线发货 取消 详情 -->
<el-button type="text" v-if="scope.row.status === 0 && scope.row.changeType !== 2" @click="queryOrderInfo(scope.row,2)">查看详情</el-button>
<!-- 3 快递发货 取消 详情 -->
<el-button type="text" v-if="scope.row.status === 0 && scope.row.changeType === 2" @click="queryOrderInfo(scope.row,3)">查看详情</el-button>
<!-- 4 快递发货 已发货 查看物流 -->
<el-button type="text" v-if="scope.row.status === 3 && scope.row.changeType === 2" @click="queryExpress(scope.row,false)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 3 && scope.row.changeType !== 2" @click="queryExpress(scope.row,true)">查看详情</el-button>
<el-button type="text" v-if="scope.row.status === 0" @click="queryExpress(scope.row,true)">查看详情</el-button>
</p>
</template>
</el-table-column>
......@@ -82,6 +89,8 @@
<el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<express :show.sync="expressShow" :id="expressId" :isInfo="isInfo"></express>
<sendGoods :show.sync="sendGoodsShow" :id="expressId" @refresh="refresh"></sendGoods>
<orderInfo :show.sync="orderInfoShow" :id="expressId" @refresh="refresh" :infoStatus="orderInfoStatus"></orderInfo>
</section>
</template>
<script>
......@@ -89,11 +98,13 @@ import { getPageUndeliverList,orderOptService,exportOnlineListExcel } from '@/se
import {formateDateTimeByType} from '@/utils/index.js';
import express from '../common/express';
import sendGoods from './send-goods';
import orderInfo from './order-info';
export default {
name: 'goods-list',
components: {
express,
sendGoods
sendGoods,
orderInfo
},
data () {
return {
......@@ -116,6 +127,8 @@ export default {
textareaValue:'',
expressShow:false,
sendGoodsShow:false,
orderInfoShow:false,
orderInfoStatus:1,
expressId:'',
isInfo:false,
dateTime:['','']
......@@ -252,6 +265,18 @@ export default {
this.isInfo = flag;
this.expressId = row.integralMallProExchangeId;
},
// 查看订单详情和取消详情
/**
* tag
* 1 在线发货 已发货 详情
* 2 在线发货 取消 详情
* 3 快递发货 取消 详情
*/
queryOrderInfo(row,tag) {
this.orderInfoShow = true;
this.orderInfoStatus = tag;
this.expressId = row.integralMallProExchangeId;
},
// 导出列表
exportExcel(){
if (this.dateTime) {
......
src/views/mall/goods/order-info.vue 0 → 100644
<template>
<el-dialog class="express dialog__body__nopadding" title="查看详情" :visible.sync="show" width="40%" :before-close="close">
<div class="express--info">
<div v-if="infoStatus === 3">
<p>收件人：{{info.consignee || '--'}}</p>
<p>联系方式：{{info.consigneePhone || '--'}}</p>
<p>收货地址：{{info.receivingAddress || '--'}}</p>
</div>
<div v-if="infoStatus === 1">
<p>发货时间：{{formateDateTimeByType(info.deliveryTime,'yyyy-MM-dd-HH-mm') || '--'}}</p>
<p>操作人员：{{info.clerkName || '--'}}</p>
<p>发货内容：{{info.deliveryContent || '--'}}</p>
</div>
<div v-if="infoStatus !== 1">
<p>取消时间：{{formateDateTimeByType(info.cancelTime,'yyyy-MM-dd-HH-mm') || '--'}}</p>
<p>操作人员：{{info.clerkName || '--'}}</p>
<p>取消原因：{{info.cancelReason || '--'}}</p>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button>
</span>
</el-dialog>
</template>
<script>
import {getLogisticsInfo,getLogisticsList,orderOptService} from '@/service/api/mallApi.js';
import {formateDateTimeByType} from '@/utils/index.js';
export default {
props:{
show:{
type:Boolean,
default:false
},
id:{
type:String,
default:''
},
infoStatus:{
type:Number,
default:false
}
},
watch:{
show(val) {
if (val) {
this.getLogisticsInfo();
}
}
},
data() {
return {
formateDateTimeByType,
loading:false,
info:{}
}
},
methods: {
close() {
this.$emit('update:show',false);
},
async getLogisticsInfo() {
this.loading = true;
let res = await getLogisticsInfo({integralMallProExchangeId:this.id});
if (res.errorCode === 0) {
this.info = res.result.changeLog || {};
}
this.loading = false;
}
}
};
</script>
<style lang="scss" scoped>
.express{
&--info {
p {
line-height: 30px;
}
}
}
</style>
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