上线

src/api/module/settings/index.js

@@ -43,3 +43,140 @@ export function getEditPayPasswordCode(query) {
     params: query
   })
 }
+//获取商品计量单位列表
+export function goodsUnitList(query){
+  return request({
+    url: '/local/goodsUnit/getList',
+    method: 'get',
+    params: query
+  })
+}
+//删除计量单位列表
+export function delGoodsUnit(data){
+  return request({
+    url: '/local/goodsUnit/del',
+    method: 'post',
+    data: data
+  })
+}
+//新增计量单位
+export function addGoodsUnit(data){
+  return request({
+    url: '/local/goodsUnit/operation',
+    method: 'post',
+    data: data
+  })
+}
+// 计量单位编辑
+export function updateGoodsUnit(data){
+  return request({
+    url: '/local/goodsUnit/info',
+    method: 'post',
+    data: data
+  })
+}
+//获取商品单位列表
+export function getPackList(query){
+  return request({
+    url: '/local/goodsUnit/getPackList',
+    method: 'get',
+    params: query
+  })
+}
+//删除包装单位列表
+export function delPack(data){
+  return request({
+    url: '/local/goodsUnit/delPack',
+    method: 'post',
+    data: data
+  })
+}
+//新增包装单位
+export function addPack(data){
+  return request({
+    url: '/local/goodsUnit/operationPack',
+    method: 'post',
+    data: data
+  })
+}
+// 包装单位编辑
+export function infoPack(data){
+  return request({
+    url: '/local/goodsUnit/infoPack',
+    method: 'post',
+    data: data
+  })
+}
+//获取商品物流
+export function goodsLogistics(query){
+  return request({
+    url: '/local/goodsLogistics/getList',
+    method: 'get',
+    params: query
+  })
+}
+//删除快递公司名称
+export function delGoodsLogistics(data){
+  return request({
+    url: '/local/goodsLogistics/del',
+    method: 'post',
+    data: data
+  })
+}
+//新增快递公司
+export function addGoodsLogistics(data){
+  return request({
+    url: '/local/goodsLogistics/add',
+    method: 'post',
+    data: data
+  })
+}
+//获取商品分组列表
+export function groupList(data){
+  return request({
+    url: '/local/group/list',
+    method: 'post',
+    data: data
+  })
+}
+//创建商品分组
+export function addGroup(data){
+  return request({
+    url: '/local/group/create',
+    method: 'post',
+    data: data
+  })
+}
+//编辑商品分组
+export function updateGroup(data){
+  return request({
+    url: '/local/group/update',
+    method: 'post',
+    data: data
+  })
+}
+//编辑商品分组
+export function GroupInfo(data){
+  return request({
+    url: '/local/group/info',
+    method: 'post',
+    data: data
+  })
+}
+//删除商品分组
+export function deleteGroup(data){
+  return request({
+    url: '/local/group/delete',
+    method: 'post',
+    data: data
+  })
+}
+// 获取 所有物流信息
+export function getExpressListData(query) {
+  return request({
+    url: '/system/order/expressList',
+    method: 'get',
+    params: query
+  })
+}
+

src/api/system/supplier.js

+import request from '@/utils/request';
+
+//获取供应商列表
+export function goodsOperatorList(query) {
+    return request({
+      url: '/local/goodsOperator/getList',
+      method: 'get',
+      params: query
+    })
+  }
+  //删除供应商
+export function deleteOperator(data){
+    return request({
+      url: '/local/goodsOperator/del',
+      method: 'post',
+      data: data
+    })
+  }
+    //获取供应商详情
+export function operatorInfo(data){
+    return request({
+      url: '/local/goodsOperator/info',
+      method: 'post',
+      data: data
+    })
+  }
+      //新增和修改供应商
+export function updateOperator(data){
+    return request({
+      url: '/local/goodsOperator/operation',
+      method: 'post',
+      data: data
+    })
+  }
\ No newline at end of file

src/api/system/wareHouse.js

+import request from '@/utils/request';
+
+//获取仓库列表
+export function wareHoustList(data){
+    return request({
+      url: '/local/warehouse/list',
+      method: 'post',
+      data: data
+    })
+}
+//新增仓库
+export function addWareHoust(data){
+    return request({
+      url: '/local/warehouse/create',
+      method: 'post',
+      data: data
+    })
+}
+//仓库详情
+export function wareHoustInfo(data){
+    return request({
+      url: '/local/warehouse/info',
+      method: 'post',
+      data: data
+    })
+}
+//仓库编辑
+export function updateWareHoust(data){
+    return request({
+      url: '/local/warehouse/update',
+      method: 'post',
+      data: data
+    })
+}
+//仓库删除
+export function deleteWareHoust(data){
+    return request({
+      url: '/local/warehouse/delete',
+      method: 'post',
+      data: data
+    })
+}
+
+

