提交 91f0ea4e 编写于 作者: jingqi.liu's avatar jingqi.liu

修改央视

上级 654f8982
此差异已折叠。
<template> <template>
<section v-if="!isWeb" :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight"> <!-- v-if="!isWeb" -->
<section :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight">
<div <div
class="nav-part" class="nav-part"
:style="'background:' + bgColor + ';' :style="'background:' + bgColor + ';'
......
...@@ -238,16 +238,16 @@ module.exports = { ...@@ -238,16 +238,16 @@ module.exports = {
}; };
console.log('this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken', this.token, this.$store.state.user.token, this.$store.state.coop.userInfo.userToken); console.log('this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken', this.token, this.$store.state.user.token, this.$store.state.coop.userInfo.userToken);
this.GET("campaign/admin/task/checkToken", param).then(res => { this.GET("campaign/admin/task/checkToken", param).then(res => {
if (res.code !== "000000") { // if (res.code !== "000000") {
console.log('commonCheckToken', window.__isWeb); // console.log('commonCheckToken', window.__isWeb);
if(window.__isWeb) { // if(window.__isWeb) {
this.goLogin(); // this.goLogin();
} else { // } else {
rocNative.gotoLogin(); // rocNative.gotoLogin();
} // }
} else { // } else {
cb && cb() cb && cb()
} // }
}); });
}, },
......
...@@ -152,7 +152,10 @@ export default { ...@@ -152,7 +152,10 @@ export default {
chooseCoupon(item) { chooseCoupon(item) {
switch (item.couponStatus) { switch (item.couponStatus) {
case 0: case 0:
receiveCoupon(item.couponId, item.grantConfigId).then((res) => { this.POST(
`/trade/coupon/app/receive/${item.couponId}/${item.grantConfigId}`,
{}
).then((res) => {
console.log(res, "receiveCoupon"); console.log(res, "receiveCoupon");
// couponType 1 满减 2 立减 todo 现金红包 // couponType 1 满减 2 立减 todo 现金红包
// if (item.couponType === 2) { // if (item.couponType === 2) {
...@@ -168,10 +171,7 @@ export default { ...@@ -168,10 +171,7 @@ export default {
// uni.switchTab({ // uni.switchTab({
// url: "/pages/home/index", // url: "/pages/home/index",
// }); // });
this.$router.push({ rocNative.goBack();
path: "/consultation/",
query: { backMethod: "web" },
});
break; break;
default: default:
break; break;
...@@ -192,6 +192,7 @@ export default { ...@@ -192,6 +192,7 @@ export default {
} }
} }
.page-wrapper { .page-wrapper {
padding-top: 64px;
height: auto; height: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
...@@ -130,7 +130,6 @@ export default { ...@@ -130,7 +130,6 @@ export default {
} }
window.__getUserInfo4CouponList = function (param) { window.__getUserInfo4CouponList = function (param) {
console.log(44444444);
console.log("__getUserInfo4CouponList", param); console.log("__getUserInfo4CouponList", param);
_this.token = param.userToken; _this.token = param.userToken;
_this.setUserInfo(param); _this.setUserInfo(param);
...@@ -138,7 +137,6 @@ export default { ...@@ -138,7 +137,6 @@ export default {
}; };
window.__refresh = function () { window.__refresh = function () {
console.log(1111111);
_this.getUserInfo(); _this.getUserInfo();
}; };
}, },
...@@ -158,12 +156,10 @@ export default { ...@@ -158,12 +156,10 @@ export default {
this.$store.dispatch("setToken", this.token); this.$store.dispatch("setToken", this.token);
// this.$store.dispatch("getUserInfo"); // this.$store.dispatch("getUserInfo");
}); });
} }
console.log(222222);
// 从登陆页面过来的 // 从登陆页面过来的
this.getMyCouponsList(); this.getMyCouponsList();
} else { } else {
console.log(3333333);
this.getUserInfo(); this.getUserInfo();
} }
}, },
...@@ -221,6 +217,7 @@ export default { ...@@ -221,6 +217,7 @@ export default {
} }
} }
.page-wrapper { .page-wrapper {
padding-top: 114px;
height: 100vh; height: 100vh;
background-color: #f5f6f8; background-color: #f5f6f8;
display: flex; display: flex;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册