合并代码
This commit is contained in:
commit
45316112b4
|
|
@ -10,7 +10,7 @@
|
||||||
</view> -->
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<template v-if="$common.isIosExamine">
|
<template v-if="datas.setindexdata">
|
||||||
<view class="gongao">
|
<view class="gongao">
|
||||||
<view class="gongaoicon">
|
<view class="gongaoicon">
|
||||||
公告
|
公告
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<contentlist :list='datas.list'></contentlist>
|
<contentlist :list='datas.list'></contentlist>
|
||||||
<image v-if="$common.isIosExamine" @click="goMsg()" src="@/static/index/red-pack-new.gif"
|
<image v-if="datas.setindexdata" @click="goMsg()" src="@/static/index/red-pack-new.gif"
|
||||||
style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
|
style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
|
||||||
<up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText"
|
<up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText"
|
||||||
:showCancelButton="datas.version.cancelText!=''" @confirm='confirmUpdateVersion' :title="datas.version.title"
|
:showCancelButton="datas.version.cancelText!=''" @confirm='confirmUpdateVersion' :title="datas.version.title"
|
||||||
|
|
@ -118,7 +118,8 @@
|
||||||
content: "",
|
content: "",
|
||||||
confirmText: "",
|
confirmText: "",
|
||||||
cancelText: "",
|
cancelText: "",
|
||||||
}
|
},
|
||||||
|
setindexdata :"false"
|
||||||
})
|
})
|
||||||
onLoad(() => {
|
onLoad(() => {
|
||||||
versionUpdate()
|
versionUpdate()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue