diff --git a/jiuyi2/App.vue b/jiuyi2/App.vue
index c7cfd3bc..2bf94f11 100644
--- a/jiuyi2/App.vue
+++ b/jiuyi2/App.vue
@@ -1,124 +1,126 @@
\ No newline at end of file
diff --git a/jiuyi2/api/mine.js b/jiuyi2/api/mine.js
index e0b9c5af..3282bb13 100644
--- a/jiuyi2/api/mine.js
+++ b/jiuyi2/api/mine.js
@@ -123,6 +123,7 @@ const mine = {
url: '/coreplay/app/durian/getUserDataByAccount',
query: param.query,
method: 'GET',
+ load: true,
})
},
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index ea5d4755..2f0ce731 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,9 +6,11 @@ const config = {
// host: 'h5api',
// #endif
// #ifndef H5
- // host: 'http://91f.xyz:8080',
- host: 'http://3f609e6a.r24.cpolar.top',
+ host: 'http://91f.xyz:8080',
+ // host: 'http://3dd3096c.r24.cpolar.top',
// #endif
+ // 是否vivo显示
+ showVivo: true,
// 支付方式配置
payType: {
score: {
diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js
index 17db9ca8..2a3fd18c 100644
--- a/jiuyi2/common/js/util.js
+++ b/jiuyi2/common/js/util.js
@@ -213,7 +213,7 @@ const util = {
responseType: params.responseType || 'text',
// 请求成功返回
success: res => {
- // console.log('request success', url, res, params.data ? params.data : '')
+ console.log('request success', url, res, params.data ? params.data : '')
// 关闭加载效果
if (params.load) {
uni.hideLoading()
@@ -623,7 +623,8 @@ const util = {
obj.success && obj.success({
value: result,
width: imageInfo.width,
- height: imageInfo.height,
+ height: imageInfo
+ .height,
});
},
})
@@ -1606,6 +1607,28 @@ const util = {
})
})
},
+
+ /**
+ * 获取app最新版本信息
+ * @param {Object} option
+ */
+ getAppVersion(callback) {
+ // 获取最新版本信息
+ api.getAppVersion().then(rs => {
+ if (rs.code == 200) {
+ const result = rs.data
+ console.log('getAppVersion result', result)
+ // 同步修改云端数据
+ uni.$store.commit('setState', {
+ key: 'versionCloud',
+ value: result
+ })
+
+ if (callback) callback(result)
+ return
+ }
+ })
+ },
}
export default util
\ No newline at end of file
diff --git a/jiuyi2/components/index/appVerUpdate.vue b/jiuyi2/components/index/appVerUpdate.vue
index 83e43dcb..08507594 100644
--- a/jiuyi2/components/index/appVerUpdate.vue
+++ b/jiuyi2/components/index/appVerUpdate.vue
@@ -10,6 +10,7 @@
getCurrentInstance,
computed,
nextTick,
+ onMounted,
} from 'vue'
// 工具库
import util from '@/common/js/util';
@@ -19,28 +20,25 @@
const {
proxy
} = getCurrentInstance()
- // 云端版本信息
- const versionCloud = reactive({})
// 程序版本信息
const versionkApp = reactive({})
+ // 云端app版本信息
+ const versionCloud = computed(() => uni.$store.state.versionCloud)
+
+ onMounted(() => {
+ let system = uni.getSystemInfoSync()
+ Object.assign(versionkApp, system)
+ })
// 初始化
function init() {
- // 获取最新版本信息
- api.getAppVersion().then(rs => {
- if (rs.code == 200) {
- console.log('getAppVersion', rs)
- // 结果
- const result = rs.data
- let system = uni.getSystemInfoSync()
- Object.assign(versionCloud, result)
- Object.assign(versionkApp, system)
- console.log('if', system.appVersionCode, result.versionCode)
- // 如果需要更新 则打开手机浏览器
- if (system.appVersionCode < result.versionCode || true) open()
- return
- }
- })
+ console.log('versionCloud', versionCloud.value)
+ return
+ Object.assign(versionkApp, system)
+ // status 1更新 0未开启
+ if (result.status != 1) return
+ // 手机版本号 < 设定版本号
+ if (system.appVersionCode < result.versionCode) open()
}
// 打开弹窗
@@ -56,13 +54,19 @@
// 更新弹窗点击确认
function handleConfirm() {
// 下载地址
- // let downloadUrl = 'https://www.doubao.com/chat/'
- let downloadUrl = versionCloud.downloadUrl
+ let downloadUrl = versionCloud.value.downloadUrl
plus.runtime.openURL(downloadUrl, function(res) {
console.log('打开浏览器结果:', res);
}, function(err) {
console.log('打开浏览器失败:', err);
- });
+ })
+ }
+
+ // 取消
+ function handleCancel() {
+ // 判断是否强制更新
+ if (versionCloud.value.isforce == 1) plus.runtime.quit()
+ else close()
}
defineExpose({
@@ -73,10 +77,10 @@
-
+
-
diff --git a/jiuyi2/components/index/leftMenu.vue b/jiuyi2/components/index/leftMenu.vue
index 99af91e9..9f63c6fe 100644
--- a/jiuyi2/components/index/leftMenu.vue
+++ b/jiuyi2/components/index/leftMenu.vue
@@ -1,98 +1,99 @@
@@ -117,22 +118,25 @@ defineExpose({
我的钱包
-
-
- 卷轴积分
-
+
+
+
+ 卷轴积分
+
-
-
- 榴莲果树
-
+
+
+ 榴莲果树
+
-
-
- 我的团队
-
+
+
+ 我的团队
+
+
@@ -163,9 +167,9 @@ defineExpose({
\ No newline at end of file
diff --git a/jiuyi2/manifest.json b/jiuyi2/manifest.json
index 52effd61..f0e0b21e 100644
--- a/jiuyi2/manifest.json
+++ b/jiuyi2/manifest.json
@@ -2,8 +2,8 @@
"name" : "九亿",
"appid" : "__UNI__08B31BC",
"description" : "",
- "versionName" : "1.0.12",
- "versionCode" : 1012,
+ "versionName" : "1.0.13",
+ "versionCode" : 1013,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json
index 9adb3d86..30f79110 100644
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@@ -779,6 +779,13 @@
{
"navigationBarTitleText" : "流量点明细"
}
+ },
+ {
+ "path" : "pages/mine/setting/about",
+ "style" :
+ {
+ "navigationBarTitleText" : "关于九亿"
+ }
}
],
@@ -866,11 +873,15 @@
}
},
"condition": {
- "current": 0,
+ "current": 1,
"list": [
{
"name": "test",
"path": "pages/mine/homepage"
+ },
+ {
+ "name": "test",
+ "path": "pages/mine/setting/about"
}
]
},
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index d4752dc4..573054ad 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -801,9 +801,11 @@
-
-
-
+
+
+
+
+
diff --git a/jiuyi2/pages/index/trade.vue b/jiuyi2/pages/index/trade.vue
index e9258968..4924ba78 100644
--- a/jiuyi2/pages/index/trade.vue
+++ b/jiuyi2/pages/index/trade.vue
@@ -100,7 +100,7 @@
})
onReady(() => {
- proxy.$refs.orderDetail.open()
+ // proxy.$refs.orderDetail.open()
})
onPullDownRefresh(() => {
diff --git a/jiuyi2/pages/index/wallet/bill.vue b/jiuyi2/pages/index/wallet/bill.vue
index 6b1c3ce4..5db3fd00 100644
--- a/jiuyi2/pages/index/wallet/bill.vue
+++ b/jiuyi2/pages/index/wallet/bill.vue
@@ -13,10 +13,15 @@
onReachBottom,
onPullDownRefresh
} from '@dcloudio/uni-app'
+ import {
+ useStore
+ } from 'vuex'
//
import api from '@/api/index.js'
// 工具库
import util from '@/common/js/util.js'
+ //
+ const store = useStore()
// 列表
const list = reactive({
pageSize: 10,
@@ -48,6 +53,8 @@
])
// 类型索引
const typeIndex = ref(0)
+ // 用户信息
+ const userinfo = computed(() => store.state.userinfo)
onLoad(() => {
// 获取列表
@@ -83,7 +90,8 @@
query: {
pageSize: list.pageSize,
pageNum: list.pageNum,
- type: typeList[typeIndex.value].id,
+ type: util.config.showVivo ? typeList[typeIndex.value].id : 'balance',
+ userId: userinfo.value.id,
}
}).then(rs => {
if (rs.code == 200) {
@@ -120,15 +128,17 @@
-
-
- {{item.name}}
-
+
+
+
+ {{item.name}}
+
+
-
-
+
+
diff --git a/jiuyi2/pages/index/wallet/wallet.vue b/jiuyi2/pages/index/wallet/wallet.vue
index 38dd5d1f..23f8394b 100644
--- a/jiuyi2/pages/index/wallet/wallet.vue
+++ b/jiuyi2/pages/index/wallet/wallet.vue
@@ -171,12 +171,9 @@
- 可用积分 {{wallet.score || 0}}
-
-
-
- 待入账列表
-
+
+ 可用积分 {{wallet.score || 0}}
+
@@ -184,15 +181,22 @@
-
- 商家明细
-
-
+
+
+ 待入账列表
+
+
-
- 我的收益
-
-
+
+ 商家明细
+
+
+
+
+ 我的收益
+
+
+
diff --git a/jiuyi2/pages/mine/homepage.vue b/jiuyi2/pages/mine/homepage.vue
index 68665713..f5e5ab2e 100644
--- a/jiuyi2/pages/mine/homepage.vue
+++ b/jiuyi2/pages/mine/homepage.vue
@@ -276,7 +276,7 @@
账号:{{userinfo.account}}
-
+
我的产品
@@ -395,12 +395,14 @@
我的客服
-->
-
-
-
- 我的分享
+
+
+
+
+ 我的分享
+
-
+
diff --git a/jiuyi2/pages/mine/setting/about.vue b/jiuyi2/pages/mine/setting/about.vue
new file mode 100644
index 00000000..3e3ca40b
--- /dev/null
+++ b/jiuyi2/pages/mine/setting/about.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+ 检查更新
+
+
+
+
+
+
+ 关于我们
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jiuyi2/pages/mine/setting/setting.vue b/jiuyi2/pages/mine/setting/setting.vue
index 7190a10a..263bea53 100644
--- a/jiuyi2/pages/mine/setting/setting.vue
+++ b/jiuyi2/pages/mine/setting/setting.vue
@@ -269,7 +269,7 @@ function logOff() {
-
+
版本号
{{ appVersion }}
diff --git a/jiuyi2/store/index.js b/jiuyi2/store/index.js
index 3ffa3130..bd5c1818 100644
--- a/jiuyi2/store/index.js
+++ b/jiuyi2/store/index.js
@@ -29,9 +29,18 @@ export default createStore({
"DAY_POINTS_RELEASE": 0.3, //每日积分释放
"TASK_READING_SECOND": 300, //任务读秒
"EFFECTIVE_SECONDS": 300, //有效读秒
- "EFFECTIVE_VIDEO_TIME": 20 ,//有效视频时间
+ "EFFECTIVE_VIDEO_TIME": 20, //有效视频时间
"UNLOCK_FLOW_STATISTICS": 30, //解锁流量统计
},
+ // 云端最新版本信息
+ versionCloud: {
+ "status": "0",
+ "versionCode": 100,
+ "versionName": "1.0.0",
+ "downloadUrl": "",
+ "updateContent": "",
+ "isForce": 0
+ },
},
mutations: {
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index c135185a..e9ea6bff 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,8 +3,8 @@ import {
} from 'vite';
import uni from '@dcloudio/vite-plugin-uni';
-// let target = 'http://91f.xyz:8080'
-let target = 'http://3f609e6a.r24.cpolar.top'
+let target = 'http://91f.xyz:8080'
+// let target = 'http://3dd3096c.r24.cpolar.tops'
export default defineConfig({
plugins: [uni()],