profile

Author: lumin3000

build/webpack.base.conf.js

@@ -5,7 +5,7 @@ var projectRoot = path.resolve(__dirname, '../')
 
 module.exports = {
   entry: {
-    app: ['./src/main.js','./src/auth/index.js']
+    app: ['native-promise-only','./src/main.js','./src/auth/index.js']
   },
   output: {
     path: config.build.assetsRoot,

package.json

@@ -13,8 +13,10 @@
   "dependencies": {
     "babel-runtime": "^6.0.0",
     "bootstrap": "^3.3.6",
+    "native-promise-only": "^0.8.1",
     "validator": "^5.2.0",
     "vue": "^1.0.20",
+    "vue-file-upload": "0.0.4",
     "vue-resource": "^0.7.0",
     "vue-router": "^0.7.13"
   },

src/App.vue

@@ -82,6 +82,45 @@ body {
   font-weight:100;
 }
 
+.nav-tabs > li.disabled > a:hover {
+  border-color: transparent;
+  cursor:auto
+}
+.nav-tabs > li > a:hover {
+  border-color: #d9d9d9 #d9d9d9 transparent;
+  cursor:pointer;
+}
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+  color: white;
+  border: 1px solid #e9573e;
+  background-color: #e9573e;
+}
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+  border: 1px solid #e9573e;
+  cursor:auto;
+}
+
+.nav-tabs.nav-justified > li > a {
+  border-bottom: 1px solid #e9573e!important;
+  font-size: 26px;
+  line-height: 60px;
+  font-weight: 300;
+}
+
+.nav > li > a:hover,
+.nav > li > a:focus {
+  background-color: #d9d9d9;
+}
+
+.nav-justified {
+  height:110px;
+}
+
+
 table, .table{
   font-size:18px;
   background-color:white;
@@ -108,10 +147,53 @@ table, .table *{
   border-color: transparent;
 }
 
+.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus{
+  background-color:white;
+  color:#d9d9d9;
+}
+
+.pagination-bar * {
+ cursor: auto!important;
+}
+.pagination-bar>li>span:hover{
+ background-color: white
+}
+.pagination-bar input{
+ width:32px;
+}
+
 .table-hover > tbody > tr:hover {
   background-color: #d9d9d9;
 }
 
+.avatar{
+  width: 220px;
+  height:220px;
+  padding:0;
+  margin:0;
+  background-color: #d9d9d9;
+  text-align: center;
+}
+.avatar img{
+  width:220px;
+  height: 220px;
+}
+span.fileupload-button{
+  width: 220px!important;
+  line-height: 48px!important;
+  background-color: #f9682e!important;
+  border-color:#f9682e!important;
+  font-size: 20px!important;
+  font-weight: 200!important;
+  margin-top:12px!important;
+  z-index:1!important
+}
+
 a.without-underline:hover {
   text-decoration: none!important;
 }
@@ -335,18 +417,27 @@ ul.dropdown-menu > li > a:focus {
   z-index:9998;
 }
 
-</style>
-own-menu > li > a:hover,
-ul.dropdown-menu > li > a:focus {
-  text-decoration: none;
-  color: #f3f4f6;
-  background-color: #818384;
+.btn-lg-group{
+  margin-top:10px
+}
+.btn-lg-group .btn-lg
+{
+  width:190px
 }
 
-.isFullscreen {
-  position:fixed;
-  height:100%;
-  z-index:9998;
+.profile-wraper{
+  width:750px;
+  margin:auto
+}
+
+div.inputGender button
+{
+  height: 50px;
+  width:  100px;
+}
+div.inputGender *{
+  font-size: 20px;
+  font-weight: 200;
 }
 
 </style>

src/components/Missions.vue

@@ -36,11 +36,11 @@
             <th>开始时间</th>
             <th>结束时间</th>
             <th>推广方式</th>
-            <th>单价</th>
-            <th>总数量</th>
-            <th>剩余数量</th>
-            <th>总金额</th>
-            <th>操作</th>
+            <th class="text-right">单价</th>
+            <th class="text-right">总数量</th>
+            <th class="text-right">剩余数量</th>
+            <th class="text-right">总金额</th>
+            <th class="text-center">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -50,44 +50,44 @@
             <td>{{mission.beginTime}}</td>
             <td>{{mission.finishTime}}</td>
             <td>{{mission.strategy}}</td>
-            <td>{{mission.unitPrice}}</td>
-            <td>{{mission.amount}}</td>
-            <td>{{mission.remain}}</td>
-            <td>{{mission.totalPrice}}</td>
-            <td>
+            <td class="text-right">{{mission.unitPrice}}</td>
+            <td class="text-right">{{mission.amount}}</td>
+            <td class="text-right">{{mission.remain}}</td>
+            <td class="text-right">{{mission.totalPrice}}</td>
+            <td class="text-right">
               <button class="btn btn-primary" @click="routerGo({name:'missions-edit',params:{missionId:mission.id}})" >编辑</button>
               <button class="btn btn-danger" @click="removeMissionConfirm(mission.id)">删除</button>
             </td>
           </tr>
         </tbody>
       </table>
 
-      <ul class="pagination">
-        <li v-if="pageCurrent != 1">
+      <ul class="pagination" v-if="pageTotal>1" >
+        <li :class="(pageCurrent == 1)?'disabled':''">
           <a @click="page(1)" aria-label="Previous">
             <span aria-hidden="true">首页</span>
           </a>
         </li>
-        <li v-if="pageCurrent != 1">
+        <li :class="(pageCurrent == 1)?'disabled':''">
           <a @click="prevPage()" aria-label="Previous">
             <span aria-hidden="true">上一页</span>
           </a>
         </li>
         <li v-for="thePage in pageTotal" :class="((pageCurrent==thePage+1)?'active':'')">
           <a @click="page($index+1)">{{thePage+1}}</a>
         </li>
-        <li v-if="pageCurrent != pageTotal">
+        <li :class="(pageCurrent == pageTotal)?'disabled':''">
           <a @click="nextPage()" aria-label="Next" >
             <span aria-hidden="true">下一页</span>
           </a>
         </li>
-        <li v-if="pageCurrent != pageTotal">
+        <li :class="(pageCurrent == pageTotal)?'disabled':''">
           <a @click="page(pageTotal)" aria-label="Next" >
             <span aria-hidden="true">尾页</span>
           </a>
         </li>
       </ul>
-      <ul class="pagination pagination-bar pull-right">
+      <ul class="pagination pagination-bar pull-right" v-if="pageTotal>1">
         <li>
           <span>
             当前第{{pageCurrent}}页/共{{pageTotal}}页&nbsp;转到
@@ -197,17 +197,3 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
  -->
-
- <style scoped>
-  .pagination-bar * {
-   cursor: auto!important;
- }
- .pagination-bar>li>span:hover{
-   background-color: white
- }
- .pagination-bar input{
-   width:32px;
- }
-
-
- </style>