修改糖果树关键字，新增三方充值接口参数

view/peko/activity/explore/index.html

@@ -85,7 +85,7 @@
             <div class="info-wrap">
                 <p class="nick"></p>
                 <div>
-                    <p class="meteor-num">我的幸运：<span></span></p>
+                    <p class="meteor-num">我的信物：<span></span></p>
                     <p class="diamond-num">我的钻石数量：<span></span></p>
                 </div>
             </div>
@@ -101,10 +101,10 @@
         <div class="title">玩法介绍</div>
         <div class="content">
             <p>1. 促销活动期间,购买限定装扮即可获赠相应会场游戏币,参与活动。</p>
-            <p>2. 购买限定装扮1“<span></span>”,可获赠幸运1个;<br>
+            <p>2. 购买限定装扮1“<span></span>”,可获赠信物1个;<br>
-                购买限定装扮2“<span></span>”,可随机获赠幸运7-10个;<br>
+                购买限定装扮2“<span></span>”,可随机获赠信物10个;<br>
-                购买限定装扮3“<span></span>”,可随机获赠幸运70~100个；<br>
+                购买限定装扮3“<span></span>”,可随机获赠信物100个；<br>
-                购买限定装扮4“<span></span>”，可随机获赠幸运700~1000个。</p>
+                购买限定装扮4“<span></span>”，可随机获赠信物1000个。</p>
             <p>3. 该活动赠送给您的游戏币为参与该活动的虛拟道具，不具任何价值也不能转赠其他用户。</p>
             <p>4. 活动结束将关闭页面,剩余游戏币将会清空,请留意活动关闭时间。</p>
             <p>5. 本活动与Apple Inc.无关,最终解释权归平台所有。</p>

view/peko/activity/explore/js/index.js

@@ -99,10 +99,10 @@ const getListPack = () => {
 
 // 渲染禮包
 let arrTips = [
-    '贈送糖果1個',
+    '贈送信物1個',
-    '隨機贈送糖果7-10個',
+    '隨機贈送信物10個',
-    '隨機贈送糖果70-100個',
+    '隨機贈送信物100個',
-    '隨機贈送糖果700-1000個',
+    '隨機贈送信物1000個',
 ]
 const renderList = () => {
     listPack.map((item, index) => {
@@ -270,7 +270,7 @@ $(function(){
                         getUserInfo(res.data)
                         $('.shade-mask-buy').hide()
                         $('.shade').fadeIn(300)
-                        $('.shade-mask-success .tip').html(`獲贈糖果x` +  giftObj.ticketNum * giftObj.num)
+                        $('.shade-mask-success .tip').html(`獲贈信物x` +  giftObj.ticketNum * giftObj.num)
                         $('.shade-mask-success').fadeIn()
                     }else if(res.code === 2103){
                         $('.shade-mask-buy').hide()

view/peko/modules/inform/help.html

@@ -63,7 +63,7 @@
   </div>
 </body>
 <script src="../../common/js/jquery-3.2.1.min.js"></script>
-<script src="../../common/js/common.js"></script>
+<script src="../../common/js/common2.js"></script>
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/template-web.js"></script>
 <script>

view/peko/modules/inform/index.html

@@ -4,7 +4,7 @@
 	<meta charset="UTF-8" />
 	<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
 	<meta http-equiv="X-UA-Compatible" content="ie=edge" />
-	<title>举报</title>
+	<title>舉報</title>
   <link rel="stylesheet" href="../../common/css/reset.css">
   <link rel="stylesheet" href="css/index.css">
 	<script src="../../common/js/flexible.js"></script>
@@ -83,7 +83,7 @@
 
 </body>
 <script src="../../common/js/jquery-3.2.1.min.js"></script>
-<script src="../../common/js/common.js"></script>
+<script src="../../common/js/common2.js"></script>
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/template-web.js"></script>
 <script src="./js/index.js"></script>

view/peko/modules/inform/inform-list.html

@@ -41,7 +41,7 @@
 
 </body>
 <script src="../../common/js/jquery-3.2.1.min.js"></script>
-<script src="../../common/js/common.js"></script>
+<script src="../../common/js/common2.js"></script>
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/template-web.js"></script>
 <script src="./js/inform-list.js"></script>

view/peko/modules/pay/js/index.js

@@ -17,6 +17,7 @@ let successUrl = window.location.href;//支付成功回调路径
 let uid;
 let modeOfPayment = false;//判断是否有选择支付方式
 let paymentAmount = false;//判断是否有选择付款金额
+var deviceId;//型号ID
 $(function () {
     console.log(host)
     if (EnvCheck() == 'test') {//degBug
@@ -59,6 +60,7 @@ $(function () {
         $('.wx_skip').hide();
     }
     function getChargePageInfoForH5 (countryCode) {
+        deviceId = get_param('deviceId')
         channelType = get_param('channelType');
         let is_CN = countryCode == "CN" ? true : false;
         networkRequest({
@@ -119,7 +121,7 @@ $(function () {
                             networkRequest({
                                 type: 'POST',
                                 url: urlPrefix + '/charge/apply2New',
-                                data: { erbanNo, chargeProdId, countryCode, openId, payChannel, paymentType, successUrl, uid },
+                                data: { erbanNo, chargeProdId, countryCode, openId, payChannel, paymentType, successUrl, uid, deviceId: deviceId },
                                 success: function (res) {
                                     if (res.code == 200) {
                                         console.log(res)