zm/medicine_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并master后

Browse Source
This commit is contained in:
@fawn-nine
2024-09-09 14:16:48 +08:00
parent 195ba83a10 cebe7d7021
commit 5232171255
10 changed files with 3106 additions and 3129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.hbuilderx/launch.json
View File

@@ -24,7 +24,7 @@
"type" : "uni-app:app-ios" "type" : "uni-app:app-ios"
}, },
{ {
"playground" : "custom", "playground" : "standard",
"type" : "uni-app:app-android" "type" : "uni-app:app-android"
}, },
{ {

7
config/baseUrl.js
View File

@@ -6,17 +6,18 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/"; // socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式 baseUrl = "https://api.nuttyreading.com/"; // 线上正式
baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑 // baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
// baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑
// baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://59.110.212.44:9200/pb/";
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
// baseUrl = "http://192.168.110.110:9200/pb/"; // baseUrl = "http://192.168.110.110:9200/pb/";
// baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1
// socketUrl = "ws://8.129.186.35:6001/"; // socketUrl = "ws://8.129.186.35:6001/";
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {
// 生产环境11 // 生产环境11
// baseUrl = "http://59.110.212.44:9100/pb/"; // baseUrl = "http://59.110.212.44:9100/pb/";
// baseUrl = "https://testapi.nuttyreading.com/"; // baseUrl = "https://testapi.nuttyreading.com/";
// baseUrl = "http://192.168.110.110:9200/pb/";//磊哥
baseUrl = "https://api.nuttyreading.com/"; //1 baseUrl = "https://api.nuttyreading.com/"; //1
// baseUrl = "ws://twin-ui.com:6001/"; // baseUrl = "ws://twin-ui.com:6001/";
// socketUrl = "ws://twin-ui.com:6001/"; // socketUrl = "ws://twin-ui.com:6001/";

537
manifest.json
View File

@@ -1,273 +1,270 @@
{ {
"name" : "吴门医述", "name": "吴门医述",
"appid" : "__UNI__C7475A8", "appid": "__UNI__C7475A8",
"description" : "吴门医述", "description": "吴门医述",
"networkTimeout" : { "networkTimeout": {
"request" : 15000 "request": 15000
}, },
"transformPx" : false, "transformPx": false,
"icons" : [ "icons": [{
{ "sizes": "分辨率，192x192",
"sizes" : "分辨率，192x192", "src": "图片路径"
"src" : "图片路径" }],
} "versionName": "1.0.18",
], "versionCode": 1018,
"versionName" : "1.0.17", "app-plus": {
"versionCode" : 1017, "nvueCompiler": "weex",
"app-plus" : { "compatible": {
"nvueCompiler" : "weex", "ignoreVersion": true
"compatible" : { },
"ignoreVersion" : true "screenOrientation": [
}, "portrait-primary",
"screenOrientation" : [ "portrait-secondary",
"portrait-primary", "landscape-primary",
"portrait-secondary", "landscape-secondary"
"landscape-primary", ],
"landscape-secondary" "privacy": {
], "prompt": "template",
"privacy" : { "template": {
"prompt" : "template", "title": "用户协议和隐私政策",
"template" : { "message": "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://wumen.taihumed.com/agreement.html'>《用户协议》</a>和<a href='https://wumen.taihumed.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"title" : "用户协议和隐私政策", "buttonAccept": "同意",
"message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://wumen.taihumed.com/agreement.html'>《用户协议》</a>和<a href='https://wumen.taihumed.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", "buttonRefuse": "暂不同意"
"buttonAccept" : "同意", }
"buttonRefuse" : "暂不同意" },
} "modules": {
}, "Payment": {},
"modules" : { "Share": {},
"Payment" : {}, "Camera": {},
"Share" : {}, "OAuth": {},
"Camera" : {}, "VideoPlayer": {}
"OAuth" : {}, },
"VideoPlayer" : {} "distribute": {
}, "apple": {
"distribute" : { "devices": "universal"
"apple" : { },
"devices" : "universal" // "UIBackgroundModes" : [ "audio" ]
}, "android": {
// "UIBackgroundModes" : [ "audio" ] "permissionPhoneState": {
"android" : { "request": "none",
"permissionPhoneState" : { "prompt": "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
"request" : "none", },
"prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。" "permissionExternalStorage": {
}, "request": "none",
"permissionExternalStorage" : { "prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
"request" : "none", },
"prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。" "permissions": [
}, "<uses-feature android:name=\"android.hardware.camera\"/>",
"permissions" : [ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>", "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", ],
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
], "minSdkVersion": 21,
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "targetSdkVersion": 30,
"minSdkVersion" : 21, "schemes": "medicine"
"targetSdkVersion" : 30, },
"schemes" : "medicine" "sdkConfigs": {
}, "ad": {},
"sdkConfigs" : { "maps": {},
"ad" : {}, "share": {
"maps" : {}, "weixin": {
"share" : { "appid": "wx6b17b40171dea988",
"weixin" : { "UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
"appid" : "wx6b17b40171dea988", }
"UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/" },
} "payment": {
}, "alipay": {
"payment" : { "__platform__": ["ios", "android"]
"alipay" : { },
"__platform__" : [ "ios", "android" ] "appleiap": {},
}, "weixin": {
"appleiap" : {}, "__platform__": ["ios", "android"],
"weixin" : { "appid": "wx6b17b40171dea988",
"__platform__" : [ "ios", "android" ], "UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
"appid" : "wx6b17b40171dea988", }
"UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/" },
} "oauth": {},
}, "push": {}
"oauth" : {}, },
"push" : {} "splashscreen": {
}, "iosStyle": "common",
"splashscreen" : { "androidStyle": "default",
"iosStyle" : "common", "useOriginalMsgbox": true
"androidStyle" : "default", },
"useOriginalMsgbox" : true "ios": {
}, "dSYMs": false,
"ios" : { // "UIBackgroundModes" : [ "audio" ], // 背景播放音乐
"dSYMs" : false, "capabilities": {
// "UIBackgroundModes" : [ "audio" ], // 背景播放音乐 "entitlements": {
"capabilities" : { "com.apple.developer.associated-domains": ["applinks:verification.nuttyreading.com"]
"entitlements" : { }
"com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ] },
} "idfa": false,
}, "urltypes": "medicine",
"idfa" : false, "urlschemewhitelist": "nuttyreading,zmzm",
"urltypes" : "medicine", "privacyDescription": {
"urlschemewhitelist" : "nuttyreading,zmzm", "NSPhotoLibraryUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
"privacyDescription" : { "NSCameraUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
"NSPhotoLibraryUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用", "NSPhotoLibraryAddUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用"
"NSCameraUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用", }
"NSPhotoLibraryAddUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用" },
} "icons": {
}, "android": {
"icons" : { "hdpi": "unpackage/res/icons/72x72.png",
"android" : { "xhdpi": "unpackage/res/icons/96x96.png",
"hdpi" : "unpackage/res/icons/72x72.png", "xxhdpi": "unpackage/res/icons/144x144.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xxxhdpi": "unpackage/res/icons/192x192.png"
"xxhdpi" : "unpackage/res/icons/144x144.png", },
"xxxhdpi" : "unpackage/res/icons/192x192.png" "ios": {
}, "appstore": "unpackage/res/icons/1024x1024.png",
"ios" : { "ipad": {
"appstore" : "unpackage/res/icons/1024x1024.png", "app": "unpackage/res/icons/76x76.png",
"ipad" : { "app@2x": "unpackage/res/icons/152x152.png",
"app" : "unpackage/res/icons/76x76.png", "notification": "unpackage/res/icons/20x20.png",
"app@2x" : "unpackage/res/icons/152x152.png", "notification@2x": "unpackage/res/icons/40x40.png",
"notification" : "unpackage/res/icons/20x20.png", "proapp@2x": "unpackage/res/icons/167x167.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "settings": "unpackage/res/icons/29x29.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "settings@2x": "unpackage/res/icons/58x58.png",
"settings" : "unpackage/res/icons/29x29.png", "spotlight": "unpackage/res/icons/40x40.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "spotlight@2x": "unpackage/res/icons/80x80.png"
"spotlight" : "unpackage/res/icons/40x40.png", },
"spotlight@2x" : "unpackage/res/icons/80x80.png" "iphone": {
}, "app@2x": "unpackage/res/icons/120x120.png",
"iphone" : { "app@3x": "unpackage/res/icons/180x180.png",
"app@2x" : "unpackage/res/icons/120x120.png", "notification@2x": "unpackage/res/icons/40x40.png",
"app@3x" : "unpackage/res/icons/180x180.png", "notification@3x": "unpackage/res/icons/60x60.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "settings@2x": "unpackage/res/icons/58x58.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "settings@3x": "unpackage/res/icons/87x87.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "spotlight@2x": "unpackage/res/icons/80x80.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "spotlight@3x": "unpackage/res/icons/120x120.png"
"spotlight@2x" : "unpackage/res/icons/80x80.png", }
"spotlight@3x" : "unpackage/res/icons/120x120.png" }
} }
} },
} "compilerVersion": 3,
}, "nvueLaunchMode": "fast",
"compilerVersion" : 3, "splashscreen": {
"nvueLaunchMode" : "fast", "alwaysShowBeforeRender": false
"splashscreen" : { },
"alwaysShowBeforeRender" : false "nativePlugins": {},
}, "uniStatistics": {
"nativePlugins" : {}, "enable": true
"uniStatistics" : { },
"enable" : true "safearea": {
}, //安全区域配置，仅iOS平台生效
"safearea" : { "bottom": {
//安全区域配置，仅iOS平台生效 // 底部安全区域配置
"bottom" : { "offset": "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
// 底部安全区域配置 }
"offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none" }
} },
} // 5+App特有相关
}, "quickapp": {},
// 5+App特有相关 // 快应用特有相关
"quickapp" : {}, "mp-weixin": {
// 快应用特有相关 "setting": {
"mp-weixin" : { "urlCheck": false,
"setting" : { "es6": true,
"urlCheck" : false, "postcss": true,
"es6" : true, "minified": true
"postcss" : true, },
"minified" : true "usingComponents": true,
}, "appid": "wxd3ba52b7661b36be",
"usingComponents" : true, "permission": {
"appid" : "wxd3ba52b7661b36be", "scope.userLocation": {
"permission" : { "desc": "你的位置信息将用于小程序位置接口的效果展示"
"scope.userLocation" : { }
"desc" : "你的位置信息将用于小程序位置接口的效果展示" },
} "uniStatistics": {
}, "enable": true
"uniStatistics" : { }
"enable" : true },
} "h5": {
}, "template": "template.h5.html",
"h5" : { "router": {
"template" : "template.h5.html", "mode": "hash",
"router" : { "base": "/uniappDemo/"
"mode" : "hash", },
"base" : "/uniappDemo/" "optimization": {
}, "treeShaking": {
"optimization" : { "enable": true
"treeShaking" : { }
"enable" : true },
} "uniStatistics": {
}, "enable": true
"uniStatistics" : { }
"enable" : true },
} "_spaceID": "mp-3614b80b-2d75-4462-a481-4998f8187274",
}, "uniStatistics": {
"_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274", "version": "2",
"uniStatistics" : { "enable": true
"version" : "2", },
"enable" : true "mp-alipay": {
}, "uniStatistics": {
"mp-alipay" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "mp-baidu": {
}, "uniStatistics": {
"mp-baidu" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "mp-jd": {
}, "uniStatistics": {
"mp-jd" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "mp-kuaishou": {
}, "uniStatistics": {
"mp-kuaishou" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "mp-lark": {
}, "uniStatistics": {
"mp-lark" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "mp-qq": {
}, "uniStatistics": {
"mp-qq" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "mp-toutiao": {
}, "uniStatistics": {
"mp-toutiao" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "quickapp-webview-huawei": {
}, "uniStatistics": {
"quickapp-webview-huawei" : { "enable": true
"uniStatistics" : { }
"enable" : true },
} "quickapp-webview-union": {
}, "uniStatistics": {
"quickapp-webview-union" : { "enable": true
"uniStatistics" : { }
"enable" : true }
}
}
} }
// 小程序特有相关 // 小程序特有相关

BIN
node_modules.zip
View File

Binary file not shown.

121
pages/component/commonComponents/video/index.vue
View File

@@ -3,24 +3,24 @@
<view style="width: 100%; height: 200px"> <view style="width: 100%; height: 200px">
<view v-if="showCountDown" class="showCountDownd" style=""> <view v-if="showCountDown" class="showCountDownd" style="">
<view class=""> <view class="">
<text class="nextText">{{secondCountDown}} 秒后播放下一个视频</text><br/> <text class="nextText">{{secondCountDown}} 秒后播放下一个视频</text><br />
<view > <view>
<text class="cancelNext" @click="hideNextVideo">取消下一个</text> <text class="cancelNext" @click="hideNextVideo">取消下一个</text>
<!-- <text class="cancelNext" @click="replayVideo">重新播放</text> --> <!-- <text class="cancelNext" @click="replayVideo">重新播放</text> -->
</view> </view>
<!-- <view class="cancelNext" @click="hideNextVideo">重新播放</view> --> <!-- <view class="cancelNext" @click="hideNextVideo">重新播放</view> -->
</view> </view>
</view> </view>
<view v-if="show" <view v-if="show"
style="height: 100%;display: flex;align-items:center;justify-content:center;color: #fff;font-size: 38rpx;text-align: center;"> style="height: 100%;display: flex;align-items:center;justify-content:center;color: #fff;font-size: 38rpx;text-align: center;">
{{errorTxt}}</view> {{errorTxt}}
</view>
<div class="" v-else style="background-color: #000" ref="videoContent" @tap="renderScript.handleClick" <div class="" v-else style="background-color: #000" ref="videoContent" @tap="renderScript.handleClick"
id="url-player-test" :videoData="videoData" :winWidth="winWidth" :winHeight="winHeight" id="url-player-test" :videoData="videoData" :winWidth="winWidth" :winHeight="winHeight"
:currentVideoList="currentVideoList" :firstTime="firstTime" :isfresh="isfresh" :platform="platform" :currentVideoList="currentVideoList" :firstTime="firstTime" :isfresh="isfresh" :platform="platform"
:isSetFirstTime="isSetFirstTime" :isChange="isChange" :change:videoData="renderScript.receiveMsg" :isSetFirstTime="isSetFirstTime" :isChange="isChange" :change:videoData="renderScript.receiveMsg"
:replayVideoFlag="replayVideoFlag" :replayVideoFlag="replayVideoFlag" :change:winWidth="renderScript.receiveWinWidth"
:change:winWidth="renderScript.receiveWinWidth" :change:winHeight="renderScript.receiveWinHeight" :change:winHeight="renderScript.receiveWinHeight" :change:firstTime="renderScript.receiveFirstTime"
:change:firstTime="renderScript.receiveFirstTime"
:change:replayVideoFlag="renderScript.receiveReplayVideoFlag" :change:replayVideoFlag="renderScript.receiveReplayVideoFlag"
:change:isSetFirstTime="renderScript.receiveisSetFirstTime" :change:isSetFirstTime="renderScript.receiveisSetFirstTime"
:change:isfresh="renderScript.receiveIsfresh" :change:platform="renderScript.receiveplatform" :change:isfresh="renderScript.receiveIsfresh" :change:platform="renderScript.receiveplatform"
@@ -71,7 +71,7 @@
} from "vuex"; } from "vuex";
export default { export default {
props: ["currentVideo", "currentVideoList", "videoTitle",'secondCountDown'], props: ["currentVideo", "currentVideoList", "videoTitle", 'secondCountDown'],
data() { data() {
return { return {
reaquestFlag: false, reaquestFlag: false,
@@ -83,13 +83,13 @@
isChange: false, isChange: false,
isControl: true, isControl: true,
timer: null, timer: null,
replayVideoFlag:false, replayVideoFlag: false,
// secondCountDown: 5, // secondCountDown: 5,
showCountDown: false, showCountDown: false,
playEndBlank:false, playEndBlank: false,
// videoTitle: "", // videoTitle: "",
videoList: [], videoList: [],
replayVideoLock:false,// 重播操作锁 replayVideoLock: false, // 重播操作锁
firstTime: 0, firstTime: 0,
options: {}, options: {},
playAuth: "", playAuth: "",
@@ -142,22 +142,22 @@
}, },
methods: { methods: {
replayVideo(){ replayVideo() {
if(!this.replayVideoFlag){ if (!this.replayVideoFlag) {
this.getLive(true, this.currentVideo) this.getLive(true, this.currentVideo)
console.log('this.currentVideo',this.currentVideo.id); console.log('this.currentVideo', this.currentVideo.id);
this.hideNextVideo() this.hideNextVideo()
this.replayVideoFlag = true this.replayVideoFlag = true
} }
}, },
replayVideoFlagFalse(){ replayVideoFlagFalse() {
console.log('复原replayVideoFlag',this.replayVideoFlag); console.log('复原replayVideoFlag', this.replayVideoFlag);
this.replayVideoFlag = false this.replayVideoFlag = false
}, },
UnlockChangeVideo(){ UnlockChangeVideo() {
this.$emit('unlockChangeVideo') this.$emit('unlockChangeVideo')
}, },
hideNextVideo(){ hideNextVideo() {
this.showCountDown = false this.showCountDown = false
this.playEndBlank = false this.playEndBlank = false
this.$emit('hideNextVideo') this.$emit('hideNextVideo')
@@ -165,13 +165,15 @@
loadNextVideo() { loadNextVideo() {
this.playEndBlank = true this.playEndBlank = true
var _list = [...this.currentVideoList] var _list = [...this.currentVideoList]
_list = _list.map(item => { return item.id}) _list = _list.map(item => {
return item.id
})
var thisIndex = _list.findIndex(item=>{ var thisIndex = _list.findIndex(item => {
return item == this.currentVideo.id return item == this.currentVideo.id
}) })
console.log('播放列表',_list,this.currentVideo.id, thisIndex); console.log('播放列表', _list, this.currentVideo.id, thisIndex);
if(thisIndex < this.currentVideoList.length-1){ if (thisIndex < this.currentVideoList.length - 1) {
this.showCountDown = true this.showCountDown = true
this.$emit('startNextVideoCountDown') this.$emit('startNextVideoCountDown')
} }
@@ -233,7 +235,7 @@
this.videoId = this.options.video; this.videoId = this.options.video;
console.log("这是苹果视屏id", this.videoId); console.log("这是苹果视屏id", this.videoId);
await this.getLive(isChange,this.options); await this.getLive(isChange, this.options);
}, },
// 配置播放项 // 配置播放项
async getData(data, isChange) { async getData(data, isChange) {
@@ -303,7 +305,7 @@
}, },
// 获取播放凭证 // 获取播放凭证
async getLive(isChange, newVideoData) { async getLive(isChange, newVideoData) {
console.log('获取播放凭证',newVideoData.id); console.log('获取播放凭证11111111111111', newVideoData);
if (this.reaquestFlag) { if (this.reaquestFlag) {
uni.showToast({ uni.showToast({
title: '操作太快了,歇一下吧', title: '操作太快了,歇一下吧',
@@ -492,24 +494,24 @@
}, },
receiveReplayVideoFlag(newValue, oldValue, ownerVm, vm) { receiveReplayVideoFlag(newValue, oldValue, ownerVm, vm) {
console.log('newValue重新播放',newValue,myplayer); console.log('newValue重新播放', newValue, myplayer);
ReplayVideoFlag = newValue ReplayVideoFlag = newValue
if(newValue){ if (newValue) {
$('.videoContent8').click() $('.videoContent8').click()
// ReplayVideoFlag = newValue // ReplayVideoFlag = newValue
// // myplayer.replay() // // myplayer.replay()
// $('.videoContent7').click() // $('.videoContent7').click()
// myplayer.seek(0) // myplayer.seek(0)
// myplayer.play() // myplayer.play()
} }
}, },
emitReplayVideoFlagFalse(event, ownerInstance) { emitReplayVideoFlagFalse(event, ownerInstance) {
ownerInstance.callMethod('replayVideoFlagFalse') ownerInstance.callMethod('replayVideoFlagFalse')
}, },
emitUnlockChangeVideo(event, ownerInstance) { emitUnlockChangeVideo(event, ownerInstance) {
ownerInstance.callMethod('UnlockChangeVideo') ownerInstance.callMethod('UnlockChangeVideo')
}, },
async receiveFirstTime(newValue, oldValue, ownerVm, vm) { async receiveFirstTime(newValue, oldValue, ownerVm, vm) {
@@ -576,9 +578,9 @@
}, },
// renderjs阿里云播放器引入与配置 // renderjs阿里云播放器引入与配置
getLive() { getLive() {
console.log('这是这只只是666666:', this.firstTime, this.videoData) console.log('这是这只只是666666:', this.firstTime, this.videoData)
$('#url-player-test').empty(); $('#url-player-test').empty();
pauseTime = 0 pauseTime = 0
var fullScreenButtonComponent = Aliplayer.Component({ var fullScreenButtonComponent = Aliplayer.Component({
@@ -762,7 +764,7 @@
player.on('play', function() { player.on('play', function() {
console.log('开始播放------'); console.log('开始播放------');
$('.videoContent7').click() $('.videoContent7').click()
if(pauseTime > 0){ if (pauseTime > 0) {
player.seek(pauseTime); player.seek(pauseTime);
} }
}) })
@@ -772,14 +774,14 @@
// if(ReplayVideoFlag){ // if(ReplayVideoFlag){
// player.seek(0); // player.seek(0);
// }else{ // }else{
var videoDurationTimes = parseInt(player.getDuration()) var videoDurationTimes = parseInt(player.getDuration())
// var firstTime = parseInt(player.getCurrentTime()) // var firstTime = parseInt(player.getCurrentTime())
console.log('视频总长度',parseInt(player.getDuration()),parseInt(player.getCurrentTime())); console.log('视频总长度', parseInt(player.getDuration()), parseInt(player.getCurrentTime()));
if(videoData.firstTime < videoDurationTimes){ if (videoData.firstTime < videoDurationTimes) {
player.seek(videoData.firstTime); player.seek(videoData.firstTime);
}else{ } else {
player.seek(0); player.seek(0);
} }
//} //}
}) })
myplayer.on('playing', function() { myplayer.on('playing', function() {
@@ -874,7 +876,7 @@
videoData = newValue videoData = newValue
if (videoData) { if (videoData) {
return return
console.log('切换后的播放数据videoData',videoData.type); console.log('切换后的播放数据videoData', videoData.type);
if (videoData.type == 1) { if (videoData.type == 1) {
if (videoData.m3u8Url != '' && videoData.m3u8Url != null) { if (videoData.m3u8Url != '' && videoData.m3u8Url != null) {
// myplayer.source(videoData.m3u8Url) // myplayer.source(videoData.m3u8Url)
@@ -942,28 +944,39 @@
} }
</script> </script>
<style> <style>
.cancelNext{display: inline-block; margin-right: 20rpx; .cancelNext {
border-radius: 10rpx; margin-top: 10rpx; display: inline-block;
padding: 10rpx 20rpx !important; background-color: #fff !important; margin-right: 20rpx;
color: #000; text-align: center; line-height: 50rpx;} border-radius: 10rpx;
margin-top: 10rpx;
padding: 10rpx 20rpx !important;
background-color: #fff !important;
color: #000;
text-align: center;
line-height: 50rpx;
}
/* .cancelNext:last-child{margin-left: 10rpx;} */ /* .cancelNext:last-child{margin-left: 10rpx;} */
.nextText{} .nextText {}
.showCountDownd { .showCountDownd {
box-sizing: border-box; box-sizing: border-box;
height: 100%; width: 100%; background-color: rgba(0, 0, 0, 0.6); height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.6);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content:flex-end; justify-content: flex-end;
color: #fff; color: #fff;
font-size: 38rpx; font-size: 38rpx;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 0; right: 10rpx; top: 0;
right: 10rpx;
z-index: 4; z-index: 4;
text{
} text {}
} }

113
pages/course/courseDetail.vue
View File

@@ -4,6 +4,9 @@
<public-module></public-module> <public-module></public-module>
<!-- <z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"> --> <!-- <z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"> -->
<z-nav-bar title="课程介绍"> <z-nav-bar title="课程介绍">
<!-- <view class="curseSet" slot="right" @click="newOnShare">
<uni-icons type="redo" size="26"></uni-icons><text style="font-size: 26rpx;"></text> 分享课程
</view> -->
</z-nav-bar> </z-nav-bar>
<view class="contentBox commonPageContentBox"> <view class="contentBox commonPageContentBox">
@@ -49,11 +52,11 @@
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
" @click="isHideCourseInfo = !isHideCourseInfo"> ">
<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`" <view :class="`${isHideCourseInfo ? 'hidden2' : ''}`"
style="width: calc(100% - 50rpx); font-size: 30rpx;" v-html="course.content"> style="width: calc(100% - 50rpx); font-size: 30rpx;" v-html="course.content">
</view> </view>
<text <text @click="isHideCourseInfo = !isHideCourseInfo"
style=" style="
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@@ -69,7 +72,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 小班入口 --> <!-- 小班入口 -->
<view class="classEntrance" v-if="linkClassList.length > 0"> <view class="classEntrance" v-if="linkClassList.length > 0">
<view class="flex_box" style="justify-content: space-between;"> <view class="flex_box" style="justify-content: space-between;">
<view class="flex_box classTitleBox"> <view class="flex_box classTitleBox">
@@ -475,7 +478,25 @@
fatherIndex: null, fatherIndex: null,
supportFlag: false, supportFlag: false,
selectGoodsData: {}, selectGoodsData: {},
buyOptions: [],
buyOptions: [
// {
// icon: 'chat',
// text: '客服'
// },
// {
// icon: 'shop',
// text: '店铺',
// // info: 2,
// infoBackgroundColor: '#007aff',
// infoColor: "#f5f5f5"
// },
// {
// icon: 'cart',
// text: '购物车',
// info: 2
// }
],
customButtonGroup1: [{ customButtonGroup1: [{
with: 200, with: 200,
text: "立即购买", text: "立即购买",
@@ -502,13 +523,13 @@
console.log(e, "传入分类id"); console.log(e, "传入分类id");
this.getUserInfo(); this.getUserInfo();
this.courseId = e.id; this.courseId = e.id;
// this.getCateList(this.courseId)
// await this.getData(e.id); // await this.getData(e.id);
this.getSayList(); this.getSayList();
this.getOS() this.getOS()
}, },
onPageScroll(e) { onPageScroll(e) {
this.scrollTop = e.scrollTop; this.scrollTop = e.scrollTop;
if (this.scrollTop > 500) { if (this.scrollTop > 500) {
@@ -594,6 +615,31 @@
}) })
}) })
}, },
getClassList(){
$http.request({
url: '/common/class/getClassByUser',
method: "POST",
data: {
"courseId": this.courseId
},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
},
})
.then(res => {
this.classInfo = {}
console.log('获取班级列表',res.result);
if(res.code == 0 && res.result != null){
if(res.result.id){
this.classInfo = res.result
}
}
console.log('获取班级列表++++++',this.classList);
}).catch(e => {
console.log('获取班级列表失败',e);
this.classInfo = {}
});
},
// 获得操作系统 // 获得操作系统
getOS() { getOS() {
let oprateOs = ""; let oprateOs = "";
@@ -692,7 +738,7 @@
v.isAudition == 1 && this.userMsg.vip == 0 && this.librayList[this.curIndex].isBuy == 0 ? v.isAudition == 1 && this.userMsg.vip == 0 && this.librayList[this.curIndex].isBuy == 0 ?
noRecored = true : '' noRecored = true : ''
uni.navigateTo({ uni.navigateTo({
url: `${_myurl}?courseId=${this.course.id}&navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&noRecored=${noRecored}`, url: `${_myurl}?navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&noRecored=${noRecored}`,
}); });
} else { } else {
this.$commonJS.showToast("请先购买课程"); this.$commonJS.showToast("请先购买课程");
@@ -746,7 +792,6 @@
this.getCourseDescriptionData(); this.getCourseDescriptionData();
// this.$commonJS.showToast(""); // this.$commonJS.showToast("");
} }
this.$forceUpdate(); this.$forceUpdate();
}); });
} else { } else {
@@ -1013,31 +1058,6 @@
console.log("提交报错", e); console.log("提交报错", e);
}); });
}, },
getClassList(){
$http.request({
url: '/common/class/getClassByUser',
method: "POST",
data: {
"courseId": this.courseId
},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
},
})
.then(res => {
this.classInfo = {}
console.log('获取班级列表',res.result);
if(res.code == 0){
if(res.result.id){
this.classInfo = res.result
}
}
console.log('获取班级列表++++++',this.classList);
}).catch(e => {
console.log('获取班级列表失败',e);
this.classInfo = {}
});
},
// 查询课程的评论 // 查询课程的评论
getSayList() { getSayList() {
this.status = 1; this.status = 1;
@@ -1215,9 +1235,7 @@
this.courseList = []; this.courseList = [];
// console.log("at line 1167:", "调用了几次"); // console.log("at line 1167:", "调用了几次");
var that = this; var that = this;
uni.showLoading({
title:'正在加载'
})
await $http await $http
.request({ .request({
url: "sociology/course/getCourseDetail", url: "sociology/course/getCourseDetail",
@@ -1303,10 +1321,8 @@
// console.log("list at line 1233:", list); // console.log("list at line 1233:", list);
} }
} }
uni.hideLoading()
}) })
.catch((e) => { .catch((e) => {
uni.hideLoading()
console.log(e, "获取目录数据报错"); console.log(e, "获取目录数据报错");
}); });
}, },
@@ -1434,10 +1450,10 @@
}); });
}, },
goClassLIst(url, id,title){ goClassLIst(url, id,title){
uni.navigateTo({ uni.navigateTo({
url: `${url}?courseId=${id}&courseTitle=${title}`, url: `${url}?courseId=${id}&courseTitle=${title}`,
}); });
}, },
}, },
}; };
</script> </script>
@@ -1477,7 +1493,7 @@
} }
img { img {
max-width: 260rpx; width: 20px;
} }
.u-upload__button { .u-upload__button {
@@ -1514,12 +1530,14 @@
.contentBox { .contentBox {
width: calc(100% - 60rpx); width: calc(100% - 60rpx);
// img{width: 100rpx !important;
// height: 100rpx !important;}
} }
// .img{ width: 60rpx; .img{ width: 60rpx;
// height: 60rpx; height: 60rpx;
// image{width:60rpx; height: 60rpx; border-radius: 100%;} image{width:60rpx; height: 60rpx; border-radius: 100%;}
// } }
} }
.chooseImgType { .chooseImgType {
@@ -2147,8 +2165,9 @@
color: #333; color: #333;
// background-color: #f0f0f0; // background-color: #f0f0f0;
// margin-bottom: 10rpx; // margin-bottom: 10rpx;
}
}
::v-deep .prof img{ width: 100px; height: 100px;}
.catalogueTitle { .catalogueTitle {
justify-content: space-between; justify-content: space-between;
overflow: hidden; overflow: hidden;

12
pages/goods/order/index.vue
View File

@@ -1012,6 +1012,7 @@
}, },
}) })
.then(async (res) => { .then(async (res) => {
this.buyingFlag = false
console.log("res at line 598:", res); console.log("res at line 598:", res);
if (res.code == 0) { if (res.code == 0) {
if (res.orderSn == null) { if (res.orderSn == null) {
@@ -1042,7 +1043,6 @@
}); });
console.log(res, "支付支付"); console.log(res, "支付支付");
if (res.success) { if (res.success) {
this.buyingFlag = false
uni.showToast({ uni.showToast({
title: "支付成功", title: "支付成功",
}); });
@@ -1062,7 +1062,7 @@
}, 1000); }, 1000);
} else { } else {
console.log("失败失败失败"); console.log("失败失败失败");
this.buyingFlag = false // this.buyingFlag = false
// that.$commonJS.showToast('支付是失败') // that.$commonJS.showToast('支付是失败')
setTimeout(() => { setTimeout(() => {
console.log("延迟调用 失败提示"); console.log("延迟调用 失败提示");
@@ -1091,7 +1091,7 @@
}; };
setWXPay(data1, (res) => { setWXPay(data1, (res) => {
if (res.success) { if (res.success) {
this.buyingFlag = false // this.buyingFlag = false
uni.showToast({ uni.showToast({
title: "支付成功", title: "支付成功",
}); });
@@ -1111,7 +1111,7 @@
} }
}, 1000); }, 1000);
} else { } else {
this.buyingFlag = false // this.buyingFlag = false
console.log(res, "微信支付111111111111111"); console.log(res, "微信支付111111111111111");
if (res.data.errMsg.indexOf("User canceled") != -1) { if (res.data.errMsg.indexOf("User canceled") != -1) {
uni.showToast({ uni.showToast({
@@ -1129,7 +1129,7 @@
} }
}); });
} else if (this.payType == 4) { } else if (this.payType == 4) {
this.buyingFlag = false // this.buyingFlag = false
// 天医币支付 // 天医币支付
uni.showToast({ uni.showToast({
title: "购买成功", title: "购买成功",
@@ -1149,6 +1149,8 @@
} }
} }
} }
}).catch(e => {
this.buyingFlag = false
}); });
}, },

1821
pages/mine/vip/index.vue
View File

File diff suppressed because it is too large Load Diff

3544
pages/mine/vip/order.vue
View File

File diff suppressed because it is too large Load Diff

2
pages/miniClass/paperBack.vue
View File

@@ -94,7 +94,7 @@
</template> </template>
<script> <script>
const paperBack = require('@/data/paperBack.json') // const paperBack = require('@/data/paperBack.json')
import $http from '@/config/requestConfig.js'; import $http from '@/config/requestConfig.js';
import { import {
mapState mapState