diff --git a/main.js b/main.js
index 2eb1fa8..b1957d1 100644
--- a/main.js
+++ b/main.js
@@ -28,7 +28,7 @@ Vue.prototype.$apkUrl = "https://a.app.qq.com/o/simple.jsp?pkgname=com.cn.medici
uni.getSystemInfo({
success: function (res) {
-
+ Vue.prototype.$platform = res.platform;
Vue.prototype.iosHidden = true;
if (res.platform == 'ios') {
@@ -106,6 +106,8 @@ import commonAddress from '@/pages/component/commonComponents/address/index.vue'
Vue.component('common-address', commonAddress);
import commonSelectGoods from '@/pages/component/commonComponents/selectGoods.vue'
Vue.component('common-select-goods', commonSelectGoods);
+import commonVideoIos from '@/pages/component/commonComponents/video/ios.nvue'
+Vue.component('common-video-ios', commonVideoIos);
// import musicPlay from '@/components/music.vue'
// Vue.component('music-play', musicPlay);
diff --git a/manifest.json b/manifest.json
index 443aaac..c117d23 100644
--- a/manifest.json
+++ b/manifest.json
@@ -32,7 +32,8 @@
"Payment" : {},
"Share" : {},
"Camera" : {},
- "OAuth" : {}
+ "OAuth" : {},
+ "VideoPlayer" : {}
},
"distribute" : {
"apple" : {
diff --git a/pages/component/commonComponents/video/ios.nvue b/pages/component/commonComponents/video/ios.nvue
new file mode 100644
index 0000000..d18a094
--- /dev/null
+++ b/pages/component/commonComponents/video/ios.nvue
@@ -0,0 +1,1433 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/course/chapterDetail.vue b/pages/course/chapterDetail.vue
index b65b1d3..e3117df 100644
--- a/pages/course/chapterDetail.vue
+++ b/pages/course/chapterDetail.vue
@@ -13,16 +13,17 @@
>
-
-
+
diff --git a/store/modules/common.js b/store/modules/common.js
index eb3b06b..37e9fc9 100644
--- a/store/modules/common.js
+++ b/store/modules/common.js
@@ -2,6 +2,7 @@ export const state = {
//webView地址
webViewUrl: "",
loadingShow: false,
+ videoTimer: false,
//微信场景参数
chatScenesInfo: {},
//绑定微信头像昵称弹窗状态
@@ -47,6 +48,14 @@ export const mutations = {
// #endif
}
},
+ setVideoTimer(state, data) {
+ if (data) {
+ state.videoTimer = data;
+ // #ifdef H5
+ // window.sessionStorage.setItem('webViewUrl', data);
+ // #endif
+ }
+ },
//数据加载状态
setLoadingShow(state, data) {
if(state.loadingShow){
@@ -95,6 +104,7 @@ export const mutations = {
checkIapOrder(){
console.log('验证苹果支付未关闭订单')
}
+
};
export const actions = {
diff --git a/uni.scss b/uni.scss
index d30a750..3c7761b 100644
--- a/uni.scss
+++ b/uni.scss
@@ -67,66 +67,3 @@ $uni-font-size-subtitle:36upx;
$uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:30upx;
-
-
-
-/* 行为相关颜色 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色,如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
-/* 边框颜色 */
-$uni-border-color:#c8c7cc;
-
-/* 尺寸变量 */
-
-/* 文字尺寸 */
-$uni-font-size-sm:24rpx;
-$uni-font-size-base:28rpx;
-$uni-font-size-lg:32rpx;
-
-/* 图片尺寸 */
-$uni-img-size-sm:40rpx;
-$uni-img-size-base:52rpx;
-$uni-img-size-lg:80rpx;
-
-/* Border Radius */
-$uni-border-radius-sm: 4rpx;
-$uni-border-radius-base: 6rpx;
-$uni-border-radius-lg: 12rpx;
-$uni-border-radius-circle: 50%;
-
-/* 水平间距 */
-$uni-spacing-row-sm: 10px;
-$uni-spacing-row-base: 20rpx;
-$uni-spacing-row-lg: 30rpx;
-
-/* 垂直间距 */
-$uni-spacing-col-sm: 8rpx;
-$uni-spacing-col-base: 16rpx;
-$uni-spacing-col-lg: 24rpx;
-
-/* 透明度 */
-$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
-
-/* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40rpx;
-$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36rpx;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30rpx;
\ No newline at end of file
diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa
index 995d33e..c72b139 100644
Binary files a/unpackage/debug/iOS_debug.ipa and b/unpackage/debug/iOS_debug.ipa differ