diff --git a/manifest.json b/manifest.json index 6f1aff0..3064ccf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ - { +{ "name" : "若依移动端", - "appid" : "__UNI__25A9D80", + "appid" : "__UNI__9285214", "description" : "", "versionName" : "1.1.0", "versionCode" : "100", @@ -14,9 +14,7 @@ "autoclose" : true, "delay" : 0 }, - "modules" : { - "OAuth" : {} - }, + "modules" : {}, "distribute" : { "android" : { "permissions" : [ @@ -29,7 +27,6 @@ "", "", "", - "", "", "", "", diff --git a/pages.json b/pages.json index 8f6266e..39674fc 100644 --- a/pages.json +++ b/pages.json @@ -168,7 +168,9 @@ { "path": "pages/mine/index", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "我的", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { @@ -295,8 +297,8 @@ "text": "工作台" }, { "pagePath": "pages/mine/index", - "iconPath": "static/images/tabbar/mine.png", - "selectedIconPath": "static/images/tabbar/mine_.png", + "iconPath": "static/images/tabbar/tu1-10.png", + "selectedIconPath": "static/images/tabbar/tu1-9.png", "text": "我的" }] }, diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 4e6150a..4f7035b 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -27,7 +27,7 @@ - { +if(e.state == 9){ + queryParams.value.state = null; + +}else{ + queryParams.value.state = e.state; +} +getList(); +} /** 查询活动详情列表 */ function getList() { queryParams.value.params = {}; diff --git a/pages/mine/index.vue b/pages/mine/index.vue index cd09581..2e2391c 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -1,148 +1,72 @@ @@ -152,104 +76,193 @@ import { useStore } from 'vuex' import { useRouter } from 'vue-router' import { ref, getCurrentInstance } from 'vue'; const { proxy } = getCurrentInstance(); +const iconConfig = proxy.iconConfig; +const bjt = iconConfig.bjt; +//+更多 +const gd11 = iconConfig.gd11; +const gd12 = iconConfig.gd12; +const gd13 = iconConfig.gd13; +const gd14 = iconConfig.gd14; +const gd21 = iconConfig.gd21; +const gd22 = iconConfig.gd22; +const gd23 = iconConfig.gd23; +const gd24 = iconConfig.gd24; +//+我的话题 +const ht11 = iconConfig.ht11; +const ht12 = iconConfig.ht12; +const ht13 = iconConfig.ht13; +const ht14 = iconConfig.ht14; +const ht15 = iconConfig.ht15; +// +我的活动 +const hd11 = iconConfig.hd11; +const hd12 = iconConfig.hd12; +const hd13 = iconConfig.hd13; +const hd14 = iconConfig.hd14; +const hd15 = iconConfig.hd15; +const list1 = ref([ + {icon: ht11, title: '全部话题' }, +{ icon: ht12, title: '已发布' }, +{ icon: ht13, title: '审核中' }, +{ icon: ht14, title: '未通过' }, +{ icon: ht15, title: '草稿箱' } +]) +const list2 = ref([ + {icon: hd11, title: '全部活动' }, +{ icon: hd12, title: '已发布' }, +{ icon: hd13, title: '审核中' }, +{ icon: hd14, title: '未通过' }, +{ icon: hd15, title: '草稿箱' } +]) +const list3 = ref([ + {icon: gd11, title: '外卖订单' }, +{ icon: gd12, title: '我的兼职' }, +{ icon: gd13, title: '证件证明' }, +{ icon: gd14, title: '地址管理' }, +{ icon: gd21, title: '优惠卡券' }, +{icon: gd22, title: '联系客服' }, +{ icon: gd23, title: '邀请好友' }, +{ icon: gd24, title: '系统设置' } +]) + +const infoAssist = ref(0) +const followCount = ref(0) +const fanCount = ref(0) - const name = ref(proxy.$store.state.user.name) - const nickName = ref(proxy.$store.state.user.nickName) - const sex = ref(proxy.$store.state.user.sex) - const version = ref(getApp().globalData.config.appInfo.version) - const avatar = ref(proxy.$store.state.user.avatar) - - const info = ()=> { - console.log(avatar); - } - info(); +const name = ref(proxy.$store.state.user.name) +const nickName = ref(proxy.$store.state.user.nickName) +const sex = ref(proxy.$store.state.user.sex) +const version = ref(getApp().globalData.config.appInfo.version) +const avatar = ref(proxy.$store.state.user.avatar) +function handleLogout() { + proxy.$modal.confirm('确定注销并退出系统吗？').then(() => { + proxy.$store.dispatch('LogOut').then(() => { + proxy.$tab.reLaunch('/pages/index') + }) + }) +} - const handleToUserInfo = ()=> { - proxy.$tab.navigateTo('/pages/mine/info/userInfo') - } +const grid1Click1 = (e) => { + console.log(e); +} +const grid1Click2 = (e) => { + console.log(e); +} +const grid1Click3 = (e) => { + console.log(e); +} - function windowHeight() { - return uni.getSystemInfoSync().windowHeight - 50 - } +const info = () => { + console.log(avatar); +} +info(); +function handleToLogin() { + proxy.$tab.reLaunch('/pages/loginInfo/login') +} +const handleToUserInfo = () => { + proxy.$tab.navigateTo('/pages/mine/info/userInfo') +} - function handleToInfo() { - proxy.$tab.navigateTo('/pages/mine/info/index') - } - function handleToEditInfo() { - proxy.$tab.navigateTo('/pages/mine/info/edit') - } - function handleToSetting() { - proxy.$tab.navigateTo('/pages/mine/setting/index') - } - function handleToLogin() { - proxy.$tab.reLaunch('/pages/login') - } - function handleToAvatar() { - proxy.$tab.navigateTo('/pages/mine/avatar/index') - } - function handleLogout() { - proxy.$modal.confirm('确定注销并退出系统吗？').then(() => { - proxy.$store.dispatch('LogOut').then(() => { - proxy.$tab.reLaunch('/pages/index') - }) - }) - } - function handleHelp() { - proxy.$tab.navigateTo('/pages/mine/help/index') - } - function handleAbout() { - proxy.$tab.navigateTo('/pages/mine/about/index') - } - function handleJiaoLiuQun() { - proxy.$modal.showToast('QQ群：①133713780、②146013835') - } - function handleBuilding() { - proxy.$modal.showToast('模块建设中~') - } +function windowHeight() { + return uni.getSystemInfoSync().windowHeight - 50 +} + +function handleToInfo() { + proxy.$tab.navigateTo('/pages/mine/info/index') +} +function handleToEditInfo() { + proxy.$tab.navigateTo('/pages/mine/info/edit') +} +function handleToSetting() { + proxy.$tab.navigateTo('/pages/mine/setting/index') +} + +function handleToAvatar() { + proxy.$tab.navigateTo('/pages/mine/avatar/index') +} + +function handleHelp() { + proxy.$tab.navigateTo('/pages/mine/help/index') +} +function handleAbout() { + proxy.$tab.navigateTo('/pages/mine/about/index') +} +function handleJiaoLiuQun() { + proxy.$modal.showToast('QQ群：①133713780、②146013835') +} +function handleBuilding() { + proxy.$modal.showToast('模块建设中~') +} diff --git a/utils/icon/icon.js b/utils/icon/icon.js index 6545ad8..9796cc8 100644 --- a/utils/icon/icon.js +++ b/utils/icon/icon.js @@ -29,10 +29,42 @@ const cg2x22 = ref(QNDomain + "home/icon/image/png/成功@2x2 (2)_20240605100300 //话题-发布话题 审核失败 const sb2x = ref(QNDomain + "home/icon/image/png/审核失败@2x_20240605101107230.png"); const sb2x1 = ref(QNDomain + "home/icon/image/png/审核失败@2x1_20240605101107230.png"); + +//我的界面 +//+背景图 +const bjt = ref(QNDomain + "home/icon/image/png/bjtu_20240608121940341.png"); + +//+更多 +const gd11 = ref(QNDomain + "home/icon/image/png/gd11_20240608080819017.png"); +const gd12 = ref(QNDomain + "home/icon/image/png/gd12_20240608080819017.png"); +const gd13 = ref(QNDomain + "home/icon/image/png/gd13_20240608080819030.png"); +const gd14 = ref(QNDomain + "home/icon/image/png/gd14_20240608080819028.png"); +const gd21 = ref(QNDomain + "home/icon/image/png/gd21_20240608080819022.png"); +const gd22 = ref(QNDomain + "home/icon/image/png/gd22_20240608080819027.png"); +const gd23 = ref(QNDomain + "home/icon/image/png/gd23_20240608080819044.png"); +const gd24 = ref(QNDomain + "home/icon/image/png/gd24_20240608080819046.png"); +//+我的话题 +const ht11 = ref(QNDomain + "home/icon/image/png/ht11_20240608080819069.png"); +const ht12 = ref(QNDomain + "home/icon/image/png/ht12_20240608080819073.png"); +const ht13 = ref(QNDomain + "home/icon/image/png/ht13_20240608080819079.png"); +const ht14 = ref(QNDomain + "home/icon/image/png/ht14_20240608080819079.png"); +const ht15 = ref(QNDomain + "home/icon/image/png/ht15_20240608080819079.png"); +// +我的活动 +const hd11 = ref(QNDomain + "home/icon/image/png/hd11_20240608080819049.png"); +const hd12 = ref(QNDomain + "home/icon/image/png/hd12_20240608080819056.png"); +const hd13 = ref(QNDomain + "home/icon/image/png/hd13_20240608080819055.png"); +const hd14 = ref(QNDomain + "home/icon/image/png/hd14_20240608080819057.png"); +const hd15 = ref(QNDomain + "home/icon/image/png/hd15_20240608080819068.png"); export default { tu21,tu22,tu23,tu2x, tu51,tu52,tu53,tu512,tu522,tu532, sh2x,sh2x1, cg2x21,cg2x22, sb2x,sb2x1, + + //我的界面 + bjt, + gd11,gd12,gd13,gd14,gd21,gd22,gd23,gd24, + ht11,ht12,ht13,ht14,ht15, + hd11,hd12,hd13,hd14,hd15, } \ No newline at end of file