查看应用页面调整

src/views/regionSection/applicationManage/applicationManage.vue

@@ -561,9 +561,9 @@
         </div>
         <div class="view_conter">
           <div class="view_comm">
-            <div class="view_titles">
-              {{ viewInfo.appName
-              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
+            <div class="view_titles view_item">
+              {{ viewInfo.appName }}
+              <p v-if="viewInfo.enabled === 1" class="qy">启用</p>
             </div>
             <div class="view_item">
               <span>版本号码</span>
@@ -581,6 +581,7 @@
                 >
               </Select>
             </div>
+            <div class="view_item"></div>
           </div>
           <div class="view_comm">
             <div class="view_item">
@@ -598,22 +599,13 @@
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
             </div>
             <div class="view_item">
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
+              <span>应用属性</span
+              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
             </div>
             <div class="view_item">
               <span>应用大小</span>{{ viewInfo.appSize }}
             </div>
           </div>
-          <div class="view_comm">
-            <div class="view_item">
-              <span>应用属性</span
-              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
-            </div>
-            <div class="view_item" style="width: 50%">
-              <span>应用包名</span>{{ viewInfo.appPackage }}
-            </div>
-            <div class="view_item"></div>
-          </div>
           <div class="view_comm">
             <div class="view_item">
               <span style="width: 120px">网址白名单例外</span
@@ -628,6 +620,12 @@
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
             </div>
           </div>
+          <div class="view_comm">
+            <div class="view_item" style="width: 100%">
+              <span>应用包名</span>{{ viewInfo.appPackage }}
+            </div>
+            <div class="view_item"></div>
+          </div>
           <div class="view_com">
             <div class="view_t">应用截图</div>
             <div class="view_img">
@@ -640,11 +638,11 @@
           </div>
           <div class="view_com">
             <div class="view_t">应用简介</div>
-            <div>{{ viewInfo.appAbbr }}</div>
+            <div>{{ viewInfo.appAbbr || "无" }}</div>
           </div>
           <div class="view_com">
             <div class="view_t">更新</div>
-            <div>{{ viewInfo.appRenew }}</div>
+            <div>{{ viewInfo.appRenew || "无" }}</div>
           </div>
           <div class="view_com">
             <div class="view_t">授权型号</div>
@@ -2031,10 +2029,13 @@ export default {
     .view_comm {
       display: flex;
       justify-content: space-between;
-      line-height: 40px;
+      height: 40px;
+      align-items: center;
       .view_titles {
         font-size: 20px;
         font-weight: bold;
+        display: flex;
+        align-items: center;
         .qy {
           background-color: #52c41a;
           border-radius: 6px;
@@ -2046,9 +2047,11 @@ export default {
       }
       .view_item {
         width: 33%;
+        font-weight: bold;
         span {
+          font-weight: 400;
           display: inline-block;
-          width: 70px;
+          width: 120px;
           margin-right: 20px;
         }
       }
@@ -2057,10 +2060,9 @@ export default {
       display: flex;
       line-height: 40px;
       .view_t {
-        width: 70px;
+        width: 120px;
         flex: none;
         margin-right: 20px;
-        text-align: right;
       }
       .view_img {
         display: flex;

src/views/regionSection/regionManage/adminManage.vue

@@ -395,6 +395,7 @@ export default {
         loginname: "",
         loginpwd: "",
         loginpwd1: "",
+        oldPhone: "",
         phone: "",
         msgcode: "",
         address: "",
@@ -579,6 +580,7 @@ export default {
         loginname: "",
         loginpwd: generateRandomString(),
         loginpwd1: "",
+        oldPhone: "",
         phone: "",
         msgcode: "",
         enabled: 1,
@@ -650,7 +652,15 @@ export default {
             this.$Message.error("手机号码格式不正确");
             return;
           }
-          if (this.adminInfo.phone && !this.adminInfo.msgcode) {
+          if (
+            (!this.adminInfo.adminid &&
+              this.adminInfo.phone &&
+              !this.adminInfo.msgcode) ||
+            (this.adminInfo.adminid &&
+              this.adminInfo.phone &&
+              this.adminInfo.phone !== this.adminInfo.oldPhone &&
+              !this.adminInfo.msgcode)
+          ) {
             this.$Message.error("请输入短信验证码");
             return;
           }
@@ -738,6 +748,7 @@ export default {
             loginpwd: "",
             loginpwd1: "",
             phone: res.obj.phone,
+            oldPhone: res.obj.phone,
             msgcode: "",
             enabled: res.obj.enabled,
             atype: res.obj.atype,

src/views/regionSection/search/allApps.vue

@@ -245,22 +245,13 @@
             <div class="view_item">
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
             </div>
-            <div class="view_item">
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
-            </div>
-            <div class="view_item">
-              <span>应用大小</span>{{ viewInfo.appSize }}
-            </div>
-          </div>
-          <div class="view_comm">
             <div class="view_item">
               <span>应用属性</span
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
             </div>
-            <div class="view_item" style="width: 50%">
-              <span>应用包名</span>{{ viewInfo.appPackage }}
+            <div class="view_item">
+              <span>应用大小</span>{{ viewInfo.appSize }}
             </div>
-            <div class="view_item"></div>
           </div>
           <div class="view_comm">
             <div class="view_item">
@@ -276,6 +267,12 @@
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
             </div>
           </div>
+          <div class="view_comm">
+            <div class="view_item" style="width: 100%">
+              <span>应用包名</span>{{ viewInfo.appPackage }}
+            </div>
+            <div class="view_item"></div>
+          </div>
           <div class="view_com">
             <div class="view_t">应用截图</div>
             <div class="view_img">
@@ -942,10 +939,13 @@ export default {
     .view_comm {
       display: flex;
       justify-content: space-between;
-      line-height: 40px;
+      height: 40px;
+      align-items: center;
       .view_titles {
         font-size: 20px;
         font-weight: bold;
+        display: flex;
+        align-items: center;
         .qy {
           background-color: #52c41a;
           border-radius: 6px;
@@ -957,9 +957,11 @@ export default {
       }
       .view_item {
         width: 33%;
+        font-weight: bold;
         span {
           display: inline-block;
-          width: 70px;
+          font-weight: 400;
+          width: 120px;
           margin-right: 20px;
         }
       }
@@ -968,10 +970,9 @@ export default {
       display: flex;
       line-height: 40px;
       .view_t {
-        width: 70px;
+        width: 120px;
         flex: none;
         margin-right: 20px;
-        text-align: right;
       }
       .view_img {
         display: flex;

src/views/schoolSection/applicationManage/applicationList.vue

@@ -533,22 +533,13 @@
             <div class="view_item">
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
             </div>
-            <div class="view_item">
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
-            </div>
-            <div class="view_item">
-              <span>应用大小</span>{{ viewInfo.appSize }}
-            </div>
-          </div>
-          <div class="view_comm">
             <div class="view_item">
               <span>应用属性</span
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
             </div>
-            <div class="view_item" style="width: 50%">
-              <span>应用包名</span>{{ viewInfo.appPackage }}
+            <div class="view_item">
+              <span>应用大小</span>{{ viewInfo.appSize }}
             </div>
-            <div class="view_item"></div>
           </div>
           <div class="view_comm">
             <div class="view_item">
@@ -564,6 +555,12 @@
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
             </div>
           </div>
+          <div class="view_comm">
+            <div class="view_item" style="width: 100%">
+              <span>应用包名</span>{{ viewInfo.appPackage }}
+            </div>
+            <div class="view_item"></div>
+          </div>
           <div class="view_com">
             <div class="view_t">应用截图</div>
             <div class="view_img">
@@ -1826,10 +1823,13 @@ export default {
     .view_comm {
       display: flex;
       justify-content: space-between;
-      line-height: 40px;
+      height: 40px;
+      align-items: center;
       .view_titles {
         font-size: 20px;
         font-weight: bold;
+        display: flex;
+        align-items: center;
         .qy {
           background-color: #52c41a;
           border-radius: 6px;
@@ -1841,9 +1841,11 @@ export default {
       }
       .view_item {
         width: 33%;
+        font-weight: bold;
         span {
           display: inline-block;
-          width: 70px;
+          font-weight: 400;
+          width: 120px;
           margin-right: 20px;
         }
       }
@@ -1852,10 +1854,9 @@ export default {
       display: flex;
       line-height: 40px;
       .view_t {
-        width: 70px;
+        width: 120px;
         flex: none;
         margin-right: 20px;
-        text-align: right;
       }
       .view_img {
         display: flex;