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

components/UiRadio.vue

@@ -1,10 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-05-07 22:57:24
- * @LastEditors: ch
- * @LastEditTime: 2022-05-07 22:57:39
- * @Description: file content
--->
-<template>
-	<el-radio/>
-</template>

pages/account/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 17:48:36
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 12:19:04
+ * @LastEditTime: 2022-05-12 19:42:49
  * @Description: file content
 -->
 <template>

pages/cart/index.vue

@@ -2,12 +2,13 @@
  * @Author: ch
  * @Date: 2022-05-03 22:41:15
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 17:36:08
+ * @LastEditTime: 2022-05-12 19:40:43
  * @Description: file content
 -->
 <template>
 	<div>
-		<UiEmpty v-if="!isLoading && !list.length" desc="购物车空空如也，去挑点喜欢的好货吧~" :icon="require('@/assets/img/cart/empty.png')">
+		<UiEmpty v-if="!isLoading && !list.length" desc="购物车空空如也，去挑点喜欢的好货吧~" 
+			:icon="require('@/assets/img/cart/empty.png')">
 			<UiButton type="grey" @click="$router.push('/')">去逛逛</UiButton>
 		</UiEmpty>
 		<UiLoading v-if="isLoading" ></UiLoading>
@@ -32,22 +33,21 @@
 					<tbody>
 						<tr v-for="item in list" :key="item.id" :class="item.status !== 'normal' && 'disable'">
 							<td width="50">
-								<el-checkbox v-if="item.status === 'normal'" :label="item.id" class="checkbox"></el-checkbox>
+								<el-checkbox v-if="item.status === 'normal'" :label="item.id" class="checkbox" />
 								<span v-else class="tag">失效</span>
 							</td>
 							<td>
-								<UIGoodsInfo :goods="item"></UIGoodsInfo>
+								<UIGoodsInfo :goods="item" />
 							</td>
 							<td width="115">
-								<UiMoney :money="item.productSku ? item.productSku.sellPrice : 0"></UiMoney>
+								<UiMoney :money="item.productSku ? item.productSku.sellPrice : 0" />
 							</td>
 							<td width="115">
 								<el-input-number :value="item.number" @change="onChangeStepper($event, item)" 
-								:min="1" :max="item.maxBuyNum" size="mini">
+								:min="1" :max="item.maxBuyNum" size="mini" />
-								</el-input-number>
 							</td>
 							<td width="115">
-								<UiMoney :money="item.totalPrice"></UiMoney>
+								<UiMoney :money="item.totalPrice" />
 							</td>
 							<td width="115">
 								<a @click="handleDelete(item.id)" class="del">删除</a>
@@ -58,33 +58,35 @@
 			</el-checkbox-group>
 			<div class="operation">
 				<div>
-					<el-checkbox label="全选" @change="handleCheckAll" 
+					<el-checkbox label="全选" @change="handleCheckAll" v-model="checkAll" :indeterminate="isIndeterminate" />
-					v-model="checkAll" :indeterminate="isIndeterminate"></el-checkbox>
 					<a @click="handleDelete()" class="operation--del">批量删除</a>
 				</div>
 				<div class="operation--right">
 					<p>已选<span class="operation--count">{{checkedIds.length}}</span>件</p>
-					<p class="operation--total">总计：
+					<p class="operation--total">
-						<UiMoney class="operation--total-price" :money="totalPrice"
+						总计：
-							size="20px" float prefix preSize="14px"/>
+						<UiMoney class="operation--total-price" size="20px" float prefix preSize="14px"
+						 :money="totalPrice"/>
 					</p>
 					<UiButton class="operation--settlement" @click="settlement" :disabled="!checkedIds.length">去结算</UiButton>
 				</div>
 			</div>
 		</div>
+		<BsChosen></BsChosen>
 	</div>
 	
 </template>
 <script>
 import {ApiGetCartList, ApiDeleteCartGoods, ApiPutCartNum} from '@/plugins/api/cart';
 import {Debounce} from '@/plugins/utils';
