Browse Source

添加后台搜索

xiaoqiang 4 years ago
parent
commit
6616e1dac0

+ 1 - 1
src/api/sing_goods/goodsorder.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/sing_goods/goodsorder/list',
+    url: '/api/sing_goods/goodsorder/page',
     method: 'get',
     params: {
       ...params,

+ 1 - 1
src/api/sing_goods/goodsrecord.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/sing_goods/goodsrecord/list',
+    url: '/api/sing_goods/goodsrecord/page',
     method: 'get',
     params: {
       ...params,

+ 1 - 1
src/api/sing_point/cmccpointrecord.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/sing_point/cmccpointrecord/list',
+    url: '/api/sing_point/cmccpointrecord/page',
     method: 'get',
     params: {
       ...params,

+ 2 - 2
src/views/sing_active/activehelp.vue

@@ -19,13 +19,13 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
                    v-if="permission.activehelp_delete"
                    @click="handleDelete">删 除
-        </el-button>
+        </el-button>-->
       </template>
     </avue-crud>
   </basic-container>

+ 47 - 53
src/views/sing_goods/goodsorder.vue

@@ -60,8 +60,9 @@
           dialogClickModal: false,
           column: [
             {
-              label: "用户id",
-              prop: "userId",
+              label: "用户名",
+              prop: "userName",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入用户id",
@@ -69,20 +70,49 @@
               }]
             },
             {
-              label: "积分商品ID",
-              prop: "pointGoodsId",
+              label: "商品名",
+              prop: "pointGoodsName",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入商品名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品图片",
+              prop: "goodsImgUrl",
+              type: 'upload',
+              listType: 'picture-img',
+              dataType: 'string',
+              span: 12,
+              propsHttp: {
+                res: 'data',
+                url: 'link'
+              },
+              action: '/api/blade-resource/oss/endpoint/put-file',
               rules: [{
                 required: true,
-                message: "请输入积分商品ID",
+                message: "请输入商品图片",
                 trigger: "blur"
               }]
             },
             {
-              label: "收获地址ID",
-              prop: "addressId",
+              label: "电话",
+              prop: "phone",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入收获地址ID",
+                message: "请输入电话",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品价格",
+              prop: "goodsPoint",
+              rules: [{
+                required: true,
+                message: "请输入商品价格",
                 trigger: "blur"
               }]
             },
@@ -176,51 +206,15 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "商品价格",
-              prop: "goodsPoint",
-              rules: [{
-                required: true,
-                message: "请输入商品价格",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "电话",
-              prop: "phone",
-              rules: [{
-                required: true,
-                message: "请输入电话",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品图片",
-              prop: "goodsImgUrl",
-              type: 'upload',
-              listType: 'picture-img',
-              dataType: 'string',
-              span: 12,
-              propsHttp: {
-                res: 'data',
-                url: 'link'
-              },
-              action: '/api/blade-resource/oss/endpoint/put-file',
-              rules: [{
-                required: true,
-                message: "请输入商品图片",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品名",
-              prop: "goodsName",
-              rules: [{
-                required: true,
-                message: "请输入商品名",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "商品名",
+            //   prop: "goodsName",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入商品名",
+            //     trigger: "blur"
+            //   }]
+            // },
           ]
         },
         data: []

+ 2 - 0
src/views/sing_goods/goodsrecord.vue

@@ -65,6 +65,7 @@
             {
               label: "用户",
               prop: "userName",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入用户",
@@ -83,6 +84,7 @@
             {
               label: "道具",
               prop: "helpGoodsName",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入道具",

+ 17 - 5
src/views/sing_point/cmccpointrecord.vue

@@ -63,8 +63,9 @@
           dialogClickModal: false,
           column: [
             {
-              label: "用户id",
-              prop: "userId",
+              label: "用户名",
+              prop: "userName",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入用户id",
@@ -98,18 +99,29 @@
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "助力道具Id",
+            //   prop: "helpGoodsId",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入助力道具Id",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "助力道具Id",
-              prop: "helpGoodsId",
+              label: "助力道具",
+              prop: "helpGoodsName",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入助力道具Id",
+                message: "请输入助力道具",
                 trigger: "blur"
               }]
             },
             {
               label: "积分",
               prop: "point",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入积分",

+ 22 - 20
src/views/sing_user/loginuser.vue

@@ -59,29 +59,30 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "普法积分",
-              prop: "pufaPoint",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入普法积分",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "热力值",
-              prop: "heatValue",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入热力值",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "普法积分",
+            //   prop: "pufaPoint",
+            //   type: "number",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入普法积分",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "热力值",
+            //   prop: "heatValue",
+            //   type: "number",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入热力值",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "手机号码",
               prop: "phone",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入手机号码",
@@ -119,6 +120,7 @@
             {
               label: "用户昵称",
               prop: "nickName",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入用户昵称",

+ 6 - 6
vue.config.js

@@ -26,15 +26,15 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        // target: 'http://localhost:2888',
+         target: 'http://localhost:2888',
         //远程演示服务地址,可用于直接启动项目
-        target: 'https://saber.bladex.vip',
-        // target: 'https://vote.guosen-fumao.cn',
+        //target: 'https://saber.bladex.vip/api',
+        //target: 'https://vote.guosen-fumao.cn/api',
 
         ws: true,
-        // pathRewrite: {
-        //   '^/api': '/'
-        // }
+        pathRewrite: {
+          '^/api': '/'
+        }
       }
     }
   }