Merge branch 'master' of http://120.78.169.79:3000/xusong_hc/tp3_activity

h5v2/act_20200708/index.html

@@ -216,7 +216,7 @@
             });
         } catch (e) {}
         var uid = PageH5.getParam('uid') || '0100834547692768574';
-        var usertoken = "00139025650832263889980824152950"
+        var UserToken = "00139025650832263889980824152950"
         var mac = 'OC-41-E9-DD-EC-DE'
         var version = "YYS.4.6.15.266.5.HNDX.0.0_Release"
         try {
@@ -358,7 +358,7 @@
             }]
         ]
 
-        var typeArr = ['gx', 'yy', 'cy', 'ds', 'kx'];
+        var typeArr = ['yy', 'gx', 'cy', 'ds', 'kx'];
 
         PageH5.eventHandler = function(keyCode) {
             if (keyCode == KEY_LEFT && (!isLock)) {

h5v2/act_20200708/js/activity_basic.js

@@ -2,8 +2,7 @@
 var ACTIVITY_CFG = {
     ACT_ID: 'looktv',
     ACT_CODE: 'act_20200708',
-    CONTENT_CODE: '', //这里是嘟嘟，暂时无
-    CHILD_CONTENT_CODE: '00000001000000000018000000431421',
+    CONTENT_CODE: '00000001000000000018000000431421', //少儿包
     PRODUCT_ID: '', //这里是嘟嘟，暂时无
     CHILD_PRODUCT_ID: '8801000638', //少儿29元
     // CHILD_PRODUCT_ID2: '8801000079', //少儿25元
@@ -16,7 +15,7 @@ function goMyCommonOrder(orderBack) {
         version = Webview.readSystemProp('app.version'); //APK版本号
     } catch (e) {}
     var product_list = {
-        "product_id": CHILD_PRODUCT_ID,
+        "product_id": ACTIVITY_CFG.CHILD_PRODUCT_ID,
         "video_name": "",
         "video_type": "",
         "product_type": "2",