diff --git a/config/index.js b/config/index.js
index 4da1aa2..5ab8995 100644
--- a/config/index.js
+++ b/config/index.js
@@ -12,7 +12,7 @@ const envParam = {
prod: 'production',
}
-const env = envParam['dev']
+const env = envParam['test']
// 全局配置
const config = {
diff --git a/pages.json b/pages.json
index 4d0f81b..40d9af2 100644
--- a/pages.json
+++ b/pages.json
@@ -55,7 +55,7 @@
{
"path": "home/search",
"style": {
- "navigationStyle": "custom"
+ "navigationBarTitleText": "搜索"
}
},
{
diff --git a/pages/index/desk.vue b/pages/index/desk.vue
index 933565c..a1810a8 100644
--- a/pages/index/desk.vue
+++ b/pages/index/desk.vue
@@ -114,7 +114,7 @@ export default {
})
const res = await this.$api.book.delStand({
- id: book.id
+ id: book.bookId
})
uni.hideLoading()
@@ -228,15 +228,14 @@ export default {
.book-grid-info {
padding: 6rpx;
box-sizing: border-box;
-
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+
.book-grid-title {
font-size: 28rpx;
font-weight: 700;
color: $primary-text-color;
-
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
}
.book-grid-meta {
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 9362e50..68e8fa5 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -601,7 +601,7 @@ export default {
width: 208rpx;
display: flex;
flex-direction: column;
-
+ // backdrop-filter: red;
.book-grid-cover {
box-shadow: 0px 4px 4px 0px #C0BCBA75;
@@ -618,15 +618,17 @@ export default {
}
.book-grid-info {
+ width: 208rpx;
padding: 6rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
.book-grid-title {
font-size: 28rpx;
font-weight: 700;
color: $primary-text-color;
margin-bottom: 14rpx;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+
}
.book-grid-meta {
diff --git a/pages/index/member.vue b/pages/index/member.vue
index a1cfadd..7fd4bae 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -120,6 +120,7 @@
学习计划
+
- {{ book.book.booksName }}
+ {{ book.book.booksName || '暂无课程' }}
- {{ book.book.categoryName }}/
+ {{ book.book.categoryName || '--' }}/
{{ book.book.duration }}
@@ -560,13 +561,18 @@ export default{
.plan-book-info {
text-align: center;
+ width: 180rpx;
.plan-book-title {
+ // width: 100%;
font-size: 28rpx;
font-weight: 700;
color: #333;
margin-bottom: 8rpx;
display: block;
-
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+
&.highlight-title {
color: $primary-color;
}
diff --git a/pages/index/test.vue b/pages/index/test.vue
index 1281de0..8af9d05 100644
--- a/pages/index/test.vue
+++ b/pages/index/test.vue
@@ -12,13 +12,12 @@
-
+
-
-
+
diff --git a/subPages/home/directory.vue b/subPages/home/directory.vue
index 462b879..ea9bdc6 100644
--- a/subPages/home/directory.vue
+++ b/subPages/home/directory.vue
@@ -26,8 +26,7 @@
知识收获
-
-
+
@@ -63,8 +62,7 @@
简介
-
-
+
@@ -256,7 +254,7 @@ export default {
right: 0;
top: 0;
padding: 30rpx;
-
+ z-index: 1;
}
.book-info {
display: flex;
@@ -358,7 +356,7 @@ export default {
gap: 24rpx;
flex-direction: column;
position: relative;
- z-index: 100;
+ z-index: 9999;
}
/* 课程部分 */
@@ -613,7 +611,7 @@ padding: 32rpx;
background: #fff;
padding: 24rpx 32rpx 0;
box-shadow: 0rpx -2rpx 0rpx 0rpx #0000001A;
- z-index: 999;
+ z-index: 10000;
.bottom-action-container{
display: flex;
diff --git a/subPages/home/plan.vue b/subPages/home/plan.vue
index 20eff13..9b9c7f7 100644
--- a/subPages/home/plan.vue
+++ b/subPages/home/plan.vue
@@ -15,7 +15,7 @@
-
+
-
-
-
-
-
-
-
-
- {{ tab.title }}
+
+
+
+
+
+ {{ tab.title }}
+
-
-
+
+
+
{
- uni.navigateBack({
- delta: 2
- })
- }, 1000)
+ uni.navigateBack()
+ }, 800)
} else {
uni.showToast({
title: subRes.msg,
@@ -155,11 +154,10 @@ export default {
})
}
- // uni.showToast({
- // title: '提交成功',
- // icon: 'success'
- // })
}
+ },
+ onLoad(options) {
+ this.linkId = options.id
}
}
diff --git a/subPages/login/login.vue b/subPages/login/login.vue
index 9697088..a5c47a3 100644
--- a/subPages/login/login.vue
+++ b/subPages/login/login.vue
@@ -8,7 +8,7 @@
- 展品维保报修小程序
+ {{ configParamContent('app_name') }}
@@ -43,8 +43,7 @@
-
-
+
@@ -52,8 +51,7 @@
-
-
+
diff --git a/subPages/member/recharge.vue b/subPages/member/recharge.vue
index 3928fdb..105597a 100644
--- a/subPages/member/recharge.vue
+++ b/subPages/member/recharge.vue
@@ -207,7 +207,11 @@
this.goBack()
}else {
// 调起微信支付
- this.$utils.wxPay(res.result)
+ this.$utils.wxPay(res.result, (res) => {
+ setTimeout(() => {
+ this.goBack()
+ }, 1000)
+ })
}
}
},
diff --git a/subPages/user/introduce.vue b/subPages/user/introduce.vue
index 77f5811..7e0c9e1 100644
--- a/subPages/user/introduce.vue
+++ b/subPages/user/introduce.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/subPages/user/policy.vue b/subPages/user/policy.vue
index c764192..882ffa7 100644
--- a/subPages/user/policy.vue
+++ b/subPages/user/policy.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/utils/common.js b/utils/common.js
index 5d375cd..ce23a37 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -116,10 +116,9 @@ const wxPay = (paymentData, successCallback, failCallback) => {
title: '支付成功',
icon: 'success'
})
- // 支付成功后返回上一页
- setTimeout(() => {
- this.goBack()
- }, 1500)
+ if (successCallback) {
+ successCallback(res)
+ }
},
fail: (err) => {
console.log('支付失败:', err)