Browse Source

修改导出bug

yangg 10 months ago
parent
commit
a59b496232
37 changed files with 168 additions and 68 deletions
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/js/0.69c7def90d993f193b0e.js
  3. 0 0
      manager-admin/dist/static/js/0.69c7def90d993f193b0e.js.gz
  4. 0 0
      manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js
  5. BIN
      manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js.gz
  6. 0 0
      manager-admin/dist/static/js/44.ca6f24b90a3f62093c21.js
  7. BIN
      manager-admin/dist/static/js/44.ca6f24b90a3f62093c21.js.gz
  8. BIN
      manager-admin/dist/static/js/45.35c5b8fc799ddf2c42d8.js.gz
  9. 0 0
      manager-admin/dist/static/js/45.e0c735ab8c8de19f8130.js
  10. BIN
      manager-admin/dist/static/js/45.e0c735ab8c8de19f8130.js.gz
  11. 0 0
      manager-admin/dist/static/js/46.2a923d564f5bcc358812.js
  12. BIN
      manager-admin/dist/static/js/46.2a923d564f5bcc358812.js.gz
  13. BIN
      manager-admin/dist/static/js/46.7418b356c5279c486cbc.js.gz
  14. 0 0
      manager-admin/dist/static/js/47.98220d84da52a6770638.js
  15. 0 0
      manager-admin/dist/static/js/48.1fa5cc484617bb6ac3a9.js
  16. BIN
      manager-admin/dist/static/js/48.1fa5cc484617bb6ac3a9.js.gz
  17. 0 0
      manager-admin/dist/static/js/49.0e7cf53b6882b552e7f2.js
  18. BIN
      manager-admin/dist/static/js/49.0e7cf53b6882b552e7f2.js.gz
  19. 0 0
      manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js
  20. BIN
      manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js.gz
  21. BIN
      manager-admin/dist/static/js/50.298d57b8612d68e596f6.js.gz
  22. 0 0
      manager-admin/dist/static/js/50.84164ec682b73fdb2caf.js
  23. BIN
      manager-admin/dist/static/js/50.84164ec682b73fdb2caf.js.gz
  24. 0 0
      manager-admin/dist/static/js/51.400bb4cb7607c0f3a438.js
  25. BIN
      manager-admin/dist/static/js/51.400bb4cb7607c0f3a438.js.gz
  26. BIN
      manager-admin/dist/static/js/51.eae4df4d85492ffa641d.js.gz
  27. 0 0
      manager-admin/dist/static/js/52.0ac647d7489770a2289e.js
  28. BIN
      manager-admin/dist/static/js/52.0ac647d7489770a2289e.js.gz
  29. BIN
      manager-admin/dist/static/js/52.2dba719378289dcb3b40.js.gz
  30. BIN
      manager-admin/dist/static/js/53.186043b414f9b9d03ca1.js.gz
  31. 0 0
      manager-admin/dist/static/js/53.a1ec69e7f1a929a358ec.js
  32. BIN
      manager-admin/dist/static/js/53.a1ec69e7f1a929a358ec.js.gz
  33. 0 0
      manager-admin/dist/static/js/app.f96b4b1a9df65d185271.js
  34. BIN
      manager-admin/dist/static/js/app.f96b4b1a9df65d185271.js.gz
  35. 0 0
      manager-admin/dist/static/js/manifest.f4c70b849fde2adfae91.js
  36. 165 65
      manager-admin/src/views/stock/goodsTransfer.vue
  37. 2 2
      ui-domain/api.js

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.e6de561f900eb74c3fe8.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.f6d9fe2258cef4b0c7b7.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.f4c70b849fde2adfae91.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.f96b4b1a9df65d185271.js></script></body></html>

+ 0 - 0
manager-admin/dist/static/js/0.49a91c9660383735ef85.js → manager-admin/dist/static/js/0.69c7def90d993f193b0e.js


+ 0 - 0
manager-admin/dist/static/js/0.49a91c9660383735ef85.js.gz → manager-admin/dist/static/js/0.69c7def90d993f193b0e.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js


BIN
manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/44.ca6f24b90a3f62093c21.js


BIN
manager-admin/dist/static/js/44.ca6f24b90a3f62093c21.js.gz


BIN
manager-admin/dist/static/js/45.35c5b8fc799ddf2c42d8.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/45.e0c735ab8c8de19f8130.js


BIN
manager-admin/dist/static/js/45.e0c735ab8c8de19f8130.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/46.2a923d564f5bcc358812.js


BIN
manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js.gz → manager-admin/dist/static/js/46.2a923d564f5bcc358812.js.gz


BIN
manager-admin/dist/static/js/46.7418b356c5279c486cbc.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/47.98220d84da52a6770638.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/48.1fa5cc484617bb6ac3a9.js


