diff --git a/src/app.json b/src/app.json index 1bfc80e..949d616 100644 --- a/src/app.json +++ b/src/app.json @@ -54,17 +54,6 @@ { "root": "gift", "pages": [ - "pages/giftList/index", - "pages/giftDetail/index", - "pages/conformOrder/index", - "pages/siteList/index", - "pages/siteEdit/index", - "pages/orderEnd/index", - "pages/orderDetail/index", - "pages/myGift/index", - "pages/priceDetail/index", - "pages/scoreRule/index", - "pages/dtpDurg/index", "pages/vipCert/index", "pages/vipReject/index", "pages/vipPending/index", diff --git a/src/components/toast/index.wxml b/src/components/toast/index.wxml index 1c72f34..be7a272 100644 --- a/src/components/toast/index.wxml +++ b/src/components/toast/index.wxml @@ -660,7 +660,7 @@ - +
通过 @@ -700,7 +700,7 @@ > - + 以下内容涉及患者个人信息,仅用于{{params.HospitalName}}{{params.Name}}医生进行患者随访管理,请在安全环境下查看,不截图,不转发 diff --git a/src/doc/pages/doc2/index.ts b/src/doc/pages/doc2/index.ts index b715682..2c4fa68 100644 --- a/src/doc/pages/doc2/index.ts +++ b/src/doc/pages/doc2/index.ts @@ -2,7 +2,7 @@ const _app = getApp() Page({ data: { - doc: `


生效日期:2025年4月

【重症肌无力患者支持“愈见昕生”项目】(以下简称“我们”)非常注重保护用户(“您”)的个人信息及隐私。我们希望通过本《个人信息及隐私保护政策》(以下简称本“隐私政策”或本“政策”)向您清晰地介绍在使用我们的产品/服务时,我们如何处理您的个人信息的方式。

我们提供的服务包括给力加油站患者端小程序、微信公众号向您提供的各项服务(以下简称“本服务”),适用本隐私政策。

请您在使用本服务前,务必仔细阅读并充分理解本隐私政策。我们将逐一说明我们收集您的个人信息的类型及其对应的用途,以便您了解我们针对某一特定功能或服务所收集的具体个人信息的类别、使用理由及 ... (very long line, trimmed to 1000 chars) + doc: `


生效日期:2025年4月

【重症肌无力患者支持“gMG给力加油站”项目】(以下简称“我们”)非常注重保护用户(“您”)的个人信息及隐私。我们希望通过本《个人信息及隐私保护政策》(以下简称本“隐私政策”或本“政策”)向您清晰地介绍在使用我们的产品/服务时,我们如何处理您的个人信息的方式。

我们提供的服务包括给力加油站患者端小程序、微信公众号向您提供的各项服务(以下简称“本服务”),适用本隐私政策。

请您在使用本服务前,务必仔细阅读并充分理解本隐私政策。我们将逐一说明我们收集您的个人信息的类型及其对应的用途,以便您了解我们针对某一特定功能或服务所收集的具体个人信息的类别、使用理由及收集方式。

本隐私政策将帮您了解以下信息:

1. 我们如何收集和使用您的个人信息

2. 我们基于何种目的或场景,收集和使用您的个人信息

3. 我们如何使用Cookie等同类技术

4. 我们如何委托处理、共享、转让、公开披露您的个人信息

5. 我们如何保存、保护您的个人信息

6. 您查阅、更正、删除、注销个人信息的权利

7. 未成年人保护

8. 本隐私政策变更及通知

9. 如何联系我们

10. 名词定义和解释

一、 我们如何收集和使用您的个人信息

(一) 我们会根据本隐私政策的约定,为实现本平台服务而对所收集的个人信息进行使用。

(二) 我们深知个人信息对您的重要性,并会尽全力保护您的个人信息安全可靠。我们致力于维持您对我们的信任,恪守以下原则,保护您的个人信息:合法、正当、必要和诚信原则,目的明确和直接相关原则,公开透明原则、准确性原则、问责性原则、数据安全原则等。同时,我们承诺采取必要的措施保障您的个人信息的安全。

二、 我们基于何种目的或场景,收集和使用您的个人信息

出于本隐私政策所描述的目的或场景,当您使用本平台服务时,我们可能会收集有关您的如下个人信息。若您不同意提供下列信息,有权拒绝提供或撤回同意,但您可能无法继续使用本平台的全部或部分服务:

(一) 注册登录账号

1. 当您关注给力加油站微信公众号时,我们会收集您的微信openID以及您关注、取消关注本公众号的行为数据,以便我们识别用户身份。

2. 当您登录使用给力加油站小程序时,您需要输入您的手机号码,通过手机号码加短信验证码的方式进行登录;或通过您的微信openID获取手机号进行手机号快捷登录。

(二) 向您提供本平台服务

1.注册成为用户:

为完成创建账号,您需提供您的姓名、手机号码,年龄,性别,完成账号注册,您后续可以自主在【我的】-【个人信息】中填写或更正您的信息;

2.ADL测评工具:

您可使用ADL双达标测评服务评估您的症状变化,我们将记录您在使用本服务期间的所有测评结果,并为您生成健康报告。

3.周三大咖说:

我们为您提供大咖说活动报名服务,报名完成后我们将记录您的userID、报名时间,我们基于此信息更新您的活动报名状态;

4.MG全知道:教育服务:

我们为您提供疾病知识服务,我们将记录您在使用本服务期间的内容浏览状态;

5.互动服务:

您在绑定专属医生后,您可使用医患互动服务。您可以从统提供的标准问答库内选择问题发送给医生,并接收医生从标准问答库内选择的问答回复;

6.就诊地图

为了您可以在就诊地图模块快速查看附近处的医院及就诊医生信息,我们会我们将请您授权我们获取您设备的地理位置权限,您可在开启权限后使用该功能。若未开启不影响您的功能的使用。

(三) 如果您对我们收集和使用您的个人信息的法律依据有任何疑问或需要提供进一步的信息,请通过本隐私政策第九章节「如何联系我们」提供的联系方式与我们联系。

(四) 本平台向您提供的服务可能将不断更新和发展,如果您选择使用本隐私政策中尚未列明的其他功能或服务时,我们会在收集您的个人信息前通过推送通知、更为显著的弹窗等方式向您详细说明信息收集的目的、方式、范围并征求您的同意。

三、 我们如何使用小程序原生能力技术

(一) 依托于微信小程序提供的原生能力

为了帮助提升您的产品体验,我们会使用微信提供的账号体系能力来避免您重复登录。所有的信息获取都会经过您的授权同意才会使用。

四、 我们如何委托处理、共享、转让、公开披露您的个人信息

(一) 委托处理

我们会聘请服务提供商来协助我们提供客户支持。对我们委托的公司、组织和个人,我们会要求他们按照本个人信息保护政策来处理您的个人信息。

(二) 共享

我们不会将任何个人信息出售给第三方。我们不会向给力加油站小程序、微信公众号运营公司以外的任何公司、组织和个人提供您的个人信息,但以下情况除外:

a) 在向您进行明确告知并获取您的单独同意的情况下共享:获得您的单独同意后,我们会与我们所披露的有关个人信息处理者共享您的相关个人信息;

(三) 转让

我们不会将您的个人信息转让给任何公司、组织和个人,但以下情况除外:

a) 在向您进行明确告知并获取您的单独同意的情况下转让:获得您的单独同意后,我们会向我们所披露的有关个人信息处理者转让您的相关个人信息;

(四) 公开披露

我们仅会在获得您明确同意后,公开披露您的个人信息。

五、 我们如何保存、保护您的个人信息

(一) 保存地点

我们依照法律法规的规定,将在境内运营过程中收集和产生的您的个人信息存储于中华人民共和国境内。目前,我们不会将上述信息传输至其他地区。

(二) 保存时间

我们会采取一切合理可行的措施,确保未收集无关的个人信息。 给力加油站小程序、微信公众号中个人信息储存必要期限是给力加油站小程序、微信公众号为您终止服务后3年。超出必要期限后,我们将对您的个人信息进行删除或匿名化处理,但法律法规另有规定的除外。

(三) 保护措施

我们已使用符合业界标准的安全防护措施保护您提供的个人信息,防止数据遭到未经授权访问、公开披露、使用、修改、损坏或丢失。我们会采取一切合理可行的措施,保护您的个人信息。我们会部署访问控制机制,确保只有授权人员才可访问个人信息。

(四) 安全事件处理

在发生个人信息安全事件后,我们将按照法律法规的要求,及时向您告知:安全事件的基本情况和可能的影响、我们已采取或将要采取的处置措施、您可自主防范和降低风险的建议、对您的补救措施等。我们将及时将事件相关情况以邮件、信函、电话、推送通知等方式告知您。

六、 您查阅、更正、删除、注销个人信息的权利

我们非常重视并保护您对于个人信息处理活动中的知情权、决定权、限制权、拒绝权等权利,并为您提供了行使在个人信息处理活动中相关权利的方法。

(一) 查阅权和更正权

除法律法规规定的情形除外,您有权随时查阅和更正您的个人信息,您可以通过在本平台的【我的】-【个人信息】查阅或更正您的个人信息,包括手机号、姓名、头像、医院、门诊时间、个人简介等信息。

(二) 删除权

1. 您可通过微信的缓存清理功能,删除您在本平台的缓存记录提供的相关个人信息。

2. 如果您需要删除您在使用本平台过程中产生的其他个人信息,在您的合理要求并经验证核实您的身份后,我们会处理您的请求。您可以通过本隐私政策「第九章节、如何联系我们方式向我们进行反馈。

3. 在以下情形中,您可以向我们提出删除个人信息的请求:

(1) 我们永久不再为您提供产品或服务;

(2) 您撤回对我们收集、使用您的个人信息的同意;

(3) 我们处理个人信息的行为违反法律、行政法规;

(4) 我们处理个人信息的行为违反了与您的约定;

(5) 您注销了用户帐号;

(6) 法律、行政法规规定的其他情形。

4. 您同意并理解,您删除某些您已提交的个人信息可能导致您无法使用本平台的部分或者全部服务。

(三) 注销权

如您希望注销本平台及服务,您可以通过发送邮件到supportpr@hbraas.com进行账号的注销。

一旦您注销账户,我们将停止为您提供服务。请您谨慎操作,否则,因注销账号产生的数据丢失问题均由您自行承担。当您选择注销账户后,我们将停止为您提供服务,并依据您的要求,删除您的个人信息。

七、 未成年人保护

我们非常重视对未成年人个人信息的保护,本平台的注册用户仅包括供医疗卫生专业人士。不涉及18周岁以下的未成年人注册为本平台账户。若您是未成年人,不得予以注册。

八、 本隐私政策变更及通知

(一) 为了向您提供更好的功能与/或服务,我们的产品/服务将不时更新与变化,因此,我们将适时修订及变更隐私政策。

(二) 未经您明确同意,我们不会削减您按照本隐私政策所应享有的权利。我们会在本页面上发布对本政策所做的任何变更。

(三) 对于重大变更,我们可能还会提供本平台公告、推送通知或更为显著的弹窗等方式,向您发送隐私政策的最新版本。

九、 如何联系我们

若您对本服务有任何疑问、意见或建议,您可以通过以下方式与我们联系:

邮箱:supportpr@hbraas.com

一般情况下,我们将在7天内回复。

十、 名词定义与解释

本平台:通过电子化信息平台运营和提供的数字化产品和服务,电子化信息平台包括但不限于 给力加油站小程序、微信公众号提供数字化产品和服务的系统或平台等,具体以用户实际注册、访问或使用为准(对于该等数字化产品和服务,本协议统称为“电子化信息平台”或“平台”或“本平台”)

个人信息:以电子或者其他方式记录的与已识别或可识别的自然人有关的各种信息,不包括匿名化处理后的信息。如姓名等;

OPENID:OPENID是微信用户在注册公众号后的唯一独立加密用户身份标识,此处OPENID是指本平台用户注册后的唯一加密用户身份标识。


`, }, onLoad() {}, }) diff --git a/src/gift/pages/conformOrder/index.json b/src/gift/pages/conformOrder/index.json deleted file mode 100644 index 57dc5ce..0000000 --- a/src/gift/pages/conformOrder/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "navigationBarTitleText": "确认订单", - "usingComponents": { - "van-icon": "@vant/weapp/icon/index" - } -} diff --git a/src/gift/pages/conformOrder/index.scss b/src/gift/pages/conformOrder/index.scss deleted file mode 100644 index b3dcf8d..0000000 --- a/src/gift/pages/conformOrder/index.scss +++ /dev/null @@ -1,184 +0,0 @@ -.page { - padding: 34rpx 40rpx; - .site { - padding: 40rpx 32rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - display: flex; - align-items: center; - justify-content: space-between; - .wrap { - .title { - .label { - width: 72rpx; - height: 36rpx; - border: 1rpx solid #e04775; - font-size: 24rpx; - color: #e04775; - text-align: center; - border-radius: 10rpx; - box-sizing: border-box; - } - .name { - margin-top: -42rpx; - text-indent: 80rpx; - font-size: 36rpx; - line-height: 46rpx; - color: #3f3f3f; - font-weight: bold; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - &.no-indent { - margin-top: 0; - text-indent: 0; - } - } - } - .content { - margin-top: 0; - margin-top: 12rpx; - font-size: 28rpx; - color: #b6b7ba; - } - } - .more { - flex-shrink: 0; - } - } - .shop { - margin-top: 16px; - padding: 40rpx 32rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - .shop-header { - padding-bottom: 10px; - display: flex; - .shop-img { - flex-shrink: 0; - width: 204rpx; - height: 204rpx; - border-radius: 24rpx; - } - .wrap { - padding-top: 8rpx; - flex: 1; - padding-left: 24rpx; - .name { - font-size: 32rpx; - font-weight: bold; - color: #3f3f3f; - line-height: 44rpx; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - } - .specification { - margin-top: 8rpx; - font-size: 28rpx; - color: #b6b7ba; - } - .price { - margin-top: 14rpx; - display: flex; - align-items: center; - justify-content: space-between; - .num { - font-size: 32rpx; - color: #3f3f3f; - } - .sub { - font-size: 22rpx; - } - .val { - font-size: 28rpx; - color: #b6b7ba; - } - } - } - } - .row { - margin-top: 32rpx; - display: flex; - align-items: center; - justify-content: space-between; - .label { - font-size: 32rpx; - color: #3f3f3f; - } - .content { - font-size: 32rpx; - color: #3f3f3f; - &.yellow { - color: #e04775; - } - .sub { - font-size: 22rpx; - } - } - } - } - .remark { - margin-top: 16px; - padding: 40rpx 32rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - .title { - font-size: 32rpx; - color: #3f3f3f; - font-weight: bold; - } - .textarea { - margin-top: 10rpx; - padding: 24rpx 32rpx; - background-color: #fafafa; - min-height: 196rpx; - border-radius: 16rpx; - box-sizing: border-box; - } - } - .footer { - padding: 24rpx 48rpx 48rpx; - position: fixed; - bottom: 0; - left: 0; - width: 100vw; - box-sizing: border-box; - display: flex; - justify-content: space-between; - align-items: center; - height: 168rpx; - background: #ffffff; - box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 0, 0, 0.26); - .price { - font-size: 28rpx; - color: #b6b7ba; - .num { - font-size: 40rpx; - color: #e04775; - } - .sub { - font-size: 24rpx; - } - } - .submit { - width: 260rpx; - height: 96rpx; - background: #e04775; - border-radius: 48rpx; - text-align: center; - line-height: 96rpx; - color: #fff; - font-weight: bold; - } - } -} diff --git a/src/gift/pages/conformOrder/index.ts b/src/gift/pages/conformOrder/index.ts deleted file mode 100644 index 1e84c2f..0000000 --- a/src/gift/pages/conformOrder/index.ts +++ /dev/null @@ -1,86 +0,0 @@ -const app = getApp(); - -Page({ - data: { - id: "", - detail: {}, - select: false, - addressDetail: {} as any, - remark: "", - }, - onLoad(options) { - this.setData({ - id: options.id, - }); - }, - onShow() { - app.waitLogin().then(() => { - this.getDetail(); - if (!this.data.select) { - this.getDefaultAddress(); - } else { - this.setData({ - select: false, - }); - } - }); - }, - getDefaultAddress() { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-address/get-default-address", - data: {}, - }).then((res) => { - this.setData({ - addressDetail: res, - }); - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/gift-order/get-order-detail", - data: { - orderId: this.data.id, - }, - }).then((res) => { - this.setData({ - detail: res, - }); - }); - }, - handleSite() { - if (this.data.addressDetail) { - wx.navigateTo({ - url: "/gift/pages/siteList/index", - }); - } else { - wx.navigateTo({ - url: "/gift/pages/siteEdit/index", - }); - } - }, - handleSubmit() { - if (!this.data.addressDetail?.addressId) { - wx.showToast({ - icon: "none", - title: "请选择地址", - }); - return; - } - wx.ajax({ - method: "POST", - url: "?r=igg4/gift-order/confirm-order", - data: { - orderId: this.data.id, - addressId: this.data.addressDetail.addressId, - remark: this.data.remark, - }, - loading: true, - }).then(() => { - wx.reLaunch({ - url: `/gift/pages/orderEnd/index?id=${this.data.id}`, - }); - }); - }, -}); diff --git a/src/gift/pages/conformOrder/index.wxml b/src/gift/pages/conformOrder/index.wxml deleted file mode 100644 index 8899b86..0000000 --- a/src/gift/pages/conformOrder/index.wxml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - 默认 - - {{addressDetail.provinceName}}{{addressDetail.cityName}}{{addressDetail.countyName}}{{addressDetail.address}} - - - {{addressDetail.receiveUserName}} {{addressDetail.receiveTelephone}} - - 请添加收货地址 - - - - - - - - {{detail.giftName}} - 规格:{{detail.specName}} - - {{detail.giftScore}}能量 - x{{detail.orderCount}} - - - - - 礼品总价 - {{detail.orderScore}}能量 - - - 配送方式 - 快递配送 - - - 商家电话 - {{detail.serviceTel}} - - - - 留言 - - - - - 共{{detail.orderCount}}件 - - 合计消耗 - {{detail.orderScore}}能量 - - - 提交订单 - - diff --git a/src/gift/pages/dtpDurg/index.json b/src/gift/pages/dtpDurg/index.json deleted file mode 100644 index b632d36..0000000 --- a/src/gift/pages/dtpDurg/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "双通道药房", - "usingComponents": {} -} diff --git a/src/gift/pages/dtpDurg/index.scss b/src/gift/pages/dtpDurg/index.scss deleted file mode 100644 index f0e8cec..0000000 --- a/src/gift/pages/dtpDurg/index.scss +++ /dev/null @@ -1,128 +0,0 @@ -.page { - position: relative; - .banner { - width: 100%; - min-height: 344rpx; - } - .container { - padding: 48rpx 40rpx; - position: absolute; - top: 316rpx; - left: 0; - width: 100%; - min-height: 100vh; - border-radius: 24rpx 24rpx 0 0; - background-color: #fafafa; - box-sizing: border-box; - .title { - font-size: 36rpx; - color: #484848; - font-weight: bold; - } - .tags { - margin-top: 16rpx; - display: flex; - .tag { - margin-right: 16rpx; - padding-right: 8rpx; - font-size: 22rpx; - color: #e04775; - line-height: 1; - border-radius: 8rpx; - background-color: #f5dfe6; - display: flex; - align-items: center; - .icon { - margin-right: 8rpx; - padding: 4rpx; - width: 24rpx; - max-height: 24rpx; - background-color: #e04775; - border-radius: 8rpx; - } - } - } - .content { - margin-top: 32rpx; - margin-bottom: 20rpx; - display: flex; - justify-content: space-between; - .inner { - .site { - font-size: 28rpx; - color: #9e9e9e; - } - .tel { - font-size: 28rpx; - color: #9b9ea6; - } - } - .options { - flex-shrink: 0; - display: flex; - .option { - margin-left: 30rpx; - .phone { - width: 48rpx; - height: 48rpx; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - background-color: #fff; - box-shadow: 0 4rpx 20rpx 0 rgba(0, 0, 0, 0.1); - &-img { - width: 24rpx; - height: 24rpx; - } - } - .name { - margin-top: 8rpx; - font-size: 24rpx; - color: #484848; - } - } - } - } - - .card { - margin-bottom: 16rpx; - padding: 32rpx 30rpx; - border-radius: 24rpx; - background-color: #fff; - .c-title { - font-size: 32rpx; - font-weight: bold; - color: #484848; - display: flex; - align-items: center; - .c-icon { - margin-right: 16rpx; - width: 36rpx; - height: 36rpx; - } - } - .c-content{ - margin-top: 24rpx; - font-size: 28rpx; - color: #9E9E9E; - } - } - - .remark{ - padding: 32rpx; - border-radius: 24rpx; - background-color: #fff; - .r-title{ - font-size: 32rpx; - color: #484848; - font-weight: bold; - } - .r-content{ - margin-top: 20rpx; - font-size: 28rpx; - color: #9E9E9E; - } - } - } -} diff --git a/src/gift/pages/dtpDurg/index.ts b/src/gift/pages/dtpDurg/index.ts deleted file mode 100644 index b62610a..0000000 --- a/src/gift/pages/dtpDurg/index.ts +++ /dev/null @@ -1,52 +0,0 @@ -const app = getApp(); - -Page({ - data: { - id: "", - detail: {} as any, - }, - onLoad(options) { - this.setData({ - id: options.id, - }); - app.waitLogin().then(() => { - this.getDetail(); - }); - }, - - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/dtp-pharmacy/detail", - data: { - Id: this.data.id, - }, - }).then((res) => { - this.setData({ - detail: res, - }); - }); - }, - handleSite() { - const { LNG, LAT, ProvinceName, CityName, CountyName, Address, Name } = this.data.detail; - wx.openLocation({ - latitude: LAT, - longitude: LNG, - name: Name, - address: `${ProvinceName}${CityName}${CountyName}${Address}`, - }); - }, - handlePhone() { - const tel = this.data.detail.Telephone; - if (!tel) { - wx.showToast({ - icon: "none", - title: "电话暂未开通", - }); - return; - } - wx.makePhoneCall({ - phoneNumber: tel, - }); - }, -}); diff --git a/src/gift/pages/dtpDurg/index.wxml b/src/gift/pages/dtpDurg/index.wxml deleted file mode 100644 index 74a48b6..0000000 --- a/src/gift/pages/dtpDurg/index.wxml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {{detail.Name}} - - - - - 自有输注中心 - - - - - 合作输注中心 - - - - - {{detail.ProvinceName}}{{detail.CityName}}{{detail.CountyName}}{{detail.Address}} - {{detail.Telephone}} - - - - - - - 地址 - - - - - - 电话 - - - - - - - 自有输注中心 - - {{detail.OwnInfusionCenterName}} - - - - - 合作输注中心 - - {{detail.CooperationInfusionCenterName}} - - - 备注 - {{detail.Remark}} - - - diff --git a/src/gift/pages/giftDetail/index.json b/src/gift/pages/giftDetail/index.json deleted file mode 100644 index bc3d960..0000000 --- a/src/gift/pages/giftDetail/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "礼品详情", - "usingComponents": { - "van-stepper": "@vant/weapp/stepper/index", - "toast": "/components/toast/index" - } -} diff --git a/src/gift/pages/giftDetail/index.scss b/src/gift/pages/giftDetail/index.scss deleted file mode 100644 index b2292c4..0000000 --- a/src/gift/pages/giftDetail/index.scss +++ /dev/null @@ -1,185 +0,0 @@ -.page { - background-color: #f9f9f9; - padding-bottom: 400rpx; - .banner { - width: 100%; - .banner-img { - display: block; - width: 100%; - height: 562rpx; - } - } - .container { - padding: 30rpx 40rpx; - .price { - display: flex; - align-items: baseline; - .num { - font-size: 56rpx; - color: #e04775; - font-weight: bold; - } - .sub { - font-size: 32rpx; - color: #e04775; - } - } - .title { - margin-top: 22rpx; - font-size: 36rpx; - color: #3f3f3f; - line-height: 48rpx; - font-weight: bold; - } - .list { - margin-top: 24rpx; - padding: 32rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - .list-title { - padding-bottom: 16rpx; - position: relative; - font-size: 36rpx; - color: #3f3f3f; - font-weight: bold; - &::before { - content: ""; - position: absolute; - top: 0; - left: -32rpx; - width: 12rpx; - height: 44rpx; - background: #e04775; - border-radius: 0rpx 8rpx 8rpx 0rpx; - } - } - .list-img { - display: block; - width: 100%; - } - } - } - .footer { - padding: 30rpx 40rpx 40rpx; - position: fixed; - bottom: 0; - left: 0; - width: 100vw; - box-sizing: border-box; - background: #ffffff; - box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 0, 0, 0.26); - .options { - padding-bottom: 25rpx; - .row { - display: flex; - align-items: center; - .label { - margin-right: 24rpx; - flex-shrink: 0; - font-size: 32rpx; - color: #b6b7ba; - } - .radios { - display: flex; - overflow: auto; - &::-webkit-scrollbar { - display: none; - } - .radio { - margin-right: 16rpx; - border-radius: 8rpx; - border: 1px solid #d0d0d0; - line-height: 40rpx; - padding: 0 20rpx; - font-size: 28rpx; - color: #aaaaaa; - white-space: nowrap; - &.active { - background-color: #e04775; - border-color: #e04775; - color: #fff; - } - } - } - .stepper { - display: flex; - align-items: center; - .custom-class { - border: 1px solid #e5e5e5; - border-radius: 8rpx; - } - .input-class { - color: #3f3f3f; - font-weight: bold; - background-color: #ffffff; - margin: 0; - } - .plus-class, - .minus-class { - margin: 0; - background-color: #f8f8f8; - } - .minus-class { - border-right: 1px solid #d7d7d7; - } - .plus-class { - border-left: 1px solid #d7d7d7; - } - .status { - margin-left: 8rpx; - font-size: 32rpx; - color: #e1e1e1; - } - } - } - .row:not(:first-of-type) { - margin-top: 24rpx; - } - } - .module { - border-top: 1px solid #f2f2f2; - padding-top: 25rpx; - display: flex; - align-items: center; - justify-content: space-between; - .wrap { - .price { - display: flex; - align-items: baseline; - .sub { - font-size: 28rpx; - color: #e04775; - } - .num { - font-size: 40rpx; - color: #e04775; - font-weight: bold; - } - } - .doc { - display: flex; - align-items: center; - font-size: 24rpx; - color: #999999; - .checkbox { - transform: scale(0.7); - } - .a { - color: #e04775; - } - } - } - .submit { - width: 298rpx; - height: 96rpx; - background: #e04775; - border-radius: 48rpx; - font-size: 36rpx; - color: #ffffff; - line-height: 96rpx; - text-align: center; - } - } - } -} diff --git a/src/gift/pages/giftDetail/index.ts b/src/gift/pages/giftDetail/index.ts deleted file mode 100644 index c4d9685..0000000 --- a/src/gift/pages/giftDetail/index.ts +++ /dev/null @@ -1,150 +0,0 @@ -const app = getApp(); - -Page({ - data: { - id: "", - detail: {}, - specVecItem: {} as any, - num: 1, - allPrice: "", - - toastShow: false, - toastType: "giftEnter", - - toastParams: { - doc: "", - }, - protocol: false, - }, - onLoad(options) { - this.setData({ - id: options.id, - toastParams: { - doc: `

为让用户更好的享受再鼎愈见昕生的服务,愈见昕生平台向用户提供了能量兑换服务,并提供了丰富的礼品,平台注册用户可使用有效的能量兑换礼品。

愈见昕生的礼品库将提供:

1) 查看用户在能量商城选择兑换的商品信息;

2) 为让用户更好的享受再鼎愈见昕生的服务,愈见昕生平台向用户提供了能量兑换服务,并提供了丰富的礼品,平台注册用户可使用有效的能量兑换礼品。

愈见昕生的礼品库将提供:

1) 查看用户在能量商城选择兑换的商品信息;

