diff --git a/api/Personal/Personal.js b/api/Personal/Personal.js new file mode 100644 index 0000000..8a37c6e --- /dev/null +++ b/api/Personal/Personal.js @@ -0,0 +1,16 @@ +import request from "../request.js" +export function appPersonal(patientId) { + return request({ + url: `/nurseApp/login/appPersonal?patientId=${patientId}`, + method: 'GET' + }) +} + + +//邀请 +export function inviteFriends(patientId) { + return request({ + url: `/nurseApplet/patientInfo/inviteFriends?inviteId=${patientId}`, + method: 'post' + }) +} diff --git a/api/ProductList/ProductList.js b/api/ProductList/ProductList.js index b750720..13c6ea1 100644 --- a/api/ProductList/ProductList.js +++ b/api/ProductList/ProductList.js @@ -1,8 +1,16 @@ import request from "../request.js" -export function goodsList(pageSize,pageNum,goodsCategoryId,goodsName) { +export function goodsList(pageSize, pageNum, goodsCategoryId, goodsName) { return request({ url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}&goodsName=${goodsName}`, method: 'GET' }) -} \ No newline at end of file +} + +//查询商品分类二级分类上边列表 小程序 +export function getGoodsCategoryNameList(goodsCategoryId) { + return request({ + url: `/nurseApplet/nursingStationGoods/getGoodsCategoryNameList?goodsCategoryId=${goodsCategoryId}`, + method: 'GET' + }) +} diff --git a/api/shopping/shopping.js b/api/shopping/shopping.js index 6202c1f..4f273ad 100644 --- a/api/shopping/shopping.js +++ b/api/shopping/shopping.js @@ -1,8 +1,8 @@ import request from "../request.js" -export function goodsCategoryList(pageSize,pageNum) { +export function goodsCategoryList(pageSize, pageNum) { return request({ - url: `/nurseApplet/nursingStationGoods/goodsCategoryList?pageSize=${pageSize}&pageNum=${pageNum}`, + url: `/nurseApplet/nursingStationGoods/goodsCategoryList?pageSize=${pageSize}&pageNum=${pageNum}&categoryLevel=${1}`, method: 'GET' }) } diff --git a/pages.json b/pages.json index d0ca5bb..0dbee9f 100644 --- a/pages.json +++ b/pages.json @@ -101,6 +101,7 @@ "navigationBarTitleText": "医路优品", "navigationBarBackgroundColor": "#ffffff", "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "navigationStyle": "custom", "enablePullDownRefresh": true //设置参数为true } }, { @@ -141,7 +142,8 @@ "style": { "navigationBarTitleText": "个人中心", "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" + "navigationBarBackgroundColor": "#ffffff", + "navigationStyle": "custom" } }, { diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue index 48dff57..fe8b799 100644 --- a/pages/Applforrefund/Applforrefund.vue +++ b/pages/Applforrefund/Applforrefund.vue @@ -7,7 +7,7 @@ 退款原因 请选择 {{dictname}} - + 退款金额 ￥{{order.totalPrice}} diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index a32b179..6e1723c 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -19,7 +19,7 @@ {{updata.goodsAttributeName}} - + @@ -28,7 +28,7 @@ + --> @@ -40,7 +40,7 @@ · 仅工作日发货 - + diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index bae2c64..f54948e 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -7,7 +7,7 @@ 店铺名称 - + 待付款 退款中 已取消 diff --git a/pages/InformationFilling/InformationFilling.vue b/pages/InformationFilling/InformationFilling.vue index b111bb9..53d7e73 100644 --- a/pages/InformationFilling/InformationFilling.vue +++ b/pages/InformationFilling/InformationFilling.vue @@ -36,13 +36,13 @@ 病例上传 - - + + 化验单上传 - - + + 确认 diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index afa1903..f938fb4 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -1,143 +1,560 @@ - - diff --git a/static/Tobepaid.png b/static/Tobepaid.png index 49c967e..6ba4f01 100644 Binary files a/static/Tobepaid.png and b/static/Tobepaid.png differ diff --git a/static/cp.png b/static/cp.png deleted file mode 100644 index 800a686..0000000 Binary files a/static/cp.png and /dev/null differ diff --git a/static/daohang.png b/static/daohang.png new file mode 100644 index 0000000..07b4dd3 Binary files /dev/null and b/static/daohang.png differ diff --git a/static/dingdan.png b/static/dingdan.png index df60c20..0f2b51b 100644 Binary files a/static/dingdan.png and b/static/dingdan.png differ diff --git a/static/evaluated.png b/static/evaluated.png index 8cd65fa..4960d9a 100644 Binary files a/static/evaluated.png and b/static/evaluated.png differ diff --git a/static/finished.png b/static/finished.png index 0b35f09..2ef3914 100644 Binary files a/static/finished.png and b/static/finished.png differ diff --git a/static/jfgz.png b/static/jfgz.png new file mode 100644 index 0000000..ec3a141 Binary files /dev/null and b/static/jfgz.png differ diff --git a/static/jiantou.png b/static/jiantou.png deleted file mode 100644 index 80157cd..0000000 Binary files a/static/jiantou.png and /dev/null differ diff --git a/static/jifen.png b/static/jifen.png new file mode 100644 index 0000000..be885a6 Binary files /dev/null and b/static/jifen.png differ diff --git a/static/jifenbeij.png b/static/jifenbeij.png new file mode 100644 index 0000000..2884b46 Binary files /dev/null and b/static/jifenbeij.png differ diff --git a/static/jkda.png b/static/jkda.png new file mode 100644 index 0000000..a57abd7 Binary files /dev/null and b/static/jkda.png differ diff --git a/static/kefuzx.jpg b/static/kefuzx.jpg deleted file mode 100644 index f749fc5..0000000 Binary files a/static/kefuzx.jpg and /dev/null differ diff --git a/static/lnb.png b/static/lnb.png new file mode 100644 index 0000000..7481043 Binary files /dev/null and b/static/lnb.png differ diff --git a/static/pic.png b/static/pic.png deleted file mode 100644 index bf2e92e..0000000 Binary files a/static/pic.png and /dev/null differ diff --git a/static/qiandao.png b/static/qiandao.png new file mode 100644 index 0000000..48544c1 Binary files /dev/null and b/static/qiandao.png differ diff --git a/static/received.png b/static/received.png index fd196a9..3c684ae 100644 Binary files a/static/received.png and b/static/received.png differ diff --git a/static/rowsright.png b/static/rowsright.png deleted file mode 100644 index dbf914f..0000000 Binary files a/static/rowsright.png and /dev/null differ diff --git a/static/user.png b/static/user.png index 4cdb845..dac4233 100644 Binary files a/static/user.png and b/static/user.png differ diff --git a/static/userl.png b/static/userl.png new file mode 100644 index 0000000..f7224f5 Binary files /dev/null and b/static/userl.png differ diff --git a/static/xg.png b/static/xg.png new file mode 100644 index 0000000..4ba6bf1 Binary files /dev/null and b/static/xg.png differ diff --git a/static/yaoqing.png b/static/yaoqing.png new file mode 100644 index 0000000..e8870b1 Binary files /dev/null and b/static/yaoqing.png differ diff --git a/static/yhj.png b/static/yhj.png new file mode 100644 index 0000000..903860e Binary files /dev/null and b/static/yhj.png differ diff --git a/static/zbglzbgl.png b/static/zbglzbgl.png new file mode 100644 index 0000000..9a76358 Binary files /dev/null and b/static/zbglzbgl.png differ