From 1bf03550ba6ee1b8a962dab403ecfb252cd3e88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Thu, 7 Nov 2024 09:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=BF=90=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderCoupon.vue  |  2 +-
 config/baseUrl.js           |  8 +++----
 config/requestConfig.js     | 20 ++++++++---------
 manifest.json               |  4 ++--
 pages/goods/order/index.vue | 45 +++++++++++++++++++++++--------------
 5 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/components/orderCoupon.vue b/components/orderCoupon.vue
index 6b819f1..b68a932 100644
--- a/components/orderCoupon.vue
+++ b/components/orderCoupon.vue
@@ -165,7 +165,7 @@
 <script>
 export default {
   name: "orderCoupon",
-  props: ["list", "curCouponId", "sumMeony", "addressId",'selectcouponList'],
+  props: ["list", "curCouponId", "sumMeony",'selectcouponList'],
   data() {
     return {
       youhuiShow: true,
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 6d44fd5..2720b95 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,9 +6,9 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	// baseUrl = "https://api.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.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/";
@@ -20,8 +20,8 @@ if (process.env.NODE_ENV === 'development') {
 	// 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.100:9200/pb/"; //  张川川
+	baseUrl = "https://api.nuttyreading.com/"; //1
+	// baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
 	// baseUrl = "ws://twin-ui.com:6001/";
 	// socketUrl = "ws://twin-ui.com:6001/";
 }
diff --git a/config/requestConfig.js b/config/requestConfig.js
index 96d90a1..1dcdee2 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -40,9 +40,9 @@ let $http = new request({
 		'Content-Type': 'application/x-www-form-urlencoded',
 		// 'project_token': base.projectToken, //项目token（可删除）
 	},
-	  timeout:'15000' // 15秒
-	
-	});
+	timeout: '15000' // 15秒
+
+});
 // 添加获取七牛云token的方法
 $http.getQnToken = function(callback) {
 	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
@@ -148,13 +148,13 @@ $http.requestEnd = function(options) {
 let loginPopupNum = 0;
 //所有接口数据处理（此方法需要开发者根据各自的接口返回类型修改，以下只是模板）
 $http.dataFactory = async function(res) {
-	// console.log("接口请求数据", {
-	// 	url: res.url,
-	// 	resolve: res.response,
-	// 	header: res.header,
-	// 	data: res.data,
-	// 	method: res.method,
-	// });
+	console.log("接口请求数据", {
+		url: res.url,
+		resolve: res.response,
+		header: res.header,
+		data: res.data,
+		method: res.method,
+	});
 	if (res.response.statusCode && res.response.statusCode == 200) {
 		let httpData = res.response.data;
 		if (typeof(httpData) == "string") {
diff --git a/manifest.json b/manifest.json
index 690a193..b7d45a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.31",
-    "versionCode" : 1031,
+    "versionName" : "1.0.32",
+    "versionCode" : 1032,
     "app-plus" : {
         "nvueCompiler" : "weex",
         "compatible" : {
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 08ad515..3dc3f9b 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -276,7 +276,10 @@
             </view>
           </view>
 
-          <view class="bottom jf_box" v-if="v.type == 4&&initData.user.jf>0">
+          <view
+            class="bottom jf_box"
+            v-if="v.type == 4 && initData.user.jf > 0"
+          >
             <view class="jf_box">
               <text style="color: #258feb; font-weight: 600"
                 >可用积分({{ jfNumberMax }}分)</text
@@ -599,7 +602,6 @@
       v-if="showCouponPup"
       :sumMeony="totalPrice"
       :selectcouponList="selectcouponList"
-      :addressId="addressId"
       :curCouponId="curCouponId"
       :list="couponHistoryList"
       ref="orderCoupon"
@@ -966,7 +968,12 @@ export default {
               title: res.errMsg,
               icon: "none",
             });
-            await this.getTotalPrice();
+            if (this.isShowAddress) {
+              await this.getUserAddress();
+            } else {
+              await this.getTotalPrice();
+            }
+
             return;
           }
           if (res.code == 0) {
@@ -1006,7 +1013,11 @@ export default {
           }
 
           this.$forceUpdate();
-          await this.getTotalPrice();
+          if (this.isShowAddress) {
+            await this.getUserAddress();
+          } else {
+            await this.getTotalPrice();
+          }
           // await that.getDetailInfo();
         })
         .catch((e) => {
@@ -1153,6 +1164,10 @@ export default {
           console.log("res at line 374:", res);
           if (res.code == 0) {
             this.initData = res.data;
+            console.log(
+              "this.initData at line 初始化课程订单信息:",
+              this.initData
+            );
             this.isShowAddress = res.data.is_course ? false : true;
             if (!this.isShowAddress && !this.options.isFudu) {
               this.priceBreakdownList.push({
@@ -1162,11 +1177,7 @@ export default {
               });
             }
 
-            if (this.isShowAddress) {
-              await this.getUserAddress();
-            } else {
-              // await this.getTotalPrice();
-            }
+           
           }
 
           this.$forceUpdate();
@@ -1230,6 +1241,7 @@ export default {
             this.addressData = this.defaultAddressList;
           }
           console.log("this.addressData at line 742:", this.addressData);
+         
           if (this.defaultAddressList.id) {
             console.log("有默认地址");
             await this.getFreightNum();
@@ -1319,14 +1331,13 @@ export default {
           this.jfNumberMax = that.totalPrice - couponAmount;
           console.log("this.jfNumberMax at line 1303:", this.jfNumberMax);
         } else {
-          if(this.initData.user.jf>=couponAmount){
-             this.jfNumber = this.initData.user.jf - couponAmount;
-          this.jfNumberMax = this.initData.user.jf - couponAmount;
-          }else{
-            this.jfNumber=this.initData.user.jf
-            this.jfNumberMax=this.initData.user.jf
+          if (this.initData.user.jf >= couponAmount) {
+            this.jfNumber = this.initData.user.jf - couponAmount;
+            this.jfNumberMax = this.initData.user.jf - couponAmount;
+          } else {
+            this.jfNumber = this.initData.user.jf;
+            this.jfNumberMax = this.initData.user.jf;
           }
-         
         }
         if (that.jfNumber == 0 || that.jfNumber == null) {
           that.jfNumberShow = "0.00";
@@ -1337,7 +1348,7 @@ export default {
         }
         that.actualPayment = that.actualPayment + that.freightNum;
       } else {
-        that.actualPayment = that.totalPrice + that.freightNum;
+        that.actualPayment = that.totalPrice + that.freightNum - couponAmount;
       }
 
       //  console.log('couponAmount优惠券金额',couponAmount);