Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

crmeb/app/dao/activity/integral/StoreIntegralOrderDao.php

@@ -95,7 +95,7 @@ class StoreIntegralOrderDao extends BaseDao
      */
     public function count(array $where = [], bool $search = true)
     {
-        return $this->search($where, $search)->count();
+        return $this->search($where)->count();
     }
 
     /**

crmeb/public/install/crmeb.sql

@@ -33722,7 +33722,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (379, 'ico_path', 'upload', 'input', 26, '', 3, '', 0, 0, '\"\"', 'ICO图标', '程序ICO图标，更换后需要清除浏览器缓存', 85, 1),
 (383, 'tengxun_appid', 'text', 'input', 82, '', 0, '', 0, 0, '\"\"', '腾讯云APPID', '腾讯云APPID', 0, 1),
 (384, 'extract_type', 'checkbox', 'input', 74, '0=>银行卡\n1=>微信\n2=>支付宝', 1, '', 0, 0, '[\"0\",\"1\",\"2\"]', '提现方式', '提现方式', 0, 1),
-(385, 'integral_frozen', 'text', 'input', 11, '', 1, '', 100, 0, '\"0\"', '积分冻结(天)', '积分冻结(天)', 0, 1),
+(385, 'integral_frozen', 'text', 'input', 11, '', 1, '', 100, 0, '\"0\"', '积分冻结(天)', '积分冻结(天)，0为不冻结', 0, 1),
 (386, 'print_type', 'radio', 'input', 86, '1=>易联云\n2=>飞鹅云', 1, '', 0, 0, '\"1\"', '平台选择', '打印平台选择', 0, 1),
 (387, 'config_export_type', 'radio', 'input', 93, '1=>一号通', 1, '', 0, 0, '1', '电子面单类型', '电子面单类型', 0, 1),
 (388, 'customer_corpId', 'text', 'input', 69, '', 1, '', 0, 0, '\"\"', '企业ID', '如果客服链接填写企业微信客服，小程序需要跳转企业微信客服的话需要配置此项，并且在小程序客服中绑定企业ID', 0, 1),

template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue

@@ -49,7 +49,7 @@
               <!-- <DropdownItem name="10" v-show="row._status >= 2">订单打印</DropdownItem> -->
               <DropdownItem name="4" v-show="row.status !== 4">订单备注</DropdownItem>
               <DropdownItem name="8" v-show="row.status === 2">已收货</DropdownItem>
-              <!-- <DropdownItem name="9">删除订单</DropdownItem> -->
+              <DropdownItem name="9" v-show="row.is_del === 1">删除订单</DropdownItem>
             </DropdownMenu>
           </Dropdown>
         </template>