瀏覽代碼

19点01分 合并

hmp 4 年之前
父節點
當前提交
cbc17d9f9d

+ 50 - 0
src/api/goodsrecord/goodsrecord.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-goodsRecord/goodsrecord/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-goodsRecord/goodsrecord/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-goodsRecord/goodsrecord/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-goodsRecord/goodsrecord/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-goodsRecord/goodsrecord/submit',
+    method: 'post',
+    data: row
+  })
+}
+

+ 50 - 0
src/api/pointsgoodsads/pointsgoodsads.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-pointsGoodsAds/pointsgoodsads/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-pointsGoodsAds/pointsgoodsads/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-pointsGoodsAds/pointsgoodsads/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-pointsGoodsAds/pointsgoodsads/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-pointsGoodsAds/pointsgoodsads/submit',
+    method: 'post',
+    data: row
+  })
+}
+

+ 50 - 0
src/api/useraddress/useraddress.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-userAddress/useraddress/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-userAddress/useraddress/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-userAddress/useraddress/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-userAddress/useraddress/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-userAddress/useraddress/submit',
+    method: 'post',
+    data: row
+  })
+}
+

+ 50 - 0
src/api/usermedal/usermedal.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-userMedal/usermedal/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-userMedal/usermedal/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-userMedal/usermedal/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-userMedal/usermedal/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-userMedal/usermedal/submit',
+    method: 'post',
+    data: row
+  })
+}
+

+ 150 - 135
src/views/activity/activity.vue

@@ -1,10 +1,10 @@
 <template>
   <basic-container>
-    <avue-crud id="activity"  :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-      @row-click="rowClick"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+    <avue-crud id="activity" :option="option" :table-loading="loading" :data="data" :page.sync="page"
+      :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate"
+      @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+      @selection-change="selectionChange" @row-click="rowClick" @current-change="currentChange"
+      @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
       <template slot="menuLeft">
         <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.activity_delete"
           @click="handleDelete">删 除
@@ -12,13 +12,12 @@
       </template>
 
       <template slot="menuLeft">
-        <el-button type="primary" size="small" icon="el-icon-delete"  v-if="permission.activity_add"
-          @click="showAdd">新增
+        <el-button type="primary" size="small" icon="el-icon-delete" v-if="permission.activity_add" @click="showAdd">新增
         </el-button>
       </template>
 
       <template slot="enable" slot-scope="scope">
-        <el-switch disabled v-model="scope.row.enable"   :active-value="1" :inactive-value="0"></el-switch>
+        <el-switch disabled v-model="scope.row.enable" :active-value="1" :inactive-value="0"></el-switch>
       </template>
 
       <template slot-scope="scope" slot="activityTime">
@@ -34,27 +33,29 @@
       </template>
 
       <template slot-scope="scope" slot="cover">
-        <el-image
-            style="width: 100%; height: 100%"
-            :src="scope.row.cover"
-            :preview-src-list="[scope.row.cover]">
-          </el-image>
+        <el-image style="width: 100%; height: 100%" :src="scope.row.cover" :preview-src-list="[scope.row.cover]">
+        </el-image>
       </template>
 
       <template slot-scope="scope" slot="poster">
-        <el-image
-            style="width: 100px; height: 120px;overflow-y: hidden;"
-            :src="scope.row.poster"
-            fit="cover"
-            :preview-src-list="[scope.row.poster]">
-          </el-image>
+        <el-image style="width: 100px; height: 120px;overflow-y: hidden;" :src="scope.row.poster" fit="cover"
+          :preview-src-list="[scope.row.poster]">
+        </el-image>
       </template>
 
       <template slot-scope="scope" slot="showData">
