This commit is contained in:
2024-09-09 11:21:05 +08:00
parent 85c2782b8a
commit cebe7d7021
7 changed files with 5686 additions and 5503 deletions

View File

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

View File

@@ -6,7 +6,8 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
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://192.168.110.100:9100/pb/"; // 开发用电脑
@@ -17,7 +18,8 @@ if (process.env.NODE_ENV === 'development') {
// 生产环境11
// baseUrl = "http://59.110.212.44:9100/pb/";
// baseUrl = "https://testapi.nuttyreading.com/";
baseUrl = "https://api.nuttyreading.com/"; //1
baseUrl = "http://192.168.110.110:9200/pb/";//磊哥
// baseUrl = "https://api.nuttyreading.com/"; //1
// baseUrl = "ws://twin-ui.com:6001/";
// socketUrl = "ws://twin-ui.com:6001/";
}

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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