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

Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

Browse Source
This commit is contained in:
吴昊天 2023-02-18 10:48:35 +08:00
commit 54862edb3c
13 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crmeb/app/services/activity/combination/StorePinkServices.php
View File

@ -151,8 +151,23 @@ class StorePinkServices extends BaseServices
$where['cid'] = $id;
$where['k_id'] = 0;
$where['is_refund'] = 0;
$list = $this->dao->pinkList($where);
$ids = array_column($list, 'id');
$pinkList = $this->dao->pinkList($where);
$ids = array_column($pinkList, 'id');
$orderIdKey = array_column($pinkList, 'order_id_key');
$refunList = [];
if ($orderIdKey) {
$refunList = app()->make(StoreOrderRefundServices::class)->getColumn([['store_order_id', 'in', $orderIdKey]], 'id', 'store_order_id');
}
if ($refunList) {
$list = [];
foreach ($pinkList as $item) {
if (!isset($refunList[$item['order_id_key']])) {
$list[] = $item;
}
}
} else {
$list = $pinkList;
}
$counts = $this->dao->getPinkPeopleCount($ids);
if ($type) {
$pinkAll = [];

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

@ -124,14 +124,6 @@ class SystemConfigServices extends BaseServices
],
'show_value' => 1
],
'allin_pay_status' => [
'son_type' => [
'allin_appid' => '',
'allin_cusid' => '',
'allin_private_key' => '',
],
'show_value' => 1
],
'pay_wechat_type' => [
'son_type' => [
'pay_weixin_key' => '',
@ -410,7 +402,7 @@ class SystemConfigServices extends BaseServices
foreach ($parameter as $v) {
if (strstr($v, $this->cuttingStr) !== false) {
$pdata = explode($this->cuttingStr, $v);
$options[] = ['label' => $pdata[1], 'value' => (int)$pdata[0]];
$options[] = ['label' => $pdata[1], 'value' => $pdata[0]];
}
}
$formbuider[] = $radio = $this->builder->radio($data['menu_name'], $data['info'], (int)$data['value'])->options($options)->appendRule('suffix', [

8
crmeb/crmeb/services/app/WechatService.php
View File

@ -60,7 +60,13 @@ class WechatService
$appId = isset($wechat['wechat_app_appid']) ? trim($wechat['wechat_app_appid']) : '';
$appsecret = isset($wechat['wechat_app_appsecret']) ? trim($wechat['wechat_app_appsecret']) : '';
} else {
$appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : '';
$appId = null;
if (request()->isPc()) {
$appId = sys_config('wechat_open_app_id');
}
if (!$appId) {
$appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : '';
}
$appsecret = isset($wechat['wechat_appsecret']) ? trim($wechat['wechat_appsecret']) : '';
}
$config = [

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

@ -50,7 +50,7 @@
@click="checkType(item)">
<view>{{item.title}}</view>
<view class="new">{{$t(`￥`)}}<text class="num">{{item.pre_price | moneyFormat}}</text></view>
<view v-if="item.type === 'free'" class="info">{{$t(`试用`)}}{{item.vip_day}}{{$t(`天.`)}}</view>
<view v-if="item.type === 'free'" class="info">{{$t(`试用`)}}{{item.vip_day}}{{$t(`天`)}}</view>
<view v-else class="old">{{$t(`￥`)}}{{item.price | moneyFormat}}</view>
</view>
</scroll-view>

8
template/uni-app/pages/goods_details/index.vue
View File

@ -757,10 +757,10 @@
summary: that.storeInfo.store_info,
imageUrl: that.storeInfo.small_image,
success: function(res) {
uni.showToast({
title: that.$t(`分享成功`),
icon: "success",
});
// uni.showToast({
// title: that.$t(`分享成功`),
// icon: "success",
// });
that.posters = false;
},
fail: function(err) {

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

@ -59,12 +59,10 @@
<newGoods :dataConfig="goodList.cc" @click.native="bindEdit('goodList', 'cc')"></newGoods>
<!-- 精品推荐 -->
<!-- <mBanner :dataConfig="swiperBg.cc" @click.native="bindEdit('swiperBg','cc')"></mBanner> -->
<!-- <titles :dataConfig="titles.default" :sty="'off'" @click.native="bindEdit('titles','default')"></titles> -->
<!-- 商品轮播 -->
<!-- <customerService :dataConfig="customerService.default" @click.native="bindEdit('customerService','default')"></customerService> -->
<!-- 促销单品 -->
<!-- 精选单品 -->
<promotion :dataConfig="goodList.dd" @click.native="bindEdit('goodList', 'dd')"></promotion>
<!-- 商品分类 -->
<tabNav class="sticky-box" :style="'top:' + isTop + 'px;'" :dataConfig="tabNav.default"

2
template/uni-app/pages/users/auth/index.vue
View File

@ -51,7 +51,7 @@
import {
registerVerify
} from '@/api/user.js'
import Verify from '../components/verify/verify.vue';
import Verify from '../components/verify/index.vue';
export default {
name: "Auth",
components: {

2
template/uni-app/pages/users/components/login_mobile/index.vue
View File

@ -21,7 +21,7 @@
const app = getApp();
import sendVerifyCode from "@/mixins/SendVerifyCode";
import Routine from '@/libs/routine';
import Verify from '../verify/verify.vue';
import Verify from '../verify/index.vue';
import Cache from '@/utils/cache';
import {
loginMobile,

2
template/uni-app/pages/users/components/verify/verify.vue → template/uni-app/pages/users/components/verify/index.vue
View File

@ -38,7 +38,7 @@
* Verify 验证码组件
* @description 分发验证码使用
* */
import VerifySlide from './verifySlider/verifySlider'
import VerifySlide from './verifySlider/index.vue'
import verifySliderPc from './verifySlider/verifySliderPc'
import VerifyPoint from "./verifyPoint/verifyPoint"

0
template/uni-app/pages/users/components/verify/verifySlider/verifySlider.vue → template/uni-app/pages/users/components/verify/verifySlider/index.vue
View File

4
template/uni-app/pages/users/login/index.vue
View File

@ -129,7 +129,7 @@
// #endif
const BACK_URL = "login_back_url";
import colors from '@/mixins/color.js';
import Verify from '../components/verify/verify.vue';
import Verify from '../components/verify/index.vue';
export default {
name: "Login",
components: {
@ -845,4 +845,4 @@
.main-color {
color: var(--view-theme);
}
</style>
</style>

2
template/uni-app/pages/users/user_phone/index.vue
View File

@ -25,7 +25,7 @@
<script>
import sendVerifyCode from "@/mixins/SendVerifyCode";
import Verify from '../components/verify/verify.vue';
import Verify from '../components/verify/index.vue';
import {
registerVerify,
bindingUserPhone,

2
template/uni-app/pages/users/user_pwd_edit/index.vue
View File

@ -52,7 +52,7 @@
import authorize from '@/components/Authorize';
// #endif
import colors from '@/mixins/color.js';
import Verify from '../components/verify/verify.vue';
import Verify from '../components/verify/index.vue';
export default {
mixins: [sendVerifyCode, colors],
components: {