'样式修改，'

public/index.html

@@ -29,5 +29,26 @@
         }
         window.onresize = resizeRoot;
     })(window);
+    // 强制禁止用户修改微信客户端的字体大小
+    (function() {
+      function handleFontSize() {
+          // 设置网页字体为默认大小
+          WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize' : 0 });
+          // 重写设置网页字体大小的事件
+          WeixinJSBridge.on('menu:setfont', function() {
+              WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize' : 0 });
+          });
+      }
+
+      if (typeof WeixinJSBridge == "object" && typeof WeixinJSBridge.invoke == "function") {
+          handleFontSize();
+      } else {
+          if (document.addEventListener) {
+              document.addEventListener("WeixinJSBridgeReady", handleFontSize, false);
+          } else if (document.attachEvent) {
+              document.attachEvent("WeixinJSBridgeReady", handleFontSize);
+              document.attachEvent("onWeixinJSBridgeReady", handleFontSize);  }
+      }
+    })();
 </script>
 </html>
\ No newline at end of file

src/api/apiList.js

@@ -10,8 +10,8 @@ const baseUrl = '/api'
 // todo: url
 // const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
 const httpUrl = 'https://repair.zeruiedu.com' // 正式接口
-const h5Url = 'http://localhost:8080' // 测试h5线上地址
-// const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
+// const h5Url = 'http://localhost:8080' // 测试h5线上地址
+const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
 window.localStorage.setItem('httpUrl', httpUrl)
 window.localStorage.setItem('h5Url', h5Url)
 // const httpUrl = 'https://fenghexm.xueyoubangedu.com' // 正式接口

src/assets/styles/common.scss

 @charset "UTF-8";
+/* iOS禁止微信调整字体大小 */
+body {
+    -webkit-text-size-adjust: 100% !important;
+    text-size-adjust: 100% !important;
+    -moz-text-size-adjust: 100% !important;
+}
+
 html, body, div, span, applet, object, iframe, h1, h2, h3,
 h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address,
 big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp,

src/assets/styles/global.scss

@@ -196,4 +196,8 @@ $text-gray: #989794;
 // 
 .self-cont-sticky .van-sticky.van-sticky--fixed {
     width: 1rem !important;
+}
+
+.specile-text {
+    color: #ff0000 !important;
 }
\ No newline at end of file

src/assets/styles/index/menulist.scss

@@ -16,7 +16,7 @@
     }
 
     .title-cont {
-        font-size: .32rem;
+        font-size: 0.4rem;
     }
 }
 

src/assets/styles/tabbar/admin_index.scss

@@ -22,13 +22,13 @@
 
 .top .status {
     color: #0054ff;
-    font-size: 0.36rem;
+    font-size: 0.38rem;
     font-weight: bold;
 }
 
 .menu .hc_total {
     color: #727272;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
 }
 
 .menu .options {
@@ -38,7 +38,7 @@
     border: 1px solid #0054ff;
     border-radius: 0.12rem;
     color: #0054ff;
-    font-size: 0.28rem;
+    font-size: 0.34rem;
     line-height: 0.58rem;
     text-align: center;
     position: relative;
@@ -74,7 +74,7 @@
     text-align: center;
     line-height: 0.58rem;
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
 }
 .date .end {
     width: 3.08rem;
@@ -85,7 +85,7 @@
     text-align: center;
     line-height: 0.58rem;
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
 }
 .date .blue{
     width: 0.31rem;
@@ -111,7 +111,7 @@
     text-align: center;
     line-height: 0.7rem;
     color: #000000;
-    font-size: 0.24rem;
+    font-size: 0.32rem;
     // margin-right: 0.2rem;
 }
 .allBtn .sureBtn {
@@ -122,7 +122,7 @@
     text-align: center;
     line-height: 0.7rem;
     color: #fff;
-    font-size: 0.24rem;
+    font-size: 0.32rem;
     margin-left: 0.2rem;
 }
 .cancel_cont{
@@ -141,12 +141,12 @@
     border-radius: 0.12rem;
     margin: 0.4rem auto 0.2rem;
     padding: 0.4rem 0.3rem;
-    font-size: 0.3rem;
+    font-size: 0.4rem;
 }
 
 .title {
     color: #0054ff;
-    font-size: 0.32rem;
+    // font-size: 0.4rem;
     font-weight: bold;
     margin-bottom: 0.5rem;
 }
