Merge remote-tracking branch 'origin/master'

src/api/contentManagement/cmsOrder.js

+import request from '@/utils/request'
+import Qs from 'qs'
+
+/**
+* 1. 列表查询
+* 2. 查询详细信息
+* 3. 新增
+* 4. 修改
+* 5. 逻辑删除
+* 6. 导出
+*
+*/
+
+// 1. 查询订单信息表列表
+export function listCmsOrder(query) {
+  return request({
+    url: '/cmsOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 2. 查询订单信息表详细信息
+export function getCmsOrder(businessId) {
+  return request({
+    url: '/cmsOrder/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 3. 新增订单信息表
+export function addCmsOrder(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/cmsOrder/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 4. 修改订单信息表
+export function updateCmsOrder(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/cmsOrder/update/' + businessId,
+    method: 'put',
+    data
+  })
+}
+
+// 5. 逻辑删除订单信息表
+export function delCmsOrder(businessId) {
+  return request({
+    url: '/cmsOrder/deleteLogical/' + businessId,
+    method: 'delete'
+  })
+}
+
+// 6. 导出订单信息表
+export function exportCmsOrder(query) {
+  return request({
+    url: '/cmsOrder/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/operationsManagement/member/info/index.vue

@@ -9,20 +9,30 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="微信头像:" prop="pictureId">
-                <el-upload
-                  ref="upload"
-                  accept=".png,.jpg,.jpeg,.PNG,.JPG,.JPEG"
-                  :file-list="fileList"
-                  list-type="picture-card"
-                  class="avatar-uploader"
-                  action="#"
-                  :disabled="secondFromDisabled"
-                  :show-file-list="false"
-                  :before-upload="handleUploadBeforeFake"
-                  :auto-upload="true"
-                >
-                  <img v-if="imageUrl" :src="imageUrl" class="avatar" alt="">
-                </el-upload>
+                <div style="justify-content: space-between;display: flex">
+                  <el-upload
+                    ref="upload"
+                    accept=".png,.jpg,.jpeg,.PNG,.JPG,.JPEG"
+                    :file-list="fileList"
+                    list-type="picture-card"
+                    class="avatar-uploader"
+                    action="#"
+                    :disabled="secondFromDisabled"
+                    :show-file-list="false"
+                    :before-upload="handleUploadBeforeFake"
+                    :auto-upload="true"
+                  >
+                    <img v-if="imageUrl" :src="imageUrl" class="avatar" alt="">
+                  </el-upload>
+                  <div style="margin-left: 20px">
+                    <img v-if="form.pictureUrls != null && form.pictureUrls.length > 0" :src="form.pictureUrls[0]" style="width: 80px;height: 80px" alt="">
+                    <img v-if="form.pictureUrls != null && form.pictureUrls.length > 2" :src="form.pictureUrls[2]" style="width: 80px;height: 80px" alt="">
+                  </div>
+                  <div>
+                    <img v-if="form.pictureUrls != null && form.pictureUrls.length > 1" :src="form.pictureUrls[1]" style="width: 80px;height: 80px" alt="">
+                    <img v-if="form.pictureUrls != null && form.pictureUrls.length > 3" :src="form.pictureUrls[3]" style="width: 80px;height: 80px" alt="">
+                  </div>
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -851,6 +861,7 @@ export default {
       this.form.memConstellation = Number(this.form.memConstellation)
       this.form.memResidence = Number(this.form.memResidence)
       this.form.memLevel = Number(this.form.memLevel)
+      this.form.pictureUrls = this.form.pictureUrls.split(',')
     },
     handleResidence() {
       const province = this.residence.find(item => item.value === this.form.memResidence[0])

src/views/system/dict/data.vue

@@ -345,8 +345,8 @@ export default {
     getList() {
       this.loading = true
       listData(this.queryParams).then(response => {
-        if (response.rows) {
-          this.dataList = response.rows
+        if (response.data) {
+          this.dataList = response.data
           this.total = response.total
         }
         this.loading = false