Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/goodsManager/goodManager/edit.vue

     <form class="mainForm">
       <ul>
          <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="Case" placeholder="请选择">
                 :on-exceed="exceed">
                 <i class="el-icon-plus"></i>
               </el-upload>
-              <el-dialog :visible.sync="dialogVisible">
-                <img width="100%" :src="imgs" alt="">
-              </el-dialog>
             </div>
           </div>
         </li>
           <span>商品规格：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="detail.specs" multiple placeholder="请选择" style="width:100%;">
+              <el-select v-model="detailSpecs" multiple placeholder="请选择" style="width:100%;">
                 <el-option
                   v-for="item in specs.list"
                   :key="item.SpecId"
   name: '',
   data () {
     return {
-      imgs: '',
-      imgsArr: [],
-      limit: 1,
+      limit: 2,
       dialogVisible: false,
+      infoSpecs: null,
     }
   },
   components: {},
         this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
         this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
       }
-    }
+    },
+    detailSpecs: {
+      get () {
+        return this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId)
+      },
+      set (val) {
+        this.infoSpecs = val
+      },
+    },
+    imgsArr () {
+      return (this.detail.Images || []).map(x => {
+        return {...x, url: x.url || x.ImgUrl}
+      })
+    },
   },
   methods: {
     ...mapGoodsActions([
       'GetGoodSpecs',
     ]),
     submit () {
-      this.detail.specs = JSON.stringify(this.detail.specs.map(x => ({SpecId: x, GoodsPrice: this.detail.Price})))
-      if ((this.detail.EquipmentId || '') === '') {
+      this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({SpecId: x, GoodsPrice: this.detail.Price})))
+      this.detail.images = this.detail.Images.map(x => {
+        if (x.response) {
+          return x.response.result.url
+        } else {
+          return x.ImgUrl
+        }
+      }).join(',')
+      if ((this.detail.GoodsId || '') === '') {
         this.detail.OrgId = this.orgid
         if (!this.detail.CaseId || this.detail.CaseId === '') {
           this.detail.CaseId = this.caseid
         }
-        this.detail.images = this.imgs
         this.AddGoods(this.detail)
       } else {
         this.UpdateGoods(this.detail)
       this.$router.go(-1)
     },
     handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
+      this.detail.Images = fileList
     },
     handleRemove (file, fileList) {
-      this.imgsArr = fileList
+      this.detail.Images = fileList
     },
     exceed () {
       this.$message({

src/pages/system/goodsManager/goodManager/index.vue

     </div>
     <div class="system-table-box">
       <el-table :data="goods.list" stripe style="width: 100%">
-        <el-table-column prop="RoleName" label="角色名">
+        <el-table-column prop="GoodsName" label="商品名称">
         </el-table-column>
-        <el-table-column label="创建时间" width="300">
+        <el-table-column label="图片" width="300">
           <template slot-scope="scope">
-            <label>{{FormatDate(scope.row.CreateDate)}}</label>
+            <img :src="(scope.row.Images[0] || {}).ImgUrl" style="width:200px;" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="Price" label="价格">
+        </el-table-column>
+        <el-table-column label="类型">
+          <template slot-scope="scope">
+            <label>{{getTypeName(scope.row.TypeId)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格">
+          <template slot-scope="scope">
+            <label>{{getSpecNames(scope.row.Specs)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column label="案场">
+          <template slot-scope="scope">
+            <label>{{getCaseName(scope.row.CaseId)}}</label>
           </template>
         </el-table-column>
         <el-table-column fixed='right' label="操作" width="300">
     ...mapGoodsActions([
       'GetGoodsList',
       'GetGoodTypes',
+      'DelGoods',
     ]),
+    getTypeName (typeid) {
+      return (this.types.list.filter(x => x.TypeId === typeid)[0] || {}).TypeName
+    },
+    getSpecNames (specs) {
+      return (specs || []).map(x => x.SpecName).join(',')
+    },
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
       console.log(`每页 ${val} 条`)
     },
     handleCurrentChange (val) {
-      this.GetRolesList({ page: val })
-      console.log(`当前页: ${val}`)
+      this.postData.page = this.currentPage
+      this.getList()
     },
     handleEdit (index, row) {
       // 编辑
-      this.$router.push({ name: 'editGoods', query: { id: row.GooddId } })
+      this.$router.push({ name: 'editGoods', query: { id: row.GoodsId } })
     },
     handleDelete (index, row) {
       // 删除
       console.log(index, row)
-      this.$confirm('确认删除此角色?', '提示', {
+      this.$confirm('确认删除此商品?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          this.DelRole({id: row.RoleId, callback: this.delCallBack})
+          this.DelGoods({id: row.GoodsId, callback: this.delCallBack})
         })
         .catch(() => {
           this.$message({
       this.$router.push({ name: 'editGoods' })
     },
   },
-  mounted () {
+  created () {
     this.GetGoodTypes({ pagesize: 1000, caseid: this.CaseId })
     this.$nextTick(function () {
       this.getList()

src/store/goods/goods.js

         method: api.goodsManager.updateGoods.method,
         data: {
           ...payload
+        },
+        urlData: {
+          id: payload.GoodsId,
         }
       }).then(res => {
       })

src/util/ajax.js

 import axios from 'axios'
 import qs from 'qs'
 import router from '../router'
+import { Message } from 'element-ui'
 
 const Axios = axios.create({
   timeout: 60000,
   return new Promise((resolve, reject) => {
     Axios(...args).then(({ data }) => {
       // console.log(111)
-      const { code, result } = data
+      const { code, message, result } = data
       if (code === 200) {
         resolve(result)
       } else if (code === 401) {
         router.push({ name: 'login' })
       } else {
-        // Message({
-        //   message: message,
-        //   type: 'error'
-        // })
+        Message({
+          message: message,
+          type: 'error'
+        })
       }
     }).catch(reject)
   })