新增店铺管理

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    BASE_API: '"http://cjxc.wanwudezhi.com/admin"'
+    BASE_API: '"http://cjxc-dev.wanwudezhi.com/admin"'
     // BASE_API: '"http://10.10.56.84:8085/admin"'
 }

src/api/business/shop.js

+import request from '@/utils/request'
+
+export function shopManagerList(data) {
+  return request({
+    url: '/openShopApplyOrder/findList',
+    method: 'post',
+    data
+  })
+}
+export function shopManagerDetail(data) {
+  return request({
+    url: '/openShopApplyOrder/findDetail',
+    method: 'post',
+    data
+  })
+}
+export function shopManagerCheck(data) {
+  return request({
+    url: '/openShopApplyOrder/auditApplyOrder',
+    method: 'post',
+    data
+  })
+}
+

src/views/shop/components/NoPassIdentifyDialog.vue

@@ -31,7 +31,7 @@
 
 <script>
 import { MessageBox } from 'element-ui'
-import { requestIdentify } from '@/api/business/order'
+import { shopManagerCheck} from '@/api/business/shop'
 export default {
   name: 'NoPassIdentifyDialog',
   props: {
@@ -39,7 +39,7 @@ export default {
       type: Boolean,
       default: false
     },
-    distributionOrderId: {
+    openShopApplyOrderId: {
       type: String,
       default: ''
     },
@@ -68,17 +68,17 @@ export default {
      * 取消
      */
     handleCancelValue() {
-      if (this.distributionOrderId) {
-        const params = { ...this.cancelForm, distributionOrderId: this.distributionOrderId, identifyOrderId: this.identifyOrderId, approved: 0 }
+      if (this.openShopApplyOrderId) {
+        const params = { ...this.cancelForm, openShopApplyOrderId: this.openShopApplyOrderId,  state: 30 }
         this.$refs.cancel.validate((valid) => {
           if (valid) {
-            requestIdentify(params)
+            shopManagerCheck(params)
               .then(response => {
                 this.$notify.success({
                   message: '操作成功'
                 })
                 this.cancelForm = {}
-                this.$emit('refreshItem', this.distributionOrderId)
+                this.$emit('refreshItem', this.shopManagerCheck)
               })
               .catch(response => {
                 MessageBox.alert('业务错误：' + response.data.errmsg, '警告', {

src/views/shop/shopManagerDetail.vue

 <template>
 
   <div class="page_transferDetail">
-    <div v-if="itemContent && itemContent.distributionOrderId" class="detail_button">
+    <div v-if="itemContent && itemContent.openShopApplyOrderId" class="detail_button">
       <el-button
-        v-if="(itemContent && itemContent.transferState === 12)"
-        type="primary"
-        size="mini"
-        @click="handleReceive()">确认收货
-      </el-button>
-      <el-button
-        v-if="(itemContent.transferState === 13)"
+        v-if="(itemContent.state === 10)"
         type="primary"
         size="mini"
         @click="handlePass()">通过
       </el-button>
       <el-button
-        v-if="(itemContent.transferState === 13)"
+        v-if="(itemContent.state === 10)"
         type="danger"
         size="mini"
         @click="handleNoPass()">不通过
       </el-button>
-      <el-button
-        v-if="(itemContent.transferState === 14)"
-        type="primary"
-        size="mini"
-        @click="handleSend(1)">去发货
-      </el-button>
-      <el-button
-        v-if="(itemContent.transferState === 15)"
-        type="primary"
-        size="mini"
-        @click="handleSend(2)">退回藏品
-      </el-button>
+
     </div>
     <el-card class="box-card" style="margin: 0 16px">
       <div class="title">
         <div class="title_content">店铺信息</div>
-        <el-button v-if="itemContent.transferStateName" type="warning" plain size="mini">{{ itemContent.transferStateName }}</el-button>
+        <el-button v-if="itemContent.stateName" type="warning" plain size="mini">{{ itemContent.stateName }}</el-button>
       </div>
       <div class="user_info flex">
         <el-form ref="addInviteRef" label-width="100px" style="width: 30%">
           <el-form-item label="商家ID：">
-            <div>{{ itemContent.distributionOrderId || '-' }}</div>
+            <div>{{ itemContent.userId || '-' }}</div>
           </el-form-item>
           <el-form-item label="昵称：">
             <div>{{ itemContent.createTime || '-' }}</div>
@@ -49,15 +32,15 @@
         </el-form>
         <el-form ref="addInviteRef" label-width="100px" style="width: 30%">
           <el-form-item label="申请时间：">
-            <div>{{ itemContent.sellerName || '-' }}</div>
+            <div>{{ itemContent.createTime || '-' }}</div>
           </el-form-item>
           <el-form-item label="粉丝：">
-            <div>{{ itemContent.buyerName || '-' }}</div>
+            <div>{{ itemContent.fansNum || '-' }}</div>
           </el-form-item>
         </el-form>
         <el-form ref="addInviteRef" label-width="200px" style="width: 30%">
           <el-form-item label="已上架的商品：">
-            <div>{{ itemContent.sellerName || '-' }}</div>
+            <div>{{ itemContent.uploadItemNum || '-' }}</div>
           </el-form-item>
         </el-form>
 
@@ -76,35 +59,31 @@
           fit
           highlight-current-row>
 
-          <el-table-column align="center" label="身份证正面" prop="homePageImage" class="image_preview">
+          <el-table-column align="center" label="身份证正面" prop="idCardFrontImage" class="image_preview">
             <template slot-scope="scope">
-              <!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px"> -->
+              <!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.idCardFrontImage.url" width="60px" height="60px"> -->
               <el-image
-              :preview-src-list="[scope.row.homePageImage.url ]"
-              :src="scope.row.homePageImage.url"
+              :preview-src-list="[scope.row.idCardFrontImage]"
+              :src="scope.row.idCardFrontImage"
               class="table-td-thumb"
             />
             </template>
           </el-table-column>
-          <el-table-column align="center" label="身份证反面" prop="homePageImage">
+          <el-table-column align="center" label="身份证反面" prop="idCardBackImage">
             <template slot-scope="scope">
               <!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px"> -->
               <el-image
-              :preview-src-list="[scope.row.homePageImage.url ]"
-              :src="scope.row.homePageImage.url"
+              :preview-src-list="[scope.row.idCardBackImage ]"
+              :src="scope.row.idCardBackImage"
               class="table-td-thumb"
             />
             </template>
           </el-table-column>
-          <el-table-column align="center" label="银行卡号" min-width="150px" prop="itemName">
-            <template slot-scope="scope">
-              <Line2Hidden :text="scope.row.itemName || ''" />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="开户行" prop="itemNum" />
-          <el-table-column align="center" label="持卡人姓名" prop="itemPrice" />
-          <el-table-column align="center" label="开店费" prop="itemNum" />
-          <el-table-column align="center" label="质保金" prop="itemPrice" />
+          <el-table-column align="center" label="开户行" prop="cardId" />
+          <el-table-column align="center" label="开户行" prop="bankName" />
+          <el-table-column align="center" label="持卡人姓名" prop="name" />
+          <el-table-column align="center" label="开店费" prop="openShopAmount" />
+          <!-- <el-table-column align="center" label="质保金" prop="itemPrice" /> -->
         </el-table>
       </div>
     </el-card>
@@ -132,6 +111,7 @@ import Line2Hidden from '@/components/line2Hidden'
 import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
 import ReturnLogisticIdentifyDialog from './components/ReturnLogisticIdentifyDialog'
 import { requestSigned, requestIdentify, requestTransferDetail } from '@/api/business/order'
+import { shopManagerDetail,shopManagerCheck} from '@/api/business/shop'
 export default {
   name: 'shopManagerDetail',
   components: { ReturnLogisticIdentifyDialog, NoPassIdentifyDialog, Line2Hidden },
@@ -149,29 +129,28 @@ export default {
     }
   },
   created() {
-    const id = this.$route.query.distributionOrderId
+    const id = this.$route.query.openShopApplyOrderId
     if (!id) {
       return
     }
-    this.distributionOrderId = id
+    this.openShopApplyOrderId = id
     this.handleGetDetail()
   },
   methods: {
     handleGetDetail() {
       const params = {
-        distributionOrderId: this.distributionOrderId
+        openShopApplyOrderId: this.openShopApplyOrderId
       }
-      requestTransferDetail(params).then(response => {
+      shopManagerDetail(params).then(response => {
         console.log('===response=', response)
-        this.itemContent = response.data.data.data || {}
-        this.fromLogisticsInfo = response.data.data.fromLogisticsInfo || '-'
-        this.returnLogisticsInfo = response.data.data.returnLogisticsInfo || ''
-        this.deliveryLogisticsInfo = response.data.data.deliveryLogisticsInfo || ''
+        this.itemContent = response.data.data || {}
         const model = {
-          itemName: this.itemContent.itemName,
-          homePageImage: this.itemContent.homePageImage,
-          itemNum: this.itemContent.itemNum,
-          itemPrice: this.itemContent.itemPrice ? `¥${this.itemContent.itemPrice}` : '-'
+          cardId: this.itemContent.cardId,
+          bankName: this.itemContent.bankName,
+          name: this.itemContent.name,
+          openShopAmount: this.itemContent.openShopAmount,
+          idCardFrontImage: this.itemContent.idCardFrontImage,
+          idCardBackImage: this.itemContent.idCardBackImage,
         }
         this.list = [model]
       }).catch((e) => {
@@ -207,19 +186,25 @@ export default {
      * 通过
      * @param item
      */
-    handlePass() {
+     handlePass(row) {
       this.$confirm('确定通过该藏家的开店申请？', '平台开店结果', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'message'
       }).then(() => {
         const params = {
-          identifyOrderId: this.itemContent.identifyOrderId,
-          distributionOrderId: this.itemContent.distributionOrderId,
-          approved: 1
+          openShopApplyOrderId:this.openShopApplyOrderId,
+          state: 20
         }
-        requestIdentify(params).then(response => {
-          this.handleGetDetail()
+        shopManagerCheck(params).then(response => {
+          this.list = this.list.filter((itemContent) => {
+            if (openShopApplyOrderId === row.openShopApplyOrderId) {
+              itemContent.stateName = '审核通过'
+              itemContent.state = 20
+              return  itemContent
+            }
+            return itemContent
+          })
           this.$notify.success({
             message: '操作成功'
           })

src/views/shop/shopManagerList.vue

@@ -6,7 +6,7 @@
     </el-menu> -->
       <div class="order_select">
         <el-input
-          v-model="listQuery.distributionOrderId"
+          v-model="listQuery.userId"
           clearable
           class="filter-item"
           style="width: 200px;"
@@ -20,7 +20,7 @@
             size="mini" />
         </el-select>
         <el-input
-          v-model="listQuery.itemName"
+          v-model="listQuery.userName"
           clearable
           class="filter-item"
           style="width: 200px;"
@@ -52,7 +52,7 @@
       fit
       highlight-current-row>
       <!--      <el-table-column align="center" label="排行" width="100px" type="index" />-->
-      <el-table-column align="center" min-width="100px" prop="distributionOrderId" label="商家ID" />
+      <el-table-column align="center" min-width="100px" prop="openShopApplyOrderId" label="申请编号" />
       <!-- <el-table-column align="center" label="分销商名称" min-width="150px" prop="sellerName">
         <template slot-scope="scope">
           <Line2Hidden :text="scope.row.sellerName || ''" />
@@ -67,11 +67,8 @@
             height="60px">
         </template>
       </el-table-column> -->
-      <el-table-column align="center" label="店铺名称" min-width="150px" prop="itemName">
-        <template slot-scope="scope">
-          <Line2Hidden :text="scope.row.itemName" />
-        </template>
-      </el-table-column>
+      <el-table-column align="center" min-width="100px" prop="userName" label="藏家昵称" />
+      <el-table-column align="center" min-width="100px" prop="userId" label="藏家ID" />
       <!-- <el-table-column align="center" label="藏片件数" prop="itemNum" />
       <el-table-column align="center" label="实付款" prop="amount">
         <template slot-scope="scope">
@@ -108,13 +105,13 @@
             @click="handleToDetail(scope.row)">详情
           </el-button>
           <el-button
-            v-if="(scope.row.state === 20)"
+            v-if="(scope.row.state === 10)"
             type="primary"
             size="mini"
             @click="handlePass(scope.row)">通过
           </el-button>
           <el-button
-            v-if="(scope.row.state === 20)"
+            v-if="(scope.row.state === 10)"
             type="danger"
             size="mini"
             @click="handleNoPass()">不通过
@@ -171,7 +168,8 @@
 import Line2Hidden from '@/components/line2Hidden'
 import Pagination from '@/components/Pagination'
 import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
-import { requestOrderList, requestLogisticsList, requestDelivery } from '@/api/business/order'
+import { shopManagerList,shopManagerCheck} from '@/api/business/shop'
+import { requestLogisticsList, requestDelivery } from '@/api/business/order'
 
 export default {
   name: 'shopManagerList',
@@ -185,17 +183,17 @@ export default {
     return {
       itemKey: 0,
       options: [{
-        value: 1,
+        value: 0,
         label: '待付款'
       }, {
         value: 10,
         label: '待审核'
       }, {
         value: 20,
-        label: '通过'
+        label: '审核通过'
       }, {
         value: 30,
-        label: '不通过'
+        label: '审核不通过'
       }],
       listLoading: true,
       listQuery: {
@@ -294,14 +292,14 @@ export default {
         type: 'message'
       }).then(() => {
         const params = {
-          distributionOrderId: row.distributionOrderId,
-          approved: 1
+          openShopApplyOrderId: row.openShopApplyOrderId,
+          state: 20
         }
-        exchangeApplyOrdercheck(params).then(response => {
+        shopManagerCheck(params).then(response => {
           this.list = this.list.filter((item) => {
-            if (item.distributionOrderId === row.distributionOrderId) {
-              item.stateName = '待发货'
-              item.state = 10
+            if (item.openShopApplyOrderId === row.openShopApplyOrderId) {
+              item.stateName = '审核通过'
+              item.state = 20
               return item
             }
             return item
@@ -378,7 +376,7 @@ export default {
     getList() {
       localStorage.setItem('systemState', '')
       this.listLoading = true
-      requestOrderList(this.listQuery).then(response => {
+      shopManagerList(this.listQuery).then(response => {
         this.list = response.data.data.dataList
         this.total = response.data.data.total
         this.listLoading = false
@@ -432,7 +430,7 @@ export default {
      * @param item
      */
      handleToDetail(item) {
-      this.$router.push({ path: '/shop/shopManagerDetail', query: { distributionOrderId: item.distributionOrderId }})
+      this.$router.push({ path: '/shop/shopManagerDetail', query: { openShopApplyOrderId: item.openShopApplyOrderId }})
     },
        /**
      * 订单状态切换