diff --git a/src/components/u-select/u-select.vue b/src/components/u-select/u-select.vue new file mode 100644 index 0000000..a05b2bd --- /dev/null +++ b/src/components/u-select/u-select.vue @@ -0,0 +1,589 @@ + + + + + diff --git a/src/manifest.json b/src/manifest.json index 71349ba..5960be7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "浩拓织厂", "appid" : "__UNI__F79F300", "description" : "周尚-浩拓织厂", - "versionName" : "1.1.15", - "versionCode" : 115, + "versionName" : "1.1.16", + "versionCode" : 116, "transformPx" : false, "app-plus" : { "optimization" : { diff --git a/src/pages.json b/src/pages.json index f5b6e6f..0d68aca 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,5 +1,6 @@ { "easycom": { + "^u-select$": "@/components/u-select/u-select.vue", "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ diff --git a/src/pages/sys/login/index.vue b/src/pages/sys/login/index.vue index ce324c1..c7bd0a9 100644 --- a/src/pages/sys/login/index.vue +++ b/src/pages/sys/login/index.vue @@ -104,8 +104,9 @@ - + 版本: {{ appVersion }} @@ -165,6 +166,12 @@ export default { }, envName() { return process.env.VUE_APP_ENV_NAME || ''; + }, + apiUrlDefaultIndex() { + const list = this.apiUrlList || []; + let index = list.findIndex(item => item.value === this.selectedApiUrl); + if (index < 0) index = list.findIndex(item => item.label === '正式环境'); + return [index >= 0 ? index : 0]; } }, @@ -212,9 +219,8 @@ export default { }, onApiUrlConfirm(e) { - console.log('e', JSON.stringify(e)); - const selectedValue = this.apiUrlList[e[0]].value; - console.log('selectedValue', selectedValue) + const selectedValue = e && e[0] && e[0].value; + if (selectedValue == null) return; this.selectedApiUrl = selectedValue; this.showApiUrlPicker = false; @@ -598,21 +604,19 @@ export default {