diff --git a/components/oneVideo.vue b/components/oneVideo.vue
new file mode 100644
index 0000000..3edb7e9
--- /dev/null
+++ b/components/oneVideo.vue
@@ -0,0 +1,509 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 77487d1..947aa6c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.0.0",
- "versionCode" : 100,
+ "versionName" : "1.0.01",
+ "versionCode" : 1001,
"app-plus" : {
"compatible" : {
"ignoreVersion" : true
diff --git a/pages/component/commonComponents/address/edit.vue b/pages/component/commonComponents/address/edit.vue
index 25ece08..7500032 100644
--- a/pages/component/commonComponents/address/edit.vue
+++ b/pages/component/commonComponents/address/edit.vue
@@ -20,7 +20,7 @@
- 默认收获地址
+ 默认收货地址
diff --git a/pages/component/commonComponents/address/index.vue b/pages/component/commonComponents/address/index.vue
index 4da5069..66f5e1a 100644
--- a/pages/component/commonComponents/address/index.vue
+++ b/pages/component/commonComponents/address/index.vue
@@ -128,7 +128,7 @@ import { mapState } from "vuex";
export default {
components: {
courseDescription, //课程说明
- editAddress, //编辑收获地址
+ editAddress, //编辑收货地址
},
props: ["backState", "type"],
data() {
diff --git a/pages/course/chapterDetail.vue b/pages/course/chapterDetail.vue
index d86c5c3..1e43018 100644
--- a/pages/course/chapterDetail.vue
+++ b/pages/course/chapterDetail.vue
@@ -6,7 +6,7 @@
视频教学
-
- {{ curriculumData.title }}
+
+ 课程:{{options.navTitle}}
+
+
+ 章节:{{ curriculumData.title }}
0) {
@@ -284,6 +285,7 @@
},
oprate(data) {
console.log(data, '得到的内容')
+
if (data.name == 'buy') {
this.buy(data.item)
} else if (data.name == 'gouwuche') {
diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue
index 38aeed5..2cdee98 100644
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -318,8 +318,8 @@
let data = {
"userId": this.userInfo.id,
"productId": item.productId,
- "productAmount": this.productAmount,
- "price": item.price
+ "productAmount": 1,
+ "price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
}
// 判断列表是否为空
if (this.cartList.length > 0) {
diff --git a/pages/course/myCourseLearn.vue b/pages/course/myCourseLearn.vue
index f5613be..0c2bbad 100644
--- a/pages/course/myCourseLearn.vue
+++ b/pages/course/myCourseLearn.vue
@@ -204,6 +204,8 @@
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
+ plus.screen.unlockOrientation();
+ plus.screen.lockOrientation("portrait-primary");
this.getData(this.courseId)
},
onReachBottom() {
@@ -717,8 +719,8 @@
let data = {
"userId": this.userInfo.id,
"productId": item.productId,
- "productAmount": this.productAmount,
- "price": item.price
+ "productAmount": 1,
+ "price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
}
// 判断列表是否为空
if (this.cartList.length > 0) {
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index b2e9681..d3535ce 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -40,7 +40,7 @@
- 请添加收获地址
+ 请添加收货地址
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index e00abd7..ca385fe 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -304,6 +304,9 @@
},
//页面显示
onShow() {
+ uni.hideTabBar();
+ plus.screen.unlockOrientation();
+ plus.screen.lockOrientation("portrait-primary");
this.requestAll()
},
onTabItemTap() {
diff --git a/pages/peanut/shopping.vue b/pages/peanut/shopping.vue
index 88dae32..cd4da1f 100644
--- a/pages/peanut/shopping.vue
+++ b/pages/peanut/shopping.vue
@@ -1,16 +1,16 @@
-
+
-
+
@@ -125,7 +125,7 @@
// }
this.isCartDelShow = this.all
this.total()
- this.manaCart = this.all
+ // this.manaCart = this.all
} else {
this.all = false
@@ -230,7 +230,7 @@
this.totalPrice = 0
this.getCartList()
uni.hideLoading()
- this.manaCart = false
+ // this.manaCart = false
})
} else {
console.log('cancel') //点击取消之后执行的代码