合并master

buyer/src/pages/Merchant.vue

@@ -20,7 +20,7 @@
     <div  class="store-category">
       <ul class="cate-list">
         <li class="cate-item" @click="searchByCate({id:'', labelName: '店铺推荐'})">首页</li>
-        <li class="cate-item" v-for="(cate, index) in cateList" :key="index" >
+        <li class="cate-item" v-for="(cate, index) in cateList" :key="index">
           <Dropdown v-if="cate.children.length">
             <div @click.self="searchByCate(cate)">{{cate.labelName}} <Icon type="ios-arrow-down"></Icon></div>
             <DropdownMenu slot="list">

manager/src/api/index.js

@@ -16,16 +16,9 @@ let commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common
 
 // 文件上传接口
 export const uploadFile = commonUrl+ "/common/upload/file";
-// 验证码渲染图片接口
-export const drawCodeImage = commonUrl + "/common/captcha/draw/";
-// 获取菜单
-export const getMenuList = managerUrl + "/permission/getMenuList";
 // Websocket
 export const ws = managerUrl + "/ws";
 
-export const getMessageSendData = "";
-
-
 //获取所有city
 export const getAllCity = (params) => {
   return getRequest(commonUrl + '/common/region/allCity', params)

manager/src/views/my-components/lili/upload-pic-input.vue

@@ -27,7 +27,7 @@
         :on-error="handleError"
         :format="['jpg','jpeg','png','gif','bmp']"
         accept=".jpg, .jpeg, .png, .gif, .bmp"
-        :max-size="maxSize*1024"
+        :max-size="1024"
         :on-format-error="handleFormatError"
         :on-exceeded-size="handleMaxSize"
         :before-upload="beforeUpload"
@@ -74,10 +74,6 @@ export default {
       type: Boolean,
       default: false
     },
-    maxSize: {
-      type: Number,
-      default: 5
-    },
     maxlength: Number,
     icon: {
       type: String,
@@ -116,7 +112,7 @@ export default {
       this.loading = false;
       this.$Notice.warning({
         title: "文件大小过大",
-        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
+        desc: "所选文件大小过大, 不得超过1M."
       });
     },
     // 上传前

manager/src/views/my-components/lili/upload-pic-thumb.vue

@@ -29,7 +29,7 @@
         :on-success="handleSuccess"
         :on-error="handleError"
         :format="['jpg','jpeg','png','gif']"
-        :max-size="maxSize*1024"
+        :max-size="1024"
         :on-format-error="handleFormatError"
         :on-exceeded-size="handleMaxSize"
         :before-upload="handleBeforeUpload"
@@ -72,10 +72,6 @@ export default {
       type: Boolean,
       default: true
     },
-    maxSize: {
-      type: Number,
-      default: 5
-    },
     limit: {
       type: Number,
       default: 10
@@ -147,11 +143,7 @@ export default {
       this.$Notice.warning({
         title: "文件大小过大",
         desc:
-          "所选文件‘ " +
+          "所选文件大小过大，不能超过1M."
-          file.name +
-          " ’大小过大, 不得超过 " +
-          this.maxSize +
-          "M."
       });
     },
     // 上传之前钩子

manager/src/views/order/order/orderList.vue

@@ -35,9 +35,9 @@
         
       </Form>
       <div>
-        <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
+        <download-excel class="export-excel-wrapper" :data="data" :fields="fields" :fetch="exportOrder" name="商品订单.xls">
           <Button type="info" class="export">
-            导出Excel
+            导出订单
           </Button>
         </download-excel>
       </div>
@@ -269,6 +269,24 @@ export default {
         query: { sn: sn },
       });
     },
+    // 导出订单
+    async exportOrder () {
+      const params = JSON.parse(JSON.stringify(this.searchForm))
+      params.pageNumber = 1;
+      params.pageSize = 10000
+      const result = await API_Order.getOrderList(params)
+      if (result.success) {
+        if (result.result.records.length === 0) {
+          this.$Message.warning('暂无待发货订单')
+          return []
+        } else {
+          return result.result.records
+        }
+      } else {
+        this.$Message.warning('导出订单失败，请重试')
+      }
+      
+    }
   },
   mounted() {
     this.init();

manager/src/views/promotion/live/liveDetail.vue

@@ -58,12 +58,12 @@
             </template>
           </div>
           <Upload v-if="liveForm.coverImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleCoverImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
-            :on-format-error="handleFormatError" :max-size="2048" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
             <div style="width: 58px;height:58px;line-height: 58px;">
               <Icon type="ios-camera" size="20"></Icon>
             </div>
           </Upload>
-          <div class="tips"> 直播间背景图，图片规则：建议像素1080*1920，大小不超过2M</div>
+          <div class="tips"> 直播间背景图，图片规则：建议像素1080*1920，大小不超过1M</div>
         </FormItem>
 
         <!-- 直播间背景墙 -->
@@ -79,7 +79,7 @@
             </template>
           </div>
           <Upload v-if="liveForm.shareImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleShareImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
-            :on-format-error="handleFormatError" :max-size="2048" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
             <div style="width: 58px;height:58px;line-height: 58px;">
               <Icon type="ios-camera" size="20"></Icon>
             </div>
@@ -191,6 +191,13 @@ export default {
       this.imageVisible = true;
       this.imageSrc = src;
     },
+    // 上传文件超过大小限制
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc: "所选文件大小过大, 不得超过 1M.",
+      });
+    },
     /**
      * 获取直播间详情
      */

