chore: 更新版本号和依赖项

- 将manifest.json中的版本号更新至1.0.61 - 将edu-core依赖从本地路径更新至git仓库地址，版本为v1.0.13 - 优化wallet页面的布局和样式，增强可读性
feat: 添加退款相关功能和状态显示
2026-05-09 11:09:46 +08:00 · 2026-05-09 11:09:14 +08:00 · 2026-04-14 10:24:30 +08:00 · 2026-03-27 10:16:29 +08:00
14 changed files with 280 additions and 62 deletions
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,8 +2,9 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	// baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境11	
 	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
--- a/main.js
+++ b/main.js
@@ -125,6 +125,9 @@ Vue.component('common-video', commonVideo);
 import CommonCourseVideo from 'edu-core/components/course-video'
 Vue.component('CommonCourseVideo', CommonCourseVideo);

+import CommonRefundDestination from 'edu-core/components/order/refund-destination.vue'
+Vue.component('common-refund-destination', CommonRefundDestination);
+
 import commonCoupon from '@/pages/component/commonComponents/coupon/index.vue'
 Vue.component('common-coupon', commonCoupon);
 import commonGoodsList from '@/pages/component/commonComponents/goodsList.vue'
--- a/manifest.json
+++ b/manifest.json
@@ -13,8 +13,8 @@
            "src" : "图片路径"
        }
    ],
-    "versionName" : "1.0.60",
-    "versionCode" : 1060,
+    "versionName" : "1.0.61",
+    "versionCode" : 1061,
    "app-plus" : {
        "nvueCompiler" : "weex",
        "compatible" : {
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "3.4.5",
 			"license": "MIT",
 			"dependencies": {
-				"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.9",
+				"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
 				"jquery": "^3.7.1",
 				"tcplayer.js": "^5.1.0"
 			},
@@ -17,12 +17,6 @@
 				"postcss-px-to-viewport": "^1.1.1"
 			}
 		},
-		"../edu-core": {
-			"version": "1.0.8",
-			"extraneous": true,
-			"license": "ISC",
-			"devDependencies": {}
-		},
 		"node_modules/babel-runtime": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -74,8 +68,8 @@
 			"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
 		},
 		"node_modules/edu-core": {
-			"version": "1.0.8",
-			"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#f815e7660e0645ca4393205b30986c4bc7aa4d9f",
+			"version": "1.0.13",
+			"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
 			"license": "ISC"
 		},
 		"node_modules/es5-shim": {
@@ -399,8 +393,8 @@
 			"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
 		},
 		"edu-core": {
-			"version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#f815e7660e0645ca4393205b30986c4bc7aa4d9f",
-			"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.9"
+			"version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
+			"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13"
 		},
 		"es5-shim": {
 			"version": "4.6.7",
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
 	},
 	"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
 	"dependencies": {
-		"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.9",
+		"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
 		"jquery": "^3.7.1",
 		"tcplayer.js": "^5.1.0"
 	},
--- a/pages.json
+++ b/pages.json
@@ -193,6 +193,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/bookShop/refundDestination",
+			"style": {
+				"navigationBarTitleText": "钱款去向",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
 		{
 			"path": "pages/goods/order/index",
 			"style": {
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -88,6 +88,16 @@
              v-if="orderContet.orderStatus == 5"
              >已超时</text
            >
+            <text
+              class="orderState orderState6"
+              v-if="orderContet.orderStatus == 6"
+              >已退款</text
+            >
+            <text
+              class="orderState orderState7"
+              v-if="orderContet.orderStatus == 7"
+              >退款中</text
+            >
          </view>
          <view
            class="orderContent"
@@ -1105,14 +1115,15 @@ export default {
              text: "继续付款",
            });
          }
-          if (this.orderContet.orderStatus == 0) {
-            this.customButton.push({
-              width: "160rpx",
-              text: "取消订单",
-              color: "#333",
-              backgroundColor: "#f0f0f0",
-            });
-          }
+          // sociology：注释取消订单按钮
+          // if (this.orderContet.orderStatus == 0) {
+          //   this.customButton.push({
+          //     width: "160rpx",
+          //     text: "取消订单",
+          //     color: "#333",
+          //     backgroundColor: "#f0f0f0",
+          //   });
+          // }

          // var seconds = res.result.timestamp + 30 * 60 + 2    // 过期时间
          // var nowSeconds = Math.floor(new Date().getTime() / 1000);
@@ -1131,6 +1142,10 @@ export default {
            this.titleStat = "待收到";
          } else if (this.orderContet.orderStatus == 3) {
            this.titleStat = "已完成";
+          } else if (this.orderContet.orderStatus == 6) {
+            this.titleStat = "已退款";
+          } else if (this.orderContet.orderStatus == 7) {
+            this.titleStat = "退款中";
          }
          if (
            this.orderContet.orderStatus >= 2 &&
@@ -1173,10 +1188,28 @@ export default {
        },
      });
    },
