代码调整

package-lock.json

@@ -10515,6 +10515,11 @@
       "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.3.0.tgz",
       "integrity": "sha1-ZltGMOoTRzFxOfzFy0laqz7F5RM="
     },
+    "vuex-class": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/vuex-class/-/vuex-class-0.3.2.tgz",
+      "integrity": "sha512-m0w7/FMsNcwJgunJeM+wcNaHzK2KX1K1rw2WUQf7Q16ndXHo7pflRyOV/E8795JO/7fstyjH3EgqBI4h4n4qXQ=="
+    },
     "watchpack": {
       "version": "1.6.1",
       "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.1.tgz",

package.json

@@ -18,7 +18,8 @@
     "vue-clipboard2": "^0.3.1",
     "vue-property-decorator": "^8.4.1",
     "vue-router": "^3.1.6",
-    "vuex": "^3.1.3"
+    "vuex": "^3.1.3",
+    "vuex-class": "^0.3.2"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.3.0",

src/api/proof.ts

 import axios from '@/utils/http';
 const base = process.env.VUE_APP_SERVER + '/proof';
+const note: any  = {
+    userName: '', // String 账号名
+    userIcon: '', // String 用户图标图片地址
+    evidenceName: '', // String 存证名称，ps：溯源时为父级商品名
+    stepName: '', // String 溯源时的存证名称，非溯源时为空
+    version: 1 , // Number 数据结构版本号，目前写死为 1
+};
 const proof = {
     list(page: number, params: any) {
         return axios.post(`${base}/list`, {
@@ -17,17 +24,27 @@ const proof = {
         });
     },
     add(name: string, detailInformation: any, params: any) {
+        let userInfo = localStorage.getItem('userInfo');
+        userInfo = userInfo ? JSON.parse(userInfo) : {};
+        const userName =  (userInfo as any ).user || '';
+        const userIcon = (userInfo as any ).icon || '';
         return axios.post(`${base}/add`, {
             name,
             detail_information: JSON.stringify(detailInformation),
+            note: JSON.stringify({...note, evidenceName: name, userName , userIcon }),
             ...params,
          });
     },
     update(id: number, name: string, detailInformation: any, params: any = {}) {
+        let userInfo = localStorage.getItem('userInfo');
+        userInfo = userInfo ? JSON.parse(userInfo) : {};
+        const userName =  (userInfo as any ).user || '';
+        const userIcon = (userInfo as any ).icon || '';
         return axios.put(`${base}/update`, {
             id,
             name,
             detail_information: JSON.stringify(detailInformation),
+            note: JSON.stringify({...note, evidenceName: name, userName , userIcon }),
             ...params,
         });
     },

src/components/ProofItem.vue

@@ -65,7 +65,10 @@ export default class ProofItem extends Vue {
     border-radius: 15px;
     color:#353535;
     text-align: left;
-    font-size: 15px;
+    font-size: 16px;
+    .status,.time{
+      font-size: 12px;
+    }
     .time{
       margin-left: 20px;
     }

src/filter/index.ts

-function timeFormat(timestamp: number): string {
-    const date = new Date(timestamp * 1000);
-    const Y = date.getFullYear() + '-';
-    const M =
-    (date.getMonth() + 1 < 10
-        ? '0' + (date.getMonth() + 1)
-        : date.getMonth() + 1) + '-';
-    const D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + '';
-    return Y + M + D;
+function timeFormat(dateRoTimestamp: any, fmt: string = 'yyyy/MM/dd hh:mm:ss'): string {
+    let date: any = {};
+    if (typeof dateRoTimestamp === 'object' && dateRoTimestamp.constructor === Date) {
+        date = dateRoTimestamp;
+    } else {
+        date = new Date(dateRoTimestamp ? (parseInt(dateRoTimestamp) * 1000) : new Date().getTime());
+    }
+
+    const o: any = {
+        'M+': date.getMonth() + 1, // 月份
+        'd+': date.getDate(), // 日
+        'h+': date.getHours(), // 小时
+        'm+': date.getMinutes(), // 分
+        's+': date.getSeconds(), // 秒
+        'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+        'S': date.getMilliseconds(), // 毫秒
+    };
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    for (const k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ?
+             (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+        }
+    }
+    return fmt;
 }
 export default {
     timeFormat,

src/store/index.ts

@@ -6,6 +6,13 @@ Vue.use(Vuex);
 export default new Vuex.Store({
   state: {
   },
+  getters: {
+    userInfo(): any {
+      let userInfo = localStorage.getItem('userInfo');
+      userInfo = userInfo ? JSON.parse(userInfo) : {};
+      return (userInfo as any);
+    },
+  },
   mutations: {
   },
   actions: {

src/utils/http.ts

@@ -6,6 +6,7 @@ import axios from 'axios';
 import router from '../router';
 import store from '../store/index';
 import { Toast } from 'vant';
+import user from '@/api/user';
 /**
  * 提示函数
  * 禁止点击蒙层、显示一秒后关闭
@@ -74,7 +75,9 @@ instance.interceptors.request.use(
         // 后台根据携带的token判断用户的登录情况，并返回给我们对应的状态码
         // 而后我们可以在响应拦截器中，根据状态码进行一些统一的操作。
         // token && (config.headers.Authorization = token);
-        config.headers.Authorization = localStorage.getItem('token');
+        let userInfo = localStorage.getItem('userInfo');
+        userInfo = userInfo ? JSON.parse(userInfo) : {};
+        config.headers.Authorization =  (userInfo as any ).token || '';
         return config;
     },
     (error: any) => Promise.reject(error));

src/views/Login.vue

 <template>
   <div class="login">
     <van-form ref="loginForm" @submit="onSubmit">
-        <img src="@/assets/logo.png" alt="">
         <van-field 
           v-model="phone" 
           :rules="[{ pattern: /1\d{10}/, message: '请输入正确的手机号' }]"
@@ -21,7 +20,7 @@
             <van-button @click="sendCode" plain size="small" color="#3F79FE" type="primary" native-type="button">{{btnStr}}</van-button>
           </template>
         </van-field>
-        <van-button block color="#3F79FE"  type="primary" native-type="submit">登录</van-button>
+        <van-button block color="#3F79FE"  type="primary" native-type="submit">注册/登录</van-button>
     </van-form>
   </div>
 </template>
@@ -46,7 +45,7 @@ export default class Login extends Vue {
       phone: this.phone,
       code: this.smsCode,
     });
-    localStorage.setItem('token', res.token);
+    localStorage.setItem('userInfo', JSON.stringify(res));
     this.$router.replace({path: '/home'});
   }
   get btnStr() {
@@ -74,8 +73,11 @@ export default class Login extends Vue {
 <style scoped lang="scss">
   .login{
     display: flex;
-    align-items: start;
+    align-items: center;
+    justify-content: center;
     flex-direction: column; 
-    padding: 30px 30px;   
+    padding: 30px 30px;
+    min-height: 100vh;
+    box-sizing: border-box;
   }
 </style>
\ No newline at end of file

src/views/ProofList.vue

@@ -181,7 +181,6 @@ export default class ProofList extends Vue {
   private async getList() {
     const { chainStatus } = this;
     const params = {
-      page_size: 5,
       status: Array.isArray(chainStatus) ? chainStatus : [ chainStatus ],
     };
     const res = await this.$api.proof.list(this.page++, params);

src/views/TemplateList.vue

@@ -10,7 +10,7 @@
     <van-list class="about"
         v-model="loading"
         :finished="finished"
-        finished-text="没有更多了"
+        finished-text=""
         @load="onLoad"
       >    
         <template-item 

src/views/userCenter/Index.vue

 <template>
   <div class="user-index">
-      <van-cell value="回收站"  center is-link :to="{name:'RecycleList'}">
+    <header>
+       <van-image width="55" round height="55" :src="userInfo.icon"></van-image>
+       <p style="margin-left:30px;">{{userInfo.user}}</p>
+    </header>
+      <van-cell style="margin-top:40px;" value="回收站"  center is-link :to="{name:'RecycleList'}">
         <template #icon>
           <common-svg name="huishouzhan" style="margin-right:10px;"></common-svg>
         </template>
@@ -10,7 +14,7 @@
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { Cell, Form, Field, CellGroup, Button, Image } from 'vant';
-
+import { Getter } from 'vuex-class';
 @Component({
   components: {
     [Form.name]: Form,
@@ -21,6 +25,7 @@ import { Cell, Form, Field, CellGroup, Button, Image } from 'vant';
   },
 })
 export default class Index extends Vue {
+  @Getter('userInfo') private userInfo!: any;
 }
 </script>
 <style scoped lang="scss">
@@ -28,6 +33,9 @@ export default class Index extends Vue {
     display: flex;
     align-items: start;
     flex-direction: column; 
-    margin-top: 30px;
+    padding: 30px;
+    header{
+      display: flex;
+    }
   }
 </style>
\ No newline at end of file

src/views/userCenter/RecycleList.vue

@@ -9,7 +9,7 @@
       <div v-for="item in list" :key="item.id" class="item">
          <div style="color:#353535;font-size:16px;margin-bottom:9px;">{{item.name}}</div>
          <div>删除理由 {{item.abandon_remark}}</div>
-         <div>删除时间 {{item.update_time}}</div>
+         <div>删除时间 {{item.update_time |timeFormat}}</div>
       </div>
     </van-list>
   </div>
@@ -17,7 +17,7 @@
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { List, Popup, Button, Image, Picker, Grid, GridItem, Empty } from 'vant';
-
+import {VALID} from '@/const/enum';
 @Component({
   components: {
     [List.name]: List,
@@ -32,7 +32,7 @@ export default class RecycleList extends Vue {
   private finished: boolean = false;
   private async getList() {
     const params = {
-      is_valid: 1, // 1不可用
+      is_valid: VALID.UNUSABLE, // 1不可用
     };
     const res = await this.$api.proof.list(this.page++, params);
     this.total = res.total;