goods

src/config/api.js

@@ -138,7 +138,15 @@ const apis = {
     },
     add: {
       method: 'post',
-      url: `${commPrefix}/customer/add`
+      url: `${commPrefix}/taGoods/add`
+    },
+    edit: {
+      method: 'put',
+      url: `${commPrefix}/taGoods`
+    },
+    change: {
+      method: 'put',
+      url: `${commPrefix}/taGoods/change`
     }
   },
   newsType: {

src/store/modules/goods.js

@@ -53,11 +53,11 @@ export default {
         })
       })
     },
-    addDynamics (_, payload) {
+    addGoods (_, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.dynamic.add, 
-          data: payload.detail,
+          ...apis.goods.add, 
+          data: payload,
         }).then((data) => {
           resolve(data)
         }).catch((err) => {
@@ -68,11 +68,11 @@ export default {
         })
       })
     },
-    editDynamics (_, payload) {
+    editGoods (_, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.dynamic.edit,
-          data: payload.detail,
+          ...apis.goods.edit,
+          data: payload,
         }).then((data) => {
           resolve(data)
         }).catch((err) => {
@@ -96,11 +96,11 @@ export default {
         })
       })
     },
-    publicDynamic (_, payload) {
+    changeGoodsStatus (_, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.dynamic.public,
-          urlData: payload,
+          ...apis.goods.change,
+          data: payload,
         }).then((data) => {
           resolve(data)
         }).catch((err) => {

src/views/goods/edit.vue

@@ -2,16 +2,24 @@
   <div>
     <div class="form-wrapper">
       <el-form label-width="100px" :model="detail">
+        <el-form-item label="项目">
+          <el-select v-model="detail.buildingId" placeholder="请选择">
+            <el-option
+                    v-for="item in buildingList"
+                    :key="item.buildingId"
+                    :label="item.buildingName"
+                    :value="item.buildingId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <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>
+                  :headers="uploadHeaders"
+                  :action="upFileUrl"
+                  :show-file-list="false"
+                  :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="商品名称：">
@@ -26,22 +34,21 @@
         <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-select v-model="detail.status" clearable placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="领取地址：">
-          <el-input v-model="detail.tel"></el-input>
+          <el-input v-model="detail.address"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm">保存</el-button>
@@ -67,7 +74,25 @@ export default {
   data() {
     return {
       upFileUrl: apis.file.upload.url,
-      detail: {}
+      detail: {
+        buildingId: '',
+        imgUrl: '',
+        goodsName: '',
+        pointPrice: '',
+        totalNum: '',
+        inventory: '',
+        status: '',
+        address: '',
+        goodsId: '',
+      },
+      options: [{
+          value: '1',
+          label: '已上架'
+        }, {
+          value: '0',
+          label: '已下架'
+        }],
+      buildingList: [],
     };
   },
   created() {
@@ -76,15 +101,30 @@ export default {
   computed: {
     ...mapBuildingState({
       buildings: x => x.buildings
-    })
+    }),
+    uploadHeaders () {
+        const token = localStorage.getItem('x-token') || ''
+        return {
+            Authorization: `Bearer ${token}`
+        }
+    }
   },
   methods: {
     ...mapBuildingActions(["getBuildings"]),
-    ...mapGoodsActions(["getGoodsDetail", "editConsultant"]),
+    ...mapGoodsActions(["getGoodsDetail", "editGoods", "addGoods"]),
     init() {
-      if (this.$route.params.id) {
+      this.detail.goodsId = this.$route.params.id
+      if (this.detail.goodsId !== undefined) {
         this.getGoodsDetail({ id: this.$route.params.id }).then(data => {
-          this.detail = data;
+          this.detail.buildingId = data.buildingId
+          this.detail.imgUrl = data.imgUrl
+          this.detail.goodsName = data.goodsName
+          this.detail.pointPrice = data.pointPrice
+          this.detail.totalNum = data.totalNum
+          this.detail.inventory = data.inventory
+          this.detail.status = data.status
+          this.detail.address = data.address
+          this.detail.goodsId = data.goodsId
         });
       }
     },
@@ -98,21 +138,33 @@ export default {
       return true;
     },
 
-    handleAvatarSuccess(res) {
-      this.detail.photo = res.data;
-      this.hideLoadding();
+    handleAvatarSuccess(res, file) {
+        this.imageUrl = URL.createObjectURL(file.raw);
+        // console.log(res)
+        this.detail.imgUrl = res.data
     },
 
     submitForm() {
       this.showLoadding("保存中...");
-      this.editConsultant(this.detail)
+      if (this.detail.goodsId === '' || this.detail.goodsId === undefined) {
+        console.log('添加')
+        this.addGoods(this.detail)
+        .then(res => {
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+           this.$router.go(-1)
+        })
+        .catch(err => {
+          this.hideLoadding();
+          this.$notify.error(err.message);
+        });
+        return;
+      }
+      this.editGoods(this.detail)
         .then(res => {
-          if (res.personId) {
-            this.detail = res;
-          }
-
           this.hideLoadding();
           this.$notify.info("保存成功");
+           this.$router.go(-1)
         })
         .catch(err => {
           this.hideLoadding();
@@ -162,16 +214,12 @@ export default {
     ];
     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);
-    //     });
-    //   }
-    // });
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100
+    }).then((data) => {
+      this.buildingList = data.records;
+    });
   }
 };
 </script>

src/views/goods/list.vue

@@ -3,7 +3,7 @@
         <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>
+          <el-button size="mini" type="success" @click='addGoods'>新增</el-button>
         </div>
         <ul>
           <li>
@@ -59,7 +59,7 @@
       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="changeStatus(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>
@@ -71,7 +71,7 @@
     :current-page.sync="pageNavi.current"
     :pageSize="pageNavi.size"
     :total="pageNavi.total || 0"
-    @current-change="getConsultants"
+    @current-change="getList"
   >
   </el-pagination>
 </div>
@@ -99,7 +99,7 @@ export default {
   },
   computed: {},
   methods: {
-    ...mapGoodsActions(["getGoods"]),
+    ...mapGoodsActions(["getGoods", "changeGoodsStatus"]),
     getList() {
       const pageNumber = this.pageNavi.current || 1;
       const pageSize = this.pageNavi.size;
@@ -119,8 +119,8 @@ export default {
           this.$notify.error(err.msg || err.message);
         });
     },
-    addDynamic() {
-      this.$router.push({ name: "consultant.list" });
+    addGoods() {
+      this.$router.push({ name: "goods.edit" });
     },
     toDetail(row) {
       this.$router.push({
@@ -128,12 +128,36 @@ export default {
         params: { id: row.goodsId }
       });
     },
+    changeStatus(row) {
+      this.showLoadding("保存中...");
+      this.changeGoodsStatus(row)
+        .then(res => {
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+          this.search();
+        })
+        .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();
+    },
     search() {
       this.pageNavi.current = 1;
       this.getList();
     },
     newPage(page) {
-      this.$router.replace({ name: "consultant.list", query: { page } });
+      this.$router.replace({ name: "goods.list", query: { page } });
     }
   },
   created() {