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

pages/account/index.vue

@@ -2,10 +2,11 @@
  * @Author: ch
  * @Date: 2022-05-08 17:48:36
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 19:42:49
+ * @LastEditTime: 2022-05-16 17:45:46
  * @Description: file content
 -->
 <template>
+<div>
   <div class="account flex">
     <div class="account-nav-wrap flex flex-column flex-center flex-middle">
       <ul
@@ -26,9 +27,14 @@
     </div>
     <nuxt-child class="account-main-wrap" />
   </div>
+
+    <BsChosen v-if="showChosenPage.includes($route.path)"/>
+    </div>
 </template>
 <script>
+import BsChosen from '../../components/BsChosen.vue';
 export default {
+	components: { BsChosen },
   name: "Account",
   data() {
     return {
@@ -55,8 +61,13 @@ export default {
           ],
         },
       ],
+      showChosenPage : ['/account/order/list','/account/order/detail']
     };
   },
+  mounted(){
+    console.log(this.$route);
+    // 
+  }
 };
 </script>
 <style lang="scss" scoped>

pages/account/index/order/list/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 20:47:29
  * @LastEditors: ch
- * @LastEditTime: 2022-05-16 16:14:47
+ * @LastEditTime: 2022-05-16 17:51:43
  * @Description: file content
 -->
 <template>
@@ -39,15 +39,17 @@
 							<td class="not-border">
 								<UIGoodsInfo :goods="i"/>
 							</td>
-							<td class="not-border" width="96">
-								<UiMoney :money="i.realAmount" />
+							<td class="not-border" width="96" @click="handleDetail(item.orderId)">
+								<UiMoney :money="i.realAmount" @click="handleDetail(item.orderId)"/>
 							</td>
-							<td class="not-border" width="96">{{i.quantity}}</td>
+							<td class="not-border" width="96" @click="handleDetail(item.orderId)">{{i.quantity}}</td>
 							<template  v-if="!idx">
-								<td width="120" :rowspan="item.products.length">
+								<td width="120" :rowspan="item.products.length" @click="handleDetail(item.orderId)">
 									<UiMoney :money="item.payAmount" />
 								</td>
-								<td width="110" :rowspan="item.products.length">{{item.orderStatusDesc}}</td>
+								<td width="110" :rowspan="item.products.length" @click="handleDetail(item.orderId)">
+									{{item.orderStatusDesc}}
+								</td>
 								<td width="145" :rowspan="item.products.length">
 									<template v-if="item.orderStatus === 1">
 										<UiButton type="yellow_gradual" @click="pay(item)">去支付</UiButton>
@@ -170,6 +172,12 @@ export default {
 				this.reloadData()
 			});
 		},
+		handleDetail(id){
+			this.$router.push({
+				path : '/account/order/detail',
+				query : {id}
+			})
+		}
 	}
 }
 </script>

pages/cart/index.vue

@@ -196,6 +196,7 @@ export default {
 				item.number = result.canSetShoppingCartNumber;
 				return false;
 			}
+			this.$store.dispatch('getCartProducts');
         },
 		/**
 		 * 删除选中的商品