diff --git a/pages.json b/pages.json index cca5aea..e228fa3 100644 --- a/pages.json +++ b/pages.json @@ -988,6 +988,18 @@ "navigationBarTitleText": "我的收藏", "navigationStyle": "custom" } + }, + { + "path": "pages/jingxuan/selected-skills", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/jingxuan/selected-brands", + "style": { + "navigationStyle": "custom" + } } diff --git a/pages/home/home.vue b/pages/home/home.vue index 4a21518..a7cb1dd 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -87,11 +87,11 @@ - - + + - 认证店铺信息,接单必经之路 - 去入驻 + {{ isSettled ? '完成认证,开启您的接单之路' : '入驻美融融,生意更轻松' }} + {{ isSettled ? '去认证' : '去入驻' }} @@ -109,7 +109,7 @@ 精选品牌 - 更多品牌 + 更多品牌 @@ -126,7 +126,7 @@ 技能集市 - 更多技能 + 更多技能 { @@ -293,7 +301,6 @@ export default { this.userInfo = result.data; uni.setStorageSync("syrId", result.data.id); this.syrId = result.data.id; - // 获取完用户信息后,初始化营业开关的状态 this.initStoreStatus(); @@ -314,7 +321,7 @@ export default { updateTime: this.formatTime(res.data.now_date), waitStart: res.data.dfw || 0, waitFinish: res.data.dwc || 0, - finished: res.data.yqx || 0 // 备注:接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx,或你后期让后端加字段 + finished: res.data.yqx || 0 // 备注:接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx,或后期让后端加字段 }; } }); @@ -385,13 +392,14 @@ export default { type: item.link_name || '平台课程', views: item.browse_num || 0, time: item.create_time ? item.create_time.split(' ')[0] : '', // 只取日期 - coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' + coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video', + typeIcon: item.link_logo || '' }; }); } }); }, - + // 跳转:通知详情页 goToNotice(msg) { if(msg.id) { @@ -422,7 +430,6 @@ export default { // 营业中 / 休息中 按钮逻辑判断 toggleStatus() { - // 校验逻辑保留你之前的认证状态检查 if (!this.isCertified) { uni.showModal({ title: '提示', content: '请先完善认证信息', confirmText: '去完善' }); return; @@ -431,19 +438,15 @@ export default { uni.showToast({ title: '请先配置营业时间', icon: 'none' }); return; } - - // 真正的请求逻辑 let newStatus = this.userInfo.order_taking == 1 ? 2 : 1; request.post("/sj/sjordertaking", { order_taking: newStatus, - sjid: this.syrId // 使用你在 getUserInfo 存入的 sjId/syrId + sjid: this.sjId }).then((res) => { - // 成功后重新拉取最新信息以更新 UI this.getUserInfo(); uni.showToast({ title: newStatus == 1 ? '已开启营业' : '已休息', icon: 'none' }); }); }, - animateScore() { const target = parseFloat(this.orderDetail.score) || 0; if (this.animationTimer) clearInterval(this.animationTimer); @@ -496,7 +499,6 @@ export default { z-index: 0; } - // 通用卡片样式 .card-box { position: relative; z-index: 1; @@ -512,7 +514,6 @@ export default { margin-left: 6rpx; } - // 通用卡片头部 .card-header { display: flex; justify-content: space-between; @@ -556,7 +557,6 @@ export default { } } - // 1. 顶部信息 .header-section { position: relative; z-index: 1; @@ -656,16 +656,15 @@ export default { } } - // 入驻引导卡片 .settlement-guide { - padding: 0; // 去除内部留白,让背景图贴边 + padding: 0; overflow: hidden; .guide-header { width: 100%; height: 248rpx; - background: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png'); background-size: cover; + /* 背景图由动态 style 接管 */ } .guide-body { @@ -698,7 +697,6 @@ export default { } } - // 2. 快捷入口 .quick-actions { display: flex; justify-content: space-around; @@ -725,7 +723,6 @@ export default { } } - // 3. 基础订单 .order-stats-basic { background: linear-gradient( 176deg, #F0F4FF 0%, #FFFFFF 100%); border-radius: 20rpx; @@ -753,7 +750,6 @@ export default { } } - // 4. 详细订单 .order-stats-detail { .detail-content { display: flex; @@ -885,7 +881,6 @@ export default { } } - // 5. 通知横幅 (跑马灯改造) .notice-bar { display: flex; align-items: center; @@ -901,7 +896,7 @@ export default { .notice-swiper { flex: 1; - height: 40rpx; // 限制高度刚好显示一行 + height: 40rpx; line-height: 40rpx; .notice-text { @@ -922,7 +917,6 @@ export default { } } - // 6. 精选品牌 (精简后的包裹容器) .brands-section { padding: 20rpx 20rpx; .brand-grid { @@ -931,13 +925,12 @@ export default { justify-content: space-between; .brand-card-wrap { - width: 48.5%; // 240rpx 宽度 + width: 48.5%; margin-bottom: 14rpx; } } } - // 7. 技能集市 .skills-section { .skill-list { display: flex; diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue new file mode 100644 index 0000000..4fee4f3 --- /dev/null +++ b/pages/jingxuan/selected-brands.vue @@ -0,0 +1,472 @@ + + + + + \ No newline at end of file diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue new file mode 100644 index 0000000..739e6c4 --- /dev/null +++ b/pages/jingxuan/selected-skills.vue @@ -0,0 +1,490 @@ + + + + + \ No newline at end of file