diff --git a/assets/img/account/home/logisitcs-empty.png b/assets/img/account/home/logisitcs-empty.png
new file mode 100644
index 0000000..01c8ba7
Binary files /dev/null and b/assets/img/account/home/logisitcs-empty.png differ
diff --git a/assets/img/common/icon-warning.png b/assets/img/common/icon-warning.png
new file mode 100644
index 0000000..27507d6
Binary files /dev/null and b/assets/img/common/icon-warning.png differ
diff --git a/assets/scss/element-variables.scss b/assets/scss/element-variables.scss
new file mode 100644
index 0000000..be4a857
--- /dev/null
+++ b/assets/scss/element-variables.scss
@@ -0,0 +1,7 @@
+/* 改变主题色变量 */
+$--color-primary: #FF512B;
+
+/* 改变 icon 字体路径变量,必需 */
+$--font-path: '~element-ui/lib/theme-chalk/fonts';
+
+@import "~element-ui/packages/theme-chalk/src/index";
\ No newline at end of file
diff --git a/components/UiConfirm.vue b/components/UiConfirm.vue
new file mode 100644
index 0000000..c6369dc
--- /dev/null
+++ b/components/UiConfirm.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
{{ title }}
+
+
+
+
+
+
diff --git a/layouts/default.vue b/layouts/default.vue
index 2d08f98..26e8b66 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -9,8 +9,9 @@
@@ -21,8 +22,7 @@
import BsLogin from "@/components/BsLogin.vue";
import Header from "./module/header/index.vue";
import Footer from "./module/footer/index.vue";
-const CATEGROY_OPEN_PAGES = ["/"]; // 默认展开热门分类tab的页面
-const CATEGROY_HIDE_PAGES = ["/account"]; // 不展示热门分类tab的页面
+const CATEGROY_HIDE_PAGES = [/\/account/]; // 隐藏热门分类tab的页面
export default {
name: "Layout",
@@ -42,13 +42,13 @@ export default {
this.$store.commit("setLoginVisible", val);
},
},
- categroyOption() {
- // 当前页面路径
- const currentPath = this.$route.path;
- return {
- open: CATEGROY_OPEN_PAGES.includes(currentPath),
- show: !CATEGROY_HIDE_PAGES.includes(currentPath),
- };
+ isHomePage() {
+ return this.$route.path === "/";
+ },
+ showCategroyTab() {
+ return !CATEGROY_HIDE_PAGES.some((reg) => {
+ return reg.test(this.$route.path);
+ });
},
},
mounted() {
diff --git a/layouts/module/header/HeaderInfoBar.vue b/layouts/module/header/HeaderInfoBar.vue
index a97ff74..0a7fc93 100644
--- a/layouts/module/header/HeaderInfoBar.vue
+++ b/layouts/module/header/HeaderInfoBar.vue
@@ -116,7 +116,7 @@ export default {
handleCommandClick(event) {
switch (event) {
case MENU_VALUE.PERSONAL:
- this.$router.push("/account/userInfo");
+ this.$router.push("/account/home");
break;
case MENU_VALUE.ADDRESS:
this.$router.push("/account/address");
@@ -136,7 +136,7 @@ export default {
},
};
-
diff --git a/pages/account/index/home/index.vue b/pages/account/index/home/index.vue
index 3d75d28..dd9a5c9 100644
--- a/pages/account/index/home/index.vue
+++ b/pages/account/index/home/index.vue
@@ -30,15 +30,21 @@
-
+
+
+
+
\ No newline at end of file
+.home-logisitcs {
+ width: 620px;
+ border: 1px solid #dddddd;
+ .home-logisitcs-label {
+ height: 42px;
+ line-height: 42px;
+ padding: 0 22px;
+ border-bottom: 1px solid #dddddd;
+ background: #f8f8f8;
+ font-size: 14px;
+ color: #333333;
+ }
+ .home-logisitcs-empty {
+ height: 310px;
+ img {
+ width: 228px;
+ height: 144px;
+ }
+ }
+ .home-logisitcs-content {
+ max-height: 620px;
+ overflow: auto;
+ padding: 30px;
+ &::-webkit-scrollbar {
+ width: 4px;
+ background-color: none;
+ }
+ &::-webkit-scrollbar-track {
+ background-color: none;
+ }
+ &::-webkit-scrollbar-thumb {
+ background: #dddddd;
+ border-radius: 10px;
+ }
+ .home-logisitcs-content__item {
+ margin-bottom: 30px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .logisitcs-content-item__info {
+ img {
+ width: 60px;
+ height: 60px;
+ margin-right: 18px;
+ border-radius: 2px;
+ }
+ .content-item-info__wrap {
+ .item-info-wrap__title {
+ width: 309px;
+ font-size: 14px;
+ color: #666666;
+ margin-bottom: 8px;
+ }
+ .item-info-wrap__orderNo {
+ display: inline-block;
+ color: #999999;
+ font-size: 12px;
+ }
+ .item-info-wrap__orderNo--light {
+ color: #ff875b;
+ margin-left: 30px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+ }
+}
+
diff --git a/plugins/api/order.js b/plugins/api/order.js
index 1401d7e..493d51d 100644
--- a/plugins/api/order.js
+++ b/plugins/api/order.js
@@ -56,13 +56,21 @@ export const ApiGetOrderProductDetail = ({orderProductId}) =>
export const ApiGetOrderPaySatus = ({orderId}) =>
ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/payResult/${orderId}`));
-
+
/**
* 获取物流信息
* @param {*} orderId
*/
export const ApiGetOrderLogistics = ({orderId}) =>
ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/logistics/${orderId}`));
+
+ /**
+ * 获取物流列表
+ * @param {*} params
+ */
+export const ApiGetOrderLogisticsList = (params) =>
+ ToAsyncAwait(axiosTk.get('http://yapi.smart-xwork.cn/mock/148902/logisitcs/list'), { params });
+
/**
* 确认收货
* @param {*} orderId
diff --git a/plugins/element-ui.js b/plugins/element-ui.js
index ff3dbc9..e94e5cd 100644
--- a/plugins/element-ui.js
+++ b/plugins/element-ui.js
@@ -1,5 +1,6 @@
import Vue from 'vue'
import Element from 'element-ui'
import locale from 'element-ui/lib/locale/lang/zh-CN'
+import '@/assets/scss/element-variables.scss'
Vue.use(Element, { locale })