diff --git a/App.vue b/App.vue
index 301b258..ad6a2b1 100644
--- a/App.vue
+++ b/App.vue
@@ -20,4 +20,5 @@
font-size: 26rpx;
background-color: #eee;
}
+
diff --git a/api/good.js b/api/good.js
new file mode 100644
index 0000000..504e0fb
--- /dev/null
+++ b/api/good.js
@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export const goodListApi = (data)=>{
+ return request.get('/good/list', data);
+}
\ No newline at end of file
diff --git a/components/addressPopup.vue b/components/addressPopup.vue
new file mode 100644
index 0000000..8e231f7
--- /dev/null
+++ b/components/addressPopup.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/modal.vue b/components/modal.vue
new file mode 100644
index 0000000..231c7d3
--- /dev/null
+++ b/components/modal.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/viewPopup/index.vue b/components/viewPopup.vue
similarity index 100%
rename from components/viewPopup/index.vue
rename to components/viewPopup.vue
diff --git a/dict/cancelDict.js b/dict/cancelDict.js
new file mode 100644
index 0000000..2c73e19
--- /dev/null
+++ b/dict/cancelDict.js
@@ -0,0 +1,33 @@
+
+const list = [
+ {
+ name: '不想要了/临时有事',
+ value: 1,
+ },
+ {
+ name: '点错了/点多了/点少了',
+ value: 2,
+ },
+ {
+ name: '地址/电话填错了',
+ value: 3,
+ },
+ {
+ name: '送达时间选错了',
+ value: 4,
+ },
+ {
+ name: '支付遇到问题',
+ value: 5,
+ },
+ {
+ name: '其他平台更便宜',
+ value: 6,
+ },
+ {
+ name: '其他原因',
+ value: 7,
+ },
+]
+
+export default list;
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 349ef7c..b2f8ebc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "",
+ "appid" : "wxce2948c50d808b66",
"setting" : {
"urlCheck" : false
},
diff --git a/pages.json b/pages.json
index ab1e849..e6635e4 100644
--- a/pages.json
+++ b/pages.json
@@ -60,6 +60,22 @@
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "addressList/addressList",
+ "style" :
+ {
+ "navigationBarTitleText" : "地址管理",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "addressEdit/addressEdit",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false
+ }
}
]
}
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 0af3bd4..a508620 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -90,7 +90,7 @@
全选
-
+
合计:
@@ -99,10 +99,10 @@
.30
- 去结算(2)
+ 去结算(2)
- 移入收藏夹
+
删除
@@ -127,6 +127,11 @@
swiperCurrent.value = current;
tabsActive.value = current;
}
+
+ // 结算
+ const settleAccounts = ()=>{
+
+ }
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 295779c..98c041a 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -9,7 +9,7 @@
-
+
151****6699
ID: 6655
@@ -21,18 +21,18 @@
我的订单
-
+
待付款
-
+
待收货
-
+
全部订单
@@ -43,7 +43,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
@@ -128,7 +128,7 @@
left: 0;
z-index: 3;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png');
- background-size: 28% 100%;
+ background-size: 38% 100%;
background-position: right;
background-repeat: no-repeat;
diff --git a/pagesOrder/addressEdit/addressEdit.vue b/pagesOrder/addressEdit/addressEdit.vue
new file mode 100644
index 0000000..4c6ec42
--- /dev/null
+++ b/pagesOrder/addressEdit/addressEdit.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设置为默认地址
+
+
+
+
+ 保存
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pagesOrder/addressList/addressList.vue b/pagesOrder/addressList/addressList.vue
new file mode 100644
index 0000000..acdd9eb
--- /dev/null
+++ b/pagesOrder/addressList/addressList.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+ 收货人:小李
+ 14566666666
+
+
+ 四川泸州市龙马潭区莲花池街道商业街1号
+
+
+
+
+
+
+ 设为默认
+
+
+
+
+ 删除
+
+
+
+ 编辑
+
+
+
+
+
+
+ 新增地址
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 739736f..fd1d4a3 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -15,7 +15,8 @@
- 修改
+ 修改
@@ -54,7 +55,9 @@
订单信息
订单编号
- wxo13546486484784555 | 复制
+
+ wxo13546486484784555 | 复制
+
下单时间
@@ -66,169 +69,222 @@
-
+
取消订单
立即支付 ¥50.00
-
+
-
+
+
+
\ No newline at end of file
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index 0ced034..c88b8d7 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -1,6 +1,5 @@
-
@@ -58,7 +57,7 @@
-
+