2) 确认兑换商品的订单信息;

< ... (very long line, trimmed to 1000 chars) - }, - }); - app.waitLogin().then(() => { - this.setView(); - this.getDetail(); - this.getProtocol(); - }); - }, - setView() { - wx.ajax({ - method: "POST", - url: "?r=igg4/gift-spu/set-visit-num", - data: { spuId: this.data.id }, - showMsg: false, - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/gift-spu/get-detail", - data: { - spuId: this.data.id, - }, - }).then((res) => { - this.setData({ - detail: { - ...res, - detailList: JSON.parse(res.detail), - }, - specVecItem: res.specVec[0], - allPrice: res.specVec[0].score, - num: res.specVec[0].stock >= 1 ? 1 : 0, - }); - }); - }, - getProtocol() { - wx.ajax({ - method: "GET", - url: "?r=igg4/agreement/get-user-agreement", - data: {}, - }).then((res) => { - this.setData({ - protocol: res, - }); - }); - }, - setProtocol() { - wx.ajax({ - method: "POST", - url: "?r=igg4/agreement/set-user-agreement", - data: {}, - }); - }, - handleSpec(e: any) { - const { index } = e.currentTarget.dataset; - const specVecItem: any = this.data.detail.specVec[index]; - console.log(specVecItem.stock>=1) - this.setData({ - specVecItem: specVecItem, - allPrice: specVecItem.score, - num: specVecItem.stock >= 1 ? 1 : 0, - }); - }, - onChangeNumber(e: any) { - this.setData({ - num: e.detail, - allPrice: this.data.specVecItem.score * e.detail, - }); - }, - handleDoc() { - this.setData({ - toastShow: true, - toastType: "giftEnter", - }); - }, - handleToastOk(e) { - if (!e.detail.protocol) { - wx.showToast({ - title: "请先勾选《用户须知》", - icon: "none", - }); - return; - } - this.setProtocol(); - this.setData({ - protocol: e.detail.protocol, - }); - this.handleToastCancel(); - }, - handleToastCancel() { - this.setData({ - toastShow: false, - toastType: "", - }); - }, - handleProtocol() { - if (!this.data.protocol) { - this.setProtocol(); - } - this.setData({ - protocol: !this.data.protocol, - }); - }, - handleSubmit() { - if (!this.data.protocol) { - wx.showToast({ - icon: "none", - title: "请先同意《用户须知》", - }); - return; - } - wx.ajax({ - method: "POST", - url: "?r=igg4/gift-order/place-order", - data: { - giftId: this.data.specVecItem.giftId, - count: this.data.num, - }, - loading: true, - }).then((res) => { - wx.navigateTo({ - url: `/gift/pages/conformOrder/index?id=${res}`, - }); - }); - }, -}); diff --git a/src/gift/pages/giftDetail/index.wxml b/src/gift/pages/giftDetail/index.wxml deleted file mode 100644 index 65450a7..0000000 --- a/src/gift/pages/giftDetail/index.wxml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - {{specVecItem.score}} - 能量 - - {{detail.giftName}} - - 礼品详情 - - - - - - - - 规格 - - - {{item.specName }} - - - - - 数量 - - - 有库存 - 无库存 - - - - - - - - 合计 -   - - {{allPrice}} - - - - 已阅读 - 《用户须知》 - - - 立即兑换 - - - - - diff --git a/src/gift/pages/giftList/index.json b/src/gift/pages/giftList/index.json deleted file mode 100644 index 91ab748..0000000 --- a/src/gift/pages/giftList/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "礼品中心", - "navigationStyle": "custom", - "usingComponents": { - "van-icon": "@vant/weapp/icon/index", - "navBar": "/components/navBar/navBar" - } -} diff --git a/src/gift/pages/giftList/index.scss b/src/gift/pages/giftList/index.scss deleted file mode 100644 index b9e74b7..0000000 --- a/src/gift/pages/giftList/index.scss +++ /dev/null @@ -1,185 +0,0 @@ -page { - background-color: #f9f9f9; -} -.page { - .bg { - width: 100%; - height: 902rpx; - } - .page-container { - position: absolute; - left: 0; - top: 0; - width: 100%; - padding: 0 40rpx; - box-sizing: border-box; - padding-bottom: 200rpx; - .notice { - height: 44rpx; - background: linear-gradient(90deg, rgba(241, 241, 241, 0) 0%, #f1f1f1 52%, rgba(241, 241, 241, 0) 100%); - border-radius: 16rpx; - display: flex; - align-items: center; - justify-content: center; - font-size: 24rpx; - color: #3f3f3f; - .icon { - margin-right: 5rpx; - width: 30rpx; - height: 24rpx; - } - } - .banner { - margin-top: 16rpx; - background: #fafafa; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - border: 2rpx solid rgba(151, 151, 151, 0.14); - .banner-header { - padding: 32rpx 0 32rpx 32rpx; - display: flex; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - border-bottom: 2rpx solid rgba(151, 151, 151, 0.14); - display: flex; - .user { - width: 106rpx; - height: 106rpx; - border-radius: 50%; - } - .wrap { - flex: 1; - padding: 0 150rpx 0 22rpx; - .title { - font-size: 24rpx; - color: #3f3f3f; - } - .price { - font-size: 48rpx; - color: #3f3f3f; - font-weight: bold; - } - } - .rule { - font-size: 24rpx; - color: #ffffff; - width: 136rpx; - height: 44rpx; - background: #f5ab1f; - border-radius: 24rpx 0 0 24rpx; - text-align: center; - line-height: 44rpx; - font-weight: bold; - } - } - .banner-footer { - padding: 20rpx 0 28rpx; - display: flex; - justify-content: space-between; - align-items: center; - .ver-line { - width: 2rpx; - height: 40rpx; - background-color: rgba(221, 221, 221, 0.6); - } - .option { - flex: 1; - display: flex; - justify-content: center; - align-items: center; - font-size: 28rpx; - color: #484848; - font-weight: bold; - .icon { - margin-right: 22rpx; - width: 50rpx; - height: 50rpx; - } - } - } - } - .list { - margin-top: 48rpx; - .list-title { - margin-bottom: 20rpx; - width: 180rpx; - height: 40rpx; - } - .list-cate { - padding: 20rpx 0; - display: flex; - flex-wrap: nowrap; - max-width: 100vw; - box-sizing: border-box; - overflow-x: auto; - &::-webkit-scrollbar { - display: none; - } - .cate { - margin-right: 20rpx; - padding: 10rpx 24rpx; - white-space: nowrap; - line-height: 1; - font-size: 28rpx; - color: #484848; - background-color: #f2f2f2; - border-radius: 24rpx; - &.active { - color: #fff; - background-color: #e04775; - } - } - } - .list-container { - display: flex; - flex-wrap: wrap; - gap: 16rpx 22rpx; - .list-item { - margin-bottom: 16rpx; - width: 324rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - .photo { - border-radius: 24rpx 24rpx 0 0; - width: 100%; - height: 324rpx; - } - .content { - padding: 18rpx 20rpx 22rpx; - .title { - margin-top: 18rpx; - font-size: 32rpx; - color: #484848; - font-weight: bold; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - .footer { - margin-top: 6rpx; - display: flex; - justify-content: space-between; - .price { - font-size: 28rpx; - color: #e04775; - } - .btn { - width: 100rpx; - height: 44rpx; - text-align: center; - line-height: 44rpx; - font-size: 24rpx; - color: #ffffff; - background: #e04775; - border-radius: 24rpx; - font-weight: bold; - } - } - } - } - } - } - } -} diff --git a/src/gift/pages/giftList/index.ts b/src/gift/pages/giftList/index.ts deleted file mode 100644 index f5b3726..0000000 --- a/src/gift/pages/giftList/index.ts +++ /dev/null @@ -1,114 +0,0 @@ -const app = getApp(); - -Page({ - data: { - bottom: 0, - selfScore: { - expire: {}, - }, - cateList: [], - - cateId: "", - list: [], - pagination: { - page: 1, - pages: 1, - count: 1, - }, - }, - onLoad() { - const SystemInfo = app.globalSystemInfo; - if (SystemInfo) { - const { bottom } = SystemInfo.capsulePosition; - this.setData({ - bottom: bottom, - }); - } - app.waitLogin().then(() => { - app.getUserInfo(this, true); - this.getScore(); - this.getList(); - this.getCateList(); - }); - }, - getScore() { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-score/get-self-score", - data: {}, - }).then((res) => { - this.setData({ - selfScore: res, - }); - }); - }, - getCateList() { - wx.ajax({ - method: "GET", - url: "?r=igg4/gift-spu/get-cate-all-list", - data: {}, - }).then((res) => { - this.setData({ - cateList: res, - }); - }); - }, - handleCate(e) { - const { id } = e.currentTarget.dataset; - this.setData({ - cateId: id, - }); - this.getList(); - }, - getList(newPage = 1) { - wx.ajax({ - method: "POST", - url: `?r=igg4/gift-spu/get-list&page=${newPage}`, - data: { - cateId: this.data.cateId ? [this.data.cateId] : [], - }, - }).then((res) => { - let list = res.page == 1 ? res.list : [...this.data.list, ...res.list]; - this.setData({ - list: list, - pagination: { - page: res.page, - pages: res.pages, - count: res.count, - }, - }); - }); - }, - handlePirceDetail() { - wx.navigateTo({ - url: "/gift/pages/priceDetail/index", - }); - }, - handleMyGift() { - wx.navigateTo({ - url: "/gift/pages/myGift/index", - }); - }, - handleDetail(e) { - const { id } = e.currentTarget.dataset; - wx.navigateTo({ - url: `/gift/pages/giftDetail/index?id=${id}`, - }); - }, - handleRule() { - wx.navigateTo({ - url: `/gift/pages/scoreRule/index`, - }); - }, - handleBack() { - wx.reLaunch({ - url: "/pages/my/index", - }); - }, - onReachBottom() { - const { page, pages } = this.data.pagination; - if (pages > page) { - this.getList(page + 1); - } - }, -}); diff --git a/src/gift/pages/giftList/index.wxml b/src/gift/pages/giftList/index.wxml deleted file mode 100644 index 77315e4..0000000 --- a/src/gift/pages/giftList/index.wxml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - 你有{{selfScore.expire.expireScore}}能量将于7月1日过期 - - - - - - 全部 - {{item.cateName}} - - - - - - {{item.giftName}} - - {{item.lowestScore}}能量 - 兑换 - - - - - - - - diff --git a/src/gift/pages/myGift/index.json b/src/gift/pages/myGift/index.json deleted file mode 100644 index 7d52f40..0000000 --- a/src/gift/pages/myGift/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "我的礼品", - "usingComponents": {} -} diff --git a/src/gift/pages/myGift/index.scss b/src/gift/pages/myGift/index.scss deleted file mode 100644 index 54a67ff..0000000 --- a/src/gift/pages/myGift/index.scss +++ /dev/null @@ -1,110 +0,0 @@ -page { - background-color: #f7f7f7; -} -.page { - padding: 32rpx 40rpx; - .card { - margin-bottom: 16rpx; - padding: 32rpx; - background: #ffffff; - border-radius: 24rpx; - .header { - display: flex; - justify-content: space-between; - align-items: center; - padding-bottom: 32rpx; - border-bottom: 1px solid #ebebeb; - .on { - font-size: 28rpx; - color: #bbbcbe; - } - .status { - font-size: 28rpx; - color: #e04775; - } - .suc { - color: #24d8c8; - } - } - .shop { - padding: 32rpx 0; - display: flex; - align-items: center; - .shop-img { - flex-shrink: 0; - width: 200rpx; - height: 200rpx; - border-radius: 24rpx; - } - .wrap { - flex: 1; - padding-left: 24rpx; - .name { - font-size: 32rpx; - font-weight: bold; - color: #3f3f3f; - line-height: 44rpx; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - } - .specification { - display: inline-block; - margin-top: 8rpx; - font-size: 28rpx; - color: #b6b7ba; - border-radius: 10rpx; - } - .price { - margin-top: 14rpx; - display: flex; - align-items: center; - justify-content: space-between; - .num { - font-size: 32rpx; - color: #e04775; - font-weight: bold; - .sub { - font-size: 22rpx; - } - } - .val { - font-size: 28rpx; - color: #b6b7ba; - } - } - } - } - .footer { - border-top: 1px solid #ebebeb; - padding-top: 32rpx; - display: flex; - align-items: center; - justify-content: space-between; - .content { - font-size: 28rpx; - color: #bbbcbe; - display: flex; - align-items: baseline; - .num { - font-size: 42rpx; - color: #e04775; - font-weight: bold; - } - } - .btn { - width: 152rpx; - height: 52rpx; - border-radius: 8rpx; - border: 1rpx solid rgba(158, 158, 158, 0.42); - font-size: 28rpx; - color: #3f3f3f; - text-align: center; - line-height: 52rpx; - } - } - } -} diff --git a/src/gift/pages/myGift/index.ts b/src/gift/pages/myGift/index.ts deleted file mode 100644 index 33b0bc9..0000000 --- a/src/gift/pages/myGift/index.ts +++ /dev/null @@ -1,48 +0,0 @@ -const app = getApp(); - -Page({ - data: { - list: [], - pagination: { - page: 1, - pages: 1, - count: 1, - }, - }, - onLoad() { - app.waitLogin().then(() => { - this.getList(); - }); - }, - getList(newPage = 1) { - wx.ajax({ - method: "POST", - url: "?r=igg4/gift-order/get-order-list", - data: { - page: newPage, - }, - }).then((res) => { - let list = res.page == 1 ? res.list : [...this.data.list, ...res.list]; - this.setData({ - list: list, - pagination: { - page: res.page, - pages: res.pages, - count: res.count, - }, - }); - }); - }, - handleDetail(e: any) { - const { id } = e.currentTarget.dataset; - wx.navigateTo({ - url: `/gift/pages/orderDetail/index?id=${id}`, - }); - }, - onReachBottom() { - const { page, pages } = this.data.pagination; - if (pages > page) { - this.getList(page + 1); - } - }, -}); diff --git a/src/gift/pages/myGift/index.wxml b/src/gift/pages/myGift/index.wxml deleted file mode 100644 index bcf981f..0000000 --- a/src/gift/pages/myGift/index.wxml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 订单号:{{item.orderNo}} - {{item.statusName}} - {{item.statusName}} - - - - - {{item.giftName}} - 规格:{{item.specName}} - - {{item.giftScore}}能量 - x{{item.orderCount}} - - - - - - 共{{item.orderCount}}件 消耗能量: - {{item.orderScore}} - - 查看物流 - - - - diff --git a/src/gift/pages/orderDetail/index.json b/src/gift/pages/orderDetail/index.json deleted file mode 100644 index 8ad27fa..0000000 --- a/src/gift/pages/orderDetail/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "订单详情", - "usingComponents": {} -} diff --git a/src/gift/pages/orderDetail/index.scss b/src/gift/pages/orderDetail/index.scss deleted file mode 100644 index f45a52a..0000000 --- a/src/gift/pages/orderDetail/index.scss +++ /dev/null @@ -1,129 +0,0 @@ -page { - background-color: #f7f7f7; -} -.page { - padding: 40rpx; - .status-line { - display: flex; - align-items: center; - justify-content: center; - font-size: 40rpx; - color: #e04775; - font-weight: bold; - .icon { - margin-right: 16rpx; - width: 48rpx; - height: 50rpx; - } - } - .site { - margin-top: 26rpx; - padding: 32rpx; - background: #ffffff; - border-radius: 24rpx; - display: flex; - align-items: center; - .icon { - margin-right: 16rpx; - flex-shrink: 0; - width: 44rpx; - height: 44rpx; - } - .wrap { - .title { - font-size: 32rpx; - font-weight: bold; - color: #3f3f3f; - } - .content { - margin-top: 12rpx; - font-size: 28rpx; - color: #bebfc1; - } - } - } - .shop { - margin-top: 16rpx; - padding: 32rpx; - background: #ffffff; - border-radius: 24rpx; - display: flex; - align-items: center; - .shop-img { - flex-shrink: 0; - width: 204rpx; - height: 204rpx; - border-radius: 24rpx; - } - .wrap { - flex: 1; - padding-left: 24rpx; - .name { - font-size: 32rpx; - font-weight: bold; - color: #3f3f3f; - line-height: 44rpx; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - } - .specification { - display: inline-block; - margin-top: 8rpx; - font-size: 28rpx; - color: #b6b7ba; - border-radius: 10rpx; - } - .price { - margin-top: 14rpx; - display: flex; - align-items: center; - justify-content: space-between; - .num { - font-size: 32rpx; - color: #e04775; - font-weight: bold; - .sub { - font-size: 22rpx; - } - } - .val { - font-size: 28rpx; - color: #b6b7ba; - } - } - } - } - .detail { - margin-top: 16rpx; - padding: 8rpx 32rpx; - background: #ffffff; - border-radius: 24rpx; - .row { - padding: 24rpx 0; - display: flex; - align-items: center; - justify-content: space-between; - .label { - font-size: 28rpx; - color: #bbbcbe; - } - .content { - padding-left: 46rpx; - flex: 1; - font-size: 28rpx; - color: #3f3f3f; - font-weight: bold; - &.yellow { - color: #f5ad1d; - } - } - } - .row:not(:first-of-type) { - border-top: 1rpx solid #ebebeb; - } - } -} diff --git a/src/gift/pages/orderDetail/index.ts b/src/gift/pages/orderDetail/index.ts deleted file mode 100644 index 4a7c887..0000000 --- a/src/gift/pages/orderDetail/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -const app = getApp(); - -Page({ - data: { - id: "", - detail: {}, - }, - onLoad(options) { - this.setData({ - id: options.id, - }); - app.waitLogin().then(() => { - this.getDetail(); - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/gift-order/get-order-detail", - data: { - orderId: this.data.id, - }, - }).then((res) => { - this.setData({ - detail: res, - }); - }); - }, -}); diff --git a/src/gift/pages/orderDetail/index.wxml b/src/gift/pages/orderDetail/index.wxml deleted file mode 100644 index 9dd5e88..0000000 --- a/src/gift/pages/orderDetail/index.wxml +++ /dev/null @@ -1,54 +0,0 @@ - - - - {{detail.statusName}} - - - - - {{detail.receiveUserName}} {{detail.receiveTelephone}} - {{detail.receiveAddress}} - - - - - - {{detail.giftName}} - 规格:{{detail.specName}} - - {{detail.giftScore}}能量 - x{{detail.orderCount}} - - - - - - 消耗能量 - {{detail.orderScore}} - - - 订单编号 - {{detail.orderNo}} - - - 客服电话 - {{detail.serviceTel}} - - - 创建时间 - {{detail.orderTime}} - - - 发货时间 - {{detail.sendTime}} - - - 物流公司 - {{detail.logisticsCompany}} - - - 物流单号 - {{detail.logisticsOrderNo}} - - - diff --git a/src/gift/pages/orderEnd/index.json b/src/gift/pages/orderEnd/index.json deleted file mode 100644 index f052d70..0000000 --- a/src/gift/pages/orderEnd/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "下单成功", - "usingComponents": {} -} diff --git a/src/gift/pages/orderEnd/index.scss b/src/gift/pages/orderEnd/index.scss deleted file mode 100644 index abf9dea..0000000 --- a/src/gift/pages/orderEnd/index.scss +++ /dev/null @@ -1,40 +0,0 @@ -.page { - text-align: center; - .content-img { - margin-top: 196rpx; - width: 454rpx; - height: 356rpx; - } - .title { - margin-top: -80rpx; - font-size: 44rpx; - color: #e04775; - font-weight: bold; - } - .order-no { - margin-top: 16rpx; - font-size: 28rpx; - color: #9b9ea6; - } - .detail-btn-bd { - margin: 64rpx auto 0; - width: 422rpx; - height: 96rpx; - background: #fff; - border-radius: 48rpx; - line-height: 96rpx; - font-size: 36rpx; - color: #e04775; - border: 4rpx solid #e04775; - } - .detail-btn { - margin: 64rpx auto 0; - width: 422rpx; - height: 96rpx; - background: #e04775; - border-radius: 48rpx; - line-height: 96rpx; - font-size: 36rpx; - color: #ffffff; - } -} diff --git a/src/gift/pages/orderEnd/index.ts b/src/gift/pages/orderEnd/index.ts deleted file mode 100644 index 187f81f..0000000 --- a/src/gift/pages/orderEnd/index.ts +++ /dev/null @@ -1,39 +0,0 @@ -const app = getApp(); - -Page({ - data: { - id: "", - detail: {}, - }, - onLoad(options) { - this.setData({ - id: options.id, - }); - app.waitLogin().then(() => { - this.getDetail(); - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/gift-order/get-order-detail", - data: { - orderId: this.data.id, - }, - }).then((res) => { - this.setData({ - detail: res, - }); - }); - }, - handleDetail() { - wx.navigateTo({ - url: `/gift/pages/orderDetail/index?id=${this.data.id}`, - }); - }, - handleGift() { - wx.navigateTo({ - url: `/gift/pages/giftList/index`, - }); - }, -}); diff --git a/src/gift/pages/orderEnd/index.wxml b/src/gift/pages/orderEnd/index.wxml deleted file mode 100644 index 3974e16..0000000 --- a/src/gift/pages/orderEnd/index.wxml +++ /dev/null @@ -1,7 +0,0 @@ - - - 下单成功 - 订单号:{{detail.orderNo}} - 查看订单详情 - 返回礼品中心 - diff --git a/src/gift/pages/priceDetail/index.json b/src/gift/pages/priceDetail/index.json deleted file mode 100644 index 14a2011..0000000 --- a/src/gift/pages/priceDetail/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "能量明细", - "usingComponents": {} -} diff --git a/src/gift/pages/priceDetail/index.scss b/src/gift/pages/priceDetail/index.scss deleted file mode 100644 index 0adc901..0000000 --- a/src/gift/pages/priceDetail/index.scss +++ /dev/null @@ -1,78 +0,0 @@ -page { - background-color: #fafafa; -} - -.page { - padding: 48rpx 40rpx 120rpx; - .banner { - position: relative; - padding: 46rpx 48rpx; - background-color: #e6658d; - border-radius: 24rpx; - .title { - font-size: 28rpx; - color: #ffffff; - } - .num { - font-size: 64rpx; - color: 1897; - font-weight: bold; - color: #fff; - } - .icon{ - position: absolute; - top: 40rpx; - right: 40rpx; - width: 124rpx; - height: 122rpx; - } - } - - .list { - margin-top: 48rpx; - .list-title { - font-size: 36rpx; - color: #3f3f3f; - &::before { - margin-right: 16rpx; - display: inline-block; - content: ""; - width: 12rpx; - height: 44rpx; - background: #e04775; - vertical-align: middle; - border-radius: 0rpx 8rpx 8rpx 0rpx; - } - } - .list-container { - padding: 0 30rpx; - margin-top: 20rpx; - background: #ffffff; - border-radius: 24rpx; - .row { - padding: 30rpx 0; - display: flex; - justify-content: space-between; - .wrap { - .title { - font-size: 32rpx; - color: #3f3f3f; - } - .date { - font-size: 28rpx; - color: #bbbcbe; - } - } - .price { - margin-left: 10rpx; - flex-shrink: 0; - font-size: 40rpx; - color: #f5ad1d; - } - } - .row:not(:last-of-type) { - border-bottom: 1px solid #ebebeb; - } - } - } -} diff --git a/src/gift/pages/priceDetail/index.ts b/src/gift/pages/priceDetail/index.ts deleted file mode 100644 index f6cb028..0000000 --- a/src/gift/pages/priceDetail/index.ts +++ /dev/null @@ -1,53 +0,0 @@ -const app = getApp(); - -Page({ - data: { - score: 0, - list: [], - pagination: { - page: 1, - pages: 1, - count: 1, - }, - }, - onLoad() { - app.waitLogin().then(() => { - this.getList(); - this.getDetail() - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-score/get-self-score", - data: {}, - }).then((res) => { - this.setData({ - score: res.score, - }); - }); - }, - getList(newPage = 1) { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-score/get-self-record-list", - data: { page: newPage }, - }).then((res) => { - let list = res.page == 1 ? res.list : [...this.data.list, ...res.list]; - this.setData({ - list: list, - pagination: { - page: res.page, - pages: res.pages, - count: res.count, - }, - }); - }); - }, - onReachBottom() { - const { page, pages } = this.data.pagination; - if (pages > page) { - this.getList(page + 1); - } - }, -}); diff --git a/src/gift/pages/priceDetail/index.wxml b/src/gift/pages/priceDetail/index.wxml deleted file mode 100644 index 9ebab0f..0000000 --- a/src/gift/pages/priceDetail/index.wxml +++ /dev/null @@ -1,26 +0,0 @@ - - - - 能量收支明细 - - - - - {{item.recordTypeName}} - :{{item.giftName}} - - {{item.createTime}} - - {{item.scoreChange}} - - - - - diff --git a/src/gift/pages/scoreRule/index.json b/src/gift/pages/scoreRule/index.json deleted file mode 100644 index eb1d033..0000000 --- a/src/gift/pages/scoreRule/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "能量规则", - "navigationStyle": "custom", - "usingComponents": { - "navBar": "/components/navBar/navBar" - } -} diff --git a/src/gift/pages/scoreRule/index.scss b/src/gift/pages/scoreRule/index.scss deleted file mode 100644 index 6a98dc4..0000000 --- a/src/gift/pages/scoreRule/index.scss +++ /dev/null @@ -1,139 +0,0 @@ -page { - background-color: #f5f5f5; -} -.page { - padding: 200rpx 40rpx 80rpx; - .banner { - position: relative; - .b-title { - position: absolute; - left: 50%; - top: 0; - transform: translate(-50%, -50%); - width: 310rpx; - height: 86rpx; - } - .b-content { - padding: 72rpx 30rpx 36rpx; - background: #fbf0f3; - box-shadow: 0rpx 14rpx 32rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - border: 2rpx solid rgba(224, 71, 117, 0.52); - } - } - .list { - margin-top: 78rpx; - padding: 76rpx 30rpx; - background: #ffffff; - box-shadow: 0rpx 14rpx 32rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - position: relative; - .l-title { - position: absolute; - left: 50%; - top: 0; - transform: translate(-50%, -50%); - width: 310rpx; - height: 86rpx; - } - .l-tip { - font-size: 32rpx; - color: #333333; - font-weight: bold; - } - .module { - .m-title { - position: relative; - margin: 26rpx 96rpx 0 16rpx; - line-height: 60rpx; - padding: 0 24rpx; - background: linear-gradient(270deg, rgba(242, 125, 173, 0) 0%, rgba(224, 71, 117, 0.87) 57%, #e04775 100%); - font-size: 28rpx; - color: #ffffff; - font-weight: bold; - .num { - position: absolute; - left: 0; - top: 0; - transform: translate(-100%, 0); - width: 60rpx; - height: 60rpx; - background-color: #24d8c8; - text-align: center; - line-height: 60rpx; - &::before { - position: absolute; - top: -6rpx; - left: 0; - content: ""; - width: 0; - height: 0; - border-style: solid; - border-width: 0 0 6rpx 14rpx; - border-color: transparent transparent #007167 transparent; - } - } - } - .m-content { - margin-top: 24rpx; - padding: 32rpx 30rpx; - font-size: 28rpx; - color: #666666; - border-radius: 16rpx; - background-color: #f5f5f5; - } - .ul { - .ol { - margin-top: 34rpx; - font-size: 28rpx; - color: #666666; - .o-title { - font-size: 28rpx; - color: #666666; - font-weight: bold; - margin-bottom: 12rpx; - display: flex; - .o-num { - margin-right: 12rpx; - flex-shrink: 0; - width: 34rpx; - height: 34rpx; - font-size: 24rpx; - color: #ffffff; - background-color: #e04775; - text-align: center; - line-height: 34rpx; - border-radius: 50%; - } - } - &.no-title { - display: flex; - } - } - } - } - .tip { - margin-top: 32rpx; - .t-title { - font-size: 32rpx; - color: #666666; - font-weight: bold; - line-height: 1; - &::before { - margin-right: 16rpx; - display: inline-block; - vertical-align: middle; - content: ""; - width: 10rpx; - height: 34rpx; - background-color: #e04775; - } - } - .t-content { - margin-top: 10rpx; - font-size: 28rpx; - color: #666666; - } - } - } -} diff --git a/src/gift/pages/scoreRule/index.ts b/src/gift/pages/scoreRule/index.ts deleted file mode 100644 index f790e55..0000000 --- a/src/gift/pages/scoreRule/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -const app = getApp(); - -Page({ - data: { - list: [], - }, - onLoad() { - const SystemInfo = app.globalSystemInfo; - if (SystemInfo) { - const { bottom } = SystemInfo.capsulePosition; - this.setData({ - bottom: bottom, - }); - } - app.waitLogin().then(() => { - this.getDetail(); - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-score/get-score-explain", - data: {}, - }).then((res) => { - this.setData({ - list: res, - }); - }); - }, - handleBack() { - wx.navigateBack(); - }, -}); diff --git a/src/gift/pages/scoreRule/index.wxml b/src/gift/pages/scoreRule/index.wxml deleted file mode 100644 index 36731f8..0000000 --- a/src/gift/pages/scoreRule/index.wxml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - {{list[1].content}} - - - {{index+1}} - {{item.title}} - - {{item.content}} - - - - {{subIndex+1}} - {{subItem.title}} - - {{subItem.content}} - - - - - - - {{list[2].content}} - - - {{index+1}} - {{item.title}} - - {{item.content}} - - - - {{subIndex+1}} - {{subItem.title}} - - {{subItem.content}} - - - - - {{list[3].title}} - {{list[3].content}} - - - - diff --git a/src/gift/pages/siteEdit/index.json b/src/gift/pages/siteEdit/index.json deleted file mode 100644 index 167c8d9..0000000 --- a/src/gift/pages/siteEdit/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "添加收货地址", - "usingComponents": { - "van-switch": "@vant/weapp/switch/index", - "van-popup": "@vant/weapp/popup/index", - "van-cascader": "@vant/weapp/cascader/index" - } -} diff --git a/src/gift/pages/siteEdit/index.scss b/src/gift/pages/siteEdit/index.scss deleted file mode 100644 index af048b1..0000000 --- a/src/gift/pages/siteEdit/index.scss +++ /dev/null @@ -1,96 +0,0 @@ -page { - background-color: #f7f7f7; -} - -.page { - padding: 40rpx; - .form { - padding: 0 32rpx; - background-color: #fff; - border-radius: 24rpx; - .row { - padding: 32rpx 0; - display: flex; - align-items: center; - .label { - flex-shrink: 0; - width: 4em; - font-size: 32rpx; - color: #3f3f3f; - font-weight: bold; - } - .content { - flex: 1; - padding-left: 18rpx; - display: flex; - align-items: center; - .input { - flex: 1; - font-size: 32rpx; - } - .place-input { - color: #bbbcbe; - } - .site { - border-left: 2rpx solid rgba(170, 170, 170, 0.3); - padding-left: 16rpx; - font-size: 32rpx; - color: #e04775; - display: flex; - align-items: center; - .icon { - margin-right: 10rpx; - width: 36rpx; - height: 36rpx; - } - } - } - } - .row:not(:last-of-type) { - border-bottom: 1rpx solid #edeff3; - } - } - .default { - margin-top: 16rpx; - padding: 26rpx 32rpx; - background-color: #fff; - border-radius: 24rpx; - display: flex; - align-items: center; - justify-content: space-between; - } - .footer { - padding: 40rpx; - position: fixed; - left: 0; - bottom: 0; - width: 100vw; - box-sizing: border-box; - bottom: 248rpx; - display: flex; - .cancel { - margin-right: 32rpx; - flex-shrink: 0; - width: 248rpx; - height: 96rpx; - border-radius: 48rpx; - box-sizing: border-box; - line-height: 92rpx; - text-align: center; - font-size: 36rpx; - color: #e04775; - border: 2rpx solid #e04775; - } - .submit { - flex: 1; - height: 96rpx; - background: #e04775; - border-radius: 48rpx; - text-align: center; - line-height: 96rpx; - text-align: center; - font-size: 36rpx; - color: #ffffff; - } - } -} diff --git a/src/gift/pages/siteEdit/index.ts b/src/gift/pages/siteEdit/index.ts deleted file mode 100644 index 3a5c45e..0000000 --- a/src/gift/pages/siteEdit/index.ts +++ /dev/null @@ -1,272 +0,0 @@ -const app = getApp(); - -Page({ - data: { - LAT: "", - LNG: "", - - addressId: "", - receiveUserName: "", - receiveTelephone: "", - address: "", - isDefault: false, - provinceName: "", - provinceId: "", - cityId: "", - cityName: "", - countyId: "", - countyName: "", - - pcc: "", - - cascaderShow: false, - options: [], - areaValue: [] as number[], - cascaderValue: "", - fieldNames: { text: "label", value: "value", children: "children" }, - }, - onLoad(options) { - if (options.id) { - wx.setNavigationBarTitle({ - title: "编辑收货地址", - }); - this.setData({ - addressId: options.id, - }); - } - app.waitLogin().then((_res) => { - this.getArea(); - if (options.id) { - this.getDetail(); - } - }); - }, - getDetail() { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-address/get-address-detail", - data: { - addressId: this.data.addressId, - }, - }).then((res) => { - console.log("res: ", res); - this.setData({ - ...res, - isDefault: res.isDefault == 1 ? true : false, - pcc: `${res.provinceName}/${res.cityName}/${res.countyName}`, - }); - }); - }, - onChange(e) { - this.setData({ - isDefault: e.detail, - }); - }, - getArea() { - wx.ajax({ - method: "GET", - url: "/js/area.json", - isJSON: true, - }).then((res) => { - this.setData({ - options: res.map((item) => { - return { - ...item, - children: item.children.map((item2) => { - return { - label: item2.label, - value: item2.value, - children: item2.children.map((item3) => { - return { - label: item3.label, - value: item3.value, - }; - }), - }; - }), - }; - }), - }); - }); - }, - handleCascader() { - this.setData({ - cascaderShow: true, - }); - }, - onFinish(e: any) { - const selectedOptions = e.detail.selectedOptions; - console.log(selectedOptions); - this.setData({ - cascaderValue: e.detail.value, - areaValue: [selectedOptions[0].value, selectedOptions[1].value, selectedOptions[2].value], - pcc: `${selectedOptions[0].label}/${selectedOptions[1].label}/${selectedOptions[2].label}`, - provinceId: selectedOptions[0].value, - provinceName: selectedOptions[0].label, - cityId: selectedOptions[1].value, - cityName: selectedOptions[1].label, - countyId: selectedOptions[2].value, - countyName: selectedOptions[2].label, - }); - this.onClose(); - }, - onClose() { - this.setData({ - cascaderShow: false, - }); - }, - handleSite() { - const that = this; - wx.getSetting({ - success(res) { - if ( - res.authSetting["scope.userFuzzyLocation"] != undefined && - res.authSetting["scope.userFuzzyLocation"] == true - ) { - //获取当前位置 - that.getFuzzyLocation(); - } else if (res.authSetting["scope.userFuzzyLocation"] == undefined) { - //获取当前位置 - that.getFuzzyLocation(); - } else { - wx.showModal({ - title: "请求授权当前位置", - content: "需要获取您的地理位置,请确认授权", - confirmColor: "#cf5375", - success: function (res) { - if (res.cancel) { - //取消授权 - wx.showToast({ - title: "拒绝授权", - icon: "none", - duration: 1000, - }); - } else if (res.confirm) { - //确定授权,通过wx.openSetting发起授权请求 - wx.openSetting({ - success: function (res) { - if (res.authSetting["scope.userFuzzyLocation"] == true) { - //再次授权,调用wx.getLocation的API - that.getFuzzyLocation(); - } else { - wx.showToast({ - title: "授权失败", - icon: "none", - duration: 1000, - }); - } - }, - }); - } - }, - }); - } - }, - }); - }, - getFuzzyLocation() { - const that = this; - wx.getFuzzyLocation({ - success(res) { - that.setData({ - LNG: res.longitude, - LAT: res.latitude, - }); - that.getLocationInfo(); - }, - fail(err) { - console.log(err); - }, - }); - }, - getLocationInfo() { - wx.ajax({ - method: "GET", - url: "?r=igg4/nrdl-hospital/location-info", - data: { - lat: this.data.LAT, - lng: this.data.LNG, - }, - loading: true, - }).then((res) => { - this.setData({ - cityId: res.CityId, - cityName: res.CityName, - countyId: res.CountyId, - countyName: res.CountyName, - provinceId: res.ProvinceId, - provinceName: res.ProvinceName, - - pcc: `${res.ProvinceName}/${res.CityName}/${res.CountyName}`, - }); - }); - }, - handleSubmit() { - const { - receiveUserName, - receiveTelephone, - address, - isDefault, - addressId, - provinceName, - provinceId, - cityId, - cityName, - countyId, - countyName, - } = this.data; - let toast = ""; - if (!receiveUserName) toast = "请输入收货人姓名"; - if (!receiveTelephone) toast = "请输入联系电话"; - if (!provinceName) toast = "请选择所在地区"; - if (!address) toast = "请输入详细地址"; - - const params = { - receiveUserName, - receiveTelephone, - provinceName, - address, - isDefault: isDefault ? 1 : 2, - addressId, - provinceId, - cityId, - cityName, - countyId, - countyName, - }; - wx.ajax({ - method: "POST", - url: "?r=igg4/patient-address/save-address", - data: params, - }).then(() => { - wx.navigateBack(); - }); - }, - handleDel() { - wx.showModal({ - title: "确认删除?", - confirmColor: "#DE406A", - success: (res) => { - if (res.confirm) { - wx.ajax({ - method: "POST", - url: "?r=igg4/patient-address/del-address", - data: { - addressId: this.data.addressId, - }, - loading: true, - }).then((res) => { - wx.navigateBack({ - success() { - wx.showToast({ - icon: "none", - title: res, - }); - }, - }); - }); - } - }, - }); - }, -}); diff --git a/src/gift/pages/siteEdit/index.wxml b/src/gift/pages/siteEdit/index.wxml deleted file mode 100644 index d599b1d..0000000 --- a/src/gift/pages/siteEdit/index.wxml +++ /dev/null @@ -1,80 +0,0 @@ - - - - 收货人 - - - - - - 联系电话 - - - - - - 所在地区 - - - - - 定位 - - - - - 详细地址 - - - - - - - 设置为默认地址 - - - - 删除 - 保存 - - - - - - diff --git a/src/gift/pages/siteList/index.json b/src/gift/pages/siteList/index.json deleted file mode 100644 index e27fa26..0000000 --- a/src/gift/pages/siteList/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "地址管理", - "usingComponents": {} -} diff --git a/src/gift/pages/siteList/index.scss b/src/gift/pages/siteList/index.scss deleted file mode 100644 index cc56cf5..0000000 --- a/src/gift/pages/siteList/index.scss +++ /dev/null @@ -1,73 +0,0 @@ -page { - background-color: #fafafa; -} -.page { - padding: 34rpx 40rpx 240rpx; - .card { - margin-bottom: 20rpx; - padding: 32rpx; - background: #ffffff; - border-radius: 24rpx; - display: flex; - justify-content: space-between; - align-items: center; - .wrap { - flex: 1; - width: calc(100% - 100rpx); - .title { - display: flex; - align-items: center; - .name { - flex: 1; - font-size: 32rpx; - font-weight: bold; - align-items: center; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - .label { - flex-shrink: 0; - margin-right: 20rpx; - padding: 0 10rpx; - display: inline-block; - vertical-align: middle; - font-size: 24rpx; - line-height: 34rpx; - color: #e04775; - border: 1rpx solid #e04775; - border-radius: 10rpx; - } - } - .content { - margin-top: 12rpx; - font-size: 28rpx; - color: #bbbcbe; - } - } - .edit { - margin-left: 15rpx; - width: 32rpx; - flex-shrink: 0; - .edit-img { - width: 32rpx; - height: 32rpx; - } - } - } - - .submit { - position: fixed; - bottom: 120rpx; - left: 40rpx; - height: 96rpx; - width: calc(100% - 80rpx); - background: #e04775; - border-radius: 48rpx; - text-align: center; - line-height: 96rpx; - text-align: center; - font-size: 36rpx; - color: #ffffff; - } -} diff --git a/src/gift/pages/siteList/index.ts b/src/gift/pages/siteList/index.ts deleted file mode 100644 index 86af78d..0000000 --- a/src/gift/pages/siteList/index.ts +++ /dev/null @@ -1,64 +0,0 @@ -const app = getApp(); - -Page({ - data: { - list: [], - pagination: { - page: 1, - pages: 1, - count: 1, - }, - }, - onShow() { - app.waitLogin().then(() => { - this.getList(); - }); - }, - getList(newPage = 1) { - wx.ajax({ - method: "GET", - url: "?r=igg4/patient-address/get-list", - data: { - page: newPage, - }, - }).then((res) => { - let list = res.page == 1 ? res.list : [...this.data.list, ...res.list]; - this.setData({ - list: list, - pagination: { - page: res.page, - pages: res.pages, - count: res.count, - }, - }); - }); - }, - handleSelect(e) { - const { index } = e.currentTarget.dataset; - let pages = getCurrentPages(); - - let prevPage = pages[pages.length - 2]; - prevPage.setData({ - select: true, - addressDetail: this.data.list[index], - }); - wx.navigateBack(); - }, - handleEdit(e) { - const { id } = e.currentTarget.dataset; - wx.navigateTo({ - url: `/gift/pages/siteEdit/index?id=${id}`, - }); - }, - handleAdd() { - wx.navigateTo({ - url: "/gift/pages/siteEdit/index", - }); - }, - onReachBottom() { - const { page, pages } = this.data.pagination; - if (pages > page) { - this.getList(page + 1); - } - }, -}); diff --git a/src/gift/pages/siteList/index.wxml b/src/gift/pages/siteList/index.wxml deleted file mode 100644 index e52643c..0000000 --- a/src/gift/pages/siteList/index.wxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 默认 - {{item.provinceName}}{{item.cityName}}{{item.countyName}}{{item.address}} - - {{item.receiveUserName}} {{item.receiveTelephone}} - - - - - - - - 新增地址 - diff --git a/src/pages/live/index.json b/src/pages/live/index.json index 4e76bd0..cd3c041 100644 --- a/src/pages/live/index.json +++ b/src/pages/live/index.json @@ -1,8 +1,7 @@ { "navigationBarTitleText": "活动列表页", - "navigationBarBackgroundColor": "#fafafa", + "navigationBarBackgroundColor": "#F7F7F7", "usingComponents": { - "van-icon": "@vant/weapp/icon/index", - "navBar": "/components/navBar/navBar" + "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/pages/live/index.scss b/src/pages/live/index.scss index be034f3..d2cb21a 100644 --- a/src/pages/live/index.scss +++ b/src/pages/live/index.scss @@ -1,74 +1,11 @@ .page { + overflow: hidden; padding-bottom: 120rpx; - background-color: #fafafa; + min-height: 100vh; + background-color: #f7f7f7; position: relative; - .search { - margin: 32rpx 30rpx 0; - padding: 18rpx 32rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 38rpx; - border: 2rpx solid #ebecee; - display: flex; - align-items: center; - .icon { - width: 40rpx; - height: 40rpx; - } - .input { - flex: 1; - margin-left: 20rpx; - font-size: 28rpx; - } - .placeholder-input { - color: #a8a8a8; - } - .clear { - color: #ccc; - } - } - .sticky { - position: sticky; - top: 0rpx; - left: 0; - z-index: 20; - padding-bottom: 10rpx; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - background-color: #fafafa; - .tags { - margin-top: 20rpx; - padding-top: 28rpx; - position: relative; - overflow-y: hidden; - overflow-x: auto; - padding-bottom: 8rpx; - &::-webkit-scrollbar { - display: none; - } - .scroll { - padding-left: 30rpx; - display: flex; - flex-wrap: nowrap; - .tag { - margin-right: 16rpx; - flex-shrink: 0; - font-size: 28rpx; - color: #484848; - background-color: #f2f2f2; - border-radius: 24rpx; - padding: 10rpx 24rpx; - line-height: 1; - &.active { - position: relative; - color: #fff; - background-color: var(--name); - } - } - } - } - } .info-list { - margin: 32rpx 30rpx; + padding: 32rpx 30rpx; .list-item { margin-bottom: 32rpx; background: #ffffff; diff --git a/src/pages/live/index.wxml b/src/pages/live/index.wxml index 44cea53..c295887 100644 --- a/src/pages/live/index.wxml +++ b/src/pages/live/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/src/pages/liveDetail/index.wxml b/src/pages/liveDetail/index.wxml index 8e869a2..a091133 100644 --- a/src/pages/liveDetail/index.wxml +++ b/src/pages/liveDetail/index.wxml @@ -14,7 +14,7 @@ 主讲人:{{detail.MasterName}} {{detail.MasterTitle}} diff --git a/src/pages/liveResult/index.wxml b/src/pages/liveResult/index.wxml index cf03da6..35f8030 100644 --- a/src/pages/liveResult/index.wxml +++ b/src/pages/liveResult/index.wxml @@ -1,6 +1,6 @@ diff --git a/src/pages/repository/index.wxml b/src/pages/repository/index.wxml index 0b97053..22424ef 100644 --- a/src/pages/repository/index.wxml +++ b/src/pages/repository/index.wxml @@ -15,7 +15,7 @@ - +