xcx

src/pages/system/cardAndCouponManager/couponManager/edit.vue

                 <el-table-column
                   prop="TargetType"
                   label="分类">
+                  <template slot-scope="scope">
+                    {{returnGoodsType(scope.row.TargetType)}}
+                  </template>
                 </el-table-column>
                 <el-table-column label="操作">
                   <template slot-scope="scope">
         page: 1,
         pagesize: 10000
       }).then(() => {
-        if (this.$route.query.id) {
-          this.getCouponById({
-            id: this.$route.query.id
-          }).then((res) => {
-            // console.log(JSON.stringify(res))
-            res.coupon.IsAll = String(res.coupon.IsAll)
-            if (res.coupon.VideoUrl !== '') {
-              this.videoOff = true
-            }
-            this.couponInfo = res.coupon
-          })
-        }
+        this.GetGoodTypes({ pagesize: 1000, caseid: this.$route.query.caseid }).then(() => {
+          if (this.$route.query.id) {
+            this.getCouponById({
+              id: this.$route.query.id
+            }).then((res) => {
+              // console.log(JSON.stringify(res))
+              res.coupon.IsAll = String(res.coupon.IsAll)
+              if (res.coupon.VideoUrl !== '') {
+                this.videoOff = true
+              }
+              this.couponInfo = res.coupon
+            })
+          }
+        })
       })
     })
   },
     }),
     ...mapGoodsState({
       goodsList: x => x.goodsList,
+      goodsTypes: x => x.goodsTypes.list,
     }),
     ...mapCourseState({
       courseList: x => x.courseList,
   methods: {
     ...mapGoodsActions([
       'GetGoodsList',
+      'GetGoodTypes',
     ]),
     ...mapCouponActions([
       'addCoupon',
     ...mapCourseActions([
       'GetCourseList',
     ]),
+    returnGoodsType (val) {
+      for (var n = 0; n < this.goodsTypes.length; n++) {
+        if (this.goodsTypes[n].TypeId === val) {
+          return this.goodsTypes[n].TypeName
+        }
+      }
+    },
     deleteVideo () { // 删除视频
       this.couponInfo.VideoUrl = ''
       this.videoOff = false

src/pages/system/cardAndCouponManager/couponManager/index.vue

       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editCoupon', query: { type: row.CouponTypeId, id: row.CouponId } })
+      this.$router.push({ name: 'editCoupon', query: { type: row.CouponTypeId, id: row.CouponId, caseid: row.CaseId } })
     },
     handleDelete (index, row) { // 删除
       let name = '确认删除渠道“' + row.ChannelName + '”?'

src/store/goods/goods.js

       })
     },
     GetGoodTypes ({ commit }, payload) {
-      ajax(api.goodsManager.getGoodsTypeList.url, {
-        method: api.goodsManager.getGoodsTypeList.method,
-        queryData: {
-          ...payload,
-        }
-      }).then(res => {
-        commit('updateTypes', res)
+      return new Promise((resolve, reject) => {
+        ajax(api.goodsManager.getGoodsTypeList.url, {
+          method: api.goodsManager.getGoodsTypeList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateTypes', res)
+          resolve(res)
+        }).catch(reject)
       })
     },
     GetGoodSpecs ({ commit }, payload) {