Browse Source

查看应用页面调整

gzb
guozhongbo 8 months ago
parent
commit
cee1b4c120

+ 22
- 20
src/views/regionSection/applicationManage/applicationManage.vue View File

561
         </div>
561
         </div>
562
         <div class="view_conter">
562
         <div class="view_conter">
563
           <div class="view_comm">
563
           <div class="view_comm">
564
-            <div class="view_titles">
565
-              {{ viewInfo.appName
566
-              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
564
+            <div class="view_titles view_item">
565
+              {{ viewInfo.appName }}
566
+              <p v-if="viewInfo.enabled === 1" class="qy">启用</p>
567
             </div>
567
             </div>
568
             <div class="view_item">
568
             <div class="view_item">
569
               <span>版本号码</span>
569
               <span>版本号码</span>
581
                 >
581
                 >
582
               </Select>
582
               </Select>
583
             </div>
583
             </div>
584
+            <div class="view_item"></div>
584
           </div>
585
           </div>
585
           <div class="view_comm">
586
           <div class="view_comm">
586
             <div class="view_item">
587
             <div class="view_item">
598
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
599
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
599
             </div>
600
             </div>
600
             <div class="view_item">
601
             <div class="view_item">
601
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
602
+              <span>应用属性</span
603
+              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
602
             </div>
604
             </div>
603
             <div class="view_item">
605
             <div class="view_item">
604
               <span>应用大小</span>{{ viewInfo.appSize }}
606
               <span>应用大小</span>{{ viewInfo.appSize }}
605
             </div>
607
             </div>
606
           </div>
608
           </div>
607
-          <div class="view_comm">
608
-            <div class="view_item">
609
-              <span>应用属性</span
610
-              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
611
-            </div>
612
-            <div class="view_item" style="width: 50%">
613
-              <span>应用包名</span>{{ viewInfo.appPackage }}
614
-            </div>
615
-            <div class="view_item"></div>
616
-          </div>
617
           <div class="view_comm">
609
           <div class="view_comm">
618
             <div class="view_item">
610
             <div class="view_item">
619
               <span style="width: 120px">网址白名单例外</span
611
               <span style="width: 120px">网址白名单例外</span
628
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
620
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
629
             </div>
621
             </div>
630
           </div>
622
           </div>
623
+          <div class="view_comm">
624
+            <div class="view_item" style="width: 100%">
625
+              <span>应用包名</span>{{ viewInfo.appPackage }}
626
+            </div>
627
+            <div class="view_item"></div>
628
+          </div>
631
           <div class="view_com">
629
           <div class="view_com">
632
             <div class="view_t">应用截图</div>
630
             <div class="view_t">应用截图</div>
633
             <div class="view_img">
631
             <div class="view_img">
640
           </div>
638
           </div>
641
           <div class="view_com">
639
           <div class="view_com">
642
             <div class="view_t">应用简介</div>
640
             <div class="view_t">应用简介</div>
643
-            <div>{{ viewInfo.appAbbr }}</div>
641
+            <div>{{ viewInfo.appAbbr || "无" }}</div>
644
           </div>
642
           </div>
645
           <div class="view_com">
643
           <div class="view_com">
646
             <div class="view_t">更新</div>
644
             <div class="view_t">更新</div>
647
-            <div>{{ viewInfo.appRenew }}</div>
645
+            <div>{{ viewInfo.appRenew || "无" }}</div>
648
           </div>
646
           </div>
649
           <div class="view_com">
647
           <div class="view_com">
650
             <div class="view_t">授权型号</div>
648
             <div class="view_t">授权型号</div>
2031
     .view_comm {
2029
     .view_comm {
2032
       display: flex;
2030
       display: flex;
2033
       justify-content: space-between;
2031
       justify-content: space-between;
2034
-      line-height: 40px;
2032
+      height: 40px;
2033
+      align-items: center;
2035
       .view_titles {
2034
       .view_titles {
2036
         font-size: 20px;
2035
         font-size: 20px;
2037
         font-weight: bold;
2036
         font-weight: bold;
2037
+        display: flex;
2038
+        align-items: center;
2038
         .qy {
2039
         .qy {
2039
           background-color: #52c41a;
2040
           background-color: #52c41a;
2040
           border-radius: 6px;
2041
           border-radius: 6px;
2046
       }
2047
       }
2047
       .view_item {
2048
       .view_item {
2048
         width: 33%;
2049
         width: 33%;
2050
+        font-weight: bold;
2049
         span {
2051
         span {
2052
+          font-weight: 400;
2050
           display: inline-block;
2053
           display: inline-block;
2051
-          width: 70px;
2054
+          width: 120px;
2052
           margin-right: 20px;
2055
           margin-right: 20px;
2053
         }
2056
         }
2054
       }
2057
       }
2057
       display: flex;
2060
       display: flex;
2058
       line-height: 40px;
2061
       line-height: 40px;
2059
       .view_t {
2062
       .view_t {
2060
-        width: 70px;
2063
+        width: 120px;
2061
         flex: none;
2064
         flex: none;
2062
         margin-right: 20px;
2065
         margin-right: 20px;
2063
-        text-align: right;
2064
       }
2066
       }
2065
       .view_img {
2067
       .view_img {
2066
         display: flex;
2068
         display: flex;

+ 12
- 1
src/views/regionSection/regionManage/adminManage.vue View File

395
         loginname: "",
395
         loginname: "",
396
         loginpwd: "",
396
         loginpwd: "",
397
         loginpwd1: "",
397
         loginpwd1: "",
398
+        oldPhone: "",
398
         phone: "",
399
         phone: "",
399
         msgcode: "",
400
         msgcode: "",
400
         address: "",
401
         address: "",
579
         loginname: "",
580
         loginname: "",
580
         loginpwd: generateRandomString(),
581
         loginpwd: generateRandomString(),
581
         loginpwd1: "",
582
         loginpwd1: "",
583
+        oldPhone: "",
582
         phone: "",
584
         phone: "",
583
         msgcode: "",
585
         msgcode: "",
584
         enabled: 1,
586
         enabled: 1,
650
             this.$Message.error("手机号码格式不正确");
652
             this.$Message.error("手机号码格式不正确");
651
             return;
653
             return;
652
           }
654
           }
653
-          if (this.adminInfo.phone && !this.adminInfo.msgcode) {
655
+          if (
656
+            (!this.adminInfo.adminid &&
657
+              this.adminInfo.phone &&
658
+              !this.adminInfo.msgcode) ||
659
+            (this.adminInfo.adminid &&
660
+              this.adminInfo.phone &&
661
+              this.adminInfo.phone !== this.adminInfo.oldPhone &&
662
+              !this.adminInfo.msgcode)
663
+          ) {
654
             this.$Message.error("请输入短信验证码");
664
             this.$Message.error("请输入短信验证码");
655
             return;
665
             return;
656
           }
666
           }
738
             loginpwd: "",
748
             loginpwd: "",
739
             loginpwd1: "",
749
             loginpwd1: "",
740
             phone: res.obj.phone,
750
             phone: res.obj.phone,
751
+            oldPhone: res.obj.phone,
741
             msgcode: "",
752
             msgcode: "",
742
             enabled: res.obj.enabled,
753
             enabled: res.obj.enabled,
743
             atype: res.obj.atype,
754
             atype: res.obj.atype,

+ 16
- 15
src/views/regionSection/search/allApps.vue View File

245
             <div class="view_item">
245
             <div class="view_item">
246
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
246
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
247
             </div>
247
             </div>
248
-            <div class="view_item">
249
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
250
-            </div>
251
-            <div class="view_item">
252
-              <span>应用大小</span>{{ viewInfo.appSize }}
253
-            </div>
254
-          </div>
255
-          <div class="view_comm">
256
             <div class="view_item">
248
             <div class="view_item">
257
               <span>应用属性</span
249
               <span>应用属性</span
258
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
250
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
259
             </div>
251
             </div>
260
-            <div class="view_item" style="width: 50%">
261
-              <span>应用包名</span>{{ viewInfo.appPackage }}
252
+            <div class="view_item">
253
+              <span>应用大小</span>{{ viewInfo.appSize }}
262
             </div>
254
             </div>
263
-            <div class="view_item"></div>
264
           </div>
255
           </div>
265
           <div class="view_comm">
256
           <div class="view_comm">
266
             <div class="view_item">
257
             <div class="view_item">
276
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
267
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
277
             </div>
268
             </div>
278
           </div>
269
           </div>
270
+          <div class="view_comm">
271
+            <div class="view_item" style="width: 100%">
272
+              <span>应用包名</span>{{ viewInfo.appPackage }}
273
+            </div>
274
+            <div class="view_item"></div>
275
+          </div>
279
           <div class="view_com">
276
           <div class="view_com">
280
             <div class="view_t">应用截图</div>
277
             <div class="view_t">应用截图</div>
281
             <div class="view_img">
278
             <div class="view_img">
942
     .view_comm {
939
     .view_comm {
943
       display: flex;
940
       display: flex;
944
       justify-content: space-between;
941
       justify-content: space-between;
945
-      line-height: 40px;
942
+      height: 40px;
943
+      align-items: center;
946
       .view_titles {
944
       .view_titles {
947
         font-size: 20px;
945
         font-size: 20px;
948
         font-weight: bold;
946
         font-weight: bold;
947
+        display: flex;
948
+        align-items: center;
949
         .qy {
949
         .qy {
950
           background-color: #52c41a;
950
           background-color: #52c41a;
951
           border-radius: 6px;
951
           border-radius: 6px;
957
       }
957
       }
958
       .view_item {
958
       .view_item {
959
         width: 33%;
959
         width: 33%;
960
+        font-weight: bold;
960
         span {
961
         span {
961
           display: inline-block;
962
           display: inline-block;
962
-          width: 70px;
963
+          font-weight: 400;
964
+          width: 120px;
963
           margin-right: 20px;
965
           margin-right: 20px;
964
         }
966
         }
965
       }
967
       }
968
       display: flex;
970
       display: flex;
969
       line-height: 40px;
971
       line-height: 40px;
970
       .view_t {
972
       .view_t {
971
-        width: 70px;
973
+        width: 120px;
972
         flex: none;
974
         flex: none;
973
         margin-right: 20px;
975
         margin-right: 20px;
974
-        text-align: right;
975
       }
976
       }
976
       .view_img {
977
       .view_img {
977
         display: flex;
978
         display: flex;

+ 16
- 15
src/views/schoolSection/applicationManage/applicationList.vue View File

533
             <div class="view_item">
533
             <div class="view_item">
534
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
534
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
535
             </div>
535
             </div>
536
-            <div class="view_item">
537
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
538
-            </div>
539
-            <div class="view_item">
540
-              <span>应用大小</span>{{ viewInfo.appSize }}
541
-            </div>
542
-          </div>
543
-          <div class="view_comm">
544
             <div class="view_item">
536
             <div class="view_item">
545
               <span>应用属性</span
537
               <span>应用属性</span
546
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
538
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
547
             </div>
539
             </div>
548
-            <div class="view_item" style="width: 50%">
549
-              <span>应用包名</span>{{ viewInfo.appPackage }}
540
+            <div class="view_item">
541
+              <span>应用大小</span>{{ viewInfo.appSize }}
550
             </div>
542
             </div>
551
-            <div class="view_item"></div>
552
           </div>
543
           </div>
553
           <div class="view_comm">
544
           <div class="view_comm">
554
             <div class="view_item">
545
             <div class="view_item">
564
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
555
               >{{ viewInfo.strategy === 0 ? "否" : "是" }}
565
             </div>
556
             </div>
566
           </div>
557
           </div>
558
+          <div class="view_comm">
559
+            <div class="view_item" style="width: 100%">
560
+              <span>应用包名</span>{{ viewInfo.appPackage }}
561
+            </div>
562
+            <div class="view_item"></div>
563
+          </div>
567
           <div class="view_com">
564
           <div class="view_com">
568
             <div class="view_t">应用截图</div>
565
             <div class="view_t">应用截图</div>
569
             <div class="view_img">
566
             <div class="view_img">
1826
     .view_comm {
1823
     .view_comm {
1827
       display: flex;
1824
       display: flex;
1828
       justify-content: space-between;
1825
       justify-content: space-between;
1829
-      line-height: 40px;
1826
+      height: 40px;
1827
+      align-items: center;
1830
       .view_titles {
1828
       .view_titles {
1831
         font-size: 20px;
1829
         font-size: 20px;
1832
         font-weight: bold;
1830
         font-weight: bold;
1831
+        display: flex;
1832
+        align-items: center;
1833
         .qy {
1833
         .qy {
1834
           background-color: #52c41a;
1834
           background-color: #52c41a;
1835
           border-radius: 6px;
1835
           border-radius: 6px;
1841
       }
1841
       }
1842
       .view_item {
1842
       .view_item {
1843
         width: 33%;
1843
         width: 33%;
1844
+        font-weight: bold;
1844
         span {
1845
         span {
1845
           display: inline-block;
1846
           display: inline-block;
1846
-          width: 70px;
1847
+          font-weight: 400;
1848
+          width: 120px;
1847
           margin-right: 20px;
1849
           margin-right: 20px;
1848
         }
1850
         }
1849
       }
1851
       }
1852
       display: flex;
1854
       display: flex;
1853
       line-height: 40px;
1855
       line-height: 40px;
1854
       .view_t {
1856
       .view_t {
1855
-        width: 70px;
1857
+        width: 120px;
1856
         flex: none;
1858
         flex: none;
1857
         margin-right: 20px;
1859
         margin-right: 20px;
1858
-        text-align: right;
1859
       }
1860
       }
1860
       .view_img {
1861
       .view_img {
1861
         display: flex;
1862
         display: flex;

Loading…
Cancel
Save