Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -49,7 +49,7 @@ export default {
|
|||||||
this.root.goto({query, path, hash})
|
this.root.goto({query, path, hash})
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.getCode({corpId, url: location.href})
|
this.getCode({corpId, suiteId, url: location.href})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<i v-else>{{ placeholder }}</i>
|
<i v-else>{{ placeholder }}</i>
|
||||||
<u-icon name="arrow-right" color="#ddd"/>
|
<u-icon name="arrow-right" color="#ddd"/>
|
||||||
</div>
|
</div>
|
||||||
<u-picker v-model="show" :columns="options" @confirm="handleConfirm"/>
|
<u-select v-model="show" :list="options" @confirm="handleConfirm"/>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ export default {
|
|||||||
placeholder: {default: "请选择"},
|
placeholder: {default: "请选择"},
|
||||||
list: {default: () => []},
|
list: {default: () => []},
|
||||||
dict: {default: ""},
|
dict: {default: ""},
|
||||||
disabled: Boolean
|
disabled: Boolean,
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
selectedLabel() {
|
selectedLabel() {
|
||||||
|
|||||||
Reference in New Issue
Block a user