BIN
manager-admin/dist/static/js/48.1fa5cc484617bb6ac3a9.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/49.0e7cf53b6882b552e7f2.js


BIN
manager-admin/dist/static/js/49.0e7cf53b6882b552e7f2.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js


BIN
manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js.gz


BIN
manager-admin/dist/static/js/50.298d57b8612d68e596f6.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/50.84164ec682b73fdb2caf.js


BIN
manager-admin/dist/static/js/50.84164ec682b73fdb2caf.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/51.400bb4cb7607c0f3a438.js


BIN
manager-admin/dist/static/js/51.400bb4cb7607c0f3a438.js.gz


BIN
manager-admin/dist/static/js/51.eae4df4d85492ffa641d.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/52.0ac647d7489770a2289e.js


BIN
manager-admin/dist/static/js/52.0ac647d7489770a2289e.js.gz


BIN
manager-admin/dist/static/js/52.2dba719378289dcb3b40.js.gz


BIN
manager-admin/dist/static/js/53.186043b414f9b9d03ca1.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/53.a1ec69e7f1a929a358ec.js


BIN
manager-admin/dist/static/js/53.a1ec69e7f1a929a358ec.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.f96b4b1a9df65d185271.js


BIN
manager-admin/dist/static/js/app.f6d9fe2258cef4b0c7b7.js.gz → manager-admin/dist/static/js/app.f96b4b1a9df65d185271.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/manifest.f4c70b849fde2adfae91.js


+ 165 - 65
manager-admin/src/views/stock/goodsTransfer.vue

@@ -6,21 +6,35 @@
           <el-col :span="12">
             <el-form-item label="仓库">
               <el-select v-model="advancedForm.warehouse_id" clearable>
-                <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option
+                  v-for="item in warehouseList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="商品编号/sku/序列号">
-              <el-input v-model="advancedForm.keyword" clearable placeholder="请输入内容" width="200px"></el-input>
+              <el-input
+                v-model="advancedForm.keyword"
+                clearable
+                placeholder="请输入内容"
+                width="200px"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <el-button @click="advancedSearchEvent"> 搜索 </el-button>
     </div>
-    <en-table-layout :tableData="tableData.data" ref="table" :loading="loading"
-      @selection-change="handleSelectionChange">
+    <en-table-layout
+      :tableData="tableData.data"
+      ref="table"
+      :loading="loading"
+      @selection-change="handleSelectionChange"
+    >
       <div slot="toolbar" class="inner-toolbar">
         <div class="toolbar-btns">
           <!-- <el-button
@@ -38,8 +52,16 @@
             :disabled="multipleSelection.length === 0"
             >删除</el-button
           > -->
-          <el-button size="mini" type="primary" v-if="checkPermission(['updateWarnStock:update'])" @click="handleSubmitGoodsTransfer">设置预警库存</el-button>
-          <el-button size="mini" type="primary" @click="checkExport">导出</el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            v-if="checkPermission(['updateWarnStock:update'])"
+            @click="handleSubmitGoodsTransfer"
+            >设置预警库存</el-button
+          >
+          <el-button size="mini" type="primary" @click="exportToExcel"
+            >导出</el-button
+          >
         </div>
       </div>
 
@@ -66,17 +88,21 @@
           }}</template> -->
         </el-table-column>
         <el-table-column prop="type" label="类别">
-        <template slot-scope="scope">
-          {{ scope.row.product_vo.hire_or_sail=='sail' ? '售卖商品' : '租赁商品'  }}
-        </template>
-       </el-table-column>
+          <template slot-scope="scope">
+            {{
+              scope.row.product_vo.hire_or_sail == "sail"
+                ? "售卖商品"
+                : "租赁商品"
+            }}
+          </template>
+        </el-table-column>
         <el-table-column prop="goods_name" label="商品名称" />
-       <el-table-column prop="type" label="sku">
-        <template slot-scope="scope">
-          {{ scope.row.product_vo ? scope.row.product_vo.sku : ''  }}
-        </template>
-       </el-table-column>
-             <!-- <el-table-column prop="product_vo.sku" label="库位号" />
+        <el-table-column prop="type" label="sku">
+          <template slot-scope="scope">
+            {{ scope.row.product_vo ? scope.row.product_vo.sku : "" }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="product_vo.sku" label="库位号" />
         <el-table-column prop="goods_bar_code" label="商品条码" />
         <el-table-column prop="goods_sn_code" label="序列号" />
           <template slot-scope="scope">{{ typeFilter(scope.row.type) }}</template>
@@ -88,9 +114,16 @@
             statusFilter(scope.row.status)
           }}</template>
         </el-table-column> -->
