update

src/api/nxPawn.js

@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/nxPawn',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/nxPawn/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/nxPawn',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del }

src/components/pic-upload-two/index.vue

@@ -45,9 +45,9 @@ export default {
     },
     // 限制图片上传大小
     beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 4
+      const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 4MB!')
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
       return isLt2M
     }

src/components/pic-upload/index.vue

@@ -45,9 +45,9 @@ export default {
     },
     // 限制图片上传大小
     beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 4
+      const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 4MB!')
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
       return isLt2M
     }

src/mixins/crud.js

@@ -61,15 +61,9 @@ export default {
         this.loading = true
         // 请求数据
         initData(this.url, this.getQueryParame()).then(data => {
-          // return ;
-          console.log(data)
           this.cateList = data.cateList
-          // this.total = data.total
-          // this.data = data.list
           this.total = data.totalElements
           this.data = data.content
-
-          // console.log(this.cateList)
           // time 毫秒后显示表格
           setTimeout(() => {
             this.loading = false
@@ -182,7 +176,7 @@ export default {
         this.$refs[id].doClose()
       })
     },
-    afterDelMethod() { },
+    afterDelMethod() {},
     /**
      * 多选删除提示
      */
@@ -221,7 +215,7 @@ export default {
     /**
      * 显示新增弹窗前可以调用该方法
      */
-    beforeShowAddForm() { },
+    beforeShowAddForm() {},
     /**
      * 显示新增弹窗
      */
@@ -234,7 +228,7 @@ export default {
     /**
      * 显示编辑弹窗前可以调用该方法
      */
-    beforeShowEditForm(data) { },
+    beforeShowEditForm(data) {},
     /**
      * 显示编辑弹窗
      */
@@ -265,11 +259,11 @@ export default {
     /**
      * 新增后可以调用该方法
      */
-    afterAddMethod() { },
+    afterAddMethod() {},
     /**
      * 新增失败后调用该方法
      */
-    afterAddErrorMethod() { },
+    afterAddErrorMethod() {},
     /**
      * 通用的编辑方法
      */
@@ -287,7 +281,7 @@ export default {
     /**
      * 编辑后可以调用该方法
      */
-    afterEditMethod() { },
+    afterEditMethod() {},
     /**
      * 提交前可以调用该方法
      */

src/settings.js

@@ -2,11 +2,7 @@ module.exports = {
   /**
    * @description 网站标题
    */
-<<<<<<< HEAD
   title: 'YSHOP-3.1',
-=======
-  title: '农心商城',
->>>>>>> 88fdfe1ae8a01c7ce6c7907f9a20ebc751c8e4d1
   /**
    * @description 是否显示 tagsView
    */

src/utils/request.js

@@ -8,7 +8,6 @@ import Config from '@/settings'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url
-  // baseURL: 'http://192.168.100.253:8001',
   timeout: Config.timeout // 请求超时时间
 })
 

src/views/generator/config.vue

@@ -243,7 +243,6 @@ export default {
       })
       getDicts().then(data => {
         this.dicts = data
-      
       })
     })
   },
@@ -257,7 +256,6 @@ export default {
     saveColumnConfig() {
       this.columnLoading = true
       save(this.data).then(res => {
-        console.log(res)
         this.notify('保存成功', 'success')
         this.columnLoading = false
       }).catch(err => {

src/views/login.vue

@@ -2,11 +2,7 @@
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-<<<<<<< HEAD
         YSHOP后台管理系统-3.1
-=======
-        农心商城后台管理系统v1.0
->>>>>>> 88fdfe1ae8a01c7ce6c7907f9a20ebc751c8e4d1
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

src/views/pawn/index.vue

@@ -1,126 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="id" prop="id">
-            <el-input v-model="form.id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="典当名称">
-            <el-input v-model="form.pawnName" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="图片">
-            <el-input v-model="form.pawnPicture" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="所需积分">
-            <el-input v-model="form.integral" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="典当金额">
-            <el-input v-model="form.money" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="排序">
-            <el-input v-model="form.sort" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="是否可见">
-            <el-input v-model="form.isVisible" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="是否可选">
-            <el-input v-model="form.isOptional" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="columns.visible('id')" prop="id" label="id" />
-        <el-table-column v-if="columns.visible('pawnName')" prop="pawnName" label="典当名称" />
-        <el-table-column v-if="columns.visible('pawnPicture')" prop="pawnPicture" label="图片" />
-        <el-table-column v-if="columns.visible('integral')" prop="integral" label="所需积分" />
-        <el-table-column v-if="columns.visible('money')" prop="money" label="典当金额" />
-        <el-table-column v-if="columns.visible('sort')" prop="sort" label="排序" />
-        <el-table-column v-if="columns.visible('isVisible')" prop="isVisible" label="是否可见" />
-        <el-table-column v-if="columns.visible('isOptional')" prop="isOptional" label="是否可选" />
-        <el-table-column v-permission="['admin','nxPawn:edit','nxPawn:del']" label="操作" width="150px" align="center">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudNxPawn from '@/api/nxPawn'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import MaterialList from "@/components/material";
-
-// crud交由presenter持有
-const defaultCrud = CRUD({ title: 'pawn', url: 'api/nxPawn', sort: 'id,desc', crudMethod: { ...crudNxPawn }})
-const defaultForm = { id: null, pawnName: null, pawnPicture: null, integral: null, money: null, sort: null, isVisible: null, isOptional: null }
-export default {
-  name: 'NxPawn',
-  components: { pagination, crudOperation, rrOperation, udOperation ,MaterialList},
-  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      
-      permission: {
-        add: ['admin', 'nxPawn:add'],
-        edit: ['admin', 'nxPawn:edit'],
-        del: ['admin', 'nxPawn:del']
-      },
-      rules: {
-        id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }    }
-  },
-  watch: {
-  },
-  methods: {
-    // 获取数据前设置好接口地址
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }, // 新增与编辑前做的操作
-    [CRUD.HOOK.afterToCU](crud, form) {
-    },
-  }
-}
-
-
-
-</script>
-
-<style scoped>
-  .table-img {
-    display: inline-block;
-    text-align: center;
-    background: #ccc;
-    color: #fff;
-    white-space: nowrap;
-    position: relative;
-    overflow: hidden;
-    vertical-align: middle;
-    width: 32px;
-    height: 32px;
-    line-height: 32px;
-  }
-</style>

src/views/shop/user/index.vue

@@ -31,7 +31,7 @@
     <detail ref="formd" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column prop="realName" label="姓名" />
+      <el-table-column prop="uid" label="用户id" />
       <el-table-column prop="nickname" label="用户昵称" />
       <el-table-column ref="table" prop="avatar" label="用户头像">
         <template slot-scope="scope">
@@ -39,18 +39,64 @@
         </template>
       </el-table-column>
       <el-table-column prop="phone" label="手机号码" />
-
+      <el-table-column prop="nowMoney" label="用户余额" />
-      <el-table-column prop="productName" label="会员类型" />
+      <el-table-column prop="brokeragePrice" label="佣金金额" />
-      <el-table-column prop="promotionCode" label="推广码" />
+      <el-table-column prop="integral" label="用户积分" />
-      <el-table-column prop="birthday" label="生日" />
+      <el-table-column  prop="createTime" label="创建日期" width="140">
-
-      <el-table-column prop="authStatus" label="认证状态" />
-      <el-table-column prop="status" label="用户状态" />
-      <el-table-column  prop="createTime" label="注册时间" width="140">
         <template slot-scope="scope">
           <span>{{ scope.row.createTime }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div @click="onStatus(scope.row.uid,scope.row.status)">
+            <el-tag v-if="scope.row.status == 1" style="cursor: pointer" :type="''">正常</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">禁用</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户来源" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.userType == 'wechat'">公众号</el-tag>
+            <el-tag v-else-if="scope.row.userType == 'routine'">小程序</el-tag>
+            <el-tag v-else>H5</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="spreadUid" label="推荐人" />
+      <el-table-column prop="payCount" label="购买次数" />
+      <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="215" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+            size="mini"
+            type="danger"
+            @click="editD(scope.row)"
+          >查看下级</el-button>
+          <el-dropdown size="mini" split-button type="primary" trigger="click">
+            操作
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <el-button
+                  v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+                  size="mini"
+                  type="primary"
+                  @click="edit(scope.row)"
+                >修改用户</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-button
+                  v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+                  size="mini"
+                  type="primary"
+                  @click="editP(scope.row)"
+                >修改余额</el-button>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
     </el-table>
     <!--分页组件-->
     <el-pagination