diff --git a/App.vue b/App.vue index c213171..8a518fc 100644 --- a/App.vue +++ b/App.vue @@ -8,8 +8,28 @@ export default { onLaunch: function() { this.initApp() + //开启分享功能 + this.overShare() }, methods: { + /** + * 开启朋友圈分享功能 + * 监听路由切换/自动执行 + */ + overShare() { + wx.onAppRoute((res) => { + // console.log('route', res) + let pages = getCurrentPages() + let view = pages[pages.length - 1] + if (view) { + wx.showShareMenu({ + menus: ['shareAppMessage', 'shareTimeline'], + success(res) {}, + fail(e) {} + }) + } + }) + }, // 初始化应用 initApp() { // 初始化应用配置 @@ -30,4 +50,4 @@ \ No newline at end of file + diff --git a/api/wxApi.js b/api/wxApi.js index 8fcac86..26cc54a 100644 --- a/api/wxApi.js +++ b/api/wxApi.js @@ -32,4 +32,12 @@ export function entPay(orderNo) { 'url': '/payApi/entPay?orderNo=' + orderNo, 'method': 'get' }) -} \ No newline at end of file +} + +// 获取urlLink +export function getUrlLink(path, query) { + return request({ + 'url': '/wxApi/getUrlLink?path=' + path + '&query=' + query, + 'method': 'post' + }) +} diff --git a/components/navigation/navigationBar.vue b/components/navigation/navigationBar.vue index 23ab46f..1173686 100644 --- a/components/navigation/navigationBar.vue +++ b/components/navigation/navigationBar.vue @@ -39,7 +39,13 @@ }, methods: { back() { - uni.navigateBack() + console.log('返回'); + if (this.title == '通告详情') { + this.$emit('goIndex') + } else { + uni.navigateBack() + } + }, clearNoReadFun() { this.$emit('clearNoRead') diff --git a/manifest.json b/manifest.json index 3c58582..1ecc42d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,69 +1,69 @@ { - "name": "多点通告", - "appid": "__UNI__5491739", - "description": "", - "versionName": "1.1.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": {}, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios": {}, - "sdkConfigs": {} - } - }, - "quickapp": {}, - "mp-weixin": { - "optimization": { - "subPackages": true - }, - "appid": "wxd96fda6510adb6d3", - "setting": { - "urlCheck": false, - "es6": false, - "minified": true, - "postcss": true - }, - "usingComponents": true - }, - "vueVersion": "2", - "h5": { - "template": "static/index.html", - "devServer": { - "port": 9090, - "https": false - }, - "title": "RuoYi-App", - "router": { - "mode": "history", - "base": "" - } - } -} \ No newline at end of file + "name" : "多点通告", + "appid" : "__UNI__5491739", + "description" : "", + "versionName" : "1.1.0", + "versionCode" : "100", + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : {}, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios" : {}, + "sdkConfigs" : {} + } + }, + "quickapp" : {}, + "mp-weixin" : { + "optimization" : { + "subPackages" : true + }, + "appid" : "wxd96fda6510adb6d3", + "setting" : { + "urlCheck" : false, + "es6" : false, + "minified" : true, + "postcss" : true + }, + "usingComponents" : true + }, + "vueVersion" : "2", + "h5" : { + "template" : "static/index.html", + "devServer" : { + "port" : 9090, + "https" : false + }, + "title" : "RuoYi-App", + "router" : { + "mode" : "history", + "base" : "" + } + } +} diff --git a/pages.json b/pages.json index d0d8e3d..2159a65 100644 --- a/pages.json +++ b/pages.json @@ -17,6 +17,11 @@ "style": { "navigationBarTitleText": "登录" } + }, { + "path": "pages/register", + "style": { + "navigationBarTitleText": "注册" + } }], "subPackages": [{ "root": "pages/common", @@ -234,10 +239,9 @@ } }, { - "path" : "points/points", - "style" : - { - "navigationBarTitleText" : "" + "path": "points/points", + "style": { + "navigationBarTitleText": "" } } ] diff --git a/pages/components/notice-index.vue b/pages/components/notice-index.vue index 4d0c36e..664df4b 100644 --- a/pages/components/notice-index.vue +++ b/pages/components/notice-index.vue @@ -56,13 +56,13 @@ - + 随手转发上传通告赚零花 - 每条轻松赚{{point || ''}}积分 + 每条轻松赚{{point/10}}元 去转发 @@ -415,7 +415,7 @@ }, // 关闭窗口 closeDrawer(e) { - debugger + this.chooseCondition = 9 this.$refs.showRight.close() this.$refs.showRight2.close() @@ -447,10 +447,7 @@ } this.queryParams.sortBy = "new" } else if ('急招' == item) { - //高奖励 - if (!await this.checkIfHasRights(rightsCode.highNewNotice)) { - return - } + this.queryParams.isUrgent = "1" } else if ('平台结算' == item) { //高奖励 diff --git a/pages/index.vue b/pages/index.vue index 89e8f2b..a3cacf2 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -85,6 +85,7 @@ this.refreshUserType() }, onShow() { + console.log("1111") this.refreshUserType() this.$refs.minePage.getDetail() diff --git a/pages/login.vue b/pages/login.vue index 154918a..f60c069 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -85,7 +85,7 @@ } }, created() { - this.getCode() + this.wxLogin() }, methods: { diff --git a/pages/mine/member/member-card.vue b/pages/mine/member/member-card.vue index 33a8b28..823380d 100644 --- a/pages/mine/member/member-card.vue +++ b/pages/mine/member/member-card.vue @@ -204,6 +204,7 @@ this.toLogin(userTypeTemp) } }, + methods: { openVip() { // 在你想触发跳转的地方 @@ -615,4 +616,4 @@ } } } - \ No newline at end of file + diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue index 13d58c9..66bb148 100644 --- a/pages/mine/mine-index.vue +++ b/pages/mine/mine-index.vue @@ -21,7 +21,7 @@ {{userInfo.nickName || ''}} - {{userInfo.cardName||''}} + {{userInfo.cardName||''}} @@ -68,7 +68,7 @@ - 报名{{userInfo.report||'0'}}次 + 可用报名{{userInfo.report||'0'}}次 去提额{{item.unicode}} @@ -229,18 +229,18 @@ memberEndDate: "", } }, - mounted() { - if (null != getJSONData(constant.userInfo)) { - this.userInfo = getJSONData(constant.userInfo) - this.getDetail() - } - }, + mounted() { + if (null != getJSONData(constant.userInfo)) { + this.userInfo = getJSONData(constant.userInfo) + this.getDetail() + } + }, onShow() { - if (null != getJSONData(constant.userInfo)) { - this.userInfo = getJSONData(constant.userInfo) - this.getDetail() - } - }, + if (null != getJSONData(constant.userInfo)) { + this.userInfo = getJSONData(constant.userInfo) + this.getDetail() + } + }, onLoad() { }, @@ -262,11 +262,11 @@ } }, getDetail() { - let param = { - userId: this.userInfo.userId, - userType: this.localUserType - } - console.log(param,'param') + let param = { + userId: this.userInfo.userId, + userType: this.localUserType + } + console.log(param, 'param') queryDetail({ userId: this.userInfo.userId, userType: this.localUserType @@ -285,8 +285,8 @@ } else { this.ifHasCard = false } - console.log(this.userInfo,'THIS.USERINFO') - this.$forceUpdate() + console.log(this.userInfo, 'THIS.USERINFO') + this.$forceUpdate() }) }, /** @@ -667,7 +667,7 @@ padding: 20rpx; .item-text-box { - font-size: 34rpx; + font-size: 30rpx; flex: 1; display: flex; flex-direction: column; diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue index ad7da3b..9330c6d 100644 --- a/pages/notice/detail.vue +++ b/pages/notice/detail.vue @@ -1,6 +1,6 @@