Browse Source

【修改bug】【查询券码 时间显示问题】【消费卡问题】【会员积分问题】【会员赠券问题】

master
GL 4 years ago
parent
commit
33c33ccb34
9 changed files with 278 additions and 124 deletions
  1. +6
    -0
      src/routers/index.js
  2. +9
    -6
      src/views/navigation/accounts/marketingClose.vue
  3. +72
    -0
      src/views/navigation/buyExplain.vue
  4. +12
    -3
      src/views/navigation/commodity.vue
  5. +16
    -6
      src/views/navigation/consume/current.vue
  6. +149
    -104
      src/views/navigation/consume/todayConsume.vue
  7. +4
    -1
      src/views/navigation/integral/userMessage.vue
  8. +9
    -4
      src/views/navigation/ticket/ticketDetails.vue
  9. +1
    -0
      vue.config.js

+ 6
- 0
src/routers/index.js View File

@@ -15,6 +15,7 @@ import ticketDetails from "@/views/navigation/ticket/ticketDetails"
import chPhone from "@/views/navigation/ticket/chPhone"
import details from "@/views/navigation/details"
import commodity from "@/views/navigation/commodity"
import buyExplain from "@/views/navigation/buyExplain"
import accomplish from "@/views/navigation/accomplish"
import billing from "@/views/navigation/billing"
import todayConsume from "@/views/navigation/consume/todayConsume"
@@ -128,6 +129,11 @@ const routes = [
component:memberCancel
},
{
path: '/buyExplain',//购买须知
name: 'buyExplain',
component:buyExplain
},
{
path: '/memberGathering',//消费卡收款
name: 'memberGathering',


+ 9
- 6
src/views/navigation/accounts/marketingClose.vue View File

@@ -92,13 +92,13 @@
>
<div
:class="status4_index == 1 ? 'status3_activity' : 'my'"
@click="settleType(1)"
@click="settleType(0)"
>
未结算
</div>
<div
:class="status4_index == 2 ? 'status3_activity' : 'wx'"
@click="settleType(2)"
@click="settleType(1)"
>
已结算
</div>
@@ -314,7 +314,7 @@ export default {
},
settleType(value) {
this.status4_index = value;
this.type = value;
this.status = value;
this.search();
},
setSource(value) {
@@ -386,6 +386,9 @@ export default {
console.log(this.endDateText, "结束");
},
getLsit() {

console.log("123")

Toast.loading({
message: "加载中...",
duration: 0, // 持续展示 toast
@@ -403,7 +406,7 @@ export default {
enddate: this.endDateText + " 23:59:59",
source: this.source,
type: this.type,
status: "",
status: this.status,
},
})
.then((res) => {
@@ -450,7 +453,7 @@ export default {
enddate: this.endDateText + " 23:59:59",
source: this.source,
type: this.type,
status: "",
status: this.status,
},
})
.then((res) => {
@@ -537,7 +540,7 @@ export default {
transform: rotateX(180deg);
}
.status1_Box {
overflow: scroll;
/* overflow: scroll; */
}
.status_1 {
position: relative;


+ 72
- 0
src/views/navigation/buyExplain.vue View File

@@ -0,0 +1,72 @@
<template>
<div class="box">
<div class="back-box">
<van-icon
class="back-icon"
@click="goBack"
size=".6rem"
name="arrow-left"
color="#fff"
/>
<span>活动规则</span>
</div>
<div class="textTop">购买须知</div>
<div class="text" v-if="text!=''">
<p style="word-break: break-all">{{ text }}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
text: "",
};
},
methods: {
goBack() {
this.$router.go(-1);
},
},
mounted() {
this.text = this.$route.query.text;
},
};
</script>
<style scoped>
.box {
height: 100%;
overflow: hidden;
}
.back-box {
left: 0;
top: 0;
z-index: 1000;
width: 100%;
height: 1.3rem;
line-height: 1.3rem;
background: #52a0fd;
color: #fff;
font-size: 0.43rem;
text-align: center;
}
.back-icon {
float: left;
margin: 0.4rem 0 0 0.1rem;
}
.textTop {
width: 100%;
padding: 0 2%;
text-align: left;
line-height: 1.2rem;
height: 1.2rem;
border-bottom: 1px solid #f5f5f5;
}
.text {
overflow: hidden;
width: 96%;
margin: 0 2%;
text-align: left;
margin-top: 0.5rem;
}
</style>

+ 12
- 3
src/views/navigation/commodity.vue View File

@@ -15,18 +15,18 @@
<img :src="list.coverImg" alt="" class="goodImg" />
<div class="titleBox">
<div class="name">{{ list.title }}</div>
<div class="time">{{ `有效期至${createDate}` }}</div>
<div class="time">{{ `有效期至${ expiredTime}` }}</div>
</div>
</div>
<div class="tiemBox">
<div class="getTime">领券时间</div>
<div class="timeSuffix">{{ expiredTime }}</div>
<div class="timeSuffix">{{ createDate }}</div>
</div>
<div class="ticket tiemBox">
<div class="getTime">券码</div>
<div class="timeSuffix">{{ list.id }}</div>
</div>
<div class="tiemBox activity">
<div class="tiemBox activity" @click="goExplain">
<div class="getTime">活动规则</div>
<img src="@/assets/images/jian.png" alt="" class="timeSuffix_img" />
</div>
@@ -81,6 +81,14 @@ export default {
};
},
methods: {
goExplain(){
this.$router.push({
path:'/buyExplain',
query:{
text:this.list.remark
}
})
},
goBack() {
this.$router.go(-1);
},
@@ -120,6 +128,7 @@ export default {
})[0].name;
// console.log(temp);
// return temp.name
return temp
},
},
mounted() {


+ 16
- 6
src/views/navigation/consume/current.vue View File

@@ -65,6 +65,7 @@
<div class="price">{{ `¥${item.deductionAmount / 100}` }}</div>
<div style="color: red">{{ `实收 ¥${item.realPayment / 100}` }}</div>
</div>
<div class="noAccount" v-if="item.payStatus == 0">未到账</div>
</div>
</van-list>

@@ -163,8 +164,7 @@ export default {
this.getCardPay();
},
//初始化查询表格
itiSearch(){
itiSearch() {
this.payMum1();
this.payMum2();
this.payMum3();
@@ -187,15 +187,13 @@ export default {
const { code, message, data } = res;
if (code == 200) {
this.ListLoading = false;
this.finished = data.list.length === 0?true:false;
this.list.push(...data.list) ;
this.finished = data.list.length === 0 ? true : false;
this.list.push(...data.list);
} else {
Toast(message);
}
})
.catch((res) => {
Toast(res);
});
},
@@ -393,6 +391,7 @@ export default {
color: #999;
}
.content {
position: relative;
background-color: #fff;
padding: 0 0.6rem;
overflow: hidden;
@@ -406,6 +405,17 @@ export default {
margin: 0.5rem 5%;
border-radius: 0.2rem;
}
.noAccount {
line-height: 0.6rem;
position: absolute;
top: 0.65rem;
left: 4rem;
transform: rotate(-30deg);
border: 0.01rem solid #ff6a6a;
border-radius: 0.1rem;
padding: 0.1rem 0.3rem;
color: #ff6a6a;
}
.content_left {
width: 50%;
float: left;


+ 149
- 104
src/views/navigation/consume/todayConsume.vue View File

@@ -1,6 +1,5 @@
<template>
<div class="Box">
<div class="back-box">
<van-icon
class="back-icon"
@@ -11,35 +10,46 @@
/>
<span>会员核销</span>
</div>
<div class="topbox">
<div class="title">今日收款总额(元)</div>
<div class="num">{{(sum_real_payment1+sum_real_payment2+sum_real_payment3)/100}}</div>
<div class="piece">{{`${list.length} 笔`}}</div>
<div class="num">
{{ (sum_real_payment1 + sum_real_payment2 + sum_real_payment3) / 100 }}
</div>
<div class="piece">{{ `${list.length} 笔` }}</div>
<div class="intOne">
<div class="left">
<div class="text1">已到账(元)</div>
<div class="text" style="color: #fff; font-weight: bold">{{(sum_real_payment2+sum_real_payment3)/100}}</div>
<div class="text" style="color: #fff; font-weight: bold">
{{ (sum_real_payment2 + sum_real_payment3) / 100 }}
</div>
</div>
<div class="right">
<div class="text1">未到账(元)</div>
<div class="text" style="color: #fff; font-weight: bold">{{sum_real_payment1/100}}</div>
<div class="text" style="color: #fff; font-weight: bold">
{{ sum_real_payment1 / 100 }}
</div>
</div>
</div>
</div>
<div class="clearfix">
<div class="clearfix_left">{{setTiem(new Date().getTime(),"YYYY-MM-DD")}}</div>
<div class="clearfix_left">
{{ setTiem(new Date().getTime(), "YYYY-MM-DD") }}
</div>
<div class="clearfix_right" @click="goCurrent">按日期查询</div>
</div>
<div class="contents" v-for="(item,index) in list" :key="index">
<div class="contents" v-for="(item, index) in list" :key="index">
<div class="contents_left">
<div class="customer">{{item.onickName}}</div>
<div>{{setTiem(item.createDate,"YYYY-MM-DD HH:mm:ss")}}</div>
</div>
<div class="customer">{{ item.onickName }}</div>
<div>{{ setTiem(item.createDate, "YYYY-MM-DD HH:mm:ss") }}</div>
</div>
<div class="contents_right">
<div style="color: #000; line-height: 1rem;text-align: right;">{{`¥${item.deductionAmount/100}`}}</div>
<div>{{`实收 ¥${item.realPayment/100}`}}</div>
<div style="color: #000; line-height: 1rem; text-align: right">
{{ `¥${item.deductionAmount / 100}` }}
</div>
<div>{{ `实收 ¥${item.realPayment / 100}` }}</div>
</div>
<div class="noAccount" v-if="item.payStatus == 0">未到账</div>
</div>
<div class="noData">暂无数据</div>
</div>
@@ -48,118 +58,141 @@
import Vue from "vue";
import moment from "moment";
import { Toast } from "vant";
import{ mapState} from "vuex";
import { mapState } from "vuex";
export default {
data() {
return {
pageNum:1,
pageSize:10,
list:[],
pageNum: 1,
pageSize: 10,
list: [],
sum_real_payment1: 0,
sum_real_payment2: 0,
sum_real_payment3:0,
}
sum_real_payment3: 0,
};
},
computed: {
...mapState(['merchant_id'])
...mapState(["merchant_id"]),
},
methods: {
goBack() {
this.$router.go(-1)
},
this.$router.go(-1);
},
goCurrent() {
this.$router.push("/current");
},
//查询消费卡扫码记录列表
getCardPay() {
Toast.loading({
message: "加载中...",
duration: 0, // 持续展示 toast
forbidClick: true,
forbidClick: true,
message: "加载中...",
duration: 0, // 持续展示 toast
forbidClick: true,
forbidClick: true,
});
this.$http
.cardPayList({
methods: "get",
params: {
pageNum: this.pageNum,
pageSize: this.pageSize,
startdate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 00:00:00",
enddate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 23:59:59",
},
})
.then((res) => {
const { code, message, data } = res;
if (code == 200) {
Toast.clear();
this.list = data.list;
} else {
Toast.clear();
Toast(message);
}
})
.catch((res) => {
Toast.clear();
Toast(res);
});
this.$http.cardPayList({
methods: "get",
params: {
pageNum:this.pageNum,
pageSize:this.pageSize,
startdate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 00:00:00',
enddate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 23:59:59',
},
}).then(res=>{
const {code,message,data} = res
if(code ==200){
Toast.clear();
this.list = data.list
}else{
Toast.clear();
Toast(message);
}
}).catch(res=>{
Toast.clear();
Toast(res);
})
},
payMum1(){
this.$http.payMum({
methods: "get",
params:{
merchantId: this.merchant_id,
startdate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 00:00:00',
enddate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 23:59:59',
payStatus:0
}
}).then(res=>{
const{code , data,message}=res
if(code==200){
this.sum_real_payment1= Number(data.length!=0?res.data[0].sum_real_payment:0)
}else{
Toast(message);
}
})

payMum1() {
this.$http
.payMum({
methods: "get",
params: {
merchantId: this.merchant_id,
startdate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 00:00:00",
enddate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 23:59:59",
payStatus: 0,
},
})
.then((res) => {
const { code, data, message } = res;
if (code == 200) {
this.sum_real_payment1 = Number(
data.length != 0 ? res.data[0].sum_real_payment : 0
);
} else {
Toast(message);
}
});
},
payMum2(){
this.$http.payMum({
methods: "get",
params:{
merchantId: this.merchant_id,
startdate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 00:00:00',
enddate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 23:59:59',
payStatus:1
}
}).then(res=>{
const{code , data,message}=res
if(code==200){
this.sum_real_payment2= Number(data.length!=0?res.data[0].sum_real_payment:0)
}else{
Toast(message);
}
})
payMum2() {
this.$http
.payMum({
methods: "get",
params: {
merchantId: this.merchant_id,
startdate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 00:00:00",
enddate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 23:59:59",
payStatus: 1,
},
})
.then((res) => {
const { code, data, message } = res;
if (code == 200) {
this.sum_real_payment2 = Number(
data.length != 0 ? res.data[0].sum_real_payment : 0
);
} else {
Toast(message);
}
});
},
payMum3(){
this.$http.payMum({
methods: "get",
params:{
merchantId: this.merchant_id,
startdate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 00:00:00',
enddate: moment(new Date().getTime()).format("YYYY-MM-DD")+' 23:59:59',
payStatus:2
}
}).then(res=>{
const{code , data,message}=res
if(code==200){
this.sum_real_payment3= Number(data.length!=0?res.data[0].sum_real_payment:0)
}else{
Toast(message);
}
})
payMum3() {
this.$http
.payMum({
methods: "get",
params: {
merchantId: this.merchant_id,
startdate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 00:00:00",
enddate:
moment(new Date().getTime()).format("YYYY-MM-DD") + " 23:59:59",
payStatus: 2,
},
})
.then((res) => {
const { code, data, message } = res;
if (code == 200) {
this.sum_real_payment3 = Number(
data.length != 0 ? res.data[0].sum_real_payment : 0
);
} else {
Toast(message);
}
});
},
//时间处理
setTiem(temp,format){//第一个参数是时间戳 第二个参数是格式 参考momentJS
return moment(Number(temp)).format(format)
}
setTiem(temp, format) {
//第一个参数是时间戳 第二个参数是格式 参考momentJS
return moment(Number(temp)).format(format);
},
},
mounted() {
this.getCardPay();
@@ -245,6 +278,7 @@ export default {
color: #52a0fd;
}
.contents {
position: relative;
padding: 0 0.6rem;
overflow: hidden;
font-size: 0.42rem;
@@ -254,12 +288,23 @@ export default {
color: rgba(153, 153, 153, 1);
padding-top: 0.5rem;
}
.noAccount {
line-height: 0.6rem;
position: absolute;
top: 0.6rem;
left: 4.5rem;
transform: rotate(-30deg);
border: 0.01rem solid #ff6a6a;
border-radius: 0.1rem;
padding: 0.1rem 0.3rem;
color: #ff6a6a;
}
.contents_left {
float: left;
line-height: 1rem;
text-align: left;
}
.customer{
.customer {
color: #000;
font-size: 0.48rem;
}


+ 4
- 1
src/views/navigation/integral/userMessage.vue View File

@@ -92,7 +92,7 @@ export default {
merchantId: this.merchant_id,
operatorType: 3,
receiptUrl:"",
spendStr: this.integral,
spendStr: this.consumption,
tags:[],
},
}).then(res=>{
@@ -114,6 +114,9 @@ export default {
},
//通过接口设置积分
setValue() {
if(this.consumption==''){
return
}
this.$http
.getCreditNum({
methods: "get",


+ 9
- 4
src/views/navigation/ticket/ticketDetails.vue View File

@@ -74,13 +74,18 @@
<div class="popupBox">
<div class="title">会员赠券</div>
<div class="text_box">
<div class="constant">会员:未绑定</div>
<div class="constant">手机号:12345644564</div>
<div class="constant">{{`会员:${list.name != undefined ? list.name : ""}` }}</div>
<div class="constant">{{`手机号:${this.phone}`}}</div>
</div>
<div class="ticket_Box">
<div class="discounts" v-for="item in pitcnOn" :key="item.id">
<div class="name">红烧肉20元通用券</div>
<div class="tiem">有效期:自领取后1日内有效</div>
<div class="name">{{item.title}}</div>
<div class="tiem">{{ item.validStartDate != undefined
? `有效期:${setTiem(
item.validStartDate,
"YYYY-MM-DD HH:mm:ss"
)}至${setTiem(item.validEndDate, "YYYY-MM-DD HH:mm:ss")}`
: "有效期:自领取后" + item.validDays + "日内有效"}}</div>
</div>
</div>
<div class="operation">


+ 1
- 0
vue.config.js View File

@@ -7,6 +7,7 @@ function resolve(dir) {
}

module.exports = {
lintOnSave: false,
devServer: {
// open: true, // 是否自动打开浏览器页面
// host: 'localhost', // 指定使用一个 host,默认是 localhost


Loading…
Cancel
Save