github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 22:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

Browse Source
This commit is contained in:
sugar1569 2024-07-15 15:06:49 +08:00
commit b4a116679a
50 changed files with 1097 additions and 981 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -144,10 +144,6 @@ So~~想要用CRMEB开源商城系统做公益项目的朋友，可以来免费
![输入图片说明](readme/pic/gongyi1.jpg)
![输入图片说明](readme/pic/gongyi2.jpg)
---
### 💎 捐赠
赠人玫瑰，手留余香！CRMEB诚挚地邀请大家积极参与捐赠，我们会将捐赠获得的费用，悉数用于支持公益项目，让善意无限传递下去！
在此深表感谢~
---
[![输入图片说明](readme/pic/多商户.jpg)](https://www.crmeb.com/index/merchant)
---

4
crmeb/app/adminapi/controller/UpgradeController.php
View File

@ -734,8 +734,8 @@ class UpgradeController
*/
public function upData()
{
$data['new_version'] = 'CRMEB-BZ-BETA v5.4.0';
$data['new_code'] = '540';
$data['new_version'] = 'CRMEB-BZ v5.4.0';
$data['new_code'] = '540.1';
$data['update_sql'] = [
[
'code' => '540',

12
crmeb/app/adminapi/controller/v1/agent/Division.php
View File

@ -141,11 +141,13 @@ class Division extends AuthController
if ((int)$data['uid'] == 0) $data['uid'] = $data['image']['uid'];
$userInfo = $userServices->getUserInfo($data['uid'], 'is_division,is_agent,is_staff');
if (!$userInfo) throw new AdminException(100100);
if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
$divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
if (!$divisionUserInfo) throw new AdminException(100100);
if ($data['edit'] == 0) {
if ($userInfo['is_division']) throw new AdminException('此用户是事业部，请勿添加为代理商');
if ($userInfo['is_agent']) throw new AdminException('此用户是代理商，无法重复添加');
if ($userInfo['is_staff']) throw new AdminException('此用户是下级员工，无法添加为代理商');
$divisionUserInfo = $userServices->count(['uid' => (int)$data['division_id'], 'is_division' => 1, 'division_id' => $data['division_id']]);
if (!$divisionUserInfo) throw new AdminException(100100);
}
$this->services->divisionAgentSave($data);
return app('json')->success(100000);
}

9
crmeb/app/adminapi/controller/v1/marketing/StoreBargain.php
View File

@ -153,7 +153,14 @@ class StoreBargain extends AuthController
{
/** @var StoreBargainUserServices $bargainUserService */
$bargainUserService = app()->make(StoreBargainUserServices::class);
$bargainUserService->userBargainStatusFail($id, false);
if ($status == 0) {
$bargainUserService->userBargainStatusFail($id, false);
} else {
$info = $this->services->get($id);
if ($info['stop_time'] < time()) {
return app('json')->fail('活动已结束，无法继续上架');
}
}
$this->services->update($id, ['status' => $status]);
return app('json')->success(100001);
}

6
crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php
View File

@ -161,6 +161,12 @@ class StoreCombination extends AuthController
*/
public function set_status($id, $status)
{
if ($status == 1) {
$info = $this->services->get($id);
if ($info['stop_time'] < time()) {
return app('json')->fail('活动已结束，无法继续上架');
}
}
$this->services->update($id, ['is_show' => $status]);
return app('json')->success($status == 0 ? 100014 : 100015);
}

6
crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php
View File

@ -120,6 +120,12 @@ class StoreSeckill extends AuthController
*/
public function set_status($id, $status)
{
if ($status == 1) {
$info = $this->services->get($id);
if ($info['stop_time'] < time()) {
return app('json')->fail('活动已结束，无法继续上架');
}
}
$this->services->update($id, ['status' => $status]);
return app('json')->success(100014);
}

2
crmeb/app/adminapi/controller/v1/order/StoreOrderInvoice.php
View File

@ -193,7 +193,7 @@ class StoreOrderInvoice extends AuthController
$data['invoice_type'] = 82;
$data['is_enterprise'] = 0;
} else {
$data['invoice_type'] = 81;
$data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
$data['tax_id'] = $info['duty_number'];
$data['is_enterprise'] = 1;
}

2
crmeb/app/api/controller/v1/order/StoreOrderController.php
View File

@ -267,7 +267,7 @@ class StoreOrderController
//创建订单jspay支付
/** @var StoreOrderSuccessServices $success */
$success = app()->make(StoreOrderSuccessServices::class);
$payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid, $paytype);
$payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid);
if ($payPriceStatus)//0元支付成功
return app('json')->status('success', '支付成功', ['order_id' => $orderInfo['order_id'], 'key' => $orderInfo['unique']]);
else

5
crmeb/app/model/order/StoreOrder.php
View File

@ -634,4 +634,9 @@ class StoreOrder extends BaseModel
{
$query->where('agent_brokerage', '>', $value);
}
public function searchVirtualTypeAttr($query, $value)
{
if ($value !== '') $query->where('virtual_type', $value);
}
}

