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

admin/control/provider_info.php

@@ -20,7 +20,7 @@ class provider_infoControl extends SystemControl
         foreach ($provider_list as $provider) {
             $providers[$provider['provider_id']] = $provider;
         }
-        $info_list = $mod->getProviderInfoList($condition,50);
+        $info_list = $mod->getProviderInfoList($condition,50,'*','store_id desc');
         foreach ($info_list as $key => $value) {
             $info_list[$key]['provider_name'] = $providers[$value['provider_id']]['name'];
             $info_list[$key]['store_name'] = $providers[$value['provider_id']]['store_name'];
@@ -59,6 +59,7 @@ class provider_infoControl extends SystemControl
                 $insert_array['admin_url'] = $_POST['admin_url'] ?? '';
                 $insert_array['admin_name'] = $_POST['admin_name'] ?? '';
                 $insert_array['admin_pwd'] = $_POST['admin_pwd'] ?? '';
+                $insert_array['bz'] = $_POST['bz'] ?? '';
                 $result = $mod->addInfo($insert_array);
                 if ($result) {
                     showMessage('添加成功', 'index.php?act=provider_info&op=index');
@@ -91,6 +92,7 @@ class provider_infoControl extends SystemControl
             $update['admin_url'] = trim($_POST['admin_url']);
             $update['admin_name'] = trim($_POST['admin_name']);
             $update['admin_pwd'] = trim($_POST['admin_pwd']);
+            $update['bz'] = trim($_POST['bz']);
 
             $result = $mod->editProviderInfo($update, ['info_id' => $info_id]);
             if (!$result) {

admin/templates/default/provider.info.add.php

@@ -97,6 +97,12 @@
                 <td class="vatop rowform"><input type="text" id="admin_pwd" name="admin_pwd" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
+            <tr>
+                <td colspan="2" class="required"><label>备注:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><textarea name="bz" rows="6" class="tarea"></textarea></td>
+            </tr>
             </tbody>
             <tfoot>
             <tr class="tfoot">

admin/templates/default/provider.info.edit.php

@@ -1,7 +1,7 @@
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 <style>
     .txt {
-        width: 18%!important;
+        width: 85%!important;
     }
 </style>
 <div class="page">
@@ -66,6 +66,12 @@
                 <td class="vatop"><input type="text" value="<?php echo $output['provider_info']['admin_pwd'];?>" name="admin_pwd" id="admin_pwd" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
+            <tr>
+                <td colspan="2" class="required"><label>备注:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><textarea name="bz" rows="6" class="tarea"><?php echo $output['provider_info']['bz']?></textarea></td>
+            </tr>
             </tbody>
             <tfoot>
             <tr class="tfoot">

admin/templates/default/provider.info.php

@@ -67,6 +67,7 @@
                 <th class="align-center">后台地址</th>
                 <th class="align-center">登录名称</th>
                 <th class="align-center">登录密码</th>
+                <th class="align-center">备注</th>
                 <th class="align-center">操作</th>
             </tr>
             </thead>
@@ -88,6 +89,7 @@
                         </td>
                         <td class="align-center"><?php echo $v['admin_name']; ?></td>
                         <td class="align-center"><?php echo $v['admin_pwd']; ?></td>
+                        <td class="align-center"><?php echo $v['bz']; ?></td>
                         <td class="align-center w200">
                             <a href="index.php?act=provider_info&op=edit&info_id=<?php echo $v['info_id'] ?>">编辑</a>
                             |
@@ -97,14 +99,14 @@
                 <?php } ?>
             <?php } else { ?>
                 <tr class="no_data">
-                    <td colspan="10"><?php echo $lang['nc_no_record']; ?></td>
+                    <td colspan="12"><?php echo $lang['nc_no_record']; ?></td>
                 </tr>
             <?php } ?>
             </tbody>
             <tfoot>
             <tr class="tfoot">
                 <td></td>
-                <td colspan="10">
+                <td colspan="12">
                     <div class="pagination"><?php echo $output['page']; ?></div>
                 </td>
             </tr>

admin/templates/default/refill.order.index.php

@@ -462,6 +462,8 @@
         $('#query_start_time').datepicker({dateFormat: 'yy-mm-dd'});
         $('#query_end_time').datepicker({dateFormat: 'yy-mm-dd'});
         $('#ncsubmit').click(function () {
+            var index = layer.load(0, {shade: false}); 
+
             $('input[name="op"]').val('index');
             let selectArr = selest_nc.getValue();
             let selectStr = ''
@@ -475,6 +477,7 @@
         });
         // 导出
         $('#ncexport').click(function () {
+            
             $('input[name="export"]').val('1');
             $('input[name="op"]').val('index');
             // 不包含客户
@@ -487,9 +490,18 @@
             $('input[name="no_mchid"]').val(selectStr);
             $('#formSearch').submit();
             $('input[name="export"]').val('');
+            var ii = layer.load();
+            setTimeout(function(){
+                layer.close(ii);
+            }, 800);
         })
         // 对账导出
         $('#ncexport_stats').click(function () {
+            var ii = layer.load();
+            setTimeout(function(){
+                layer.close(ii);
+            }, 800);
+
             $('input[name="export_stats"]').val('1');
             $('input[name="op"]').val('index');
             // 不包含客户
@@ -505,6 +517,7 @@
         })
         //搜索+统计 
         $('#ncstat').click(function () {
+            var index = layer.load(0, {shade: false}); 
             $('input[name="fShowStat"]').val('1');
             $('input[name="op"]').val('index');
             // 不包含客户

data/config/xyz/refill.ini.php

@@ -551,15 +551,15 @@ $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
             ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6457, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6457, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6458, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6459, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
@@ -567,15 +567,15 @@ $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
             ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6461, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6462, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6463, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],