diff --git a/components/buyPup.vue b/components/buyPup.vue
index 9442d50..7c2676c 100644
--- a/components/buyPup.vue
+++ b/components/buyPup.vue
@@ -16,10 +16,10 @@
立即购买
-
+
diff --git a/pages.json b/pages.json
index 50eecb4..f8863ab 100644
--- a/pages.json
+++ b/pages.json
@@ -461,7 +461,49 @@
"popGesture": "none"
}
}
- }
+ },
+ {
+ "path": "pages/medicaldes/medicaldes",
+ "style": {
+ "navigationBarTitleText": "吴门医述",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/medicaldes/zhuanzhuchuban",
+ "style": {
+ "navigationBarTitleText": "专著出版",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/medicaldes/xueshugongxianDetail",
+ "style": {
+ "navigationBarTitleText": "学术贡献详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/medicaldes/medicaldesDetail",
+ "style": {
+ "navigationBarTitleText": "医述详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/medicaldes/recordDetail",
+ "style": {
+ "navigationBarTitleText": "纪实详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/medicaldes/video",
+ "style": {
+ "navigationBarTitleText": "医述详情",
+ "enablePullDownRefresh": false
+ }
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 797e104..80358a3 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -512,7 +512,7 @@
})
return
}
- return false
+
let images = ''
if (this.uploadPicLIst.length > 0) {
let list = this.uploadPicLIst.map(item => item.url)
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 7bbc8e7..2e797a3 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -277,7 +277,6 @@
this.status = 2 // 加载完成
} else {
-
this.status = 3 // 暂无数据
}
console.log('status', this.status)
diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue
index de2d835..1d60f22 100644
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -108,7 +108,7 @@
- {{item.title}}
+ {{item.title}}-{{item.catalogueTitle}}
@@ -215,7 +215,8 @@
page: 1,
flag: false
},
- oldValue : ''
+ oldValue : '',
+ cartList:[]
};
},
@@ -286,8 +287,101 @@
}
},
// 购物车
- addCart(){
-
+ addCart(val){
+ console.log(val)
+ if (val.productStock == 0) {
+ uni.showToast({
+ title: '商品库存不足',
+ icon: "none"
+ });
+ } else {
+ console.log(this.userInfo, '222')
+ this.$http
+ .post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+ .then(res => {
+ // console.log(
+ this.cartList = res.cartList
+ // this.isAddLink(val)
+ })
+ }
+ },
+ // 加入购物车
+ isAddLink(item) {
+ // 统计商品信息
+ let data = {
+ "userId": this.userInfo.id,
+ "productId": item.productId,
+ "productAmount": this.productAmount,
+ "price": item.price
+ }
+ // 判断列表是否为空
+ if (this.cartList.length > 0) {
+ let flag = ''
+ let shagnpin = {}
+ // 循环购物车列表
+ flag = this.cartList.some((item, index) => {
+ if (item.productId == data.productId) {
+ shagnpin = item
+ shagnpin.productAmount = item.productAmount + 1
+ return true
+ }
+ })
+ if (flag) {
+ // 已在购物车中添加
+ $http.request({
+ url: "book/ordercart/update",
+ method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
+ data: shagnpin,
+ header: { //默认 无 说明:请求头
+ 'Content-Type': 'application/json'
+ },
+ }).then(res => {
+ if (res.code == 0) {
+ this.upoShow = false
+ uni.showToast({
+ title: '加入购物车成功',
+ duration: 1000,
+ });
+ }
+ })
+ } else {
+ // 加入购物车
+ $http.request({
+ url: "book/ordercart/save",
+ method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
+ data,
+ header: { //默认 无 说明:请求头
+ 'Content-Type': 'application/json'
+ },
+ }).then(res => {
+ if (res.code == 0) {
+ this.upoShow = false
+ uni.showToast({
+ title: '加入购物车成功',
+ duration: 1000,
+ });
+ }
+ })
+ }
+
+ } else {
+ // 购物车列表为空时直接加入购物车
+ $http.request({
+ url: "book/ordercart/save",
+ method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
+ data,
+ header: { //默认 无 说明:请求头
+ 'Content-Type': 'application/json'
+ },
+ }).then(res => {
+ if (res.code == 0) {
+ uni.showToast({
+ title: '加入购物车成功',
+ duration: 1000,
+ });
+ }
+ })
+ }
},
// 直接购买
buy(val){
@@ -464,7 +558,7 @@
},
})
.then(res => {
- if (res.code == 0) {
+ if (res.code == 0 && res.courseList != null) {
if (res.courseList.length > 0) {
this.ExpiredCourseList.list = res.courseList
// if (res.courseList.pages > this.ExpiredCourseList.page) {
@@ -475,7 +569,9 @@
} else {
this.ExpiredCourseList.status = 3 // 暂无数据
}
- console.log('status', this.ExpiredCourseList.status)
+ console.log('status-------------------', this.ExpiredCourseList.status)
+ }else{
+ this.ExpiredCourseList.status = 3 // 暂无数据
}
// this.ExpiredCourseList.flag = false
}).catch(e => {
@@ -571,7 +667,7 @@
url: "sociology/product/getProductListForCourse",
method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
data: {
- "id": val.id
+ "id": val.catalogueId
},
header: { //默认 无 说明:请求头
'Content-Type': 'application/json'
@@ -593,11 +689,7 @@
this.pricespop = true
- },
- // 获取续费商品
- getCourseProList(){
-
- },
+ },
// 跳转
onPageJump(url, id) {
uni.navigateTo({
diff --git a/pages/medicaldes/medicaldes.vue b/pages/medicaldes/medicaldes.vue
new file mode 100644
index 0000000..b128431
--- /dev/null
+++ b/pages/medicaldes/medicaldes.vue
@@ -0,0 +1,759 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ {{item.dictValue}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/medicaldes/medicaldesDetail.vue b/pages/medicaldes/medicaldesDetail.vue
new file mode 100644
index 0000000..5fcb0ff
--- /dev/null
+++ b/pages/medicaldes/medicaldesDetail.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{prescriptDetail.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/medicaldes/medurl.vue b/pages/medicaldes/medurl.vue
new file mode 100644
index 0000000..cd4331e
--- /dev/null
+++ b/pages/medicaldes/medurl.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/medicaldes/recordDetail.vue b/pages/medicaldes/recordDetail.vue
new file mode 100644
index 0000000..5dbcc96
--- /dev/null
+++ b/pages/medicaldes/recordDetail.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{prescriptDetail.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/medicaldes/video.vue b/pages/medicaldes/video.vue
new file mode 100644
index 0000000..1c63d4c
--- /dev/null
+++ b/pages/medicaldes/video.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/medicaldes/xueshugongxianDetail.vue b/pages/medicaldes/xueshugongxianDetail.vue
new file mode 100644
index 0000000..87feca8
--- /dev/null
+++ b/pages/medicaldes/xueshugongxianDetail.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+ {{ prescriptDetail.title }}
+
+
+
+
+
+
+
+
+
+ < 返回
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/medicaldes/zhuanzhuchuban.vue b/pages/medicaldes/zhuanzhuchuban.vue
new file mode 100644
index 0000000..3b62788
--- /dev/null
+++ b/pages/medicaldes/zhuanzhuchuban.vue
@@ -0,0 +1,808 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.dictValue}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 258181b..3dad965 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -21,11 +21,7 @@
我的课程
-
-
-
- 太湖公益
-
+
-