src/views/entry/fillBrandInf.vue

@@ -65,7 +65,7 @@
               </span>
               </div>
               <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                <span class="tips-text">必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传2张</span>
+                <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
               </div>
             </div>
           </el-form-item>
@@ -106,7 +106,7 @@
               </span>
               </div>
               <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                <span class="tips-text">品牌方给予企业的授权书。文件大小在2MB以内，支持png,jpg格式</span>
+                <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
               </div>
             </div>
           </el-form-item>
@@ -146,7 +146,7 @@
               </span>
               </div>
               <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                <span class="tips-text">授权在云仓平台经营此品牌。文件大小在2MB以内，支持png,jpg格式，最多可上传2张</span>
+                <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
               </div>
             </div>
           </el-form-item>

src/views/entry/fillMainInf.vue

@@ -45,7 +45,7 @@
               </span>
               </div>
               <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                <span class="tips-text">图片大小在2MB以内，支持png,jpg格式，最多可上传1张</span></br>
+                <span class="tips-text">图片大小为500KB以内，支持png/jpg，限一张，请确保图片清晰</span></br>
                 <span class="tips-text">请确保营业执照在有效期内</span>
               </div>
             </div>
@@ -141,7 +141,7 @@
                 </span>
               </div>
               <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                <span class="tips-text">请按顺序分别上传正面（照片面）和反面（国徽面）电子版图片,文件大小在 2MB以内，支持png,jpg格式，最多可上传2张</span>
+                <span class="tips-text">图片大小为500KB以内，支持png/jpg，每个上传框限一张，请确保图片清晰</span>
               </div>
             </div>
             <div class="idcard-tips-con">

src/views/entry/fillShopInf.vue

@@ -65,7 +65,7 @@
               </span>
               </div>
               <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                <span class="tips-text">请上传店铺LOGO，文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
+                <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
               </div>
             </div>
           </el-form-item>

src/views/system/goods/add/components/goodsinfomation.vue

@@ -70,8 +70,8 @@
       <el-form-item label="商品图片：" prop="imgs">
         <span class="tip-span" style="display: block;line-height: 34px;">
           <i style="margin: 10px;">{{ goodsImgFileList.length }} / 7</i>
-          商品图片最多上传7张，默认第一张为主图
-          <span style="margin-left: 20px;">单张图片需限制在2M以内，可上传png、jpg格式，尺寸要求为800 * 800</span>
+           商品图片最多上传7张，默认第一张为主图
+          <span style="margin-left: 10px;">主图要求为白底，建议尺寸要求为800*800px，拖拽图片可进行排序</span>
         </span>
         <draggable :list="goodsImgFileList" group="article" class="dragArea" @end="handchange($event)">
           <div v-for="(element,index) in goodsImgFileList" :key="index" class="list-complete-item"

src/views/system/settings/commodityExpress.vue

