gengxin

src/layout/dock/applyForm.vue

@@ -12,7 +12,7 @@
           <span v-if="form.buyer == '1'">
             <el-form-item label="选择产品" prop="goodsList">
               <el-select v-model="form.goodsList" placeholder="请选择选择产品">
-                <el-option v-for="(item, index) in goodsLists" :key="index" :label="item.name" :value="item.id"> </el-option>
+                <el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="item.id"> </el-option>
               </el-select>
             </el-form-item>
           </span>
@@ -44,6 +44,7 @@ export default {
   name: 'applyForm',
   props: {
     form: null,
+    list: null,
   },
   components: {},
   data: function() {
@@ -56,7 +57,6 @@ export default {
         email: [{ required: false, message: '请输入电子邮箱', trigger: 'blur' }],
         company: [{ required: false, message: '请输入单位名称', trigger: 'blur' }],
       },
-      goodsLists: [],
     };
   },
   created() {},

src/layout/matter/detailinfo.vue

@@ -15,8 +15,8 @@
             <span>{{ detailInfo.username || '暂无' }}</span>
           </p>
           <p>
-            <span>联系人:</span>
-            <span>{{ detailInfo.contact_user || '暂无' }}</span>
+            <span>状态:</span>
+            <span>{{ detailInfo.status === '0' ? '洽谈' : detailInfo.status === '1' ? '意向' : detailInfo.status === '2' ? '交易' : '暂无' }}</span>
           </p>
           <div class="introduction">
             <p>说明:</p>

src/store/index.js

@@ -3,10 +3,14 @@ import Vuex from 'vuex';
 import marketproduct from '@common/store/market/marketproduct';
 import expertsuser from '@common/store/market/exportuser';
 import maarkettype from '@common/store/market/markettype';
+
 import authUser from './user/auth-user';
 import dock from '@common/store/live/dock';
 import wxchattest from './user/wxchattest';
 import market from '@common/store/market/market';
+import apply from '@common/store/live/apply';
+import transaction from '@common/store/market/transaction';
+import expertsaudit from '@common/store/market/expertsaudit';
 import * as ustate from '@/store/common/state';
 import * as umutations from '@/store/common/mutations';
 
@@ -24,5 +28,8 @@ export default new Vuex.Store({
     authUser,
     dock,
     wxchattest,
+    apply,
+    transaction,
+    expertsaudit,
   },
 });

src/views/market/index.vue

@@ -39,7 +39,7 @@
             </van-tabs>
           </el-col>
           <el-col :span="24" class="two">
-            <van-button type="primary" @click="$router.push({ path: '/market/detail' })">发布产品</van-button>
+            <van-button type="primary" @click="$router.push({ path: '/market/detail' })" v-if="user.role == 3 || user.role == 2">发布产品</van-button>
           </el-col>
         </el-col>
         <el-col :span="24" class="foot">

src/views/market/parts/productList.vue

