diff --git a/components/my-tabbar.vue b/components/my-tabbar.vue index 5d70538..3a007b5 100644 --- a/components/my-tabbar.vue +++ b/components/my-tabbar.vue @@ -34,18 +34,24 @@ }, { index: 1, + name: '分类', + img: '/static/fenl.png', + acImg: '/static/fenl1.png', + }, + { + index: 2, name: '发布', img: '/static/center.png', acImg: '/static/center1.png', }, { - index: 2, + index: 3, name: '消息', img: '/static/activity.png', acImg: '/static/activity1.png', }, { - index: 3, + index: 4, name: '我的', img: '/static/my.png', acImg: '/static/my1.png', @@ -154,15 +160,20 @@ break; case 1: uni.switchTab({ - url: '/pages/center/index' + url: '/pages/fenl/index' }) break; case 2: uni.switchTab({ - url: '/pages/activity/index' + url: '/pages/center/index' }) break; case 3: + uni.switchTab({ + url: '/pages/activity/index' + }) + break; + case 4: uni.switchTab({ url: '/pages/my/index' }) diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue index 85c9b41..bff0256 100644 --- a/packageA/my/orderList.vue +++ b/packageA/my/orderList.vue @@ -17,7 +17,7 @@ - + @@ -58,12 +58,12 @@ - + 未开始 - + - + 申请售后 + + + 取消订单 @@ -328,7 +331,30 @@ }, methods: { - + // 取消订单 + cancelOrder() { + uni.$u.http.post('/api/school.newactivity.order/freecancel', { + order_no: this.order_no + }).then(res => { + if (res.code == 1) { + // uni.navigateBack(1) + uni.navigateBack({ + delta: 1, + success: (event) => { + const pages = getCurrentPages() + let prevPage = pages[pages.length - 1] + prevPage.onLoad(prevPage.options) + } + }); + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); + } + }).catch(error => {}); + }, // 批量生成二维码 // generateAllQRCodes() { // this.qrList.forEach((item, index) => { diff --git a/pages.json b/pages.json index cc37688..aa228d4 100644 --- a/pages.json +++ b/pages.json @@ -17,6 +17,13 @@ "navigationStyle": "custom" //单个页面设置 } }, + { + "path": "pages/fenl/index", + "style": { + "navigationBarTitleText": "分类", + "navigationStyle": "custom" //单个页面设置 + } + }, { "path": "pages/index/Apply", "style": { @@ -55,7 +62,7 @@ { "path": "pages/center/index", // 确保此处与 tabBar 匹配 "style": { - "navigationBarTitleText": "选课中心", + "navigationBarTitleText": "", "navigationStyle": "custom" //单个页面设置 } } @@ -309,6 +316,10 @@ "pagePath": "pages/index/index", "text": "首页" }, + { + "pagePath": "pages/fenl/index", // 更新为与 pages 数组一致 + "text": "分类" + }, { "pagePath": "pages/center/index", // 更新为与 pages 数组一致 "text": "发布活动" diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 97ad079..389888e 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -100,9 +100,9 @@ uni.$u.http.get('/api/index/init', {}).then(res => { if (res.code == 1) { if (res.data.base_info.miniapp_activity_swtich == 1) { - this.tabBarShow = 2; + this.tabBarShow = 3; } else { - this.tabBarShow = 1; + this.tabBarShow = 2; } } }).catch(error => { diff --git a/pages/center/index.vue b/pages/center/index.vue index f49d731..98673d4 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -173,7 +173,7 @@ + @close="close" @open="open" :custom-style="popupStyle" :closeOnClickOverlay="false"> 《免责声明》 @@ -190,9 +190,10 @@ - + :closeable="false" @close="closebq" :closeOnClickOverlay="false"> + + 确认 @@ -239,7 +240,7 @@ - + @@ -571,6 +572,9 @@ export default { }, open() { this.show = true + setTimeout(() => { + this.agree = true + }, 5000) }, opentuikuan() { this.tuikuan = true; @@ -662,6 +666,7 @@ export default { if (name === '1') { //单张 // this.list1 = this.fileList1.length > 0 ? this.fileList1[0].url : ''; + this.list1 = this.fileList1.map(item => item.url).join(','); console.log('Updated list1:', this.list1); } @@ -1319,12 +1324,12 @@ export default { width: 750rpx; height: 1040rpx; top: -164rpx; - z-index: 1; + z-index: 100; } .bqlist { - margin-top: 160rpx; - z-index: 1; + margin-top: 80rpx; + z-index: 200; margin-left: 80rpx; height: 100%; @@ -1383,7 +1388,7 @@ export default { .popup_tkall { // height: 1100rpx; - + z-index: 100; .popup_tk { font-size: 42rpx; font-weight: 800; diff --git a/pages/fenl/index.vue b/pages/fenl/index.vue new file mode 100644 index 0000000..4c20470 --- /dev/null +++ b/pages/fenl/index.vue @@ -0,0 +1,948 @@ + + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index f6b9c35..6277fe3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -46,7 +46,7 @@ - + + + @@ -183,8 +186,6 @@ - - 暂无数据 @@ -207,7 +208,7 @@ - + 联系人 @@ -217,7 +218,7 @@ - + 联系电话 @@ -227,7 +228,7 @@ - + 企业名称 @@ -237,7 +238,7 @@ - + 企业地址 @@ -247,7 +248,7 @@ - + 经营/热爱的户外运动 @@ -778,7 +779,7 @@ } else { wx.navigateToMiniProgram({ appId: 'wx867e324c44b9e016', - path: 'packageA/center/detail?id=' + id, + path: 'pages/center/detail?id=' + id, extraData: res.data, envVersion: 'trial', success(res) { diff --git a/pages/my/index.vue b/pages/my/index.vue index d05a4ee..185bd04 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -418,9 +418,9 @@ export default { if (res.code == 1) { this.init = res.data.customer_service; if( res.data.base_info.miniapp_activity_swtich == 1){ - this.tabBarShow = 3; + this.tabBarShow = 4; }else{ - this.tabBarShow = 2; + this.tabBarShow = 3; } uni.setStorageSync('init', res.data.customer_service) uni.setStorageSync('init_info', res.data.activity_info) diff --git a/static/fenl.png b/static/fenl.png new file mode 100644 index 0000000..569c469 Binary files /dev/null and b/static/fenl.png differ diff --git a/static/fenl1.png b/static/fenl1.png new file mode 100644 index 0000000..2599237 Binary files /dev/null and b/static/fenl1.png differ diff --git a/static/homehot.png b/static/homehot.png new file mode 100644 index 0000000..6d3d186 Binary files /dev/null and b/static/homehot.png differ