merge
This commit is contained in:
唐明明
2
App.vue
2
App.vue
@@ -14,7 +14,7 @@
|
||||
title : "更新提示",
|
||||
content : res.note || '版本更新信息',
|
||||
confirmText : "更新",
|
||||
showCancel : false,
|
||||
showCancel : true,
|
||||
success : modalRes => {
|
||||
if (modalRes.confirm) {
|
||||
if (plus.os.name == "Android") {
|
||||
|
||||
@@ -10,8 +10,8 @@ import router from '../router'
|
||||
|
||||
// 基础配置
|
||||
const config = {
|
||||
// apiUrl : 'https://api.gongli.vip/api/', // 正式环境
|
||||
apiUrl : 'http://api.gl.shangkelian.cn/api/', // 测试
|
||||
apiUrl : 'https://api.gongli.vip/api/', // 正式环境
|
||||
// apiUrl : 'http://api.gl.shangkelian.cn/api/', // 测试
|
||||
timeout : 60000
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
<!-- 设置支付密码 -->
|
||||
<view class="password">
|
||||
<view class="prompt">
|
||||
<view class="prompt-code">验证码已发送至{{phone}} <button size="mini" :disabled="getCodeState" @click="getCode">{{sendCode}}</button></view>
|
||||
<view class="prompt-code">验证码已发送至{{phone}}
|
||||
<!-- <button size="mini" :disabled="getCodeState" @click="getCode">{{sendCode}}</button> -->
|
||||
</view>
|
||||
<view>请设置6位数字密码。建议不要使用连续的数字。</view>
|
||||
</view>
|
||||
<view class="group">
|
||||
@@ -40,7 +42,7 @@
|
||||
return {
|
||||
sendCode : '获取验证码',
|
||||
canGet : true,
|
||||
getCodeState: false,
|
||||
getCodeState: true,
|
||||
phone : '',
|
||||
code : '',
|
||||
password : '',
|
||||
@@ -58,7 +60,7 @@
|
||||
|
||||
// 获取验证码
|
||||
getCode(){
|
||||
let smsTime = 3;
|
||||
let smsTime = 60;
|
||||
getSms().then(res => {
|
||||
this.canGet = false
|
||||
uni.showToast({
|
||||
@@ -225,6 +227,7 @@
|
||||
width: 100%;
|
||||
.time{
|
||||
padding:20rpx 30rpx 20rpx 20rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,319 +1,391 @@
|
||||
<template>
|
||||
<view class="capacity">
|
||||
<view class="capacity-title">共力分总产率/小时<text>{{baseHour}}GLF/h</text></view>
|
||||
<view class="capacity-sbutitle">总产率=角色产率+团队产率+共建产率+共力值产率</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">我的角色</view>
|
||||
<view class="nickname">{{nickname}}</view>
|
||||
</view>
|
||||
<view class="capacity-block-glf ">{{identityText}}:{{base}}GLF/h</view>
|
||||
</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">成员产率({{group.effect}}/{{group.count}})<text</text></view>
|
||||
<view class="capacity-block-glf">{{group.capacity}}GLF/h</view>
|
||||
<!-- <view class="more" @click="onInvitation">邀请更多好友</view> -->
|
||||
</view>
|
||||
<view class="capacity-block-table pt30">
|
||||
<view class="header">
|
||||
<view class="flex-item">家族成员产率</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{recommend.vip}}人在线(会员)</view>
|
||||
<view class="flex-item">{{recommend.vip_text}}</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{recommend.novip}}人在线(普通用户)</view>
|
||||
<view class="flex-item">{{recommend.novip_text}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="capacity-block-table">
|
||||
<view class="header">
|
||||
<view class="flex-item">伙伴成员</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{partner.vip}}人在线(会员)</view>
|
||||
<view class="flex-item">{{partner.vip_text}}</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{partner.novip}}人在线(普通用户)</view>
|
||||
<view class="flex-item">{{partner.novip_text}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">共建产率<text>{{build.capacity}}GLF/h</text></view>
|
||||
<view class="subtitle">{{build.current}}/{{build.max}}</view>
|
||||
</view>
|
||||
<view class="capacity-block-text ">产品当前设置共建者每日可以通过看广告获得共建值（暂未开放，敬请期待）</view>
|
||||
</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">共力值产率<text>{{together.capacity}}GLF/h</text></view>
|
||||
<view class="subtitle">{{together.current}}/{{together.max}}</view>
|
||||
</view>
|
||||
<view class="capacity-block-text ">根据正常用户的使用在平台的使用习惯，购物等行为产生对应共力值（暂未开放，敬请期待）</view>
|
||||
</view>
|
||||
<view class="capacity-block" v-for="(item,index) in other" :keys='index'>
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">{{item.title}}</view>
|
||||
<view class="capacity-block-glf">{{item.capacity}}GLF/h</view>
|
||||
</view>
|
||||
<view class="capacity-block-text " v-if="item.remark">{{item.remark}}</view>
|
||||
</view>
|
||||
<view class="capacity-hint"> 用户须知：用户所产生共力分，在每日结算时，平台会扣除30%的共力分用于平台运营使用。 </view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { glz } from '@/apis/interfaces/life.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
identityText: '普通用户',
|
||||
baseHour : 0,
|
||||
base : 0,
|
||||
group : {
|
||||
count : 0,
|
||||
effect : 0,
|
||||
capacity: 0,
|
||||
},
|
||||
nickname : '',
|
||||
recommend : {
|
||||
vip : '-',
|
||||
vip_count : '-',
|
||||
novip : '-',
|
||||
novip_count : '-',
|
||||
vip_text : '-',
|
||||
novip_text : '-',
|
||||
},
|
||||
partner : {
|
||||
vip : '-',
|
||||
vip_count : '-',
|
||||
novip : '-',
|
||||
novip_count : '-',
|
||||
vip_text : '-',
|
||||
novip_text : '-',
|
||||
},
|
||||
build:{},
|
||||
together:{},
|
||||
other:{}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
uni.showLoading({})
|
||||
glz().then(res => {
|
||||
this.nickname = res.nickname
|
||||
this.identityText = res.identity_text
|
||||
this.baseHour = res.base_hour
|
||||
this.base = res.base
|
||||
this.group = res.group
|
||||
this.recommend = res.recommend
|
||||
this.partner = res.partner
|
||||
this.build = res.build
|
||||
this.together = res.together
|
||||
this.other = res.other
|
||||
uni.setNavigationBarTitle({
|
||||
title: res.glz + 'GLF'
|
||||
})
|
||||
uni.hideLoading()
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
title: err.message,
|
||||
icon : 'none'
|
||||
})
|
||||
})
|
||||
},
|
||||
onNavigationBarButtonTap() {
|
||||
uni.showModal({
|
||||
title:'温馨提示',
|
||||
content:'重置签到只重新计算24小时时间，所迭代加成的比例不变',
|
||||
confirmColor:'#34CE98',
|
||||
confirmText:'立即重置',
|
||||
cancelColor:'#999',
|
||||
cancelText:'再想想',
|
||||
success: (res) => {
|
||||
if(res.confirm){
|
||||
console.log('再次签到。。。')
|
||||
this.checkIMEI().then(res => {
|
||||
switch (res) {
|
||||
case 'Permanent':
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '签到功能需使用您的电话状态和网络信息，请在手机设置中权限开启您的权限',
|
||||
showCancel: false,
|
||||
})
|
||||
break;
|
||||
case 'Temporary':
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '签到功能需使用您的电话状态和网络信息，请点击设置开启应用权限',
|
||||
cancelText: '获取权限',
|
||||
confirmText: '稍后再说',
|
||||
success: e => {
|
||||
if (e.cancel) {
|
||||
this.checkIMEI().then(IMEI => {
|
||||
if (IMEI === 'Success') {
|
||||
this.showAd()
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
break;
|
||||
case 'Success':
|
||||
this.showAd()
|
||||
break;
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
onInvitation(){
|
||||
this.$Router.push({name: 'Invitation'})
|
||||
},
|
||||
// imei权限
|
||||
checkIMEI() {
|
||||
// 检查imei权限
|
||||
return new Promise((resolve, reject) => {
|
||||
if (plus.os.name == "Android") {
|
||||
plus.android.requestPermissions(['android.permission.READ_PHONE_STATE'], (e) => {
|
||||
if (e.deniedAlways.length > 0) {
|
||||
resolve('Permanent');
|
||||
}
|
||||
if (e.deniedPresent.length > 0) {
|
||||
resolve('Temporary');
|
||||
}
|
||||
if (e.granted.length > 0) {
|
||||
resolve('Success');
|
||||
}
|
||||
}, (e) => {
|
||||
uni.showToast({
|
||||
title: JSON.stringify(e),
|
||||
icon: 'none'
|
||||
})
|
||||
})
|
||||
return
|
||||
}
|
||||
reject('非安卓设备');
|
||||
<template>
|
||||
<view class="capacity">
|
||||
<view class="capacity-title">共力分总产率/小时<text>{{baseHour}}GLF/h</text></view>
|
||||
<view class="capacity-sbutitle">总产率=角色产率+团队产率+共建产率+共力值产率</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">我的角色</view>
|
||||
<view class="nickname">{{nickname}}</view>
|
||||
</view>
|
||||
<view class="capacity-block-glf ">{{identityText}}:{{base}}GLF/h</view>
|
||||
</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">成员产率({{group.effect}}/{{group.count}})<text< /text>
|
||||
</view>
|
||||
<view class="capacity-block-glf">{{group.capacity}}GLF/h</view>
|
||||
<!-- <view class="more" @click="onInvitation">邀请更多好友</view> -->
|
||||
</view>
|
||||
<view class="capacity-block-table pt30">
|
||||
<view class="header">
|
||||
<view class="flex-item">家族成员产率</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{recommend.vip}}人在线(会员)</view>
|
||||
<view class="flex-item">{{recommend.vip_text}}</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{recommend.novip}}人在线(普通用户)</view>
|
||||
<view class="flex-item">{{recommend.novip_text}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="capacity-block-table">
|
||||
<view class="header">
|
||||
<view class="flex-item">伙伴成员</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{partner.vip}}人在线(会员)</view>
|
||||
<view class="flex-item">{{partner.vip_text}}</view>
|
||||
</view>
|
||||
<view class="flex">
|
||||
<view class="flex-item">{{partner.novip}}人在线(普通用户)</view>
|
||||
<view class="flex-item">{{partner.novip_text}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">共建产率<text>{{build.capacity}}GLF/h</text></view>
|
||||
<view class="subtitle">{{build.current}}/{{build.max}}</view>
|
||||
</view>
|
||||
<view class="capacity-block-text ">产品当前设置共建者每日可以通过看广告获得共建值（暂未开放，敬请期待）</view>
|
||||
</view>
|
||||
<view class="capacity-block">
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">共力值产率<text>{{together.capacity}}GLF/h</text></view>
|
||||
<view class="subtitle">{{together.current}}/{{together.max}}</view>
|
||||
</view>
|
||||
<view class="capacity-block-text ">根据正常用户的使用在平台的使用习惯，购物等行为产生对应共力值（暂未开放，敬请期待）</view>
|
||||
</view>
|
||||
<view class="capacity-block" v-for="(item,index) in other" :keys='index'>
|
||||
<view class="capacity-block-title">
|
||||
<view class="title">{{item.title}}</view>
|
||||
<view class="capacity-block-glf">{{item.capacity}}GLF/h</view>
|
||||
</view>
|
||||
<view class="capacity-block-text " v-if="item.remark">{{item.remark}}</view>
|
||||
</view>
|
||||
<view class="capacity-hint"> 用户须知：用户所产生共力分，在每日结算时，平台会扣除30%的共力分用于平台运营使用。 </view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
glz,sign
|
||||
} from '@/apis/interfaces/life.js'
|
||||
import AD from '@/utils/ad.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
identityText: '普通用户',
|
||||
baseHour: 0,
|
||||
base: 0,
|
||||
group: {
|
||||
count: 0,
|
||||
effect: 0,
|
||||
capacity: 0,
|
||||
},
|
||||
nickname: '',
|
||||
recommend: {
|
||||
vip: '-',
|
||||
vip_count: '-',
|
||||
novip: '-',
|
||||
novip_count: '-',
|
||||
vip_text: '-',
|
||||
novip_text: '-',
|
||||
},
|
||||
partner: {
|
||||
vip: '-',
|
||||
vip_count: '-',
|
||||
novip: '-',
|
||||
novip_count: '-',
|
||||
vip_text: '-',
|
||||
novip_text: '-',
|
||||
},
|
||||
build: {},
|
||||
together: {},
|
||||
other: {},
|
||||
can_repeat_sign: false
|
||||
};
|
||||
},
|
||||
created() {
|
||||
uni.showLoading({})
|
||||
this.glz();
|
||||
},
|
||||
onNavigationBarButtonTap() {
|
||||
if (!this.can_repeat_sign) {
|
||||
uni.showModal({
|
||||
title: '温馨提示',
|
||||
content: '今日重置签到机会已使用过了，明日再来试试吧~',
|
||||
confirmColor: '#34CE98',
|
||||
confirmText: '知道了',
|
||||
showCancel: false,
|
||||
})
|
||||
} else {
|
||||
uni.showModal({
|
||||
title: '温馨提示',
|
||||
content: '重置签到只重新计算24小时时间，所迭代加成的比例不变',
|
||||
confirmColor: '#34CE98',
|
||||
confirmText: '立即重置',
|
||||
cancelColor: '#999',
|
||||
cancelText: '再想想',
|
||||
success: (res1) => {
|
||||
if (res1.confirm) {
|
||||
this.checkIMEI().then(res => {
|
||||
switch (res) {
|
||||
case 'Permanent':
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '签到功能需使用您的电话状态和网络信息，请在手机设置中权限开启您的权限',
|
||||
showCancel: false,
|
||||
})
|
||||
break;
|
||||
case 'Temporary':
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '签到功能需使用您的电话状态和网络信息，请点击设置开启应用权限',
|
||||
cancelText: '获取权限',
|
||||
confirmText: '稍后再说',
|
||||
success: e => {
|
||||
if (e.cancel) {
|
||||
this.checkIMEI().then(IMEI => {
|
||||
if (IMEI ===
|
||||
'Success') {
|
||||
this.showAd()
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
break;
|
||||
case 'Success':
|
||||
this.showAd()
|
||||
break;
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
glz(){
|
||||
glz().then(res => {
|
||||
this.nickname = res.nickname
|
||||
this.identityText = res.identity_text
|
||||
this.baseHour = res.base_hour
|
||||
this.base = res.base
|
||||
this.group = res.group
|
||||
this.recommend = res.recommend
|
||||
this.partner = res.partner
|
||||
this.build = res.build
|
||||
this.together = res.together
|
||||
this.other = res.other
|
||||
this.can_repeat_sign = res.can_repeat_sign
|
||||
uni.setNavigationBarTitle({
|
||||
title: res.glz + 'GLF'
|
||||
})
|
||||
uni.hideLoading()
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
title: err.message,
|
||||
icon: 'none'
|
||||
})
|
||||
})
|
||||
},
|
||||
showAd() {
|
||||
AD.show({
|
||||
adpid: 1428308887,
|
||||
adType: 'RewardedVideo'
|
||||
}, detail => {
|
||||
if (detail && detail.isEnded) {
|
||||
this.Sign()
|
||||
}
|
||||
}, err => {
|
||||
this.Sign()
|
||||
})
|
||||
},
|
||||
// 签到
|
||||
Sign(){
|
||||
uni.showLoading({
|
||||
title: '签到中..'
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.capacity{
|
||||
background: $window-color;
|
||||
min-height: 100vh;
|
||||
padding: $padding;
|
||||
box-sizing: border-box;
|
||||
&-hint{
|
||||
font-size: 26rpx;
|
||||
color: gray;
|
||||
line-height: 40rpx;
|
||||
padding: $padding 0;
|
||||
}
|
||||
&-title{
|
||||
font-size: 38rpx;
|
||||
font-weight: bold;
|
||||
line-height: 60rpx;
|
||||
text{
|
||||
margin-left: 10rpx;
|
||||
color: $main-color;
|
||||
}
|
||||
}
|
||||
&-sbutitle{
|
||||
font-size: 26rpx;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
&-block{
|
||||
background: white;
|
||||
margin-top: $margin;
|
||||
border-radius: $radius;
|
||||
padding: $padding;
|
||||
&-glf{
|
||||
color: $main-color;
|
||||
font-size: 30rpx;
|
||||
// padding-top: 30rpx;
|
||||
}
|
||||
&-title{
|
||||
font-weight: bold;
|
||||
font-size: 34rpx;
|
||||
line-height: 60rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.title{
|
||||
text{
|
||||
color: $main-color;
|
||||
font-weight: normal;
|
||||
padding-left: 10rpx;
|
||||
}
|
||||
}
|
||||
.more{
|
||||
background: $main-color;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
border-radius: 25rpx;
|
||||
line-height: 60rpx;
|
||||
width: 230rpx;
|
||||
text-align: center;
|
||||
}
|
||||
.subtitle{
|
||||
font-weight: normal;
|
||||
font-size: 24rpx;
|
||||
color: $main-color;
|
||||
}
|
||||
.nickname{
|
||||
color: gray;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
}
|
||||
&-text{
|
||||
font-size: 28rpx;
|
||||
color: gray;
|
||||
line-height: 40rpx;
|
||||
padding-top: 30rpx;
|
||||
}
|
||||
&-table{
|
||||
border:solid 1px $border-color;
|
||||
margin-bottom: 20rpx;
|
||||
padding-top: 30rpx;
|
||||
&:last-child{
|
||||
margin-top: 0;
|
||||
}
|
||||
.header{
|
||||
background: $border-color;
|
||||
line-height: 50rpx;
|
||||
padding: 0 15rpx;
|
||||
font-size: 26rpx;
|
||||
color: gray;
|
||||
}
|
||||
.flex{
|
||||
display: flex;
|
||||
border-top: solid 1rpx $border-color;
|
||||
color: gray;
|
||||
.flex-item{
|
||||
width: 50%;
|
||||
box-sizing: border-box;
|
||||
line-height: 50rpx;
|
||||
padding: 0 15rpx;
|
||||
font-size: 24rpx;
|
||||
&:first-child{
|
||||
border-right: solid 1rpx $border-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
.pt30{
|
||||
padding-top: 30rpx;
|
||||
}
|
||||
}
|
||||
sign().then(res => {
|
||||
uni.showToast({
|
||||
title: '签到成功',
|
||||
icon: 'none'
|
||||
})
|
||||
this.glz()
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
title: err.message,
|
||||
icon: 'none'
|
||||
})
|
||||
})
|
||||
},
|
||||
onInvitation() {
|
||||
this.$Router.push({
|
||||
name: 'Invitation'
|
||||
})
|
||||
},
|
||||
// imei权限
|
||||
checkIMEI() {
|
||||
// 检查imei权限
|
||||
return new Promise((resolve, reject) => {
|
||||
if (plus.os.name == "Android") {
|
||||
plus.android.requestPermissions(['android.permission.READ_PHONE_STATE'], (e) => {
|
||||
if (e.deniedAlways.length > 0) {
|
||||
resolve('Permanent');
|
||||
}
|
||||
if (e.deniedPresent.length > 0) {
|
||||
resolve('Temporary');
|
||||
}
|
||||
if (e.granted.length > 0) {
|
||||
resolve('Success');
|
||||
}
|
||||
}, (e) => {
|
||||
uni.showToast({
|
||||
title: JSON.stringify(e),
|
||||
icon: 'none'
|
||||
})
|
||||
})
|
||||
return
|
||||
}
|
||||
reject('非安卓设备');
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.capacity {
|
||||
background: $window-color;
|
||||
min-height: 100vh;
|
||||
padding: $padding;
|
||||
box-sizing: border-box;
|
||||
|
||||
&-hint {
|
||||
font-size: 26rpx;
|
||||
color: gray;
|
||||
line-height: 40rpx;
|
||||
padding: $padding 0;
|
||||
}
|
||||
|
||||
&-title {
|
||||
font-size: 38rpx;
|
||||
font-weight: bold;
|
||||
line-height: 60rpx;
|
||||
|
||||
text {
|
||||
margin-left: 10rpx;
|
||||
color: $main-color;
|
||||
}
|
||||
}
|
||||
|
||||
&-sbutitle {
|
||||
font-size: 26rpx;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
|
||||
&-block {
|
||||
background: white;
|
||||
margin-top: $margin;
|
||||
border-radius: $radius;
|
||||
padding: $padding;
|
||||
|
||||
&-glf {
|
||||
color: $main-color;
|
||||
font-size: 30rpx;
|
||||
// padding-top: 30rpx;
|
||||
}
|
||||
|
||||
&-title {
|
||||
font-weight: bold;
|
||||
font-size: 34rpx;
|
||||
line-height: 60rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
.title {
|
||||
text {
|
||||
color: $main-color;
|
||||
font-weight: normal;
|
||||
padding-left: 10rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.more {
|
||||
background: $main-color;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
border-radius: 25rpx;
|
||||
line-height: 60rpx;
|
||||
width: 230rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
font-weight: normal;
|
||||
font-size: 24rpx;
|
||||
color: $main-color;
|
||||
}
|
||||
|
||||
.nickname {
|
||||
color: gray;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
}
|
||||
|
||||
&-text {
|
||||
font-size: 28rpx;
|
||||
color: gray;
|
||||
line-height: 40rpx;
|
||||
padding-top: 30rpx;
|
||||
}
|
||||
|
||||
&-table {
|
||||
border: solid 1px $border-color;
|
||||
margin-bottom: 20rpx;
|
||||
padding-top: 30rpx;
|
||||
|
||||
&:last-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.header {
|
||||
background: $border-color;
|
||||
line-height: 50rpx;
|
||||
padding: 0 15rpx;
|
||||
font-size: 26rpx;
|
||||
color: gray;
|
||||
}
|
||||
|
||||
.flex {
|
||||
display: flex;
|
||||
border-top: solid 1rpx $border-color;
|
||||
color: gray;
|
||||
|
||||
.flex-item {
|
||||
width: 50%;
|
||||
box-sizing: border-box;
|
||||
line-height: 50rpx;
|
||||
padding: 0 15rpx;
|
||||
font-size: 24rpx;
|
||||
|
||||
&:first-child {
|
||||
border-right: solid 1rpx $border-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.pt30 {
|
||||
padding-top: 30rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -260,11 +260,13 @@
|
||||
title: ''
|
||||
})
|
||||
readingUrl().then(res => {
|
||||
if(res.is_over){
|
||||
plus.runtime.openURL(res.ticket)
|
||||
if(!res.is_over){
|
||||
try{
|
||||
plus.runtime.openURL(res.ticket)
|
||||
}catch(e){
|
||||
console.log(e)
|
||||
}
|
||||
}
|
||||
|
||||
console.log(res)
|
||||
uni.hideLoading()
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
|
||||
@@ -19,7 +19,10 @@
|
||||
<block v-for="(item, index) in goodsInfo" :key="index">
|
||||
<view class="goods-item">
|
||||
<image class="order-cover" :src="item.items[0].cover" mode="aspectFill"></image>
|
||||
<view class="order-title">{{item.items[0].title}}</view>
|
||||
<view class="order-title">
|
||||
<view class="title"> {{item.items[0].title}}</view>
|
||||
<view class="subtitle" v-if="item.items[0] && item.items[0].value"> {{item.items[0].value}} </view>
|
||||
</view>
|
||||
<view class="order-count">
|
||||
<view class="order-price">{{item.items[0].price}}<text class="type">DT积分</text></view>
|
||||
</view>
|
||||
@@ -214,12 +217,19 @@
|
||||
height: 128rpx;
|
||||
}
|
||||
.order-title{
|
||||
@extend .ellipsis;
|
||||
text-align: left;
|
||||
flex: 1;
|
||||
padding-left: $margin;
|
||||
font-size: 28rpx;
|
||||
line-height: 40rpx;
|
||||
// line-height: 40rpx;
|
||||
.title{
|
||||
font-size: 28rpx;
|
||||
@extend .ellipsis;
|
||||
text-align: left;
|
||||
}
|
||||
.subtitle{
|
||||
font-size: 26rpx;
|
||||
color: #666;
|
||||
padding-top: 10rpx;
|
||||
}
|
||||
}
|
||||
.order-count{
|
||||
text-align: right;
|
||||
|
||||
@@ -23,6 +23,9 @@
|
||||
</view>
|
||||
<view class="sales" v-if="goods.skus">库存量{{goods.skus[0].stock}}</view>
|
||||
</view>
|
||||
<view class="unit" v-if="goods.skus && goods.skus[0].unit !== ''">
|
||||
规格 : {{goods.skus[0].unit}}
|
||||
</view>
|
||||
|
||||
<!-- 店铺信息 -->
|
||||
<view class="shopInfo" @click="toShop(goods.shop.shop_id)" v-if="goods.shop">
|
||||
@@ -200,7 +203,13 @@
|
||||
color: $text-gray;
|
||||
}
|
||||
}
|
||||
.imgs{
|
||||
.unit{
|
||||
padding: 30rpx;
|
||||
font-size: $title-size-m;
|
||||
color: #333;
|
||||
border-top:solid 20rpx #f9f9f9;
|
||||
}
|
||||
.imgs{
|
||||
image{
|
||||
vertical-align: top;
|
||||
width: 100%;
|
||||
|
||||
255
unpackage/dist/dev/app-plus/app-service.js
vendored
255
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
229
unpackage/dist/dev/app-plus/app-view.js
vendored
229
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user