diff --git a/App.vue b/App.vue
index a031b98..6c62d72 100644
--- a/App.vue
+++ b/App.vue
@@ -367,13 +367,15 @@
plus.runtime.restart();
}
});
- } else {
- //获取当前系统版本信息
+ } else {
+ //获取当前系统版本信息
plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
//请求后台接口 解析数据 对比版本
that.$Request.getT('/app/user/selectNewApp').then(res => {
res = res.data[0];
- if (res.wgtUrl && widgetInfo.version < res.version) {
+ console.log("widgetInfo==",widgetInfo)
+ console.log("selectNewApp==",res)
+ if (widgetInfo.version < res.version) {
let downloadLink = '';
let androidLink = res.androidWgtUrl;
let iosLink = res.iosWgtUrl;
@@ -388,7 +390,7 @@
console.log('发现下载地址');
// 安卓：创建下载任务
if (androidLink.match(RegExp(/.wgt/))) {
- console.log('确认wgt热更新包');
+ console.log('确认wgt热更新包');
downloadLink = androidLink;
ready = true;
} else {
@@ -398,8 +400,8 @@
console.log('下载地址是空的，无法继续');
}
} else {
- console.log('苹果系统');
- if (iosLink && iosLink !== '#') {
+ console.log('苹果系统');
+ if (iosLink && iosLink !== '#') {
// 我这里默认#也是没有地址，请根据业务自行修改
console.log('发现下载地址');
// 苹果(A)：进行热更新（如果iosLink是wgt更新包的下载地址）判断文件名中是否含有.wgt
@@ -457,11 +459,12 @@
}
} else {
//不是热更新是在线更新 校验是否强制升级
- if (res.method == 'true') {
+
+ if (res.method == "true") {
uni.showModal({
showCancel: false,
- confirmText: '立即更新',
title: '发现新版本',
+ confirmText: '立即更新',
content: res.des,
success: res => {
if (res.confirm) {
@@ -471,15 +474,10 @@
uni.downloadFile({
url: androidLink,
success: downloadResult => {
- if (downloadResult
- .statusCode ===
- 200) {
+ console.log(downloadResult)
+ if (downloadResult.statusCode === 200) {
plus.runtime
- .install(
- downloadResult
- .tempFilePath, {
- force: false
- },
+ .install(downloadResult.tempFilePath, { force: false },
d => {
console
.log(
@@ -489,12 +487,22 @@
.restart();
},
e => {
+ console.log(e)
console
.error(
'install fail...'
);
}
);
+ // plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, entry => {
+ // entry.getParent(_oldFile=>{
+ // entry.moveTo(_oldFile,'.apk',newFilePath=>{
+ // console.log('newFilePath',newFilePath.fullPath)
+
+ // })
+ // })
+ // })
+
}
}
});
@@ -509,7 +517,7 @@
}
}
});
- } else {
+ } else {
uni.showModal({
title: '发现新版本',
confirmText: '立即更新',
@@ -523,15 +531,9 @@
uni.downloadFile({
url: androidLink,
success: downloadResult => {
- if (downloadResult
- .statusCode ===
- 200) {
+ if (downloadResult.statusCode === 200) {
plus.runtime
- .install(
- downloadResult
- .tempFilePath, {
- force: false
- },
+ .install(downloadResult.tempFilePath, { force: false },
d => {
console
.log(
@@ -541,12 +543,38 @@
.restart();
},
e => {
+ console.log(e)
console
.error(
'install fail...'
);
}
);
+ // plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, entry => {
+ // entry.getParent(_oldFile=>{
+ // entry.moveTo(_oldFile,'.apk',newFilePath=>{
+ // console.log('newFilePath',newFilePath.fullPath)
+ // plus.runtime
+ // .install(newFilePath.fullPath, { force: false },
+ // d => {
+ // console
+ // .log(
+ // 'install success...'
+ // );
+ // plus.runtime
+ // .restart();
+ // },
+ // e => {
+ // console.log(e)
+ // console
+ // .error(
+ // 'install fail...'
+ // );
+ // }
+ // );
+ // })
+ // })
+ // })
}
}
});
diff --git a/common/config.js b/common/config.js
index d614bd8..ef54693 100644
--- a/common/config.js
+++ b/common/config.js
@@ -4,7 +4,7 @@ const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
module.exports = {
APIHOST: ROOTPATH,
diff --git a/me/invite/cashList.vue b/me/invite/cashList.vue
index 64c622f..fe0950d 100644
--- a/me/invite/cashList.vue
+++ b/me/invite/cashList.vue
@@ -102,8 +102,9 @@
.centre {
text-align: center;
- margin: 200rpx auto;
+ padding: 200rpx 0;
font-size: 32rpx;
+ box-sizing: border-box;
image {
width: 360rpx;
diff --git a/me/invite/moneyList.vue b/me/invite/moneyList.vue
index 92d5d5b..80d62d8 100644
--- a/me/invite/moneyList.vue
+++ b/me/invite/moneyList.vue
@@ -96,8 +96,9 @@
.centre {
text-align: center;
- margin: 200rpx auto;
+ padding: 200rpx 0;
font-size: 32rpx;
+ box-sizing: border-box;
image {
width: 360rpx;
height: 360rpx;
diff --git a/pages.json b/pages.json
index 95f48f6..e4b9d40 100644
--- a/pages.json
+++ b/pages.json
@@ -338,7 +338,6 @@
"path": "invite/cashList",
"style": {
"navigationBarTitleText": "提现记录",
- "enablePullDownRefresh": true,
"h5": {
"titleNView": {
"backgroundColor": "#FFFFFF"
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 9fc8655..a0f6df3 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -22,8 +22,8 @@
{{ item.detail }}
- {{ item.buttonTitle }}
- {{ item.buttonTitle }}
+ {{ item.type == 1 ? item.buttonTitle : ( item.number <= 0 ? '立即领取' : `剩余${item.number}次`) }}
+ {{ item.type == 1 ? item.buttonTitle : ( item.number <= 0 ? '立即领取' : `剩余${item.number}次`) }}