Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wanglei
2021-12-02 17:16:17 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -49,7 +49,7 @@ export default {
this.root.goto({query, path, hash})
})
} else {
this.getCode({corpId, url: location.href})
this.getCode({corpId, suiteId, url: location.href})
}
},
},

View File

@@ -8,7 +8,7 @@
<i v-else>{{ placeholder }}</i>
<u-icon name="arrow-right" color="#ddd"/>
</div>
<u-picker v-model="show" :columns="options" @confirm="handleConfirm"/>
<u-select v-model="show" :list="options" @confirm="handleConfirm"/>
</section>
</template>
@@ -20,7 +20,7 @@ export default {
placeholder: {default: "请选择"},
list: {default: () => []},
dict: {default: ""},
disabled: Boolean
disabled: Boolean,
},
computed: {
selectedLabel() {