Merge remote-tracking branch 'origin/master'

src/views/hhr-view/hhrCustomer.vue

@@ -39,13 +39,16 @@
             <div style="background-image: url('./picture/hhr/b2.png');width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;" @click="rongHe"></div>
             <div style="height: 250px"></div>
         </div>
-        <van-popup  v-model="kefushow" style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;" @click-overlay="clickOverlay">
+
+        <div v-show="kefushow">
+            <van-popup  v-model="kefushow" style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;" >
                 <div style="border: 1px solid #e2e2e2;width: 92%;height: 90%;position: fixed;display: flex; align-items: center;justify-content: center;">
                     <div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">您的专属客服</div>
                     <img src="/picture/hhr/service-qrcode.jpg" style="width:55%;" >
                 </div>
             </van-popup>
         </div>
+    </div>
 
 
 </template>
@@ -89,9 +92,6 @@
             },
             packageUpgrade(){
             this.$router.push({path: 'packageUpgrade'})
-            },
-            clickOverlay(){
-                this.kefushow = false;
             }
         }
     }

src/views/hhr-view/newpackage/newPackageTips.vue

@@ -5,6 +5,7 @@
         <div style="position:fixed ;bottom: 0px;width: 100%">
             <van-button type="info" :round="true" size="large" @click="ordercar">我要领卡</van-button>
         </div>
+        <div v-show="kefushow">
             <van-popup  v-model="kefushow" style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;">
                 <div style="border: 1px solid #e2e2e2;width: 92%;height: 90%;position: fixed;display: flex; align-items: center;justify-content: center;">
                     <div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">您的专属客服</div>
@@ -12,6 +13,8 @@
                 </div>
             </van-popup>
         </div>
+
+    </div>
 </template>
 
 <script>

src/views/hhr-view/newpackage/orderNewCar.vue

@@ -17,8 +17,8 @@
                 <div style="width: 15%;height: 80px;float: left; margin-right: 10px">
                     <img src="/picture/hhr/sim-bg.png" style="width: 100%;">
                 </div>
-                <p >天翼学生证</p>
-                <p >10元/月</p>
+                <p style="font-weight: 900" >天翼学生证</p>
+                <p style="font-weight: 900">10元/月</p>
                 <p style="color: red">适用于中小学生,号码卡将统一配送至学生</p>
                 <p style="color: red"> 所在学校,由学校发放给学生。</p>
             </div>
@@ -92,11 +92,11 @@
             </div>
         </div>
 <!--        领卡确认部分-->
-        <div style="background-color:white;position: fixed;bottom: 0%">
+        <div style="background-color:white;position: fixed;bottom: 0%;width: 100%">
             <div style="margin-left: 8%;font-size: 16px;text-align:left">
                <span>
                    <div style="width: 100%;display: flex;padding-top: 2%">
-                       <van-checkbox v-model="Agree" shape="square" style="width: 10%" checked-color="#07c160">
+                       <van-checkbox v-model="Agree" shape="square" style="width: 13%" checked-color="#07c160">
                        </van-checkbox>
                        <span >同意 <a>《中国电信股份有限公司广州分公司全业务服务协议》 </a>内容</span>
                    </div>
@@ -190,7 +190,6 @@
                     imgurl=imgurl+'txiang'
                 }
                 var img = document.getElementById(imgurl);
-                console.log(img)
                 var reader = new FileReader();
                 reader.onload = function (evt) {
                     img.src = evt.target.result;