|
@@ -27,7 +27,7 @@
|
|
<use-pop :userInfo="userInfo" v-model="meunShow" @close="meunShow = false"></use-pop>
|
|
<use-pop :userInfo="userInfo" v-model="meunShow" @close="meunShow = false"></use-pop>
|
|
|
|
|
|
<!-- 今日任务有未读 -->
|
|
<!-- 今日任务有未读 -->
|
|
- <u-popup :show="updateShow" :closeOnClickOverlay="false" :safeAreaInsetBottom="false" mode="center" :round="16" @close="state.taskNumShow = false">
|
|
|
|
|
|
+ <u-popup :show="showUpdatePop" :closeOnClickOverlay="false" :safeAreaInsetBottom="false" mode="center" :round="16" @close="state.taskNumShow = false">
|
|
<view class="reason-box">
|
|
<view class="reason-box">
|
|
<image class="icon-img" src="https://qiuyu-shuzhi.oss-cn-beijing.aliyuncs.com/image/task-pop-img.png" mode=""></image>
|
|
<image class="icon-img" src="https://qiuyu-shuzhi.oss-cn-beijing.aliyuncs.com/image/task-pop-img.png" mode=""></image>
|
|
<view class="reason-box-title">象力WMS邀请你升级至新版本</view>
|
|
<view class="reason-box-title">象力WMS邀请你升级至新版本</view>
|
|
@@ -42,7 +42,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import usePop from './components/use-pop.vue'
|
|
import usePop from './components/use-pop.vue'
|
|
- import { downloadApk } from '@/common/request/apis/index'
|
|
|
|
|
|
+ import { downloadApkWithJsonPost } from '@/common/utils/app-update.js'
|
|
// const Base64 = require('js-base64').Base64
|
|
// const Base64 = require('js-base64').Base64
|
|
import {
|
|
import {
|
|
mapGetters
|
|
mapGetters
|
|
@@ -88,10 +88,10 @@
|
|
// JSON.parse(Base64.decode(that.$Route.query.classData))
|
|
// JSON.parse(Base64.decode(that.$Route.query.classData))
|
|
},
|
|
},
|
|
onShow() {
|
|
onShow() {
|
|
- if(this.$store.state.update.update) {
|
|
|
|
- console.log('需要更新')
|
|
|
|
- this.updateShow = true
|
|
|
|
- }
|
|
|
|
|
|
+ // if(this.$store.state.update.update) {
|
|
|
|
+ // console.log('需要更新')
|
|
|
|
+ // this.updateShow = true
|
|
|
|
+ // }
|
|
if(!this.isLogin) {
|
|
if(!this.isLogin) {
|
|
uni.$u.toast("请先登录!");
|
|
uni.$u.toast("请先登录!");
|
|
setTimeout(()=>{
|
|
setTimeout(()=>{
|
|
@@ -102,13 +102,18 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
- ...mapGetters(['isLogin','userInfo'])
|
|
|
|
|
|
+ ...mapGetters(['isLogin','userInfo']),
|
|
|
|
+ showUpdatePop(){
|
|
|
|
+ return this.$store.state.update.update&&this.updateShow
|
|
|
|
+ }
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
toUpdate() {
|
|
toUpdate() {
|
|
-
|
|
|
|
|
|
+ const params = this.$store.state.downloadApkParams
|
|
|
|
+ const url = this.$BASE_URL + '/pda/downloadApk'
|
|
|
|
+ downloadApkWithJsonPost(url, params)
|
|
},
|
|
},
|
|
meunClick() {
|
|
meunClick() {
|
|
if(!this.isLogin) {
|
|
if(!this.isLogin) {
|