Commit deb2cfed authored by mengcuiguang's avatar mengcuiguang

代码优化

parent d8f2e1fd
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
</view> </view>
</view> </view>
<text class="trialStyle" v-show="hintText!=null&&hintText!=''">
{{hintText}}
</text>
<view style="display: flex;flex-direction: column;align-items: center;"> <view style="display: flex;flex-direction: column;align-items: center;">
<view style="font-size: 24rpx;color: gray;margin-top: 16rpx;margin-bottom: 18rpx;"> <view style="font-size: 24rpx;color: gray;margin-top: 16rpx;margin-bottom: 18rpx;">
订单中如有疑问,请在个人中心联系客服</view> 订单中如有疑问,请在个人中心联系客服</view>
...@@ -107,6 +111,7 @@ ...@@ -107,6 +111,7 @@
agreeFlag: false, agreeFlag: false,
userBean: {}, userBean: {},
agreementDto: null, agreementDto: null,
hintText: '',
os: 'android', os: 'android',
titleText: '超多精彩小说一键解锁', titleText: '超多精彩小说一键解锁',
showClone: false showClone: false
...@@ -153,11 +158,11 @@ ...@@ -153,11 +158,11 @@
success: ({ success: ({
data data
}) => { }) => {
console.log("agreement=",data.agreement); console.log("agreement=", data.agreement);
if(data.agreement==undefined){ if (data.agreement == undefined) {
console.log("agreement=22222"); console.log("agreement=22222");
this.agreementDto = null; this.agreementDto = null;
}else{ } else {
this.agreementDto = data.agreement; this.agreementDto = data.agreement;
} }
...@@ -184,7 +189,7 @@ ...@@ -184,7 +189,7 @@
}, },
choosePack(item, index) { choosePack(item, index) {
this.selectedIndex = index; this.selectedIndex = index;
this.hintText = this.vipList[this.selectedIndex].trailRemark;
this.handlePay(); this.handlePay();
}, },
handlePay() { handlePay() {
...@@ -380,4 +385,15 @@ ...@@ -380,4 +385,15 @@
} }
} }
} }
.trialStyle {
display: flex;
align-items: center;
font-size: 30rpx;
color: gainsboro;
margin: 20rpx;
word-wrap: break-word;
word-break: break-all;
white-space: pre-line;
}
</style> </style>
\ No newline at end of file
{ {
"name": "reader", "name" : "reader",
"appid": "__UNI__F7F50FF", "appid" : "__UNI__F7F50FF",
"description": "", "description" : "",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": 1000, "versionCode" : 1000,
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
"compatible": { "compatible" : {
"ignoreVersion": true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持
}, },
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": false, "waiting" : false,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules": { "modules" : {
"Payment": {} "Payment" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
...@@ -36,186 +36,184 @@ ...@@ -36,186 +36,184 @@
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>" "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
], ],
"permissionExternalStorage": { "permissionExternalStorage" : {
"request": "none", "request" : "none",
"prompt": "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。" "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
}, },
"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
"autoSdkPermissions": true, "autoSdkPermissions" : true,
"schemes": "" "schemes" : ""
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": { "ios" : {
"idfa": false, "idfa" : false,
"privacyDescription": { "privacyDescription" : {
"NSPhotoLibraryUsageDescription": "您在完成实名认证的过程中需要上传相关证件照片,故需获取您的相册读取权限。", "NSPhotoLibraryUsageDescription" : "您在完成实名认证的过程中需要上传相关证件照片,故需获取您的相册读取权限。",
"NSCameraUsageDescription": "您在完成实名认证的过程中需要上传相关证件照片,故需获取您的拍照权限。", "NSCameraUsageDescription" : "您在完成实名认证的过程中需要上传相关证件照片,故需获取您的拍照权限。",
"NSPhotoLibraryAddUsageDescription": "用于APP日常运行过程中文件存储与读取,包括但不限于上传下载、日志文件等。" "NSPhotoLibraryAddUsageDescription" : "用于APP日常运行过程中文件存储与读取,包括但不限于上传下载、日志文件等。"
}, },
"urltypes": "twofiveone" "urltypes" : "twofiveone"
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": { "sdkConfigs" : {
"share": { "share" : {
"weixin": { "weixin" : {
"appid": "", "appid" : "",
"UniversalLinks": "" "UniversalLinks" : ""
} }
}, },
"oauth": {}, "oauth" : {},
"ad": {}, "ad" : {},
"payment": { "payment" : {
"weixin": { "weixin" : {
"__platform__": ["ios", "android"], "__platform__" : [ "ios", "android" ],
"appid": "wxaa277a94b5a33c63", "appid" : "wxaa277a94b5a33c63",
"UniversalLinks": "" "UniversalLinks" : ""
} }
}, },
"speech": {} "speech" : {}
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "", "hdpi" : "",
"xhdpi": "", "xhdpi" : "",
"xxhdpi": "", "xxhdpi" : "",
"xxxhdpi": "" "xxxhdpi" : ""
}, },
"ios": { "ios" : {
"appstore": "", "appstore" : "",
"ipad": { "ipad" : {
"app": "", "app" : "",
"app@2x": "", "app@2x" : "",
"notification": "", "notification" : "",
"notification@2x": "", "notification@2x" : "",
"proapp@2x": "", "proapp@2x" : "",
"settings": "", "settings" : "",
"settings@2x": "", "settings@2x" : "",
"spotlight": "", "spotlight" : "",
"spotlight@2x": "" "spotlight@2x" : ""
}, },
"iphone": { "iphone" : {
"app@2x": "", "app@2x" : "",
"app@3x": "", "app@3x" : "",
"notification@2x": "", "notification@2x" : "",
"notification@3x": "", "notification@3x" : "",
"settings@2x": "", "settings@2x" : "",
"settings@3x": "", "settings@3x" : "",
"spotlight@2x": "", "spotlight@2x" : "",
"spotlight@3x": "" "spotlight@3x" : ""
} }
} }
}, },
"splashscreen": { "splashscreen" : {
"androidStyle": "default", "androidStyle" : "default",
"useOriginalMsgbox": true, "useOriginalMsgbox" : true,
"alwaysShowBeforeRender": false, "alwaysShowBeforeRender" : false,
"autoclose": false, "autoclose" : false,
"waiting": false, "waiting" : false,
"delay": 0, "delay" : 0,
"iosStyle": "common", "iosStyle" : "common",
"android": { "android" : {
"hdpi": "", "hdpi" : "",
"xhdpi": "", "xhdpi" : "",
"xxhdpi": "" "xxhdpi" : ""
}, },
"ios": { "ios" : {
"storyboard": "unpackage/res/splash/LaunchScreen.storyboard_.zip" "storyboard" : "unpackage/res/splash/LaunchScreen.storyboard_.zip"
} }
} }
}, },
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wx17fe9416bd3f1244", "appid" : "wx17fe9416bd3f1244",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"es6": false, "es6" : false,
"postcss": true, "postcss" : true,
"minified": true "minified" : true
}, },
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
}, },
"optimization": { "optimization" : {
"subPackages": true "subPackages" : true
}, },
"navigateToMiniProgramAppldList": [ "navigateToMiniProgramAppldList" : [ "wxbd687630cd02ce1d" ],
"wxbd687630cd02ce1d" "lazyCodeLoading" : "requiredComponents" // 依赖按需注入
],
"lazyCodeLoading": "requiredComponents" // 依赖按需注入
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true, "usingComponents" : true,
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"appid": "" "appid" : ""
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false, "enable" : false,
"version": "2" "version" : "2"
}, },
"vueVersion": "2", "vueVersion" : "2",
"h5": { "h5" : {
"optimization": { "optimization" : {
"treeShaking": { "treeShaking" : {
"enable": true "enable" : true
} }
}, },
"title": "小说", "title" : "小说",
"router": { "router" : {
"base": "./" "base" : "./"
}, },
"uniStatistics": { "uniStatistics" : {
"enable": true "enable" : true
} }
}, },
"mp-jd": { "mp-jd" : {
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"mp-kuaishou": { "mp-kuaishou" : {
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"mp-lark": { "mp-lark" : {
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"mp-qq": { "mp-qq" : {
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"quickapp-webview-huawei": { "quickapp-webview-huawei" : {
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
}, },
"quickapp-webview-union": { "quickapp-webview-union" : {
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
} }
} }
} }
...@@ -233,3 +231,4 @@ ...@@ -233,3 +231,4 @@
// }, // },
// "https" : true // "https" : true
// } // }
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<view class="name row" :class="[{active2: index==selectedIndex}]"> <view class="name row" :class="[{active2: index==selectedIndex}]">
{{item.title}} {{item.title}}
</view> </view>
<view class="price row" :class="[{active1: index==selectedIndex},{price2:item.firstPayPrice<=0}]"> <view class="price row"
:class="[{active1: index==selectedIndex},{price2:item.firstPayPrice<=0}]">
<view style="font-size: 50rpx;">{{item.firstPayPrice<=0 ? '' : '¥'}}</view> <view style="font-size: 50rpx;">{{item.firstPayPrice<=0 ? '' : '¥'}}</view>
{{item.firstPayPrice<=0 ? '免费试用' : item.firstPayPrice}} {{item.firstPayPrice<=0 ? '免费试用' : item.firstPayPrice}}
</view> </view>
...@@ -41,6 +42,10 @@ ...@@ -41,6 +42,10 @@
</view> </view>
</view> </view>
<text class="trialStyle" v-show="hintText!=null&&hintText!=''">
{{hintText}}
</text>
<view class="agreementWrp"> <view class="agreementWrp">
<checkbox-group @change="checkboxChange" style="width: 50rpx;"> <checkbox-group @change="checkboxChange" style="width: 50rpx;">
...@@ -82,6 +87,7 @@ ...@@ -82,6 +87,7 @@
os: 'android', os: 'android',
checked: false, checked: false,
agreementDto: null, agreementDto: null,
hintText: ''
} }
}, },
methods: { methods: {
...@@ -117,6 +123,7 @@ ...@@ -117,6 +123,7 @@
}, },
choosePack(item, index) { choosePack(item, index) {
this.selectedIndex = index; this.selectedIndex = index;
this.hintText = this.vipList[this.selectedIndex].trailRemark;
}, },
handleUnsign() { handleUnsign() {
if (this.agreementDto) { if (this.agreementDto) {
...@@ -274,7 +281,7 @@ ...@@ -274,7 +281,7 @@
display: inline-block; display: inline-block;
.active { .active {
background-color: #FEF8F5; background-color: #FEEDD0;
border: 4rpx solid #FDEADC !important; border: 4rpx solid #FDEADC !important;
} }
...@@ -406,4 +413,15 @@ ...@@ -406,4 +413,15 @@
} }
} }
} }
.trialStyle {
display: flex;
align-items: center;
font-size: 30rpx;
color: gainsboro;
margin: 20rpx;
word-wrap: break-word;
word-break: break-all;
white-space: pre-line;
}
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment