解决冲突

src/pages/intoApproval/intoApproval/refund.vue

@@ -120,7 +120,7 @@ export default {
       })
       this.$router.go(-1)
     },
-    getInfo () {
+    getInfo () { // 获取还款计划信息
       let vm = this
       let url = process.env.basePath + 'prj_cashflow_query'
       let param = {
@@ -137,15 +137,15 @@ export default {
           } else {
             vm.dataNone = true
           }
-          vm.lists.sort(vm.compare('due_date'))
+          vm.lists.sort(vm.compare('due_date'))// 对于获取到的数据根据时间进行排序
         }
       })
     },
     compare (key) {
       return function (value1, value2) {
-        var val1 = parseInt(value1[key].substr(0, 4))
-        var val2 = parseInt(value2[key])
-        return val1 - val2
+        var val1 = new Date(value1[key])
+        var val2 = new Date(value2[key])
+        return val1 < val2 ? -1 : 1
       }
     },
   },

src/pages/myInfo/my-info.vue

@@ -69,8 +69,7 @@
           </div>
           <div class="content-wrap" @click="goCarConfirm">
             <span
-              :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}"
-              style="left:30px"
+              :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}" style="margin-left:5px;"
             >{{ carCount > 99 ? '99+' : carCount }}</span>
             <img src="@/assets/myInfo/carConfirm.png" >
             <p>发车确认</p>
@@ -212,12 +211,12 @@ export default {
     },
     // 进入待确认，（进件确认）
     goConfirm () {
-      /* this.$router.push({
-        name: 'IntoList',
-      }) */
       this.$router.push({
-        name: 'IframTest',
+        name: 'IntoList',
       })
+      // this.$router.push({
+      //   name: 'IframTest',
+      // })
     },
     // 进入我的还款
     goReimburse () {

src/pages/userBind/np/invoiceInfo.vue

@@ -54,10 +54,10 @@
         @input="addRowsLive(invoiceInfo.open_bank)"
       />
     </item>
-    <item @click="keyboradShow">
+    <item>
       <div slot="name">开户行账号</div>
       <input
-        slot="content" v-model="invoiceInfo.open_account" readonly type="text"
+        slot="content" v-model="invoiceInfo.open_account" type="number" pattern="\d*"
         placeholder="请输入开户行账号" >
     </item>
   </list-item>

src/store/index.js

+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+let store = new Vuex.Store({
+  state: {
+    routerHistory: [],
+    userInfo: void 0,
+    allSystemUser: void 0,
+    locationSearch: void 0,
+  },
+  getters: {
+    getRouterHistory: (state) => {
+      return state.routerHistory
+    },
+    getUserInfo: (state) => {
+      return state.userInfo
+    },
+    getAllSystemUser: (state) => {
+      return state.allSystemUser
+    },
+    getLocationSearch: (state) => {
+      return state.locationSearch
+    },
+  },
+
+  mutations: {
+    setRouterHistory: (state, value) => {
+      state.routerHistory = value
+    },
+    setUserInfo: (state, value) => {
+      state.userInfo = value
+    },
+    setAllSystemUser: (state, value) => {
+      state.allSystemUser = value
+    },
+    setLocationSearch: (state, value) => {
+      state.locationSearch = value
+    },
+  },
+})
+
+export default store

src/store/utils.js

+const createGetter = (state) => {
+  let getters = {}
+  for (let key in state) {
+    let getter = `get${key.replace(key.charAt(0), key.charAt(0).toUpperCase())}`
+    getters[getter] = (state) => {
+      return state[key]
+    }
+  }
+  return getters
+}
+
+const createMutations = (state) => {
+  let mutations = {}
+  for (let key in state) {
+    let mutation = `set${key.replace(key.charAt(0), key.charAt(0).toUpperCase())}`
+    mutations[mutation] = (state, value) => {
+      state[key] = value
+    }
+  }
+  return mutations
+}
+
+export {
+  createGetter,
+  createMutations,
+}