Commit d80b4426 by 无尘

feat: 增加签到接口

parent 08f300b7
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title></title><link href=css/chunk-006266a2.4b8e5a29.css rel=prefetch><link href=css/chunk-41d0cdd7.c57ad67b.css rel=prefetch><link href=css/chunk-4d446ff8.613edf34.css rel=prefetch><link href=css/chunk-6075e5c8.213de925.css rel=prefetch><link href=css/chunk-79d39695.a67484b8.css rel=prefetch><link href=css/chunk-a4644ea6.877b82bf.css rel=prefetch><link href=js/chunk-006266a2.b6144737.js rel=prefetch><link href=js/chunk-41d0cdd7.8dfa29f5.js rel=prefetch><link href=js/chunk-4d446ff8.c265c444.js rel=prefetch><link href=js/chunk-6075e5c8.9d3c5f68.js rel=prefetch><link href=js/chunk-79d39695.743cf281.js rel=prefetch><link href=js/chunk-a4644ea6.02cddf1f.js rel=prefetch><link href=css/app.26b754ca.css rel=preload as=style><link href=js/app.ac278363.js rel=preload as=script><link href=js/chunk-vendors.63e5230c.js rel=preload as=script><link href=css/app.26b754ca.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.63e5230c.js></script><script src=js/app.ac278363.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title></title><link href=css/chunk-006266a2.4b8e5a29.css rel=prefetch><link href=css/chunk-41d0cdd7.c57ad67b.css rel=prefetch><link href=css/chunk-4d446ff8.613edf34.css rel=prefetch><link href=css/chunk-6075e5c8.213de925.css rel=prefetch><link href=css/chunk-79d39695.a67484b8.css rel=prefetch><link href=css/chunk-830e6366.1ff07da2.css rel=prefetch><link href=js/chunk-006266a2.b6144737.js rel=prefetch><link href=js/chunk-41d0cdd7.8dfa29f5.js rel=prefetch><link href=js/chunk-4d446ff8.c265c444.js rel=prefetch><link href=js/chunk-6075e5c8.9d3c5f68.js rel=prefetch><link href=js/chunk-79d39695.743cf281.js rel=prefetch><link href=js/chunk-830e6366.f8fa175f.js rel=prefetch><link href=css/app.26b754ca.css rel=preload as=style><link href=js/app.1b6c1ba6.js rel=preload as=script><link href=js/chunk-vendors.63e5230c.js rel=preload as=script><link href=css/app.26b754ca.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.63e5230c.js></script><script src=js/app.1b6c1ba6.js></script></body></html>
\ No newline at end of file \ No newline at end of file
...@@ -10,6 +10,6 @@ import { ...@@ -10,6 +10,6 @@ import {
export const getUserData = data => getRequest('/gicfwh/get-member-info-for-integral', data); export const getUserData = data => getRequest('/gicfwh/get-member-info-for-integral', data);
export const postTokenData = data => postRequest('/gicfwh/loginForDemo', data); export const postTokenData = data => postRequest('/gicfwh/loginForDemo', data);
export const getCardData = data => getRequest('/gicfwh/virtualGoodsList', data); export const getCardData = data => getRequest('/gicfwh/virtualGoodsList', data);
export const getSignData = data => getRequest('/gicfwh/get-yueshi-params', data); export const getSignData = data => getRequest('/gicfwh/tpn-member-sign', data);
export const getBrandData = data => getRequest('/gicfwh/virtualGoodsBrand', data); export const getBrandData = data => getRequest('/gicfwh/virtualGoodsBrand', data);
export const getGoodsData = data => getRequest('/gicfwh/entityGoodsList', data); export const getGoodsData = data => getRequest('/gicfwh/entityGoodsList', data);
...@@ -82,17 +82,17 @@ ...@@ -82,17 +82,17 @@
<div class="point-card-cell_header border-box"> <div class="point-card-cell_header border-box">
<div class="point-card-condition flex flex-space-between"> <div class="point-card-condition flex flex-space-between">
<div class="point-card-condition_brand"><img :src="item.cardBrand" alt=""/></div> <div class="point-card-condition_brand"><img :src="item.cardBrand" alt=""/></div>
<div class="point-card-condition_text font-10 color-000 flex flex-align-center">{{item.cardCondition}}</div> <div class="point-card-condition_text font-10 color-000 flex flex-align-center">{{item.threshold}}</div>
</div> </div>
<div class="point-card-price"> <div class="point-card-price">
<span class="font-12"></span><span class="font-24">{{item.cardPrice}}</span><span class="absolute-card-type">{{item.couponType}}</span> <span class="font-12"></span><span class="font-24">{{item.couponValue}}</span><span class="absolute-card-type">{{item.couponType == 10 ? '兑换券' : '抵金券'}}</span>
</div> </div>
</div> </div>
<div class="point-card-cell_footer border-box"> <div class="point-card-cell_footer border-box">
{{item.cardPoint}}积分兑换 {{item.defaultConsumptionIntegral}}积分兑换
</div> </div>
</div> </div>
<div class="card-no-condition" v-if="item.cardCondition == ''">无门槛</div> <div class="card-no-condition" v-if="item.threshold == ''">无门槛</div>
</li> </li>
</template> </template>
</ul> </ul>
...@@ -118,12 +118,12 @@ ...@@ -118,12 +118,12 @@
<template v-for="(item, index) in goodsData"> <template v-for="(item, index) in goodsData">
<li :key="index" class="point-goods-list_li border-box" @click="toDetail(item)"> <li :key="index" class="point-goods-list_li border-box" @click="toDetail(item)">
<div class="point-mall-goods_cell"> <div class="point-mall-goods_cell">
<p class="font-12 color-757575 border-dashed">每人限兑:{{item.limit || 1}}</p> <p class="font-12 color-757575 border-dashed">每人限兑:{{item.exchangeLimit || 1}}</p>
<p class="font-12 color-757575">剩余{{item.stock}}</p> <p class="font-12 color-757575">剩余{{item.stock}}</p>
<div class="m-t-6 m-b-6"><img class="goods-pic" :src="item.goodsPic" alt=""/></div> <div class="m-t-6 m-b-6"><img class="goods-pic" :src="item.goodsPic" alt=""/></div>
<p class="font-10 color-b3b3b3">{{item.goodsName}}</p> <p class="font-10 color-b3b3b3">{{item.goodsTitle}}</p>
<p class="font-11 color-c9b799"><span class="point-border">积分{{item.point}}</span></p> <p class="font-11 color-c9b799"><span class="point-border">积分{{item.defaultConsumptionIntegra}}</span></p>
<p class="font-11 color-757575"><span>吊牌价</span><span class="line-through">{{item.price}}</span></p> <p class="font-11 color-757575"><span>吊牌价</span><span class="line-through">{{item.marketPrice}}</span></p>
</div> </div>
</li> </li>
</template> </template>
...@@ -191,26 +191,29 @@ export default { ...@@ -191,26 +191,29 @@ export default {
{ {
cardId: '1', cardId: '1',
couponType: '代金券', couponType: '代金券',
cardBrand: require('../../assets/images/logo.png'), cardBrand: require('../../assets/images/logo01_248_124.png'),
cardPrice: '20', couponValue: '20',
cardPoint: '2000', defaultConsumptionIntegral: '2000',
cardCondition: '' threshold: '',
url: ''
}, },
{ {
cardId: '1', cardId: '1',
couponType: '代金券', couponType: '代金券',
cardBrand: require('../../assets/images/logo.png'), cardBrand: require('../../assets/images/logo01_248_124.png'),
cardPrice: '20', couponValue: '20',
cardPoint: '2000', defaultConsumptionIntegral: '2000',
cardCondition: '满 500 使用' threshold: '满 500 使用',
url: ''
}, },
{ {
cardId: '1', cardId: '1',
couponType: '代金券', couponType: '代金券',
cardBrand: require('../../assets/images/logo.png'), cardBrand: require('../../assets/images/logo01_248_124.png'),
cardPrice: '20', couponValue: '20',
cardPoint: '2000', defaultConsumptionIntegral: '2000',
cardCondition: '满 500 使用' threshold: '满 500 使用',
url: ''
} }
], ],
adsData: { adsData: {
...@@ -219,26 +222,29 @@ export default { ...@@ -219,26 +222,29 @@ export default {
}, },
goodsData: [ goodsData: [
{ {
limit: 1, exchangeLimit: 1,
stock: 4, stock: 4,
goodsName: '太平鸟青年卫衣', goodsTitle: '太平鸟青年卫衣',
goodsPic: 'https://pic01-10001430.image.myqcloud.com/ab89aa0c-7cd6-43bf-8fa1-ede0a0970549', goodsPic: 'https://pic01-10001430.image.myqcloud.com/ab89aa0c-7cd6-43bf-8fa1-ede0a0970549',
point: '12345', defaultConsumptionIntegra: '12345',
price: '656' marketPrice: '656',
url: ''
},{ },{
limit: 1, exchangeLimit: 1,
stock: 4, stock: 4,
goodsName: '太平鸟青年卫衣', goodsTitle: '太平鸟青年卫衣',
goodsPic: 'https://pic01-10001430.image.myqcloud.com/ab89aa0c-7cd6-43bf-8fa1-ede0a0970549', goodsPic: 'https://pic01-10001430.image.myqcloud.com/ab89aa0c-7cd6-43bf-8fa1-ede0a0970549',
point: '12345', defaultConsumptionIntegra: '12345',
price: '656' marketPrice: '656',
url: ''
},{ },{
limit: 1, exchangeLimit: 1,
stock: 4, stock: 4,
goodsName: '太平鸟青年卫衣', goodsTitle: '太平鸟青年卫衣',
goodsPic: 'https://pic01-10001430.image.myqcloud.com/ab89aa0c-7cd6-43bf-8fa1-ede0a0970549', goodsPic: 'https://pic01-10001430.image.myqcloud.com/ab89aa0c-7cd6-43bf-8fa1-ede0a0970549',
point: '12345', defaultConsumptionIntegra: '12345',
price: '656' marketPrice: '656',
url: ''
} }
], ],
currentPage: 1, currentPage: 1,
...@@ -269,11 +275,7 @@ export default { ...@@ -269,11 +275,7 @@ export default {
if (that.userData.signFlag) { if (that.userData.signFlag) {
return false; return false;
} }
that.userData.signFlag = true; that.postSign();
const fadeTime = setTimeout(() => {
that.userData.flagFade = true;
clearTimeout(fadeTime);
}, 400);
}, },
/** /**
...@@ -287,7 +289,12 @@ export default { ...@@ -287,7 +289,12 @@ export default {
} }
let resData = await getSignData(param); let resData = await getSignData(param);
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
that.cardsData = resData.data; that.getMemberData();
that.userData.signFlag = true;
const fadeTime = setTimeout(() => {
that.userData.flagFade = true;
clearTimeout(fadeTime);
}, 400);
} }
}, },
...@@ -420,7 +427,7 @@ export default { ...@@ -420,7 +427,7 @@ export default {
/** /**
* 获取用户数据 * 获取用户数据
*/ */
async getMemberData() { async getMemberData(flag) {
const that = this; const that = this;
let param = { let param = {
// memberId: 'ff80808163a6ab7a0163a6abd0710000', // memberId: 'ff80808163a6ab7a0163a6abd0710000',
...@@ -430,6 +437,9 @@ export default { ...@@ -430,6 +437,9 @@ export default {
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
resData.result.flagFade = resData.result.signFlag == 1 ? true : false; resData.result.flagFade = resData.result.signFlag == 1 ? true : false;
that.userData = resData.result; that.userData = resData.result;
if (flag) {
return false; // 签到后不在去获取token
}
await that.getToken(); await that.getToken();
} }
}, },
......
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