+    checkPayTimeout(payItem) {
+      const createTime = payItem && payItem.createTime;
+      if (!createTime) return true;
+      const createdAt = new Date(String(createTime).replace(/-/g, "/")).getTime();
+      if (!createdAt) return true;
+      const expired = Date.now() - createdAt > 10 * 60 * 1000;
+      if (expired) {
+        uni.showModal({
+          title: "提示",
+          content: "订单已超时，不能继续支付，请重新下单",
+          confirmText: "知道了",
+          showCancel: false,
+        });
+        return false;
+      }
+      return true;
+    },

    // 支付
    goPay(payItem) {
      console.log(payItem, "订单数据");
+      if (!this.checkPayTimeout(payItem)) return;
      if (payItem.paymentMethod == 2) {
        console.log("阿里支付");
        setPay(
@@ -1320,6 +1353,12 @@ uni-view {
 .orderState5 {
  background-color: #787878;
 }
+.orderState6 {
+  background-color: #f56c6c;
+}
+.orderState7 {
+  background-color: #f56c6c;
+}
 .guoqi {
  font-size: 28rpx;
  align-items: center;
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -24,7 +24,7 @@

    <view class="cateList flexbox">
      <common-sticky
-        itemStyle="width:20%; height: 68rpx;font-size:24rpx;"
+        itemStyle="height: 68rpx;font-size:24rpx; padding: 0 20rpx;"
        :list="ordersTabs"
        label="name"
        :currentCateIndex="currentCateIndex"
@@ -120,6 +120,16 @@
                      v-show="slotProps.row.orderStatus == 5"
                      >已过期</text
                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 6"
+                      >已退款</text
+                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 7"
+                      >退款中</text
+                    >
                  </view>
                </view>
                <view
@@ -380,11 +390,12 @@
                  class="operation_box boxShadow"
                  v-if="slotProps.row.isShowMore == true"
                >
-                  <view
+                  <!-- sociology：注释取消订单入口 -->
+                  <!-- <view
                    v-if="slotProps.row.orderStatus == 0"
                    @click.native.stop="canceOrder(slotProps.row)"
                    >取消订单</view
-                  >
+                  > -->
                </view>
                <view class="btns flexbox" style="margin-top: 10rpx">
                  <view
@@ -421,8 +432,18 @@
                    >
                    <view
                      class="orderstatusbtn"
-                      v-if="slotProps.row.orderStatus == 3"
-                      >申请售后</view
+                      v-if="
+                        slotProps.row.orderStatus == 6 ||
+                        slotProps.row.orderStatus == 7
+                      "
+                      @click.stop="goRefundDestination(slotProps.row)"
+                      >钱款去向</view
+                    >
+                    <view
+                      class="orderstatusbtn"
+                      v-if="slotProps.row.refundableStatus === true"
+                      @click.stop="confirmApplyRefund(slotProps.row)"
+                      >申请退款</view
                    >
                    <!-- <view
                      class="orderstatusbtn"
@@ -615,12 +636,14 @@ export default {
      come: "1",
      isShowTab: false,
      isLoadingHide: false,
-      moreList: [
-        {
-          name: "取消订单",
-          key: "false",
-        },
-      ],
+      // sociology：注释取消订单菜单
+      // moreList: [
+      //   {
+      //     name: "取消订单",
+      //     key: "false",
+      //   },
+      // ],
+      moreList: [],
      currentCateIndex: 0,
      pagination: {
        // 请求参数
@@ -671,6 +694,16 @@ export default {
          value: 3,
          badge: {},
        },
+        {
+          name: "已退款",
+          value: 6,
+          badge: {},
+        },
+        {
+          name: "退款中",
+          value: 7,
+          badge: {},
+        },
      ],
      selectOrderInfo: {},
      ordersListTab: 1,
@@ -790,7 +823,8 @@ export default {
      console.log("index at line 609:", index);
      if (index.key == "false") {
        this.isShowMore = false;
-        this.canceOrder(this.selectOrderInfo);
+        // sociology：注释取消订单触发
+        // this.canceOrder(this.selectOrderInfo);
      }
    },
    openMore(row, index) {
@@ -856,6 +890,51 @@ export default {
          val.orderSn,
      });
    },
+    goRefundDestination(row) {
+      uni.navigateTo({
+        url: `/pages/bookShop/refundDestination?orderId=${row.orderId}`,
+      });
+    },
+    confirmApplyRefund(row) {
+      uni.showModal({
+        title: "申请退款",
+        content: "请确认是否提交退款申请？",
+        confirmText: "确认提交",
+        cancelText: "取消",
+        success: (res) => {
+          if (res.confirm) {
+            this.submitOrderRefund(row);
+          }
+        },
+      });
+    },
+    submitOrderRefund(orderRow) {
+      this.$http
+        .request({
+          url: "book/buyOrder/refundOrder",
+          method: "POST",
+          data: {
+            orderId: orderRow.orderId,
+          },
+          header: {
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          if (res.code === 0) {
+            this.$commonJS.showToast("申请退款成功");
+            this.newestpage = 1;
+            this.pagination.page = 1;
+            this.newList = [];
+            this.getBookList(this.ordersListTab, false);
+            return;
+          }
+          this.$commonJS.showToast(res.errMsg || "申请退款失败");
+        })
+        .catch(() => {
+          this.$commonJS.showToast("申请退款失败");
+        });
+    },
    getBookList(flag, refreshflag) {
      this.isLoadingHide = false;
      var that = this;
@@ -882,6 +961,8 @@ export default {
          // * 3：已完成
          // * 4: 交易失败
          // * 5: 已过期
+          // * 6: 已退款
+          // * 7: 退款中

          console.log("res at line 757:", res);
          that.map = res.data;
@@ -909,7 +990,7 @@ export default {
      var params = {
        userId: this.userInfo.id,
        come: this.come,
-        orderStatus: flag == -1 ? "" : flag, //传null为全部，订单状态  0-待付款 1-待发出 2-待收到 3-已完成 4-交易失败 5-已过期
+        orderStatus: flag == -1 ? "" : flag, //传null为全部，订单状态  0-待付款 1-待发出 2-待收到 3-已完成 4-交易失败 5-已过期 6-已退款 7-退款中
        ...this.pagination,
        // limit: 10,
        // page: this.newestpage,
@@ -949,9 +1030,27 @@ export default {

      this.axiosStatus = 1;
    },
+    checkPayTimeout(payItem) {
+      const createTime = payItem && payItem.createTime;
+      if (!createTime) return true;
+      const createdAt = new Date(String(createTime).replace(/-/g, "/")).getTime();
+      if (!createdAt) return true;
+      const expired = Date.now() - createdAt > 10 * 60 * 1000;
+      if (expired) {
+        uni.showModal({
+          title: "提示",
+          content: "订单已超时，不能继续支付，请重新下单",
+          confirmText: "知道了",
+          showCancel: false,
+        });
+        return false;
+      }
+      return true;
+    },
    // 支付
    goPay(payItem) {
      console.log(payItem, "订单数据");
+      if (!this.checkPayTimeout(payItem)) return;
      if (payItem.paymentMethod == 2) {
        console.log("阿里支付");
        setPay(
@@ -1629,9 +1728,9 @@ export default {
  z-index: 970;
 }

-/deep/.u-tabs__wrapper__nav__item {
-  padding: 0 !important;
-}
+// /deep/.u-tabs__wrapper__nav__item {
+//   padding: 0 !important;
+// }

 .commonDetailPage {
  background-color: #f5f5f5;
--- a/pages/bookShop/refundDestination.vue
+++ b/pages/bookShop/refundDestination.vue
@@ -0,0 +1,27 @@
+<template>
+  <view class="page-wrap">
+    <public-module></public-module>
+    <common-refund-destination :order-id="orderId" :http="$http" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      orderId: "",
+    };
+  },
+  onLoad(options) {
+    if (options && options.orderId != null) {
+      this.orderId = options.orderId;
+    }
+  },
+};
+</script>
+
+<style scoped>
+.page-wrap {
+  min-height: 100vh;
+}
+</style>
--- a/pages/component/commonComponents/selectGoods.vue
+++ b/pages/component/commonComponents/selectGoods.vue
@@ -445,4 +445,8 @@ export default {
    font-weight: 700;
  }
 }
+
+.title_list {
+  margin-bottom: 20rpx;
+}
 </style>
--- a/pages/component/commonComponents/sticky.vue
+++ b/pages/component/commonComponents/sticky.vue
@@ -1,6 +1,6 @@
 <template>
  <!-- <scroll-view class="scroll-view_H cateList" scroll-x="true" scroll-left="0"> -->
-  <view class="" style="background-color: #fff; width: 100%">
+  <view class="" style="background-color: #fff; width: 100%; padding: 0 20rpx;">
    <u-tabs
      lineWidth="30"
      lineColor="#3AB3AE"
--- a/pages/medicaldes/medicaldes.vue
+++ b/pages/medicaldes/medicaldes.vue
@@ -93,8 +93,6 @@
              "
            >
              <common-list
-                @lower="onReachBottom1"
-                :pagination="pagination"
                :dataList="titleList"
                @hancleClick="gotoDetail"
                label="title"
@@ -107,7 +105,6 @@
            </template>
            <template v-else-if="curOneCateIndex == 0 || curOneCateIndex == 2">
              <common-list
-                @lower="onReachBottom1"
                :dataList="titleList"
                @hancleClick="gotoDetail"
                label="name"
@@ -125,7 +122,6 @@
            </template>
            <template v-if="curOneCateIndex == 3">
              <common-list
-                @lower="onReachBottom1"
                :dataList="titleList"
                @hancleClick="gotoDetail"
                label="title"
@@ -575,8 +571,12 @@ export default {
              // }).exec();
              await uni
                .createSelectorQuery()
-                .select(".cateList")
+                .in(this)
+                .select(".twoCateList")
                .boundingClientRect(function (rect) {
+                  if (!rect || typeof rect.height !== "number") {
+                    return;
+                  }
                  console.log(rect.height, "22222");

                  var height = 42 + rect.height + 20;
@@ -778,14 +778,21 @@ export default {
 .custom-grid {
  display: flex;
  flex-wrap: wrap;
-  // border: 1px solid #dadbde;
-	// border-bottom: 0;
+  // border-top: 1px solid #dadbde;
+  // border-bottom: 1px solid #dadbde;

  &.col-3 {
    .grid-item {
      min-width: 33.33%;
      flex: 1;
    }
+
+    // .grid-item:nth-child(-n + 3) {
+    //   border-top: 0;
+    // }
+    // .grid-item:nth-child(3n + 1) {
+    //   border-left: 0;
+    // }
  }

  &.col-4 {
@@ -793,11 +800,18 @@ export default {
      min-width: 25%;
      flex: 1;
    }
+
+    // .grid-item:nth-child(-n + 4) {
+    //   border-top: 0;
+    // }
+    // .grid-item:nth-child(4n + 1) {
+    //   border-left: 0;
+    // }
  }

  .grid-item {
-    // border-right: 1px solid #dadbde;
-    // border-bottom: 1px solid #dadbde;
+    // border-left: 1px solid #dadbde;
+    // border-top: 1px solid #dadbde;
    padding: 10rpx 0;
    text-align: center;
    font-size: 30rpx;
@@ -857,7 +871,7 @@ export default {
      color: #3ab3ae;
    }

-    // .u-grid-list{border: 0.5px solid #dadbde;}
+    .u-grid-list{border: 0.5px solid #dadbde;}
  }

  .titleList {
--- a/pages/mine/wallet/index/index.vue
+++ b/pages/mine/wallet/index/index.vue
@@ -63,17 +63,19 @@
            >
              <template slot="labelSlot" slot-scope="slotProps">
                <view class="label_content AC_List">
-                  <view class="left">
-                    <view class="title">{{ slotProps.row.orderType }}</view>
-                  </view>
-                  <view
-                    :class="`right ${
-                      slotProps.row.changeAmount > 0 ? 'Hot' : ''
-                    }`"
-                  >
-                    <text v-if="slotProps.row.changeAmount > 0">+</text>
-                    <text>{{ slotProps.row.changeAmount }}</text>
-				  </view>
+					<view style=" display: flex; align-items: center; justify-content: space-between;">
+					  <view class="left">
+						  <view class="title">{{ slotProps.row.productName || slotProps.row.orderType}}</view>
+					  </view>
+					  <view
+						:class="`right ${
+						  slotProps.row.changeAmount > 0 ? 'Hot' : ''
+						}`"
+					  >
+						<text v-if="slotProps.row.changeAmount > 0">+</text>
+						<text>{{ slotProps.row.changeAmount }}</text>
+					  </view>
+					</view>
 				  <view class="AC_mark" v-if="slotProps.row.remark">{{slotProps.row.remark}}</view>
 				  <view class="AC_note" v-if="slotProps.row.note&&slotProps.row.note!='null'">说明：{{slotProps.row.note}}</view>
 				  <view class="AC_time">{{ slotProps.row.createTime }}</view>
@@ -348,6 +350,12 @@ export default {

    .AC_List {
      overflow: hidden;
+      .title,
+      .AC_note,
+      .AC_mark {
+        word-break: break-word;
+        overflow-wrap: break-word;
+      }
      .left {
        width: calc(100% - 220rpx) !important;
        font-weight: 700;
@@ -365,6 +373,19 @@ export default {
        font-weight: 700;
        color: #333;
      }
+      > view:first-child {
+        .left {
+          flex: 1;
+          min-width: 0;
+          width: auto !important;
+          float: none;
+        }
+        .right {
+          flex-shrink: 0;
+          float: none;
+          width: auto !important;
+        }
+      }

      //   border-bottom: 1px solid #eee;
      //   padding: 40rpx 10rpx;
--- a/style/common.scss
+++ b/style/common.scss
@@ -377,3 +377,7 @@ button::after {
 		}
 	}
 }
+
+uni-text {
+	white-space: normal;
+}
Author	SHA1	Message	Date
chenghuan	df34c1ad48	chore: 更新版本号和依赖项 - 将manifest.json中的版本号更新至1.0.61 - 将edu-core依赖从本地路径更新至git仓库地址，版本为v1.0.13 - 优化wallet页面的布局和样式，增强可读性	2026-05-09 11:09:46 +08:00
chenghuan	5f4a4d4ae4	feat: 添加退款相关功能和状态显示 - 新增退款状态显示，包括“已退款”和“退款中” - 添加退款目的地页面，支持查看订单退款信息 - 更新订单列表和订单详情页，支持退款操作 - 更新依赖edu-core至v1.0.13以支持新功能	2026-05-09 11:09:14 +08:00
chenghuan	708804cbbf	chore: 视频播放下一集自动保持倍速设置；增加2.5倍速	2026-04-14 10:24:30 +08:00
chenghuan	7523441a17	fix: 解决控制台报错 - 将baseUrl配置调整为线上正式环境 - 移除medicaldes页面中不必要的@lower事件监听 - 优化common-list组件的使用，简化代码结构 - 调整样式注释，清理不必要的样式代码	2026-03-27 10:16:29 +08:00