From 5b3f61e90aa9d6a53e0a442efb7cb8d255270dcb Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Tue, 2 Jul 2024 14:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/commonComponents/address/edit.vue  |  2 +-
 pages/component/commonComponents/address/index.vue |  2 +-
 pages/course/coursePrice.vue                       |  6 ++++--
 pages/course/myCourse.vue                          |  4 ++--
 pages/course/myCourseLearn.vue                     |  4 ++--
 pages/goods/order/index.vue                        |  2 +-
 pages/peanut/shopping.vue                          | 12 ++++++------
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pages/component/commonComponents/address/edit.vue b/pages/component/commonComponents/address/edit.vue
index 25ece08..7500032 100644
--- a/pages/component/commonComponents/address/edit.vue
+++ b/pages/component/commonComponents/address/edit.vue
@@ -20,7 +20,7 @@
 								<view v-for="(item, index) in argee" :key="index" style="font-size: 32rpx;">
 									<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue"
 										color="#258feb" @click="radioCheck(index)"></radio>
-									默认收获地址
+									默认收货地址
 								</view>
 							</radio-group>
 						</view>
diff --git a/pages/component/commonComponents/address/index.vue b/pages/component/commonComponents/address/index.vue
index 4da5069..66f5e1a 100644
--- a/pages/component/commonComponents/address/index.vue
+++ b/pages/component/commonComponents/address/index.vue
@@ -128,7 +128,7 @@ import { mapState } from "vuex";
 export default {
   components: {
     courseDescription, //课程说明
-    editAddress, //编辑收获地址
+    editAddress, //编辑收货地址
   },
   props: ["backState", "type"],
   data() {
diff --git a/pages/course/coursePrice.vue b/pages/course/coursePrice.vue
index 8da110b..c069322 100644
--- a/pages/course/coursePrice.vue
+++ b/pages/course/coursePrice.vue
@@ -206,12 +206,13 @@
 			},
 			// 加入到购物车
 			isAddLink(item) {
+				console.log('传入购物车',item);				
 				// 统计商品信息
 				let data = {
 					"userId": this.userInfo.id,
 					"productId": item.productId,
-					"productAmount": this.productAmount,
-					"price": item.price
+					"productAmount": 1,
+					"price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
 				}
 				// 判断列表是否为空
 				if (this.cartList.length > 0) {
@@ -284,6 +285,7 @@
 			},
 			oprate(data) {
 				console.log(data, '得到的内容')
+				
 				if (data.name == 'buy') {
 					this.buy(data.item)
 				} else if (data.name == 'gouwuche') {
diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue
index 38aeed5..2cdee98 100644
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -318,8 +318,8 @@
 				let data = {
 					"userId": this.userInfo.id,
 					"productId": item.productId,
-					"productAmount": this.productAmount,
-					"price": item.price
+					"productAmount": 1,
+					"price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
 				}
 				// 判断列表是否为空
 				if (this.cartList.length > 0) {
diff --git a/pages/course/myCourseLearn.vue b/pages/course/myCourseLearn.vue
index f5613be..a1b44e3 100644
--- a/pages/course/myCourseLearn.vue
+++ b/pages/course/myCourseLearn.vue
@@ -717,8 +717,8 @@
 				let data = {
 					"userId": this.userInfo.id,
 					"productId": item.productId,
-					"productAmount": this.productAmount,
-					"price": item.price
+					"productAmount": 1,
+					"price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
 				}
 				// 判断列表是否为空
 				if (this.cartList.length > 0) {
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index b2e9681..d3535ce 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -40,7 +40,7 @@
         </view>
         <view class="normal_box" v-else>
           <view class="normal_box_top">
-            <view class="curriulum_title">请添加收获地址 </view>
+            <view class="curriulum_title">请添加收货地址 </view>
           </view>
         </view>
         <view class="right">
diff --git a/pages/peanut/shopping.vue b/pages/peanut/shopping.vue
index 88dae32..ebaa30e 100644
--- a/pages/peanut/shopping.vue
+++ b/pages/peanut/shopping.vue
@@ -1,16 +1,16 @@
 <template>
 	<view>
 		<z-nav-bar backState="2000" title="购物车">
-			<view class="curseSet" slot="right" @click="manaCart = !manaCart" style="margin-right: 10px;">
+			<!-- <view class="curseSet" slot="right" @click="manaCart = !manaCart" style="margin-right: 10px;">
 				<text v-show="!manaCart">管理</text>
 				<text v-show="manaCart">完成</text>
-				</view>
+				</view> -->
 			</z-nav-bar>
 		</z-nav-bar>
 		<view class="shopCarContent">
 			<scroll-view scroll-y="true">
 				<view class="cartItem" v-for="(item,index) in cartList" :key="index">
-					<view class="select" v-show="manaCart">
+					<view class="select" >
 						<checkbox :checked="item.checked" @click="checkboxGroupChange(index,item)"
 							class="round checkedItem" />
 					</view>
@@ -22,7 +22,7 @@
 								<text>{{item.productName}}</text>
 							</view>
 							<view class="itemPrice">
-								<text v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice*item.productAmount}}</text>
+								<text v-if="item.activityPrice && item.activityPrice > 0">￥-{{item.activityPrice*item.productAmount}}</text>
 								<text v-else>￥{{item.price*item.productAmount}}</text>
 								<u-number-box v-model="item.productAmount" @change="valChange($event,item)" :input-width="50"
 									:input-height="20" :min="1" :max="item.productStock" integer @overlimit='overlimit'></u-number-box>
@@ -125,7 +125,7 @@
 					// }
 					this.isCartDelShow = this.all
 					this.total()
-					this.manaCart = this.all
+					// this.manaCart = this.all
 				} else {
 					this.all = false
 					
@@ -230,7 +230,7 @@
 								this.totalPrice = 0
 								this.getCartList()								
 								uni.hideLoading()
-								this.manaCart = false
+								// this.manaCart = false
 							})
 						} else {
 							console.log('cancel') //点击取消之后执行的代码