更新

package-lock.json

@@ -2437,7 +2437,7 @@
     },
     "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",
+      "resolved": "https://registry.npm.taobao.org/buffer-equal-constant-time/download/buffer-equal-constant-time-1.0.1.tgz",
       "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
     },
     "buffer-from": {
@@ -4046,8 +4046,8 @@
     },
     "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==",
+      "resolved": "https://registry.npm.taobao.org/ecdsa-sig-formatter/download/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha1-rg8PothQRe8UqBfao86azQSJ5b8=",
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -6754,8 +6754,8 @@
     },
     "jsonwebtoken": {
       "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "resolved": "https://registry.npm.taobao.org/jsonwebtoken/download/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha1-AOceC431TCEhofJhN98igGc7zA0=",
       "requires": {
         "jws": "^3.2.2",
         "lodash.includes": "^4.3.0",
@@ -6783,8 +6783,8 @@
     },
     "jwa": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "resolved": "https://registry.npm.taobao.org/jwa/download/jwa-1.4.1.tgz?cache=0&sync_timestamp=1576560341481&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjwa%2Fdownload%2Fjwa-1.4.1.tgz",
+      "integrity": "sha1-dDwymFy56YZVUw1TZBtmyGRbA5o=",
       "requires": {
         "buffer-equal-constant-time": "1.0.1",
         "ecdsa-sig-formatter": "1.0.11",
@@ -6793,8 +6793,8 @@
     },
     "jws": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "resolved": "https://registry.npm.taobao.org/jws/download/jws-3.2.2.tgz",
+      "integrity": "sha1-ABCZ82OUaMlBQADpmZX6UvtHgwQ=",
       "requires": {
         "jwa": "^1.4.1",
         "safe-buffer": "^5.0.1"
@@ -7021,32 +7021,32 @@
     },
     "lodash.includes": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.includes/download/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",
+      "resolved": "https://registry.npm.taobao.org/lodash.isboolean/download/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",
+      "resolved": "https://registry.npm.taobao.org/lodash.isinteger/download/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",
+      "resolved": "https://registry.npm.taobao.org/lodash.isnumber/download/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",
+      "resolved": "https://registry.npm.taobao.org/lodash.isplainobject/download/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",
+      "resolved": "https://registry.npm.taobao.org/lodash.isstring/download/lodash.isstring-4.0.1.tgz",
       "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
     },
     "lodash.kebabcase": {
@@ -7069,7 +7069,7 @@
     },
     "lodash.once": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.once/download/lodash.once-4.1.1.tgz",
       "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
     },
     "lodash.transform": {

src/layout/enterprise/contextfabu.vue

@@ -6,9 +6,6 @@
           <el-tab-pane label="需求发布" name="first">
             <el-row class="demandForm">
               <el-form ref="form" :model="demandForm" label-width="80px">
-                <el-form-item label="用戶id">
-                  <el-input v-model="demandForm.userid" placeholder="后期删除"></el-input>
-                </el-form-item>
                 <el-form-item label="产品类型">
                   <el-select v-model="demandForm.totaltype" placeholder="请选择产品类型" @change="selectType">
                     <el-option v-for="(item, index) in totaltype_list" :key="index" :value="item.value" :label="item.name"></el-option>
@@ -136,7 +133,7 @@
               </el-form>
             </el-row>
           </el-tab-pane>
-          <el-tab-pane label="供给发布" name="second">供给发布</el-tab-pane>
+          <!-- <el-tab-pane label="供给发布" name="second">供给发布</el-tab-pane> -->
         </el-tabs>
       </el-col>
     </el-row>

src/layout/supermarket/rightcont.vue

@@ -116,17 +116,17 @@ export default {
       console.log('ads');
       console.log(id.id);
       let newid = id.id;
-      window.location.href = 'http://139.210.167.203/free-technological-management/supermaket/supermarketdetail?totaltype=0&&?&id=' + newid + '';
+      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=0&&?&id=' + newid + '';
     },
     detail(id) {
       console.log(id.id);
       let newid = id.id;
-      window.location.href = ' http://139.210.167.203/free-technological-management/supermaket/supermarketdetail?totaltype=1&&?&id=' + newid + '';
+      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=1&&?&id=' + newid + '';
     },
     clickdetail(id) {
       console.log(id.id);
       let newid = id.id;
-      window.location.href = 'http://139.210.167.203/free-technological-management/supermaket/supermarketdetail?totaltype=2&&?&id=' + newid + '';
+      window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + newid + '';
     },
   },
 };