@@ -39,7 +39,7 @@ export default {
   methods: {
     ...product(['newquery']),
     async searchInfo() {
-      let res = await this.newquery({ skip: 0, limit: 6, totaltype: '1', status: '1' });
+      let res = await this.newquery({ totaltype: '1', status: '1' });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/market/parts/serviceList.vue

@@ -39,7 +39,7 @@ export default {
   methods: {
     ...product(['newquery']),
     async searchInfo() {
-      let res = await this.newquery({ skip: 0, limit: 6, totaltype: '2', status: '1' });
+      let res = await this.newquery({ totaltype: '2', status: '1' });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/userCenter/dock/apply.vue

@@ -6,7 +6,7 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <applyForm :form="form" @onSubmit="onSubmit" @restBtn="restBtn"></applyForm>
+          <applyForm :form="form" @onSubmit="onSubmit" @restBtn="restBtn" :list="list"></applyForm>
         </el-col>
       </el-col>
     </el-row>
@@ -14,6 +14,9 @@
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: product } = createNamespacedHelpers('marketproduct');
+const { mapActions: apply } = createNamespacedHelpers('apply');
 import NavBar from '@/layout/common/topInfo.vue';
 import applyForm from '@/layout/dock/applyForm.vue';
 export default {
@@ -32,16 +35,39 @@ export default {
     navShow: true,
     // 申請
     form: {},
+    list: [],
   }),
-  created() {},
+  created() {
+    this.search();
+  },
   computed: {
+    ...mapState(['user']),
     id() {
       return this.$route.query.id;
     },
   },
   methods: {
-    onSubmit({ data }) {
-      console.log(data);
+    ...product(['newquery']),
+    ...apply({ appleCreate: 'create' }),
+    async search() {
+      let userid = this.user.uid;
+      let res = await this.newquery({ status: '1', userid });
+
+      this.$set(this, `list`, res.data);
+    },
+    async onSubmit({ data }) {
+      data.user_id = this.user.uid;
+      if (this.user.role == '3' || this.user.role == '2' || this.user.role == '6') {
+        console.log(data);
+        data.user_name = this.user.name;
+        let dock_id = this.$route.query.id;
+        console.log(data);
+
+        const res = await this.appleCreate({ id: dock_id, ...data });
+        this.$checkRes(res, '添加成功', '添加失败');
+      } else {
+        this.$message.error('您的身份不能申请展会，请重新登录');
+      }
     },
     restBtn() {
       this.form = {};

src/views/userCenter/matter/detailinfo.vue

@@ -16,6 +16,8 @@
 <script>
 import NavBar from '@/layout/common/topInfo.vue';
 import detailinfo from '@/layout/matter/detailinfo.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
 export default {
   name: 'prodDetail',
   props: {},
@@ -31,11 +33,28 @@ export default {
     // 返回
     navShow: true,
     // 产品名称
-    detailInfo: { product_name: '最最新新技术', market_username: '卖家1', username: '买家1', description: '222222222222222222222222222222' },
+    detailInfo: {},
   }),
-  created() {},
-  computed: {},
-  methods: {},
+  created() {
+    this.search();
+  },
+  computed: {
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  methods: {
+    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update', fetch: 'fetch' }),
+
+    async search() {
+      let res = await this.fetch(this.id);
+      console.log(res.data);
+
+      if (this.$checkRes(res)) {
+        this.$set(this, `detailInfo`, res.data);
+      }
+    },
+  },
   mounted() {
     this.title = this.$route.meta.title;
     this.isleftarrow = this.$route.meta.isleftarrow;

src/views/userCenter/matter/index.vue

@@ -1,47 +1,74 @@
 <template>
   <div id="index">
-    <el-col :span="24" class="style">
-      <el-col :span="24" class="top">
-        <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-      </el-col>
-      <el-col :span="24" class="main">
+    <el-row>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="top">
+          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
+        </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="one">
-            <van-tabs v-model="active" animated>
-              <van-tab>
-                <template #title>
-                  <van-icon name="todo-list" />
-                  <p>我的全部</p>
-                </template>
-                <wholeList></wholeList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="column" />
-                  <p>我的洽谈</p>
-                </template>
-                <negotiation></negotiation>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="label" />
-                  <p>我的意向</p>
-                </template>
-                <intentionList></intentionList>
-              </van-tab>
+          <el-col :span="24" class="main">
+            <el-col :span="24" class="one">
+              <van-tabs v-model="active" animated>
+                <van-tab>
+                  <template #title>
+                    <van-icon name="todo-list" />
+                    <p>我的全部</p>
+                  </template>
+                  <wholeList></wholeList>
+                </van-tab>
+                <van-tab>
+                  <template #title>
+                    <van-icon name="column" />
+                    <p>我的洽谈</p>
+                  </template>
+                  <negotiation></negotiation>
+                </van-tab>
+                <van-tab>
+                  <template #title>
+                    <van-icon name="label" />
+                    <p>我的意向</p>
+                  </template>
+                  <intentionList @submit="submit"></intentionList>
+                </van-tab>
 
-              <van-tab>
-                <template #title>
-                  <van-icon name="label" />
-                  <p>我的交易</p>
-                </template>
-                <transaction></transaction>
-              </van-tab>
-            </van-tabs>
+                <van-tab>
+                  <template #title>
+                    <van-icon name="label" />
+                    <p>我的交易</p>
+                  </template>
+                  <transaction></transaction>
+                </van-tab>
+              </van-tabs>
+            </el-col>
           </el-col>
         </el-col>
       </el-col>
-    </el-col>
+    </el-row>
+    <van-popup v-model="show" position="bottom"
+      ><van-form @submit="onSubmit">
+        <van-field
+          v-model="newform.product_name"
+          name="产品名称"
+          label="产品名称"
+          placeholder="用户名"
+          :rules="[{ required: true, message: '请填写用户名' }]"
+        />
+        <van-field
+          v-model="newform.username"
+          name="购买人名称"
+          label="购买人名称"
+          placeholder="购买人名称"
+          :rules="[{ required: true, message: '请填写购买人名称' }]"
+        />
+        <van-field v-model="newform.market_username" name="营销人名称" label="营销人名称" placeholder="营销人名称" />
+        <van-field v-model="newform.description" name="描述" label="描述" placeholder="描述" />
+        <div style="margin: 16px;">
+          <van-button round block type="info" native-type="submit">
+            提交
+          </van-button>
+        </div>
+      </van-form></van-popup
+    >
   </div>
 </template>
 
@@ -52,7 +79,7 @@ import wholeList from './parts/wholeList.vue';
 import negotiation from './parts/negotiation.vue';
 import intentionList from './parts/intentionList.vue';
 import transaction from './parts/transaction.vue';
-
+const { mapActions: transactions } = createNamespacedHelpers('transaction');
 export default {
   name: 'index',
   props: {},
@@ -66,27 +93,25 @@ export default {
     navShow: true,
     img_path: require('@/assets/logo.png'),
     active: 0,
+    show: false,
+    newform: {},
   }),
   created() {},
   computed: {},
   methods: {
-    uploadSuccess({ type, data }) {
-      console.log(type, data);
-      // if (type !== 'img_path') {
-      //   let arr = _.get(this.uploads, type);
-      //   if (arr !== undefined) {
-      //     this.uploads[type].push({ name: data.name, uri: data.uri });
-      //   } else {
-      //     let newArr = [{ name: data.name, uri: data.uri }];
-      //     this.$set(this.uploads, `${type}`, newArr);
-      //   }
-      // } else {
-      //   this.picLoading = false;
-      //   this.$set(this.info, `${type}`, data.uri);
-      //   this.$nextTick(() => {
-      //     this.picLoading = true;
-      //   });
-      // }
+    ...transactions({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
+
+    async submit(item) {
+      console.log(item);
+      this.show = true;
+      this.$set(this, `newform`, item);
+      item.status = '2';
+      console.log(item);
+      let res = await this.shenheupdate(item);
+    },
+
+    onSubmit() {
+      console.log(this.newform);
     },
   },
   mounted() {
@@ -132,4 +157,10 @@ export default {
 .van-icon {
   font-size: 20px;
 }
+/deep/.van-popup--bottom {
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 300px;
+}
 </style>

src/views/userCenter/matter/parts/intentionList.vue

@@ -4,8 +4,8 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo' })">{{ item.product_name }}</span>
-            <span style="float:right"><van-button type="info" size="small" @click="submit">交易成功</van-button></span>
+            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
+            <span style="float:right"><van-button type="info" size="small" @click="submit(item)">交易成功</van-button></span>
           </p>
           <p>
             <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
@@ -20,73 +20,32 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
+
 export default {
   name: 'auditList',
   props: {},
   components: {},
   data: function() {
     return {
-      list: [
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-      ],
+      list: [],
     };
   },
   created() {
     this.searchInfo();
   },
   methods: {
-    ...product(['newquery']),
+    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
     async searchInfo() {
-      // let res = await this.newquery({ skip: 0, limit: 6, totaltype: '0', status: '1' });
-      // if (this.$checkRes(res)) {
-      //   this.$set(this, `list`, res.data);
-      // }
+      let market_userid = this.user.uid;
+      let res = await this.transactionList({ market_userid, status: 1 });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.data);
+      }
     },
 
-    submit() {
-      console.log('submit');
+    submit(item) {
+      this.$emit('submit', item);
     },
   },
   computed: {

src/views/userCenter/matter/parts/negotiation.vue

@@ -4,8 +4,8 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo' })">{{ item.product_name }}</span>
-            <span style="float:right"><van-button type="info" size="small" @click="submit">同意交易</van-button></span>
+            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
+            <span style="float:right"><van-button type="info" size="small" @click="submit(item)">同意交易</van-button> </span>
           </p>
           <p>
             <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
@@ -15,78 +15,40 @@
         </el-col>
       </el-col>
     </el-row>
+    <van-popup v-model="show">内容</van-popup>
   </div>
 </template>
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
+
 export default {
   name: 'auditList',
   props: {},
   components: {},
   data: function() {
     return {
-      list: [
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-      ],
+      list: [],
     };
   },
   created() {
     this.searchInfo();
   },
   methods: {
-    ...product(['newquery']),
+    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
     async searchInfo() {
-      // let res = await this.newquery({ skip: 0, limit: 6, totaltype: '0', status: '1' });
-      // if (this.$checkRes(res)) {
-      //   this.$set(this, `list`, res.data);
-      // }
+      let market_userid = this.user.uid;
+      let res = await this.transactionList({ market_userid, status: 0 });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.data);
+      }
     },
-
-    submit() {
-      console.log('submit');
+    async submit(item) {
+      item.status = '1';
+      console.log(item);
+      let res = await this.shenheupdate(item);
+      this.$checkRes(res, '同意成功', '审核失败');
     },
   },
   computed: {
@@ -128,4 +90,9 @@ export default {
     }
   }
 }
+.content {
+  padding: 16px 16px 160px;
+  height: 160px;
+  background-color: aqua;
+}
 </style>

src/views/userCenter/matter/parts/transaction.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo' })">{{ item.product_name }}</span>
+            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
           </p>
           <p>
             <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
@@ -19,73 +19,32 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
+const { mapActions: expertsaudit } = createNamespacedHelpers('expertsaudit');
 export default {
   name: 'auditList',
   props: {},
   components: {},
   data: function() {
     return {
-      list: [
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-      ],
+      list: [],
     };
   },
   created() {
     this.searchInfo();
   },
   methods: {
-    ...product(['newquery']),
+    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
     async searchInfo() {
-      // let res = await this.newquery({ skip: 0, limit: 6, totaltype: '0', status: '1' });
-      // if (this.$checkRes(res)) {
-      //   this.$set(this, `list`, res.data);
-      // }
+      let market_userid = this.user.uid;
+      let res = await this.transactionList({ market_userid, status: 2 });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.data);
+      }
     },
 
-    submit() {
-      console.log('submit');
+    async submit(data) {
+      console.log(data);
     },
   },
   computed: {

src/views/userCenter/matter/parts/wholeList.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo' })">{{ item.product_name }}</span>
+            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
           </p>
           <p>
             <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
@@ -19,69 +19,27 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
 export default {
   name: 'auditList',
   props: {},
   components: {},
   data: function() {
     return {
-      list: [
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-        {
-          product_name: '最最新新技术',
-          market_username: '卖家1',
-          username: '买家1',
-          description: '222222222222222222222222222222',
-        },
-      ],
+      list: [],
     };
   },
   created() {
     this.searchInfo();
   },
   methods: {
-    ...product(['newquery']),
+    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
     async searchInfo() {
-      // let res = await this.newquery({ skip: 0, limit: 6, totaltype: '0', status: '1' });
-      // if (this.$checkRes(res)) {
-      //   this.$set(this, `list`, res.data);
-      // }
+      let market_userid = this.user.uid;
+      let res = await this.transactionList({ market_userid });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.data);
+      }
     },
 
     submit() {