加入列表

客户端/齐越慧眼/齐越慧眼/Windows/CompetingWindow.xaml.cs

@@ -600,16 +600,32 @@ namespace 齐越慧眼.Windows
             topPanel.Visibility = Visibility.Visible;
         }
 
-        private void btn_save_Click(object sender, RoutedEventArgs e)
+        private async void btn_save_Click(object sender, RoutedEventArgs e)
         {
-            if (ApiHelper.UpdateItemCompeting(CompetingWindowViewModel.Instance.ItemList.ToList(), CompetingWindowViewModel.Instance.Item.Id))
+            try
             {
-                this.DialogResult = true;
+                var result = await web.EvaluateScriptAsPromiseAsync("return window.checkCanSave()");
+
+                if (result.Success)
+                {
+                    if ((bool)result.Result)
+                    {
+                        if (ApiHelper.UpdateItemCompeting(CompetingWindowViewModel.Instance.ItemList.ToList(), CompetingWindowViewModel.Instance.Item.Id))
+                        {
+                            this.DialogResult = true;
+                        }
+                        else
+                        {
+                            WpfNoticeMsg.NoticeMessage.Show(this, "保存失败！");
+                        }
+                    }
+                }
             }
-            else
+            catch
             {
-                WpfNoticeMsg.NoticeMessage.Show(this,"保存失败！");
+                WpfNoticeMsg.NoticeMessage.Show(this, "保存失败！");
             }
+
         }
     }
 

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/competing/Index.vue

@@ -114,12 +114,12 @@
             </div>
               最强武将战力:{{getTop1Comment(item.CompetingItems)}}
 
-            <div style="color:#D7D7D7;">
+            <div >
               猛将数量 ：
             {{getTop1Data(item.CompetingItems)[1]}}
             </div>
              
-            <div style="color:#D7D7D7;">
+            <div>
               猛将最低价： 
             {{getTop1Data(item.CompetingItems)[2]}}
           </div>
@@ -258,10 +258,12 @@ export default {
         }
         return [text,count,price]
       }
-      return ['优',0,0]
+      return ['-',0,0]
     },
     getCommentNeed(items){
-      var result=""
+      var result="-"
+      if(items==undefined||items.length==0)
+        return result
       if(items.filter(c=>c.CommentCount=="500+").length<2&&items.filter(c=>c.CommentNumber>=1000).length==0)
       {
         result="100+"

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/competing/List.vue

@@ -18,8 +18,8 @@
             <span>{{ text }}</span>
           </div>
           <div v-else>
-            <a-select v-model="record.Title">
+            <a-select v-model="record.isEmpty" style="min-width: 100px;" @change="(e,s)=>{dataChange(e,s,record)}">
-              <a-select-option :value="null">无更多竞品</a-select-option>
+              <a-select-option :value="false">无更多竞品</a-select-option>
             </a-select>
           </div>
       </div>
@@ -55,7 +55,7 @@ export default {
             title: 'SKU名称',
             dataIndex: 'Title',
             width:'280px',
-            // scopedSlots: { customRender: 'Title' }
+            scopedSlots: { customRender: 'Title' }
           },
           {
             title: '价格',
@@ -92,16 +92,21 @@ export default {
     this.getDatas();
   },
   methods: {
+    dataChange(e,s,record)
+    {
+      console.log(e,s,record)
+      record.isEmpty=false
+    },
     getDatas() {
       hyCoreModel.getData().then((res) => {
-        // if(res.length<20)
+        if(res.length<20)
-        // {
+        {
-        //   var len=20-res.length
+          var len=20-res.length
-        //   for(var i =0;i<len;i++)
+          for(var i =0;i<len;i++)
-        //   {
+          {
-        //     res.push({Title:undefined,isEmpty:true})
+            res.push({Title:undefined,isEmpty:true})
-        //   }
+          }
-        // }
+        }
         this.datas = res;
       });
     },
@@ -122,10 +127,13 @@ export default {
         })
     },
     checkCanSave(){
-      if(this.datas.filter(c=>c.Title==undefined).length>0)
+      if(this.datas.filter(c=>c.isEmpty==true).length>0){
-      return false
+          this.$message.error(`需要查找20个竞品,确定无更多竞品\r\n请在"SKU名称"项填写"无更多竞品"`);
-      else
+        return false
+      }
+      else{
       return true
+    }
     },
     saveData() {
       hyCoreModel.saveData().then((isOk) => {