diff --git a/api/CommodityDetails/CommodityDetails.js b/api/CommodityDetails/CommodityDetails.js index 513029e..3c9265f 100644 --- a/api/CommodityDetails/CommodityDetails.js +++ b/api/CommodityDetails/CommodityDetails.js @@ -1,8 +1,8 @@ import request from "../request.js" // 查询商品详细列表 -export function goodsDetails(goodsInfoId){ +export function goodsDetails(goodsInfoId, patientId) { return request({ - url: `/nurseApplet/nursingStationGoods/goodsDetails?goodsInfoId=${goodsInfoId}`, + url: `/nurseApplet/nursingStationGoods/goodsDetails?goodsInfoId=${goodsInfoId}&patientId=${patientId}`, method: 'GET' }) } diff --git a/api/Personal/Personal.js b/api/Personal/Personal.js index 1f3005d..8a37c6e 100644 --- a/api/Personal/Personal.js +++ b/api/Personal/Personal.js @@ -5,3 +5,12 @@ export function appPersonal(patientId) { method: 'GET' }) } + + +//邀请 +export function inviteFriends(patientId) { + return request({ + url: `/nurseApplet/patientInfo/inviteFriends?inviteId=${patientId}`, + method: 'post' + }) +} diff --git a/api/integral/index.js b/api/integral/index.js new file mode 100644 index 0000000..f341f0a --- /dev/null +++ b/api/integral/index.js @@ -0,0 +1,27 @@ +import request from "../request.js" + + +//签到 +export function signIn(patientId) { + return request({ + url: `/nurseApplet/patientInfo/signIn?patientId=${patientId}&signInChannel=WECHAT_APPLET`, + method: 'post' + }) +} + +//积分 +export function selectPatientSignIn(patientId) { + return request({ + url: `/nurseApplet/patientInfo/selectPatientSignIn?patientId=${patientId}`, + method: 'get' + }) +} + +//可兑换商品 + +export function selectExchangeGoods(pageNum,pageSize) { + return request({ + url: `/nurseApplet/patientInfo/selectExchangeGoods?pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'get' + }) +} diff --git a/api/materialbenefits/index.js b/api/materialbenefits/index.js new file mode 100644 index 0000000..5afa5ab --- /dev/null +++ b/api/materialbenefits/index.js @@ -0,0 +1,10 @@ +import request from "../request.js" + + +//新人优惠券 +export function couponByUseStatus(patientId) { + return request({ + url: `/nurseApplet/patientInfo/couponByUseStatus?patientId=${patientId}`, + method: 'get' + }) +} diff --git a/pages.json b/pages.json index 92c89b4..9257993 100644 --- a/pages.json +++ b/pages.json @@ -4,20 +4,18 @@ }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { + "path": "pages/integral/integral", + "style": { + "navigationBarTitleText": "积分", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + },{ "path": "pages/startup/startup", "style": { "navigationBarTitleText": "", "navigationStyle": "custom" } - }, { - "path": "pages/coupon/coupon", - "style": { - "navigationBarTitleText": "优惠卷", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff", - "onReachBottomDistance": 40, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true //设置参数为true - } },{ "path": "pages/information/information", "style": { @@ -25,6 +23,22 @@ "navigationBarBackgroundColor": "#ffffff", //背景颜色 "enablePullDownRefresh": false } + }, { + "path": "pages/CommodityDetails/CommodityDetails", + "style": { + "navigationBarTitleText": "商品详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/coupon/coupon", + "style": { + "navigationBarTitleText": "优惠券", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff", + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true + } }, { "path": "pages/Personal/Personal", "style": { @@ -33,13 +47,6 @@ "navigationBarBackgroundColor": "#ffffff", "navigationStyle": "custom" } - }, { - "path": "pages/integral/integral", - "style": { - "navigationBarTitleText": "积分", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } }, { "path": "pages/modify/modify", "style": { @@ -249,14 +256,6 @@ "enablePullDownRefresh": true //设置参数为true } }, - { - "path": "pages/CommodityDetails/CommodityDetails", - "style": { - "navigationBarTitleText": "商品详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { "path": "pages/nursestation/nursestation", "style": { diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 842e96e..578f80b 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -12,7 +12,7 @@ ￥{{goodsPrice}} - + 已选 @@ -21,14 +21,14 @@ - + 优惠 - + @@ -51,7 +51,7 @@ - + 立即购买 @@ -69,8 +69,16 @@ 暂无 - - ￥{{updata.goodsPrice}} + + + ￥{{totalPrice}} + + + 实付价￥ + + {{Paidinprice}} + + 库存数量:{{updata.goodsStock}} @@ -124,10 +132,21 @@ 数量 - + + + + 优惠卷 + + + 已选择 {{coupon.couponTitle}} + + + @@ -161,9 +180,80 @@ + + + + 选择优惠卷 + + + + + + + ￥ + + + {{item.couponPrice}} + + + + {{item.couponTitle}} + + + 满 + {{item.couponConsumePrice}} + 可用 + + + 有效期至{{item.expirationEndTime}} + + + 取消使用 + + + 使用 + + + + 领取来源：{{item.receiveSource =='NEW_PEOPLE_WELFARE'?'新人福利':''}} + + + + + + + ￥ + + + {{item.couponPrice}} + + + + {{item.couponTitle}} + + + 满 + {{item.couponConsumePrice}} + 可用 + + + 有效期至{{item.expirationEndTime}} + + + 不满足 + + + + 领取来源：{{item.receiveSource =='NEW_PEOPLE_WELFARE'?'新人福利':''}} + + + + + - diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss index 7101bfd..e860f38 100644 --- a/pages/modify/modify.scss +++ b/pages/modify/modify.scss @@ -80,8 +80,8 @@ .radio { display: inline-block; - width: 40rpx; - height: 40rpx; + width: 50rpx; + height: 50rpx; border-radius: 70%; border: 2rpx solid #178ffb; position: absolute; diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue index d7bee60..f63ebe1 100644 --- a/pages/modify/modify.vue +++ b/pages/modify/modify.vue @@ -12,8 +12,8 @@ 性别： - - + + {{item.name}} @@ -53,7 +53,7 @@ - 疾病类型: + 基础疾病: diff --git a/pages/startup/startup.vue b/pages/startup/startup.vue index e53d307..1593810 100644 --- a/pages/startup/startup.vue +++ b/pages/startup/startup.vue @@ -33,6 +33,13 @@ path: url, } }, + onLoad(query) { + // scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene + const scene = decodeURIComponent(query.scene) + if (scene >= 0) { + uni.setStorageSync("invitationPatientId", scene) + } + }, onShow() { var that = this createMobileToken().then(res => { diff --git a/static/yaoqinghaoyou.png b/static/yaoqinghaoyou.png new file mode 100644 index 0000000..3057785 Binary files /dev/null and b/static/yaoqinghaoyou.png differ