@@ -225,7 +225,7 @@
 }
 
 .btn {
-    margin-top: 0.2rem;
+    margin-top: 0.5rem;
 }
 
 .btn-item {
@@ -236,8 +236,9 @@
     text-align: center;
     line-height: 0.7rem;
     color: #fff;
-    font-size: 0.27rem;
+    font-size: 0.34rem;
     margin-left: 0.2rem;
+    margin-bottom: .1rem;
 }
 
 .sf-btn {
@@ -263,7 +264,7 @@
 
 .pop_title {
     color: #000000;
-    font-size: 0.36rem;
+    font-size: 0.4rem;
     font-weight: bold;
     margin-bottom: 0.4rem;
 }
@@ -362,7 +363,7 @@
 }
 .tc-box .tc-title{
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
     margin-bottom: 0.3rem;
     font-weight: bold;
     text-align: center;
@@ -376,7 +377,7 @@
     background: #f2f2f2;
     line-height: 0.56rem;
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
     padding-left: 0.3rem;
     margin-bottom: 0.3rem;
 }
@@ -392,7 +393,7 @@
 }
 .tc-box .workers .gr-item .gr-name{
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
 }
 .tc-box .workers .k-img {
     width: 0.42rem;
@@ -437,5 +438,13 @@
 .none{
     margin-left: 0.3rem;
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
+}
+
+/deep/ .van-ellipsis {
+    font-size: 0.4rem !important;
+}
+
+/deep/ .van-picker__confirm, /deep/ .van-picker__cancel {
+    font-size: 0.4rem !important;
 }
\ No newline at end of file

src/assets/styles/tabbar/index.scss

@@ -18,12 +18,12 @@
 }
 .top .status {
     color: #0054ff;
-    font-size: 0.36rem;
+    font-size: 0.38rem;
     font-weight: bold;
 }
 .menu .hc_total {
     color: #727272;
-    font-size: 0.28rem;
+    font-size: 0.4rem;
 }
 .menu .options {
     width: 1.76rem;
@@ -32,7 +32,7 @@
     border: 1px solid #0054ff;
     border-radius: 0.12rem;
     color: #0054ff;
-    font-size: 0.28rem;
+    font-size: 0.34rem;
     line-height: 0.58rem;
     text-align: center;
     position: relative;
@@ -57,11 +57,11 @@
     border-radius: 0.12rem;
     margin: 0.4rem auto 0.2rem;
     padding: 0.4rem 0.3rem;
-    font-size: 0.3rem;
+    font-size: 0.4rem;
 }
 .title {
     color: #0054ff;
-    font-size: 0.32rem;
+    // font-size: 0.4rem;
     font-weight: bold;
     margin-bottom: 0.5rem;
 }
@@ -121,7 +121,6 @@
 }
 .bz-title{
     margin-bottom: 0.2rem;
-    color: #ff0000;
 }
 .one {
     color: #727272;
@@ -159,7 +158,7 @@
     margin-right: 0.3rem;
 }
 .btn{
-    margin-top: 0.2rem;
+    margin-top: 0.5rem;
 }
 .btn-item {
     width: 1.8rem;
@@ -169,8 +168,9 @@
     text-align: center;
     line-height: 0.7rem;
     color: #fff;
-    font-size: 0.27rem;
+    font-size: 0.34rem;
     margin-left: 0.2rem;
+    margin-bottom: .1rem;
 }
 .sf-btn {
     background: #ffffff;
@@ -201,7 +201,7 @@
 // }
 .pop_title {
     color: #000000;
-    font-size: 0.36rem;
+    font-size: 0.4rem;
     font-weight: bold;
     margin-bottom: 0.4rem;
 }
@@ -214,7 +214,7 @@
 }
 .van-popup textarea::-webkit-input-placeholder {
     color: #c8c8c8;
-    font-size: 0.26rem;
+    font-size: 0.34rem;
 }
 .btnItem {
     margin-top: 0.4rem;
@@ -280,7 +280,7 @@
     color: #000000;
     font-size: 0.26rem;
     margin-left: 0.3rem;
-    margin-top: 0.4rem;
+    // margin-top: 0.4rem;
 }
 .sure-btn {
     width: 3.12rem;
@@ -309,7 +309,7 @@
     text-align: center;
     line-height: 0.58rem;
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.34rem;
 }
 
 .date .end {
@@ -321,11 +321,19 @@
     text-align: center;
     line-height: 0.58rem;
     color: #000000;
-    font-size: 0.28rem;
+    font-size: 0.34rem;
 }
 
 .date .blue {
     width: 0.31rem;
     height: 0.03rem;
     background: #0054FF;
+}
+
+/deep/ .van-ellipsis {
+    font-size: 0.4rem !important;
+}
+
+/deep/ .van-picker__confirm, /deep/ .van-picker__cancel {
+    font-size: 0.4rem !important;
 }
\ No newline at end of file

src/assets/styles/tabbar/modifyPhone.scss

