新增商品列表，商品修改页面

src/components/Details.vue

@@ -542,6 +542,9 @@ export default {
           case "/CapitalAllocationDetail": //资金调拨
           path = "/CapitalAllocation";
           break;
+          case "/addIntegralMall": //新增商品
+          path = "/IntegralMall";
+          break;
       }
 
       //找到Root
@@ -756,6 +759,9 @@ export default {
           case "/CapitalAllocationDetail": //资金调拨
           path = "/CapitalAllocation";
           break;
+          case "/addIntegralMall": //新增商品
+          path = "/IntegralMall";
+          break;
       }
 
       //找到Root

src/components/activity/LuckyDraw.vue

@@ -602,9 +602,9 @@ export default {
         this.$message.info(this.$t('tips.shangchuanzhong'))
         this.UploadSelfFileT(path, newArr, x => {
             let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
-            this.addMsg.image = this.domainManager().ViittoFileUrl + x.data.FilePath
+            this.addMsg.icon = this.domainManager().ViittoFileUrl + x.data.FilePath
             this.$message.success(this.$t('tips.scchenggong'));
-            this.$forceUpdate();
+            // this.$forceUpdate();
         });
     },
   }

src/components/administrative/Announcement.vue

@@ -365,7 +365,7 @@
 						this.addMsg.Title=res.data.data.Title
 						this.addMsg.Content=res.data.data.Content
 						this.uploadList=[]
-						if(res.data.data.File_url!=''){
+						if(res.data.data.File_url){
 							let _arr=JSON.parse(res.data.data.File_url);
 							if(_arr.length>0){
 								_arr.forEach(item=>{
@@ -383,10 +383,12 @@
 				this.apipost('User_get_NoticeGet',{noticeId:id},res=>{
 					if(res.data.resultCode == 1) {
 						this.detailMessage=res.data.data
+						if(res.data.data.File_url){
 					    this.downLoadList=JSON.parse(res.data.data.File_url)
 					    this.downLoadList.forEach(item=>{
 					    	item.Url=this.domainManager().ViittoFileUrl+item.Url
 							})
+						}
 					}else{
 						this.$message.error(res.data.message)	
 					}
@@ -439,7 +441,10 @@
 				this.resetForm('addMsg');
 			},
 			resetForm(formName) { //弹出框取消 初始化谈框内表单
+				if (formName) {
 					this.$refs[formName].resetFields();
+				}
+				
 				this.addMsg.Id='-1'
 			}			
 		}

src/router/config.js

@@ -3274,6 +3274,30 @@ export default {
                                 title: '当地游'
                             }
                         },
+                        {
+                            path: '/CommodityType',
+                            name: 'CommodityType',
+                            component: resolve => require(['@/components/activity/CommodityType'], resolve),
+                            meta: {
+                                title: '商品类型'
+                            }
+                        },                       
+                        {
+                            path: '/IntegralMall',
+                            name: 'IntegralMall',
+                            component: resolve => require(['@/components/activity/IntegralMall'], resolve),
+                            meta: {
+                                title: '商品列表'
+                            }
+                        },
+                        {
+                            path: '/addIntegralMall',
+                            name: 'addIntegralMall',
+                            component: resolve => require(['@/components/activity/addIntegralMall'], resolve),
+                            meta: {
+                                title: '新增商品'
+                            }
+                        },
                     ]
                 },
                 {