src/router/index.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import checkLogin from './before';
+import checkLogin from '@common/router/before';
 
 Vue.use(VueRouter);
 
@@ -338,5 +338,4 @@ const router = new VueRouter({
   routes,
 });
 checkLogin(router);
-
 export default router;

src/store/index.js

@@ -26,9 +26,10 @@ import dock from './dock';
 import apply from './apply';
 import talentExperts from './talentExperts';
 import room from './room';
+import login from '@common/store/login';
 
-import * as ustate from './user/state';
-import * as umutations from './user/mutations';
+import * as ustate from '@common/store/user/state';
+import * as umutations from '@common/store/user/mutations';
 
 Vue.use(Vuex);
 
@@ -60,6 +61,7 @@ export default new Vuex.Store({
     apply,
     talentExperts,
     room,
+    login,
   },
   state: { ...ustate },
   mutations: { ...umutations },

src/views/enterprise/enterprisefabu.vue

@@ -89,7 +89,7 @@ export default {
     async searchInfo({ skip = 0, limit = 3, ...info } = {}) {
       skip = this.skip;
       let status = 1;
-      let userid = this.user.id;
+      let userid = this.user.uid;
       const res = await this.productList({ skip, limit, status, userid, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `recruitData`, res.data);
@@ -99,7 +99,7 @@ export default {
     async searchstatus1({ skip, limit = 3, ...info } = {}) {
       let status = 0;
       skip = this.skip;
-      let userid = this.user.id;
+      let userid = this.user.uid;
       const res = await this.productList({ skip, limit, status, userid, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `shenheList`, res.data);
@@ -109,7 +109,7 @@ export default {
     async searchstaus2({ skip = 0, limit = 3, ...info } = {}) {
       let status = 2;
       skip = this.skip;
-      let userid = this.user.id;
+      let userid = this.user.uid;
       console.log();
       const res = await this.productList({ skip, limit, status, userid, ...info });
       console.log(res);

src/views/enterprise/enterprisexuqiu.vue

@@ -76,7 +76,8 @@ export default {
     async demandSubmit(demandForm) {
       let data = this.demandForm;
       console.log(data);
-      data.userid = this.user.id;
+      data.userid = this.user.uid;
+      console.log(data.userid);
 
       let res;
       let msg;

vue.config.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const common = path.resolve(__dirname, '../common');
 module.exports = {
   publicPath: process.env.NODE_ENV === 'development' ? '/' : process.env.VUE_APP_ROUTER,
   // outputDir: process.env.VUE_APP_ROUTER,
@@ -10,6 +11,7 @@ module.exports = {
           '@': path.resolve(__dirname, './src'),
           '@c': path.resolve(__dirname, './src/components'),
           '@a': path.resolve(__dirname, './src/assets'),
+          '@common': common,
         },
       },
     });
@@ -26,6 +28,12 @@ module.exports = {
       '/files': {
         target: 'http://free.liaoningdoupo.com',
       },
+      '/api': {
+        target: 'http://free.liaoningdoupo.com',
+        // target: 'http://free.liaoningdoupo.com', //http://free.liaoningdoupo.com
+        changeOrigin: true,
+        ws: true,
+      },
       '/api/setting': {
         target: 'http://free.liaoningdoupo.com',
         // target: 'http://free.liaoningdoupo.com', //http://free.liaoningdoupo.com