Merge branch 'v3.0-app' of http://118.190.145.217:3000/xiaojincai/wanzb_v3_api into v3.0-app

src/settings/settings_online.py

@@ -63,7 +63,7 @@ LOGGING = {
         },
     },
     'loggers': {
-        '': {
+        'myinfo': {
             'handlers': ['console'],
             'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
         }

src/weixin/controls.py

@@ -2125,7 +2125,7 @@ def do_wx_pay(request):
         #生成选手信息
         cur_match = cm.Match.objects.filter(id=match_id).first()
         visit_group = cm.MatchGroup.objects.filter(id=match_group).first()
-        opmode_group_obj = cm.OpModelGroup.objects.filter(id=opmode_group).first()
+        #opmode_group_obj = cm.OpModelGroup.objects.filter(id=opmode_group).first()
 
         player,flag = cm.Player.objects.get_or_create(
             user_id = user.id, 
@@ -2134,8 +2134,8 @@ def do_wx_pay(request):
         player.match_name = cur_match.name
         player.match_group = visit_group.id
         player.match_group_name = visit_group.name
-        player.opmode_group = opmode_group_obj.id
-        player.opmode_group_name = opmode_group_obj.name
+        #player.opmode_group = opmode_group_obj.id
+        #player.opmode_group_name = opmode_group_obj.name
 
         player.username = signup_name 
         player.usercode = request.user.get("usercode")

src/weixin/wzhifuSDK.py

@@ -48,6 +48,8 @@ try:
     from cStringIO import StringIO
 except ImportError:
     pycurl = None
+import logging
+log = logging.getLogger("myinfo")
 
 
 class WxPayConf_pub(object):
@@ -310,13 +312,16 @@ class UnifiedOrder_pub(Wxpay_client_pub):
         sign = self.getSign(self.parameters)
         print self.parameters
         self.parameters["sign"] = sign  #签名
+        log.info("params:%s" % self.parameters)
         return  self.arrayToXml(self.parameters)
 
     def getPrepayId(self):
         """获取prepay_id"""
         self.postXml()
+        log.info("raw response:"+self.response)
         self.result = self.xmlToArray(self.response)
         print self.result
+        log.info(self.result)
         return self.result
 
     def geth5url(self):
@@ -373,6 +378,7 @@ def get_wx_unifiedorder(out_trade_no,total_fee,openid,trade_type="JSAPI"):
     par_obj.setParameter('openid',openid)
     par_obj.setParameter('trade_type',trade_type)
     par_obj.createXml()
+    log.info("order info:%s,%s,%s,%s" % (out_trade_no,total_fee,openid,trade_type))
     return par_obj.getPrepayId()
 
 def check_notify_valid(xml_params):

templates/topic/xsSignup.html

@@ -9,7 +9,10 @@
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://api.hunanwanzhu.com/topic/elementui-index.css">
     <!-- 引入组件库 -->
+    <!--
     <script src="https://code.jquery.com/jquery-3.6.0.js"  integrity="sha256-H+K7U5CnXl1h5ywQfKtSj8PCmoN9aaq30gDh27Xc0jk=" crossorigin="anonymous"></script>
+    -->
+    <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script src="https://api.hunanwanzhu.com/topic/vue.js"></script>
     <script src="https://api.hunanwanzhu.com/topic/elementui-index.js"></script>
 </head>
@@ -68,7 +71,7 @@
           百万组：50W到300W<br/>
           十万组：10W到50W<br/>
           菜鸟组：10W以下<br/>
-          各组第一有牛气冲天奖杯！<br/>
+          各组第一奖牛气冲天奖杯!各组前三奖比赛纪念衫两件。五组选手总收益率第一，奖华为mate60一部。五组选手总盈利金额第一，奖华为mate60一部。<br/>
           产业链选手禁止参赛，一经多个观众投诉反应，经核实有一定嫌疑，将立刻取消参赛资格。<br/>
         </div>
         <div class="title">3、交作业</div>

templates/topic/ykSignup.html

@@ -9,7 +9,10 @@
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://api.hunanwanzhu.com/topic/elementui-index.css">
     <!-- 引入组件库 -->
+    <!--
     <script src="https://code.jquery.com/jquery-3.6.0.js"  integrity="sha256-H+K7U5CnXl1h5ywQfKtSj8PCmoN9aaq30gDh27Xc0jk=" crossorigin="anonymous"></script>
+    -->
+    <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script src="https://api.hunanwanzhu.com/topic/vue.js"></script>
     <script src="https://api.hunanwanzhu.com/topic/elementui-index.js"></script>
 </head>

templates/wzb/index.html

@@ -140,7 +140,7 @@
 				scrollTop: 0
 			})
 			if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) { //判断iPhone|iPad|iPod|iOS
-			  $('.bg_iphone').show()
+			  $('.bg_az').show()
 			} else if (/(Android)/i.test(navigator.userAgent)) {  //判断Android
 			  $('.bg_az').show()
 			}