2
crmeb/app/model/product/product/StoreCategory.php
View File

@ -96,6 +96,6 @@ class StoreCategory extends BaseModel
*/
public function searchIdAttr($query, $value, $data)
{
if ($value) $query->whereIn('id', $value);
if ($value) $query->whereIn('id', is_array($value) ? $value : (string)$value);
}
}

2
crmeb/app/model/product/product/StoreProduct.php
View File

@ -311,7 +311,7 @@ class StoreProduct extends BaseModel
$query->where(['is_show' => 0, 'is_del' => 0]);
break;
case 3:
$query->where(['is_del' => 0]);
$query->where(['is_del' => 0, 'vip_product' => 0]);
break;
case 4:
$query->where(['is_del' => 0])->where(function ($query) {

16
crmeb/app/services/activity/bargain/StoreBargainServices.php
View File

@ -100,20 +100,28 @@ class StoreBargainServices extends BaseServices
/** @var StoreBargainUserHelpServices $storeBargainUserHelpServices */
$storeBargainUserHelpServices = app()->make(StoreBargainUserHelpServices::class);
$countHelpAll = $storeBargainUserHelpServices->getHelpAllCount([['bargain_id', 'in', $ids]]);
$stopIds = [];
foreach ($list as &$item) {
$item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
$item['count_people_help'] = $countHelpAll[$item['id']] ?? 0;//帮忙砍价人数
$item['count_people_success'] = $countSuccess[$item['id']] ?? 0;//砍价成功人数
$item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
if ($item['status']) {
if ($item['start_time'] > time())
if ($item['start_time'] > time()) {
$item['start_name'] = '未开始';
else if ($item['stop_time'] < time())
} else if ($item['stop_time'] < time()) {
$item['start_name'] = '已结束';
else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
$item['status'] = 0;
$stopIds[] = $item['id'];
} else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
$item['start_name'] = '进行中';
}
} else $item['start_name'] = '已结束';
} else {
$item['start_name'] = '已结束';
}
}
if ($stopIds) {
$this->dao->batchUpdate($stopIds, ['status' => 0]);
}
return compact('list', 'count');
}

16
crmeb/app/services/activity/combination/StoreCombinationServices.php
View File

@ -136,20 +136,28 @@ class StoreCombinationServices extends BaseServices
$countAll = $storePinkServices->getPinkCount([]);
$countTeam = $storePinkServices->getPinkCount(['k_id' => 0, 'status' => 2]);
$countPeople = $storePinkServices->getPinkCount(['k_id' => 0]);
$stopIds = [];
foreach ($list as &$item) {
$item['count_people'] = $countPeople[$item['id']] ?? 0;//拼团数量
$item['count_people_all'] = $countAll[$item['id']] ?? 0;//参与人数
$item['count_people_pink'] = $countTeam[$item['id']] ?? 0;//成团数量
$item['stop_status'] = $item['stop_time'] < time() ? 1 : 0;
if ($item['is_show']) {
if ($item['start_time'] > time())
if ($item['start_time'] > time()) {
$item['start_name'] = '未开始';
else if ($item['stop_time'] < time())
} else if ($item['stop_time'] < time()) {
$item['start_name'] = '已结束';
else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
$item['is_show'] = 0;
$stopIds[] = $item['id'];
} else if ($item['stop_time'] > time() && $item['start_time'] < time()) {
$item['start_name'] = '进行中';
}
} else $item['start_name'] = '已结束';
} else {
$item['start_name'] = '已结束';
}
}
if ($stopIds) {
$this->dao->batchUpdate($stopIds, ['is_show' => 0]);
}
return compact('list', 'count');
}

12
crmeb/app/services/activity/seckill/StoreSeckillServices.php
View File

@ -206,14 +206,17 @@ class StoreSeckillServices extends BaseServices
[$page, $limit] = $this->getPageValue();
$list = $this->dao->getList($where, $page, $limit);
$count = $this->dao->count($where + ['is_del' => 0]);
$stopIds = [];
foreach ($list as &$item) {
$item['store_name'] = $item['title'];
if ($item['status']) {
if ($item['start_time'] > time())
if ($item['start_time'] > time()) {
$item['start_name'] = '未开始';
else if (bcadd($item['stop_time'], '86400') < time())
} else if (bcadd($item['stop_time'], '86400') < time()) {
$item['start_name'] = '已结束';
else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
$item['status'] = 0;
$stopIds[] = $item['id'];
} else if (bcadd($item['stop_time'], '86400') > time() && $item['start_time'] < time()) {
$item['start_name'] = '进行中';
}
} else $item['start_name'] = '已结束';
@ -221,6 +224,9 @@ class StoreSeckillServices extends BaseServices
$item['_stop_time'] = $end_time;
$item['stop_status'] = $item['stop_time'] + 86400 < time() ? 1 : 0;
}
if ($stopIds) {
$this->dao->batchUpdate($stopIds, ['status' => 0]);
}
return compact('list', 'count');
}