-        <el-table-column prop="actual_stock" label="实际库存" >
+        <el-table-column prop="actual_stock" label="实际库存">
           <template slot-scope="scope">
-           <span :style="Number(scope.row.actual_stock)<Number(scope.row.warning_stock)?'color:red':''">{{ scope.row.actual_stock }}</span> 
+            <span
+              :style="
+                Number(scope.row.actual_stock) < Number(scope.row.warning_stock)
+                  ? 'color:red'
+                  : ''
+              "
+              >{{ scope.row.actual_stock }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column prop="usable_stock" label="可用库存" />
@@ -99,8 +132,16 @@
         <el-table-column prop="warning_stock" label="预警库存" />
         <el-table-column label="操作" width="250">
           <template slot-scope="scope">
-            <el-button type="success1" size="mini" v-if="checkPermission(['goodsTransfer:add']) && scope.row.transit_stock>0"
-              @click="lookTransit(scope.row)">查看在途</el-button>
+            <el-button
+              type="success1"
+              size="mini"
+              v-if="
+                checkPermission(['goodsTransfer:add']) &&
+                scope.row.transit_stock > 0
+              "
+              @click="lookTransit(scope.row)"
+              >查看在途</el-button
+            >
             <!-- <el-button type="success1" size="mini"
               v-if="scope.row.allowable.submit && checkPermission(['goodsTransfer:submit'])"
               @click="handleSubmitGoodsTransfer(scope.row)">提交</el-button>
@@ -121,13 +162,26 @@
         </el-table-column>
       </template>
 
-      <el-pagination v-if="tableData" slot="pagination" @size-change="handlePageSizeChange"
-        @current-change="handlePageCurrentChange" :current-page="tableData.page_no" :page-sizes="[50, 100]"
-        :page-size="tableData.page_size" layout="total, sizes, prev, pager, next, jumper" :total="tableData.data_total">
+      <el-pagination
+        v-if="tableData"
+        slot="pagination"
+        @size-change="handlePageSizeChange"
+        @current-change="handlePageCurrentChange"
+        :current-page="tableData.page_no"
+        :page-sizes="[50, 100]"
+        :page-size="tableData.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="tableData.data_total"
+      >
       </el-pagination>
     </en-table-layout>
-    <el-dialog title="在途明细" :visible.sync="dialogVisible" append-to-body :close-on-click-modal="false"
-      :close-on-press-escape="false">
+    <el-dialog
+      title="在途明细"
+      :visible.sync="dialogVisible"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
       <el-table :data="transitDetails" border class="sku-table">
         <el-table-column prop="order_sn" label="订单编号" />
         <el-table-column prop="num" label="在途数量" />
@@ -138,10 +192,22 @@
             <el-button type="primary" >确 定</el-button>
           </span> -->
     </el-dialog>
-    <el-dialog title="设置预警数量" :visible.sync="numDialogVisible" append-to-body :close-on-click-modal="false"
-      :close-on-press-escape="false" width="30%">
-      <el-form ref="numAddForm" :model="numAddForm" :rules="numAddFormRule" label-width="160px" inline
-        class="change-form">
+    <el-dialog
+      title="设置预警数量"
+      :visible.sync="numDialogVisible"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="30%"
+    >
+      <el-form
+        ref="numAddForm"
+        :model="numAddForm"
+        :rules="numAddFormRule"
+        label-width="160px"
+        inline
+        class="change-form"
+      >
         <el-form-item label="预警数量" prop="num" class="change-form-item">
           <el-input v-model="numAddForm.num" placeholder="请输入"></el-input>
         </el-form-item>
@@ -158,6 +224,7 @@
 import * as API_GoodsTransfer from "@/api/goodsTransfer";
 import * as API_Setting from "@/api/setting";
 import * as API_BasicSetting from "@/api/basicSetting";
+import XLSX from "xlsx";
 import { mapGetters } from "vuex";
 export default {
   name: "GoodsTransfer",
@@ -184,23 +251,24 @@ export default {
       transitDetails: [],
       numDialogVisible: false,
       numAddForm: {},
-      stockListId: [],//选择的id
+      stockListId: [], //选择的id
       numAddFormRule: {
-        num: [{
-          required: true,
-          message: '请输入预警库存数量',
-          trigger: 'blur'
-        },
-        {
-          validator: (rule, value, callback) => {
-            if (/^(?:[1-9]\d*)$/.test(value) == false) {
-              callback(new Error("请输入正整数"));
-            } else {
-              callback();
-            }
+        num: [
+          {
+            required: true,
+            message: "请输入预警库存数量",
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (/^(?:[1-9]\d*)$/.test(value) == false) {
+                callback(new Error("请输入正整数"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
           },
-          trigger: "blur",
-        },
         ],
       },
       selectedRow: null, // 用于记录当前选中的行
@@ -225,37 +293,67 @@ export default {
     submitNum() {
       this.$refs["numAddForm"].validate((valid) => {
         if (valid) {
-          API_GoodsTransfer.updateWarnStock({stock_id:this.stockListId, warn_num:this.numAddForm.num}).then(res => {
-            this.numDialogVisible = false
-            this.numAddForm = {}
-            this.$message.success('预警库存设置成功!')
+          API_GoodsTransfer.updateWarnStock({
+            stock_id: this.stockListId,
+            warn_num: this.numAddForm.num,
+          }).then((res) => {
+            this.numDialogVisible = false;
+            this.numAddForm = {};
+            this.$message.success("预警库存设置成功!");
             this.GET_GoodsTransferList();
-          })
+          });
         }
-      })
+      });
     },
     // 删除
     handleDelGoodsTransfer(row) {
       this.$confirm("确定要删除这些库存吗?", "提示", { type: "warning" })
         .then(() => {
-          const ids = []
-          ids.push(row.id)
+          const ids = [];
+          ids.push(row.id);
           API_GoodsTransfer.deleteGoodsTransfer({ ids: ids }).then((res) => {
             this.$message.success("删除成功!");
-            this.ids = []
+            this.ids = [];
             this.GET_GoodsTransferList();
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     // 导出
-    checkExport() { },
+    exportToExcel() {
+      // 准备导出数据
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning("请先选择要导出的数据");
+        return;
+      }
+
+      // 准备导出数据
+      const data = this.multipleSelection.map((item) => ({
+        仓库名称: item.warehouse_name,
+        商品编号: item.sn,
+        类别: item.product_vo.hire_or_sail === "sail" ? "售卖商品" : "租赁商品",
+        商品名称: item.goods_name,
+        SKU: item.product_vo ? item.product_vo.sku : "",
+        单位: item.goods_unit,
+        实际库存: item.actual_stock,
+        可用库存: item.usable_stock,
+        在途库存: item.transit_stock,
+        冻结库存: item.locked_stock,
+        预警库存: item.warning_stock,
+      }));
+
+      // 使用 xlsx 库导出 Excel
+      const ws = XLSX.utils.json_to_sheet(data);
+      const wb = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(wb, ws, "库存信息");
+      XLSX.writeFile(wb, "库存信息.xlsx");
+    },
     // 查看在途
     lookTransit(row) {
-      API_GoodsTransfer.transitDetail(row.id).then(res => {
+      API_GoodsTransfer.transitDetail(row.id).then((res) => {
         this.dialogVisible = true;
-        this.transitDetails = res
-      })
+        this.transitDetails = res;
+      });
     },
     handleSuccessGoodsTransfer(row) {
       API_GoodsTransfer.successGoodsTransfer(row.id, {
@@ -290,9 +388,9 @@ export default {
       });
     },
     handleSubmitGoodsTransfer(row) {
-      if(this.stockListId.length==0) return this.$message.error("请选择")
+      if (this.stockListId.length == 0) return this.$message.error("请选择");
       /* this.stockId = row.id */
-      this.numDialogVisible = true
+      this.numDialogVisible = true;
       /* API_GoodsTransfer.submitGoodsTransfer(row.id).then(() => {
         this.$message.success("提交成功!");
         this.GET_GoodsTransferList();
@@ -330,13 +428,15 @@ export default {
             this.GET_GoodsTransferList();
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 多选改变 */
-    handleSelectionChange(row) {
-      this.stockListId=row.map(el=>{
-        return el.id
-      })
+    handleSelectionChange(selection) {
+      /*  this.stockListId = row.map((el) => {
+        return el.id;
+      }); */
+      this.multipleSelection = selection;
+      this.stockListId = selection.map((el) => el.id);
       /* if (selection.length > 0) {
         const lastSelected = selection[selection.length - 1];
         if (this.selectedRow && this.selectedRow !== lastSelected) {

+ 2 - 2
ui-domain/api.js

@@ -9,7 +9,7 @@
 module.exports = {
   // 开发环境 192.168.8.103:9999
   dev: {
-    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'//https://apidoc.raycos.net http://192.168.8.103:9999
+    admin: window.__ENV__.API_ADMIN || 'http://apidoc.raycos.net'//https://apidoc.raycos.net http://192.168.8.103:9999
   },
   // 测试环境apidoc.raycos.net 60.204.236.53:9999
   test: {
@@ -17,6 +17,6 @@ module.exports = {
   },
   // 生产环境
   pro: {
-    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'//api.v3rental.com  apidoc.raycos.net
+    admin: window.__ENV__.API_ADMIN || 'http://apidoc.raycos.net'//api.v3rental.com  apidoc.raycos.net
   }
 }

Some files were not shown because too many files changed in this diff