@@ -28,7 +28,7 @@
 }
 input::-webkit-input-placeholder{
     color: #C8C8C8;
-    font-size: 0.28rem;
+    font-size: 0.32rem;
 }
 .code{
     position: relative;

src/views/my/admin_detail.vue

@@ -46,7 +46,7 @@
                     </div>
                 </div>
                 <div class="material" v-if="order.no_pay_order">
-                    <div class="item-title bz-title">待支付耗材</div>
+                    <div class="item-title bz-title specile-text">待支付耗材：</div>
                     <div
                         class="no-pay ma-item flex-h flex-hb"
                         v-for="(child, index) in order.no_pay_order.goods"

src/views/my/charge.vue

@@ -9,7 +9,7 @@
             <div class="item-desc que-desc">
                 {{ order.repair_type.type_name }}-{{ order.description }}
             </div>
-            <div class="item flex-h flex-vc">
+            <div class="item flex-h flex-start">
                 <div class="item-title">服务地址：</div>
                 <div class="item-desc">
                     {{ order.region.region_name }}-{{ order.room.room_name }}-{{
@@ -31,7 +31,7 @@
                 <div class="item-title">提交时间：</div>
                 <div class="item-desc">2021-06-17 09:28:43</div>
             </div>
-            <div class="item flex-h flex-vc">
+            <div class="item flex-h flex-start">
                 <div class="item-title">图片详情：</div>
                 <div
                     class="img flex-h"
@@ -132,9 +132,7 @@
         <!-- 底部 -->
         <div class="bottom flex-h flex-hb flex-vc">
             <div class="left">
-                共
-                <span>{{ goods_number }}</span
-                >件，总金额:
+                共<span>{{ goods_number }}</span>件，总金额:
                 <!-- <span v-if="isNaN(total_price)">￥暂无</span> -->
                 <span>￥{{ total_price }}</span>
             </div>
@@ -371,6 +369,7 @@ export default {
     min-height: 100vh;
     background: #fff;
     padding-top: 0.2rem;
+    font-size: 0.4rem;
 }
 .backBtn {
     width: 1rem;
@@ -398,17 +397,18 @@ export default {
     margin: 0rem auto;
 }
 .item {
-    height: 0.3rem;
-    margin-bottom: 0.4rem;
+    // height: 0.3rem;
+    margin-bottom: 0.2rem;
+    font-size: 0.4rem;
 }
 .title {
     color: #0054ff;
-    font-size: 0.32rem;
+    // font-size: 0.4rem;
     font-weight: bold;
 }
 .item-title {
     color: #000000;
-    font-size: 0.3rem;
+    // font-size: 0.4rem;
     white-space: nowrap;
 }
 .hc_field {
@@ -416,11 +416,11 @@ export default {
 }
 .item-desc {
     color: #727272;
-    font-size: 0.3rem;
+    // font-size: 0.3rem;
 }
 .que-desc {
-    margin-top: 0.4rem;
-    margin-bottom: 0.4rem;
+    margin-top: 0.2rem;
+    margin-bottom: 0.2rem;
 }
 .phone {
     color: #0054ff;
@@ -429,7 +429,7 @@ export default {
     width: 1.2rem;
     height: 1.2rem;
     border-radius: 0.08rem;
-    margin-top: 0.8rem;
+    // margin-top: 0.8rem;
     margin-right: 0.16rem;
     border-radius: 0.08rem;
 }
@@ -448,7 +448,7 @@ export default {
 }
 .things_title {
     color: #000000;
-    font-size: 0.3rem;
+    font-size: 0.4rem;
     font-weight: bold;
     margin-bottom: 0.4rem;
 }
@@ -458,11 +458,11 @@ export default {
 }
 .title_r {
     color: #727272;
-    font-size: 0.3rem;
+    font-size: 0.4rem;
 }
 .select .select_txt {
     color: #0054ff;
-    font-size: 0.3rem;
+    font-size: 0.4rem;
     margin-right: 0.2rem;
 }
 .select img {
@@ -476,12 +476,13 @@ export default {
 }
 .add-btn {
     color: #0054ff;
-    font-size: 0.3rem;
+    font-size: 0.4rem;
     margin: 0.2rem auto 0;
 }
 .list-item {
     margin-bottom: 0.8rem;
     position: relative;
+    font-size: 0.4rem;
 }
 .delete-btn {
     width: 0.4rem;
@@ -502,7 +503,7 @@ export default {
     width: 100%;
     height: 1.04rem;
     background: #ffffff;
-    padding-left: 0.3rem;
+    padding-left: 0.34rem;
     padding-right: 0.3rem;
     position: fixed;
     left: 0;
@@ -510,7 +511,7 @@ export default {
 }
 .left {
     color: #000;
-    font-size: 0.28rem;
+    font-size: 0.36rem;
 }
 .left span {
     color: #0054ff;
@@ -523,16 +524,21 @@ export default {
     text-align: center;
     line-height: 0.76rem;
     color: #ffffff;
-    font-size: 0.26rem;
+    // font-size: 0.26rem;
+    font-size: 0.36rem;
 }
 .skBtn {
-    width: 3rem;
+    width: 2.6rem;
     height: 0.76rem;
     background: #0054ff;
     border-radius: 0.38rem;
     text-align: center;
     line-height: 0.76rem;
     color: #ffffff;
-    font-size: 0.26rem;
+    // font-size: 0.26rem;
+    font-size: 0.36rem;
+}
+/deep/.things .van-ellipsis {
+    font-size: 0.4rem !important;
 }
 </style>

src/views/my/order_detail.vue

@@ -53,7 +53,7 @@
                     <div class="item-desc">{{ order.telephone }}</div>
                 </div>
                 <div class="material" v-if="order.no_pay_order">
-                    <div class="item-title bz-title">待支付耗材</div>
+                    <div class="item-title bz-title specile-text">待支付耗材：</div>
                     <div
                         class="no-pay ma-item flex-h flex-hb"
                         v-for="(child, index) in order.no_pay_order.goods"
@@ -115,7 +115,7 @@
                     <div class="item-title">退回备注:</div>
                     <div class="item-desc">{{ order.orderlog_cancel.remark }}</div>
                 </div>
-                <div class="btn flex-h flex-hr" v-if="btnShow">
+                <div class="btn flex-h flex-hr flex-hw" v-if="btnShow">
                     <div
                         v-if="order.is_can_remark_material == 1"
                         class="btn-item bz-btn"
@@ -211,13 +211,9 @@
                             v-for="(item, index) in expend_detail.list"
                             :key="index"
                         >
-                            <div class="one one1 one_title text-line-one">
-                                {{
-                                item.parent_detail
-                                ? item.parent_detail.goods_name
-                                : '其它'
-                                }}
-                            </div>
+                            <div
+                                class="one one1 one_title text-line-one"
+                            >{{ item.parent_detail ? item.parent_detail.goods_name : '其它' }}</div>
                             <div class="one one2 flex-h">
                                 <div class="_one text-line-one">
                                     {{

src/views/tabbar/Home.vue

@@ -4,7 +4,7 @@
             <div class="point"></div>
             <div class="status">{{ user.online_status_display }}</div>
         </div>
-        <div class="menu flex-h flex-hb">
+        <div class="menu flex-h flex-hb flex-vc">
             <div class="hc_total">共{{ count }}个工单</div>
             <div class="options">
                 <div @click="chooseTab">{{ curSelect.name }}</div>
@@ -93,7 +93,7 @@
                         <div class="item-desc">{{ item.worker.phone }}</div>
                     </div>
                     <div class="material" v-if="item.no_pay_order">
-                        <div class="item-title bz-title">待支付耗材</div>
+                        <div class="item-title bz-title specile-text">待支付耗材：</div>
                         <div
                             class="no-pay ma-item flex-h flex-hb"
                             v-for="(child, index) in item.no_pay_order.goods"
@@ -133,7 +133,7 @@
                     </div>
                     <!-- <div class="line"></div> -->
                     <div class="material" v-if="item.free_material_order">
-                        <div class="item-title bz-title">备注耗材</div>
+                        <div class="item-title bz-title">备注耗材：</div>
                         <div
                             class="ma-item flex-h flex-hb"
                             v-for="(child, index) in item.free_material_order
@@ -153,7 +153,7 @@
                         </div>
                         <div class="item_line"></div>
                     </div>
-                    <div class="btn flex-h flex-hr">
+                    <div class="btn flex-h flex-hr flex-hw">
                         <div
                             v-if="item.is_can_remark_material == 1"
                             class="btn-item bz-btn"

src/views/tabbar/admin_home.vue

@@ -137,7 +137,7 @@
                         </div>
                     </div>
                     <div class="material" v-if="item.no_pay_order">
-                        <div class="item-title bz-title">待支付耗材</div>
+                        <div class="item-title bz-title specile-text">待支付耗材：</div>
                         <div
                             class="no-pay ma-item flex-h flex-hb"
                             v-for="(child, index) in item.no_pay_order.goods"
@@ -153,7 +153,7 @@
                         <div class="item_line"></div>
                     </div>
                     <div class="material" v-if="item.pay_order != ''">
-                        <div class="item-title bz-title">已支付耗材</div>
+                        <div class="item-title bz-title">已支付耗材：</div>
                         <div v-for="(parent, index) in item.pay_order" :key="index">
                             <div
                                 class="ma-item flex-h flex-hb"
@@ -175,7 +175,7 @@
                     </div>
                     <!-- <div class="line"></div> -->
                     <div class="material" v-if="item.free_material_order">
-                        <div class="item-title bz-title">备注耗材</div>
+                        <div class="item-title bz-title">备注耗材：</div>
                         <div
                             class="ma-item flex-h flex-hb"
                             v-for="(child, index) in item.free_material_order.goods"