diff --git a/components/fuyu-MixSwiper/fuyu-MixSwiper.vue b/components/fuyu-MixSwiper/fuyu-MixSwiper.vue index 0e3fffe..950b99f 100644 --- a/components/fuyu-MixSwiper/fuyu-MixSwiper.vue +++ b/components/fuyu-MixSwiper/fuyu-MixSwiper.vue @@ -171,11 +171,11 @@ this.videoIndex = null this.videoId = null this.autoplaySwiper = true - if (!type) { - setTimeout(v => { - this.swiperCurrent++ - }, 500) - } + // if (!type) { + // setTimeout(v => { + // this.swiperCurrent++ + // }, 500) + // } }, } } diff --git a/pages/Negotiate/agreement.vue b/packageA/Negotiate/agreement.vue similarity index 100% rename from pages/Negotiate/agreement.vue rename to packageA/Negotiate/agreement.vue diff --git a/pages/Negotiate/privacy.vue b/packageA/Negotiate/privacy.vue similarity index 100% rename from pages/Negotiate/privacy.vue rename to packageA/Negotiate/privacy.vue diff --git a/pages/afterSales/index.vue b/packageA/afterSales/index.vue similarity index 100% rename from pages/afterSales/index.vue rename to packageA/afterSales/index.vue diff --git a/pages/afterSales/info.vue b/packageA/afterSales/info.vue similarity index 100% rename from pages/afterSales/info.vue rename to packageA/afterSales/info.vue diff --git a/pages/afterSales/list.vue b/packageA/afterSales/list.vue similarity index 98% rename from pages/afterSales/list.vue rename to packageA/afterSales/list.vue index 2a0b2b0..39f4f3e 100644 --- a/pages/afterSales/list.vue +++ b/packageA/afterSales/list.vue @@ -19,7 +19,7 @@ --> + :key="index" @click.stop="openUrl('/packageA/afterSales/info?id='+item.id)"> @@ -120,7 +120,7 @@ // 售后 service(id) { uni.navigateTo({ - url: "/pages/afterSales/index?id=" + id + url: "/packageA/afterSales/index?id=" + id }) }, // 获取列表 diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue index 1349ff8..3b21139 100644 --- a/packageA/my/cancelActivity.vue +++ b/packageA/my/cancelActivity.vue @@ -67,7 +67,7 @@ - 核销订单 + 确认核销 diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index 5b440fb..2eba860 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -313,7 +313,7 @@ // 售后 service(id) { uni.navigateTo({ - url: "/pages/afterSales/index?id=" + id + url: "/packageA/afterSales/index?id=" + id }) }, // 核销码 diff --git a/packageA/my/makeList.vue b/packageA/my/makeList.vue index 613e1c1..5cb5933 100644 --- a/packageA/my/makeList.vue +++ b/packageA/my/makeList.vue @@ -342,7 +342,7 @@ // 售后 service(id) { uni.navigateTo({ - url: "/pages/afterSales/index?id=" + id + url: "/packageA/afterSales/index?id=" + id }) }, headerSelected(status) { diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue index 1828229..5f673ab 100644 --- a/packageA/my/orderList.vue +++ b/packageA/my/orderList.vue @@ -454,7 +454,7 @@ export default { // 售后 service(id) { uni.navigateTo({ - url: "/pages/afterSales/index?id=" + id, + url: "/packageA/afterSales/index?id=" + id, }); }, // 核销码 diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index 1d59c94..235008b 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -712,7 +712,7 @@ //申请售后 service(id) { uni.navigateTo({ - url: `/pages/afterSales/index?id=${id}` + url: `/packageA/afterSales/index?id=${id}` }) }, // 取消选择 diff --git a/pages.json b/pages.json index 12608c5..6e87d41 100644 --- a/pages.json +++ b/pages.json @@ -52,7 +52,19 @@ "navigationStyle": "custom" //单个页面设置 } }, - + { + "path": "pages/center/detailSys", + "style": { + "navigationBarTitleText": "", // 发布活动详情 + "navigationStyle": "custom" + } + }, + { + "path": "pages/center/signDetail", + "style": { + "navigationBarTitleText": "报名信息" + } + }, { "path": "pages/center/MechanismDetail", "style": { @@ -77,65 +89,55 @@ "navigationBarTitleText": "支付参加" } }, - { - "path": "pages/index/group", - "style": { - "navigationBarTitleText": "一键进群" - } - }, - { - "path": "pages/index/previousList", - "style": { - "navigationBarTitleText": "往期课程" - } - }, - { - "path": "pages/afterSales/index", - "style": { - "navigationBarTitleText": "售后订单" - } - }, - - { - "path": "pages/afterSales/list", - "style": { - "navigationBarTitleText": "售后订单" - } - }, - { - "path": "pages/afterSales/info", - "style": { - "navigationBarTitleText": "售后订单" - } - }, - { - "path": "pages/Negotiate/agreement", - "style": { - "navigationBarTitleText": "用户协议" - } - }, - { - "path": "pages/Negotiate/privacy", - "style": { - "navigationBarTitleText": "隐私政策" - } - }, { "path": "pages/activity/stationStemys", "style": { - "navigationBarTitleText": "系统消息" + "navigationBarTitleText": "系统消息", + "navigationStyle": "custom" } } ], "subPackages": [{ "root": "packageA", "pages": [ + { + "path": "afterSales/index", + "style": { + "navigationBarTitleText": "售后订单" + } + }, + + { + "path": "afterSales/list", + "style": { + "navigationBarTitleText": "售后订单" + } + }, + { + "path": "afterSales/info", + "style": { + "navigationBarTitleText": "售后订单" + } + }, + { + "path": "Negotiate/agreement", + "style": { + "navigationBarTitleText": "用户协议" + } + }, + { + "path": "Negotiate/privacy", + "style": { + "navigationBarTitleText": "隐私政策" + } + }, { "path": "my/person-detail", "style": { "navigationBarTitleText": "个人中心" } }, + { "path": "my/makeList", "style": { diff --git a/pages/activity/index.vue b/pages/activity/index.vue index c3d6b6e..4976b42 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -69,7 +69,7 @@ unread_activity_number: '', keywords: '', page: 1, - limit: 10, + limit: 20, loadStatus: 'loading', status: '', mini_type: '', @@ -339,10 +339,10 @@ } .center { width: 690rpx; - margin-bottom: 200rpx; + // margin-bottom: 200rpx; position: fixed; margin-top: 130rpx; - height: 100%; + height: 1120rpx; overflow-y: auto; .list { width: 690rpx; diff --git a/pages/activity/stationStemys.vue b/pages/activity/stationStemys.vue index f3e0d3c..39986f2 100644 --- a/pages/activity/stationStemys.vue +++ b/pages/activity/stationStemys.vue @@ -1,17 +1,43 @@ @@ -22,8 +48,7 @@ page: 1, limit: 10, list:[], - loadStatus:'', - loadStatus: 'loading' + loadStatus: 'loading', }; }, onLoad(option) { @@ -36,13 +61,39 @@ this.getDetail(); }, methods: { + // 单独已读 + only(id,type){ + if (type == 1) { + uni.$u.http.get('/api/school/message/detail', { + params: { + id: id, + } + }).then(res => { + if (res.code == 1) { + uni.showToast({ + title: '确认已读', + icon: 'none', + duration: 2000 + }); + this.getDetail(); + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); + } + }).catch(error => {}); + } + + }, getDetail() { uni.$u.http.get('/api/school/message/message_list', { params: { page: this.page, limit: this.limit, status: 'system,activity', - type: "1", + type: "1,2", } }).then(res => { if (res.code == 1) { @@ -57,6 +108,33 @@ } }).catch(error => {}); }, + + // 一键已读 + one() { + uni.$u.http.get('/api/school/message/batch', { + params: { + id: '*', + status: 'system,activity', + mini_type: '', + event: '' + } + }).then(res => { + if (res.code == 1) { + uni.showToast({ + title: '全部已读', + icon: 'none', + duration: 2000 + }); + this.getDetail(); + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); + } + }).catch(error => {}); + }, // 重置列表 resetLists() { this.page = 1; @@ -71,8 +149,23 @@ .box { background: #F1F2F8; width: 750rpx; - height: 100vh; + height: 100%; margin: 0 auto; + + .nav_txt{ + display: flex; + justify-content: center; + align-items: center; + } + .u-nav-slot{ + width: 64rpx; + height: 64rpx; + border-radius: 32rpx 32rpx 32rpx 32rpx; + border: 1rpx solid #EBEBEB; + display: flex; + justify-content: center; + align-items: center; + } } .w-100 { diff --git a/pages/center/detail.vue b/pages/center/detail.vue index efd848a..ddbe374 100644 --- a/pages/center/detail.vue +++ b/pages/center/detail.vue @@ -114,9 +114,9 @@ 已收藏 --> - - 支付并参加 - 免费参加 + + 支付并参加 + 免费参加 - - - - - - - - {{item.nickname}} - - 报名成功 - - {{ item.createTime }} - + + + 报名信息 + + + + 查看全部 + + + + + + {{item.user.nickname}} + 订单编号：{{item.order_no}} + 数量：{{item.num}} + + + + + @@ -110,41 +117,19 @@ - + - - - - - - - + - - 支付并参加 - 免费参加 - 立即支付 - 确认报名 - 我要预约 - 确认时间 - + + + 取消活动 + @@ -152,114 +137,31 @@ - - + + - {{detail.title}} + 是否确认取消活动 - ￥{{detail.price}} - 公益 + 取消活动后，如果再次举办活动需重新设置并提交信息审核 - - - - {{formattedTime.formattedTime}} (共计{{formattedTimeList.length}}节) - - - - {{detail.address_detail}} - - - - - 立 即 支 付 - 确 认 报 名 + + + 关闭 + 确认取消 - + - - - - 保 存 海 报 - - - - - - - + @@ -270,12 +172,7 @@ } from '../../utils/dateFormat' export default { computed: { - // formattedTitle() { - // if (this.detail.title.length > 9) { - // return this.detail.title.slice(0, 9) + '..'; - // } - // return this.detail.title; - // }, + formattedTimeList() { return this.timeList.map(item => { const startTime = dayjs.unix(item.start_time).format('YYYY-MM-DD HH:mm:ss'); @@ -303,6 +200,8 @@ img: 'width: 100%' }, + mysignList:[], + join_info:{}, value_slide:0, scrollTop: 0, overlay: false, @@ -310,7 +209,7 @@ path: 'https://testy.hschool.com.cn//uploads/20241219/3406baf51fcc28c63c31ebcee5c9c75e.jpg', uloadingShow: false, show: false, - buyShow: false, + cancelsShow: false, type: 0, // 0 支付 1 立即购买 2 预约 3确认时间 id: 1, count: 5, @@ -322,12 +221,13 @@ qrUrl: '', is_collect: 0, popupStyle: { - width: '690rpx', - height: '716rpx', + width: '640rpx', + height: '414rpx', margin: '0 auto', // 水平居中 display: 'flex', justifyContent: 'flex-start', - alignItems: 'center' + alignItems: 'center', + borderRadius: '50rpx' }, timeList: [], selectedTime: null, @@ -367,9 +267,8 @@ } console.log(options.id) this.getDetail() - // this.getPeople() - // this.getTime() - this.getShare() + this.getPeople() + }, methods: { @@ -393,28 +292,6 @@ }); } }, - getShare() { - uni.$u.http.post('/api/wechat_util/link', { - path: 'pages/center/detail', - query: `id=${this.id}`, - }).then(res => { - if (res.code == 1) { - this.qrUrl = res.data.url_link - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }); - } - }).catch(error => { - uni.showToast({ - title: '请求失败，请稍后再试', - icon: 'none', - duration: 2000 - }); - }); - }, // 时间转换函数 timeago(timestamp) { const now = new Date().getTime(); // 当前时间（毫秒） @@ -433,12 +310,6 @@ } }, - // sharePoster() { - // //获取带参数二维码并传递 - // this.is_show_model = false - // this.$refs.poster.showCanvas() - // }, - // 获取课时规格 getTime() { uni.$u.http.get('/api/school/classes/spec', { @@ -464,20 +335,23 @@ }); }); }, + toSgindetail(){ + uni.navigateTo({ + url: '/pages/center/signDetail?id=' + this.id + }); + }, // 获取报名详情 getPeople() { const that = this - uni.$u.http.get('/api/school/classes/people', { + uni.$u.http.get('/api/school.newworker.activity.order/order_list', { params: { - id: that.id, - } + activity_id: that.id, + page: 1, + limit: 1000, + }, }).then(res => { if (res.code == 1) { - that.processPeopleData(res.data).then(processedData => { - that.people = processedData; - console.log('that.people', that.people) - }); - + this.mysignList = res.data.list; } else { that.showErrorToast(res.msg); } @@ -486,21 +360,6 @@ }); }, - // 数据转换 - processPeopleData(data) { - return new Promise((resolve) => { - const paidUserData = data.paid_user_data.map(item => { - item.createTime = this.timeago(item.time); - return item; - }).reverse(); - const unpaidUserData = data.unpaid_user_data - const processedData = { - unpaid_user_data: unpaidUserData, - paid_user_data: paidUserData - } - resolve(processedData); - }); - }, // 提示 showErrorToast(msg) { uni.showToast({ @@ -509,6 +368,29 @@ duration: 2000 }); }, + //取消活动 + cancels(){ + uni.$u.http.post('/api/school.new_activity/cancel', { + id: this.id, + }).then(res => { + if (res.code == 1) { + uni.showToast({ + title: '取消成功', + icon: 'success', + duration: 2000 + }) + uni.redirectTo({ + url: "/packageA/my/orderList?status=-1" + }) + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }).catch(error => {}); + }, // 获取详情 getDetail() { uni.$u.http.get('/api/school.new_activity/detail', { @@ -517,7 +399,8 @@ } }).then(res => { if (res.code == 1) { - this.detail = res.data.detail + this.detail = res.data.detail; + this.join_info = res.data.detail.join_info; this.value_slide = res.data.detail.join_info.percent; if (res.data.detail.is_collect != 0) { this.is_collect = 1 @@ -538,11 +421,10 @@ } }).catch(error => {}); }, - // 报名 0 支付 1 立即购买 2 预约 3确认时间 sign() { - // this.buyShow = true + // this.cancelsShow = true // this.type = 3; uni.navigateTo({ @@ -554,10 +436,9 @@ this.uloadingShow = true this.getMoney() }, - // 购买弹窗 type = 0 支付 1 立即购买 2 预约 3确认时间 - buyOpen() { - this.buyShow = true - this.type = 1 + // 取消弹窗 + cancelsOpen() { + this.cancelsShow = true }, // 预约弹窗 type = 2 0 支付 1 立即购买 2 预约 3确认时间 open() { @@ -647,10 +528,8 @@ this.selectedTime = null this.show = false }, - buyClose() { - this.type = 0 - this.selectedTime = null - this.buyShow = false + cancelsClose() { + this.cancelsShow = false }, // 返回首页 toIndex() { @@ -709,29 +588,6 @@ }, - base64ToFilePath(base64data, callback) { - const time = new Date().getTime(); - const imgPath = `${wx.env.USER_DATA_PATH}/addFriends${time}share_qrcode.png`; - const imageData = base64data.replace(/^data:image\/\w+;base64,/, ""); - const fileSystemManager = uni.getFileSystemManager(); - - fileSystemManager.writeFile({ - filePath: imgPath, - data: imageData, - encoding: 'base64', - success: () => { - callback(imgPath); - }, - fail: (err) => { - console.error('Write file failed:', err); - uni.showToast({ - title: '写入文件失败', - icon: 'none' - }); - } - }); - }, - // 收藏和取消 Collect(number) { uni.$u.http.post('/api/school/classes/collect', { @@ -796,7 +652,6 @@ if (res.code == 1) { this.PayPirce = res.data.order_data.totalprice this.order_no = res.data.order_no - this.create(this.order_no, this.PayPirce) } else { uni.showToast({ title: res.msg, @@ -808,88 +663,6 @@ this.uloadingShow = false }).catch(error => { - }); - }, - // 创建订单 - create(order_no, PayPirce) { - uni.$u.http.post('/api/school.newactivity.order/create', { - order_no: order_no, - }).then(res => { - if (res.code == 1) { - if (PayPirce != 0) { - this.pament() - } else { - this.uloadingShow = false - uni.showToast({ - title: '创建成功', - icon: 'success', - duration: 2000, - complete: function() { - setTimeout(function() { - uni.redirectTo({ - url: "/packageA/my/orderList?status=" + 3 - }) - }, 2000); - } - }); - } - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - that.uloadingShow = false - - // _this.$api.toast(res.msg); - } - }).catch(error => { - - }); - }, - // 支付 - pament() { - let that = this - that.uloadingShow = false - uni.$u.http.post('/api/school.newactivity.pay/payment', { - type: 'wechat', - order_no: that.order_no, - platform: 'miniapp' - }).then(res => { - if (res.code == 1) { - wx.requestPayment({ - timeStamp: res.data.paydata.timeStamp, //时间戳 - nonceStr: res.data.paydata.nonceStr, //随机字符串 - package: res.data.paydata.package, //prepay_id - signType: res.data.paydata.signType, //签名算法MD5 - paySign: res.data.paydata.paySign, //签名 - success(res) { - if (res.errMsg == "requestPayment:ok") { - that.order_no = '' - uni.redirectTo({ - url: "/packageA/my/orderList?status=" + 3 - }) - console.log('支付成功', res) - } else { - that.uloadingShow = false - console.log('支付失败') - } - }, - fail(res) { - that.uloadingShow = false - console.log('支付失败', res) - } - }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - // _this.$api.toast(res.msg); - } - }).catch(error => { - }); }, }, @@ -1061,7 +834,9 @@ height: 64rpx; border-radius: 16rpx 16rpx 16rpx 16rpx; margin: 20rpx 0 16rpx 0; - + .smalld { + margin-left: 0 !important; + } .number { height: 40rpx; @@ -1081,23 +856,23 @@ margin: 0 22rpx 0 4rpx; } } - .value_slide{ - width: 50%; - ::v-deep .uni-slider-handle-wrapper{ - height: 10rpx; - } - ::v-deep .uni-slider-handle{ - background: url('@/static/detail/qiu.png') !important; - border-radius: 0; - background-size: 52rpx 52rpx !important; - } - ::v-deep .uni-slider-value{ - color: #323232; - &::after{ - content: '%'; - } - } - } + // .value_slide{ + // width: 50%; + // ::v-deep .uni-slider-handle-wrapper{ + // height: 10rpx; + // } + // ::v-deep .uni-slider-handle{ + // background: url('@/static/detail/qiu.png') !important; + // border-radius: 0; + // background-size: 52rpx 52rpx !important; + // } + // ::v-deep .uni-slider-value{ + // color: #323232; + // &::after{ + // content: '%'; + // } + // } + // } } @@ -1106,9 +881,10 @@ background: #ffffff; margin-top:20rpx; border-radius: 44rpx; + margin-bottom: 150rpx; .third-top{ font-family: PingFang SC, PingFang SC; - font-weight: 400; + font-weight: bold; font-size: 36rpx; color: #323232; line-height: 50rpx; @@ -1139,6 +915,74 @@ width: 690rpx; } } + .third-center-gro { + margin-top: 28rpx; + width: auto; + height: 160rpx; + overflow: hidden; + position: relative; + margin-left: 30rpx; + margin-right: 30rpx; + margin-bottom: 30rpx; + .scroll-container { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + // animation: scroll 12s linear infinite; + // @keyframes scroll { + // 0% { + // transform: translateY(0); + // } + + // 100% { + // transform: translateY(calc(-100% + 8 * 100px)); + // /* 8 * 100px 是假设每个项目的宽度为 100px */ + // } + // } + .t1_name{ + width: 240rpx; + height: 36rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 26rpx; + color: #3D3D3D; + line-height: 36rpx; + text-align: left; + font-style: normal; + text-transform: none; + } + .t1_order{ + width: 310rpx; + height: 36rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 26rpx; + color: #3D3D3D; + line-height: 36rpx; + text-align: left; + font-style: normal; + text-transform: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + .t1_num{ + width: 103rpx; + height: 36rpx; + + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 26rpx; + color: #3D3D3D; + line-height: 36rpx; + text-align: left; + font-style: normal; + text-transform: none; + } + } + } @@ -1200,16 +1044,20 @@ height: 118rpx; } } - + .bottom_fot{ + width: 100%; + height: 147rpx; + background: #FFFFFF; + position: fixed; + bottom: 0; + } .footer-right { - position: absolute; - right: 30rpx; - width: 487rpx; - height: 102rpx; - background: url('@/static/detail/shangche.png'); - background-size: 487rpx 102rpx; + margin: 0 auto; + width: 690rpx; + height: 90rpx; + background: #323232; border-radius: 200rpx; - + margin-top: 30rpx; span { font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; font-weight: 400; @@ -1221,16 +1069,19 @@ .popupBox { - width: 690rpx; - height: 716rpx; - + width: 640rpx; + height: 414rpx; + background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/confirm2.png"); + background-size: 100%; + background-repeat:no-repeat; + border-radius: 44rpx; .pop-header { width: 100%; - background-image: url("/static/center/bg.png"); + background-repeat: no-repeat; background-position: left bottom; - height: 265rpx; - + height: 414rpx; + margin-top: 80rpx; span { font-family: PingFang SC, PingFang SC; font-weight: 400; @@ -1239,31 +1090,30 @@ } .name { - width: 594rpx; - height: 66rpx; - font-family: Source Han Sans CN, Source Han Sans CN; - font-weight: bold; - font-size: 44rpx; - color: #222222; - margin-top: 80rpx; + width: 288rpx; + height: 36rpx; + font-family: PingFang SC Bold, PingFang SC Bold; + font-weight: 400; + font-size: 36rpx; + color: #202020; + line-height: 36rpx; + text-align: center; + font-style: normal; + text-transform: none; } .price { - width: 594rpx; - height: 66rpx; - font-family: Source Han Sans CN, Source Han Sans CN; - font-weight: bold; - font-size: 44rpx; - color: #FF4810; - margin-top: 16rpx; - - span { - font-family: PingFang SC, PingFang SC; - font-weight: 800; - font-size: 36rpx; - color: #FF2323; - line-height: 32rpx; - } + width: 520rpx; + height: 68rpx; + margin-top: 30rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #202020; + line-height: 34rpx; + text-align: center; + font-style: normal; + text-transform: none; } } @@ -1276,22 +1126,28 @@ .popup-footer { position: absolute; - left: 48rpx; - bottom: 48rpx; + left: 75rpx; + bottom: 60rpx; span { - width: 594rpx; - height: 100rpx; - background: #222222; + width: 230rpx; + height: 90rpx; + background: #323232; border-radius: 200rpx 200rpx 200rpx 200rpx; - font-family: Source Han Sans CN, Source Han Sans CN; - font-weight: bold; + font-family: PingFang SC Regular, PingFang SC Regular; + font-weight: 400; font-size: 32rpx; - color: #BEEE03; + color: #BBFC5B; display: flex; justify-content: center; align-items: center; } + .span1{ + background: rgba(193, 193, 193, 0.22); + color: #202020; + margin-right: 30rpx; + } + } @@ -1303,39 +1159,7 @@ border-radius: 0rpx 0rpx 0rpx 0rpx; } - .times { - width: 93%; - - .selectTime { - width: 288rpx; - height: 50rpx; - background: #FFFFFF; - border-radius: 12rpx 12rpx 12rpx 12rpx; - border: 1rpx solid #D9D9D9; - color: #4B4B4B; - font-family: 'PingFang SC', 'PingFang SC'; - font-weight: 500; - font-size: 24rpx; - padding-left: 15rpx; - cursor: pointer; - margin: 24rpx 32rpx 0 0; - white-space: nowrap; - /* 防止文本换行 */ - text-overflow: ellipsis; - /* 超出部分显示省略号 */ - overflow: hidden; - /* 隐藏超出部分 */ - text-align: left; - /* 文字靠左对齐 */ - line-height: 50rpx; - /* 垂直居中对齐 */ - box-sizing: border-box; - /* 确保 padding 和 border 不影响宽度和高度 */ - display: inline-block; - /* 确保容器内文字正确对齐 */ - } - - } + .selectTime.selected { width: 288rpx; @@ -1575,4 +1399,57 @@ align-items: center; } } + + + \ No newline at end of file diff --git a/pages/center/index.vue b/pages/center/index.vue index d17f0f7..a652c77 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -6,7 +6,7 @@ - + @@ -134,11 +134,12 @@ - - - - + + + + + 确认发布 + + + + + {{item.user.realname ? item.user.realname : item.user.nickname.slice(0,5)}} + + + + 订单编号：{{item.order_no}} + 数量：{{item.num}} + + + + + + + + diff --git a/pages/index/group.vue b/pages/index/group.vue deleted file mode 100644 index f24124f..0000000 --- a/pages/index/group.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - diff --git a/pages/index/index.vue b/pages/index/index.vue index 64aacfd..e3fa11b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,121 +33,121 @@ + + + + - - - - - - - - - - - {{ tab.name }} + + + + + + + {{ tab.name }} + + + + - - - - - - - - - + + + + + - - - {{ item.title }} - - - - {{ item.user.nickname }} - {{ item.teacher.name }} - - #{{ items_t }} - - - - - - {{ '报名中' }} - - {{ dateWeeks(item.start_time) }} - {{ item.address_detail }} + + {{ item.title }} + + + + {{ item.user.nickname }} + {{ item.teacher.name }} + + #{{ items_t }} + - + + + {{ '报名中' }} + + {{ dateWeeks(item.start_time) }} + {{ item.address_detail }} + - - - + + + + + + - - - - - - + + + + + + + + {{ Number(item.join_info.people_number)+"人已上车" }} + + + + 已结束 - - {{ Number(item.join_info.people_number)+"人已上车" }} - + + 上车 + + - - 已结束 - - - 上车 - + - - - - + @@ -250,7 +250,9 @@ export default { }; }, onLoad() { - uni.hideTabBar(); + + // uni.hideTabBar(); + }, mounted() { this.videoContext = uni.createVideoContext("myVideo"); //创建视频实例指向video diff --git a/pages/index/previousList.vue b/pages/index/previousList.vue deleted file mode 100644 index bf31823..0000000 --- a/pages/index/previousList.vue +++ /dev/null @@ -1,508 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/my/index.vue b/pages/my/index.vue index c0a49b2..fab2b27 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -42,16 +42,7 @@ - + - + "], @@ -280,65 +271,7 @@ export default { }, ], - list2: [{ - image: '../../static/my/Platform.png', - text: '申请入驻', - url: "/pages/index/Apply", - auth_status: 1 - }, - { - image: '../../static/my/Check.png', - text: '报名审核', - url: "/packageA/my/classCheck", - auth_status: 0 - }, - { - image: '../../static/my/Manage.png', - text: '课程管理', - auth_status: 0, - url: '/packageA/my/management', - }, - { - image: '../../static/my/activity.png', - text: '活动管理', - auth_status: 0, - url: '/packageA/my/ac-management', - }, - { - image: '../../static/my/verification.png', - text: '核销课程', - url: '/packageA/my/cancel', - auth_status: 0 - }, - { - image: '../../static/my/cancal.png', - text: '核销活动', - url: '/packageA/my/cancelActivity', - auth_status: 0 - }, - // { - // image: '../../static/my/list.png', - // text: '订单管理', - // auth_status: 0 - // }, - // { - // image: '../../static/my/phone.png', - // text: '学员管理', - // auth_status: 0 - // }, - { - image: '../../static/my/organization.png', - text: '我的机构', - auth_status: 0, - url: '/pages/center/MechanismDetail', - }, - { - image: '../../static/my/addClass.png', - text: '创建课程', - auth_status: 0, - url: '/packageA/my/addManagement', - } - ] + }; }, // watch: { @@ -375,7 +308,6 @@ export default { }, onShow() { - this.getStatus() this.token = uni.getStorageSync('token'); if (this.token) { this.getUserInfo(); @@ -507,49 +439,6 @@ export default { }); }); }, - // 查看自己的状态 - getStatus() { - uni.$u.http.get('/api/school/shop/auth_info', {}).then(res => { - console.log(this.list2.length, 'this.list2.length') - if (res.code == 1) { - let have_auth = false; - let have_shop = false; - - if (res.data.verification_auth.verification) { - have_auth = true; - } - - if (res.data.auth_status == 1 && res.data.shop_id) { - have_shop = true; - } - - if (have_auth) { - for (let i = 1; i < this.list2.length; i++) { - this.list2[i].auth_status = 1; - } - this.list2[this.list2.length - 1].auth_status = 0; - this.list2[this.list2.length - 2].auth_status = 0; - } - if (have_shop) { - this.list2[0].auth_status = 0; - for (let i = 1; i < this.list2.length; i++) { - this.list2[i].auth_status = 1; - } - this.shop_id = res.data.shop_id - uni.setStorageSync('shop_id', res.data.shop_id) - uni.setStorageSync('apply_info', res.data.apply_info) - this.list2[this.list2.length - 2].url = `/pages/center/MechanismDetail?id=${res.data.shop_id}`; - } - - } - }).catch(error => { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - }) - }, toMycy() { // if (!this.token) { // this.miniLogin() @@ -599,71 +488,72 @@ export default { url: url }); }, - jump(url, type) { - console.log(url) - if (url == '/packageA/my/cancel') { - uni.scanCode({ - success: (res) => { - console.log('扫码结果：' + res.result); - uni.navigateTo({ - url: url + '?res=' + encodeURIComponent(res.result) - }); - }, - fail: (err) => { - console.error('扫码失败：' + err); - uni.showToast({ - title: '扫码已取消', - icon: 'none' - }); - } - }); - } else if (url == '/packageA/my/addManagement') { - uni.$u.http.get('/api/school/shop/auth_info',).then(res => { - if (res.code == 1) { - if (res.data.check_full) { - uni.navigateTo({ - url: "/packageA/my/addManagement?shop_id=" + this.shop_id - }) - } else { - uni.showToast({ - title: '必要展示信息未完善，请先在机构完善展示信息', - icon: 'none', - duration: 2000 - }); - } + //扫码逻辑 + // jump(url, type) { + // console.log(url) + // if (url == '/packageA/my/cancel') { + // uni.scanCode({ + // success: (res) => { + // console.log('扫码结果：' + res.result); + // uni.navigateTo({ + // url: url + '?res=' + encodeURIComponent(res.result) + // }); + // }, + // fail: (err) => { + // console.error('扫码失败：' + err); + // uni.showToast({ + // title: '扫码已取消', + // icon: 'none' + // }); + // } + // }); + // } else if (url == '/packageA/my/addManagement') { + // uni.$u.http.get('/api/school/shop/auth_info',).then(res => { + // if (res.code == 1) { + // if (res.data.check_full) { + // uni.navigateTo({ + // url: "/packageA/my/addManagement?shop_id=" + this.shop_id + // }) + // } else { + // uni.showToast({ + // title: '必要展示信息未完善，请先在机构完善展示信息', + // icon: 'none', + // duration: 2000 + // }); + // } - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }); - } - }).catch(error => { - console.error('请求失败', error); - }); - } else if (url == '/packageA/my/cancelActivity') { - uni.scanCode({ - success: (res) => { - console.log('扫码结果：' + res.result); - uni.navigateTo({ - url: url + '?res=' + encodeURIComponent(res.result) - }); - }, - fail: (err) => { - console.error('扫码失败：' + err); - uni.showToast({ - title: '扫码已取消', - icon: 'none' - }); - } - }); - } else { - uni.navigateTo({ - url: url - }); - } - }, + // } else { + // uni.showToast({ + // title: res.msg, + // icon: 'none', + // duration: 2000 + // }); + // } + // }).catch(error => { + // console.error('请求失败', error); + // }); + // } else if (url == '/packageA/my/cancelActivity') { + // uni.scanCode({ + // success: (res) => { + // console.log('扫码结果：' + res.result); + // uni.navigateTo({ + // url: url + '?res=' + encodeURIComponent(res.result) + // }); + // }, + // fail: (err) => { + // console.error('扫码失败：' + err); + // uni.showToast({ + // title: '扫码已取消', + // icon: 'none' + // }); + // } + // }); + // } else { + // uni.navigateTo({ + // url: url + // }); + // } + // }, close() { this.showPopup = false }, @@ -1159,6 +1049,7 @@ export default { } .popup { + display: flex; flex-direction: column; align-items: center; @@ -1168,16 +1059,16 @@ export default { .img_shouquan { position: absolute; - width: 675rpx; + width: 680rpx; height: 857rpx; - left: -24rpx; - top: -185px; + left: -25rpx; + top: -390rpx; } #txt2 { text-align: center; - margin-top: 220rpx; + margin-top: 200rpx; font-size: 28rpx; color: #525252; margin-bottom: 60rpx; diff --git a/static/center/float.png b/static/center/float.png deleted file mode 100644 index f22ad80..0000000 Binary files a/static/center/float.png and /dev/null differ diff --git a/static/center/jita.jpeg b/static/center/jita.jpeg deleted file mode 100644 index 185b8be..0000000 Binary files a/static/center/jita.jpeg and /dev/null differ diff --git a/static/center/jitavatvr.png b/static/center/jitavatvr.png deleted file mode 100644 index f5d78bd..0000000 Binary files a/static/center/jitavatvr.png and /dev/null differ diff --git a/static/clearicon.png b/static/clearicon.png new file mode 100644 index 0000000..c4442ea Binary files /dev/null and b/static/clearicon.png differ diff --git a/static/detail/bg.png b/static/detail/bg.png new file mode 100644 index 0000000..1a4f686 Binary files /dev/null and b/static/detail/bg.png differ diff --git a/static/detail/hxall.png b/static/detail/hxall.png new file mode 100644 index 0000000..56b93e0 Binary files /dev/null and b/static/detail/hxall.png differ diff --git a/static/detail/hxslice.png b/static/detail/hxslice.png new file mode 100644 index 0000000..dd4baa4 Binary files /dev/null and b/static/detail/hxslice.png differ diff --git a/static/my/jigou.png b/static/my/jigou.png deleted file mode 100644 index c757467..0000000 Binary files a/static/my/jigou.png and /dev/null differ diff --git a/uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue b/uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue index 4133811..23c611a 100644 --- a/uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue +++ b/uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue @@ -67,8 +67,8 @@ justify-content: flex-start; align-items: center; - // margin-top: 40rpx; - margin-left: 40rpx; + margin-top: 20rpx; + // margin-left: 40rpx; width: 90%; font-size: 28rpx; color: $themeColor;