Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-website

package-lock.json

@@ -2430,6 +2430,11 @@
         "isarray": "^1.0.0"
       }
     },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz",
@@ -4034,6 +4039,14 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -6734,6 +6747,23 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "jsonwebtoken": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "requires": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^5.6.0"
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
@@ -6746,6 +6776,25 @@
         "verror": "1.10.0"
       }
     },
+    "jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "requires": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "requires": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -6965,6 +7014,36 @@
       "integrity": "sha1-US6b1yHSctlOPTpjZT+hdRZ0HKY=",
       "dev": true
     },
+    "lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+    },
+    "lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+    },
+    "lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+    },
+    "lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
     "lodash.kebabcase": {
       "version": "4.1.1",
       "resolved": "https://registry.npm.taobao.org/lodash.kebabcase/download/lodash.kebabcase-4.1.1.tgz",
@@ -6983,6 +7062,11 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    },
     "lodash.transform": {
       "version": "4.6.0",
       "resolved": "https://registry.npm.taobao.org/lodash.transform/download/lodash.transform-4.6.0.tgz",
@@ -7411,8 +7495,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true
+      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -9351,8 +9434,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
-      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
-      "dev": true
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -9403,8 +9485,7 @@
     "semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1576601833267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz",
-      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
-      "dev": true
+      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc="
     },
     "send": {
       "version": "0.17.1",

package.json

@@ -11,6 +11,7 @@
     "axios": "^0.19.2",
     "core-js": "^3.4.3",
     "element-ui": "^2.13.1",
+    "jsonwebtoken": "^8.5.1",
     "loadsh": "0.0.4",
     "moment": "^2.24.0",
     "naf-core": "^0.1.2",

src/components/enterprise/enterprisefabu.vue

@@ -33,6 +33,7 @@
               :total="total"
               :tatalstatus2="tatalstatus2"
               :tatalstatus1="tatalstatus1"
+              :Transactionlist="Transactionlist"
             ></contextfabuxx>
           </el-col>
         </div>
@@ -59,12 +60,13 @@ export default {
   props: {
     info: null, //站点信息
     liebiaoList: null, //分类导航
-    recruitData: null,
-    total: null,
-    shenheList: null,
-    successlist: null,
-    tatalstatus2: null,
-    tatalstatus1: null,
+    recruitData: null, //审核中
+    total: null, //分页
+    shenheList: null, //审核成功
+    successlist: null, //交易失败
+    tatalstatus2: null, //分页
+    tatalstatus1: null, //分页
+    Transactionlist: null, //交易中
     // gonggeiData: null,
   },
   components: {

src/layout/enterprise/contextfabuxx.vue

@@ -6,7 +6,7 @@
           <el-tab-pane label="我的需求" name="first">
             <el-row style="padding: 0 20px;">
               <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
-                <el-tab-pane label="已经审核信息" name="first">
+                <el-tab-pane label="审核成功" name="first">
                   <el-col :span="24" v-for="(item, index) in recruitData" :key="index">
                     <el-col class="xqborder">
                       <el-col :span="24" class="fbListTop">
@@ -91,15 +91,17 @@
                   <el-col class="page" :span="24">
                     <el-pagination
                       @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange"
+                      @current-change="handleCurrentChange1"
                       :current-page="currentPage"
+                      background
                       layout="total,  prev, pager, next, jumper"
                       :total="tatalstatus1"
+                      :page-size="pageSize"
                     >
                     </el-pagination>
                   </el-col>
                 </el-tab-pane>
-                <el-tab-pane label="未交易" name="thirth">
+                <el-tab-pane label="审核失败" name="thirth">
                   <el-col :span="24" v-for="(item, index) in successlist" :key="index">
                     <el-col class="xqborder">
                       <el-col :span="24" class="fbListTop">
@@ -133,17 +135,19 @@
                   <el-col class="page" :span="24">
                     <el-pagination
                       @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange"
+                      @current-change="handleCurrentChange1"
                       :current-page="currentPage"
+                      background
                       layout="total,  prev, pager, next, jumper"
                       :total="tatalstatus2"
+                      :page-size="pageSize"
                     >
                     </el-pagination>
                   </el-col>
                 </el-tab-pane>
 
-                <el-tab-pane label="交易完成" name="thirth">
-                  <el-col :span="24" v-for="(item, index) in successlist" :key="index">
+                <el-tab-pane label="交易中" name="fgrr">
+                  <el-col :span="24" v-for="(item, index) in Transactionlist" :key="index">
                     <el-col class="xqborder">
                       <el-col :span="24" class="fbListTop">
                         <el-col :span="20"> {{ item.name }} </el-col>
@@ -341,6 +345,7 @@ export default {
     shenheList: null,
     tatalstatus2: null,
     tatalstatus1: null,
+    Transactionlist: null,
     // gonggeiData: null,
   },
   components: {},
@@ -379,6 +384,16 @@ export default {
       console.log(currentPage);
       this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
+
+    handleCurrentChange1(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange1', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+
+    handleCurrentChange2(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange2', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
   },
 };
 </script>

src/store/index.js

@@ -20,8 +20,11 @@ import enterpriseproject from './enterpriseproject';
 import transaction from './transaction';
 import marketproduct from './marketproduct';
 import markettype from './markettype';
+import tranaudit from './tranaudit';
+
 import * as ustate from './user/state';
 import * as umutations from './user/mutations';
+
 Vue.use(Vuex);
 
 export default new Vuex.Store({
@@ -46,6 +49,7 @@ export default new Vuex.Store({
     transaction,
     marketproduct,
     markettype,
+    tranaudit,
   },
   state: { ...ustate },
   mutations: { ...umutations },

src/store/tranaudit.js

@@ -0,0 +1,39 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  newsInfo: `/api/market/tranaudit`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.newsInfo}`, { skip, limit, ...info });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.newsInfo}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.newsInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.newsInfo}/update/${id}`, data);
+    return res;
+  },
+
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.newsInfo}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/store/user/mutations.js

@@ -1,17 +1,15 @@
+const jwt = require('jsonwebtoken');
 export const setUser = (state, payload) => {
   let res = true;
   //登陆时
   if (payload) {
-    let { user, menuList } = payload;
-    state.user = user;
-    state.menuList = menuList;
+    state.token = payload;
   } else {
     //已经登陆,切换路由时取出用户信息放在总store中
-    let user = localStorage.getItem('user');
-    let menuList = localStorage.getItem('menuList');
-    if (menuList) state.menuList = JSON.parse(menuList);
-    if (user) state.user = JSON.parse(user);
-    else {
+    let token = localStorage.getItem('token');
+    if (token) {
+      state.user = jwt.decode(token);
+    } else {
       res = false;
       state.user = undefined;
       console.warn('用户未登录');
@@ -22,7 +20,5 @@ export const setUser = (state, payload) => {
 
 export const deleteUser = (state, payload) => {
   state.user = {};
-  state.menuList = [];
   localStorage.removeItem('user');
-  localStorage.removeItem('menuList');
 };

src/views/enterprise/enterprisefabu.vue

@@ -8,10 +8,13 @@
       @onsave="onsaveClick"
       :successlist="successlist"
       :shenheList="shenheList"
+      :Transactionlist="Transactionlist"
       :total="total"
       :tatalstatus1="tatalstatus1"
       :tatalstatus2="tatalstatus2"
       @handleCurrentChange="handleCurrentChange"
+      @handleCurrentChange1="handleCurrentChange1"
+      @handleCurrentChange2="handleCurrentChange2"
     ></enterprisefabu-detail>
   </div>
 </template>
@@ -35,6 +38,7 @@ export default {
     liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
     recruitData: [],
     gonggeiData: [],
+    Transactionlist: [],
     total: 1,
     tatalstatus1: 1,
     tatalstatus2: 1,
@@ -63,21 +67,18 @@ export default {
     },
     // 查询列表
     async searchInfo({ skip = 0, limit = 3, ...info } = {}) {
-      let status = 1;
       skip = this.skip;
-
+      let status = 1;
       const res = await this.productList({ skip, limit, status, ...info });
-      console.log(res);
       if (this.$checkRes(res)) {
         this.$set(this, `recruitData`, res.data);
         this.$set(this, `total`, res.total);
       }
     },
-    async searchstatus1({ skip = 0, limit = 3, ...info } = {}) {
+    async searchstatus1({ skip, limit = 3, ...info } = {}) {
       let status = 0;
-      console.log();
+      skip = this.skip;
       const res = await this.productList({ skip, limit, status, ...info });
-      console.log(res);
       if (this.$checkRes(res)) {
         this.$set(this, `shenheList`, res.data);
         this.$set(this, `tatalstatus1`, res.total);
@@ -85,6 +86,7 @@ export default {
     },
     async searchstaus2({ skip = 0, limit = 3, ...info } = {}) {
       let status = 2;
+      skip = this.skip;
       console.log();
       const res = await this.productList({ skip, limit, status, ...info });
       console.log(res);
@@ -98,6 +100,18 @@ export default {
       this.$set(this, `skip`, skip);
       this.searchInfo();
     },
+
+    async handleCurrentChange1({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      console.log(skip);
+      this.searchstatus1();
+    },
+
+    async handleCurrentChange2({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.searchstaus2();
+    },
+
     // 删除信息
     async deleteData({ item }) {
       const res = await this.productdeltet(item.id);

src/views/enterprise/enterprisexuqiu.vue

@@ -15,7 +15,7 @@
 
 <script>
 import enterprisexuqiuDetail from '@/components/enterprise/enterprisexuqiu.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
 const { mapActions: mapMarkettype } = createNamespacedHelpers('markettype');
 const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
@@ -42,6 +42,8 @@ export default {
     this.searchInfo();
   },
   computed: {
+    ...mapState(['user']),
+
     id() {
       return this.$route.query.id;
     },
@@ -74,8 +76,7 @@ export default {
     async demandSubmit(demandForm) {
       let data = this.demandForm;
       console.log(data);
-      data.userid = '1234556677';
-      console.log(data);
+      data.userid = this.user.id;
 
       let res;
       let msg;

src/views/supermaket/supermarketlist.vue

@@ -16,11 +16,12 @@
 
 <script>
 import supermarketlistDetail from '@/components/supermaket/supermarketlistDetail.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 import _ from 'loadsh';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
 const { mapActions: mapEnterpriseproject } = createNamespacedHelpers('enterpriseproject');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
+const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
 
 export default {
   name: 'policy',
@@ -42,6 +43,7 @@ export default {
     this.search();
   },
   computed: {
+    ...mapState(['user']),
     totaltype() {
       return this.$route.query.totaltype;
     },
@@ -50,6 +52,7 @@ export default {
     ...mapSite(['showInfo']),
     ...mapEnterpriseproject({ list: 'query', fetch: 'fetch' }),
     ...transaction({ transactioncreate: 'create', transactionfetch: 'fetch' }),
+    ...tranaudit({ tranauditcreate: 'create' }),
     // 查询站点信息
     async searchSite() {
       let res = await this.showInfo();
@@ -89,23 +92,25 @@ export default {
       this.search();
     },
     async onSubmit() {
+      console.log(this.user.id);
       let form = {};
-
-      form.userid = '12334';
+      form.userid = this.user.id;
       form.username = '测试neme';
       form.product_id = this.policyInfo.id;
       form.product_name = this.policyInfo.name;
       form.market_userid = this.policyInfo.userid;
       form.market_username = this.policyInfo.contact_user;
       form.status = '0';
+      console.log(form);
       let res = await this.transactioncreate(form);
       this.$checkRes(res, '发起交易成功', '交易失败');
-      // console.log(form);
-      // let shenhe = {};
-      // shenhe.result = '0';
-      // shenhe.userid = this.policyInfo.userid;
-      // shenhe.product_id = this.policyInfo.userid;
-      // console.log(shenhe);
+      let shenhe = {};
+      shenhe.result = '0';
+      shenhe.transaction_id = res.data.id;
+      shenhe.userid = this.policyInfo.userid;
+      shenhe.product_id = this.policyInfo.userid;
+      console.log(shenhe);
+      let ress = await this.tranauditcreate(shenhe);
     },
   },
 };