Merge branch 'master' of http://git.shengws.com/csx/Pad_New

config/dev.env.js

@@ -4,8 +4,8 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  //BASE_API: '"https://api.xt.kuyicloud.com"'
-  BASE_API: '"http://localhost:9531"'
+  BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"http://localhost:9531"'
   //BASE_API: '"http://localhost:9529"'
   //http://api.xt.test.sgjyun.com http://localhost:9529
   // BASE_API: '"http://api.xt.test.sgjyun.com"'

src/pages/home/active.vue

@@ -49,11 +49,7 @@
                     <img src="../../assets/images/goods_03.png" alt="">
                     <img src="../../assets/images/goods_07.png" alt="">
                     <img src="../../assets/images/goods_09.png" alt="">
-                    <p class="attention">注意</p>
-                    <p>*本次活动免费赠送且包邮，请正确填写您的个人资料，工作人员将在<span>1-3</span>天内通过电话或微信方式联系您并核对信息，尽快为您安排发货</p>
-                    <span>*提交信息成功即可扫码加入活动微信交流群</span>
-                    <p>*标有<span>*</span>的栏目必须填写;</p>
-                    <p class="litle">以上解释权归酷医云所有，敬请留意</p>
+                    
                 </div>  
             </div>
             <div class="join" @click="toActiveForm">我 要 报 名</div>
