diff --git a/pages.json b/pages.json
index 7b1b7c1..bcbc18c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,20 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
+ "path": "pages/shopping/shopping",
+ "style": {
+ "navigationBarTitleText": "医路优品",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ },{
+ "path": "pages/ProductList/ProductList",
+ "style": {
+ "navigationBarTitleText": "医路优品",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ }, {
"path": "pages/homepage/homepage",
"style": {
"navigationBarTitleText": "泉医到家",
@@ -33,14 +47,9 @@
"enablePullDownRefresh": false
}
- }, {
- "path": "pages/shopping/shopping",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
}
+
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -71,7 +80,7 @@
{
"pagePath": "pages/Personal/Personal",
"iconPath": "static/个人 拷贝 2@2x.png",
- "selectedIconPath": "static/商城11@2x.png",
+ "selectedIconPath": "static/个人@2x.png",
"text": "个人中心"
}
]
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
new file mode 100644
index 0000000..0d7d816
--- /dev/null
+++ b/pages/ProductList/ProductList.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 3dd0b0e..f236255 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -1,8 +1,37 @@
-
-
+
+ 
+
+ 护理站
+
+
+
+ 
+
+ 就医
+
+
+
+ 
+
+ 健康知识
+
+
+
+ 
+
+ 国家老年病中心
+
+
+
+ 
+
+ 体卫融合
+
+
+
@@ -26,13 +55,90 @@
position: relative;
.cards {
- width: 92%;
- height: 920rpx;
+ width: 94%;
box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
background-color: #fff;
position: absolute;
top: 3%;
- left: 4%;
+ left: 3%;
+ display: flex;
+ justify-content: space-evenly;
+ flex-wrap: wrap;
+ padding: 40rpx 0 0 0;
+ border-radius: 25rpx;
+
+ .smallitem {
+ width: 30%;
+ height: 200rpx;
+ margin-bottom: 40rpx;
+ border-radius: 25rpx;
+ position: relative;
+ background: #9E4DD0;
+
+ .title {
+ width: 90%;
+ text-align: center;
+ font-size: 26rpx;
+ color: #FCFCFC;
+ position: absolute;
+ top: 60%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ img {
+ width: 70rpx;
+ height: 70rpx;
+ position: absolute;
+ top: 20%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ }
+
+ .item {
+ width: 43%;
+ height: 310rpx;
+ margin-bottom: 40rpx;
+ border-radius: 25rpx;
+ position: relative;
+
+ .title {
+ width: 80%;
+ text-align: center;
+ font-size: 46rpx;
+ color: #FCFCFC;
+ position: absolute;
+ top: 55%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ img {
+ width: 100rpx;
+ height: 100rpx;
+ position: absolute;
+ top: 20%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ }
+
+ .knowledge {
+ background-color: #E1AE3C;
+ }
+
+ .elderly {
+ background-color: #00C176;
+ }
+
+ .expert {
+ background-color: #D43953;
+ }
+
+ .nursing {
+ background: #4C7BC9;
+ }
}
}
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index 921994d..15990e0 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -1,6 +1,31 @@
-
- 2
+
+
+
+ 
+
+ 特医食品
+
+
+
+ 
+
+ 营养膳食
+
+
+
+ 
+
+ 可穿戴医疗设备
+
+
+
+ 
+
+ 适老化改造
+
+
+
@@ -8,12 +33,70 @@
export default {
data() {
return {
-
};
- }
+ },
+ methods: {
+ //跳转到商品列表页面
+ goProductList(number) {
+ if (number == 1) {
+ var titlename = '特医食品'
+ uni.reLaunch({
+ url: `/pages/ProductList/ProductList?title=${titlename}`
+ })
+ }
+
+ },
+ },
}
diff --git a/pages/startup/startup.vue b/pages/startup/startup.vue
index d211add..9caa18d 100644
--- a/pages/startup/startup.vue
+++ b/pages/startup/startup.vue
@@ -31,10 +31,11 @@