diff --git a/.DS_Store b/.DS_Store index edeb594..1a831c5 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/manifest.json b/manifest.json index ddf87dd..5993f25 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "Same home", "appid" : "__UNI__C4028F6", "description" : "", - "versionName" : "1.0.3", - "versionCode" : 103, + "versionName" : "1.0.4", + "versionCode" : 104, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -16,6 +16,9 @@ "autoclose" : true, "delay" : 0 }, + "compatible" : { + "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 + }, /* 模块配置 */ "modules" : { "VideoPlayer" : {} diff --git a/pages/home/index.vue b/pages/home/index.vue index 7f41805..a073d1b 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -30,7 +30,7 @@ - + @@ -62,18 +62,10 @@ - - - {{ i18n.CaringForWomen }} - - {{ i18n.LoveFeminist }}
{{ i18n.LoveFeminist1 }}
- - - - - - {{ i18n.checkTheDetails }} - + + + + @@ -85,7 +77,7 @@ - @@ -182,16 +174,18 @@ stepsNum: 0, // 当前步数 stepTarget: 5000, // 目标步数 myChart: null, + middleList:null } }, onLoad() { this.baseURL = constant.BASE_URL this.getbanner(); + this.getMiddle(); this.noticeList(); this.getUserInfoBalance(); // #ifdef APP-PLUS - // this.appVersion() + this.appVersion() // #endif }, @@ -232,11 +226,17 @@ } }, methods: { - + logOut() { plus.runtime.openURL(this.conInfo.appUrl); }, - + getMiddle(){ + api.indexBanner({ + 'mark': 'APP_INDEX_MIDDLE' + }).then(res => { + this.middleList=res + }) + }, // 校验APP应用版本 appVersion() { console.log("校验APP应用版本", uni.getSystemInfoSync().platform) @@ -250,7 +250,7 @@ // console.log(wgtinfo.versionCode, response.versionCode) let param = { 'appId': uni.getSystemInfoSync().platform, - 'versionCode': '1.0.0' + 'versionCode': wgtinfo.version } console.log(param) this.$api.appVersion(param).then(response => { @@ -332,13 +332,21 @@ }, bannerClick(i) { - // #ifdef APP-PLUS - plus.runtime.openURL(this.bannerList[i]) - // #endif - // #ifdef H5 - var href = this.bannerList[i] - window.open(href, '_blank'); - // #endif + if(this.bannerList[i].content=='inner'){ + uni.navigateTo({ + url: this.bannerList[i].adUrl + }) + }else{ + // #ifdef APP-PLUS + plus.runtime.openURL(this.bannerList[i].adUrl) + // #endif + // #ifdef H5 + var href = this.bannerList[i].adUrl + window.open(href, '_blank'); + // #endif + } + + }, // 获取用户余额信息 @@ -461,10 +469,21 @@ }, - go(url) { - uni.navigateTo({ - url: url - }) + go(type,url) { + if(type=='inner'){ + uni.navigateTo({ + url: url + }) + }else{ + // #ifdef APP-PLUS + plus.runtime.openURL(url) + // #endif + // #ifdef H5 + var href = url + window.open(href, '_blank'); + // #endif + } + }, @@ -491,7 +510,10 @@ // this.bannerList = res for (var i = 0; i < res.length; i++) { this.swiperList.push(this.baseURL + res[i].adImgPath) - this.bannerList.push(res[i].adUrl) + this.bannerList.push({ + content:res[i].content, + adUrl:res[i].adUrl + }) } this.videoList = res // banner图按照接口返回的顺序 但是底部视频倒序放 @@ -925,13 +947,13 @@ .steps { margin: 0 32rpx; width: 686rpx; - height: 472rpx; - background-color: #211F32; - background-image: url(../../static/home/img_People.png); - background-repeat: no-repeat; - background-size: contain; - border-radius: 16px; - + margin-top: 32rpx; + + + image{ + width: 100%; + border-radius: 16px; + } .content { //margin-left: 246rpx; diff --git a/pages/subscription/details.vue b/pages/subscription/details.vue index 5973242..6e4f5e9 100644 --- a/pages/subscription/details.vue +++ b/pages/subscription/details.vue @@ -54,8 +54,8 @@ {{ i18n.ProjectDetails }} - {{ i18n.Video }} - {{ i18n.WhiteBook }} + {{ i18n.Video }} + {{ i18n.WhiteBook }}