Merge branch 'master' of http://gitlab.91isoft.com:90/yangshuo/longhui_web

src/styles/element-ui.scss

@@ -416,3 +416,4 @@ label {
     text-align: left;
   }
 }
+

src/views/business/businessadd.vue

@@ -32,6 +32,11 @@
           <el-input v-model.trim="form.entryAccount" :maxlength="25" placeholder="请输入商家账号" />
         </el-form-item>
       </div>
+      <div style="display: flex;justify-content: space-between">
+        <el-form-item label="权重"  prop="sort">
+          <el-input-number v-model="form.sort" :min="0" :max="9999" style="width: 100%" controls-position="right" :precision="0" />
+        </el-form-item>
+      </div>
       <el-form-item label="商家简介" prop="entryDetails">
         <el-input v-model.trim="form.entryDetails" type="textarea" :maxlength="500" placeholder="请输入商家简介" />
       </el-form-item>
@@ -42,6 +47,7 @@
           :http-request="upload"
           :on-preview="handlePreview"
           :on-remove="handleRemove"
+          :before-upload="beforeUpload"
           :file-list="fileList"
           :show-file-list="false"
           :limit="1"
@@ -60,6 +66,7 @@
           class="upload-image"
           action="#"
           :http-request="ImageUpload"
+          :before-upload="beforeUploads"
           :on-preview="handlePreview"
           :on-remove="handleRemove"
           :file-list="imageFileList"
@@ -69,7 +76,7 @@
         >
           <img v-if="imgageUrl" :src="imgageUrl" class="avatar">
           <!--            <el-button size="small" type="primary">点击上传</el-button>-->
-          <div  v-if="!imgageUrl" class="upload-trademark">
+          <div v-if="!imgageUrl" class="upload-trademark">
             <i class="el-icon-plus" style="width: 20px;height: 20px;margin-top: 10px;" />
             <div class="upload-trademark-title">上传封面</div>
           </div>
@@ -131,7 +138,9 @@ export default {
         entryAccount: [
           { required: true, message: '请输入商家账号', trigger: 'blur' }
           // { validator: verifyNameProp, trigger: 'blur' }
-        ]
+        ],
+        sort: [{ required: true, message: '请输入权重', trigger: 'blur' },
+          { type: 'number', validator: this.validWeigh, trigger: 'change' }]
       }
     }
   },
@@ -139,6 +148,8 @@ export default {
     const baseURL = 'http://192.144.239.97:20043/file/'
     if (this.type === 0) {
       this.form = {}
+      this.imgageUrl = 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
+      this.imgUrl = 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
     } else if (this.type === 1) {
       // this.form = this.$route.query.data
       const id = this.$route.query.id
@@ -153,6 +164,54 @@ export default {
     }
   },
   methods: {
+    beforeUpload(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onload = (e) => {
+          const image = new Image()
+          image.src = e.target.result
+          image.onload = () => {
+            if (image.width === 165 && image.height === 220) {
+              resolve(file)
+            } else {
+              reject(new Error('请上传尺寸为165px*220px的图片'))
+            }
+          }
+        }
+        reader.onerror = (error) => {
+          reject(error)
+        }
+        reader.readAsDataURL(file)
+      })
+    },
+    beforeUploads(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onload = (e) => {
+          const image = new Image()
+          image.src = e.target.result
+          image.onload = () => {
+            if (image.width === 314 && image.height === 192) {
+              resolve(file)
+            } else {
+              reject(new Error('请上传尺寸为165px*220px的图片'))
+            }
+          }
+        }
+        reader.onerror = (error) => {
+          reject(error)
+        }
+        reader.readAsDataURL(file)
+      })
+    },
+    validWeigh(rule, value, callback) {
+      console.log('value', value)
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('权重不能为0'))
+      }
+    },
     ImageUpload(file) {
       console.log('file', file)
       const formData = new FormData()
@@ -197,6 +256,8 @@ export default {
                 this.$message.success('操作成功')
                 this.reset()
                 this.$router.push('/business/index')
+              } else if (res.code === null) {
+                this.$message.error(res.message)
               }
             })
           } else {
@@ -206,6 +267,8 @@ export default {
                 this.$message.success('操作成功')
                 this.reset()
                 this.$router.push('/business/index')
+              } else if (res.code === null) {
+                this.$message.error(res.message)
               }
             })
           }

src/views/business/index.vue

@@ -705,6 +705,9 @@ export default {
   height: 59px;
 }
 .memberDialog{
+  ::v-deep .el-dialog .el-dialog__body{
+    max-height: 85vh;
+  }
   ::v-deep .el-table tr{
     height: 59px;
   }

src/views/member/memberinfo/index.vue

@@ -214,7 +214,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-         rows: 10,
+        rows: 10,
         phone: '',
         nickName: '',
         level: '',