-            参与人数:<div style="background-color: #3296fa;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">{{scope.row.applyNum}}</div><br>
-            礼物总值:<div style="background-color: #5bc0de;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">{{ +scope.row.totalCash}}</div><br>
-            打榜数量:<div style="background-color: #5bc0de;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">{{scope.row.hitNum}}</div><br>
-            打赏数量:<div style="background-color: #99cf99;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">{{scope.row.rewardNum}}</div><br>
+        参与人数:<div
+          style="background-color: #3296fa;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">
+          {{scope.row.applyNum}}</div><br>
+        礼物总值:<div
+          style="background-color: #5bc0de;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">
+          {{ +scope.row.totalCash}}</div><br>
+        打榜数量:<div
+          style="background-color: #5bc0de;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">
+          {{scope.row.hitNum}}</div><br>
+        打赏数量:<div
+          style="background-color: #99cf99;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ; display:inline;">
+          {{scope.row.rewardNum}}</div><br>
       </template>
 
 
@@ -78,51 +79,60 @@
       </template>
     </avue-crud>
 
-    <activity-add ref="addDialog"
-      @submit="submit"
-      :form1="data1" :form2="data2" :form3="data3" :form4="data4">
+    <activity-add ref="addDialog" @submit="submit" :form1="data1" :form2="data2" :form3="data3" :form4="data4">
     </activity-add>
   </basic-container>
 </template>
 
 <script>
   import activityAdd from "./comps/activity-add.vue"
