同济登录不加密及其他BUG修复

pages/homePage/homePage.vue

@@ -692,67 +692,73 @@
           title: "登录中",
           mask: true,
         });
-        let data = {
-          username: this.username.trim(),
-          password: this.password.trim(),
-          type: 'APP'
-        };
-        data = {
-          k: this.encryptByEnAESLogin(JSON.stringify(data))
-        };
-        post("/auth/login", data).then((res) => {
-          uni.hideLoading();
-          if (res.status == 200) {
-            //获取角色信息
-            let role = res.user.user.role;
-            // 配药师和支助人员才能登录
-            let workerFlag = role.some((item) => item.rolecode === "worker");
-            let pharmacistFlag = role.some((item) => item.rolecode === "pharmacist");
-            if (!workerFlag && !pharmacistFlag) {
+        
+        get("/auth/getSysNameAndLogo").then((resultLog) => {
+          let data = {
+            username: this.username.trim(),
+            password: this.password.trim(),
+            type: 'APP'
+          };
+          if(resultLog.project !== 'tongji'){
+            data = {
+              k: this.encryptByEnAESLogin(JSON.stringify(data))
+            };
+          }
+          post("/auth/login", data).then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              //获取角色信息
+              let role = res.user.user.role;
+              // 配药师和支助人员才能登录
+              let workerFlag = role.some((item) => item.rolecode === "worker");
+              let pharmacistFlag = role.some((item) => item.rolecode === "pharmacist");
+              if (!workerFlag && !pharmacistFlag) {
+                uni.showToast({
+                  icon: "none",
+                  title: "暂无权限登录！",
+                });
+                return;
+              }
+              if (this.savePassword[0].checked) {
+                //记住密码
+                uni.setStorageSync("username", this.encryptByEnAES(this.username)); //存储用户名
+                uni.setStorageSync("password", this.encryptByEnAES(this.password)); //存储密码
+                uni.setStorageSync("savePasswordTime", Date.now()); //存储当前时间戳
+              } else {
+                uni.removeStorageSync('username');
+                uni.removeStorageSync('password');
+                uni.removeStorageSync('savePasswordTime');
+              }
+              uni.setStorageSync("userData", res.user);
+              this.getWorkScheme(false, res.user.user.currentHospital.id); //获取当前启动中的工作分配方案
+              this.getHistorys(res.user.user.id); //获取上班历史记录
+              this.offWork("app", this.ip);
+              if (workerFlag) { //有配药师角色
+                if (!res.user.user.online) {
+                  this.online = false;
+                } else {
+                  this.online = true;
+                  // 建立websocket连接
+                  webHandle("receiptpage", "app", this.ip);
+                }
+              } else {
+                webHandle("pharmacy", "app", this.ip);
+              }
+            } else if (!res.status && !res.remarks) {
+              //如果乱填写域名或ip
               uni.showToast({
                 icon: "none",
-                title: "暂无权限登录！",
+                title: "服务器连接失败！请检查输入的域名(IP)及端口号",
               });
-              return;
-            }
-            if (this.savePassword[0].checked) {
-              //记住密码
-              uni.setStorageSync("username", this.encryptByEnAES(this.username)); //存储用户名
-              uni.setStorageSync("password", this.encryptByEnAES(this.password)); //存储密码
-              uni.setStorageSync("savePasswordTime", Date.now()); //存储当前时间戳
-            } else {
-              uni.removeStorageSync('username');
-              uni.removeStorageSync('password');
-              uni.removeStorageSync('savePasswordTime');
-            }
-            uni.setStorageSync("userData", res.user);
-            this.getWorkScheme(false, res.user.user.currentHospital.id); //获取当前启动中的工作分配方案
-            this.getHistorys(res.user.user.id); //获取上班历史记录
-            this.offWork("app", this.ip);
-            if (workerFlag) { //有配药师角色
-              if (!res.user.user.online) {
-                this.online = false;
-              } else {
-                this.online = true;
-                // 建立websocket连接
-                webHandle("receiptpage", "app", this.ip);
-              }
             } else {
-              webHandle("pharmacy", "app", this.ip);
+              uni.showToast({
+                icon: "none",
+                title: res.remarks ? res.remarks : "请求失败",
+              });
             }
-          } else if (!res.status && !res.remarks) {
-            //如果乱填写域名或ip
-            uni.showToast({
-              icon: "none",
-              title: "服务器连接失败！请检查输入的域名(IP)及端口号",
-            });
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: res.remarks ? res.remarks : "请求失败",
-            });
-          }
-        });
+          });
+        })
+        
       },
       // 微信登录公用方法
       // user:当前登录用户对象

pages/receiptpage/receiptpage.vue

@@ -283,9 +283,9 @@
     <!-- 底部扫一扫 -->
     <view class="bigScreenWrap">
       <bigScreen ref="bigscreen"></bigScreen>
-      <view class="more"></view>
+      <view class="more" v-if="arrayBigScreen.length"></view>
       <picker class="more_picker" @click.stop @change="execFilterBigScreen($event)" :value="indexBigScreen"
-        :range="arrayBigScreen" range-key="name">
+        :range="arrayBigScreen" range-key="name" v-if="arrayBigScreen.length">
         <view class="uni-input">{{ arrayBigScreen[indexBigScreen].name }}</view>
       </picker>
     </view>