diff --git a/config/baseUrl.js b/config/baseUrl.js
index 46bddf3..f725c58 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,8 +2,8 @@ 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/"; //线上正式
} else if (process.env.NODE_ENV === 'production') {
// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
baseUrl = "https://api.nuttyreading.com/"; //线上正式
diff --git a/manifest.json b/manifest.json
index 15ca8bd..04c4219 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,9 +2,9 @@
"name" : "心灵空间",
"appid" : "__UNI__BBBDFD2",
"description" : "心灵空间",
- "versionName" : "1.0.50",
+ "versionName" : "1.0.51",
"sassImplementationName" : "node-sass",
- "versionCode" : 1050,
+ "versionCode" : 1051,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/curriculum/order/index copy.vue b/pages/curriculum/order/index copy.vue
deleted file mode 100644
index 63e53e3..0000000
--- a/pages/curriculum/order/index copy.vue
+++ /dev/null
@@ -1,1746 +0,0 @@
-
-
-
-
-
-
-
-
- {{ goBuyTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ curriculumData.title }}
-
-
- {{ cateList && cateList.length > 0 ? `共${cateList.length}个目录` : "" }}
-
-
-
-
-
-
-
-
-
- {{ isHideCourseInfo ? "展开" : "收起" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ slotProps.data.title
- }}
-
-
-
-
-
-
-
- 课程有效期截止到:
{{ slotProps.data.endTime ? slotProps.data.endTime
- : '' }}
- 已购买
-
-
-
-
-
-
- 未购买
-
- 课程有效期截止到:
{{ slotProps.data.endTime ? slotProps.data.endTime
- : '' }}
- 已购买
-
- 有效期至{{ userVip.endTime ? userVip.endTime : '' }}
-
-
-
-
- 购买课程
-
-
-
-
-
-
-
- 领取课程
-
- 复读
-
-
-
-
-
-
-
-
-
-
-
-
-
- gotoDetail(data, index, slotProps)" label="title">
-
-
- {{
- slotProps1.row.title }}
-
-
-
-
-
-
-
- 试听
-
-
-
-
-
-
-
- 试听
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 学习进度
-
-
-
-
-
- {{ slotProps.data.completion }}%
-
-
-
-
-
-
-
-
-
-
-
-
-
- VIP优惠
-
-
-
- {{ item.productName }}
-
-
- ¥{{
- item.vipPrice.toFixed(2) }}
- ¥{{ Number(item.price) }}
-
-
-
- ¥{{
- item.activityPrice }}
- ¥{{ Number(item.price) }}
-
-
- ¥{{
- Number(item.price) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/curriculum/order/index.vue b/pages/curriculum/order/index.vue
index ec6894e..84c45a2 100644
--- a/pages/curriculum/order/index.vue
+++ b/pages/curriculum/order/index.vue
@@ -681,7 +681,7 @@ export default {
});
const joinedText = this.textList.join('/');
- this.goBuyTitle = '购买' + joinedText + 'VIP,即可畅享更多专属权益';
+ this.goBuyTitle = '购买' + joinedText + 'VIP,即可畅享更多专属权益(不包含论坛)';
}
})
},
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 4463ed8..223961e 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -437,6 +437,7 @@ export default {
}
.userInfoBox{
padding-left: 20rpx;
+ flex: 1;
}
view {
@@ -1045,6 +1046,7 @@ export default {
margin-top: 10rpx;
display: flex;
align-items: center;
+ flex-wrap: wrap;
}
.vip_type_item{
display: flex;
@@ -1058,7 +1060,8 @@ export default {
height: 40rpx;
font-weight: bold;
color: #fff;
- margin-right: 10rpx;
+ margin-right: 8rpx;
+ margin-bottom: 4rpx;
}
.vip_type_item:last-child{
margin-right: 0;