From e421621155caeab0913d88996f1bae08fd6dc73b Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 18 Sep 2024 15:42:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E5=93=81=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js             |  4 ++--
 pages/bookShop/orderLCont.vue | 16 ++++++++++++++--
 pages/goods/order/index.vue   | 13 +++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 501662f..d4197fa 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -7,8 +7,8 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
 	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-	baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	// baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
+	baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index 4deac51..b6a2e31 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -1088,10 +1088,22 @@ export default {
 
     // 商品内容跳转
     goDetail(id, data) {
-      console.log("data at line 1277:", data);
+      console.log("data at line 1277:订单详情参数", data);
       if (data.delFlag == -1) {
         this.$commonJS.showToast("商品已下架");
-      } else {
+      }else if(data.goodsType == '05'){
+		  if(data.courseIds && data.courseIds.length > 0){
+			  uni.navigateTo({
+			   url: `/pages/course/courseDetail?id=${data.courseIds[0].courseId}`,		
+			  			});
+		  }else{
+			  uni.showToast({
+			    title: "课程数据出错",
+			    icon: "none"			 
+			  });
+		  }
+		  
+	  } else {
         uni.navigateTo({
           // url: '../bookShop/commodityDetail?id=' + item.id
           url: `/pages/goods/index/index?navTitle=''&title=''&id=${id}`,
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 9daf62a..287fdbe 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -55,7 +55,7 @@
 							<view class="curriulum_title">{{ v.productName }} </view>
 							<view class="price_box">
 								<text class="price" style="margin-right: 0">
-									￥{{ v.price }}
+									￥{{ v.activityPrice && v.activityPrice > 0 ? v.activityPrice : v.price}}
 								</text>
 							</view>
 						</view>
@@ -81,7 +81,7 @@
 				</view>
 				<view class="pay_box" style="margin-top: 20rpx">
 					<view @click="openOrderModal(v)" class="curriulum_title_box goods_item pay_item"
-						v-for="(v, i) in orderInfoList">
+						v-for="(v, i) in orderInfoList" :key="i">
 						<view class="top">
 							<view class="left">
 								<text> {{ v.text }}</text>
@@ -114,7 +114,7 @@
 			<view class="order_top common_radius_box color_shandow goods_box pay_box">
 				<view class="title">价格明细</view>
 
-				<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in priceBreakdownList">
+				<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in priceBreakdownList" :key="i">
 					<view class="top">
 						<view class="left">
 							<image v-if="v.imgUrl" class="pay_item_img" :src="v.imgUrl" mode="aspectFil"
@@ -162,6 +162,7 @@
 			</view>
 			<view class="order_top common_radius_box color_shandow goods_box pay_box">
 				<view class="title">支付方式</view>
+				<!-- 商品是安卓环境支付，或者商品列表中没有课程 -->
 				<template v-if="isAndorid || !isAndorid && !haveCourse">
 					<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payList">
 						<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
@@ -191,7 +192,7 @@
 				</template>
 				<!-- ios 支付列表 -->
 				<template v-else>
-					<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payListIOS">
+					<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payListIOS" :key="i">
 						<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
 							<view class="left">
 								<image class="pay_item_img" :src="v.imgUrl" mode="aspectFil" :style="v.style">
@@ -866,7 +867,7 @@
 				var s = 0;
 				var that = this;
 				for (var i = this.goodsDataList.length - 1; i >= 0; i--) {
-					s += this.goodsDataList[i].price ? this.goodsDataList[i].price : 0;
+					s += this.goodsDataList[i].activityPrice && this.goodsDataList[i].activityPrice > 0 ?  this.goodsDataList[i].activityPrice : this.goodsDataList[i].price;
 				}
 				that.totalPrice = s;
 				// ！
@@ -1013,7 +1014,7 @@
 					})
 					.then(async (res) => {
 						this.buyingFlag = false
-						console.log("res at line 598:", res);
+						console.log("res at line 598系统下单返回结果:", res);
 						if (res.code == 0) {
 							if (res.orderSn == null) {
 								uni.showToast({

From 54a69954dd496fccdfd43860cb8a0aa80875a3f0 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 19 Sep 2024 11:35:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |   2 +-
 .../commonComponents/selectGoods.vue          |  17 ++-
 pages/goods/index/index.vue                   |   3 +-
 pages/goods/order/index.vue                   | 133 ++++++++++++++----
 4 files changed, 116 insertions(+), 39 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index b5014f6..5be1b72 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -24,7 +24,7 @@
             "type" : "uni-app:app-ios"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {
diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue
index c8c32f9..8d206c2 100644
--- a/pages/component/commonComponents/selectGoods.vue
+++ b/pages/component/commonComponents/selectGoods.vue
@@ -50,7 +50,7 @@
                   : ''
               }`"
             >
-              <view class="image_box" style="margin-right: 10rpx">
+              <view class="image_box" style="margin-right: 10rpx; ">
                 <image
                   :src="slotProps.row.productImages"
                   mode="aspectFit"
@@ -58,12 +58,17 @@
                 ></image>
               </view>
 
-              <view :class="`goods_info `">
+              <view :class="`goods_info flex_box just`" style="justify-content: space-between;">
                 <view class="name">{{ slotProps.row.productName }}</view>
-                <view class="price" style="color: #258feb"
-                  >￥{{ slotProps.row.activityPrice?slotProps.row.activityPrice:slotProps.row.price }}</view
-                ></view
-              >
+				<view class="flex_box">
+					<text style="color: #999; text-decoration: line-through; margin-right: 20rpx;"
+													v-if="slotProps.row.activityPrice > 0 && slotProps.row.activityPrice < slotProps.row.price" >￥{{slotProps.row.price}}</text>
+					  <view class="price" style="color: #258feb"
+					    >￥{{ slotProps.row.activityPrice?slotProps.row.activityPrice:slotProps.row.price }}</view
+					  ></view
+					>
+				</view>
+				
             </view>
 
             <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
index a166865..4471507 100644
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -877,7 +877,8 @@ export default {
             productImages: this.selectGoodsData.productImages,
             productId: this.selectGoodsData.productId,
             productName: this.selectGoodsData.productName,
-            price: this.selectGoodsData.activityPrice?this.selectGoodsData.activityPrice:this.selectGoodsData.price,
+			activityPrice:this.selectGoodsData.activityPrice,
+            price: this.selectGoodsData.price,
             goodsType: this.selectGoodsData.goodsType,
           },
         ],
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 287fdbe..f2ba75e 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -53,15 +53,25 @@
 					<view class="normal_box">
 						<view class="normal_box_top" style="justify-content: space-between">
 							<view class="curriulum_title">{{ v.productName }} </view>
-							<view class="price_box">
+							<!-- <view class="price_box">
 								<text class="price" style="margin-right: 0">
 									￥{{ v.activityPrice && v.activityPrice > 0 ? v.activityPrice : v.price}}
 								</text>
-							</view>
+							</view> -->
 						</view>
-
-						<view style="width: 100%; text-align: right">
-							x 1
+						<!-- <view class=""></view> -->
+						<view style="width: 100% !important;  text-align: right;" class=" ">
+							<!-- <view class="flexbox" style="justify-content: space-between; align-items: center;"> -->
+								<!--  -->								
+								<text style="color: #999; text-decoration: line-through; margin-right: 20rpx;" 
+								v-if="v.activityPrice > 0 && v.activityPrice < v.price" >原价:￥{{v.price}}</text>
+								<text class="" style="margin-right: 26rpx">
+									￥{{ v.activityPrice && v.activityPrice > 0 ? v.activityPrice : v.price}}
+								</text>
+								<text>x 1</text>
+							<!-- </view> -->
+							
+							
 							<!-- <u-number-box v-model="number" style="float: right">
                 <view slot="minus" class="minus">
                   <u-icon name="minus" size="12"></u-icon>
@@ -412,6 +422,7 @@
 		},
 		data() {
 			return {
+				historyOrderInfo:undefined, //上一个订单的参数
 				isDefaultCurrency: false,
 				isShowAddress: false,
 				jfNumber: 0,
@@ -484,6 +495,7 @@
 					"margin-left": "30rpx",
 				},
 				modalInfo: {},
+				canjump:true,     // 是否可以跳转到其他页面
 				currentCateIndex: 0,
 				show: false,
 				playData: {},
@@ -929,6 +941,7 @@
 				}
 			},
 			async goBuyJie() {
+				console.log('this.buyingFlag',this.buyingFlag);
 				if (this.buyingFlag) {
 					uni.showToast({
 						title: '操作太频繁了，休息下吧',
@@ -948,6 +961,7 @@
 				setTimeout(() => {
 					this.nowClick = true;
 				}, 5000);
+				
 				// let youPre = {
 				//   id: "",
 				//   coupons: {
@@ -970,7 +984,8 @@
 						this.$commonJS.showToast("请选择收货地址");
 						return false;
 					}
-				}
+				}			
+				
 				let data = {
 					buyType: this.options.typeId, //0- 商品页直接下单  1- 购物车结算
 					userId: this.userInfo.id, //下单人ID
@@ -998,9 +1013,48 @@
 					appName: "wumen",
 					come: "2",
 				};
-
-				console.log("data at line 477:", data);
-
+				var productList = [...data.productList]
+				var thisproduct = productList.map(item => {
+					return item.productId+"_"+item.quantity
+				})
+				thisproduct = thisproduct.join(',')
+				console.log("data at line 477:", data);	
+				// console.log('成功信息',product,thisproduct,data.addressId, data.realMoney);
+				if(this.historyOrderInfo && 
+				thisproduct == this.historyOrderInfo.product && 
+				data.addressId == this.historyOrderInfo.addressId && 
+				this.historyOrderInfo.realMoney == data.realMoney){		
+				    that.canjump = false
+					uni.showModal({
+						title:'提示',
+						content:'您短时间内有一笔相同金额的订单，是否确定继续下单？',
+						cancelText:'点错了',
+						confirmText:'继续操作',
+						success: function(res) {
+						that.canjump = true
+							if (res.confirm) {
+								
+								that.buyingFlag = false
+								console.log('用户点击确定',that.buyingFlag);
+								that.submitorder(data)								
+							}
+							else{
+								that.buyingFlag = false
+							}
+						}
+					})
+				}else{					
+					that.submitorder(data)
+				}
+			},
+			
+			async submitorder(data){
+				uni.showLoading({
+					title:'正在请求订单'
+				})
+				// this.buyingFlag = false
+				console.log('进来请求了吗？');
+				let that = this
 				await $http
 					.request({
 						// url: "book/buyOrder/buySave",
@@ -1013,9 +1067,19 @@
 						},
 					})
 					.then(async (res) => {
-						this.buyingFlag = false
+						that.buyingFlag = false
+						var product = data.productList.map(item => {
+							return item.productId+"_"+item.quantity
+						})
+						product = product.join(',')
+						that.historyOrderInfo = {
+							'product':product,
+							'addressId':data.addressId,
+							'realMoney':data.realMoney
+						}
+						
 						console.log("res at line 598系统下单返回结果:", res);
-						if (res.code == 0) {
+						if (res.code == 0) {							
 							if (res.orderSn == null) {
 								uni.showToast({
 									title: "失败,请重新下单",
@@ -1024,12 +1088,12 @@
 								});
 							} else {
 								console.log("that.payType at line 607:", that.payType);
+								uni.showToast({
+									title: "下单成功，即将进行支付",
+									icon:'none'
+								})
 								if (that.payType == 2) {
-									// 常规支付
-									uni.showToast({
-										title: "正在支付",
-										icon: "loading",
-									});
+									// 常规支付									
 									await setPay({
 											typePay: "alipay",
 											subject: "order",
@@ -1043,12 +1107,14 @@
 												title: "加载中",
 											});
 											console.log(res, "支付支付");
-											if (res.success) {												
+											if (res.success) {	
+												uni.hideLoading()
 												uni.showToast({
 													title: "支付成功",
 												});
 												setTimeout(() => {
-													if (that.goToInfo.type == 1) {
+													if(that.canjump){
+													if (that.goToInfo.type == 1 ) {
 														uni.switchTab({
 															url: `${that.goToInfo.url}?type=order`,
 														});
@@ -1060,8 +1126,10 @@
 															url: `${that.goToInfo.url}?backType=order`,
 														});
 													}
+													}
 												}, 1000);
 											} else {
+												uni.hideLoading()
 												console.log("失败失败失败");
 												// this.buyingFlag = false
 												// that.$commonJS.showToast('支付是失败')
@@ -1069,13 +1137,12 @@
 													console.log("延迟调用 失败提示");
 													uni.showToast({
 														title: "支付失败",
-
 														image: "../../../static/icon/ic_close.png",
 													});
 												}, 0);
-
+				
 												// setTimeout(() => {
-
+				
 												// 	uni.navigateTo({
 												// 		url: './orderList'
 												// 	});
@@ -1083,7 +1150,7 @@
 											}
 										}
 									);
-								} else if (this.payType == 1) {
+								} else if (that.payType == 1) {
 									// 微信支付
 									let data1 = {
 										orderSn: res.orderSn,
@@ -1093,26 +1160,26 @@
 									setWXPay(data1, (res) => {
 										if (res.success) {
 											// this.buyingFlag = false
+											uni.hideLoading()
 											uni.showToast({
 												title: "支付成功",
 											});
 											setTimeout(() => {
+												if(that.canjump){
 												if (that.goToInfo.type == 1) {
 													uni.switchTab({
 														url: `${that.goToInfo.url}?type=order`,
 													});
-												} else {
-													// uni.navigateBack({
-													//   delta: 2,
-													// });
-													// uni.n
+												} else {													
 													uni.redirectTo({
 														url: `${that.goToInfo.url}?backType=order`,
 													});
 												}
+												}
 											}, 1000);
 										} else {
 											// this.buyingFlag = false
+											uni.hideLoading()
 											console.log(res, "微信支付111111111111111");
 											if (res.data.errMsg.indexOf("User canceled") != -1) {
 												uni.showToast({
@@ -1129,14 +1196,16 @@
 											}
 										}
 									});
-								} else if (this.payType == 4) {
-									// this.buyingFlag = false
+								} else if (that.payType == 4) {
+									 that.buyingFlag = false
 									// 天医币支付
+									uni.hideLoading()
 									uni.showToast({
 										title: "购买成功",
 										icon: "success",
 									});
 									setTimeout(() => {
+										if(that.canjump){
 										if (that.goToInfo.type == 1) {
 											uni.switchTab({
 												url: `${that.goToInfo.url}?type=order`,
@@ -1146,15 +1215,16 @@
 												url: `${that.goToInfo.url}?backType=order`,
 											});
 										}
+										}
 									}, 1000);
 								}
 							}
 						}
 					}).catch(e => {
-						this.buyingFlag = false
+						that.buyingFlag = false
+						uni.hideLoading()
 					});
 			},
-
 			radioChange(index) {
 				if (index == this.selectPayIndex) {
 					return
@@ -1867,6 +1937,7 @@
 			background-color: #fff;
 
 			.curriulum_title {
+				// width: calc(100% - 80rpx);
 				width: calc(100% - 80rpx);
 				font-weight: 500;
 				font-size: 30rpx;

From 7f17a51c8cf863c5e0a9183225f7748f078e4879 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 19 Sep 2024 11:45:30 +0800
Subject: [PATCH 3/3] 1

---
 config/baseUrl.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index d4197fa..d0b6b61 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -18,8 +18,8 @@ if (process.env.NODE_ENV === 'development') {
 	// 生产环境11
 	// baseUrl = "http://59.110.212.44:9100/pb/";
 	// baseUrl = "https://testapi.nuttyreading.com/";
-	baseUrl = "http://192.168.110.110:9200/pb/";//磊哥
-	// baseUrl = "https://api.nuttyreading.com/"; //1
+	// baseUrl = "http://192.168.110.110:9200/pb/";//磊哥
+	baseUrl = "https://api.nuttyreading.com/"; //1
 	// baseUrl = "ws://twin-ui.com:6001/";
 	// socketUrl = "ws://twin-ui.com:6001/";
 }