@@ -75,16 +71,16 @@ export default {
 <style lang="scss" scoped>
 .page_active{
     // overflow-y: auto;
-    background: url("../../assets/images/activeBanner.png") no-repeat;
+    background: url("https://images.shengws.com/2020/4/23/admin_avatar_1587638028661.png") no-repeat;
     background-size:100%;
-    height:100rem;
+    height:90rem;
     position: relative;
     .activeBox{
         position: absolute;
         left: 1.4375rem;
         top: 10rem;
         width:20.625rem;
-        height:84.375rem;
+        height:72.375rem;
         background:rgba(255,255,255,1);
         box-shadow:0px 0px 44px 0px rgba(173,198,238,0.68);
         opacity:0.9;

src/pages/home/activeForm.vue

@@ -6,7 +6,16 @@
                 <span class="titleName">活动报名表</span>
             </div>
         </van-sticky>
+        
         <div class="formBox">
+            <div class="attentionBox">
+                <p class="attention">注意</p>
+                <p>*本次活动免费赠送且包邮，请正确填写您的个人资料，工作人员将在<span>1-3</span>天内通过电话或微信方式联系您并核对信息，尽快为您安排发货</p>
+                <span>*提交信息成功即可扫码加入活动微信交流群</span>
+                <p>*标有<span>*</span>的栏目必须填写;</p>
+                <p>有问题请联系客服微信：<span>kuyicloud</span></p>
+                <p class="litle">以上解释权归酷医云所有，敬请留意</p>
+            </div>
             <van-field v-model="form.name" label="收件姓名" required placeholder="请填写"/>
             <van-field v-model="form.mobile" label="收件手机" required placeholder="请填写"/>
             <van-field v-model="form.address" label="收件地址" required placeholder="请填写"/>
@@ -28,7 +37,7 @@
                 </van-radio-group>
             </div>
             <div class="formOne">
-                <div class="formTitle"><span style="color:#ee0a24">*</span>是否考虑使用酷医云免费透析管理系统</div>
+                <div class="formTitle"><span style="color:#ee0a24">*</span>除酷医云免费使用的透析管理系统外，您还想了解酷医云系统其他哪些服务板块？（多选） </div>
                 <van-checkbox-group v-model="result">
                     <van-checkbox name="1">慢病管理</van-checkbox>
                     <van-checkbox name="2">营销管理</van-checkbox>
@@ -49,9 +58,9 @@
                     <van-radio name="2">车载加湿器</van-radio>
                     <van-radio name="3">商务保温杯套装</van-radio>
                 </van-radio-group>
-                <p style="color:#ccc">请填写其他（30个字以内）</p>
-                <div class="textareaBox">
-                    <van-field v-model="form.other_message" rows="3" type="textarea" maxlength="30" />
+                <p>其他留言（200个字以内）</p>
+                <div class="textareaBox2">
+                    <van-field v-model="form.other_message" rows="5" type="textarea" maxlength="200" />
                 </div>
             </div>
         </div>
@@ -197,42 +206,62 @@ export default {
     font-size: 1.125rem;
     font-weight: 600;
   }
-  .formBox {
-    width: 21rem;
-    height: 82.125rem;
-    background: rgba(255, 255, 255, 1);
-    border-radius: 10px;
-    margin: 0.875rem auto;
-  }
-  .formOne {
-    font-size: 1.0625rem;
-    margin-left: 0.5rem;
-    padding: 1.5rem 0;
-    border-bottom: 0.0625rem solid #e5e5e5;
-    .formTitle {
-      margin: 0 0 1.5rem;
+    .formBox{
+        width:21rem;
+        height:97rem;
+        background:rgba(255,255,255,1);
+        border-radius:15px;
+        margin: .875rem auto;
+
     }
-  }
-  .formTwo {
-    font-size: 1.0625rem;
-    margin-left: 0.5rem;
-    padding: 1.5rem 0;
-    .formTitle {
-      margin: 0 0 1.5rem;
+    .attentionBox{
+        font-size: .875rem;
+        color: #242D39;
+        padding: 0 .625rem;
+        line-height: 1.5rem;
+        span{
+            color: #FD543A;
+            font-weight: bold;
+        }
+        .litle{
+            font-size: .75rem;
+            color: #FD543A;
+        }
+        .attention{
+            font-size: .9375rem;
+            font-weight: bold;
+            color: #FD543A;
+        }
+    }
+    .formOne{
+        font-size: 1.0625rem;
+        margin-left: .5rem;
+        padding: 1.5rem 0;
+        border-bottom: 0.0625rem solid #e5e5e5;
+        .formTitle{
+            margin: 0 0 1.5rem;
+        }
+    }
+    .formTwo{
+        font-size: 1.0625rem;
+        margin-left: .5rem;
+        padding: 1.5rem 0;
+        .formTitle{
+            margin: 0 0 1.5rem;
+        }
+    }
+    .submit{
+        height: 3.75rem;
+        line-height: 3.75rem;
+        text-align: center;
+        color: #fff;
+        width: 18.75rem;
+        margin: 1.625rem auto .625rem;
+        background: #1B97FF;
+        border-radius: 1.875rem;
+        font-weight: 600;
+        font-size: 1.25rem;
     }
-  }
-  .submit {
-    height: 3.75rem;
-    line-height: 3.75rem;
-    text-align: center;
-    color: #fff;
-    width: 18.75rem;
-    margin: 1.625rem auto 0.625rem;
-    background: #1b97ff;
-    border-radius: 1.875rem;
-    font-weight: 600;
-    font-size: 1.25rem;
-  }
 }
 ::-webkit-scrollbar {
   width: 0;
@@ -305,5 +334,23 @@ export default {
       margin-bottom: 1.125rem;
     }
   }
+    .textareaBox2{
+        margin-top: .625rem;
+        margin-right: .875rem;
+        border-radius:5px;
+         .van-cell{
+            height: 7.5rem;
+            padding: 0;
+        }
+        .van-cell__value{
+            background: #F6F6F6;
+        }
+        .van-field__body{
+            width: 100%;
+            textarea{
+                width: 100%;
+            }
+        }
+    }
 }
 </style>

src/pages/home/activeSuccess.vue

@@ -15,7 +15,7 @@
         <div class="msgBox">
             <p>您已完成填写，</p>
             <p>工作人员将通过电话或微信联系您并进行信息审核。</p>
-            <img src="../../assets/images/m01.png" alt="">
+            <img src="../../assets/images/ercode.png" alt="">
             <p>欢迎扫码加入</p>
             <p>【酷医云民营血透医护交流群二】微信群，</p>
             <p>了解行业热点，获取知识！</p>
@@ -69,7 +69,9 @@
             line-height: 1.25rem;
         }
         img{
-            margin: 1.25rem auto;
+            width: 9.375rem;
+            height: 9.375rem;
+            margin: 1rem auto .5rem;
             display: block;
         }
     }