wzh 2 лет назад
Родитель
Сommit
46bff9236e
2 измененных файлов с 14 добавлено и 9 удалено
  1. 2 2
      manifest.json
  2. 12 7
      pages/login.vue

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "用电助理",
     "appid" : "__UNI__60E8019",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

+ 12 - 7
pages/login.vue

@@ -100,17 +100,16 @@
     <u-picker @cancel="cancelLocale" :show="showLocale" keyName="label" :columns="localeList" @confirm="changeLanguage"></u-picker>
     <u-popup :zoom="false" :show="showStatus" :mask-close-able="false" mode="center" :closeable="false"  border-radius="14" height="150rpx">
       <view style="margin:20rpx">
-        检测到有新版本,请点击下载
+        {{i18('检测到有新版本,请点击下载')}}
       </view>
-      <view style="text-align: center;text-decoration: underline;margin:10px" @click="downloadFile">
-        立即下载
-
+      <view v-if="!isShowProgress" style="text-align: center;text-decoration: underline;margin:10px" @click="downloadFile">
+        {{i18('立即下载')}}
       </view>
 
 
       <view class="progress-container" v-if="isShowProgress">
         <view class="progress-box">
-          <view class="text">文件下载中,请稍后......</view>
+          <view class="text">  {{i18('文件下载中,请稍后......')}}</view>
           <progress :percent="progress" show-info stroke-width="3" />
         </view>
       </view>
@@ -122,6 +121,7 @@
 <script>
   import {checkVersion} from '@/api/login'
   import {getToken} from "@/utils/auth";
+  import i18 from '@/utils/i18.js'
   export default {
     data() {
       return {
@@ -172,6 +172,9 @@
       this.checkLogin();
     },
     methods: {
+      i18(text){
+        return i18(text)
+      },
       downloadFile(){
         let self = this;
         self.isShowProgress = true;
@@ -193,7 +196,7 @@
                 });
           }
         })
-
+        console.log(downloadTask)
         downloadTask.onProgressUpdate((res) => {
           if(res.progress > 0) {
             this.isShowProgress = true;
@@ -211,10 +214,12 @@
         let self = this;
         checkVersion({"versionCode":appVersionCode}).then(res=>{
           let cz_app_version =res.data;
+          console.log(cz_app_version)
           if(cz_app_version != null){
             let onlineVersion = cz_app_version.version;
+            console.log(onlineVersion)
             let isForce = cz_app_version.isForce;
-            let url = cz_app_version.downUrl;
+            let url = cz_app_version.down_url;
             self.downloadUrl = url;
             if(onlineVersion>appVersionCode){
               self.showStatus = true;