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/";

343
manifest.json
View File

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

BIN
node_modules.zip
View File

Binary file not shown.

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

@@ -3,8 +3,8 @@
<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>
@@ -13,14 +13,14 @@
</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,9 +494,9 @@
}, },
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()
@@ -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);
} }
}) })
@@ -774,10 +776,10 @@
// }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);
} }
//} //}
@@ -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 {}
} }

105
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, "获取目录数据报错");
}); });
}, },
@@ -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
}); });
}, },

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

@@ -10,55 +10,35 @@
--> -->
</z-nav-bar> </z-nav-bar>
<view <view class="contentBox commonPageContentBox" :style="`margin-top: ${
class="contentBox commonPageContentBox"
:style="`margin-top: ${
(40 + statusBarHeight) * 2 (40 + statusBarHeight) * 2
}rpx;height: calc(100% - ${(50 + statusBarHeight) * 2}rpx) !important;`" }rpx;height: calc(100% - ${(50 + statusBarHeight) * 2}rpx) !important;`">
>
<view class="flash_sale_content"> <view class="flash_sale_content">
<scroll-view scroll-y="true" class="scroll-Y" style=""> <scroll-view scroll-y="true" class="scroll-Y" style="">
<view <view class="scroll-view-item flash_sale_content_item color_shandow" v-for="(v, i) in dataList"
class="scroll-view-item flash_sale_content_item color_shandow" :style="`background:${v.background ? v.background : '#f6f6f6'};`">
v-for="(v, i) in dataList" <view class="book_name PM_font" v-html="v.title" :style="`background: ${v.color};
:style="`background:${v.background ? v.background : '#f6f6f6'};`"
>
<view
class="book_name PM_font"
v-html="v.title"
:style="`background: ${v.color};
;-webkit-background-clip: text; ;-webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
`" `"></view>
></view>
<view class="vip_content"> <view class="vip_content">
<view class="vip_image_box" <view class="vip_image_box">
><image <image class="vip_image" src="@/static/icon/quanyi.png" mode="aspectFit">
class="vip_image" </image>
src="@/static/icon/quanyi.png" </view>
mode="aspectFit"
>
</image
></view>
<view class="qunyi_box"> <view class="qunyi_box">
<view style="height: auto"> <view style="height: auto">
<view class="item" <view v-for="(item, index1) in v.quanyi" :style="item.style" v-html="item.name">
v-for="(item, index1) in v.quanyi" </view>
:style="item.style" </view>
v-html="item.name"
></view
></view>
</view> </view>
<!-- buttonbg --> <!-- buttonbg -->
</view> </view>
<view class="vip_list vip_button_list"> <view class="vip_list vip_button_list">
<view <view @click="openorderModal(item)" v-for="(item, index) in v.list" class="vip_button"
@click="openorderModal(item)" :style="`background:${v.buttonbg ? v.buttonbg : '#f6f6f6'};`">
v-for="(item, index) in v.list" <view style="max-width: 200rpx">{{ item.title }}</view>
class="vip_button"
:style="`background:${v.buttonbg ? v.buttonbg : '#f6f6f6'};`"
><view style="max-width: 200rpx">{{ item.title }}</view>
<view style="margin: 0 5rpx">￥{{ item.lastFee }}</view> <view style="margin: 0 5rpx">￥{{ item.lastFee }}</view>
</view> </view>
</view> </view>
@@ -68,18 +48,12 @@
</view> </view>
<u-popup :show="orderModalShow" mode="bottom" :round="20"> <u-popup :show="orderModalShow" mode="bottom" :round="20">
<view class="orderModalShow popup_box"> <view class="orderModalShow popup_box">
<u-icon <u-icon name="close" color="#333" size="18" @click="closeOrderModalShow" style="
name="close"
color="#333"
size="18"
@click="closeOrderModalShow"
style="
display: inline-block; display: inline-block;
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
top: 20rpx; top: 20rpx;
" "></u-icon>
></u-icon>
<orderPay ref="orderPay" :dataInfo="selectVipData"></orderPay> <orderPay ref="orderPay" :dataInfo="selectVipData"></orderPay>
<!-- <view class="goods_nav_box"> <!-- <view class="goods_nav_box">
<uni-goods-nav <uni-goods-nav
@@ -97,11 +71,13 @@
</template> </template>
<script> <script>
import list from "@/pages/component/commonComponents/list"; import list from "@/pages/component/commonComponents/list";
import orderPay from "./order.vue"; import orderPay from "./order.vue";
import $http from "@/config/requestConfig.js"; import $http from "@/config/requestConfig.js";
import { mapState } from "vuex"; import {
export default { mapState
} from "vuex";
export default {
components: { components: {
list, list,
orderPay, orderPay,
@@ -110,43 +86,52 @@ export default {
return { return {
selectVipData: {}, selectVipData: {},
orderModalShow: false, orderModalShow: false,
superQuanyi: [ superQuanyi: [{
{ name: "众妙之门视频", name: "众妙之门视频",
// style: { style: {
// color: "#2D38F4", color: "#2D38F4",
// }, },
}, },
{ {
name: "吴门医述视频", name: "吴门医述视频",
}, },
{ name: "专属视频视听" }, {
name: "专属视频视听"
},
{ {
name: "读书相关权益", name: "读书相关权益",
// style: { style: {
// color: "#2D38F4", color: "#2D38F4",
// }, },
},
{
name: "活动报名折扣价<text style='color:red'>(更优惠)</text>"
}, },
{ name: "活动报名折扣价<text style='color:red'>(更优惠)</text>" },
], ],
sociologyQuanyi: [ sociologyQuanyi: [{
// { name: "-",
// name: "-", style: {
// style: { color: "#fafafa",
// color: "#b0b0b0", },
// }, },
// }, {
{ name: "吴门医述视频" }, name: "吴门医述视频"
{ name: "专属视频视听" }, },
{
name: "专属视频视听"
},
// { {
// name: "-", name: "-",
// style: { style: {
// color: "#b0b0b0", color: "#fafafa",
// }, },
// }, },
{ name: "活动报名折扣价" }, {
name: "活动报名折扣价"
},
], ],
isLoadingHide: false, isLoadingHide: false,
@@ -277,8 +262,7 @@ export default {
width: "120rpx", width: "120rpx",
}, },
background: "rgb(255 255 255 / 85%)", background: "rgb(255 255 255 / 85%)",
buttonbg: buttonbg: "linear-gradient(to right, #3F7FC9 0%,#D3EEFC 100%) ",
"linear-gradient(to right, #3F7FC9 0%,#D3EEFC 100%) ",
// titleBackground: // titleBackground:
// "linear-gradient(130deg, rgb(153, 202, 192) 0%, rgb(192, 223, 207) 50%)", // "linear-gradient(130deg, rgb(153, 202, 192) 0%, rgb(192, 223, 207) 50%)",
color: "linear-gradient(130deg,rgb(45, 56, 244) 0%, #72AD92 100%)", color: "linear-gradient(130deg,rgb(45, 56, 244) 0%, #72AD92 100%)",
@@ -286,7 +270,7 @@ export default {
quanyi: this.superQuanyi, quanyi: this.superQuanyi,
}); });
} else if (i == "sociology" || i == "sociology_hd") { } else if (i == "sociology" || i == "sociology_hd") {
console.log('i+++++++++++++++++',i) console.log('i+++++++++++++++++', i)
this.dataList.push({ this.dataList.push({
title: "吴门医述VIP", title: "吴门医述VIP",
key: "sociology", key: "sociology",
@@ -504,8 +488,7 @@ export default {
if (res.code == 0 && res.result.length >= 0) { if (res.code == 0 && res.result.length >= 0) {
this.twoCateList = res.result; this.twoCateList = res.result;
if (this.curOneCateIndex == 0) { if (this.curOneCateIndex == 0) {
this.twoCateList = [ this.twoCateList = [{
{
dictType: "1", dictType: "1",
dictValue: "学术思想", dictValue: "学术思想",
}, },
@@ -520,8 +503,7 @@ export default {
]; ];
} }
if (this.curOneCateIndex == 2) { if (this.curOneCateIndex == 2) {
this.twoCateList = [ this.twoCateList = [{
{
dictType: "1", dictType: "1",
dictValue: "吴门之歌", dictValue: "吴门之歌",
}, },
@@ -536,8 +518,7 @@ export default {
]; ];
} }
if (this.curOneCateIndex == 3) { if (this.curOneCateIndex == 3) {
this.twoCateList = [ this.twoCateList = [{
{
dictType: "1", dictType: "1",
dictValue: "学术贡献", dictValue: "学术贡献",
}, },
@@ -566,7 +547,7 @@ export default {
await uni await uni
.createSelectorQuery() .createSelectorQuery()
.select(".cateList") .select(".cateList")
.boundingClientRect(function (rect) { .boundingClientRect(function(rect) {
console.log(rect.height, "22222"); console.log(rect.height, "22222");
var height = 42 + rect.height + 20; var height = 42 + rect.height + 20;
@@ -591,7 +572,9 @@ export default {
transformData(inputData) { transformData(inputData) {
const result = {}; const result = {};
inputData.forEach((item) => { inputData.forEach((item) => {
const { letter } = item; const {
letter
} = item;
if (!result[letter]) { if (!result[letter]) {
result[letter] = []; result[letter] = [];
} }
@@ -662,7 +645,7 @@ export default {
urls: [url], urls: [url],
longPressActions: { longPressActions: {
itemList: ["很抱歉，暂不支持保存图片到本地"], itemList: ["很抱歉，暂不支持保存图片到本地"],
success: function (res) { success: function(res) {
// console.log(res,'+++++') // console.log(res,'+++++')
}, },
}, },
@@ -756,16 +739,17 @@ export default {
plus.key.hideSoftKeybord(); plus.key.hideSoftKeybord();
// #endif // #endif
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/style/mixin.scss"; @import "@/style/mixin.scss";
.commonPageBox { .commonPageBox {
height: 100vh !important; height: 100vh !important;
} }
.vipBox {
.vipBox {
font-size: 28rpx !important; font-size: 28rpx !important;
background-repeat: no-repeat; background-repeat: no-repeat;
display: flex; display: flex;
@@ -773,90 +757,96 @@ export default {
overflow: hidden; overflow: hidden;
background-size: 100% 100%; background-size: 100% 100%;
background-image: url("@/static/icon/vipbg.png"); background-image: url("@/static/icon/vipbg.png");
} }
.u-grid-list { .u-grid-list {
// height: 40rpx; // height: 40rpx;
} }
.searchList { .searchList {
.item { .item {
font-size: 28rpx; font-size: 28rpx;
padding: 20rpx; padding: 20rpx;
border-bottom: 1px solid #dadbde; border-bottom: 1px solid #dadbde;
} }
} }
.scroll-view_H { .scroll-view_H {
background-color: #fff; background-color: #fff;
white-space: nowrap; white-space: nowrap;
padding: 10rpx; padding: 10rpx;
} }
.scroll-Y { .scroll-Y {
height: 100%; height: 100%;
} }
.scroll-view_H { .scroll-view_H {
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
} }
.scroll-view-item { .scroll-view-item {
display: inline-block; display: inline-block;
// height: 300rpx; // height: 300rpx;
// line-height: 300rpx; // line-height: 300rpx;
// text-align: center; // text-align: center;
// font-size: 36rpx; // font-size: 36rpx;
} }
.scroll-view-item_H { .scroll-view-item_H {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
// height: 300rpx; // height: 300rpx;
// line-height: 300rpx; // line-height: 300rpx;
// text-align: center; // text-align: center;
// font-size: 36rpx; // font-size: 36rpx;
} }
.titleList { .titleList {
height: 100%; height: 100%;
} }
.titleList2 { .titleList2 {
height: calc(100% - 170rpx); height: calc(100% - 170rpx);
} }
.commonPageContentBox {
.commonPageContentBox {
// min-height: 100% !important; // min-height: 100% !important;
} }
.related_courses_name {
.related_courses_name {
display: inline-block; display: inline-block;
float: left; float: left;
line-height: 60rpx; line-height: 60rpx;
width: calc(100% - 90rpx) !important; width: calc(100% - 90rpx) !important;
padding-left: 20rpx; padding-left: 20rpx;
font-weight: 700; font-weight: 700;
.aui-text-danger { .aui-text-danger {
display: inline-block; display: inline-block;
float: right; float: right;
} }
} }
.vip_image_box {
.vip_image_box {
@include themFlex(center, center); @include themFlex(center, center);
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.vip_image {
.vip_image {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
// float: left; // float: left;
} }
/deep/.list_item {
/deep/.list_item {
.rightArrow { .rightArrow {
margin-top: 10rpx !important; margin-top: 10rpx !important;
} }
} }
.flash_sale_content { .flash_sale_content {
width: 100%; width: 100%;
display: flex; display: flex;
overflow: hidden; overflow: hidden;
@@ -867,11 +857,12 @@ export default {
.flash_sale_content_item { .flash_sale_content_item {
width: auto; width: auto;
min-width: 47%; min-width: 47%;
min-height: 56%; min-height: 48%;
margin: 10rpx !important; margin: 10rpx !important;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
.vip_content { .vip_content {
width: 100%; width: 100%;
height: calc(100% - 80rpx); height: calc(100% - 80rpx);
@@ -910,8 +901,9 @@ export default {
// text-overflow: ellipsis; // text-overflow: ellipsis;
white-space: wrap; white-space: wrap;
} }
} }
.vip_button_list {
.vip_button_list {
width: 100%; width: 100%;
max-height: 200rpx; max-height: 200rpx;
// @include themFlex(center, space-between); // @include themFlex(center, space-between);
@@ -924,6 +916,7 @@ export default {
bottom: 20rpx; bottom: 20rpx;
left: 0; left: 0;
width: 100%; width: 100%;
// justify-content: center; // justify-content: center;
// flex-direction: column; // flex-direction: column;
.vip_button { .vip_button {
@@ -942,6 +935,7 @@ export default {
// line-height: 80rpx; // line-height: 80rpx;
margin-top: 20rpx; margin-top: 20rpx;
white-space: wrap; white-space: wrap;
view { view {
display: flex; display: flex;
line-height: 30rpx; line-height: 30rpx;
@@ -949,11 +943,13 @@ export default {
justify-content: center; justify-content: center;
} }
} }
.vip_button:first-child { .vip_button:first-child {
margin-top: 0 !important; margin-top: 0 !important;
} }
} }
.qunyi_box {
.qunyi_box {
height: calc(100% - 280rpx); height: calc(100% - 280rpx);
color: #333; color: #333;
font-weight: bold; font-weight: bold;
@@ -961,11 +957,20 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.item{line-height: 60rpx; text-align: center; padding: 0 10rpx; border: 1px solid #64bec5; border-radius: 50rpx; margin-bottom: 20rpx;}
} .item {
.popup_box { line-height: 60rpx;
text-align: center;
padding: 0 10rpx;
border: 1px solid #64bec5;
border-radius: 50rpx;
margin-bottom: 20rpx;
}
}
.popup_box {
max-height: 95vh; max-height: 95vh;
overflow: auto; overflow: auto;
} }
</style> </style>

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

@@ -1,8 +1,5 @@
<template> <template>
<view <view class="container commonDetailPage" style="background-color: #fff !important">
class="container commonDetailPage"
style="background-color: #fff !important"
>
<!-- 公共组件-每个页面必须引入 --> <!-- 公共组件-每个页面必须引入 -->
<view class="contentBox commonPageContentBox order_box"> <view class="contentBox commonPageContentBox order_box">
@@ -10,90 +7,49 @@
<view class="pay_title">支付方式</view> <view class="pay_title">支付方式</view>
<view style="margin-bottom: 20rpx"> <view style="margin-bottom: 20rpx">
<u-tag <u-tag :text="`已选：${dataInfo.title}`" bgColor="#DCF2FA" borderColor="#DCF2FA" color="#258feb"
:text="`已选：${dataInfo.title}`" plain></u-tag>
bgColor="#DCF2FA"
borderColor="#DCF2FA"
color="#258feb"
plain
></u-tag>
</view> </view>
<view <view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payList">
class="curriulum_title_box goods_item pay_item"
v-for="(v, i) in payList" :key="i"
>
<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'"> <view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
<view class="left"> <view class="left">
<image <image class="pay_item_img" :src="v.imgUrl" mode="aspectFil" :style="v.style">
class="pay_item_img"
:src="v.imgUrl"
mode="aspectFil"
:style="v.style"
>
</image> </image>
<template v-if="v.type == 4"> <template v-if="v.type == 4">
<text> {{ v.text }}</text> <text> {{ v.text }}</text>
<text <text style="color: #258feb; font-weight: 600; margin-left: 10rpx">
style="color: #258feb; font-weight: 600; margin-left: 10rpx"
>
(余额：{{ (余额：{{
initData && initData.user ? initData.user.peanutCoin : 0 initData && initData.user ? initData.user.peanutCoin : 0
}})</text }})</text>
>
</template> </template>
<text v-else> {{ v.text }}</text> <text v-else> {{ v.text }}</text>
</view> </view>
<template v-if="isDefaultCurrency"> <template v-if="isDefaultCurrency">
<radio <radio v-if="i == 2" :value="v.value" color="#258feb"
v-if="i == 2" :checked="selectPayIndex == i ? true : false" @click="radioChange(i)" size="10" />
:value="v.value"
color="#258feb"
:checked="selectPayIndex == i ? true : false"
@click="radioChange(i)"
size="10"
/>
</template> </template>
<template v-else> <template v-else>
<radio <radio :value="v.value" color="#258feb" :checked="selectPayIndex == i ? true : false"
:value="v.value" @click="radioChange(i)" size="10" />
color="#258feb"
:checked="selectPayIndex == i ? true : false"
@click="radioChange(i)"
size="10"
/>
</template> </template>
</view> </view>
</view> </view>
<template v-if="selectPayIndex == 2"> <template v-if="selectPayIndex == 2">
<view <view class="goods_detail_list_title bg_box_shandow color_shandow bg_color">
class="goods_detail_list_title bg_box_shandow color_shandow bg_color" <view class="linlanzhifu" style="
>
<view
class="linlanzhifu"
style="
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
justify-content: space-between; justify-content: space-between;
" ">
>
<view class="linlanzhifu"> <view class="linlanzhifu">
<u-icon <u-icon name="error-circle" color="#258feb" size="20"
name="error-circle" style="display: inline-block; margin-right: 10rpx"></u-icon>
color="#258feb"
size="20"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
确保您的天医币足够支付 确保您的天医币足够支付
</view> </view>
<text <text class="fdButtonBox aui-text-danger fdButtonBoxRed" style="float: right"
class="fdButtonBox aui-text-danger fdButtonBoxRed" @click="onPageJump('/pages/mine/wallet/recharge/index?source=order')">立即充值</text>
style="float: right"
@click="onPageJump('/pages/mine/wallet/recharge/index?source=order')"
>立即充值</text
>
</view> </view>
<view class="other_info" style="margin-top: 12rpx"> <view class="other_info" style="margin-top: 12rpx">
@@ -101,9 +57,7 @@
<view class="explain"> 1. 1天医币 = 1元人民币 </view> <view class="explain"> 1. 1天医币 = 1元人民币 </view>
<view class="explain"> <view class="explain">
2.若有疑问或意见请致电客服 2.若有疑问或意见请致电客服
<span style="font-size: 15px" <span style="font-size: 15px"><u @click="gotoPhone">022-24142321</u></span>
><u @click="gotoPhone">022-24142321</u></span
>
</view> </view>
<view class="explain"> <view class="explain">
<!-- 3.非中国大陆用户可通过paypal账户支付 <!-- 3.非中国大陆用户可通过paypal账户支付
@@ -116,21 +70,14 @@
3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！ 3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱 支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
<text <text @click="fnCopy('publisher@tmrjournals.com', '邮箱')" class="aui-text-success"
@click="fnCopy('publisher@tmrjournals.com', '邮箱')" style="text-decoration: underline; color: #258feb">
class="aui-text-success"
style="text-decoration: underline; color: #258feb"
>
publisher@tmrjournals.com publisher@tmrjournals.com
</text> </text>
（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（ （点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
<text <text class="aui-text-success" @click="fnCopy('yilujiankangkefu', '微信名')"
class="aui-text-success" style="text-decoration: underline; color: #258feb">
@click="fnCopy('yilujiankangkefu', '微信名')" yilujiankangkefu </text>）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
style="text-decoration: underline; color: #258feb"
>
yilujiankangkefu </text
>）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
</view> </view>
</view> </view>
</view> </view>
@@ -138,29 +85,19 @@
</view> </view>
<template> <template>
<common-sticky <common-sticky label="title" :itemStyle="`width:${
label="title"
:itemStyle="`width:${
cateList.length == 2 ? '50' : '33' cateList.length == 2 ? '50' : '33'
}%;padding-left: 15px; padding-right: 15px; height: 68rpx;`" }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`" :list="cateList"
:list="cateList" :currentCateIndex="currentCateIndex" @handleselectCate="handleselectCate">
:currentCateIndex="currentCateIndex"
@handleselectCate="handleselectCate"
>
</common-sticky> </common-sticky>
</template> </template>
</view> </view>
<view class="goods_nav_box"> <view class="goods_nav_box">
<common-goods-nav <common-goods-nav :iconList="[]" :customButton="customButton" @submit="goBuyJie">
:iconList="[]"
:customButton="customButton"
@submit="goBuyJie"
>
<!-- leftSlot --> <!-- leftSlot -->
<template slot="leftSlot" slot-scope="slotProps"> <template slot="leftSlot" slot-scope="slotProps">
<view class="price_box order_bottom_box"> <view class="price_box order_bottom_box">
<text class="price" <text class="price">合计：
>合计：
<text class="total">￥{{ dataInfo.lastFee }}</text> <text class="total">￥{{ dataInfo.lastFee }}</text>
</text> </text>
@@ -179,12 +116,20 @@
</template> </template>
<script> <script>
import courseDescription from "@/pages/component/commonComponents/list"; import courseDescription from "@/pages/component/commonComponents/list";
import { setPay, setPayAssign, setWXPay } from "@/config/utils"; import {
import $http from "@/config/requestConfig.js"; setPay,
const { platform } = uni.getSystemInfoSync(); setPayAssign,
import { mapState } from "vuex"; setWXPay
export default { } from "@/config/utils";
import $http from "@/config/requestConfig.js";
const {
platform
} = uni.getSystemInfoSync();
import {
mapState
} from "vuex";
export default {
props: ["dataInfo"], props: ["dataInfo"],
components: { components: {
courseDescription, //课程说明 courseDescription, //课程说明
@@ -232,8 +177,7 @@ export default {
}, },
selectPayIndex: 1, selectPayIndex: 1,
farePrice: 0, farePrice: 0,
payList: [ payList: [{
{
text: "支付宝", text: "支付宝",
imgUrl: require("@/static/icon/pay_1.png"), imgUrl: require("@/static/icon/pay_1.png"),
type: 2, type: 2,
@@ -316,22 +260,18 @@ export default {
addressList: "common/userAddress/getUserAddress", addressList: "common/userAddress/getUserAddress",
freightNum: "book/buyOrder/calculateTransportPrice", //运费 freightNum: "book/buyOrder/calculateTransportPrice", //运费
}, },
customButton: [ customButton: [{
{
width: "160rpx", width: "160rpx",
text: "立即支付", text: "立即支付",
backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)", backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
color: "#fff", color: "#fff",
}, }, ],
], customButtonGroup1: [{
customButtonGroup1: [
{
with: 200, with: 200,
text: "确定", text: "确定",
backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)", backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
color: "#fff", color: "#fff",
}, }, ],
],
}; };
}, },
async onLoad(options) { async onLoad(options) {
@@ -370,7 +310,7 @@ export default {
async onShow() { async onShow() {
console.log("调用了onShow方法"); console.log("调用了onShow方法");
var that = this; var that = this;
await uni.$on("returnData", function (data) { await uni.$on("returnData", function(data) {
console.log("data at line 415:", data); console.log("data at line 415:", data);
if (data) { if (data) {
that.addressData = { that.addressData = {
@@ -413,8 +353,7 @@ export default {
}, },
async initPrepareOrder() { async initPrepareOrder() {
this.priceBreakdownList = [ this.priceBreakdownList = [{
{
text: "商品总价", text: "商品总价",
imgUrl: "", imgUrl: "",
type: 1, type: 1,
@@ -558,10 +497,10 @@ export default {
// quantity: this.cartList[i].productAmount, // quantity: this.cartList[i].productAmount,
// }); // });
// } // }
if(this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee){ if (this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee) {
uni.showToast({ uni.showToast({
title:'天医币余额不足', title: '天医币余额不足',
icon:'none' icon: 'none'
}) })
return return
} }
@@ -607,10 +546,9 @@ export default {
title: "正在支付", title: "正在支付",
icon: "loading", icon: "loading",
}); });
await setPay( await setPay({
{
typePay: "alipay", typePay: "alipay",
subject: "order", subject: "vip",
totalAmount: res.money, totalAmount: res.money,
type: 2, type: 2,
relevanceoid: res.orderSn, relevanceoid: res.orderSn,
@@ -754,8 +692,7 @@ export default {
} }
this.modalInfo = { this.modalInfo = {
title: "提示信息", title: "提示信息",
content: content: "用户您好，该课程已到期，通过支付" +
"用户您好，该课程已到期，通过支付" +
fee + fee +
"元，本门课程可获得" + "元，本门课程可获得" +
days + days +
@@ -970,8 +907,7 @@ export default {
// curriculumInfo // curriculumInfo
this.detailInfo = { this.detailInfo = {
content: content: "<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png' ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
"<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png' ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
}; };
// this.$http // this.$http
@@ -1116,7 +1052,9 @@ export default {
transformData(inputData) { transformData(inputData) {
const result = {}; const result = {};
inputData.forEach((item) => { inputData.forEach((item) => {
const { letter } = item; const {
letter
} = item;
if (!result[letter]) { if (!result[letter]) {
result[letter] = []; result[letter] = [];
} }
@@ -1187,7 +1125,7 @@ export default {
urls: [url], urls: [url],
longPressActions: { longPressActions: {
itemList: ["很抱歉，暂不支持保存图片到本地"], itemList: ["很抱歉，暂不支持保存图片到本地"],
success: function (res) { success: function(res) {
// console.log(res,'+++++') // console.log(res,'+++++')
}, },
}, },
@@ -1281,17 +1219,19 @@ export default {
plus.key.hideSoftKeybord(); plus.key.hideSoftKeybord();
// #endif // #endif
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/style/mixin.scss"; @import "@/style/mixin.scss";
.pay_title {
.pay_title {
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
.order_box {
.order_box {
padding: 20rpx; padding: 20rpx;
.order_top { .order_top {
@@ -1332,42 +1272,42 @@ export default {
} }
} }
} }
} }
.u-grid-list { .u-grid-list {
// height: 40rpx; // height: 40rpx;
} }
.flexbox { .flexbox {
display: flex; display: flex;
} }
.dataList { .dataList {
height: 100%; height: 100%;
} }
.titleList2 { .titleList2 {
height: calc(100% - 150rpx); height: calc(100% - 150rpx);
} }
.priceDetail { .priceDetail {
height: calc(100% - 180rpx) !important; height: calc(100% - 180rpx) !important;
padding: 0rpx 0; padding: 0rpx 0;
box-sizing: border-box; box-sizing: border-box;
} }
.componentPage { .componentPage {
height: calc(100% - 90rpx) !important; height: calc(100% - 90rpx) !important;
} }
.dateReminder { .dateReminder {
width: 100%; width: 100%;
font-size: 24rpx; font-size: 24rpx;
text-align: right; text-align: right;
line-height: 40rpx; line-height: 40rpx;
} }
.fdButtonBox { .fdButtonBox {
border: 1rpx solid $themeColor; border: 1rpx solid $themeColor;
background-color: $themeColor; background-color: $themeColor;
color: #fff; color: #fff;
@@ -1383,14 +1323,14 @@ export default {
// margin-top: 20rpx; // margin-top: 20rpx;
// display: flex; // display: flex;
// align-items: center; // align-items: center;
} }
.commonDetailPage { .commonDetailPage {
padding: 0 !important; padding: 0 !important;
padding-bottom: 150rpx !important; padding-bottom: 150rpx !important;
} }
.goods_box { .goods_box {
background-color: #fff; background-color: #fff;
// margin-top: 20rpx; // margin-top: 20rpx;
// padding: 40rpx 30rpx; // padding: 40rpx 30rpx;
@@ -1423,36 +1363,36 @@ export default {
box-sizing: border-box; box-sizing: border-box;
} }
} }
} }
.dataList { .dataList {
background-color: #fff !important; background-color: #fff !important;
padding: 0 30rpx 40rpx !important; padding: 0 30rpx 40rpx !important;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/.titleItem { /deep/.titleItem {
// width: calc(100% - 120rpx) !important; // width: calc(100% - 120rpx) !important;
} }
/deep/.scroll-view-item:nth-child(2n-1) { /deep/.scroll-view-item:nth-child(2n-1) {
background-color: transparent !important; background-color: transparent !important;
} }
.dataList { .dataList {
height: auto !important; height: auto !important;
} }
.related_courses_box { .related_courses_box {
background-color: #fff; background-color: #fff;
.small_class_teaching_content { .small_class_teaching_content {
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
box-sizing: border-box; box-sizing: border-box;
} }
} }
.related_courses_name { .related_courses_name {
display: inline-block; display: inline-block;
width: calc(100% - 150rpx) !important; width: calc(100% - 150rpx) !important;
@@ -1460,9 +1400,9 @@ export default {
display: inline-block; display: inline-block;
float: right; float: right;
} }
} }
.original_price { .original_price {
font-size: 28rpx !important; font-size: 28rpx !important;
font-weight: 500; font-weight: 500;
color: #999 !important; color: #999 !important;
@@ -1470,9 +1410,9 @@ export default {
text-decoration: line-through; text-decoration: line-through;
float: left; float: left;
margin-top: 6rpx; margin-top: 6rpx;
} }
.price { .price {
width: auto; width: auto;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
@@ -1480,29 +1420,29 @@ export default {
margin-right: 10rpx; margin-right: 10rpx;
color: #333; color: #333;
// font-family: PangMenZhengDaoBiaoTiTiMianFeiBan; // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
} }
.price_box { .price_box {
width: auto; width: auto;
overflow: hidden; overflow: hidden;
margin-top: 10rpx; margin-top: 10rpx;
} }
.commonTags { .commonTags {
margin-right: 20rpx; margin-right: 20rpx;
margin-top: -5rpx !important; margin-top: -5rpx !important;
} }
.sales_number { .sales_number {
text-decoration: none; text-decoration: none;
color: #b0b0b0; color: #b0b0b0;
font-weight: 500; font-weight: 500;
} }
// .common_curriculum_list{ // .common_curriculum_list{
// } // }
/deep/.common_curriculum_list { /deep/.common_curriculum_list {
margin-top: 20rpx; margin-top: 20rpx;
padding: 20rpx 20rpx 20rpx; padding: 20rpx 20rpx 20rpx;
@@ -1536,14 +1476,14 @@ export default {
.content_item:nth-child(1) { .content_item:nth-child(1) {
border-top: none !important; border-top: none !important;
} }
} }
/deep/.common_section { /deep/.common_section {
padding: 0 !important; padding: 0 !important;
padding-bottom: 20rpx !important; padding-bottom: 20rpx !important;
} }
.goods_detail_list_title { .goods_detail_list_title {
display: block; display: block;
padding-top: 20rpx; padding-top: 20rpx;
padding-bottom: 40rpx; padding-bottom: 40rpx;
@@ -1558,8 +1498,7 @@ export default {
// color: #aaa; // color: #aaa;
color: #5a5a5a; color: #5a5a5a;
.explain { .explain {}
}
} }
.left { .left {
@@ -1575,13 +1514,13 @@ export default {
} }
// justify-content: space-between; // justify-content: space-between;
} }
.commonPageContentBox { .commonPageContentBox {
height: auto !important; height: auto !important;
} }
.minus { .minus {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
border-width: 2rpx; border-width: 2rpx;
@@ -1599,15 +1538,15 @@ export default {
@include flex; @include flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.input { .input {
padding: 0 10px; padding: 0 10px;
height: 50rpx; height: 50rpx;
border: 1rpx solid #e6e6e6; border: 1rpx solid #e6e6e6;
} }
.plus { .plus {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
border-width: 2rpx; border-width: 2rpx;
@@ -1624,9 +1563,9 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: $themeColor; color: $themeColor;
} }
.order_bottom_box { .order_bottom_box {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
@@ -1642,9 +1581,9 @@ export default {
color: red; color: red;
} }
} }
} }
/deep/.goods_nav_box { /deep/.goods_nav_box {
.left { .left {
margin-top: -10rpx; margin-top: -10rpx;
width: calc(100% - 180rpx); width: calc(100% - 180rpx);
@@ -1652,21 +1591,21 @@ export default {
position: relative; position: relative;
// overflow: hidden; // overflow: hidden;
} }
} }
.explain { .explain {
word-wrap: break-word; word-wrap: break-word;
word-break: normal; word-break: normal;
word-break: break-all; //会断词 word-break: break-all; //会断词
// white-space: nowrap; // white-space: nowrap;
} }
.order_bottom_box { .order_bottom_box {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.pay_box { .pay_box {
.pay_item { .pay_item {
border-bottom: 1rpx solid #eeecec; border-bottom: 1rpx solid #eeecec;
padding-top: 20rpx; padding-top: 20rpx;
@@ -1723,14 +1662,14 @@ export default {
/deep/.pay_item:nth-last-child(1) { /deep/.pay_item:nth-last-child(1) {
border-bottom: none !important; border-bottom: none !important;
} }
} }
.linlanzhifu { .linlanzhifu {
font-size: 28rpx; font-size: 28rpx;
line-height: 24rpx; line-height: 24rpx;
} }
.address_box { .address_box {
// padding: 20rpx; // padding: 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -1786,22 +1725,22 @@ export default {
// position: absolute; // position: absolute;
// right: 30rpx; // right: 30rpx;
} }
} }
.rightArrow { .rightArrow {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
// position: absolute; // position: absolute;
// right: 30rpx; // right: 30rpx;
} }
.orderModalShow { .orderModalShow {
width: 100%; width: 100%;
max-height: 48vh; max-height: 48vh;
padding-bottom: 120rpx; padding-bottom: 120rpx;
} }
.popup_box { .popup_box {
.curriulum_title_box { .curriulum_title_box {
.title { .title {
text-align: center; text-align: center;
@@ -1810,24 +1749,25 @@ export default {
margin-bottom: 60rpx !important; margin-bottom: 60rpx !important;
} }
} }
} }
.hasRemark { .hasRemark {
color: #333 !important; color: #333 !important;
font-size: 40rpx !important; font-size: 40rpx !important;
} }
.bgGrey { .bgGrey {
// background-color: #f5f5f5; // background-color: #f5f5f5;
} }
.pay_info {
.pay_info {
margin-bottom: 60rpx; margin-bottom: 60rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
/deep/.commonDetailPage { /deep/.commonDetailPage {
height: 100vh !important; height: 100vh !important;
} }
</style> </style>

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