diff --git a/src/pages.json b/src/pages.json
index 5501799..4c94eb4 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -85,7 +85,7 @@
"root": "pages/mall/subs",
"pages": [
{
- "path": "goods/goods-detail",
+ "path": "goods/detail",
"style": {
"navigationBarTitleText": "商品详情"
}
@@ -138,13 +138,13 @@
}
},
{
- "path": "order/order-list",
+ "path": "order/index",
"style": {
"navigationBarTitleText": "我的订单"
}
},
{
- "path": "order/order-detail",
+ "path": "order/detail",
"style": {
"navigationBarTitleText": "订单详情"
}
@@ -156,13 +156,13 @@
}
},
{
- "path": "address/address-list",
+ "path": "address/index",
"style": {
"navigationBarTitleText": "收货地址"
}
},
{
- "path": "address/add-address",
+ "path": "address/create",
"style": {
"navigationBarTitleText": "新增收货地址"
}
diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index 7a3dc1b..4338142 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -89,7 +89,7 @@
商家
-
+
订单
diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue
index affab95..6f81a78 100644
--- a/src/pages/mall/index.vue
+++ b/src/pages/mall/index.vue
@@ -19,7 +19,7 @@
+ @click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
{{ item.goodsName }}
¥{{ item.price }}
diff --git a/src/pages/mall/subs/goods/goods-detail.vue b/src/pages/mall/subs/goods/detail.vue
similarity index 99%
rename from src/pages/mall/subs/goods/goods-detail.vue
rename to src/pages/mall/subs/goods/detail.vue
index 5f9ce09..77f59d8 100644
--- a/src/pages/mall/subs/goods/goods-detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -70,7 +70,7 @@
商家
-
+
订单
diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue
index 2c8801f..331820f 100644
--- a/src/pages/mall/subs/order/order-confirm.vue
+++ b/src/pages/mall/subs/order/order-confirm.vue
@@ -12,7 +12,7 @@
+ @click.stop='goPath("/pages/mine/subs/address/index")'>
默认
黄先生
diff --git a/src/pages/mall/subs/search/index.vue b/src/pages/mall/subs/search/index.vue
index 1ef6380..2a51128 100644
--- a/src/pages/mall/subs/search/index.vue
+++ b/src/pages/mall/subs/search/index.vue
@@ -71,7 +71,6 @@ const goodsList = ref([1, 2, 3, 4, 1, 2, 2, 2]);
display: flex;
flex-direction: column;
position: relative;
- background: #666666;
padding: 10rpx 10rpx;
flex: 1;
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 7d08f8b..a4b389f 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -75,17 +75,17 @@ const officialAccountDialogRef = ref();
const orderActionList = ref([{
title: '进行中',
icon: assetsUrl('ic_order_progressing.png'),
- path: '/pages/mine/subs/order/order-list',
+ path: '/pages/mine/subs/order/index',
amount: 10
}, {
title: '已结束',
icon: assetsUrl('ic_order_finish.png'),
- path: '/pages/mine/subs/order/order-list?index=1',
+ path: '/pages/mine/subs/order/index?index=1',
amount: 0
}, {
title: '全部订单',
icon: assetsUrl('ic_order_all.png'),
- path: '/pages/mine/subs/order/order-list?index=2',
+ path: '/pages/mine/subs/order/index?index=2',
amount: 0
}]);
@@ -108,7 +108,7 @@ const serviceList = [
{
title: '收货地址',
icon: assetsUrl('ic_member_service_address.png'),
- path: '/pages/mine/subs/address/address-list'
+ path: '/pages/mine/subs/address/index'
}, {
title: '联系商家',
icon: assetsUrl('ic_member_service_contact.png'),
diff --git a/src/pages/mine/subs/address/components/address-item.vue b/src/pages/mine/subs/address/components/item.vue
similarity index 100%
rename from src/pages/mine/subs/address/components/address-item.vue
rename to src/pages/mine/subs/address/components/item.vue
diff --git a/src/pages/mine/subs/address/add-address.vue b/src/pages/mine/subs/address/create.vue
similarity index 98%
rename from src/pages/mine/subs/address/add-address.vue
rename to src/pages/mine/subs/address/create.vue
index d2e96d7..de1223a 100644
--- a/src/pages/mine/subs/address/add-address.vue
+++ b/src/pages/mine/subs/address/create.vue
@@ -93,7 +93,7 @@ const save = () => {
view:nth-of-type(1) {
flex: 1;
- margin: 5rpx 20rpx 0 0;
+ margin: 0 20rpx 0 0;
}
textarea {
diff --git a/src/pages/mine/subs/address/address-list.vue b/src/pages/mine/subs/address/index.vue
similarity index 74%
rename from src/pages/mine/subs/address/address-list.vue
rename to src/pages/mine/subs/address/index.vue
index c1b53df..7f880c5 100644
--- a/src/pages/mine/subs/address/address-list.vue
+++ b/src/pages/mine/subs/address/index.vue
@@ -1,18 +1,18 @@
-
+
-
+