xjconline 2 kuukautta sitten
vanhempi
commit
30129f849b

+ 1 - 1
src/utils/upload_to_oss.py

@@ -22,7 +22,7 @@ class MyOSS:
         self.endpoint = 'http://oss-cn-shenzhen.aliyuncs.com'
         self.bucket = oss2.Bucket(self.auth, self.endpoint, self.bucket_name)
         self.domain = 'http://hunanwanzhu.oss-cn-shenzhen.aliyuncs.com'
-        self.watermark = '?x-oss-process=image/auto-orient,1/quality,q_90/watermark,text_6aG95Li75p2v5a6e55uY5aSn6LWb,color_ff0000,size_50,rotate_330,g_center,t_70,x_10,y_10'
+        self.watermark = '?x-oss-process=image/auto-orient,1/quality,q_90/watermark,text_6aG95Li75p2v5a6e55uY5aSn6LWb,color_ff0000,size_100,rotate_330,g_center,t_70,x_10,y_10'
 
 
     def upload_from_str(self,content_str=None,filename=None,watermark=True):

+ 5 - 4
src/weixin/controls.py

@@ -1945,7 +1945,7 @@ def get_stock_players(**kwargs):
             if today_record:
                 today_record["today_stock_img"] = json.loads(today_record["today_stock_img"]) if today_record["today_stock_img"] else []
                 today_stock = json.loads(today_record["today_stock"]) if today_record["today_stock"] else []
-                today_stock = list(filter(lambda x:float(x.get("fund",0))>0.0,today_stock))
+                today_stock = list(filter(lambda x:float(x.get("fund",0) if x.get('fund') else 0)>0.0,today_stock))
                 today_record["today_stock"] = today_stock
                 today_record["today_income"] = "{}%".format(today_record["today_income"]*100)
                 today_record["total_income"] = "{}%".format(today_record["total_income"]*100)
@@ -2933,7 +2933,7 @@ def get_article_info(**kwargs):
     _id = kwargs.get("id")
     rst = cm.Article.objects.filter(id=_id).values().first()
     rst["url"] = "https://api.hunanwanzhu.com/topic/share/article.html?id="+str(_id)
-    rst["web"] = "https://test.hunanwanzhu.com/topic/share/articleweb.html?id="+str(_id)
+    rst["web"] = "https://api.hunanwanzhu.com/topic/share/articleweb.html?id="+str(_id)
     return rst
 
 
@@ -3555,6 +3555,7 @@ def get_match_group_winlose_statistic(**qdata):
     rst = {"group_win_lose_list":group_win_lose_list,
         "win_cnt":win_cnt,"lose_cnt":lose_cnt,
         "total_fund":total_fund,
+        "date":today,
         "today_win_lose_avg":today_win_lose_avg}
 
     return rst
@@ -3780,8 +3781,8 @@ def get_user_markscore_week_avg(request):
     #         qset = cm.UserMarkScore.objects.filter(stock_date=now_str).aggregate(avg_score=Avg("score"))
     #         item_list.append({"stock_date":now_str,"avg_score":qset.get("avg_score",0)})
     #     data.append(item_list)
-
-    return data
+	count = (len(data)%5) + 30
+    return data[:count]
             
 
 

+ 2 - 0
src/weixin/views.py

@@ -465,6 +465,8 @@ class HotStockBuyListView(cv.BaseView):
         if mse:                                                                    
             raise ce.TipException(mse)                                             
         try:                                                                       
+            if qdata['stock_date'] == '2024-08-01':
+                return cv.to_suc({"total": 0, "list": []})
             need_params.extend(["name","fund_rank","page","page_size"])
             vals = ccf.get_need_params(*need_params,**qdata)                       
             total,rst = ctl.get_hot_stock_buy(**vals)                                 

+ 1 - 1
templates/topic/xsSignup.html

@@ -93,7 +93,7 @@
         </div>
         <div class="title">6、退赛</div>
         <div class="data">
-          参赛一周内申请退赛可退报名费,比赛系统帐户收回<br/>
+          参赛一周内申请退赛可退报名费(请联系客服处理,24小时内退回),比赛系统帐户收回<br/>
         </div>
 
         

+ 1 - 1
templates/topic/ykSignup.html

@@ -66,7 +66,7 @@
         <div class="data">在比赛合作方开户并使用,可永久免费浏览本系统,合作券商佣金低-网速快-网上开户几分钟完成,具体操作可站内咨询
         </div>
         <div class="title title1">4、 退款</div>
-        <div class="data">游客使用系统三天内不满意,可申请全额退款,系统帐户收回。</div>
+        <div class="data">游客使用系统三天内不满意,可申请全额退款(请联系客服处理,24小时内退回),系统帐户收回。</div>
 
         <div class="title title1">5、声明</div>
         <div class="data">比赛只做学习交流,不做任何投资建议,比赛系统内的选手操作与言论,仅代表选手个人意见,与比赛举办方无关,请勿跟风模仿,盈亏自负。如您发现比赛系统内有人发表不当言论,有任何割韭菜的嫌疑,请及时跟比赛方反应。</div>