提交 7f063c74 编写于 作者: guangjun.yang's avatar guangjun.yang

no message

上级 8c779b05
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
<script> <script>
import Logo from "@/components/annual-summary/logo"; import Logo from "@/components/annual-summary/logo";
import { getWebPageUrl } from "@/utils"; import { getWebPageUrl } from "@/utils";
import { Progress, Toast } from "vant";
export default { export default {
components: { components: {
Logo Logo
...@@ -67,6 +68,10 @@ export default { ...@@ -67,6 +68,10 @@ export default {
isHide: { isHide: {
type: Boolean, type: Boolean,
default: true default: true
},
appVersion: {
type: Number | String,
default: 300 // 1: 站内; 2: 站外
} }
}, },
data() { data() {
...@@ -83,7 +88,11 @@ export default { ...@@ -83,7 +88,11 @@ export default {
methods: { methods: {
// 保存图片 // 保存图片
save() { save() {
this.$emit("save"); if(this.appVersion < 359) {
Toast('请下载新版本APP保存页面截图');
} else {
this.$emit("save");
}
}, },
// 分享按钮 // 分享按钮
......
...@@ -123,13 +123,13 @@ export default { ...@@ -123,13 +123,13 @@ export default {
var btn = document.getElementById(this.wxOpenId); var btn = document.getElementById(this.wxOpenId);
if (btn != null) { if (btn != null) {
// 成功唤起事件 // 成功唤起事件
btn.addEventListener( // btn.addEventListener(
"launch", // "launch",
e => { // e => {
_this.$emit("launchApp"); // _this.$emit("launchApp");
}, // },
true // true
); // );
// 唤起失败事件 // 唤起失败事件
btn.addEventListener( btn.addEventListener(
"error", "error",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<Card5 :anualData="anualData"></Card5> <Card5 :anualData="anualData"></Card5>
</div> </div>
<div v-if="anualData.haveFlag" class="swiper-slide"> <div v-if="anualData.haveFlag" class="swiper-slide">
<Card6 :anualData="anualData" @save="savePage2Picture" @share="share" :isHide="isHide"></Card6> <Card6 :anualData="anualData" :isHide="isHide" :appVersion="appVersion" @save="savePage2Picture" @share="share"></Card6>
</div> </div>
</div> </div>
<Loading v-show="showLoading" /> <Loading v-show="showLoading" />
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
isInfresh: false, isInfresh: false,
showLoading: false, showLoading: false,
isHide: true, isHide: true,
activeIndex: 0,
anualData: { anualData: {
orderNum: 0, orderNum: 0,
learnTime4Show: 0 learnTime4Show: 0
...@@ -84,7 +85,6 @@ export default { ...@@ -84,7 +85,6 @@ export default {
}, },
created() { created() {
_this = this;
_this = this; _this = this;
// 截屏时通知前端 // 截屏时通知前端
window.__screenCaptureEvent = function() { window.__screenCaptureEvent = function() {
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
window.__getUserInfoAS = function(param) { window.__getUserInfoAS = function(param) {
console.log("__getUserInfoAS", param); console.log("__getUserInfoAS", param);
_this.token = param.userToken; _this.token = param.userToken;
_this.userMobile = param.userMobile; _this.appVersion = (param.appVersion || '').split('.').join('');
_this.setUserInfo(param); _this.setUserInfo(param);
_this.checkToken(); _this.checkToken();
_this.initData(); _this.initData();
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
}, 100); }, 100);
}); });
} else { } else {
this.$toast(res.message); Toast(res.message);
} }
}); });
}, },
...@@ -199,12 +199,9 @@ export default { ...@@ -199,12 +199,9 @@ export default {
swiperAnimate(this); swiperAnimate(this);
}, },
slideChangeTransitionEnd: function(se) { slideChangeTransitionEnd: function(se) {
let activeIndex = se.activeIndex; _this.activeIndex = se.activeIndex;
swiperAnimate(this); swiperAnimate(this);
console.log("---2323", se); console.log("---2323", se);
// if (activeIndex == 1) {
// }
} }
} }
}); });
...@@ -227,7 +224,8 @@ export default { ...@@ -227,7 +224,8 @@ export default {
if (res.code !== "000000") { if (res.code !== "000000") {
console.log("跳登录", this.isInfresh); console.log("跳登录", this.isInfresh);
if (this.isInfresh) { if (this.isInfresh) {
rocNative.goBack(); // rocNative.goBack();
this.$router.back(-1);
} else { } else {
rocNative.gotoLogin(); rocNative.gotoLogin();
} }
......
...@@ -44,12 +44,11 @@ ...@@ -44,12 +44,11 @@
</template> </template>
<script> <script>
import Loading from "@/components/common/common-loading"; import Loading from "@/components/common/common-loading";
// import Card6 from "@/components/annual-summary/card-6";
import WxOpenCommon from '@/components/wx-open'; import WxOpenCommon from '@/components/wx-open';
import { getWebPageUrl } from "@/utils"; import { getWebPageUrl } from "@/utils";
import { Progress, Toast } from "vant";
export default { export default {
components: { components: {
// Card6,
Loading, Loading,
WxOpenCommon WxOpenCommon
}, },
...@@ -97,7 +96,7 @@ export default { ...@@ -97,7 +96,7 @@ export default {
this.showLoading = false; this.showLoading = false;
this.handlerDate(res.data || {}); this.handlerDate(res.data || {});
} else { } else {
this.$toast(res.message); Toast(res.message);
} }
}); });
}, },
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册