灰度&商家活动更新

@@ -361,7 +361,11 @@ class Seller extends Common
                     $data['title'] = '满赠';
                     $data['title'] = '满赠';
                     break;
                     break;
                 case '3':
                 case '3':
-                    $data['title'] = '满'.$data['max_num'].'立享'.$data['min_num'].'折';
+                    if($data['max_num']===0){
+                        $data['title'] = $data['min_num'].'折';
+                    }else{
+                        $data['title'] = '满'.$data['max_num'].'立享'.$data['min_num'].'折';
+                    }
                     break;
                     break;
                 case '4':
                 case '4':
                     $data['title'] = $data['max_num'].'元代金券';
                     $data['title'] = $data['max_num'].'元代金券';

@@ -429,7 +429,7 @@ class Template extends Common{
                 if($data['flag']==3){
                 if($data['flag']==3){
                     //推送跟新消息
                     //推送跟新消息
                     $file_url = 'http://xt03.colorcun.com'.@$data['file_url'];
                     $file_url = 'http://xt03.colorcun.com'.@$data['file_url'];
-                    $list= file_get_contents(ON_LINE.'Android.Device.SendNewPackageMessage&version='.$data['version'].'&file_url='.$file_url.'&content='.$data['content']);
+                    $list= file_get_contents(ON_LINE.'Android.Device.SendNewPackageMessage&version='.$data['version'].'&file_url='.$file_url.'&content='.$data['content'].'&pro='.$data['pro']);
                     //$array = json_decode($list,TRUE);
                     //$array = json_decode($list,TRUE);
                 }
                 }
             }
             }

@@ -34,6 +34,15 @@
                     </select>
                     </select>
                 </div>
                 </div>
         </div>
         </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">更新方案</label>
+            <div class="layui-input-block">
+              <input type="radio" name="pro" value="1" title="全量更新" checked="">
+              <input type="radio" name="pro" value="2" title="灰度更新">
+            </div>
+        </div>
+
         <div class="layui-form-item">
         <div class="layui-form-item">
             <label class="layui-form-label">文件</label>
             <label class="layui-form-label">文件</label>
             <input type="hidden" name="pic" id="pic" value="">
             <input type="hidden" name="pic" id="pic" value="">