平台端

Mr.Zhang

2023-09-22 b0cd187ac6eb1df56a572ac52afc42869269fea9

平台端

 platform/.env.development

@@ -12,4 +12,4 @@
VUE_APP_API = 'http://192.168.0.35:10023'

# #测试服务器
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'

 platform/.env.production

@@ -8,4 +8,4 @@

# http://yx.ahapp.net/admin_interface/doc.html
# VUE_APP_API = 'https://yx.ahapp.net/admin_interface'
VUE_APP_API = 'http://127.0.0.1:10023/
VUE_APP_API = 'https://127.0.0.1:10023/

 platform/.env.staging

@@ -7,4 +7,4 @@

# https://dmtest.ahapp.net/preselect_admin_interface/doc.html
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
VUE_APP_API = 'http://127.0.0.1:10023'
VUE_APP_API = 'https://127.0.0.1:10023'

 platform/public/template/goods_import_modle.xlsx

Binary files differ

 platform/src/views/business/company.vue

@@ -35,7 +35,7 @@
      <el-table v-loading="isWorking.search" :data="tableData.list" border stripe
        @selection-change="handleSelectionChange">
        <!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
        <el-table-column prop="id" label="企业编号" min-width="80px" align="center"></el-table-column>
        <el-table-column prop="id" label="企业编号" fixed="left" min-width="80px" align="center"></el-table-column>
        <el-table-column prop="name" label="企业名称" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="managerUserName" label="登录账号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="linkname" label="联系人" min-width="100px" align="center"></el-table-column>
@@ -46,7 +46,9 @@
            {{ row.userNum || '不限' }}
          </template>
        </el-table-column>
        <el-table-column prop="anchorUserNum" label="主播数" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="empUserNum" label="员工数" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="goodsNum" label="商品数" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="salesmanRealName" label="销售人员" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="status" label="状态" min-width="100px" align="center">
          <template slot-scope="{row}">
@@ -59,7 +61,7 @@
        </el-table-column>
        <el-table-column prop="createTime" label="创建时间" min-width="140px" align="center"></el-table-column>
        <el-table-column v-if="containPermissions(['business:company:update', 'business:company:delete'])" label="操作"
          min-width="140" align="center" fixed="right">
          min-width="160" align="center" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaCompanyWindow.open('编辑企业', row)"
              v-permissions="['business:company:update']">编辑</el-button>

 platform/src/views/business/goods.vue

@@ -54,7 +54,9 @@
        <li>
          <el-button type="primary" :loading="isWorking.export" @click="bulkOperation(1)">批量下架</el-button>
        </li>
        <li v-permissions="['business:goods:delete']"><el-button @click="deleteByIdInBatch" style="color: red;">批量删除</el-button></li>
        <li v-permissions="['business:goods:delete']">
          <el-button type="danger" @click="deleteByIdInBatch">批量删除</el-button>
        </li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe border :header-cell-style="rowStyle"
        :cell-style="rowStyle" @selection-change="handleSelectionChange">

 platform/vue.config.js

@@ -1,11 +1,24 @@

const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
// const proxyMiddleware = require('http-proxy-middleware');
module.exports = {
  publicPath: './',
  outputDir: outputDir || 'web',
  assetsDir: 'static',
  lintOnSave: false,
  devServer: {
    // before(app) {
    //   app.use(
    //     [process.env.VUE_APP_API_PREFIX],
    //     proxyMiddleware({
    //       target: process.env.VUE_APP_API,
    //       changeOrigin: true,
    //       pathRewrite: {
    //         [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
    //       }
    //     })
    //   );
    // },
    host: '0.0.0.0',
    port: 10086,
    proxy: {