合并

src/config/api.js

@@ -1,4 +1,4 @@
-const commPrefix = '/api/admin/'
+const commPrefix = '/api/admin'
 
 const apis = {
   system: {
@@ -127,6 +127,20 @@ const apis = {
       url: `${commPrefix}/customer/add`
     }
   },
+  goods:{
+    list:{
+      method:'get',
+      url: `${commPrefix}/taGoods`
+    },
+    detail: {
+      method: 'get',
+      url: `${commPrefix}/taGoods/:id`
+    },
+    add: {
+      method: 'post',
+      url: `${commPrefix}/customer/add`
+    }
+  },
   newsType: {
     list: {
       method: 'get',

src/store/index.js

@@ -3,7 +3,6 @@ import Vuex from 'vuex'
 import system from './system'
 import apartment from './modules/apartment'
 import news from './modules/news'
-
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -15,6 +14,7 @@ const store = new Vuex.Store({
     customer: require('./modules/customer').default,
     building: require('./modules/building').default,
     img: require('./modules/img').default,
+    goods: require('./modules/goods').default,
     news
   }
 })

src/store/modules/goods.js

@@ -0,0 +1,132 @@
+import request from '../../utils/request'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    dynamics: {},
+    detail: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.dynamics = payload
+    },
+    updateDetail (state, payload) {
+      state.detail = payload
+    }
+  },
+  actions: {
+    setDetailNull ({ commit }) {
+      commit('updateDetail', {})
+    },
+    getGoods ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.list,
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    getGoodsDetail ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.detail,
+          urlData: payload,
+        }).then((data) => {
+          commit('updateDetail', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    addDynamics (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.add, 
+          data: payload.detail,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    editDynamics (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.edit,
+          data: payload.detail,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    deleteDynamics (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.delete,
+          ...payload
+        }).then(() => {
+          resolve()
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
+    publicDynamic (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.public,
+          urlData: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    cancelDynamic (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.cancel,
+          urlData: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    }
+  }
+}

src/views/goods/edit.vue

@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <div class="form-wrapper">
+      <el-form label-width="100px" :model="detail">
+        <el-form-item label="商品图片：">
+          <el-upload
+            class="avatar-uploader"
+            :action="upFileUrl"
+            name='file'
+            :show-file-list="false"
+            :before-upload="beforeImgUpload"
+            :on-success="handleAvatarSuccess">
+            <img v-if="detail.imgUrl" :src="detail.imgUrl" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="商品名称：">
+          <el-input v-model="detail.goodsName"></el-input>
+        </el-form-item>
+        <el-form-item label="所需积分：">
+          <el-input v-model="detail.pointPrice"></el-input>
+        </el-form-item>
+        <el-form-item label="商品数量：">
+          <el-input v-model="detail.totalNum"></el-input>
+        </el-form-item>
+        <el-form-item label="剩余数量：">
+          <el-input v-model="detail.inventory"></el-input>
+        </el-form-item>
+        <el-form-item label="授权项目：">
+          <el-select v-model="detail.buildings" placeholder="请选择">
+            <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品详情：">
+            <div id="websiteEditorElem" style="height: 400px"></div>
+        </el-form-item>
+        <el-form-item label="状态：">
+          <el-radio-group v-model="detail.status">
+            <el-radio-button :label="0">禁用</el-radio-button>
+            <el-radio-button :label="1">启用</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="领取地址：">
+          <el-input v-model="detail.tel"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm">保存</el-button>
+          <el-button @click="$router.go(-1)">返回</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+import apis from "../../config/api";
+import E from "wangeditor";
+
+const { mapActions: mapGoodsActions } = createNamespacedHelpers("goods");
+const {
+  mapState: mapBuildingState,
+  mapActions: mapBuildingActions
+} = createNamespacedHelpers("building");
+export default {
+  name: "goodsEdit",
+  data() {
+    return {
+      upFileUrl: apis.file.upload.url,
+      detail: {}
+    };
+  },
+  created() {
+    this.init();
+  },
+  computed: {
+    ...mapBuildingState({
+      buildings: x => x.buildings
+    })
+  },
+  methods: {
+    ...mapBuildingActions(["getBuildings"]),
+    ...mapGoodsActions(["getGoodsDetail", "editConsultant"]),
+    init() {
+      if (this.$route.params.id) {
+        this.getGoodsDetail({ id: this.$route.params.id }).then(data => {
+          this.detail = data;
+        });
+      }
+    },
+    beforeImgUpload(file) {
+      if (file.type !== "image/jpeg" && file.type !== "image/png") {
+        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+        return false;
+      }
+
+      this.showLoadding("上传中...");
+      return true;
+    },
+
+    handleAvatarSuccess(res) {
+      this.detail.photo = res.data;
+      this.hideLoadding();
+    },
+
+    submitForm() {
+      this.showLoadding("保存中...");
+      this.editConsultant(this.detail)
+        .then(res => {
+          if (res.personId) {
+            this.detail = res;
+          }
+
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+        })
+        .catch(err => {
+          this.hideLoadding();
+          this.$notify.error(err.message);
+        });
+    },
+
+    showLoadding(text) {
+      this.loading = this.$loading({
+        text,
+        lock: true,
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.7)"
+      });
+    },
+
+    hideLoadding() {
+      if (this.loading) this.loading.close();
+    }
+  },
+  mounted() {
+    const _that = this;
+    const phoneEditor = new E("#websiteEditorElem");
+    phoneEditor.customConfig.onchange = function(html) {
+      _that.dynamic = { ..._that.dynamic, url: html };
+    };
+    // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
+    // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
+
+    phoneEditor.customConfig.customUploadImg = function(files, insert) {
+      _that.uploadImg(files[0]).then(data => {
+        insert(data);
+      });
+    };
+    phoneEditor.customConfig.menus = [
+      "head", // 标题
+      "bold", // 粗体
+      "fontSize", // 字号
+      "fontName", // 字体
+      "italic", // 斜体
+      "underline", // 下划线
+      "strikeThrough", // 删除线
+      "foreColor", // 文字颜色
+      "backColor", // 背景颜色
+      "justify", // 对齐方式
+      "image" // 插入图片
+    ];
+    phoneEditor.create()
+
+    // this.getBuildings({
+    //   pageNum: 1,
+    //   pageSize: 100
+    // }).then(() => {
+    //   if ((this.$route.query.id || "") !== "") {
+    //     this.getDetail({ id: this.$route.query.id }).then(data => {
+    //       phoneEditor.txt.html(data.url);
+    //     });
+    //   }
+    // });
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.form-wrapper {
+  width: 60%;
+}
+</style>
+
+<style lang="scss">
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/goods/list.vue

@@ -0,0 +1,188 @@
+<template>
+<div class="list">
+        <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
+        </div>
+        <ul>
+          <li>
+            <el-input v-model="filterData.goodsName" placeholder="商品名称"></el-input>
+          </li>
+
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">查询</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+  <el-table
+    :data="list || []"
+    style="width: 100%">
+    <el-table-column
+      label="商品图片">
+      <template slot-scope="scope">
+          <div class="header">
+            <img :src="scope.row.imgUrl" alt="" />
+          </div>
+        </template>
+    </el-table-column>
+    <el-table-column
+      prop="goodsName"
+      label="商品名称">
+    </el-table-column>
+    <el-table-column
+      prop="pointPrice"
+      label="所需积分">
+    </el-table-column>
+    <el-table-column
+      prop="totalNum"
+      label="总数量">
+    </el-table-column>
+    <el-table-column
+      label="已经兑换数量">
+      <template slot-scope="scope">
+        <span  >{{scope.row.totalNum -scope.row.inventory }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="inventory"
+      label="剩余数量">
+    </el-table-column>
+    <el-table-column   label="状态">
+      <template slot-scope="scope">
+        <span :style="{color:(scope.row.status == 1?'':'red')}" >{{scope.row.status == 1 ? '已上架' : '未上架'}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      fixed="right"
+      label="操作">
+      <template slot-scope="scope">
+        <el-button type="text" @click="toDetail(scope.row)" size="small">{{scope.row.status == 1?'下架':'上架'}}</el-button>
+        <el-button type="text" @click="toDetail(scope.row)" size="small">编辑</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    small
+    style="margin-top:10px;"
+    layout="prev, pager, next"
+    :current-page.sync="pageNavi.current"
+    :pageSize="pageNavi.size"
+    :total="pageNavi.total || 0"
+    @current-change="getConsultants"
+  >
+  </el-pagination>
+</div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+
+const { mapActions: mapGoodsActions } = createNamespacedHelpers("goods");
+
+export default {
+  name: "goods-list",
+  data() {
+    return {
+      filterData: {
+        goodsName: ""
+      },
+      list: [],
+      pageNavi: {
+        current: 1,
+        size: 20,
+        total: 0
+      }
+    };
+  },
+  computed: {},
+  methods: {
+    ...mapGoodsActions(["getGoods"]),
+    getList() {
+      const pageNumber = this.pageNavi.current || 1;
+      const pageSize = this.pageNavi.size;
+
+      this.getGoods({
+        ...this.filterData,
+        pageNumber,
+        pageSize
+      })
+        .then(res => {
+          const { records, ...pageNavi } = res;
+
+          this.list = records;
+          this.pageNavi = pageNavi;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    addDynamic() {
+      this.$router.push({ name: "consultant.list" });
+    },
+    toDetail(row) {
+      this.$router.push({
+        name: "goods.edit",
+        params: { id: row.goodsId }
+      });
+    },
+    search() {
+      this.pageNavi.current = 1;
+      this.getList();
+    },
+    newPage(page) {
+      this.$router.replace({ name: "consultant.list", query: { page } });
+    }
+  },
+  created() {
+    this.pageNavi.current = this.$route.query.page || 1;
+
+    this.getList();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  .header {
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+  }
+  img {
+      width: 100%;
+      height: 100%;
+    }
+}
+.system-table-search {
+  width: calc(100% - 40px);
+  margin: 20px auto 0;
+}
+
+.system-table-search li {
+  margin-right: 20px;
+}
+
+.system-table-search ul {
+  font-size: 0;
+  white-space: nowrap;
+}
+
+.system-table-search ul > li {
+  display: inline-block;
+}
+
+.flex-h {
+  display: flex;
+  align-items: center;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

src/views/index.js

@@ -192,6 +192,63 @@ const pages = [
       }
     ]
   },
+  {
+    path: 'pointsmall',
+    name: 'pointsmall',
+    redirect: 'pointsmall/list',
+    component: () => import('./index.vue'),
+    meta: {
+      menuShow: true,
+      title: '积分商城',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'goods.list',
+        component: () => import('./goods/list.vue'),
+        meta: {
+          menuShow: true,
+          title: '商品列表',
+        },
+      },
+      {
+        path: 'goods/edit',
+        name: 'goods.edit',
+        component: () => import('./goods/edit.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑商品',
+        },
+      },
+      {
+        path: 'edit/:id?',
+        name: 'pointsmall.edit',
+        component: () => import('./consultant/edit.vue'),
+        meta: {
+          menuShow: true,
+          title: '积分获取',
+        },
+      },
+      {
+        path: 'edit/:id?',
+        name: 'consultant.edit',
+        component: () => import('./consultant/edit.vue'),
+        meta: {
+          menuShow: true,
+          title: '商品核销',
+        },
+      },
+      {
+        path: 'edit/:id?',
+        name: 'consultant.edit',
+        component: () => import('./consultant/edit.vue'),
+        meta: {
+          menuShow: true,
+          title: '兑换记录',
+        },
+      },
+    ]
+  },
 ]
 
 const flatten = (rts, parents = []) => {