manager/src/views/sys/oss-manage/ossManage.vue

@@ -187,7 +187,7 @@
         :headers="accessToken"
         :on-success="handleSuccess"
         :on-error="handleError"
-        :max-size="5120"
+        :max-size="1024"
         :on-exceeded-size="handleMaxSize"
         multiple
         type="drag"
@@ -694,7 +694,7 @@ export default {
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "文件大小过大",
-        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 5M.",
+        desc: "所选文件大小过大, 不得超过 1M.",
       });
     },
     // 上传成功回调

manager/src/views/sys/user-manage/userManage.vue

@@ -3,7 +3,7 @@
     <Card>
       <Row @keydown.enter.native="handleSearch">
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="用户名" prop="username">
+          <Form-item label="用户名">
             <Input
               type="text"
               v-model="searchForm.username"
@@ -12,7 +12,7 @@
               style="width: 200px"
             />
           </Form-item>
-          <Form-item label="联系方式" prop="mobile">
+          <Form-item label="联系方式">
             <Input
               type="text"
               v-model="searchForm.mobile"
@@ -22,16 +22,9 @@
             />
           </Form-item>
 
-          <Form-item label="部门" prop="department" >
+          <Form-item label="部门">
             <department-choose @on-change="handleSelectDep" style="width: 150px;" ref="dep"></department-choose>
           </Form-item>
