diff --git a/src/project/baiduAI/AppDialogue/AppDialogue.vue b/src/project/baiduAI/AppDialogue/AppDialogue.vue index 4828a8e..65ec5bb 100644 --- a/src/project/baiduAI/AppDialogue/AppDialogue.vue +++ b/src/project/baiduAI/AppDialogue/AppDialogue.vue @@ -1,37 +1,40 @@ @@ -95,7 +100,13 @@ export default { ], current: 1, pages: 2, - areaId: '' + areaId: '', + statusBarHeight: uni.getSystemInfoSync().statusBarHeight, + typeList: [ + {dictValue: '1', dictName: '文本助理'}, + {dictValue: '2', dictName: '日常助理'} + ], + type: '' } }, computed: { @@ -292,6 +303,9 @@ export default { }) } }, + confirmType(val) { + this.type = val[0].value; + }, }, } @@ -305,13 +319,30 @@ page { height: 100vh; background-color: #fff; position: relative; + .top-select { + line-height: 64px; + background: #026AF2; + border-radius: 32px; + position: fixed; + left: 28px; + text-align: center; + padding: 0 24px; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 28px; + color: #FFF; + z-index: 9; + u-icon { + margin-left: 8px; + } + } .service-content { width: 100%; height: 420px; background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png"); background-size: 100vw; background-repeat: no-repeat; - padding-top: 20px; + padding-top: 84px; box-sizing: border-box; .text-content { margin: 0 0 0 32px; diff --git a/src/project/wuxi/AppMine/AppMine.vue b/src/project/wuxi/AppMine/AppMine.vue index 92a8bfc..35b60f9 100644 --- a/src/project/wuxi/AppMine/AppMine.vue +++ b/src/project/wuxi/AppMine/AppMine.vue @@ -24,12 +24,12 @@ -
+
- + + :label="approveLabel" label-color="#E7F2FF" label-pos="left" @click="approve"/>
@@ -39,11 +39,17 @@
- {{ item.label }} + {{ item.label }}
+
@@ -59,31 +65,57 @@ export default { name: "AppMine", appName: "我的", customNavigation: true, + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', computed: { ...mapState(['user', 'token']), - - isApprove: v => v.user?.status == 2, + isApprove() { + return this.user?.status == 2; + }, approveLabel() { - return this.user?.status == 2 ? "已认证" : - this.user?.status == 1 ? "审核中" : - this.user?.status == -1 ? "审核驳回" : "前往认证" + return this.user?.areaId? "已认证" : "前往认证" }, listGroup() { return [ - // [ - // { - // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png", - // label: "我的家庭", - // path: "./myFamily", - // type: 'idNumber' - // }, - // { - // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png", - // label: "我的家乡", - // path: "/mods/AppHometown/AppHometown", - // type: 'token' - // } - // ], + [ + // { + // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png", + // label: "我的家乡", + // path: "/mods/AppHometown/AppHometown", + // type: 'token' + // }, + // { + // icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-wdjt.png", + // label: "我的家庭", + // path: "./myFamily", + // type: 'token' + // }, + { + icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-wdjf.png", + label: "我的积分", + path: "./myIntegral", + type: 'token' + }, + // { + // icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-wdewm.png", + // label: "我的二维码", + // path: "./myHarvestQR", + // type: 'token' + // }, + // { + // icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-sys.png", + // label: "扫一扫", + // path: "./myHarvestQR", + // type: 'scan' + // }, + { + icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-fxxcx.png", + label: "分享小程序", + path: "./myHarvestQR", + type: 'share', + share: true + }, + ], // [ // { // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejifen.png", @@ -114,8 +146,7 @@ export default { this.$refs.login.show(); } else if (!this.isApprove) { if (this.user.status == 0) { - // this.$linkTo('/mods/AppAuth/AppAuth'); - this.$linkTo('./userInfo') + this.$linkTo('/mods/AppAuth/AppAuth'); } else { this.$linkTo('/mods/AppAuth/authSuccess') } @@ -129,16 +160,24 @@ export default { } if (type == 'idNumber') { if (this.user.status == 0) { - // if (!this.user.phone) { - // this.$linkTo('/pages/phone/bingPhoneNumber?from=auth') - // } else { - // this.$linkTo('/mods/AppAuth/AppAuth') - // } - this.$linkTo('./userInfo') + if (!this.user.phone) { + this.$linkTo('/pages/phone/bingPhoneNumber?from=auth') + } else { + this.$linkTo('/mods/AppAuth/AppAuth') + } } else { this.$linkTo(url) } } + if (type == 'scan') { + this.scan() + } + if (type == 'share') { + + } + if (type == 'null') { + this.$u.toast('内容建设中...') + } } else { this.$refs.login.show() } @@ -153,7 +192,7 @@ export default { }, getAuth() { this.$nextTick(() => { - this.token && this.getUserInfo() + this.token && this.getUserInfo('qujing') }) }, onLogout() { @@ -171,13 +210,24 @@ export default { } }) }, + scan() { + uni.scanCode({ + success: (res) => { + var info = JSON.parse(res.result) + uni.navigateTo({url: `./addFamily?avatarUrl=${info.avatarUrl || ''}&nickName=${info.nickName}&openId=${info.openId}`}) + } + }); + } }, - onShow() { + onLoad() { this.getAuth(); + uni.$on('auth',()=> { + this.getAuth(); + }) }, onShareAppMessage() { return { - title: '欢迎使用数字巫溪治理服务一体化平台~', + title: '欢迎使用数字乡村治理服务一体化平台~', path: `/pages/AppModules/AppModules` } }, @@ -200,8 +250,8 @@ export default { .header-info { width: 100%; height: 100%; - background: url("https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-my-nav-bg.png") no-repeat no-repeat; - background-size: 100% 100%; + background: url('https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-top-bg.png') no-repeat; + background: 100% auto; box-sizing: border-box; padding: 240px 0 0 48px; @@ -273,7 +323,7 @@ export default { .approve { position: absolute; left: 50%; - top: 384px; + top: 400px; transform: translateX(-50%); width: 686px; height: 112px; @@ -316,7 +366,7 @@ export default { &:last-child { .desc { - border-bottom: none !important; + // border-bottom: none !important; } } @@ -342,7 +392,7 @@ export default { color: #666666; display: flex; align-items: center; - border-bottom: 1px solid #EEEEEE; + box-sizing: border-box; & > span { width: 100%; @@ -356,6 +406,11 @@ export default { border: none; } } + + .solid { + border-bottom: 1px solid #EEE; + } + .no-border { border-bottom: none; @@ -367,7 +422,6 @@ export default { } } } - .logout { width: 100%; height: 96px; @@ -380,7 +434,7 @@ export default { border-radius: 16px; font-size: 34px; font-weight: 500; - color: #2D7DFF; + color: #4181FF; } } } diff --git a/src/project/wuxi/AppMine/addFamily.vue b/src/project/wuxi/AppMine/addFamily.vue new file mode 100644 index 0000000..1026e40 --- /dev/null +++ b/src/project/wuxi/AppMine/addFamily.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/project/wuxi/AppMine/me.png b/src/project/wuxi/AppMine/me.png index 03b531e..9298b9b 100644 Binary files a/src/project/wuxi/AppMine/me.png and b/src/project/wuxi/AppMine/me.png differ diff --git a/src/project/wuxi/AppMine/me_selected.png b/src/project/wuxi/AppMine/me_selected.png index dff9fca..caec4d0 100644 Binary files a/src/project/wuxi/AppMine/me_selected.png and b/src/project/wuxi/AppMine/me_selected.png differ diff --git a/src/project/wuxi/AppMine/myFamily.vue b/src/project/wuxi/AppMine/myFamily.vue index a544cf9..bffee93 100644 --- a/src/project/wuxi/AppMine/myFamily.vue +++ b/src/project/wuxi/AppMine/myFamily.vue @@ -1,31 +1,31 @@ diff --git a/src/project/wuxi/AppMine/myHarvestQR.vue b/src/project/wuxi/AppMine/myHarvestQR.vue new file mode 100644 index 0000000..44a3a33 --- /dev/null +++ b/src/project/wuxi/AppMine/myHarvestQR.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/src/project/wuxi/AppMine/transferIntrgral.vue b/src/project/wuxi/AppMine/transferIntrgral.vue new file mode 100644 index 0000000..2601932 --- /dev/null +++ b/src/project/wuxi/AppMine/transferIntrgral.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/project/wuxi/AppMine/userInfo.vue b/src/project/wuxi/AppMine/userInfo.vue index 6f3e219..bab7640 100644 --- a/src/project/wuxi/AppMine/userInfo.vue +++ b/src/project/wuxi/AppMine/userInfo.vue @@ -4,11 +4,14 @@

头像

-