Merge branch 'master' of http://113.105.137.151:22280/chan/xxmp

addons/longbing_company/template/manage/config.html

@@ -234,7 +234,7 @@
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">股东分销提成</label>
                                         <div class="layui-input-block">
-                                            <input type="number" min="0" max="100" name="stock_extract" placeholder="请输入分销提成" autocomplete="off" class="layui-input" value="{$info['first_extract']}">
+                                            <input type="number" min="0" max="100" name="stock_extract" placeholder="请输入分销提成" autocomplete="off" class="layui-input" value="{$info['stock_extract']}">
                                             <span class="span-remark">用户消费, 其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
                                         </div>
                                     </div>

addons/longbing_company/wxapp.php

@@ -1844,23 +1844,23 @@ class longbing_companyModuleWxapp extends WeModuleWxapp
 		$uniacid = $_W['uniacid'];
 		$encryptedData = $_GPC['encryptedData'];
 		$iv = $_GPC['iv'];
-		$info = pdo_get('longbing_company_user_phone', array('user_id' => $uid, 'uniacid' => $uniacid));
+		$info = pdo_get('longbing_company_user_phone', array('user_id' => $uid,'uniacid' => $uniacid));
 
 		if ($info) {
 			return $this->result(0, 'fail', array('phone' => $info['phone'], 'new' => 3, 'iv' => $iv));
 		}
-
+		/*
 		if (!$uid || !$to_uid) {
 			return $this->result(-1, '', array());
 		}
-
+      */
 		$appid = $_W['account']['key'];
 		$appsecret = $_W['account']['secret'];
 		$check_sk = pdo_get('longbing_company_user_sk', array('user_id' => $uid));
 
 		if (!$check_sk) {
 			return $this->result(-1, 'need login', array());
-		}
+	     }
 
 		$session_key = $check_sk['sk'];
 		include_once 'wxBizDataCrypt.php';