TmOct5/dtx_store
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
唐明明
2022-07-07 17:19:03 +08:00
parent b144de3c32 9f6c343d05
commit 0dd0f0f37c
9 changed files with 690 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@@ -14,7 +14,7 @@
title : "更新提示",
content : res.note || '版本更新信息',
confirmText : "更新",
showCancel : false,
showCancel : true,
success : modalRes => {
if (modalRes.confirm) {
if (plus.os.name == "Android") {

4
apis/index.js
View File

@@ -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
}

9
pages/account/resetPassword.vue
View File

@@ -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>

130
pages/life/capacity.vue
View File

@@ -11,7 +11,8 @@
</view>
<view class="capacity-block">
<view class="capacity-block-title">
<view class="title">成员产率({{group.effect}}/{{group.count}})<text</text></view>
<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>
@@ -68,7 +69,10 @@
</template>
<script>
import { glz } from '@/apis/interfaces/life.js'
import {
glz,sign
} from '@/apis/interfaces/life.js'
import AD from '@/utils/ad.js'
export default {
data() {
return {
@@ -99,34 +103,24 @@
},
build: {},
together: {},
other:{}
other: {},
can_repeat_sign: false
};
},
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'
})
})
this.glz();
},
onNavigationBarButtonTap() {
if (!this.can_repeat_sign) {
uni.showModal({
title: '温馨提示',
content: '今日重置签到机会已使用过了，明日再来试试吧~',
confirmColor: '#34CE98',
confirmText: '知道了',
showCancel: false,
})
} else {
uni.showModal({
title: '温馨提示',
content: '重置签到只重新计算24小时时间，所迭代加成的比例不变',
@@ -134,9 +128,8 @@
confirmText: '立即重置',
cancelColor: '#999',
cancelText: '再想想',
success: (res) => {
if(res.confirm){
console.log('再次签到。。。')
success: (res1) => {
if (res1.confirm) {
this.checkIMEI().then(res => {
switch (res) {
case 'Permanent':
@@ -155,7 +148,8 @@
success: e => {
if (e.cancel) {
this.checkIMEI().then(IMEI => {
if (IMEI === 'Success') {
if (IMEI ===
'Success') {
this.showAd()
}
})
@@ -167,14 +161,73 @@
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: '签到中..'
})
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'})
this.$Router.push({
name: 'Invitation'
})
},
// imei权限
checkIMEI() {
@@ -212,41 +265,49 @@
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;
@@ -254,6 +315,7 @@
padding-left: 10rpx;
}
}
.more {
background: $main-color;
color: white;
@@ -264,29 +326,35 @@
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;
@@ -294,16 +362,19 @@
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;
}
@@ -312,6 +383,7 @@
}
}
.pt30 {
padding-top: 30rpx;
}

8
pages/life/life.vue
View File

@@ -260,11 +260,13 @@
title: ''
})
readingUrl().then(res => {
if(res.is_over){
if(!res.is_over){
try{
plus.runtime.openURL(res.ticket)
}catch(e){
console.log(e)
}
}
console.log(res)
uni.hideLoading()
}).catch(err => {
uni.showToast({

18
pages/store/buy.vue
View File

@@ -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;
// line-height: 40rpx;
.title{
font-size: 28rpx;
line-height: 40rpx;
@extend .ellipsis;
text-align: left;
}
.subtitle{
font-size: 26rpx;
color: #666;
padding-top: 10rpx;
}
}
.order-count{
text-align: right;

9
pages/store/goods.vue
View File

@@ -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,6 +203,12 @@
color: $text-gray;
}
}
.unit{
padding: 30rpx;
font-size: $title-size-m;
color: #333;
border-top:solid 20rpx #f9f9f9;
}
.imgs{
image{
vertical-align: top;

253
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

247
unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long