0.1.0

src/Auman.PieceWage.UniApp/pages.json

@@ -3,7 +3,7 @@
         {
             "path": "pages/home/newhome",
             "style": {
-                "navigationBarTitleText": "首页"
+                "navigationBarTitleText": "欧曼生产流程管理"
             }
         },
         {

src/Auman.PieceWage.UniApp/pages/dispatch/dispatch.vue

@@ -7,7 +7,6 @@
 </template>
 
 <script>
-    import url from '../../utils/url';
     import request from '../../utils/request';
     import user from '../../utils/user';
     import extend from '../../utils/extend';

src/Auman.PieceWage.UniApp/pages/home/newhome.vue

@@ -9,10 +9,9 @@
 
 <script>
     import extend from '../../utils/extend.js';
-    import token from '../../utils/token.js';
-    import user from '../../utils/user.js';
     import appUpdate from '../../utils/appUpdate.js';
-    import request from '../../utils/request.js';
+    import url from '../../utils/url.js';
+    import login from '../../utils/login.js';
 
     export default {
         data() {
@@ -28,18 +27,12 @@
         async onShow() {
             // #ifdef APP
 
-            let baseUrl = await request.getBaseUrl();
-            // console.log('baseUrl', baseUrl);
+            let baseUrl = url.api;
 
             // 检查更新
             let updateRes = await appUpdate.check('api/PDAScan/GetVersion?name=PDA');
             this.isNew = updateRes.isNew;
             this.appWgtVersion = updateRes.appWgtVersion;
-
-            let url = baseUrl + updateRes.url;
-            // console.log(updateRes);
-            // console.log('url:', url);
-            // this.$refs.newVerPopup.open();
             if (updateRes.isNew) {
                 uni.showModal({
                     title: '应用更新',
@@ -54,7 +47,7 @@
                                 }
                             });
                             let ures = await appUpdate.update({
-                                url: url,
+                                url: `${baseUrl}${updateRes.url}`,
                                 progress(pr) {
                                     _this.updateProcess = pr.progress;
                                     showLoading.setTitle(`已下载 ${pr.progress}%`);
@@ -75,6 +68,18 @@
             }
 
             // #endif
+
+            /**
+             * 自动登录
+             */
+            if (!login.logined) {
+                let lres = await login.login();
+                if (!lres.success) {
+                    uni.navigateTo({
+                        url: '/pages/login/index'
+                    });
+                }
+            }
         },
         methods: {
             /**
@@ -82,16 +87,16 @@
              * @param {string} type 类型。navigate | switch。
              * @param {string} url 页面地址
              */
-            go(type, url) {
+            go(type, path) {
                 switch (type) {
                     case 'navigate':
                         uni.navigateTo({
-                            url: url
+                            url: path
                         });
                         break;
                     case 'switch':
                         uni.switchTab({
-                            url: url
+                            url: path
                         });
                         break;
                 }

src/Auman.PieceWage.UniApp/pages/my/index.vue

@@ -27,16 +27,13 @@
 
 <script>
     import extend from '../../utils/extend.js';
-    import token from '../../utils/token.js';
     import user from '../../utils/user.js';
     import request from '../../utils/request.js';
-    import Tone from '../../utils/tone.js';
     import message from '../../utils/message.js';
+    import login from '../../utils/login.js';
 
     let userinfo = null;
 
-    const tone = new Tone();
-
     export default {
         data() {
             return {
@@ -52,30 +49,28 @@
             this.version = systemInfo.appWgtVersion || systemInfo.appVersion;
         },
         async onShow() {
-            if (token.has()) {
-                this.isLogin = true;
-                userinfo = user.get();
-                console.log(userinfo);
-                this.username = userinfo.userName;
-                this.loginName = userinfo.loginName;
-                console.log(userinfo);
-            } else {
-                let res = await token.getByServer();
-                if (res.success) {
-                    this.isLogin = true;
-                    userinfo = user.get();
-                    this.username = userinfo.userName;
-                    this.loginName = userinfo.loginName;
-                } else {
-                    token.clear();
-                    this.isLogin = false;
-                    userinfo = null;
-                    this.username = '';
-                    this.loginName = '';
+            /**
+             * 自动登录
+             */
+            if (!login.logined) {
+                let lres = await login.login();
+                if (!lres.success) {
+                    uni.navigateTo({
+                        url: '/pages/login/index'
+                    });
                 }
+            } else {
+                this.isLogin = true;
+                this.showUserInfo();
             }
         },
         methods: {
+            showUserInfo(){
+                userinfo = user.get();
+                this.username = userinfo.userName;
+                this.loginName = userinfo.loginName;
+            },
+            
             openLogin() {
                 uni.navigateTo({
                     url: '/pages/login/index'
@@ -119,7 +114,7 @@
                 console.log(res);
             },
 
-            showUserInfo() {
+            popupUserInfo() {
                 let msg =
                     `${userinfo.UserName}\n账号：${userinfo.LoginName}\n密码：${userinfo.Password}\n内码：${userinfo.SystemUserId}`;
                 uni.showModal({

src/Auman.PieceWage.UniApp/utils/login.js

@@ -10,7 +10,7 @@ class Login {
      * 是否登录
      * @returns {boolean}
      */
-    logined() {
+    get logined() {
         return token.has();
     }
 

src/Auman.PieceWage.UniApp/utils/url.js

@@ -28,7 +28,17 @@ class Url {
      */
     set(url) {
         if (extend.isObject(url)) {
+            if (extend.isEmptyString(url.auth)) {
+                let oldUrl = this.get();
+                url.auth = oldUrl.auth;
+            }
+            if (extend.isEmptyString(url.api)) {
+                let oldUrl = this.get();
+                url.api = oldUrl.api;
+            }
             extend.addStorage(urlkey, url);
+        } else {
+            this.set(oldUrl);
         }
     }
 
@@ -37,9 +47,11 @@ class Url {
      * @returns {{auth: string, api: string}}
      */
     get() {
+        let isStorage = true;
         let url = extend.readStorage(urlkey);
         if (extend.isNull(url)) {
             url = {};
+            isStorage = false;
         }
         if (extend.isEmptyString(url.authUrl)) {
             url.auth = 'http://219.151.179.47:8087/'
@@ -47,6 +59,9 @@ class Url {
         if (extend.isEmptyString(url.authUrl)) {
             url.api = 'http://219.151.179.47:8081/'
         }
+        if (!isStorage) {
+            this.set(url);
+        }
         return url;
     }
 }