yfh hace 1 día
padre
commit
d335075fee

+ 3 - 1
.env.prod-bly

@@ -1,5 +1,7 @@
 # 页面标题
-VUE_APP_TITLE = 倍力优会员商城私域平台
+VUE_APP_TITLE =倍力优会员商城平台
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =倍力优会员商城平台
 # 公司名称
 VUE_APP_COMPANY_NAME = 倍力优(北京)健康产业科技有限公司
 # ICP备案号

+ 8 - 8
src/api/hisStore/city.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 查询城市列表
 export function listCity(query) {
   return request({
-    url: '/store/store/city/list',
+    url: '/store/city/list',
     method: 'get',
     params: query
   })
 }
 export function getAllList(query) {
   return request({
-    url: '/store/store/city/getAllList',
+    url: '/store/city/getAllList',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function getAllList(query) {
 
 export function getCitys() {
   return request({
-    url: '/store/store/city/getCitys',
+    url: '/store/city/getCitys',
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getCitys() {
 // 查询城市详细
 export function getCity(id) {
   return request({
-    url: '/store/store/city/' + id,
+    url: '/store/city/' + id,
     method: 'get'
   })
 }
@@ -36,7 +36,7 @@ export function getCity(id) {
 // 新增城市
 export function addCity(data) {
   return request({
-    url: '/store/store/city',
+    url: '/store/city',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function addCity(data) {
 // 修改城市
 export function updateCity(data) {
   return request({
-    url: '/store/store/city',
+    url: '/store/city',
     method: 'put',
     data: data
   })
@@ -54,7 +54,7 @@ export function updateCity(data) {
 // 删除城市
 export function delCity(id) {
   return request({
-    url: '/store/store/city/' + id,
+    url: '/store/city/' + id,
     method: 'delete'
   })
 }
@@ -62,7 +62,7 @@ export function delCity(id) {
 // 导出城市
 export function exportCity(query) {
   return request({
-    url: '/store/store/city/export',
+    url: '/store/city/export',
     method: 'get',
     params: query
   })

+ 3 - 3
src/views/his/storeProduct/index.vue

@@ -836,9 +836,9 @@ export default {
         specType: [
          { required: true, message: "规格不能为空", trigger: "blur" }
        ],
-        storeId: [
-         { required: true, message: "所属店铺不能为空", trigger: "blur" }
-       ],
+       //  storeId: [
+       //   { required: true, message: "所属店铺不能为空", trigger: "blur" }
+       // ],
         productType: [
          { required: true, message: "商品类型不能为空", trigger: "blur" }
        ],

+ 265 - 0
src/views/hisStore/userBill/index.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+       <el-form-item label="会员昵称" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          placeholder="请输入会员昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRange" size="small" style="width: 205.4px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['store:userBill:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table  height="500" border v-loading="loading" :data="userBillList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="会员昵称" align="center" prop="nickname" />
+      <el-table-column label="会员手机号" align="center" prop="phone" />
+      <el-table-column label="账单标题" align="center" prop="title" />
+      <el-table-column label="明细分类 " align="center" prop="category" />
+      <el-table-column label="明细类型" align="center" prop="type" />
+      <el-table-column label="明细数字" align="center" prop="number" />
+      <el-table-column label="余额" align="center" prop="balance" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import { listUserBill, getUserBill, delUserBill, addUserBill, updateUserBill, exportUserBill } from "@/api/his/userBill";
+
+export default {
+  name: "UserBill",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      dateRange:[],
+      // 总条数
+      total: 0,
+      // 用户账单表格数据
+      userBillList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        businessId: null,
+        category: null,
+        billType: null,
+        type: null,
+        title: null,
+        number: null,
+        balance: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户uid不能为空", trigger: "blur" }
+        ],
+        businessId: [
+          { required: true, message: "关联id不能为空", trigger: "blur" }
+        ],
+        billType: [
+          { required: true, message: "类型 0 = 支出 1 = 获得不能为空", trigger: "change" }
+        ],
+        title: [
+          { required: true, message: "账单标题不能为空", trigger: "blur" }
+        ],
+        number: [
+          { required: true, message: "明细数字不能为空", trigger: "blur" }
+        ],
+        balance: [
+          { required: true, message: "剩余不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "添加时间不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "0 = 带确定 1 = 有效 -1 = 无效不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户账单列表 */
+    getList() {
+      this.loading = true;
+      listUserBill(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.userBillList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        businessId: null,
+        category: null,
+        billType: null,
+        type: null,
+        title: null,
+        number: null,
+        balance: null,
+        remark: null,
+        createTime: null,
+        updateTime: null,
+        status: 0
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户账单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getUserBill(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改用户账单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateUserBill(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addUserBill(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除用户账单编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delUserBill(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有用户账单数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportUserBill(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>