Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0

pages/account/index/order/detail/module/StatusInfo.vue

@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-16 16:40:50
+ * @LastEditTime: 2022-05-16 18:27:52
  * @Description: file content
 -->
 <template>
 		<div class="operation">
 			<span>订单编号：{{orderInfo.orderNo}}</span>
-			<p>订单状态：{{orderInfo.orderStatusDesc}}</p>
+			<p>订单状态：{{ctxCon.name}}</p>
 			<span>{{ctxCon.tips}}</span>
 			<div class="operation--btns">
 			<!-- 已发货可以确认收货 -->
@@ -44,7 +44,7 @@ export default {
 				// 关闭
 				'2' : {name:'交易关闭' , tips:'关闭原因'},
 				// 已支付
-				'3' : {name:'等待发货', tips:'您的包裹整装待发'},
+				'3' : {name:'待发货', tips:'您的包裹整装待发'},
 				// 已发货
 				'4' : {name:'待收货', tips:'您的包裹正向您飞来'},
 				// 已收货
@@ -64,7 +64,6 @@ export default {
 		orderInfo(nVal){
 			const {orderStatus, autoReceiveTime, serverTime} = this.orderInfo;
 			this.ctxCon = this.ctxData[orderStatus];
-			
 			if(orderStatus === 1){
 				// 待支付 开始倒计时
 				if(this.timerStop){

pages/cart/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-03 22:41:15
  * @LastEditors: ch
- * @LastEditTime: 2022-05-16 16:50:09
+ * @LastEditTime: 2022-05-16 20:40:48
  * @Description: file content
 -->
 <template>
@@ -291,7 +291,9 @@ export default {
 	margin-top: 10px;
 	height: 70px;
 	padding: 0 237px 0 20px;
-	position: relative;
+	position: sticky;
+	z-index: 9;
+	bottom: 0;
 	&--del{
 		margin-left: 70px;
 	}

plugins/router.js

@@ -1,22 +1,21 @@
 export default ({ app }) => {
   app.router.beforeEach((to, from, next) => {
-    const { token, userInfo } = app.store.state;
+    // const { token, userInfo } = app.store.state;
-    if (token) {
+    // if (token) {
-      // 获取用户信息
+    //   if (Object.keys(userInfo).length === 0) {
-      if (Object.keys(userInfo).length === 0) {
+    //     app.store.dispatch("getUserInfo");
-        app.store.dispatch("getUserInfo");
+    //   }
-      }
+    //   next();
-      next();
+    //   return;
-      return;
+    // }
-    }
 
-    // 未登录打开需要登录的页面，跳首页
+    // // 未登录打开需要登录的页面，跳首页
-    const needLoginPage = [/\/account/, /\/cart/];
+    // const needLoginPage = [/\/account/, /\/cart/];
-    const result = needLoginPage.some((item) => item.test(to.path));
+    // const result = needLoginPage.some((item) => item.test(to.path));
-    if (result) {
+    // if (result) {
-      next("/");
+    //   next("/");
-      return;
+    //   return;
-    }
+    // }
     next();
   });
 };