-import UIGoodsInfo from '../../components/UIGoodsInfo.vue';
+import UIGoodsInfo from '@/components/UIGoodsInfo.vue';
-import UiButton from '../../components/UiButton.vue';
+import UiButton from '@/components/UiButton.vue';
-import UiMoney from '../../components/UiMoney.vue';
+import UiMoney from '@/components/UiMoney.vue';
-import UiEmpty from '../../components/UiEmpty.vue';
+import UiEmpty from '@/components/UiEmpty.vue';
-import UiLoading from '../../components/UiLoading.vue';
+import UiLoading from '@/components/UiLoading.vue';
+import BsChosen from '@/components/BsChosen.vue';
 export default {
-	components: { UIGoodsInfo, UiButton, UiMoney, UiEmpty, UiLoading },
+	components: { UIGoodsInfo, UiButton, UiMoney, UiEmpty, UiLoading, BsChosen },
 	data(){
 		return {
 			isLoading : false,
@@ -104,7 +106,6 @@ export default {
                 tempPrice += unitPrice * (item.number || 0)
 			});
 			return (tempPrice / 100).toFixed(2);
-
 		},
 		// 正常可结算的商品
 		normalList(){
@@ -276,6 +277,7 @@ export default {
 	td{
 		text-align: center;
 		padding: 40px 0;
+		border-bottom: 1px solid #ddd;
 	}
 }
 .operation{

pages/goods/detail/_id.vue

@@ -136,7 +136,7 @@
           <span>此商品暂无库存啦~看看其他的吧</span>
         </div>
         <div class="main__details-pay">
-          <UiButton type="yellow_line">加入购物车</UiButton>
+          <UiButton type="yellow_line" @click="addCart">加入购物车</UiButton>
           <UiButton type="yellow_panel" @click="buyNow">立即购买</UiButton>
         </div>
       </article>
@@ -168,21 +168,22 @@
         </div>
       </div>
     </section>
-    <UiChosen v-else></UiChosen>
+    <BsChosen v-else></BsChosen>
   </div>
 </template>
 <script>
 import UiMoney from "@/components/UiMoney.vue";
 import UiButton from "@/components/UiButton.vue";
 import UiGoodsItem from "@/components/UiGoodsItem.vue";
-import UiChosen from "@/components/UiChosen.vue";
+import BsChosen from "@/components/BsChosen.vue";
+import {ApiPutAddCart} from "@/plugins/api/cart";
 import {
   ApiGetGoodsDetail,
   ApiGetGoodsSkus,
   ApiGetRecommendedGoodsList,
 } from "@/plugins/api/goods";
 export default {
-  componetns: { UiMoney, UiButton, UiGoodsItem, UiChosen },
+  componetns: { UiMoney, UiButton, UiGoodsItem, BsChosen },
   data() {
     return {
       curBuyNum: 1,
@@ -424,6 +425,27 @@ export default {
         query,
       });
     },
+
+		/**
+		 * 加入购物车
+		 */
+		async addCart(){
+			if(!this.curSku.skuId){
+        this.$message.error("请选择规格~");
+				return false;
+			}
+			const {error, result} = await ApiPutAddCart({
+				productSkuId : this.curSku.skuId,
+				productId : this.detailData.id,
+				number : this.curBuyNum
+			});
+			if(error){
+				this.$message.error(error.message);
+				return false;
+			}
+			this.$message.success('加入购物车成功~');
+			// this.$Router.push('/cart');
+		},
   },
 };
 </script>

pages/goods/list/index.vue

@@ -70,7 +70,7 @@
       <img class="main-none-img" src="@/assets/img/goods/none.png" alt="" />
       <p class="main-none-txt">没有搜到你想要的商品哦，换个关键词试试</p>
     </main>
-    <UiChosen></UiChosen>
+    <BsChosen></BsChosen>
   </div>
 </template>
 <script>
@@ -81,9 +81,9 @@ import {
 } from "@/plugins/api/goods";
 import Sort from "./module/SortItem.vue";
 import UiGoodsItem from "@/components/UiGoodsItem.vue";
-import UiChosen from '@/components/UiChosen.vue';
+import BsChosen from '@/components/BsChosen.vue';
 export default {
-  components: { Sort, UiGoodsItem,UiChosen },
+  components: { Sort, UiGoodsItem,BsChosen },
   data() {
     return {
       navActive: 0,