diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php
index df25e87b7..223390680 100644
--- a/crmeb/app/services/activity/combination/StorePinkServices.php
+++ b/crmeb/app/services/activity/combination/StorePinkServices.php
@@ -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 = [];
diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php
index 4efee7790..2ec3d78fc 100644
--- a/crmeb/app/services/system/config/SystemConfigServices.php
+++ b/crmeb/app/services/system/config/SystemConfigServices.php
@@ -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', [
diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php
index 79386c373..dc76c5a2b 100644
--- a/crmeb/crmeb/services/app/WechatService.php
+++ b/crmeb/crmeb/services/app/WechatService.php
@@ -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 = [
diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue
index 49df53fcc..29de79881 100644
--- a/template/uni-app/pages/annex/vip_paid/index.vue
+++ b/template/uni-app/pages/annex/vip_paid/index.vue
@@ -50,7 +50,7 @@
@click="checkType(item)">
{{item.title}}
{{$t(`￥`)}}{{item.pre_price | moneyFormat}}
- {{$t(`试用`)}}{{item.vip_day}}{{$t(`天.`)}}
+ {{$t(`试用`)}}{{item.vip_day}}{{$t(`天`)}}
{{$t(`￥`)}}{{item.price | moneyFormat}}
diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue
index 3887020f2..1ca72ba48 100644
--- a/template/uni-app/pages/goods_details/index.vue
+++ b/template/uni-app/pages/goods_details/index.vue
@@ -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) {
diff --git a/template/uni-app/pages/index/visualization/index.vue b/template/uni-app/pages/index/visualization/index.vue
index 837926dd3..96bf02933 100644
--- a/template/uni-app/pages/index/visualization/index.vue
+++ b/template/uni-app/pages/index/visualization/index.vue
@@ -59,12 +59,10 @@
-
-
-
+
+
diff --git a/template/uni-app/pages/users/user_phone/index.vue b/template/uni-app/pages/users/user_phone/index.vue
index dd62bd118..af4c3e298 100644
--- a/template/uni-app/pages/users/user_phone/index.vue
+++ b/template/uni-app/pages/users/user_phone/index.vue
@@ -25,7 +25,7 @@