订单

src/api/system/shop/orders.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询订单列表
+export function listOrders(query) {
+  return request({
+    url: '/system/shop/orders/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单详细
+export function getOrders(id) {
+  return request({
+    url: '/system/shop/orders/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单
+export function addOrders(data) {
+  return request({
+    url: '/system/shop/orders',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单
+export function updateOrders(data) {
+  return request({
+    url: '/system/shop/orders',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单
+export function delOrders(id) {
+  return request({
+    url: '/system/shop/orders/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单
+export function exportOrders(query) {
+  return request({
+    url: '/system/shop/orders/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/system/news/edit.vue

@@ -5,13 +5,11 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-loading="loading">
         <el-form-item label="资讯标题" prop="title"><el-input v-model="form.title" placeholder="请输入资讯标题" clearable /></el-form-item>
         <el-form-item label="封面图" prop="pic">
-          <el-upload action="#" :show-file-list="false" :http-request="requestUpload" accept=".jpg,.jpeg,.png,.gif" :before-upload="beforeUpload">
-            <el-button icon="el-icon-scissors">选取图片</el-button>
-          </el-upload>
-          <el-image v-if="form.pic" :fit="'contain'" class="mt10 lsw_square" style="max-width:10%;" :src="form.pic" :preview-src-list="[form.pic]"></el-image>
+          <el-button icon="el-icon-scissors" @click="getImg()">选取图片</el-button>
+          <el-image v-if="form.pic" :fit="'contain'" style="max-width:10%;display: block;margin-top: 10px;" :src="form.pic" :preview-src-list="[form.pic]"></el-image>
         </el-form-item>
         <div class="meditor">
-          <el-form-item label="资讯内容" prop="contents"><Editor v-model="form.contents" :min-height="292"/></el-form-item>
+          <el-form-item label="资讯内容" prop="contents"><Editor v-model="form.contents" :min-height="292" /></el-form-item>
         </div>
         <el-form-item label="状态 " prop="state">
           <el-radio-group v-model="form.state">
@@ -76,28 +74,11 @@ export default {
         });
       }
     },
-    // 覆盖默认的上传行为
-    requestUpload() {},
-    // 上传预处理
-    beforeUpload(file) {
-      if (file.type.indexOf('image/') == -1) {
-        this.msgError('文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。');
-        return;
-      }
-      const reader = new FileReader();
-      reader.readAsDataURL(file);
-      reader.onload = () => {
-        this.show = true;
-        this.$nextTick(() => {
-          this.$refs.upload.editCropper(reader.result);
-        });
-      };
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.loading=true;
+          this.loading = true;
           if (this.form.id != null) {
             updateNews(this.form).then(response => {
               if (response.code === 200) {
@@ -118,13 +99,21 @@ export default {
         }
       });
     },
+    //选取图片
+    getImg() {
+      this.show = true;
+      this.$nextTick(() => {
+        this.$refs.upload.editCropper();
+      });
+    },
+    //设置图片
     setImg(img) {
       this.form.pic = img;
     },
     // 关闭弹窗表单重置
     close() {
       this.resetForm('form');
-      this.form = {pic:''};
+      this.form = { pic: '' };
     }
   }
 };

src/views/system/news/index.vue

@@ -26,7 +26,7 @@
           <el-image class="lsw_square" :fit="'contain'" style="max-width:80px;" :src="scope.row.pic" :preview-src-list="[scope.row.pic]"></el-image>
         </template>
       </el-table-column>
-      <el-table-column label="阅读量" align="center" prop="views" />
+      <el-table-column label="阅读量" align="center" prop="views" width="120"/>
       <el-table-column label="状态" align="center" prop="state" sortable width="120">
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.state == 1">停用</el-tag>

src/views/system/shop/goods/index.vue

@@ -33,12 +33,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="商品标题" align="center" prop="title" />
       <el-table-column label="商品类型" align="center" prop="tbGoodsType.name" />
-      <el-table-column label="商品价格" align="center" prop="price" />
       <el-table-column label="商品图片" align="center">
         <template slot-scope="scope">
           <el-image class="lsw_square" :fit="'contain'" style="max-width:80px;" :src="scope.row.pic" :preview-src-list="[scope.row.pic]"></el-image>
         </template>
       </el-table-column>
+      <el-table-column label="商品价格" align="center" prop="price" />
       <el-table-column label="状态" align="center" prop="state" sortable width="120">
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.state == 1">下架</el-tag>

src/views/system/shop/orders/edit.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="app-container">
+    <!-- 添加或修改订单对话框 -->
+    <el-dialog :title="form.id?'编辑':'新增'"  :close-on-click-modal="false" :visible.sync="visible" @close="close" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-loading="loading">
+        <el-form-item label="用户id" prop="appUserId">
+          <el-input v-model="form.appUserId" placeholder="请输入用户id" clearable/>
+        </el-form-item>
+        <el-form-item label="商品id" prop="goodsId">
+          <el-input v-model="form.goodsId" placeholder="请输入商品id" clearable/>
+        </el-form-item>
+        <el-form-item label="商品标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入商品标题" clearable/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="visible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOrders, getOrders, delOrders, addOrders, updateOrders, exportOrders } from "@/api/system/shop/orders";
+import { getToken } from '@/utils/auth';
+export default {
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      visible: false,
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        orderNum: [{ required: true, message: "订单编号不能为空", trigger: "blur" }],
+        createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+  },
+  methods: {
+    /** 查询订单列表 */
+    init(id) {
+        this.visible = true;
+        if (id!='') {
+            this.loading = true;
+            getOrders(id).then(response => {
+                this.form = response.data;
+                this.loading = false;
+            });
+        }
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOrders(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.$emit('refresh'); //刷新父组件数据
+                this.visible = false;
+              }
+            });
+          } else {
+            addOrders(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.$emit('refresh'); //刷新父组件数据
+                this.visible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    // 关闭弹窗表单重置
+    close() {
+        this.resetForm('form');
+        this.form = {
+     }
+    },
+  }
+};
+</script>

src/views/system/shop/orders/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="手机号" prop="mobile"><el-input v-model="queryParams.mobile" placeholder="请输入商品标题" clearable @keyup.enter.native="handleQuery" /></el-form-item>
+      <el-form-item label="订单编号" prop="orderNum">
+        <el-input v-model="queryParams.orderNum" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="payCancelTime">
+        <el-date-picker
+          clearable
+          v-model="dateRange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          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" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="handleOp" v-hasPermi="['system/shop:orders:edit']">操作</el-button>
+      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="handleDelete" v-hasPermi="['system/shop:orders:remove']">批量删除</el-button>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table v-loading="loading" border :data="ordersList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户昵称" align="center" prop="tbAppUser.nickName" width="150" />
+      <el-table-column label="手机号码" align="center" prop="tbAppUser.mobile" width="150" />
+      <el-table-column label="购买商品" align="center" prop="title" />
+      <el-table-column label="商品类型" align="center" prop="tbGoods.tbGoodsType.name" />
+      <el-table-column label="支付金额" align="center" prop="money" width="90" />
+      <el-table-column label="订单编号" align="center" prop="orderNum" />
+      <el-table-column label="支付方式" align="center" prop="payType" sortable width="120">
+        <template slot-scope="scope">
+          <el-tag type="danger" effect="dark" v-if="scope.row.payType == 1">支付宝</el-tag>
+          <el-tag type="success" effect="dark" v-if="scope.row.payType == 0">微信</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="state" sortable width="120">
+        <template slot-scope="scope">
+          <el-tag type="danger" effect="dark" v-if="scope.row.state == 0">未支付</el-tag>
+          <el-tag type="success" effect="dark" v-if="scope.row.state == 1">进行中</el-tag>
+          <el-tag type="info" effect="dark" v-if="scope.row.state == -1">取消订单</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOp(scope.row)" v-hasPermi="['system/shop:orders:edit']">操作</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system/shop:orders:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+      <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" />
+    <!-- 添加或修改对话框 -->
+    <edit v-if="dialogVisible" ref="dialog" @refresh="getList"></edit>
+  </div>
+</template>
+
+<script>
+import { listOrders, getOrders, delOrders, addOrders, updateOrders, exportOrders } from '@/api/system/shop/orders';
+import edit from './edit';
+export default {
+  components: {
+    edit
+  },
+  data() {
+    return {
+      //新增,修改弹出框
+      dialogVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      // 日期范围
+      dateRange: [],
+      ids: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单表格数据
+      ordersList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mobile:null,
+        orderNum: null,
+        orderByColumn: 'o.id', //排序字段
+        isAsc: 'desc' //排序方式
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单列表 */
+    getList() {
+      this.loading = true;
+      listOrders(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.ordersList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+    },
+    /** 新增,修改按钮操作 */
+    handleOp(row) {
+      this.dialogVisible = true;
+      const ids = row.id || this.ids;
+      this.$nextTick(() => {
+        this.$refs.dialog.init(ids);
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除订单编号为"' + ids + '"的数据项?', '警告', { type: 'warning' })
+        .then(() => {
+          return delOrders(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess('删除成功');
+        });
+    }
+  }
+};
+</script>