Merge branch 'bonus_rate' into car

admin/control/person_bonus.php

@@ -124,7 +124,7 @@ class activity_bonus
             $type_sn = $ret['type_sn'];
 
             if(BASE_SITE_URL == 'http://manager.lrlz.com') {
-                $url = "http://p.lrlz.com/mobile/index.php?act=bonusex&op=open&client_type=wap&type_sn={$type_sn}";
+                $url = "https://passport.lrlz.com/mobile/index.php?act=bonusex&op=open&client_type=wap&type_sn={$type_sn}";
             } else {
                 $url = BASE_SITE_URL . "/mobile/index.php?act=bonusex&op=open&client_type=wap&type_sn={$type_sn}";
             }

admin/control/stat_anotice.php

@@ -87,7 +87,7 @@ class stat_anoticeControl extends SystemControl
             $val['used'] = $item['nc_count'] - $unused;
             $val['binded'] = $binded;
 
-            $url = "http://p.lrlz.com/mobile/index.php?act=fcode&op=index&common_id={$item['goods_commonid']}&batch_code={$item['batch_code']}";
+            $url = "https://passport.lrlz.com/mobile/index.php?act=fcode&op=index&common_id={$item['goods_commonid']}&batch_code={$item['batch_code']}";
             $val['fc_link'] = $url;
             $goods = $mod_goods->where(array('goods_commonid' => $item['goods_commonid']))->limit(1)->select();
             if(empty($goods)) {

data/resource/js/dialog/dialog.js

@@ -670,8 +670,11 @@ function getHost(url) {
 	return host;
 }
 
-function hostconvert(url) {
-	if(!url.match(/^http?:\/\//)) url = SITEURL.replace(/(\/+)$/g, '') + '/' + url;
+function hostconvert(url)
+{
+	if(!url.match(/^http[s]?:\/\//)) {
+	    url = SITEURL.replace(/(\/+)$/g, '') + '/' + url;
+    }
 	var url_host = getHost(url);
 	var cur_host = getHost().toLowerCase();
 	if(url_host && cur_host != url_host) {
@@ -814,12 +817,12 @@ function ajaxpost(formid, showid, waitid, showidclass, submitbtn, recall) {
 	var ajaxframeid = 'ajaxframe';
 	var ajaxframe = $$(ajaxframeid);
 	var formtarget = $$(formid).target;
-	var handleResult = function() {
+	var handleResult = function()
+    {
 		var s = '';
 		var evaled = false;
 
-//		showloading('none');
-		try {	
+		try {
 			s = $$(ajaxframeid).contentWindow.document.XMLDocument.text;
 		} catch(e) {
 			try {
@@ -861,6 +864,7 @@ function ajaxpost(formid, showid, waitid, showidclass, submitbtn, recall) {
 		ajaxframe.loading = 0;
 		$$('append_parent').removeChild(ajaxframe.parentNode);
 	};
+
 	if(!ajaxframe) {
 		var div = document.createElement('div');
 		div.style.display = 'none';
@@ -876,8 +880,10 @@ function ajaxpost(formid, showid, waitid, showidclass, submitbtn, recall) {
 	//showloading();
 	$$(formid).target = ajaxframeid;
 	var action = $$(formid).getAttribute('action');
+	console.log('action=' + action);
 	action = hostconvert(action);
-	$$(formid).action = action.replace(/\&inajax\=1/g, '')+'&inajax=1';
+    console.log('action=' + action);
+    $$(formid).action = action.replace(/\&inajax\=1/g, '')+'&inajax=1';
 	$$(formid).submit();
 	if(submitbtn) {
 		submitbtn.disabled = true;

data/resource/mobile/comm/websocket.js

@@ -110,10 +110,17 @@ var WebsocketConnect = function(wshost,fAutoConnect,fAutojoin,callbacks,room_msg
         socket.close();
     };
 
-    var connect = function(){
-        if(socket) {
-            return;
-        }
+    var reconnect = function(){
+        setTimeout(function(){
+            if(fauto_connect) {
+                connect();
+            }
+        },1000);
+    };
+
+    function connect()
+    {
+        socket = null;
         if(window.WebSocket) {
             socket = new WebSocket(wshost);
         }
@@ -130,9 +137,13 @@ var WebsocketConnect = function(wshost,fAutoConnect,fAutojoin,callbacks,room_msg
             }
         };
         socket.onerror = function(){
-            webSocket_callbacks.onerror();
+            console.log('error');
+        };
+        socket.onclose = function(e){
+            console.log('onclose:'+ e);
+            webSocket_callbacks.onclose();
+            reconnect();
         };
-
         socket.onmessage = function(msg)
         {
             var datasJsonParse = JSON.parse(msg.data);
@@ -162,11 +173,8 @@ var WebsocketConnect = function(wshost,fAutoConnect,fAutojoin,callbacks,room_msg
                     msg_handler.message(datasJsonParse);
             }
         };
-        socket.onclose = function(){
-            webSocket_callbacks.onclose();
-        };
         is_connect = true;
-    };
+    }
     if(fauto_connect) {
         connect();
     }

data/resource/mobile/comm/wx_share.js

@@ -1,6 +1,6 @@
 //微信分享接口
 //必须首先加载下面的官方js文件
-//<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+//<script src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 //传参格式为对象
 
 var weiXinShare =

mobile/control/bargain.php

@@ -399,12 +399,12 @@ class tpl_bargain
         {
             if($this->bargained()) {
                 $str = '<span class="just_buy" id="just_buy"></span>
-                        <span class="invite_btn join_btn" id="invite_btn"></span>';
+                        <span class="invite_btn" id="invite_btn"></span>';
             }
             else {
                 $str = '<span class="mine_bargain_btn" id="mine_bargain_btn"></span>
                         <span class="just_buy" id="just_buy"></span>
-                        <span class="invite_btn join_btn" id="invite_btn"></span>';
+                        <span class="invite_btn" id="invite_btn"></span>';
             }
         }
         else

mobile/control/config.php

@@ -51,7 +51,7 @@ class configControl extends mobileHomeControl
             foreach ($result as $value) {
                 $ret[$value['name']] = array('value'=>$value['value']);
             }
-            $ret['feed_back_url'] = array('value'=> 'http://p.lrlz.com/' . '/mobile/index.php?act=member_feedback&op=add&client_type=ios');
+            $ret['feed_back_url'] = array('value'=> BASE_SITE_URL . '/mobile/index.php?act=member_feedback&op=add&client_type=ios');
         }
         return self::outsuccess($ret);
     }

mobile/control/control.php

@@ -297,9 +297,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018020501";
+    return "v=2018020504";
 }
 function shop_version()
 {
-    return "v=2018020501";
+    return "v=2018020502";
 }

mobile/control/index.php

@@ -65,7 +65,7 @@ class indexControl extends specialControl
 
     public function inoherbOp()
     {
-        return self::outsuccess(['direct_uri' => 'http://p.lrlz.com/hfive/inoherb/index.html?2'],"redirect");
+        return self::outsuccess(['direct_uri' => BASE_SITE_URL . '/hfive/inoherb/index.html?2'],"redirect");
     }
 
     public function memberOp()

mobile/control/inoherb.php

@@ -26,10 +26,10 @@ class inoherbControl extends mobileControl
     {
         $inoherb_id = intval($_GET['inoherb_id']);
         if($inoherb_id > 0) {
-            $url = "http://p.lrlz.com/hfive/inoherb/index.html?#/share?inoherb_id={$inoherb_id}";
+            $url = BASE_SITE_URL . "/hfive/inoherb/index.html?#/share?inoherb_id={$inoherb_id}";
         }
         else {
-            $url = "http://p.lrlz.com/hfive/inoherb/index.html?2";
+            $url = BASE_SITE_URL . "/hfive/inoherb/index.html?2";
         }
         return self::outsuccess(['direct_uri' => $url],"redirect");
     }

mobile/control/mshop.php

@@ -117,7 +117,6 @@ class mshopControl extends specialControl
         $relay_id = session_helper::relay_id();
         fcgi_setcookie("relay_id","{$relay_id}",time() + 86400,'/',LOCAL_DOMAIN);
 
-
         if(session_helper::need_wechat_author())
         {
             $author = new thrid_author\wxauthor();

mobile/templates/default/bargain/bargain.php

@@ -82,7 +82,7 @@
 <?php echo $output['tpl']->show_close_pop(); ?>
 
 
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/shake/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/animate.js?<?php echo bonus_version(); ?>"></script>
@@ -294,7 +294,7 @@
             window.location.href = 'itms-apps://itunes.apple.com/app/id945609424';
         }
         else if(bridge.isMobile.Android()) {
-            window.location.href = 'http://p.lrlz.com/hfive/android_down';
+            window.location.href = "<?php echo BASE_SITE_URL . "/hfive/android_down/index.html"; ?>";
         }
     }
     $('#download_app').on('click',function(){
@@ -305,12 +305,7 @@
     });
     $('.join_btn').on('click',function()
     {
-        if(from_app){
-            window.location.href = 'xmmz://'+location.host+'/block/special?title=56CN5Lu35ZuiCg==&special_id=1181';
-        }
-        else {
-            download_app();
-        }
+        download_app();
     });
 
     var room    =  <?php echo $output['room']['room']; ?>;
@@ -322,7 +317,6 @@
     };
     var callbacks = {
         onOpen:sOpen,
-        onError:sError,
         onClose:sClose
     };
     var msg_handler = {
@@ -333,12 +327,7 @@
 
     function sOpen(){
     }
-    function sError(e){
-        console.log('网络连接失败！请刷新重试');
-        online = false;
-    }
-    function sClose(e){
-        console.log('网络连接关闭!');
+    function sClose(){
         online = false;
     }
 

mobile/templates/default/bonus/bind.php

@@ -54,7 +54,7 @@
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/tel.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="http://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js?<?php echo bonus_version(); ?>"></script>
 <script>
@@ -66,7 +66,7 @@
         if (app_nav.indexOf('iphone')>-1&&app.indexOf('iphone')){
             href='http://a.app.qq.com/o/simple.jsp?pkgname=com.lrlz.beautyshop';
         } else if (app.indexOf('micromessenger')>-1 && app_nav.indexOf('android')>-1) {
-            href = "http://p.lrlz.com/hfive/android_down/index.html";
+            href = "<?php echo BASE_SITE_URL . "/hfive/android_down/index.html"; ?>";
         }
         else {
             href="javascript:void(0)";

mobile/templates/default/bonus/detail.php

@@ -34,7 +34,7 @@
     <?php bonus_out_download(); ?>
 </div>
 
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/tel.js?<?php echo bonus_version(); ?>"></script>
@@ -49,7 +49,7 @@
         if (app_nav.indexOf('iphone')>-1&&app.indexOf('iphone')){
             href='http://a.app.qq.com/o/simple.jsp?pkgname=com.lrlz.beautyshop';
         } else if (app.indexOf('micromessenger')>-1 && app_nav.indexOf('android')>-1) {
-            href = "http://p.lrlz.com/hfive/android_down/index.html";
+            href = "<?php echo BASE_SITE_URL . "/hfive/android_down/index.html"; ?>";
         }
         else {
             href="javascript:void(0)";

mobile/templates/default/bonus/open.php

@@ -60,7 +60,7 @@
         });
     </script>
 
-    <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+    <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
     <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
     <script type="text/javascript" src="http://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js?<?php echo bonus_version(); ?>"></script>
     <script>

mobile/templates/default/bonus/ranklist.php

@@ -191,7 +191,7 @@
         concern.init();
     })
 </script>
-<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js<?php echo bonus_version(); ?>"></script>
+<script src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js<?php echo bonus_version(); ?>"></script>
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js<?php echo bonus_version(); ?>"></script>
 <script>
     var list_sn = $('#list_sn').val();

mobile/templates/default/fcode/bind.php

@@ -49,7 +49,7 @@
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/fcode/js/fcode.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/layer.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">

mobile/templates/default/fcode/index.php

@@ -28,7 +28,7 @@
     <div class="loading"></div>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
     $(function()

mobile/templates/default/fcode/success.php

@@ -45,7 +45,7 @@
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/fcode/js/fcode.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
     $(function()

mobile/templates/default/invite_friend/invite.php

@@ -143,7 +143,7 @@
         })();
     }
 </script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
 
@@ -154,7 +154,7 @@
         $('#download_app').attr('href','itms-apps://itunes.apple.com/app/id945609424');
     } else if (isMobile.Android) {
         init_android_bridge();
-        $('#download_app').attr('href','http://p.lrlz.com/data/upload/package/xmmz_release.apk');
+        $('#download_app').attr('href',"<?php echo BASE_SITE_URL . "/data/upload/package/xmmz_release.apk"; ?>");
     } else {
         $('#download_app').attr('href','javascript:void(0)');
     }

mobile/templates/default/shop/goods_detail.php

@@ -103,7 +103,7 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/mshop/js/common/sm.min.js"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/mshop/js/common/sm-extend.min.js"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/mshop/js/page/products_content.js"></script>
-<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script type="text/javascript">
 
     var bonus_title = "熊猫美妆" ;

mobile/templates/default/signature.php

@@ -12,7 +12,7 @@
 
 </div>
 <script src="https://cdn.bootcss.com/jquery/1.6.2/jquery.min.js"></script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 <script type="text/javascript">
     $(function ()
     {

mobile/templates/default/ugc/content.php

@@ -77,7 +77,7 @@
 <div class='loader loader--circularSquare'></div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/ugc/js/picLazyLoad.min.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/ugc/js/zepto_touch.js?<?php echo bonus_version(); ?>"></script>

shop/templates/default/seller/store_goods_add.step2.php

@@ -58,7 +58,16 @@
 </ul>
 <?php }?>
 <div class="item-publish">
-  <form method="post" id="goods_form" action="<?php if ($output['edit_goods_sign']) { echo urlShop('store_goods_online', 'edit_save_goods');} else { echo urlShop('store_goods_add', 'save_goods');}?>">
+  <form method="post" id="goods_form" action=
+        "<?php if ($output['edit_goods_sign']) {
+            echo urlShop('store_goods_online', 'edit_save_goods');
+            $url = urlShop('store_goods_online', 'edit_save_goods');
+         } else {
+            echo urlShop('store_goods_add', 'save_goods');
+            $url = urlShop('store_goods_add', 'save_goods');
+         }
+         Log::record("url={$url}",Log::DEBUG);
+        ?>">
     <input type="hidden" name="form_submit" value="ok" />
     <input type="hidden" name="commonid" value="<?php echo $output['goods']['goods_commonid'];?>" />
     <input type="hidden" name="type_id" value="<?php echo $output['goods_class']['type_id'];?>" />

test/DBTest.php

@@ -18,6 +18,11 @@ class DBTest extends PHPUnit_Framework_TestCase
         Base::run_util();
     }
 
+    public function testUrl()
+    {
+        $url = urlShop('store_goods_online', 'edit_save_goods');
+    }
+
     public function testTranslog()
     {
     }

test/TestFcode.php

@@ -24,6 +24,8 @@ class TestFcode extends PHPUnit_Framework_TestCase
         Base::run_util();
     }
 
+
+
     public function testManager()
     {
         $manager = fcode\present_manager::instance();

test/TestSystem.php

@@ -18,7 +18,6 @@ class testSystem extends PHPUnit_Framework_TestCase
     {
         Base::run_util();
     }
-
     public function testAreas()
     {
         $items = Model('area')->field('*')->order('area_id')->limit(false)->select();