kubbo/dvcp_v2_wechat_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 27846

Browse Source
This commit is contained in:
aixianling
2022-03-02 16:57:17 +08:00
parent 3166fe09a0
commit 757a4a7182
3 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
package.json
View File

@@ -20,22 +20,23 @@
"project/*" "project/*"
], ],
"dependencies": { "dependencies": {
"@dcloudio/uni-app-plus": "^2.0.1-33320211224001", "@dcloudio/uni-app-plus": "^2.0.1-33920220208001",
"@dcloudio/uni-h5": "^2.0.1-33320211224001", "@dcloudio/uni-h5": "^2.0.1-33920220208001",
"@dcloudio/uni-helper-json": "^1.0.8", "@dcloudio/uni-helper-json": "^1.0.8",
"@dcloudio/uni-mp-360": "^2.0.1-33320211224001", "@dcloudio/uni-mp-360": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-alipay": "^2.0.1-33320211224001", "@dcloudio/uni-mp-alipay": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-baidu": "^2.0.1-33320211224001", "@dcloudio/uni-mp-baidu": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-kuaishou": "^2.0.1-33320211224001", "@dcloudio/uni-mp-jd": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-lark": "^2.0.1-33320211224001", "@dcloudio/uni-mp-kuaishou": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-qq": "^2.0.1-33320211224001", "@dcloudio/uni-mp-lark": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-toutiao": "^2.0.1-33320211224001", "@dcloudio/uni-mp-qq": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-vue": "^2.0.1-33320211224001", "@dcloudio/uni-mp-toutiao": "^2.0.1-33920220208001",
"@dcloudio/uni-mp-weixin": "^2.0.1-33320211224001", "@dcloudio/uni-mp-vue": "^2.0.1-33920220208001",
"@dcloudio/uni-quickapp-native": "^2.0.1-33320211224001", "@dcloudio/uni-mp-weixin": "^2.0.1-33920220208001",
"@dcloudio/uni-quickapp-webview": "^2.0.1-33320211224001", "@dcloudio/uni-quickapp-native": "^2.0.1-33920220208001",
"@dcloudio/uni-stat": "^2.0.1-33320211224001", "@dcloudio/uni-quickapp-webview": "^2.0.1-33920220208001",
"@vue/shared": "^3.2.26", "@dcloudio/uni-stat": "^2.0.1-33920220208001",
"@vue/shared": "^3.2.31",
"axios": "^0.19.2", "axios": "^0.19.2",
"core-js": "^3.7.0", "core-js": "^3.7.0",
"dayjs": "^1.9.5", "dayjs": "^1.9.5",
@@ -48,17 +49,17 @@
}, },
"devDependencies": { "devDependencies": {
"@dcloudio/types": "^1.1.1", "@dcloudio/types": "^1.1.1",
"@dcloudio/uni-automator": "^2.0.1-33320211224001", "@dcloudio/uni-automator": "^2.0.1-33920220208001",
"@dcloudio/uni-cli-i18n": "^2.0.1-33320211224001", "@dcloudio/uni-cli-i18n": "^2.0.1-33920220208001",
"@dcloudio/uni-cli-shared": "^2.0.1-33320211224001", "@dcloudio/uni-cli-shared": "^2.0.1-33920220208001",
"@dcloudio/uni-i18n": "^2.0.1-33320211224001", "@dcloudio/uni-i18n": "^2.0.1-33920220208001",
"@dcloudio/uni-migration": "^2.0.1-33320211224001", "@dcloudio/uni-migration": "^2.0.1-33920220208001",
"@dcloudio/uni-template-compiler": "^2.0.1-33320211224001", "@dcloudio/uni-template-compiler": "^2.0.1-33920220208001",
"@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-33320211224001", "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-33920220208001",
"@dcloudio/vue-cli-plugin-uni": "^2.0.1-33320211224001", "@dcloudio/vue-cli-plugin-uni": "^2.0.1-33920220208001",
"@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-33320211224001", "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-33920220208001",
"@dcloudio/webpack-uni-mp-loader": "^2.0.1-33320211224001", "@dcloudio/webpack-uni-mp-loader": "^2.0.1-33920220208001",
"@dcloudio/webpack-uni-pages-loader": "^2.0.1-33320211224001", "@dcloudio/webpack-uni-pages-loader": "^2.0.1-33920220208001",
"@vue/cli-plugin-babel": "^4.5.6", "@vue/cli-plugin-babel": "^4.5.6",
"@vue/cli-service": "^4.5.6", "@vue/cli-service": "^4.5.6",
"babel-plugin-import": "^1.13.3", "babel-plugin-import": "^1.13.3",

18
src/components/AiAreaPicker/AiAreaPicker.vue
View File

@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<scroll-view class="fill pendingList" :style="{height: height}" scroll-y> <scroll-view class="fill pendingList" :style="{height: height}" scroll-y>
<div class="pendingItem flexRow" flex v-for="op in pending" :key="op.id" @tap="getChild(op)"> <div class="pendingItem flex flexRow" v-for="op in pending" :key="op.id" @tap.stop="getChild(op)">
<div class="fill" :class="{ self: index == op.id }" v-html="op.name"/> <div class="fill" :class="{ self: index == op.id }" v-html="op.name"/>
<u-icon v-if="index == op.id" name="checkbox-mark" color="#4181FF"/> <u-icon v-if="index == op.id" name="checkbox-mark" color="#4181FF"/>
</div> </div>
@@ -57,7 +57,8 @@ export default {
default: false default: false
}, },
isForm: Boolean, isForm: Boolean,
valueLevel: 5 valueLevel: {default: 5},
fullName: {default: ''}
}, },
computed: { computed: {
...mapState(['user']), ...mapState(['user']),
@@ -141,7 +142,7 @@ export default {
e && (e.levelLabel = this.levelLabels[e.type]) e && (e.levelLabel = this.levelLabels[e.type])
}) })
if (res.data.length > 1) { if (res.data.length > 1) {
this.fullArea = res.data.reverse().slice(this.dataRange) this.fullArea = res.data.reverse().slice(this.dataRange - 1)
} else { } else {
this.fullArea = res.data this.fullArea = res.data
} }
@@ -158,10 +159,10 @@ export default {
this.list = res.data this.list = res.data
let self = this.fullArea.find((e) => e.id == this.areaId) let self = this.fullArea.find((e) => e.id == this.areaId)
if (this.value && !this.areaName && this.value !== this.areaId) { if (this.value && !this.areaName && this.value !== this.areaId) {
this.areaName = this.list.find((e) => e.id == this.value).name this.areaName = this.list.find((e) => e.id == this.value)?.name
} }
if (!this.areaName && this.value === this.areaId) { if (!this.areaName && this.value === this.areaId) {
this.areaName = self.name this.areaName = self?.name
} }
if (!!self?.id && !this.isHideTown) { if (!!self?.id && !this.isHideTown) {
this.list.unshift(self) this.list.unshift(self)
@@ -202,7 +203,10 @@ export default {
} }
}, },
selectNode(area, i) { selectNode(area, i) {
this.fullArea.splice(i + 1, this.fullArea.length - i) let deleteCount = this.fullArea.length - i
if (deleteCount > 0) {
this.fullArea.splice(i + 1, deleteCount)
}
if (this.all && !area.id) { if (this.all && !area.id) {
this.index = '' this.index = ''
this.getProvinces() this.getProvinces()
@@ -245,7 +249,7 @@ export default {
position: relative; position: relative;
&:last-of-type { &:last-of-type {
margin-right: 0; margin-right: 0 !important;
&:after { &:after {
content: " "; content: " ";

5
src/mods/AppAuth/authApply.vue
View File

@@ -32,7 +32,7 @@
<div class="card"> <div class="card">
<view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in contract" :key="row.prop"> <view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in contract" :key="row.prop">
<span class="label" :class="{required:row.required}" v-text="row.label"/> <span class="label" :class="{required:row.required}" v-text="row.label"/>
<AiAreaPicker v-if="row.type=='area'" @select="v=>$set(form,row.prop,v)" :areaId="$areaId"> <AiAreaPicker v-if="row.type=='area'" @select="v=>$set(form,row.prop,v)" :fullName.sync="form.currentAreaName">
<u-icon name="arrow-right" :label="form.currentAreaName||'请选择'" label-pos="left" color="#ddd"/> <u-icon name="arrow-right" :label="form.currentAreaName||'请选择'" label-pos="left" color="#ddd"/>
</AiAreaPicker> </AiAreaPicker>
<textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999"/> <textarea v-else v-model="form[row.prop]" input-align="right" placeholder="请输入" placeholder-style="color:#999"/>
@@ -53,7 +53,8 @@
<span class="label" :class="{required:row.required}" v-text="row.label"/> <span class="label" :class="{required:row.required}" v-text="row.label"/>
<AiSelect v-if="row.dict" v-model="form[row.prop]" :dict="row.dict"/> <AiSelect v-if="row.dict" v-model="form[row.prop]" :dict="row.dict"/>
<AiDate v-else-if="row.type=='time'" v-model="form[row.prop]"/> <AiDate v-else-if="row.type=='time'" v-model="form[row.prop]"/>
<AiAreaPicker v-else-if="row.type=='area'" @select="v=>$set(form,row.prop,v)" all> <AiAreaPicker v-else-if="row.type=='area'" @select="v=>$set(form,row.prop,v)" all
:fullName.sync="form.birthplaceAreaName">
<u-icon name="arrow-right" :label="form.birthplaceAreaName||'请选择'" label-pos="left" color="#ddd"/> <u-icon name="arrow-right" :label="form.birthplaceAreaName||'请选择'" label-pos="left" color="#ddd"/>
</AiAreaPicker> </AiAreaPicker>
<u-input v-else v-model="form[row.prop]" input-align="right"/> <u-input v-else v-model="form[row.prop]" input-align="right"/>