加入超链接新窗口打开

src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs

@@ -128,9 +128,18 @@ namespace Coldairarrow.Business.HuiYan
                         }
                         else
                         {
-                            if (state == -1)
+                            //竞品分析状态查询
+                            if (state == -1 || state == 9)
                             {
-                                where = where.And(c => c.State != (int)TeamItemState.放弃&&c.State!= (int)TeamItemState.已分析);
+                                //未分析
+                                if (state == -1)
+                                {
+                                    where = where.And(c => c.State != (int)TeamItemState.放弃 && c.CompetingState != (int)CompetingState.已分析);
+                                }
+                                else
+                                //已分析
+                                if (state == 9)
+                                    where = where.And(c => c.State != (int)TeamItemState.放弃 && c.CompetingState == (int)CompetingState.已分析);
                             }
                             else
                                 where = where.And(c => c.State == state);
@@ -604,6 +613,17 @@ namespace Coldairarrow.Business.HuiYan
                 return DeleteItem(id);
             }
 
+            //设置为已分析
+            if (state == 9)
+            {
+                int row = Db.Update<teamitems>(c => c.Id == id, (item) =>
+                {
+                    item.CompetingState = (int)CompetingState.已分析;
+                });
+
+                return Success();
+            }
+
             var priceUserId = Db.GetIQueryable<teamitems>().FirstOrDefault(c => c.Id == id).PriceTaskUserId;
 
            var result= Db.RunTransaction(() =>

src/Coldairarrow.Entity/Enum/teamItemState.cs

@@ -33,4 +33,10 @@ namespace Coldairarrow.Entity.Enum
 
         比价完成=3
     }
+
+    public enum CompetingState
+    {
+        未分析 = 0,
+        已分析 = 1
+    }
 }

src/Coldairarrow.Entity/HuiYan/teamitems.cs

@@ -134,5 +134,9 @@ namespace Coldairarrow.Entity.HuiYan
         /// 比价发布日期
         /// </summary>
         public DateTime? PriceTaskCreateDate { get; set; }
+        /// <summary>
+        /// 竞品分析状态
+        /// </summary>
+        public int CompetingState { get; set; }
     }
 }

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js

@@ -24,7 +24,7 @@ let ipAddress = axios.defaults.baseURL;
 axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
 //axios.defaults.baseURL = 'http://111.230.132.27:8033/';
 
- axios.defaults.baseURL = 'http://localhost:5000/';
+//  axios.defaults.baseURL = 'http://localhost:5000/';
 axios.interceptors.request.use((config) => {
   //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken();
 

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

@@ -103,19 +103,20 @@
         </div>
         <div style="background-color: #f3f2f7;border-bottom: 0px solid #d7d7d7;background: #ffffff;justify-items: center;text-align: center;display: flex;align-items: center; vertical-align: center;height: 178px;">
           <div style="width: 171px;" class="contentDiv">
-            <img :src="item.ItemImg" style="width: 151px;height: 151px;" >
+            <a :href="item.GoodsUrl" target="_black">
+            <img :src="item.ItemImg" style="width: 151px;height: 151px;" ></a>
           </div>
           <div style="width: 177px;" class="contentDiv">
             武将战力 {{getTop1Comment(item.CompetingItems)}}
           </div>
           <div style="width: 177px;flex-direction: column" class="contentDiv">
             {{getTop1Data(item.CompetingItems)[0]}}
-            <div style="color:#D7D7D7;">
+            <!-- <div style="color:#D7D7D7;">
             达到该战场定义的</div>
             <div style="color:#D7D7D7;">
             评价量商家个数为 
             {{getTop1Data(item.CompetingItems)[1]}}
-          </div>
+          </div> -->
           </div>
           <div style="width: 177px;" class="contentDiv">
             所需兵力:{{getCommentNeed(item.CompetingItems)}}
@@ -127,7 +128,7 @@
               <div class="contentColumn">{{son.Price}}</div>
               <div class="contentColumn">{{son.CommentCount}}</div>
               <div class="contentColumn" style="width: 558px;">
-                <a :href="son.ItemUrl">
+                <a :href="son.ItemUrl" target="_black">
                 {{son.Title}}</a>
               </div>
             </div>
@@ -137,7 +138,7 @@
 
             <div v-if="currentTab=='-1'" @click="()=>{onShowWindow(item,0)}" style="cursor: pointer;">查找竞品</div>
             <div v-if="currentTab=='-1'"  style="margin-top: 10px;cursor: pointer;" @click="setState(item.Id,9)">完成分析</div>
-            <div v-if="currentTab=='-1'"  style="margin-top: 10px;cursor: pointer;"  @click="()=>{onShowWindow(item,1)}">编辑修改</div>
+            <div style="margin-top: 10px;cursor: pointer;"  @click="()=>{onShowWindow(item,1)}">编辑修改</div>
             <div style="margin-top: 10px;cursor: pointer;" @click="setState(item.Id,3)">放弃</div>
           </div>
         </div>