merge

src/views/vote/detail.vue

@@ -117,15 +117,16 @@ export default {
 <style lang="scss" scoped>
 
 .ContextbBox {
-  width: 93.6%;
-  height: 4.05rem;
+  width: 3.25rem;
+  // height: 4.05rem;
   background-color: rgba(255, 255, 255, 1);
   border-radius: 0.02rem;
-  margin-top: 0.7rem;
+  margin: 0.11rem auto;
   display: flex;
   flex-direction: column;
   align-items: center;
   position: relative;
+  padding: 0.1rem 0.13rem;
 }
 
 .votelist {
@@ -136,19 +137,18 @@ export default {
   border-radius: 0.23rem 0 0 0.23rem;
   padding: 0.05rem 0.05rem 0.05rem 0.16rem;
   font-size: 0.18rem;
-  font-family: PingFangSC-Medium;
   font-weight: bolder;
   color: rgba(255, 255, 255, 1);
   line-height: 0.25rem;
 }
 
 img {
-  width: 93%;
+  width: 100%;
   height: 3.16rem;
   margin: 0.1rem 0;
 }
 .detailinformation {
-  width: 82%;
+  width: 90%;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -163,22 +163,23 @@ img {
 .context {
   width: 100%;
   height: 100%;
+  overflow-y: scroll;
   // background-color: rgba(220,229,236,1);;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+  // display: flex;
+  // flex-direction: column;
+  // align-items: center;
 }
 
 .theme1 {  
-  background-image: url('../../assets/yttjbg.png');
+  // background-image: url('../../assets/yttjbg.png');
+   background: rgba(209,220,228,1);
   .personnumber {
     position: absolute;
     top: 0;
     background-color:rgba(255,255,255,1);
     border-radius: 0 0 0.12rem 0.12rem;
-    padding: 0.01rem 0.25rem;
+    padding: 0.07rem 0.25rem;
     font-size: 0.18rem;
-    font-family: PingFangSC-Medium;
     font-weight: bolder;
     color:rgba(70,86,101,1);
     line-height: 0.25rem;
@@ -190,7 +191,6 @@ img {
   }
   .information {
     font-size: 0.16rem;
-    font-family: JQLaoSongJT;
     color:rgba(112,125,138,1);
     line-height: 0.28rem;
     font-weight: bold;
@@ -198,11 +198,10 @@ img {
   }
   .informationnum {
     font-size: 0.24rem;
-    font-family: JQLaoSongJT;
     color:rgba(112,125,138,1);
     font-weight: bolder;
     line-height: 0.28rem;
-      height: 0.28rem;
+    height: 0.28rem;
   }
   .votebtn {
     width: 59%;
@@ -210,12 +209,14 @@ img {
     background: rgba(166,184,201,1);
     border-radius: 0.23rem;
     font-size: 0.2rem;
-    font-family: PingFangSC-Medium;
     font-weight: bolder;
     color: rgba(255, 255, 255, 1);
     line-height: 0.28rem;
     border: none;
-    margin-top: 0.18rem;
+    // margin-top: 0.18rem;
+    margin-left: calc(20.5%);
+   margin-top: 0.07rem;
+    // padding: 0.07rem 0.65rem;
   }
 }
  
@@ -238,15 +239,15 @@ img {
     word-wrap: break-word;
     word-break: normal;
     font-size: 0.14rem;
-    font-family: PingFangSC-Regular;
     font-weight: bold;
-    color: rgba(77,87,97,1);
+    color: rgba(77,87,97,0.7);
     line-height: 0.2rem;
   }
 }
 
 .theme2 {
-  background-image: url('../../assets/bgimg.jpg');
+  // background-image: url('../../assets/bgimg.jpg');
+    background: linear-gradient(#97796c,#705443);
   .personnumber {
     position: absolute;
     top: 0;
@@ -254,7 +255,6 @@ img {
     border-radius: 0 0 0.12rem 0.12rem;
     padding: 0.01rem 0.25rem;
     font-size: 0.18rem;
-    font-family: PingFangSC-Medium;
     font-weight: bolder;
     color:rgba(112,84,75,1);
     line-height: 0.25rem;
@@ -266,7 +266,6 @@ img {
   }
   .information {
     font-size: 0.16rem;
-    font-family: JQLaoSongJT;
     color:rgba(112,84,75,1);
     line-height: 0.28rem;
     font-weight: bold;
@@ -274,7 +273,6 @@ img {
   }
   .informationnum {
     font-size: 0.24rem;
-    font-family: JQLaoSongJT;
     color:rgba(112,84,75,1);
     font-weight: bolder;
     line-height: 0.28rem;
@@ -286,12 +284,12 @@ img {
     background: rgba(173,145,129,1);
     border-radius: 0.23rem;
     font-size: 0.2rem;
-    font-family: PingFangSC-Medium;
     font-weight: bolder;
     color: rgba(255, 255, 255, 1);
     line-height: 0.28rem;
     border: none;
-    margin-top: 0.18rem;
+    margin-left: calc(20.5%);
+   margin-top: 0.44rem;
   }
 }
 </style>

src/views/vote/index.vue

@@ -70,12 +70,11 @@ export default {
     background: #a6b8c9;
     border: none;
     font-size: 0.2rem;
-    font-family: PingFangSC-Medium;
     font-weight: bolder;
     color: white;
     line-height: 0.28rem;
     position: fixed;
-    bottom: 0.4rem;
+    bottom: 0.3rem;
     left: calc(12.5%);
   }
   .classtwo {
@@ -85,12 +84,11 @@ export default {
     background: rgba(173, 145, 129, 1);
     border: none;
     font-size: 0.2rem;
-    font-family: PingFangSC-Medium;
     font-weight: bolder;
     color: white;
     line-height: 0.28rem;
     position: fixed;
-    bottom: 0.4rem;
+    bottom: 0.3rem;
     left: calc(12.5%);
   }
 

src/views/vote/list.vue

@@ -69,7 +69,9 @@
         </van-tab>
       </van-tabs>
     </div>
-    <button v-show="showBtn" :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myID > 0 ? '我的上传' : '我要报名'}}</button>
+    <div class="btn" v-show="showBtn">
+    <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myID > 0 ? '我的上传' : '我要报名'}}</button>
+    </div>
     <toast v-if="show" :url="activity.AfterVote" @close="close" @confirmbtn="tolink"></toast>
   </div>
 </template>
@@ -357,7 +359,7 @@ export default {
 
   .BannerImage {
     width: 100%;
-    height: 3.4rem;
+    max-height: 10rem;
   }
 
   .onscroll1 {
@@ -383,7 +385,6 @@ export default {
         background-color: rgba(255, 255, 255, 0);
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
         width: 3rem;
@@ -392,7 +393,6 @@ export default {
       input::-webkit-input-placeholder {
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
       }
@@ -428,7 +428,6 @@ export default {
         background-color: rgba(255, 255, 255, 0);
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
         width: 3rem;
@@ -437,7 +436,6 @@ export default {
       input::-webkit-input-placeholder {
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
       }
@@ -473,7 +471,6 @@ export default {
         background-color: rgba(255, 255, 255, 0);
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
         width: 3rem;
@@ -482,7 +479,6 @@ export default {
       input::-webkit-input-placeholder {
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
       }
@@ -519,7 +515,6 @@ export default {
         background-color: rgba(255, 255, 255, 0);
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
         width: 3rem;
@@ -528,7 +523,6 @@ export default {
       input::-webkit-input-placeholder {
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
-        font-family: PingFangSC-Regular;
         font-weight: bold;
         line-height: 0.22rem;
       }
@@ -715,6 +709,19 @@ export default {
       }
     }
   }
+
+  .btn{
+        width: 100%;
+    height: 0.6rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(255,255,255,1);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 100;
+
   .signupBtnOne {
     width: 91%;
     height: 0.5rem;
@@ -725,10 +732,10 @@ export default {
     font-weight: bold;
     color: rgba(255, 255, 255, 1);
     line-height: 0.28rem;
-    position: fixed;
-    bottom: 0.19rem;
-    left: calc(4.25%);
-    z-index: 100;
+    // position: fixed;
+    // bottom: 0.19rem;
+    // left: calc(4.25%);
+    // z-index: 100;
   }
   .signupBtnTwo {
     width: 91%;
@@ -740,12 +747,24 @@ export default {
     font-weight: bold;
     color: rgba(255, 255, 255, 1);
     line-height: 0.28rem;
-    position: fixed;
-    bottom: 0.19rem;
-    left: calc(4.25%);
-    z-index: 100;
+    // position: fixed;
+    // bottom: 0.19rem;
+    // left: calc(4.25%);
+    // z-index: 100;
+  }
+
   }
+
 }
+
+.theme1 {
+  // background-image: url('../../assets/bgimg.jpg');
+   background: rgba(209,220,228,1);
+   }
+   .theme2 {
+  // background-image: url('../../assets/bgimg.jpg');
+    background: linear-gradient(#97796c,#705443);
+   }
 </style>
 
 

src/views/vote/signup.vue

@@ -184,17 +184,18 @@ export default {
 <style lang='scss' scoped>
 .context {
   width: 100%;
-  // height: 100%;
-  display: flex;
-  justify-content: center;
+  height: 100%;
+  overflow-y: scroll;
+  // display: flex;
+  // justify-content: center;
 
   .ContextBox {
     width: 94%;
     // height: 5.85rem;
     border-radius: 0.06rem;
     background-color: rgba(255, 255, 255, 1);
-    margin: 0.12rem 0;
-    padding: 0.29rem 0 0.59rem 0;
+    margin: 0.12rem auto;
+    padding: 0.29rem 0 0.32rem 0;
     position: relative;
 
     .uploadimg {
@@ -310,12 +311,6 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      // padding: 0.32rem 0;
-      margin-top: 0.60rem;
-      // padding-top: 0.32rem;
-      // position: fixed;
-      // left: 0;
-      // bottom: 0.32rem;
 
       .SubmitBtn {
         width: 44%;
@@ -327,14 +322,14 @@ export default {
         font-weight: bolder;
         color: rgba(255, 255, 255, 1);
         line-height: 0.28rem;
-        // padding-top: 0.32rem;
       }
     }
   }
 }
 
 .theme1{
-  background-image: url("../../assets/yttjbg.png");
+    background: rgba(209,220,228,1);
+  // background-image: url("../../assets/yttjbg.png");
   .desc{
     font-size: 0.16rem;
     font-weight: bolder;
@@ -348,7 +343,7 @@ export default {
   .cbtn{
     background: rgba(166, 184, 201, 1);
     box-shadow: 0px 2px 10px 0px rgba(207, 217, 227, 1);
-    // margin-top: 1rem;
+    margin-top: 0.24rem;
   }
   input::-webkit-input-placeholder {
     font-size: 0.16rem;
@@ -367,7 +362,8 @@ export default {
 }
 
 .theme2{
-  background-image: url("../../assets/bgimg.jpg");
+  // background-image: url("../../assets/bgimg.jpg");
+      background: linear-gradient(#97796c,#705443);
   .desc{
     font-size: 0.16rem;
     font-weight: bolder;

vue.config.js

@@ -7,9 +7,9 @@ module.exports = {
     proxy: {
       '/voteapi': {
         // target: 'http://wechatconfigdev.ycjcjy.com',
-        target: 'http://localhost:8080', // wf
+        // target: 'http://192.168.0.62:8080', // wf
         // target: 'http://192.168.0.102:8080', // hyq
-        // target: 'http://192.168.0.11:8080', // zys
+        target: 'http://192.168.0.11:8080', // zys
         // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         pathRewrite: {