From d2749929001c4f5b7fbc1b83c7f2fb763ca7be5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?= =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com> Date: Wed, 11 Jun 2025 18:28:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=B8=83=E5=B1=80=202.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=B5=B7=E6=8A=A5=203.=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E7=99=BB=E9=99=86=E5=88=A4?= =?UTF-8?q?=E6=96=AD=204.=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=A4=E8=AF=81=E5=88=A4=E6=96=AD=205.=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=B9=A6=E7=A1=AE=E8=AE=A4=206.=E4=BC=98=E5=8C=96=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=B9=A6=E6=A0=B7=E5=BC=8F=207.=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9Etips=E5=BC=B9=E7=AA=97=208.?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E9=A1=BB=E7=9F=A5=209.=E8=BA=AB=E4=BB=BD=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=85=A5=E4=BD=8F?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=8B=BE=E9=80=89=2010.=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=85=A5?= =?UTF-8?q?=E4=BD=8F=E5=BC=B9=E7=AA=97=E7=A1=AE=E8=AE=A4=2011.=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AE=A4=E8=AF=81=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?UI=2012.=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uview-ui/components/u-navbar/u-navbar.vue | 2 +- packageA/afterSales/index.vue | 9 +- packageA/afterSales/info.vue | 2 +- packageA/center/applyDetail.vue | 48 +- packageA/center/detail.vue | 94 +- packageA/center/detailSys.vue | 38 +- packageA/my/orderList.vue | 1971 +++++++++-------- packageA/my/pendinPayStatus.vue | 5 - packageB/card/index.vue | 128 +- packageB/wallet/bank.vue | 28 +- packageB/wallet/index.vue | 67 +- pages/center/index.vue | 232 +- pages/index/index.vue | 18 +- pages/my/index.vue | 4 +- .../cc-protocolBox/cc-protocolBox.vue | 34 +- .../lsl-protocol-popup/lsl-protocol-popup.vue | 2 +- 16 files changed, 1515 insertions(+), 1167 deletions(-) diff --git a/node_modules/uview-ui/components/u-navbar/u-navbar.vue b/node_modules/uview-ui/components/u-navbar/u-navbar.vue index ce243dc..2ee2347 100644 --- a/node_modules/uview-ui/components/u-navbar/u-navbar.vue +++ b/node_modules/uview-ui/components/u-navbar/u-navbar.vue @@ -139,7 +139,7 @@ left: 0; right: 0; top: 0; - z-index: 11; + z-index: 9999; } &__content { diff --git a/packageA/afterSales/index.vue b/packageA/afterSales/index.vue index dffbc24..a48027a 100644 --- a/packageA/afterSales/index.vue +++ b/packageA/afterSales/index.vue @@ -76,7 +76,7 @@ - 确定 + 确定 @@ -99,8 +99,8 @@ - - 确定 + + 确定 @@ -270,6 +270,7 @@ }else{ uni.showToast({ title: res.msg, + icon: 'none', }) } }) @@ -696,7 +697,7 @@ } .popup-content{ height: 500rpx; - margin-bottom: 100rpx; + margin-bottom: 140rpx; // overflow-y: auto; } .popup-content-item{ diff --git a/packageA/afterSales/info.vue b/packageA/afterSales/info.vue index 4ef004f..e2254c0 100644 --- a/packageA/afterSales/info.vue +++ b/packageA/afterSales/info.vue @@ -113,7 +113,7 @@ ￥{{ info.first_refundprice }} ￥{{ - info.real_refundprice }} + info.total_refundprice}} 退款原因 diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue index d129cc5..c4459fd 100644 --- a/packageA/center/applyDetail.vue +++ b/packageA/center/applyDetail.vue @@ -73,7 +73,7 @@ + style="justify-content: flex-start;margin-bottom: 280rpx;"> 报名信息 @@ -124,7 +124,7 @@ - + @@ -137,7 +137,30 @@ style="background: #323232;border-radius: 8rpx;text-align: center;padding: 2rpx 10rpx 10rpx 10rpx;"> {{ detail.refund_info.title }} - + + + + + + + + + 申请退款时间 + 退款比例 + 退款金额 + + + + + + + {{item.refund_time}} + {{item.refund_scale}} + {{item.refund_price}} + + + + - @@ -281,11 +304,11 @@ - 《免责声明》 + 《用户参与须知》 - + @@ -360,7 +383,7 @@ export default { Negotiate: null, // 入驻协议 agree: false, agreeShow: false, - protocolArr: ["<支付协议>"], + protocolArr: "《用户参与须知》", value_slide: 0, scrollTop: 0, userInfo: {}, @@ -516,6 +539,11 @@ export default { }) }, openUrlSuccess() { + uni.showToast({ + title: '订单处理中...', + icon: 'none', + duration: 2000 + }); uni.redirectTo({ url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no }) @@ -960,7 +988,7 @@ export default { }).then(res => { if (res.code == 1) { - this.Negotiate = (res.data.entry_agreement).replace(/\ - + @@ -36,11 +36,16 @@ style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;"> {{ detail.user.nickname }} - + - {{ + {{ detail.refund_info.title }} + {{ + detail.refund_info.title }} @@ -68,10 +73,10 @@ + {{ detail.join_info.people_number }}/{{ detail.join_info.stock >= 10000 ? + '9999+' : detail.join_info.stock}} + 人数 - {{ detail.join_info.people_number }}/{{ detail.join_info.stock >= 10000 ? - '9999+' : detail.join_info.stock}} - 人数 @@ -96,7 +101,7 @@ - 查看 + 查看 @@ -220,17 +225,17 @@ + style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 0rpx;right: 45rpx;"> + custom-style="position:absolute;left:45rpx;right:44rpx;top:0rpx;z-index:100"> + css="display: block; height: 36rpx;color: #3D3D3D; font-size: 28rpx; fontWeight: 600;" /> @@ -244,7 +249,7 @@ css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;" :text="detail.title"> - 活动二维码 - - - - - - - 长按识别二维码进群 - - 如果无法加入或者开启了群验证，可能是成员已满您即将加入由用户自发组织的户外活动，请知悉 - - 确认您已知晓《用户协议》的用户义务与责任平台不对活动真实性作担保，请入群自行辨别 - - 我已知晓 - + 活动二维码 + + + + + + + 长按识别二维码进群 + + 如果无法加入或者开启了群验证，可能是成员已满您即将加入由用户自发组织的户外活动，请知悉 + + 确认您已知晓《用户协议》的用户义务与责任平台不对活动真实性作担保，请入群自行辨别 + + 我已知晓 + @@ -342,7 +345,7 @@ data() { return { - qunShow:false, + qunShow: false, height_sw: '580rpx', style: { // 字符串的形式 @@ -384,9 +387,9 @@ order_no2: '', mobile: '', is_show_model: false, //是否显示分享模态窗 - background: '#ffffff00', + background: '#ffffff', titleStyle: { - color: '#FFFFFF' + color: '#000000' }, }; }, @@ -515,7 +518,7 @@ }, 2000); } }); - + } else { @@ -1049,6 +1052,7 @@ } .box { + padding-top: 175rpx; position: relative; } @@ -1070,10 +1074,14 @@ .top_texts { position: absolute; - top: -151rpx; - right: 68rpx; + top: -148rpx; + right: 30rpx; z-index: 3; color: #ffffff; + width: 200rpx; + text-align: center; + display: flex; + justify-content: center; .xiao { margin-left: 4rpx; @@ -1172,16 +1180,13 @@ font-weight: 400; font-size: 26rpx; color: #323232; - margin-left: 32rpx; + margin-left: 20rpx; } view { span { - width: 24rpx; - height: 24rpx; background: rgba(255, 255, 255, 0.4); border-radius: 24rpx; - margin: 0 22rpx 0 4rpx; } } } @@ -1233,7 +1238,7 @@ .imgs { display: block; - width: 100%; + width: 690rpx; } } @@ -1593,6 +1598,7 @@ width: 100%; height: 100%; z-index: 99999; + .posterClose { position: absolute; // right: 8rpx; @@ -1702,7 +1708,7 @@ .btnList { position: absolute; - bottom: 10rpx; + bottom: 173rpx; display: flex; justify-content: space-around; align-items: self-start; @@ -1811,7 +1817,8 @@ // #endif } - .ck-qrcode{ + + .ck-qrcode { width: 180rpx; height: 70rpx; background: #323232; @@ -1823,6 +1830,7 @@ line-height: 70rpx; text-align: center; } + .btn_1 { width: 95%; height: 90rpx; diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue index 132bf73..b97e561 100644 --- a/packageA/center/detailSys.vue +++ b/packageA/center/detailSys.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue index 64ba5e1..5250bbe 100644 --- a/packageA/my/pendinPayStatus.vue +++ b/packageA/my/pendinPayStatus.vue @@ -83,11 +83,6 @@ 申请售后 - - - - - diff --git a/packageB/card/index.vue b/packageB/card/index.vue index 178c8a7..e8f408b 100644 --- a/packageB/card/index.vue +++ b/packageB/card/index.vue @@ -3,7 +3,7 @@ * - 上传身份证 + 上传身份证 @@ -35,7 +35,7 @@ * - 身份证信息 + 身份证信息 @@ -58,7 +58,36 @@ - 提交信息 + + + + 提交信息 + 提交信息 + + + 《【搭+】入驻协议》 + + + + + + + 我同意 + 我同意 + + @@ -66,7 +95,13 @@ export default { data() { return { + agreeShow:false, + show:false, + agree:false, + protocolArr:"《【搭+】入驻协议》", + desc:'的全部条款，愿意受其约束', imgUrl:uni.$u.http.config.baseURL, + Negotiate: null, // 入驻协议 form:{ name:'', idnum:'', @@ -77,8 +112,45 @@ }, onShow() { this.getInfo(); + this.getAgreement(); }, methods: { + protocolClick(tag) { + this.show=true; + }, + //同意 + handleScroll() { + console.log(111); + this.agreeShow = true + }, + change(){ + this.show=false; + this.agree=true; + }, + getAgreement() { + uni.$u.http.get('/api/index/agreement', { + params: { + + } + }).then(res => { + if (res.code == 1) { + this.Negotiate = (res.data.entry_agreement).replace(/\ { + uni.showToast({ + title: '请求失败，请稍后再试', + icon: 'none', + duration: 2000 + }); + }); + }, getInfo(){ uni.$u.http.get('/api/school.real_name/info').then(res=>{ console.log(res); @@ -113,6 +185,9 @@ console.log(res); if(res.code==1){ uni.$u.toast('提交成功'); + setTimeout(()=>{ + uni.navigateBack(); + },1000) }else{ uni.$u.toast(res.data.msg); } @@ -180,4 +255,51 @@ margin: 0 auto; margin-top: 50rpx; } + .btn_2 { + width: 95%; + height: 90rpx; + background: #C1C1C1; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #ffffff; + line-height: 90rpx; + text-align: center; + margin: 0 auto; + margin-top: 50rpx; + } + .popup-footer { + display: flex; + justify-content: center; + align-items: center; + // margin: 30rpx 0; + height: 146rpx; + + .zhixiao { + height: 80rpx; + background: #E8E8E8; + //border-radius: 401rpx 401rpx 401rpx 401rpx; + font-family: YouSheBiaoTiHei; + font-weight: 400; + font-size: 36rpx; + color: #9C9C9C; + line-height: 32rpx; + display: flex; + justify-content: center; + align-items: center; + position: absolute; + width: 100%; + bottom: 0; + border-radius: 0rpx 0rpx 20rpx 20rpx; + } + + .shows_zhidao { + background-color: #323232; + color: #BBFC5B; + font-weight: 400; + font-size: 36rpx; + } + } + \ No newline at end of file diff --git a/packageB/wallet/bank.vue b/packageB/wallet/bank.vue index 2ac252d..a32edc6 100644 --- a/packageB/wallet/bank.vue +++ b/packageB/wallet/bank.vue @@ -20,7 +20,7 @@ - 提现金额 + 可提现金额 ￥ @@ -28,11 +28,27 @@ settleInfo.settled_amount }} - - 默认全部提现，具体到账时间以银行为准 - - - 若您的提现账户为跨行或跨区域的对公账户，银行会收取额外 手续费，具体金额以实际到账为准 + + + 1、提现金额： + 本平台的提现操作默认将您当前“可提现金额”的全部款项一次性提现，暂不支持部分提现。 + + + 2、到账时间： + 我们将在您提交有效提现申请后的T+3个工作日内处理您的请求（T为申请日）。工作日不含周末及法定节假日，我们会尽快处理，但具体到账时间以收款银行的实际处理速度为准。 + + + 3、关于手续费： + 若您的提现账户为跨行或跨区域的对公账户，银行在处理转账时可能会收取额外的手续费。该费用由银行直接扣除，非本平台收取，具体扣费金额以您的最终实际到账金额为准。 + + + 4、信息准确性： + 请务必确保您填写的持卡人姓名、银行卡号、开户银行等信息完全正确。因您填写信息错误导致的任何资金损失、提现延迟或失败，全部责任由您自行承担。 + + + 5、联系客服： + 如在提现过程中遇到任何问题，或超过预计到账时间仍未收到款项，请及时联系平台客服。 + 确认提现 diff --git a/packageB/wallet/index.vue b/packageB/wallet/index.vue index f25db07..f6b1cc5 100644 --- a/packageB/wallet/index.vue +++ b/packageB/wallet/index.vue @@ -2,7 +2,10 @@ - 当前余额 + + 当前余额 + + {{settleInfo.settled_amount?settleInfo.settled_amount:0}} @@ -22,6 +25,7 @@ 累计收益 ￥{{settleInfo.accumulated_incoming_amount?settleInfo.accumulated_incoming_amount:0}} + @@ -108,27 +112,54 @@ - 预计待入账金额说明 - - 1. 活动结束时： - 您的可入账金额会显示为预计待入账金额。 - - - 2. 7天售后期： - 活动结束后7天内，若发生售后问题(如退款)，对应金额将从“预计待入账”中扣除您的可入账金额会显示为预计待入账金额。 - - - 3. 查看售后进度： - 您可在【我发布的-已售后】中查询具体售后单详情 - - - 4. 最终可提现金额： - 7天售后期结束后，剩余未扣除的金额即可全额提现 + 预计待入账金额说明 + + ①这是您已结束活动产生的、正在结算中的款项金额。 + ②为处理潜在的用户退款，所有款项会经过一个为期7天的“结算与售后处理期”。在此期间发生的退款，将直接从这笔金额中扣除。 + ③7天处理期结束后，剩余金额将自动转入您的“当前余额”，变为可提现资金。 + ④您可在【我发布的-已售后】查询退款详情。 + ⑤最终转入“当前余额”的金额=活动应结算总额−7日内发生的退款总额。 我已知晓 + + 当前余额 + + 前余额指已经完成所有结算流程、您可以随时发起提现的金额。 + + + 我已知晓 + + + + 累计收益 + + 指自您入驻以来，所有已完成结算的活动为您带来的结算款项总和。累计收益=提现金额总和+当前余额。 + + + 我已知晓 + + @@ -136,6 +167,8 @@ export default { data() { return { + tipsShowTwo:false, + tipsShowOne:false, tabIndex: 0, page: 1, list: [], diff --git a/pages/center/index.vue b/pages/center/index.vue index 89b821b..613e0a2 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -6,7 +6,8 @@ - + @@ -135,7 +136,7 @@ 活动价格 - @@ -154,8 +155,7 @@ - + @@ -190,25 +190,55 @@ - - 《免责声明》 + 《责任承诺确认书》 + @scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;"> - + - - 我同意 （{{timeLog}}） + + + 取消 + 我同意 + 我同意 + + + + + + 去认证 + 完成认证，即可发布精彩活动 + + 只差最后一步！完成身份认证，即可成为【搭+】认证活动官，开始分享您的精彩活动。 + + + 取消 + 我同意 @@ -218,7 +248,7 @@ - 最近使用 + 已选择 @@ -276,9 +306,9 @@ export default { data() { return { - agreeAdd:false, - timer:null, - timeLog:0, + agreeAdd: false, + timer: null, + timeLog: 0, showPopbq: false, //标签弹窗 bqList: [], //标签列表 cate_id: '', //标签id @@ -306,7 +336,7 @@ Negotiate: null, // 入驻协议 agree: false, agreeShow: false, - protocolArr: ["<入驻协议>"], + protocolArr: "《活动发布者责任与承诺确认书》", form: { cate_ids: '', // 活动分类名字 @@ -352,7 +382,7 @@ flexColumn: 'column' }, current: 0, - currents: 0, + currents: -1, institutionList: [], images: '', fileList1: [], // 用于存储第一个上传组件的文件列表 @@ -364,6 +394,9 @@ times_sinb: '', times_sine: '', qunQrcode: '', + boxHeight: 0, + cardShow: false, + cardStatus: 0, }; }, onLoad() { @@ -372,9 +405,16 @@ this.getAgreement() this.getBqList(); this.getrefund_list(); - //this.getitembq(); + this.getitembq(); + //var c=uni.getSystemInfoSync(); + //844-94-70-100 = 580 + //763-47-(100-47)-34-50 + //this.computeBoxHeight(); }, + onShow() { + this.getCardInfo(); + }, filters: { formatTimestamp(value) { if (!value) return ''; @@ -386,6 +426,18 @@ } }, methods: { + openUrl(url) { + uni.navigateTo({ + url: url + }) + }, + getCardInfo() { + uni.$u.http.get('/api/school.real_name/info').then(res => { + console.log(res); + this.cardShow = res.data.status != 1 ? true : false; + this.cardStatus = res.data.status; + }) + }, //选择政策 selectItem(index, item) { this.currents = index; @@ -396,7 +448,7 @@ const result = await this.uploadFilePromise(item.file.url, 'user'); this.qunQrcode = result; }, - //登录及发布 + //登录及发布123 // tofb() { // const token = uni.getStorageSync('token') // if (token) { @@ -418,15 +470,17 @@ // }, // 获取本地最近使用 getitembq() { - if (uni.getStorageSync("zjlist") != "") { - this.list = JSON.parse(uni.getStorageSync("zjlist")); - let arr = this.list.map((item) => { - return item.name - }) - this.form.cate_idsName = arr.join(','); - } else { - uni.setStorageSync('zjlist', JSON.stringify(this.list)) - } + this.list = []; + uni.setStorageSync('zjlist', JSON.stringify(this.list)) + // if (uni.getStorageSync("zjlist") != "") { + // this.list = JSON.parse(uni.getStorageSync("zjlist")); + // let arr = this.list.map((item) => { + // return item.name + // }) + // this.form.cate_idsName = arr.join(','); + // } else { + // uni.setStorageSync('zjlist', JSON.stringify(this.list)) + // } }, //删除标签（本地） removebq(i) { @@ -536,6 +590,7 @@ }, //同意 handleScroll() { + console.log(123) this.agreeShow = true }, getTime() { @@ -611,26 +666,26 @@ }, opentuikuan() { this.tuikuan = true; - this.form.refund_id = 1; - this.form.refund_idn = '随时退'; + //this.form.refund_id = 1; + //this.form.refund_idn = '随时退'; }, change() { this.agree = true; - this.agreeAdd=true; + this.agreeAdd = true; this.show = false }, // 选择机构地址 protocolClick(tag) { - //timeLog 开始倒计时 - this.timeLog = 5; - this.timer = setInterval(() => { - this.timeLog--; - if (this.timeLog === 0) { - this.agreeShow=true; - clearInterval(this.timer); - } - }, 1000); + //timeLog 开始倒计时 + // this.timeLog = 5; + // this.timer = setInterval(() => { + // this.timeLog--; + // if (this.timeLog === 0) { + // this.agreeShow=true; + // clearInterval(this.timer); + // } + // }, 1000); this.show = true }, // 获取入驻协议文章 @@ -641,7 +696,7 @@ } }).then(res => { if (res.code == 1) { - this.Negotiate = (res.data.entry_agreement).replace(/\ { - resolve(JSON.parse(res.data).data.url); + var js = JSON.parse(res.data); + console.log(js.data.errcode); + if (js.data.errcode == '30002') { + uni.showToast({ + title: '请登录...', + icon: 'none', + duration: 1000 + }); + setTimeout(()=>{ + uni.switchTab({ + url: '/pages/my/index', + }) + },1000) + resolve(''); + } + resolve(js.data.url); }, fail: (err) => { reject(err); @@ -840,6 +914,10 @@ }, apply() { + if (this.cardStatus == -1) { + this.cardShow = true; + return; + } let url = '/api/school.new_activity/add'; let params = {}; this.form.cate_ids = this.list.map(item => item.id).join(','); @@ -973,7 +1051,7 @@ latitude: this.form.latitude, address: this.form.address, address_detail: this.form.address_detail, - image:this.qunQrcode + image: this.qunQrcode } uni.$u.http.post(url, params).then(res => { if (res.code == 1) { @@ -1017,6 +1095,9 @@ } } else { + if (res.data.errcode == '1001100') { + this.cardShow = true; + } uni.showToast({ title: res.msg, icon: 'none', @@ -1037,23 +1118,28 @@ \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 4a6a3eb..04f433b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -20,13 +20,13 @@ - + + @animationfinish="swiperChange"> @@ -354,6 +354,16 @@ export default { // } }, methods: { + onScrolltolower(){ + uni.showLoading({ + title: '加载中...' + }); + this.page+=1; + this.getHotList(); + setTimeout(() => { + uni.hideLoading(); + }, 2000) + }, onS(){ this.homrS=true; uni.showLoading({ @@ -487,7 +497,9 @@ export default { } }, swiperChange(e) { - this.swiperCurrent = e.detail.current; + if(e.detail.source =='autoplay' || e.detail.source == 'touch'){ + this.swiperCurrent = e.detail.current; + } }, //跳转夜校 toshool() { diff --git a/pages/my/index.vue b/pages/my/index.vue index 136f448..57e989c 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -73,12 +73,12 @@ - + - + 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 dc05913..cf2ab5f 100644 --- a/uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue +++ b/uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue @@ -1,17 +1,11 @@ @@ -23,6 +17,14 @@ type: Boolean, default: false }, + desc: { + type: String, + default: '' + }, + name: { + type: String, + default: '' + }, // 协议数组 protocolArr: { type: Array, @@ -63,7 +65,7 @@ .protocol_box { display: flex; - flex-wrap:nowrap; + flex-wrap: nowrap; justify-content: center; align-items: center; @@ -72,6 +74,7 @@ font-size: 28rpx; color: $themeColor; font-size: 13px; + .select { width: 36rpx; height: 36rpx; @@ -81,23 +84,18 @@ background-size: 100% auto; margin-right: 15rpx; margin-top: 2px; - + &.active { background-image: url("./ic_sel.png"); } } - text { - - + .key-text { color: $themeColor; font-size: 13px; text-decoration: underline; white-space: pre-wrap; - - - } diff --git a/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue b/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue index f8f2c82..0285d8d 100644 --- a/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue +++ b/uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue @@ -372,7 +372,7 @@ } .btn { - width: 240rpx; + width: 285rpx; line-height: 80rpx; font-size: 28rpx; border-radius: 24px;