-
-          <Form-item label="用户状态" prop="status">
-            <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 150px">
-              <Option value="true">启用</Option>
-              <Option value="false">禁用</Option>
-            </Select>
-          </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
@@ -143,8 +136,6 @@ export default {
         username: "",
         departmentId: "",
         mobile: "",
-        type: "",
-        status: "",
         pageNumber: 1,
         pageSize: 10,
         sort: "createTime",
@@ -158,7 +149,6 @@ export default {
         mobile: "",
         email: "",
         sex: "",
-        type: 0,
         roles: [],
         departmentId: "",
         departmentTitle: ""
@@ -388,13 +378,6 @@ export default {
     getUserList() {
       // 多条件搜索用户列表
       this.loading = true;
-      // 避免后台默认值
-      if (!this.searchForm.type) {
-        this.searchForm.type = "";
-      }
-      if (!this.searchForm.status) {
-        this.searchForm.status = "";
-      }
       getUserListData(this.searchForm).then(res => {
         this.loading = false;
         if (res.success) {
@@ -461,21 +444,21 @@ export default {
         if (valid) {
           if (this.modalType == 0) {
             // 添加用户 避免编辑后传入id
-            delete this.form.id;
+            const params = JSON.parse(JSON.stringify(this.form))
-            delete this.form.status;
+            delete params.id;
-            if (this.form.password == "" || this.form.password == undefined) {
+            delete params.status;
+            if (params.password == "" || params.password == undefined) {
               this.errorPass = "密码不能为空";
               return;
             }
-            if (this.form.password.length < 6) {
+            if (params.password.length < 6) {
               this.errorPass = "密码长度不得少于6位";
               return;
             }
             //todo
-            this.form.password = this.md5(this.form.password)
+            params.password = this.md5(params.password)
-
             this.submitLoading = true;
-            addUser(this.form).then(res => {
+            addUser(params).then(res => {
               this.submitLoading = false;
               if (res.success) {
                 this.$Message.success("操作成功");
@@ -503,6 +486,15 @@ export default {
       this.modalType = 0;
       this.modalTitle = "添加用户";
       this.$refs.form.resetFields();
+      this.form = { // 表单
+        username: "",
+        mobile: "",
+        email: "",
+        sex: "",
+        roles: [],
+        departmentId: "",
+        departmentTitle: ""
+      },
       this.$refs.depTree.setData("", "");
       this.userModalVisible = true;
     },

seller/src/views/change-password/change-password.vue

@@ -1,9 +1,7 @@
 <template>
   <div>
     <Card class="change-pass">
-      <p slot="title">
+      <p slot="title"><Icon type="key"></Icon>修改密码</p>
-        <Icon type="key"></Icon>修改密码
-      </p>
       <div>
         <Form
           ref="editPasswordForm"

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -78,7 +78,7 @@
                 </vuedraggable>
                 <Upload ref="upload" :show-upload-list="false" 
                   :on-success="handleSuccessGoodsPicture" :format="['jpg', 'jpeg', 'png']"
-                  :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
+                  :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" :max-size="1024"
                   :before-upload="handleBeforeUploadGoodsPicture" multiple type="drag" :action="uploadFileUrl"
                   :headers="accessToken" style="margin-left:10px">
                   <div style="width: 148px; height: 148px; line-height: 148px">
@@ -183,7 +183,7 @@
                             </vuedraggable>
                             <Upload ref="uploadSku" :show-upload-list="false"
                                 :on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
-                                :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
+                                :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" :max-size="1024"
                                 :before-upload="handleBeforeUpload" multiple type="drag" :action="uploadFileUrl"
                                 :headers="accessToken" style="display: inline-block; width: 58px">
                               <div>
@@ -609,7 +609,7 @@ export default {
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "超过文件大小限制",
-        desc: "图片 " + file.name + " 不能超过2mb"
+        desc: "图片大小不能超过1MB"
       });
     },
     // 图片上传前钩子

seller/src/views/my-components/lili/upload-pic-input.vue

@@ -27,7 +27,7 @@
         :on-error="handleError"
         :format="['jpg','jpeg','png','gif','bmp']"
         accept=".jpg, .jpeg, .png, .gif, .bmp"
-        :max-size="maxSize*1024"
+        :max-size="1024"
         :on-format-error="handleFormatError"
         :on-exceeded-size="handleMaxSize"
         :before-upload="beforeUpload"
@@ -71,10 +71,6 @@ export default {
       type: Boolean,
       default: false
     },
-    maxSize: { // 图片最大尺寸
-      type: Number,
-      default: 5
-    },
     maxlength: Number, // 最大长度
     icon: { // 上传按钮图标
       type: String,
@@ -113,7 +109,7 @@ export default {
       this.loading = false;
       this.$Notice.warning({
         title: "文件大小过大",
-        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
+        desc: "所选文件大小过大, 不得超过1M."
       });
     },
     // 上传前

seller/src/views/my-components/lili/upload-pic-thumb.vue

@@ -30,7 +30,7 @@
         :on-success="handleSuccess"
         :on-error="handleError"
         :format="['jpg','jpeg','png','gif']"
-        :max-size="maxSize*1024"
+        :max-size="1024"
         :on-format-error="handleFormatError"
         :on-exceeded-size="handleMaxSize"
         :before-upload="handleBeforeUpload"
@@ -74,10 +74,6 @@ export default {
       type: Boolean,
       default: true
     },
-    maxSize: { // 大小限制 MB
-      type: Number,
-      default: 5
-    },
     disable:{ // 禁止上传
       type: Boolean,
       default: false
@@ -154,11 +150,7 @@ export default {
       this.$Notice.warning({
         title: "文件大小过大",
         desc:
-          "所选文件‘ " +
+          "所选文件大小过大, 不得超过1M."
-          file.name +
-          " ’大小过大, 不得超过 " +
-          this.maxSize +
-          "M."
       });
     },
     handleBeforeUpload() {

seller/src/views/order/after-order/orderComplaintDetail.vue

@@ -89,7 +89,7 @@
                   </template>
                 </div>
                 <Upload ref="upload" :show-upload-list="false" :on-format-error="handleFormatError" :action="uploadFileUrl" :headers="accessToken" :on-success="handleSuccessGoodsPicture"
-                  :format="['jpg','jpeg','png']" :max-size="2048" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag"
+                  :format="['jpg','jpeg','png']" :max-size="1024" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag"
                   style="display: inline-block;width:58px;">
                   <div style="width: 58px;height:58px;line-height: 58px;">
                     <Icon type="ios-camera" size="20"></Icon>
@@ -316,7 +316,7 @@ export default {
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "超过文件大小限制",
-        desc: "图片  " + file.name + " 不能超过2mb",
+        desc: "图片不能超过1mb",
       });
     },
     // 获取详情

seller/src/views/order/order/orderList.vue

@@ -258,7 +258,7 @@ export default {
       const params = {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 100, // 页面大小
+        pageSize: 10000, // 页面大小
         sort: "startDate", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -284,7 +284,7 @@ export default {
         }
         return res.result
       } else {
-        this.$Message.warning('暂无待发货订单')
+        this.$Message.warning('导出订单失败，请重试')
       }
       
     },

seller/src/views/promotion/live/addLive.vue

@@ -67,12 +67,12 @@
             </template>
           </div>
           <Upload v-if="liveForm.coverImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleCoverImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
-            :on-format-error="handleFormatError" :max-size="2048" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
             <div style="width: 58px;height:58px;line-height: 58px;">
               <Icon type="ios-camera" size="20"></Icon>
             </div>
           </Upload>
-          <div class="tips"> 直播间背景图，图片规则：建议像素1080*1920，大小不超过2M</div>
+          <div class="tips"> 直播间背景图，图片规则：建议像素1080*1920，大小不超过1M</div>
         </FormItem>
 
         <!-- 直播间背景墙 -->
@@ -88,7 +88,7 @@
             </template>
           </div>
           <Upload v-if="liveForm.shareImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleShareImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
-            :on-format-error="handleFormatError" :max-size="2048" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
             <div style="width: 58px;height:58px;line-height: 58px;">
               <Icon type="ios-camera" size="20"></Icon>
             </div>
@@ -467,7 +467,7 @@ export default {
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "图片超过限制大小！",
-        desc: file.name + "图片超过规定限制大小，请重新上传",
+        desc: "图片超过规定限制大小，请重新上传",
       });
     },