Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/administrative/model/Voting.vue

@@ -2,7 +2,36 @@
   <div class="Voting">
     <div class="Voting-box">
         <div class="tit">
-            
+            <p>占位占位投票（单选）</p>
+        </div>
+        <div class="list">
+            <div class="item" :class="{'active': radio === '1'}">
+                <el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="1">这里是A选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '2'}">
+                <el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="2">这里是B选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '3'}">
+                <el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="3">这里是C选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '4'}">
+                <el-radio text-color="#ffffff" fill="#ffffff"    v-model="radio" label="4">这里是D选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '1'}">
+                <el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="1">这里是A选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '2'}">
+                <el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="2">这里是B选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '3'}">
+                <el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="3">这里是C选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+            <div class="item" :class="{'active': radio === '4'}">
+                <el-radio text-color="#ffffff" fill="#ffffff"    v-model="radio" label="4">这里是D选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
+            </div>
+        </div>
+        <div class="btn">
+            <div>确认提交</div>
         </div>
     </div>
   </div>
@@ -13,7 +42,7 @@ export default {
   name: 'Voting',
   data () {
     return {
-      
+      radio: 1
     }
   },
   activated () {},
@@ -46,5 +75,44 @@ export default {
     background: url('../../../assets/img/voting/titi-bg.png');
     background-repeat: no-repeat;
     background-size: 100% 100%;
+    color:rgba(255,255,255,1);
+    padding: 20px 60px 0 60px;
+    font-size:20px;
+    font-weight:bold;
+}
+.Voting div.Voting-box .list{
+    padding: 0 60px 20px 60px;
+    height: 253px;
+    overflow: auto;
+}
+.Voting div.Voting-box .list .item{
+    margin-top: 20px;
+    padding: 10px 20px;
+    border-radius:5px;
+    border:1px solid rgba(228, 228, 228, 1);
+}
+.Voting div.Voting-box .list .item.active{
+    background:rgba(233,82,82,1);
+    border:1px solid rgba(233,82,82,1);
+}
+.Voting .el-radio__input.is-checked+.el-radio__label{
+    color: white;
+}
+.Voting .btn{
+    position:relative;
+    bottom: -20px;
+    left: 0;
+    width: 100%;
+    text-align: center
+}
+.Voting .btn div{
+    width: 120px;
+    height: 30px;
+    text-align: center;
+    line-height: 30px;
+    margin: 0 auto;
+    color: white;
+    background:rgba(233,82,82,1);
+    border-radius:5px;
 }
 </style>

src/plug/index.js

@@ -111,7 +111,7 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-           domainUrl = "http://192.168.2.65:8025";
+           domainUrl = "http://192.168.2.66:8025";
         let locationName = window.location.hostname;
 
         let javaUrldo="";