-  import {getList, getDetail, createOrUpdate, update, remove} from "@/api/activity/activity";
-  import {mapGetters} from "vuex";
+  import {
+    getList,
+    getDetail,
+    createOrUpdate,
+    update,
+    remove
+  } from "@/api/activity/activity";
+  import {
+    mapGetters
+  } from "vuex";
 
   export default {
-    components:{
+    components: {
       activityAdd
     },
     data() {
       return {
-        data1:{
-          id:'',
-          name:'',
-          beginTime:'',
-          endTime:'',
-          applyEndTime:'',
-          description:'',
-          visitBase:0,
-          tagIds:[]
+        data1: {
+          id: '',
+          name: '',
+          beginTime: '',
+          endTime: '',
+          applyEndTime: '',
+          description: '',
+          visitBase: 0,
+          tagIds: []
         },
-        data2:{
-          cover:'',
-          poster:'',
-          ads:''
+        data2: {
+          cover: '',
+          poster: '',
+          ads: ''
         },
-        data3:{
-           bonusProportion:'',
-           grossProfitRate:'',
-           classification:'',
-           personTitle:'',
-           productionTitle:'',
-           introductionTitle:'',
-           ticketDays:1,
-           ticketHotValue:1
+        data3: {
+          shareImg: '',
+          shareTitle: '',
+          shareDesc: '',
+          bonusProportion: '',
+          grossProfitRate: '',
+          classification: '',
+          personTitle: '',
+          productionTitle: '',
+          introductionTitle: '',
+          ticketDays: 1,
+          ticketHotValue: 1
         },
-        data4:{
-          presentIds:[]
+        data4: {
+          presentIds: []
         },
 
         form: {},
@@ -143,19 +153,18 @@
           border: true,
           index: true,
           viewBtn: true,
-          editBtn:false,
-          addBtn:false,
+          editBtn: false,
+          addBtn: false,
           selection: true,
           labelWidth: 150,
-          size:"medium",
+          size: "medium",
           dialogClickModal: false,
-          column: [
-            {
+          column: [{
               label: "封面图",
               prop: "cover",
               width: 150,
               type: "upload",
-              solt:true,
+              solt: true,
               listType: "picture-img",
               action: '/api/putObject',
               propsHttp: {
@@ -166,9 +175,9 @@
                 message: "请输入活动封面图",
                 trigger: "blur"
               }]
-            },{
+            }, {
               label: "活动主题",
-              search:true,
+              search: true,
               prop: "name",
               rules: [{
                 required: true,
@@ -177,25 +186,25 @@
               }]
             },
             {
-              label:"活动时间",
-              slot:true,
+              label: "活动时间",
+              slot: true,
               width: 200,
-              editDisplay:false,
-              addDisplay:false,
-              prop:"activityTime"
+              editDisplay: false,
+              addDisplay: false,
+              prop: "activityTime"
             },
             {
-              label:"数据",
-              slot:true,
+              label: "数据",
+              slot: true,
               width: 180,
-              editDisplay:false,
-              addDisplay:false,
-              prop:"showData"
+              editDisplay: false,
+              addDisplay: false,
+              prop: "showData"
             },
             {
               label: "活动开始时间",
               width: 140,
-              hide:true,
+              hide: true,
               prop: "beginTime",
               type: 'datetime',
               format: "yyyy-MM-dd hh:mm:ss",
@@ -209,7 +218,7 @@
             {
               label: "活动结束时间",
               width: 140,
-              hide:true,
+              hide: true,
               prop: "endTime",
               type: 'datetime',
               format: "yyyy-MM-dd hh:mm:ss",
@@ -223,7 +232,7 @@
             {
               label: "报名结束时间",
               width: 140,
-              hide:true,
+              hide: true,
               prop: "applyEndTime",
               type: 'datetime',
               format: "yyyy-MM-dd hh:mm:ss",
@@ -262,7 +271,7 @@
             {
               label: "活动海报",
               prop: "poster",
-              slot:true,
+              slot: true,
               dataType: 'string',
               listType: 'picture-img',
               propsHttp: {
@@ -280,7 +289,7 @@
             {
               label: "活动轮播图",
               prop: "ads",
-              hide:true,
+              hide: true,
               dataType: 'string',
               listType: 'picture-card',
               propsHttp: {
@@ -298,7 +307,7 @@
               label: "是否启用",
               width: 100,
               prop: "enable",
-              slot:true,
+              slot: true,
               type: 'switch',
               dicData: [{
                   label: '禁用',
@@ -335,82 +344,88 @@
       }
     },
     methods: {
-      rowClick(row,event){
-        if (event.property=='enable') {
-          let param={
-            id:row.id,
-            enable:row.enable==1?0:1
+      rowClick(row, event) {
+        if (event.property == 'enable') {
+          let param = {
+            id: row.id,
+            enable: row.enable == 1 ? 0 : 1
           }
-          update(param).then(()=>{
+          update(param).then(() => {
             this.onLoad(this.page);
           })
         }
       },
-      showAdd(){
+      showAdd() {
         if (!this.$isEmpty(this.data1.id)) {
           this.resetData()
         }
         this.$refs.addDialog.open()
       },
-      resetData(){
-        this.data1={
-          id:'',
-          name:'',
-          beginTime:'',
-          endTime:'',
-          applyEndTime:'',
-          description:'',
-          visitBase:0,
-          tagIds:[]
+      resetData() {
+        this.data1 = {
+          id: '',
+          name: '',
+          beginTime: '',
+          endTime: '',
+          applyEndTime: '',
+          description: '',
+          visitBase: 0,
+          tagIds: []
         }
-        this.data2={
-          cover:'',
-          poster:'',
-          ads:''
+        this.data2 = {
+          cover: '',
+          poster: '',
+          ads: ''
         }
-        this.data3={
-           bonusProportion:0,
-           grossProfitRate:1,
-           classification:'',
-           personTitle:'',
-           productionTitle:'',
-           introductionTitle:'',
-           ticketDays:1,
-           ticketHotValue:1
+        this.data3 = {
+          shareImg: '',
+          shareTitle: '',
+          shareDesc: '',
+          bonusProportion: 0,
+          grossProfitRate: 1,
+          classification: '',
+          personTitle: '',
+          productionTitle: '',
+          introductionTitle: '',
+          ticketDays: 1,
+          ticketHotValue: 1
         }
-        this.data4={
-          presentIds:[]
+        this.data4 = {
+          presentIds: []
         }
       },
       //编辑
       handleEdit(item) {
-        this.data1={
-          id:item.id,
-          name:item.name,
-          beginTime:item.beginTime,
-          endTime:item.endTime,
-          applyEndTime:item.applyEndTime,
-          description:item.description,
-          visitBase:item.visitBase,
-          tagIds:item.tagIds
+        this.data1 = {
+          id: item.id,
+          name: item.name,
+          beginTime: item.beginTime,
+          endTime: item.endTime,
+          applyEndTime: item.applyEndTime,
+          description: item.description,
+          visitBase: item.visitBase,
+          tagIds: item.tagIds
         }
-        this.data2={
-          cover:item.cover,
-          poster:item.poster,
-          ads:item.ads
+        this.data2 = {
+          cover: item.cover,
+          poster: item.poster,
+          ads: item.ads
         }
-        this.data3={
-           grossProfitRate:item.grossProfitRate,
-           bonusProportion:item.bonusProportion,
-           classification:item.classification,
-           personTitle:item.personTitle,
-           productionTitle:item.productionTitle,
-           introductionTitle:item.introductionTitle,
-           ticketDays:item.ticketDays,
-           ticketHotValue:item.ticketHotValue
+        this.data3 = {
+          shareImg: item.shareImg,
+          shareTitle: item.shareTitle,
+          shareDesc: item.shareDesc,
+          grossProfitRate: item.grossProfitRate,
+          bonusProportion: item.bonusProportion,
+          classification: item.classification,
+          personTitle: item.personTitle,
+          productionTitle: item.productionTitle,
+          introductionTitle: item.introductionTitle,
+          ticketDays: item.ticketDays,
+          ticketHotValue: item.ticketHotValue
         }
-        this.data4={
-          presentIds:item.presentIds
+        this.data4 = {
+          presentIds: item.presentIds
         }
         this.$refs.addDialog.open()
       },
@@ -536,7 +551,7 @@
           this.selectionClear();
         });
       },
-      view(id,name){
+      view(id, name) {
         this.$router.push({
           name,
           query: {
@@ -549,7 +564,7 @@
 </script>
 
 <style>
-/* #activity
+  /* #activity
     .el-table__row{
       height: 200px;
     } */

+ 28 - 0
src/views/activity/comps/activity-add.vue

@@ -156,6 +156,30 @@
               </el-form-item>
             </el-form>
           </div>
+        </el-card>、
+        
+        
+        <el-card style="margin-top: 10px;">
+          <div slot="header" style="padding: 5px 0;">
+            <span>分享配置</span>
+          </div>
+          <div>
+            <el-form ref="form3" :model="form3" :rules="rules3" label-width="100px">
+              <el-form-item  label="分享标题" prop="shareTitle">
+                <el-input v-model="form3.shareTitle" placeholder="请输入分享标题"></el-input>
+              </el-form-item>
+              <el-form-item label="分享内容" prop="shareDesc">
+                <el-input v-model="form3.shareDesc" placeholder="请输入分享内容"></el-input>
+              </el-form-item>
+              <el-form-item label="分享图片" prop="shareImg">
+                <el-upload class="avatar-uploader" action="/api/putObject" :show-file-list="false"
+                  :on-success="handleShareImg">
+                  <img v-if="form3.shareImg" :src="form3.shareImg" class="avatar">
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+              </el-form-item>
+            </el-form>
+          </div>
         </el-card>
 
         <el-card style="margin-top: 10px;">
@@ -413,6 +437,10 @@
       handleUploadCover(res) {
         this.form2.cover = res.data
       },
+      //上传分享图片
+      handleShareImg(res) {
+        this.form3.shareImg = res.data
+      },
       //上传海报图
       handleUploadPoster(res) {
         this.form2.poster = res.data

+ 353 - 0
src/views/goodsrecord/goodsrecord.vue

@@ -0,0 +1,353 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="distributionStatus" slot-scope="scope">
+        <div v-if="scope.row.distributionStatus=0">配送中</div>
+        <div v-if="scope.row.distributionStatus=1">已完成</div>
+      </template>
+      <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称:{{scope.row.nickName}}</div>
+             <div>手机:{{scope.row.phone}}</div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="distributionStatus" slot-scope="scope">
+        <el-tag type="warning" v-if="scope.row.distributionStatus==0">配送中</el-tag>
+        <el-tag type="success" v-if="scope.row.distributionStatus==1">已完成</el-tag>
+      </template>
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.goodsrecord_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/goodsrecord/goodsrecord";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户id",
+              hide:true,
+              prop: "userId",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              labal:"用户信息",
+              width:200,
+              slot:true,
+              prop:"userInfo"
+            },
+            {
+              label: "实物id",
+              hide:true,
+              prop: "goodsId",
+              rules: [{
+                required: true,
+                message: "请输入实物id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物名称",
+              prop: "goodsName",
+              rules: [{
+                required: true,
+                message: "请输入实物名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label:"昵称",
+              search:true,
+              hide:true,
+              prop:"nickName"
+            },
+            {
+              label:"手机号",
+              search:true,
+              hide:true,
+              prop:"phone"
+            },
+            {
+              label: "实物图片",
+              prop: "goodsPic",
+              slot:true,
+              listType: 'picture-img',
+              action: '/api/putObject',
+              type: 'upload',
+              propsHttp: {
+                url: 'data'
+              },
+              rules: [{
+                required: true,
+                message: "请输入实物图片",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "领取数量",
+              prop: "count",
+              rules: [{
+                required: true,
+                message: "请输入领取数量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物包邮的数量",
+              hide:true,
+              prop: "goodsPostAmount",
+              rules: [{
+                required: true,
+                message: "请输入实物包邮的数量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "配送方式id,包邮则传-1",
+              hide:true,
+              prop: "distributionId",
+              rules: [{
+                required: true,
+                message: "请输入配送方式id,包邮则传-1",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "配送状态",
+              search:true,
+              prop: "distributionStatus",
+              type: "select",
+              dicData:[
+                {
+                  label:'配送中',
+                  value:0
+                },
+                {
+                  label:'已完成',
+                  value:1
+                }
+              ],
+              rules: [{
+                required: true,
+                message: "请输入配送状态,0: 配送中 1:已完成",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "完成时间",
+              hide:true,
+              prop: "doneTime",
+              rules: [{
+                required: true,
+                message: "请输入完成时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "关联的地址",
+              hide:true,
+              prop: "addressId",
+              rules: [{
+                required: true,
+                message: "请输入关联的地址",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.goodsrecord_add, false),
+          viewBtn: this.vaildData(this.permission.goodsrecord_view, false),
+          delBtn: this.vaildData(this.permission.goodsrecord_delete, false),
+          editBtn: this.vaildData(this.permission.goodsrecord_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

+ 3 - 5
src/views/guosen/agenter.vue

@@ -3,10 +3,9 @@
    <el-dialog  :modal-append-to-body="false" :visible.sync="userAgenterVisible" title="推广用户" width="70%">
      <useragenter ref="useragenterRef" :agenterId="selectAgenterId"></useragenter>
    </el-dialog>
-   <el-dialog @close="closeOrderCommission"  append-to-body :close-on-click-modal="false" :visible.sync="viewOrderCommissionVisible" title="分佣记录" width="70%">
-     <ordercommissioncomp  ref="ordercommissioncompRef" :agenter="selectAgenter"></ordercommissioncomp>
-   </el-dialog>
-    </el-dialog>
+     <el-dialog @close="closeOrderCommission"  append-to-body :close-on-click-modal="false" :visible.sync="viewOrderCommissionVisible" title="分佣记录" width="70%">
+       <ordercommissioncomp  ref="ordercommissioncompRef" :agenter="selectAgenter"></ordercommissioncomp>
+     </el-dialog>
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
@@ -249,7 +248,6 @@
     },
     methods: {
       closeOrderCommission(){
-        debugger
         this.viewOrderCommissionVisible = false;
       },
       viewOrderCommission(row){

+ 262 - 0
src/views/pointsgoodsads/pointsgoodsads.vue

@@ -0,0 +1,262 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.pointsgoodsads_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/pointsgoodsads/pointsgoodsads";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "轮播图片",
+              prop: "url",
+              type: "upload",
+              listType: "picture-img",
+              action: '/api/putObject',
+              propsHttp: {
+                url: 'data'
+              },
+              rules: [{
+                required: true,
+                message: "请输入轮播图片",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "跳转类型",
+              prop: "type",
+              type:"select",
+              dicData: [{
+                  label: '跳转小程序',
+                  value: 0
+                },
+                {
+                  label: '跳转链接',
+                  value: 1
+                }
+              ],
+              rules: [{
+                required: true,
+                message: "请选择跳转类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "跳转路径",
+              prop: "path",
+              rules: [{
+                required: true,
+                message: "请输入原始的appid或者跳转的地址",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "所属活动",
+              prop: "activityId",
+              type: "select",
+              search:true,
+              dicUrl: "/api/cyzh-activity/activity/list?size=500",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              dicFormatter: (res) => {
+                return res.data.records
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属活动",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.pointsgoodsads_add, false),
+          viewBtn: this.vaildData(this.permission.pointsgoodsads_view, false),
+          delBtn: this.vaildData(this.permission.pointsgoodsads_delete, false),
+          editBtn: this.vaildData(this.permission.pointsgoodsads_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

+ 273 - 0
src/views/useraddress/useraddress.vue

@@ -0,0 +1,273 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称:{{scope.row.nickName}}</div>
+             <div>手机:{{scope.row.phone}}</div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.useraddress_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/useraddress/useraddress";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户id",
+              hide:true,
+              prop: "userId",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label:'用户信息',
+              slot:true,
+              prop:"userInfo"
+            },
+            {
+              label:'用户昵称',
+              search:true,
+              prop:'nickName'
+            },
+            {
+              label:'手机号',
+              search:true,
+              prop:'phone'
+            },
+            {
+              label: "收货人姓名",
+              prop: "consignee",
+              rules: [{
+                required: true,
+                message: "请输入收货人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "收货人手机号",
+              prop: "phone",
+              rules: [{
+                required: true,
+                message: "请输入收货人手机号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "所在地区",
+              prop: "area",
+              rules: [{
+                required: true,
+                message: "请输入所在地区",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "详细地址",
+              prop: "detail",
+              rules: [{
+                required: true,
+                message: "请输入详细地址",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.useraddress_add, false),
+          viewBtn: this.vaildData(this.permission.useraddress_view, false),
+          delBtn: this.vaildData(this.permission.useraddress_delete, false),
+          editBtn: this.vaildData(this.permission.useraddress_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

+ 287 - 0
src/views/usermedal/usermedal.vue

@@ -0,0 +1,287 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+
+      <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称:{{scope.row.nickName}}</div>
+             <div>手机:{{scope.row.phone}}</div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="medalInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.medal.icon"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >名称:{{scope.row.medal.name}}</div>
+             <div>积分值:{{scope.row.medal.pointsValue}}
+                <span style="font-weight: 800;padding: 0 10px;">X</span>
+                {{scope.row.count}}
+             </div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.usermedal_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/usermedal/usermedal";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户id",
+              hide:true,
+              prop: "userId",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label:"用户信息",
+              slot:true,
+              prop:"userInfo"
+            },
+            {
+              label:"用户昵称",
+              search:true,
+              prop:'nickName'
+            },
+            {
+              label:"手机号",
+              search:true,
+              prop:'phone'
+            },
+            {
+              label: "勋章id",
+              hide:true,
+              prop: "medalId",
+              rules: [{
+                required: true,
+                message: "请输入勋章id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label:"勋章信息",
+              slot:true,
+              prop:"medalInfo"
+            },
+            {
+              label: "来源礼物id列表",
+              hide:true,
+              prop: "activityIds",
+              rules: [{
+                required: true,
+                message: "请输入来源礼物id列表",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "勋章数量",
+              prop: "count",
+              rules: [{
+                required: true,
+                message: "请输入勋章数量",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.usermedal_add, false),
+          viewBtn: this.vaildData(this.permission.usermedal_view, false),
+          delBtn: this.vaildData(this.permission.usermedal_delete, false),
+          editBtn: this.vaildData(this.permission.usermedal_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

+ 0 - 1
src/views/userpointsgoods/userpointsgoods.vue

@@ -46,7 +46,6 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
           border: true,
           index: true,
           viewBtn: true,

+ 0 - 1
src/views/wel/index.vue

@@ -137,7 +137,6 @@
           url: '/api/cyzh-static/static',
           method: "get"
         }).then(res => {
-          debugger
           const resData = res.data.data;
           this.optionMusic.data[0].count = resData.userCount;
           this.optionMusic.data[1].count = resData.agenterCount;