2
crmeb/app/services/order/StoreOrderDeliveryServices.php
View File

@ -626,7 +626,7 @@ class StoreOrderDeliveryServices extends BaseServices
}
$orderInfo->delivery_id = $data['delivery_id'];
}
if ($data['express_record_type'] != 3) {
if (true) {
$data['status'] = 1;
$orderInfo->delivery_type = $data['delivery_type'];
$orderInfo->delivery_name = $data['delivery_name'];

2
crmeb/app/services/order/StoreOrderInvoiceServices.php
View File

@ -271,7 +271,7 @@ class StoreOrderInvoiceServices extends BaseServices
$data['tax_id'] = '';
$data['is_enterprise'] = 0;
} else {
$data['invoice_type'] = 81;
$data['invoice_type'] = $info['type'] == 1 ? 82 : 81;
$data['tax_id'] = $info['duty_number'];
$data['is_enterprise'] = 1;
}

11
crmeb/app/services/order/StoreOrderServices.php
View File

@ -796,6 +796,15 @@ HTML;
if ($order['two_brokerage'] > 0) {
$data['two_brokerage'] = bcmul((string)$order['two_brokerage'], $percent, 2);
}
if ($order['staff_brokerage'] > 0) {
$data['staff_brokerage'] = bcmul((string)$order['staff_brokerage'], $percent, 2);
}
if ($order['agent_brokerage'] > 0) {
$data['agent_brokerage'] = bcmul((string)$order['agent_brokerage'], $percent, 2);
}
if ($order['division_brokerage'] > 0) {
$data['division_brokerage'] = bcmul((string)$order['division_brokerage'], $percent, 2);
}
}
/** @var StoreOrderStatusServices $services */
$services = app()->make(StoreOrderStatusServices::class);
@ -2582,7 +2591,7 @@ HTML;
}
// 判断是否开启小程序订单管理
$orderData['order_shipping_open'] = false;
if (sys_config('order_shipping_open', 0) && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
if (sys_config('order_shipping_open', 0) && $order['pay_price'] > 0 && $order['is_channel'] == 1 && $order['pay_type'] == 'weixin' && MiniOrderService::isManaged()) {
// 判断是否存在子未收货子订单
if ($order['pid'] > 0) {
if ($this->checkSubOrderNotTake((int)$order['pid'], (int)$order['id'])) {

2
crmeb/app/services/order/StoreOrderTakeServices.php
View File

@ -572,7 +572,7 @@ class StoreOrderTakeServices extends BaseServices
//自定义事件-佣金到账
event('CustomEventListener', ['order_brokerage', [
'uid' => $spread_uid,
'order_id' => $orderInfo['order_id'],
'order_id' => $orderInfo['order_id'] ?? '',
'phone' => $spreadPhone,
'brokeragePrice' => $brokeragePrice,
'goodsName' => $goodsName,

2
crmeb/app/services/other/export/ExportServices.php
View File

@ -218,7 +218,7 @@ class ExportServices extends BaseServices
$export = $fileKey = [];
/** @var StoreOrderServices $orderServices */
$orderServices = app()->make(StoreOrderServices::class);
$data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1])['data'];
$data = $orderServices->getOrderList(['status' => 1, 'shipping_type' => 1, 'virtual_type' => 0])['data'];
if (!empty($data)) {
$i = 0;
foreach ($data as $item) {

21
crmeb/app/services/system/config/SystemConfigServices.php
View File

@ -782,6 +782,27 @@ class SystemConfigServices extends BaseServices
}
$i++;
}
} else {
$sonData = $this->dao->getColumn(['level' => 1, 'link_id' => $data['id']], 'menu_name,link_value');
if ($sonData) {
$sonValue = [];
foreach ($sonData as $sv) {
$sonValue[$sv['link_value']][] = $sv['menu_name'];
}
$i = 0;
foreach ($sonValue as $pk => $pv) {
$label = $data['menu_name'];
if ($i == 1) $label = $data['menu_name'] . '@';
if ($i == 2) $label = $data['menu_name'] . '#';
if (!isset($relateRule[$label])) {
$relateRule[$label]['show_value'] = (int)$pk;
}
foreach ($pv as $pvv) {
$relateRule[$label]['son_type'][$pvv] = '';
}
$i++;
}
}
}
if (isset($relateRule[$key])) {
$role = $relateRule[$key];

1
crmeb/app/services/user/UserExtractServices.php
View File

@ -96,6 +96,7 @@ class UserExtractServices extends BaseServices
$list = $this->dao->getExtractList($where, $field, $page, $limit);
foreach ($list as &$item) {
$item['nickname'] = $item['user']['nickname'] ?? '';
$item['receive_price'] = bcsub((string)$item['extract_price'], (string)$item['extract_fee'], 2);
}
$count = $this->dao->count($where);
return compact('list', 'count');

BIN
template/admin/public/image/logo-small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

1
template/admin/public/index.html
View File

@ -5,6 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="manifest" href="./manifest.json">
<title></title>
</head>
<body>

13
template/admin/public/manifest.json Normal file
View File

@ -0,0 +1,13 @@
{
"name":"CRMEB",
"display":"standalone",
"start_url":".",
"id": "index.html",
"background_color": "#999",
"theme_color":"#292d3e",
"icons":[{
"src":"./image/logo-small.png",
"sizes":"144x144",
"type":"image/png"
}]
}

18
template/admin/src/assets/iconfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 1945396 */
src: url('//at.alicdn.com/t/c/font_1945396_6gitgc05gen.woff2?t=1712912127437') format('woff2'),
url('//at.alicdn.com/t/c/font_1945396_6gitgc05gen.woff?t=1712912127437') format('woff'),
url('//at.alicdn.com/t/c/font_1945396_6gitgc05gen.ttf?t=1712912127437') format('truetype');
src: url('//at.alicdn.com/t/c/font_1945396_qp61r9cscmj.woff2?t=1719814295530') format('woff2'),
url('//at.alicdn.com/t/c/font_1945396_qp61r9cscmj.woff?t=1719814295530') format('woff'),
url('//at.alicdn.com/t/c/font_1945396_qp61r9cscmj.ttf?t=1719814295530') format('truetype');
}
.iconfont {
@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.iconrequ1:before {
content: "\e830";
}
.iconrequ:before {
content: "\e82f";
}
.iconicon_Like_2:before {
content: "\e7e1";
}
.iconic_mall:before {
content: "\e797";
}

2
template/admin/src/components/from/from.vue
View File

@ -1,6 +1,6 @@
<template>
<div v-if="FromData">
<el-dialog :visible.sync="modals" :title="FromData.title" :z-index="1" width="720px" @closed="cancel">
<el-dialog :visible.sync="modals" :title="FromData.title" width="720px" @closed="cancel">
<template>
<div class="radio acea-row row-middle" v-if="FromData.action === '/marketing/coupon/save.html'">
<div class="name ivu-form-item-content">优惠券类型</div>

2
template/admin/src/components/mobilePageDiy/home_goods_list.vue
View File

@ -225,7 +225,7 @@ export default {
name: 'home_goods_list',
cname: '商品列表',
configName: 'c_home_goods_list',
icon: 'iconcuxiaoliebiao1',
icon: 'iconshangpinliebiao1',
type: 0, // 0 基础组件 1 营销组件 2工具组件
defaultName: 'goodList', // 外面匹配名称
props: {

2
template/admin/src/components/mobilePageDiy/home_hotspot.vue
View File

@ -37,7 +37,7 @@ export default {
name: 'home_hotspot',
cname: '热区',
configName: 'c_hotspot',
icon: 'icontupianguanggao1',
icon: 'iconrequ1',
type: 0, // 0 基础组件 1 营销组件 2工具组件
defaultName: 'hotspot', // 外面匹配名称
props: {

2
template/admin/src/components/mobilePageDiy/picture_cube.vue
View File

@ -80,7 +80,7 @@ export default {
name: 'picture_cube',
cname: '图片魔方',
configName: 'c_picture_cube',
icon: 'iconcuxiaoliebiao1',
icon: 'iconshangpinfenlei1',
type: 0, // 0 基础组件 1 营销组件 2工具组件
defaultName: 'pictureCube', // 外面匹配名称
props: {

12
template/admin/src/pages/finance/userExtract/index.vue
View File

@ -101,6 +101,11 @@
<div>{{ scope.row.extract_fee }}</div>
</template>
</el-table-column>
<el-table-column label="到账金额" min-width="100">
<template slot-scope="scope">
<div class="f-price">{{ scope.row.receive_price }}</div>
</template>
</el-table-column>
<el-table-column label="提现方式" min-width="130">
<template slot-scope="scope">
<div class="type" v-if="scope.row.extract_type === 'bank'">
@ -436,4 +441,11 @@ export default {
img
width 100%
height 100%
.z-price {
color: red;
}
.f-price {
color: green;
}
</style>

2
template/admin/src/pages/marketing/storeBargain/create.vue
View File

@ -114,7 +114,7 @@
<el-form-item label="物流方式：" prop="logistics">
<el-checkbox-group v-model="formValidate.logistics">
<el-checkbox label="1">快递</el-checkbox>
<el-checkbox label="2">到店核销</el-checkbox>
<el-checkbox label="2">到店</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>

2
template/admin/src/pages/marketing/storeBargain/index.vue
View File

@ -122,7 +122,6 @@
:inactive-value="0"
v-model="scope.row.status"
:value="scope.row.status"
:disabled="scope.row.stop_status ? true : false"
@change="onchangeIsShow(scope.row)"
size="large"
>
@ -377,6 +376,7 @@ export default {
})
.catch((res) => {
this.$message.error(res.msg);
row.status = !row.status
});
},
},

2
template/admin/src/pages/marketing/storeCombination/create.vue
View File

@ -119,7 +119,7 @@
<el-form-item label="物流方式：" prop="logistics">
<el-checkbox-group v-model="formValidate.logistics">
<el-checkbox label="1">快递</el-checkbox>
<el-checkbox label="2">到店核销</el-checkbox>
<el-checkbox label="2">到店</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>

2
template/admin/src/pages/marketing/storeCombination/index.vue
View File

@ -123,7 +123,6 @@
:inactive-value="0"
v-model="scope.row.is_show"
:value="scope.row.is_show"
:disabled="scope.row.stop_status ? true : false"
@change="onchangeIsShow(scope.row)"
size="large"
active-text="上架"
@ -310,6 +309,7 @@ export default {
})
.catch((res) => {
this.$message.error(res.msg);
row.is_show = !row.is_show
});
},
},

2
template/admin/src/pages/marketing/storeSeckill/create.vue
View File

@ -66,7 +66,7 @@
<el-form-item label="物流方式：" prop="logistics">
<el-checkbox-group v-model="formValidate.logistics">
<el-checkbox label="1">快递</el-checkbox>
<el-checkbox label="2">到店核销</el-checkbox>
<el-checkbox label="2">到店</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>

1
template/admin/src/pages/marketing/storeSeckill/index.vue
View File

@ -359,6 +359,7 @@ export default {
})
.catch((res) => {
this.$message.error(res.msg);
row.status = !row.status
});
},
},

2
template/admin/src/pages/product/productAdd/index.vue
View File

@ -707,7 +707,7 @@
<el-form-item label="物流方式：" prop="logistics">
<el-checkbox-group v-model="formValidate.logistics" @change="logisticsBtn">
<el-checkbox label="1">快递</el-checkbox>
<el-checkbox label="2">到店核销</el-checkbox>
<el-checkbox label="2">到店</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>

2
template/admin/src/pages/product/productList/index.vue
View File

@ -221,7 +221,7 @@
<el-form-item label="物流方式：" prop="logistics">
<el-checkbox-group v-model="batchFormData.logistics" @change="logisticsBtn">
<el-checkbox label="1">快递</el-checkbox>
<el-checkbox label="2">到店核销</el-checkbox>
<el-checkbox label="2">到店</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="运费设置：">

6
template/admin/src/pages/setting/devise/list.vue
View File

@ -10,7 +10,7 @@
</div>
</div>
<el-card class="h100" :bordered="false" shadow="never" v-if="cardShow == 0">
<div class="acea-row">
<div class="acea-row no-warp">
<div class="iframe-col">
<iframe class="iframe-box" :src="iframeUrl" frameborder="0" ref="iframe"></iframe>
<div class="mask"></div>
@ -447,6 +447,9 @@ export default {
background-color: #fff;
padding-bottom: 50px;
}
.no-warp{
flex-wrap: nowrap !important;
}
::v-deep .el-card__body{
padding: 40px;
}
@ -456,6 +459,7 @@ export default {
.iframe-col {
width: 375px;
min-width: 375px;
height: 650px;
margin-right: 30px;
position: relative;

2
template/admin/src/pages/system/codeGeneration/list.vue
View File

@ -618,7 +618,7 @@ export default {
.save {
position: absolute;
left: 50%;
bottom: -30px;
bottom: -10px;
z-index: 99;
}
}

24
template/uni-app/App.vue
View File

@ -258,18 +258,18 @@ export default {
uni.setStorageSync('copyRight', res.data);
});
// #ifdef MP
getSystemVersion().then((res) => {
if (res.data.version_code != SYSTEM_VERSION) {
uni.showModal({
title: '警告',
content: '前后端版本不一致！',
success: function (res) {
if (res.confirm) {
}
}
});
}
});
// getSystemVersion().then((res) => {
// if (res.data.version_code != SYSTEM_VERSION) {
// uni.showModal({
// title: '警告',
// content: '前后端版本不一致！',
// success: function (res) {
// if (res.confirm) {
// }
// }
// });
// }
// });
// #endif
},
// #ifdef H5

4
template/uni-app/manifest.json
View File

@ -2,8 +2,8 @@
"name" : "CRMEB标准版",
"appid" : "__UNI__A3F1ED4",
"description" : "CRMEB标准版",
"versionName" : "5.3.0",
"versionCode" : 530,
"versionName" : "5.4.0",
"versionCode" : 540,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

6
template/uni-app/pages/activity/goods_combination_details/index.vue
View File

@ -484,7 +484,6 @@
// #endif
if (options.hasOwnProperty('id')) {
this.id = options.id
// app.globalData.openPages = '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' + this.userInfo.uid;
if (this.isLogin) {
this.combinationDetail();
} else {
@ -858,9 +857,6 @@
// 授权后回调
onLoadFun: function(e) {
this.userInfo = e
app.globalData.openPages = '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' +
e.uid;
// this.downloadFilePromotionCode();
this.combinationDetail();
},
selecAttr: function() {
@ -1261,7 +1257,7 @@
onShareAppMessage() {
return {
title: this.storeInfo.title,
path: app.globalData.openPages,
path: '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid,
imageUrl: this.storeInfo.image
};
}

4
template/uni-app/pages/activity/goods_combination_status/index.vue
View File

@ -235,7 +235,6 @@
handler: function(newV, oldV) {
if (newV) {
this.userInfo = newV;
app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
}
},
deep: true
@ -269,7 +268,7 @@
let that = this;
return {
title: that.$t(`您的好友`) + that.userInfo.nickname + this.$t(`邀请您参团`) + that.storeCombination.title,
path: app.globalData.openPages,
path: '/pages/activity/goods_combination_status/index?id=' + that.pinkId,
imageUrl: that.storeCombination.image
};
},
@ -319,7 +318,6 @@
// 授权后回调
onLoadFun: function(e) {
this.userInfo = e;
app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
this.getCombinationPink();
},
/**

7
template/uni-app/pages/activity/goods_seckill_details/index.vue
View File

@ -605,11 +605,6 @@
setTimeout(() => {
that.infoScroll();
}, 500);
app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
'&spid=' + that.storeInfo.uid;
// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
// wxh.time(that.data.time, that);
}).catch(err => {
that.$util.Tips({
title: err
@ -1141,7 +1136,7 @@
onShareAppMessage() {
return {
title: this.storeInfo.title,
path: app.globalData.openPages,
path: '/pages/activity/goods_seckill_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid,
imageUrl: this.storeInfo.image
};
}

2
template/uni-app/pages/annex/vip_paid/index.vue
View File

@ -178,7 +178,6 @@
title: this.$t(`微信支付`),
payStatus: true
},
// #ifdef H5 ||APP-PLUS
{
name: this.$t(`支付宝支付`),
icon: 'icon-zhifubao',
@ -186,7 +185,6 @@
title: this.$t(`支付宝支付`),
payStatus: true
},
// #endif
{
name: this.$t(`余额支付`),
icon: 'icon-qiandai',

2
template/uni-app/pages/goods/order_details/index.vue
View File

@ -1136,7 +1136,7 @@ export default {
confirmOrder(orderId) {
let that = this;
// #ifdef MP
if (wx.openBusinessView && this.orderInfo.order_shipping_open && this.orderInfo.trade_no) {
if (wx.openBusinessView && this.orderInfo.order_shipping_open && this.orderInfo.trade_no && this.orderInfo.uid == this.orderInfo.pay_uid) {
uni.showLoading({
title: this.$t(`加载中`)
});

489
template/uni-app/pages/index/diy/components/menus.vue
View File

@ -1,241 +1,250 @@
<template>
<view v-show="!isSortType && menus.length" :class="bgStyle?'borderRadius15':''"
:style="{background:bgColor,margin:'0 '+prConfig*2+'rpx',marginTop:mbConfig*2+'rpx'}">
<view v-if="isMany">
<view class="swiper">
<swiper :interval="interval" :duration="duration" :style="'height:'+(navHigh*2+17)+'rpx;'"
@change='bannerfun'>
<block>
<swiper-item v-for="(item,indexw) in menuList" :key="indexw">
<view class="nav acea-row" :id="'nav' + indexw">
<view :style="'color:' + titleColor" class="item"
:class="number===1?'four':number===2?'five':''" v-for="(itemn,indexn) in item.list"
:key="indexn" @click="menusTap(itemn.info[1].value)">
<view class="pictrue skeleton-radius" :class="menuStyle?'':'on'">
<image :src="itemn.img" mode="aspectFill"></image>
</view>
<view class="menu-txt">{{ $t(itemn.info[0].value) }}</view>
</view>
</view>
</swiper-item>
</block>
</swiper>
</view>
<view class="dot acea-row row-center-wrapper" v-if="docConfig<2">
<view class="dot-item" :class="{ 'line_dot-item': docConfig === 0,'': docConfig === 1}"
:style="active==index?'background:'+ dotColor:''" v-for="(item,index) in menuList"></view>
</view>
</view>
<view class="nav oneNav" v-else>
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
<block v-for="(item, index) in menus" :key="index">
<view class="item" :style="'color:' + titleColor" @click="menusTap(item.info[1].value)">
<view class="pictrue skeleton-radius" :class="menuStyle?'':'on'">
<image :src="item.img" mode="aspectFill"></image>
</view>
<view class="menu-txt">{{ $t(item.info[0].value) }}</view>
</view>
</block>
</scroll-view>
</view>
</view>
</template>
<script>
export default {
name: 'menus',
props: {
dataConfig: {
type: Object,
default: () => {}
},
isSortType: {
type: String | Number,
default: 0
}
},
data() {
return {
interval: 3000,
duration: 500,
menus: this.dataConfig.menuConfig.list || [],
titleColor: this.dataConfig.titleColor.color[0].item,
mbConfig: this.dataConfig.mbConfig.val,
rowsNum: this.dataConfig.rowsNum.type,
number: this.dataConfig.number.type,
isMany: this.dataConfig.tabConfig.tabVal,
menuStyle: this.dataConfig.menuStyle.type,
docConfig: this.dataConfig.pointerStyle.type,
dotColor: this.dataConfig.pointerColor.color[0].item,
bgColor: this.dataConfig.bgColor.color[0].item,
bgStyle: this.dataConfig.bgStyle.type,
prConfig: this.dataConfig.prConfig.val,
navHigh: 0,
menuList: [],
active: 0
};
},
created() {},
mounted() {
if (this.rowsNum === 0) {
if (this.number === 0) {
this.pageNum(6)
} else if (this.number === 1) {
this.pageNum(8)
} else {
this.pageNum(10)
}
} else if (this.rowsNum === 1) {
if (this.number === 0) {
this.pageNum(9)
} else if (this.number === 1) {
this.pageNum(12)
} else {
this.pageNum(15)
}
} else {
if (this.number === 0) {
this.pageNum(12)
} else if (this.number === 1) {
this.pageNum(16)
} else {
this.pageNum(20)
}
}
this.$nextTick(() => {
if (this.menuList.length && this.isMany) {
let that = this
// #ifdef H5
that.menuHeight()
// #endif
// #ifndef H5
setTimeout(() => {
that.menuHeight()
}, 100)
// #endif
}
})
},
methods: {
bannerfun(e) {
this.active = e.detail.current;
},
menuHeight() {
let that = this;
const query = uni.createSelectorQuery().in(this);
query.select('#nav0').boundingClientRect(data => {
that.navHigh = data.height;
}).exec();
},
pageNum(num) {
let count = Math.ceil(this.menus.length / num);
let goodArray = new Array();
for (let i = 0; i < count; i++) {
let list = this.menus.slice(i * num, i * num + num);
if (list.length)
goodArray.push({
list: list
});
}
this.$set(this, 'menuList', goodArray);
},
menusTap(url) {
this.$util.JumpPath(url);
}
}
};
</script>
<style lang="scss">
.dot {
width: 100%;
padding-bottom: 20rpx;
.instruct {
width: 50rpx;
height: 36rpx;
line-height: 36rpx;
background-color: rgba(0, 0, 0, 0.8);
color: #fff;
border-radius: 16rpx;
font-size: 24rpx;
text-align: center;
}
.dot-item {
width: 10rpx;
height: 10rpx;
background: rgba(0, 0, 0, .4);
border-radius: 50%;
margin: 0 4px;
&.line_dot-item {
width: 20rpx;
height: 5rpx;
border-radius: 3rpx;
}
}
}
.nav {
&.oneNav {
padding-bottom: 25rpx;
}
.item {
margin-top: 30rpx;
width: 160rpx;
text-align: center;
font-size: 24rpx;
display: inline-block;
.pictrue {
width: 90rpx;
height: 90rpx;
margin: 0 auto;
image {
width: 100%;
height: 100%;
border-radius: 50%;
}
&.on {
image {
border-radius: 0;
}
}
}
.menu-txt {
margin-top: 15rpx;
}
}
}
.swiper {
z-index: 20;
position: relative;
overflow: hidden;
.nav {
.item {
width: 33.3333%;
&.four {
width: 25%;
}
&.five {
width: 20%;
}
}
}
swiper,
.swiper-item {
width: 100%;
display: block;
}
}
<template>
<view
v-show="!isSortType && menus.length"
:class="bgStyle ? 'borderRadius15' : ''"
:style="{ background: bgColor, margin: '0 ' + prConfig * 2 + 'rpx', marginTop: mbConfig * 2 + 'rpx' }"
>
<view v-if="isMany">
<view class="swiper">
<swiper :interval="interval" :duration="duration" :style="'height:' + navHigh + 'px;'" @change="bannerfun">
<swiper-item v-for="(item, indexw) in menuList" :key="indexw">
<view class="nav acea-row" :id="'nav' + indexw">
<view
:style="'color:' + titleColor"
class="item"
:class="number === 1 ? 'four' : number === 2 ? 'five' : ''"
v-for="(itemn, indexn) in item.list"
:key="indexn"
@click="menusTap(itemn.info[1].value)"
>
<view class="pictrue skeleton-radius" :class="menuStyle ? '' : 'on'">
<image :src="itemn.img" mode="aspectFill"></image>
</view>
<view class="menu-txt">{{ $t(itemn.info[0].value) }}</view>
</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="dot acea-row row-center-wrapper" v-if="docConfig < 2">
<view
class="dot-item"
:class="{ 'line_dot-item': docConfig === 0, '': docConfig === 1 }"
:style="active == index ? 'background:' + dotColor : ''"
v-for="(item, index) in menuList"
></view>
</view>
</view>
<view class="nav oneNav" v-else>
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
<block v-for="(item, index) in menus" :key="index">
<view class="item" :style="'color:' + titleColor" @click="menusTap(item.info[1].value)">
<view class="pictrue skeleton-radius" :class="menuStyle ? '' : 'on'">
<image :src="item.img" mode="aspectFill"></image>
</view>
<view class="menu-txt">{{ $t(item.info[0].value) }}</view>
</view>
</block>
</scroll-view>
</view>
</view>
</template>
<script>
export default {
name: 'menus',
props: {
dataConfig: {
type: Object,
default: () => {}
},
isSortType: {
type: String | Number,
default: 0
}
},
data() {
return {
interval: 3000,
duration: 500,
menus: this.dataConfig.menuConfig.list || [],
titleColor: this.dataConfig.titleColor.color[0].item,
mbConfig: this.dataConfig.mbConfig.val,
rowsNum: this.dataConfig.rowsNum.type,
number: this.dataConfig.number.type,
isMany: this.dataConfig.tabConfig.tabVal,
menuStyle: this.dataConfig.menuStyle.type,
docConfig: this.dataConfig.pointerStyle.type,
dotColor: this.dataConfig.pointerColor.color[0].item,
bgColor: this.dataConfig.bgColor.color[0].item,
bgStyle: this.dataConfig.bgStyle.type,
prConfig: this.dataConfig.prConfig.val,
navHigh: 0,
menuList: [],
active: 0
};
},
created() {},
mounted() {
if (this.rowsNum === 0) {
if (this.number === 0) {
this.pageNum(6);
} else if (this.number === 1) {
this.pageNum(8);
} else {
this.pageNum(10);
}
} else if (this.rowsNum === 1) {
if (this.number === 0) {
this.pageNum(9);
} else if (this.number === 1) {
this.pageNum(12);
} else {
this.pageNum(15);
}
} else {
if (this.number === 0) {
this.pageNum(12);
} else if (this.number === 1) {
this.pageNum(16);
} else {
this.pageNum(20);
}
}
this.$nextTick(() => {
if (this.menuList.length && this.isMany) {
let that = this;
setTimeout(() => {
that.menuHeight();
}, 100);
}
});
},
methods: {
bannerfun(e) {
this.active = e.detail.current;
},
menuHeight() {
let that = this;
const query = uni.createSelectorQuery().in(this);
query
.select('#nav0')
.boundingClientRect((data) => {
console.log(data.height);
that.navHigh = data.height;
})
.exec();
},
pageNum(num) {
let count = Math.ceil(this.menus.length / num);
let goodArray = new Array();
for (let i = 0; i < count; i++) {
let list = this.menus.slice(i * num, i * num + num);
if (list.length)
goodArray.push({
list: list
});
}
this.$set(this, 'menuList', goodArray);
},
menusTap(url) {
this.$util.JumpPath(url);
}
}
};
</script>
<style lang="scss">
.dot {
width: 100%;
padding-bottom: 20rpx;
.instruct {
width: 50rpx;
height: 36rpx;
line-height: 36rpx;
background-color: rgba(0, 0, 0, 0.8);
color: #fff;
border-radius: 16rpx;
font-size: 24rpx;
text-align: center;
}
.dot-item {
width: 10rpx;
height: 10rpx;
background: rgba(0, 0, 0, 0.4);
border-radius: 50%;
margin: 0 4px;
&.line_dot-item {
width: 20rpx;
height: 5rpx;
border-radius: 3rpx;
}
}
}
.nav {
&.oneNav {
padding-bottom: 25rpx;
}
.item {
margin-top: 30rpx;
width: 160rpx;
text-align: center;
font-size: 24rpx;
display: inline-block;
.pictrue {
width: 90rpx;
height: 90rpx;
margin: 0 auto;
image {
width: 100%;
height: 100%;
border-radius: 50%;
}
&.on {
image {
border-radius: 0;
}
}
}
.menu-txt {
margin-top: 15rpx;
}
}
}
.swiper {
z-index: 20;
position: relative;
overflow: hidden;
padding-bottom: 30rpx;
.nav {
.item {
width: 33.3333%;
&.four {
width: 25%;
}
&.five {
width: 20%;
}
}
}
swiper,
.swiper-item {
width: 100%;
display: block;
}
}
</style>

5
template/uni-app/pages/points_mall/integral_goods_details.vue
View File

@ -417,11 +417,6 @@
that.storeImage = that.storeInfo.image
// #endif
that.DefaultSelect();
app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
'&time=' + that.time +
'&status=' + that.status + '&scene=' + that.storeInfo.uid;
// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
// wxh.time(that.data.time, that);
}).catch(err => {
that.$util.Tips({
title: err

1321
template/uni-app/pages/users/user_invoice_form/index.vue
View File

File diff suppressed because it is too large Load Diff