Merge branch 'rthrid' of 39.97.239.116:gyfl/xyzshop into rthrid

data/config/win/refill.ini.php

@@ -760,4 +760,16 @@ $phone_providers = [
     ['name' => 'fengye', 'cfg' => $fengye_phone],
 >>>>>>> rmaster
 ];
-$config['phone_providers'] = $phone_providers;
+$config['phone_providers'] = $phone_providers;
+
+//以下为三方通道
+$sctongqian = ['name' => 'sctongqian', 'store_id' => 55,'qualitys' => '1',
+    'amount' => [
+        100 => [['goods_id' => 123, 'price' => 99, 'quality' => 1, 'card_type' => 'third']],
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$third_providers = [
+    ['name' => 'sctongqian', 'cfg' => $sctongqian]
+];
+$config['third_providers'] = $third_providers;

shop/control/store_goods_online.php

@@ -394,7 +394,7 @@ class store_goods_onlineControl extends BaseSellerControl {
         $update_common['plateid_bottom']     = intval($_POST['plate_bottom']) > 0 ? intval($_POST['plate_bottom']) : '';
         $update_common['is_virtual']         = intval($_POST['is_gv']);
         $update_common['virtual_indate']     = $_POST['g_vindate'] != '' ? (strtotime($_POST['g_vindate']) + 24*60*60 -1) : 0;  // 当天的最后一秒结束
-        $update_common['virtual_limit']      = intval($_POST['g_vlimit']) > 10 || intval($_POST['g_vlimit']) < 0 ? 10 : intval($_POST['g_vlimit']);
+        $update_common['virtual_limit']      = intval($_POST['g_vlimit']) > 10000 || intval($_POST['g_vlimit']) < 0 ? 10 : intval($_POST['g_vlimit']);
         $update_common['virtual_invalid_refund'] = intval($_POST['g_vinvalidrefund']);
         $update_common['is_fcode']           = intval($_POST['is_fc']);
         $update_common['is_appoint']         = intval($_POST['is_appoint']);     // 只有库存为零的商品可以预约

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

@@ -527,7 +527,7 @@
         <dd>
           <input type="text" name="g_vlimit" id="g_vlimit" class="w80 text" value="<?php if ($output['goods']['is_virtual'] == 1) {echo $output['goods']['virtual_limit'];}?>">
           <span></span>
-          <p class="hint">请填写1~10之间的数字，虚拟商品最高购买数量不能超过10个。</p>
+          <p class="hint">请填写1~10000之间的数字，虚拟商品最高购买数量不能超过10000个。</p>
         </dd>
       </dl>
       <dl class="special-01" nctype="virtual_valid" <?php if ($output['goods']['is_virtual'] == 0) {?>style="display:none;"<?php }?>>
@@ -904,7 +904,7 @@ $(function(){
             },
 			g_vlimit : {
 				required	: function() {if ($("#is_gv_1").prop("checked")) {return true;} else {return false;}},
-				range		: [1,10]
+				range		: [1,10000]
 			},
 			g_fccount : {
 				<?php if (!$output['edit_goods_sign']) {?>required	: function() {if ($("#is_fc_1").prop("checked")) {return true;} else {return false;}},<?php }?>
@@ -961,8 +961,8 @@ $(function(){
                 required    : '<i class="icon-exclamation-sign"></i>请选择有效期'
             },
 			g_vlimit : {
-				required	: '<i class="icon-exclamation-sign"></i>请填写1~10之间的数字',
-				range		: '<i class="icon-exclamation-sign"></i>请填写1~10之间的数字'
+				required	: '<i class="icon-exclamation-sign"></i>请填写1~10000之间的数字',
+				range		: '<i class="icon-exclamation-sign"></i>请填写1~10000之间的数字'
 			},
 			g_fccount : {
 				required	: '<i class="icon-exclamation-sign"></i>请填写1~100之间的数字',