Merge branch 'master' into hotfix/switch_0317

This commit is contained in:
jiangruowei
2017-03-17 16:23:43 +08:00
15 changed files with 207 additions and 135 deletions

View File

@@ -87,7 +87,7 @@ export default {
</zan-popup>
<div class="zan-row">
<zan-button @click="popupShow2 = true">从上方弹出popup</zan-button>
<zan-button @click="popupShow2 = true">从上方弹出popup</zan-button>
</div>
<zan-popup v-model="popupShow2" position="top" class="zan-popup-2" :overlay="false">
更新成功