+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div class="clearfix">
+        <span class="left-text">常用快递</span>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd()"
+          style="float: right"
+          size="mini"
+          >新增</el-button
+        >
+      </div>
+
+      <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+        <el-table-column
+          prop="logistics_company_name"
+          label="快递公司"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              style="color: red"
+              @click="handleDelete(scope.row)"
+              >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 新增或修改提示框 -->
+    <el-dialog
+      title="新增快递公司"
+      :visible.sync="dialogVisible"
+      center
+      :append-to-body="true"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+      @close="clearPayform"
+      width="40%"
+    >
+      <div style="width: 100%; margin: 50px auto 200px">
+        <el-form :model="addForm" label-width="150px" center size="mini">
+          <el-form-item label="选择快递公司：" prop="express">
+            <el-select
+              style="width: 80%"
+              v-model="addForm.express"
+              multiple
+              placeholder="请选择..."
+            >
+              <el-option
+                v-for="item in scopeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
+        <el-button type="primary" size="mini" @click="closeDialogVisible()"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 删除弹窗 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogDelete"
+      center
+      :close-on-click-modal="false"
+      width="30%"
+      class="dialogstyle"
+    >
+      <div style="text-align: center; margin: 0 auto">
+        <p>确定要删除该快递公司吗？</p>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogDelete = false" size="mini">取 消</el-button>
+        <el-button type="primary" size="mini" @click="closeDialogDelete()"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  goodsLogistics,
+  delGoodsLogistics,
+  addGoodsLogistics,
+  getExpressListData,
+} from "@/api/module/settings";
+export default {
+  name: "commodityExpress",
+  data() {
+    return {
+      fullHeight: 0,
+      tableHeight: 0,
+      //表格内容
+      tableData: [],
+      code: 0,
+      //新增表单内容
+      addForm: {
+        express: [],
+      },
+      //新增快递公司下拉框数据
+      scopeOptions: [],
+      //新增表单弹框
+      dialogVisible: false,
+      //删除弹框
+      dialogDelete: false,
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.fullHeight =
+        document.getElementsByClassName("box-card")[0].clientHeight;
+    });
+  },
+  watch: {
+    fullHeight(val) {
+      let formHeight =
+        document.getElementsByClassName("clearfix")[0].clientHeight;
+      this.tableHeight = val - formHeight - 100;
+    },
+  },
+  mounted() {
+    //获取快递公司列表
+    this.getGoodsLogistics();
+  },
+  methods: {
+    //删除分组
+    handleDelete(val) {
+      this.code = val.id;
+      this.dialogDelete = true;
+    },
+    //新增快递公司
+    handleAdd() {
+      getExpressListData().then((res) => {
+        if (res.code == 1) {
+          this.scopeOptions = res.data.expressLists;
+          this.dialogVisible = true;
+        }
+      });
+    },
+    //删除提示框
+    closeDialogDelete() {
+      let obj = {
+        id: this.code,
+      };
+      delGoodsLogistics(obj).then((res) => {
+        if (res.code == 1) {
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.dialogDelete = false;
+          this.getGoodsLogistics();
+        }else {
+          this.$message({
+            message: res.message,
+            type: "error",
+          });
+          this.dialogDelete = false;
+        }
+      });
+    },
+    //新增弹框确定回调
+    closeDialogVisible() {
+      let obj = {
+        logistics_company: this.addForm.express,
+      };
+      addGoodsLogistics(obj).then((res) => {
+        if (res.code == 1) {
+          this.$message({
+            message: "添加成功",
+            type: "success",
+          });
+          this.getGoodsLogistics();
+          this.dialogVisible = false;
+        } else {
+          this.$message({
+            message: res.message,
+            type: "error",
+          });
+          this.dialogVisible = false;
+        }
+      });
+    },
+    //获取表格内容
+    getGoodsLogistics() {
+      goodsLogistics().then((res) => {
+        if (res.code == 1) {
+          this.tableData = res.data;
+        }else {
+          this.$message({
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    //清空表单内容
+    clearPayform() {
+      this.addForm.express = "";
+    },
+  },
+};
+</script>
+<style scoped>
+.app-container {
+  overflow: auto;
+}
+.clearfix {
+  margin: 10px 0 15px 0;
+}
+.left-text {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #333333;
+  line-height: 28px;
+}
+</style>
\ No newline at end of file

src/views/system/settings/commodityGroup.vue

+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div class="clearfix">
+        <span class="left-text">商品分组</span>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-plus"
+          style="float: right"
+          @click="handleAdd()"
+          >新增</el-button
+        >
+      </div>
+      <!-- 分组表格 -->
+      <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+        <el-table-column prop="id" label="分组ID" width="180">
+        </el-table-column>
+        <el-table-column prop="name" label="分组名称" width="180">
+        </el-table-column>
+        <el-table-column prop="goods_num" label="商品数量"> </el-table-column>
+        <el-table-column prop="created_time" label="创建时间">
+          <template slot-scope="scope">
+            <div>
+              {{ timeFormatter(scope.row.created_time) }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <div v-if="!scope.row.seller_id == 0">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                >编辑
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelete(scope.row)"
+                style="color: red"
+                >删除
+              </el-button>
+            </div>
+            <div v-if="scope.row.seller_id == 0">--</div>
+            <!-- <el-divider direction="vertical"></el-divider> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <!-- <div class="footer_pagination">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[20, 40, 60, 80, 100]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div> -->
+    </el-card>
+    <!-- 新增或修改弹窗 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      :append-to-body="true"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+      center
+      @close="clearPayform"
+      width="40%"
+    >
+      <div style="width: 100%; margin: 50px auto 200px">
+        <el-form
+          :model="formInline"
+          ref="formInline"
+          :rules="formInlines"
+          label-width="150px"
+          size="mini"
+        >
+          <el-form-item label="分组名称：" prop="name">
+            <el-input
+              v-model="formInline.name"
+              style="width: 80%"
+              placeholder="请输入商品分组名称"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="closeDialogVisible('formInline')"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 删除弹窗 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogDelete"
+      center
+      :close-on-click-modal="false"
+      width="30%"
+    >
+      <div style="text-align: center; margin: 0 auto">
+        <p>
+          确定要删除该分组吗？删除后，该分组的商品将分配到系统默认分组里面。商品的相关设置及状态保持不变。
+        </p>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogDelete = false" size="mini">取 消</el-button>
+        <el-button type="primary" size="mini" @click="closeDialogDelete()"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  groupList,
+  addGroup,
+  updateGroup,
+  GroupInfo,
+  deleteGroup,
+} from "@/api/module/settings";
+import { dateFormat } from "@/utils";
+export default {
+  name: "commodityGroup",
+  data() {
+    return {
+      fullHeight: 0,
+      tableHeight: 0,
+      code: 0,
+      tableData: [],
+      //新增和修改提示框分组名称
+      formInline: {
+        name: "",
+      },
+      //表单验证
+      formInlines: {
+        name: [
+          { required: true, message: "分组名称不能为空", trigger: "blur" },
+        ],
+      },
+      title: "",
+      //新增修改提示框
+      dialogVisible: false,
+      //删除提示框
+      dialogDelete: false,
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.fullHeight =
+        document.getElementsByClassName("box-card")[0].clientHeight;
+    });
+    this.getGroupList();
+  },
+  watch: {
+    fullHeight(val) {
+      let formHeight =
+        document.getElementsByClassName("clearfix")[0].clientHeight;
+      this.tableHeight = val - formHeight - 100;
+    },
+  },
+  methods: {
+    //新增分组
+    handleAdd() {
+      this.dialogVisible = true;
+      this.title = "新增分组";
+    },
+    //删除分组
+    handleDelete(val) {
+      this.code = val.id;
+      this.dialogDelete = true;
+    },
+    //编辑分组
+    handleUpdate(val) {
+      this.title = "编辑分组";
+      this.code = val.id;
+      let obj = {
+        id: val.id,
+      };
+      GroupInfo(obj).then((res) => {
+        if (res.code == 1) {
+          this.formInline.name = res.data.name;
+          this.dialogVisible = true;
+        }
+      });
+    },
+    //新增或修改弹框确定回调
+    closeDialogVisible(formInline) {
+      this.$refs[formInline].validate((valid) => {
+        if (valid) {
+          let obj = {
+            name: this.formInline.name,
+          };
+          if (this.title == "新增分组") {
+            addGroup(obj).then((res) => {
+              if (res.code == 1) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功",
+                });
+                this.getGroupList();
+              } else if (res.code == 0) {
+                this.$message({
+                  type: "error",
+                  message: res.message,
+                });
+              }
+            });
+          }
+          if (this.title == "编辑分组") {
+            obj["id"] = this.code;
+            updateGroup(obj).then((res) => {
+              if (res.code == 1) {
+                this.$message({
+                  type: "success",
+                  message: "编辑成功",
+                });
+                this.getGroupList();
+              } else {
+                this.$message({
+                  message: res.message,
+                  type: "error",
+                });
+              }
+            });
+          }
+          this.dialogVisible = false;
+        }
+      });
+    },
+    //删除提示框
+    closeDialogDelete() {
+      let obj = {
+        id: this.code,
+      };
+      deleteGroup(obj).then((res) => {
+        if (res.code == 1) {
+          this.$message({
+            type: "success",
+            message: "删除成功",
+          });
+          this.getGroupList();
+        } else {
+          this.$message({
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+      this.dialogDelete = false;
+    },
+    /** 一般时间 格式化 */
+    timeFormatter(time) {
+      if (time) {
+        return dateFormat(time * 1000, "Y-m-d H:i:s");
+      } else {
+        return "--";
+      }
+    },
+    getGroupList() {
+      groupList().then((res) => {
+        if (res.code == 1) {
+          this.tableData = res.data.list;
+        } else {
+          this.$message({
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    clearPayform() {
+      this.formInline.name = "";
+    },
+  },
+};
+</script>
+<style lang="scss" scoped type="text/stylus">
+.app-container {
+  overflow: auto;
+}
+.clearfix {
+  margin: 10px 0 15px 0;
+}
+.left-text {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #333333;
+  line-height: 28px;
+}
+/* 分页 */
+.footer_pagination {
+  text-align: center;
+  margin-top: 15px;
+}
+</style>
\ No newline at end of file

src/views/system/shop/brand.vue

@@ -160,7 +160,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
                 </div>
               </div>
             </el-form-item>
@@ -196,7 +196,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">请提供有效期内的商标注册证，保持信息清晰可见，支持png,jpg格式，最多可上传1张</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
                 </div>
               </div>
             </el-form-item>
@@ -270,7 +270,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">授权在云仓平台经营此品牌，支持png,jpg格式，文件大小在2MB以内</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
                 </div>
               </div>
               <p class="brand-auth-tips">上传完整授权链路，品牌方给予企业的授权书，如果是多级授权，请上传各级授权证书</p>
@@ -305,7 +305,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">授权在云仓平台经营此品牌，支持png,jpg格式</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
                 </div>
               </div>
             </el-form-item>

src/views/system/shop/index.vue

@@ -301,7 +301,7 @@
               </span>
             </div>
             <div style="width:380px;line-height: 24px;padding-top: 6px;">
-              <span class="tips-text">请上传店铺LOGO，文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
+              <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
             </div>
           </div>
         </el-form-item>