czg_team
/
new_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into test

This commit is contained in:
GaoHao 2025-01-22 14:21:06 +08:00
parent a1c95f7f1b 0c5e5798ea
commit ab588d4123
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commons/config.js
View File

@ -1,6 +1,6 @@
//打包时修改env的值即可 //打包时修改env的值即可
const env='production' //test , production,local const env='test' //test , production,local
export const encryptKey='1234567890123456' // http数据加解密的key export const encryptKey='1234567890123456' // http数据加解密的key

12
pages/index/components/contentlist.vue
View File

@ -35,7 +35,7 @@
.contentlist { .contentlist {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10rpx; margin-top: 10rpx;
padding: 0 26rpx; padding: 0 26rpx;
@ -44,17 +44,19 @@
border-radius: 21rpx 21rpx 21rpx 21rpx; border-radius: 21rpx 21rpx 21rpx 21rpx;
width: 30%; width: 30%;
margin-top: 20rpx; margin-top: 20rpx;
text-align: center;
>view { >view {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
text-align: left; text-align: left;
margin-left: 10rpx;
} }
} }
.liststyle:last-child { // .liststyle:last-child {
margin-right: auto; // margin-right: auto;
margin-left: 6rpx; // margin-left: 6rpx;
} // }
} }
</style> </style>

9
pages/index/index.vue
View File

@ -45,8 +45,8 @@
<image v-if="datas.isExamine" @click="goMsg()" src="@/static/index/red-pack-new.gif" <image v-if="datas.isExamine" @click="goMsg()" src="@/static/index/red-pack-new.gif"
style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image> style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
<up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText" <up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText"
:showCancelButton="datas.version.cancelText!=''" @cancel="cancelUpdateVersion" @confirm='confirmUpdateVersion' :title="datas.version.title" :showCancelButton="datas.version.cancelText!=''" @cancel="cancelUpdateVersion" @confirm='confirmUpdateVersion'
:title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)"> :title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)">
<view class="" style="padding-top: 30rpx;text-align: left;"> <view class="" style="padding-top: 30rpx;text-align: left;">
<scroll-view scroll-y="true" style="max-height: 50vh;"> <scroll-view scroll-y="true" style="max-height: 50vh;">
<!-- <rich-text style="color:#666" :nodes="datas.version.content"></rich-text> --> <!-- <rich-text style="color:#666" :nodes="datas.version.content"></rich-text> -->
@ -98,6 +98,9 @@
// console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug') // console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
// 判断ios是否审核 // 判断ios是否审核
$common.init() $common.init()
// #ifdef H5
datas.isExamine = $common.isIosExamine
// #endif
// let sysInfo = uni.getSystemInfoSync() // let sysInfo = uni.getSystemInfoSync()
// let isIos = sysInfo.platform == 'ios' // let isIos = sysInfo.platform == 'ios'
// if (isIos) { // if (isIos) {
@ -190,10 +193,12 @@
}); });
//#endif //#endif
} }
function cancelUpdateVersion() { function cancelUpdateVersion() {
uni.showTabBar() uni.showTabBar()
datas.version.show = false datas.version.show = false
} }
function confirmUpdateVersion() { function confirmUpdateVersion() {
// plus.runtime.openURL(config.baseUrl + '/pages/login/appEq') // plus.runtime.openURL(config.baseUrl + '/pages/login/appEq')
linkTo('/pages/login/download') linkTo('/pages/login/download')