修改积分反馈相关规则

@@ -15,7 +15,7 @@ return [
     'Is_pledge'            => '是否缴纳押金',
     'Is_pledge 0'          => '不需要',
     'Is_pledge 1'          => '需要',
-    'Fee'                  => '需要缴纳金额',
+    'Fee'                  => '奖励金额',
     'User_id'              => '创建人',
     'Createtime'           => '创建时间',
     'Showswitch'           => '显示',

@@ -692,7 +692,17 @@ class Clock extends Api
         $return['mission']['mission_name']=$info['mission_name'];
         $return['mission']['cycle']=$info['cycle'];
         $return['mission']['start_time']=$info['start_times'];
-        $return['mission']['fee']=$info['fee'].'元';
+
+
+        if (!empty($info['fee'])){
+            $return['mission']['fee']=$info['fee'].'元';
+        }else{
+            $site=config('site');
+            $return['mission']['fee']=$site['default_fee'];
+        }
+
+
+
         $return['mission']['score']=$info['fee']*$ratio;
         $return['mission']['id']=$info['id'];
         $return['mission']['position_name']=$info['position_name'];
@@ -708,9 +718,9 @@ class Clock extends Api
             $return['mission']['join_id']= $join_id;
         }
         $return['mission']['price']= $return['mission']['fee'];
-        if (empty($return['mission']['user_join']) && !empty( $return['mission']['fee'])){
+     /*   if (empty($return['mission']['user_join']) && !empty( $return['mission']['fee'])){
             $return['mission']['fee']=  '加入可见';
-        }
+        }*/
         $Diary=new CheckDiary();
         $where['mission_id']=$id;
         $return['diary']=$Diary->diaryList($where,$user_id);
@@ -1318,6 +1328,9 @@ class Clock extends Api
    private function makeRenwuPic($user_id,$code_num,$title,$cal){
        $PicPath=ROOT_PATH.'public'.DS.'assets'.DS.'img'.DS;
        $pic=$PicPath.'yangsheng.png';
+
+
+
        /*判断头像是否为网络路径*/
        $avatar=cdnurl($this->auth->avatar);
        $nickname=$this->auth->nickname;

@@ -14,8 +14,11 @@ use app\admin\model\Suggest;
 use app\common\controller\Api;
 use app\common\library\Auth;
 use EasyWeChat\Foundation\Application;
+use EasyWeChat\Foundation\ServiceProviders\MiniProgramServiceProvider;
+use EasyWeChat\MiniProgram\MiniProgram;
 use fast\Http;
 use fast\Random;
+use Overtrue\Socialite\FactoryInterface;
 use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\Root;
 use think\Config;
 use think\Db;
@@ -27,7 +30,7 @@ use think\Log;
  */
 class Common extends Api
 {
-    protected $noNeedLogin = ['getSessionKey','login','index','codeToToken','notifyx','notifyx1','clock'];
+    protected $noNeedLogin = ['getSessionKey','login','index','codeToToken','notifyx','notifyx1','clock','getPath'];
     protected $noNeedRight = '*';
 
 
@@ -62,6 +65,20 @@ class Common extends Api
 
     }
 
+    public function getPath(){
+        $access_token=$this->get_accessToken();
+        $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token='.$access_token;
+        $path="pages/clock/clock";
+        $width=430;
+        $data='{"path":"'.$path.'","width":'.$width.'}';
+        $return = $this->http_request($url,$data);
+        $path=APP_PATH.'../public/'.time().'.jpg';
+        file_put_contents($path,$return);
+        $this->success('生成成功', 'Shop/index');
+    }
+
+
+
     /**
      * @ApiTitle    (获取SessionKey)
      * @ApiSummary  (解密微信加密信息)
@@ -890,6 +907,23 @@ class Common extends Api
             return $output;
         }
 
+        private function http_request($url, $data = null)
+        {
+            $curl = curl_init();
+            //curl_setopt ( $curl, CURLOPT_SAFE_UPLOAD, false);
+            curl_setopt($curl, CURLOPT_URL, $url);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
+            if (!empty ($data)) {
+                curl_setopt($curl, CURLOPT_POST, 1);
+                curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+            }
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            $output = curl_exec($curl);
+            curl_close($curl);
+            return $output;
+        }
+
     public function getLogo(){
         $site=\config('site');
         $return['logo']=cdnurl($site['logo']);

@@ -351,8 +351,8 @@ class Shop extends Api
         $money=$good->money;
         $user_score=$user->score;
         $site=config('site');
-        $rate=$site['ratio'];
-        $return['remark']='每'.$rate.'分＝１元';
+        $rate=$site['good_ratio'];
+        $return['remark']='每'.$rate.'分＝1元';
         $return['good_price']=$money;
         $discount_money=$user_score/$rate;
         if ($discount_money>$money){
@@ -361,8 +361,8 @@ class Shop extends Api
             $discount_money=$money;
         }else{
             $cost_score=$user->score;
-            $real_fee=ceil(($good['money']-$user_score/$site['ratio'])*100)/100;
-            $discount_money=ceil($user_score/$site['ratio']*100)/100;
+            $real_fee=ceil(($good['money']-$user_score/$site['good_ratio'])*100)/100;
+            $discount_money=ceil($user_score/$site['good_ratio']*100)/100;
         }
         $return['discount_money']=$discount_money;
         $return['real_fee']=$real_fee;
@@ -472,9 +472,9 @@ class Shop extends Api
                    $this->error('现金类型商品无法用现金支付');
                 }
 
-               if ($user['score']>=($good['price']*$site['ratio'])){
+               if ($user['score']>=($good['price']*$site['good_ratio'])){
                    $real_fee=0;
-                   $cost_score=$good['price']*$site['ratio'];
+                   $cost_score=$good['price']*$site['good_ratio'];
                    /*扣除相应积分*/
                    $insert['order_sn']=cmf_get_order_sn();
                    $insert['user_id']=$user_id;
@@ -509,7 +509,7 @@ class Shop extends Api
                    $this->success('支付成功!');
 
                }else{
-                   $real_fee=ceil(($good['money']-$user['score']/$site['ratio'])*100)/100;
+                   $real_fee=ceil(($good['money']-$user['score']/$site['good_ratio'])*100)/100;
                    $cost_score=$user['score'];
 
                    $insert['order_sn']=cmf_get_order_sn();