Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/frontend_vue/qqxb-self-service

package-lock.json

@@ -964,6 +964,11 @@
       "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
       "dev": true
     },
+    "@types/fastclick": {
+      "version": "1.0.29",
+      "resolved": "https://registry.npmjs.org/@types/fastclick/-/fastclick-1.0.29.tgz",
+      "integrity": "sha512-umkMhdAk3dNAenNuhoKPzZUYN9uBHrK8UAvUKWMLst80Gj4BWC1syLuiNzdBzPpM2b2Xg036vvl6X1wiu1Piuw=="
+    },
     "@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
@@ -4484,6 +4489,11 @@
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "fastclick": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
+      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
+    },
     "fastparse": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",

package.json

@@ -8,10 +8,12 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@types/fastclick": "^1.0.29",
     "@types/qs": "^6.9.3",
     "amfe-flexible": "^2.2.1",
     "axios": "^0.19.2",
     "core-js": "^2.6.11",
+    "fastclick": "^1.0.6",
     "oidc-client": "^1.10.1",
     "qs": "^6.9.4",
     "vant": "^2.2.0",

src/components/archives/workInfo.vue

@@ -3,6 +3,7 @@
     <div class="header">
       <div class="tip"></div>
       <div class="title">工作信息</div>
+      <van-icon size="14px" color="#E1E4EB" name="arrow" />
     </div>
     <div class="box">
       <div class="item">
@@ -31,23 +32,22 @@
 
 <script lang="ts">
 import Vue from "vue";
-// import { Button } from 'vant';
+import { Icon } from 'vant';
 import { Component } from "vue-property-decorator";
 
 @Component({
-  //   components:{
-  //     // [Cell.name]: Cell,
-  //     [Button.name]:Button
-  //   }
+    components:{
+      [Icon.name]: Icon
+    }
 })
 export default class workInfo extends Vue {
   created() {
-    // let params = {
-    //   edId: 1
-    // };
-    // this.$server.EmployeeService.getWorkInfoDetail(params).then(res => {
-    //   console.log(res);
-    // });
+    let params = {
+      edId: 1
+    };
+    this.$server.EmployeeService.getWorkInfoDetail(params).then(res => {
+      console.log(res);
+    });
   }
 }
 </script>
@@ -70,6 +70,9 @@ export default class workInfo extends Vue {
       font-weight: 500;
       color: rgba(61, 64, 71, 1);
     }
+    i{
+      margin: 0 20px 0 auto;
+    }
   }
   .box {
     margin: 0 20px;

src/main.ts

@@ -3,10 +3,12 @@ import App from './App.vue';
 import router from './router'
 import store from './store'
 import 'amfe-flexible/index.js'
-import server from '@/services/install';
+import server from '@/services/install'
+import FastClick from 'fastclick'
 import '@/assets/css/index.less'
 
 Vue.config.productionTip = false;
+FastClick.attach(document.body);
 Vue.use(server)
 
 new Vue({

src/views/FlexEmployeeDetial.vue

@@ -2,8 +2,8 @@
   <div class="fe-detial-box">
     <div class="fe-detial-top">
       <h4>任务报酬</h4>
-      <h3>+8,000.22</h3>
-      <p>待发放</p>
+      <h3>+{{money}}</h3>
+      <p>{{status}}</p>
     </div>
     <div class="fe-detial-bottom">
       <div class="fe-detial-bottom-title">
@@ -13,17 +13,31 @@
         <p>收款账户</p>
       </div>
       <div class="fe-detial-bottom-detial">
-        <p>天津有米科技有限公司</p>
-        <p>市场推广-地推</p>
-        <p>2019-11-12</p>
-        <p>622254889999888900</p>
+        <p>{{company}}</p>
+        <p>{{task_count}}</p>
+        <p>{{date}}</p>
+        <p>{{account}}</p>
       </div>
     </div>
   </div>
 </template>
 
-<script>
-export default {};
+<script lang="ts">
+import {Component,Vue} from 'vue-property-decorator'
+@Component
+export default class FlexEmployee extends Vue  {
+  private money:number=9999.99;
+  private status:string='待发放';
+  private company:string='天津有米科技有限公司';
+  private task_count:string='市场推广-地推';
+  private date:string='2020-5-29';
+  private account:string='622254889999888900'
+
+  private toDetail(id:any):void{
+    this.$router.push({name:'FlexEmployeeDetial',query:{id:id}})
+  }
+
+};
 </script>
 
 <style lang="less">

vue.config.js

@@ -114,11 +114,11 @@ module.exports = {
     before: app => { }
   },
   // 第三方插件配置
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'scss',
-      patterns: []
-    }
-  }
+  // pluginOptions: {
+  //   'style-resources-loader': {
+  //     preProcessor: 'scss',
+  //     patterns: []
+  //   }
+  // }
 
 };