From 44f420f88532afe6e528705f22535fbc45976821 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:28:10 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=9A=82?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-app/pages/goods/cashier/index.vue | 1497 +++++++++-------- 1 file changed, 758 insertions(+), 739 deletions(-) diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue index a0d3c9685..0266a6c55 100644 --- a/template/uni-app/pages/goods/cashier/index.vue +++ b/template/uni-app/pages/goods/cashier/index.vue @@ -1,740 +1,759 @@ - - - - - From f39dc96313e457f92df924c37ed70cbdd40ff820 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:28:54 +0800 Subject: [PATCH 02/12] =?UTF-8?q?improve:=20=E8=A7=84=E6=A0=BC=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/product/productAdd/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue index c7c4baedb..9c7b14351 100644 --- a/template/admin/src/pages/product/productAdd/index.vue +++ b/template/admin/src/pages/product/productAdd/index.vue @@ -2137,6 +2137,7 @@ export default { }, end() { this.moveIndex = ''; + this.generate(1) }, // 单独设置会员设置 checkAllGroupChange(data) { From 2c07999a9a8220c3fe0df45777f4812db637a85e Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:29:07 +0800 Subject: [PATCH 03/12] =?UTF-8?q?style:=20=E5=88=86=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/components/shareRedPackets/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/template/uni-app/components/shareRedPackets/index.vue b/template/uni-app/components/shareRedPackets/index.vue index 8de1f9135..986f60bc6 100644 --- a/template/uni-app/components/shareRedPackets/index.vue +++ b/template/uni-app/components/shareRedPackets/index.vue @@ -140,7 +140,12 @@ .sharing-packets .sharing-con .text .shareBut { font-size: 22rpx; color: #fff; + // #ifdef H5 margin-top: 14rpx; + // #endif + // #ifndef H5 + margin-top: 26rpx; + // #endif height: 50rpx; line-height: 50rpx; } From e60f17553db692ce2af92c2da9e878a28469a6d0 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:29:34 +0800 Subject: [PATCH 04/12] =?UTF-8?q?style:=20=E7=A7=92=E6=9D=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/activity/goods_seckill/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/template/uni-app/pages/activity/goods_seckill/index.vue b/template/uni-app/pages/activity/goods_seckill/index.vue index 32e117786..55fe22129 100644 --- a/template/uni-app/pages/activity/goods_seckill/index.vue +++ b/template/uni-app/pages/activity/goods_seckill/index.vue @@ -254,6 +254,7 @@ .flash-sale .timeLsit .item.on .state { width: 120rpx; height: 30rpx; + line-height: 30rpx; border-radius: 15rpx; background: var(--view-theme); color: #fff; From c3d6c24d1735e0b12d9208ea476b2e3f8c49f712 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:29:59 +0800 Subject: [PATCH 05/12] =?UTF-8?q?improve:=20=E5=A4=B1=E6=95=88=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/user_coupon/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/template/uni-app/pages/users/user_coupon/index.vue b/template/uni-app/pages/users/user_coupon/index.vue index f14b960ad..a3af39894 100644 --- a/template/uni-app/pages/users/user_coupon/index.vue +++ b/template/uni-app/pages/users/user_coupon/index.vue @@ -4,7 +4,8 @@ {{$t(`未使用`)}} - {{$t(`已使用/过期`)}} + {{$t(`已使用/过期`)}} + {{$t(`￥`)}}{{item.coupon_price}} - {{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}} + {{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}} + {{$t(`无门槛券`)}} @@ -122,6 +124,7 @@ this.getUseCoupons(); }, useCoupon(item) { + if (this.navOn == 2) return let url = ''; if (item.category_id == 0 && item.product_id == '') { url = '/pages/goods/goods_list/index?title=默认' @@ -204,7 +207,7 @@ .coupon-list .item .text .condition .name { font-size: 24rpx; - font-weight: 500; + font-weight: 500; line-height: 28rpx; /* display: flex; align-items: center; */ @@ -218,6 +221,7 @@ display: inline-block; vertical-align: middle; } + .condition .line-title { /* width: 70rpx; */ height: 36rpx !important; From 6b4ee7829c144cb6bf3a317aa5b5bfa749b2c1be Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:45:36 +0800 Subject: [PATCH 06/12] =?UTF-8?q?improve:=20=E8=AE=A2=E5=8D=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/goods/order_confirm/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue index fcf82b161..81e7841f4 100644 --- a/template/uni-app/pages/goods/order_confirm/index.vue +++ b/template/uni-app/pages/goods/order_confirm/index.vue @@ -1363,7 +1363,6 @@ addressId: that.addressId, formId: '', couponId: that.couponId, - payType: that.payType, useIntegral: that.useIntegral, bargainId: that.BargainId, combinationId: that.combinationId, From f09a5f21de46cc6e6344ce61441b258df6e0dbc9 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 16:45:56 +0800 Subject: [PATCH 07/12] =?UTF-8?q?improve:=20=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/user_spread_user/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/template/uni-app/pages/users/user_spread_user/index.vue b/template/uni-app/pages/users/user_spread_user/index.vue index 4bc2f28f5..ab114f5f0 100644 --- a/template/uni-app/pages/users/user_spread_user/index.vue +++ b/template/uni-app/pages/users/user_spread_user/index.vue @@ -7,8 +7,8 @@ - {{userInfo.nickname}} - + {{userInfo.nickname}} + {{userInfo.agent_level_name?$t(userInfo.agent_level_name):$t(`分销等级`)}} @@ -270,7 +270,8 @@ .nickname { font-size: 32rpx; - margin: 10rpx 0; + margin: 10rpx 0; + max-width: 8rem; } .level { @@ -281,7 +282,7 @@ transform: scale(0.9); display: flex; align-items: center; - + max-width: 10rem; .icon-xiangyou { transform: scale(0.7); font-size: 28rpx; From 2542ab3615aedc88c01bf126acae78d1f08e339a Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sat, 18 Feb 2023 17:09:32 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/order/StoreOrderController.php | 12 +-- .../v1/user/UserRechargeController.php | 4 +- crmeb/app/api/route/v1.php | 4 +- crmeb/app/services/pay/OrderPayServices.php | 2 +- crmeb/app/services/pay/PayServices.php | 88 +++++++++---------- crmeb/app/services/pay/RechargeServices.php | 4 +- 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index a63c2acfc..6776603ad 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -484,7 +484,7 @@ class StoreOrderController } /** - * 支付宝单独支付 + * TODO 支付宝单独支付 弃用 * @param OrderPayServices $payServices * @param OtherOrderServices $services * @param string $key @@ -494,11 +494,11 @@ class StoreOrderController * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function aliPay(OrderPayServices $payServices, OtherOrderServices $services, string $key, string $quitUrl) - { - $payInfo = $this->services->aliPayOrder($payServices, $services, $key, $quitUrl); - return app('json')->success(['pay_content' => $payInfo]); - } +// public function aliPay(OrderPayServices $payServices, OtherOrderServices $services, string $key, string $quitUrl) +// { +// $payInfo = $this->services->aliPayOrder($payServices, $services, $key, $quitUrl); +// return app('json')->success(['pay_content' => $payInfo]); +// } /** * 订单列表 diff --git a/crmeb/app/api/controller/v1/user/UserRechargeController.php b/crmeb/app/api/controller/v1/user/UserRechargeController.php index e4d35d9ea..57302764d 100644 --- a/crmeb/app/api/controller/v1/user/UserRechargeController.php +++ b/crmeb/app/api/controller/v1/user/UserRechargeController.php @@ -61,7 +61,7 @@ class UserRechargeController } /** - * 小程序充值 + * TODO 小程序充值 弃用 * @param Request $request * @return mixed */ @@ -82,7 +82,7 @@ class UserRechargeController } /** - * 公众号充值 + * TODO 公众号充值 弃用 * @param Request $request * @return mixed */ diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index 127cedd2c..569fef1f8 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -42,8 +42,8 @@ Route::group(function () { Route::post('register/reset', 'v1.LoginController/reset')->name('registerReset'); // 绑定手机号(静默授权 还未有用户信息) Route::post('binding', 'v1.LoginController/binding_phone')->name('bindingPhone'); - // 支付宝复制链接支付 - Route::get('ali_pay', 'v1.order.StoreOrderController/aliPay')->name('aliPay'); + // 支付宝复制链接支付 弃用 +// Route::get('ali_pay', 'v1.order.StoreOrderController/aliPay')->name('aliPay'); //查询版权 Route::get('copyright', 'v1.PublicController/copyright')->option(['real_name' => '申请版权']); diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php index 458ee43de..e8bc1b903 100644 --- a/crmeb/app/services/pay/OrderPayServices.php +++ b/crmeb/app/services/pay/OrderPayServices.php @@ -159,7 +159,7 @@ class OrderPayServices } //发起支付 - $jsConfig = $this->payServices->payV2($payType, $orderInfo['order_id'], $orderInfo['pay_price'], $successAction, $body, $options); + $jsConfig = $this->payServices->pay($payType, $orderInfo['order_id'], $orderInfo['pay_price'], $successAction, $body, $options); //发起支付后处理返回参数 $payInfo = $this->afterPay($orderInfo, $jsConfig, $payType); diff --git a/crmeb/app/services/pay/PayServices.php b/crmeb/app/services/pay/PayServices.php index eb26b594e..e896d63be 100644 --- a/crmeb/app/services/pay/PayServices.php +++ b/crmeb/app/services/pay/PayServices.php @@ -105,7 +105,7 @@ class PayServices * @param string $body * @return array|string */ - public function payV2(string $payType, string $orderId, string $price, string $successAction, string $body, array $options = []) + public function pay(string $payType, string $orderId, string $price, string $successAction, string $body, array $options = []) { try { @@ -139,7 +139,7 @@ class PayServices } /** - * 发起支付 + * TODO 发起支付 弃用 * @param string $payType * @param string $openid * @param string $orderId @@ -148,46 +148,46 @@ class PayServices * @param string $body * @return array|string */ - public function pay(string $payType, string $openid, string $orderId, string $price, string $successAction, string $body, bool $isCode = false) - { - try { - - //这些全都是微信支付 - if (in_array($payType, ['routine', 'weixinh5', 'weixin', 'pc', 'store'])) { - $payType = 'wechat_pay'; - //判断是否使用v3 - if (sys_config('pay_wechat_type') == 1) { - $payType = 'v3_wechat_pay'; - } - } - - if ($payType == 'alipay') { - $payType = 'ali_pay'; - } - - - $options = []; - if (self::ALLIN_PAY === $payType) { - $options['returl'] = $this->getOption('returl'); - if ($options['returl']) { - $options['returl'] = str_replace('http://', 'https://', $options['returl']); - } - $options['is_wechat'] = $this->getOption('is_wechat', false); - $options['appid'] = sys_config('routine_appId'); - $payType = 'allin_pay'; - } - - /** @var Pay $pay */ - $pay = app()->make(Pay::class, [$payType]); - - - return $pay->create($orderId, $price, $successAction, $body, '', ['openid' => $openid, 'isCode' => $isCode, 'pay_new_weixin_open' => (bool)sys_config('pay_new_weixin_open')] + $options); - - } catch (\Exception $e) { - if (strpos($e->getMessage(), 'api unauthorized rid') !== false) { - throw new ApiException('请在微信支付配置中将小程序商户号选择改为商户号绑定'); - } - throw new ApiException($e->getMessage()); - } - } +// public function pay(string $payType, string $openid, string $orderId, string $price, string $successAction, string $body, bool $isCode = false) +// { +// try { +// +// //这些全都是微信支付 +// if (in_array($payType, ['routine', 'weixinh5', 'weixin', 'pc', 'store'])) { +// $payType = 'wechat_pay'; +// //判断是否使用v3 +// if (sys_config('pay_wechat_type') == 1) { +// $payType = 'v3_wechat_pay'; +// } +// } +// +// if ($payType == 'alipay') { +// $payType = 'ali_pay'; +// } +// +// +// $options = []; +// if (self::ALLIN_PAY === $payType) { +// $options['returl'] = $this->getOption('returl'); +// if ($options['returl']) { +// $options['returl'] = str_replace('http://', 'https://', $options['returl']); +// } +// $options['is_wechat'] = $this->getOption('is_wechat', false); +// $options['appid'] = sys_config('routine_appId'); +// $payType = 'allin_pay'; +// } +// +// /** @var Pay $pay */ +// $pay = app()->make(Pay::class, [$payType]); +// +// +// return $pay->create($orderId, $price, $successAction, $body, '', ['openid' => $openid, 'isCode' => $isCode, 'pay_new_weixin_open' => (bool)sys_config('pay_new_weixin_open')] + $options); +// +// } catch (\Exception $e) { +// if (strpos($e->getMessage(), 'api unauthorized rid') !== false) { +// throw new ApiException('请在微信支付配置中将小程序商户号选择改为商户号绑定'); +// } +// throw new ApiException($e->getMessage()); +// } +// } } diff --git a/crmeb/app/services/pay/RechargeServices.php b/crmeb/app/services/pay/RechargeServices.php index b625d8ed3..7285f8534 100644 --- a/crmeb/app/services/pay/RechargeServices.php +++ b/crmeb/app/services/pay/RechargeServices.php @@ -86,7 +86,7 @@ class RechargeServices $openid = ''; } - $res = $this->pay->pay($recharge['recharge_type'], $openid, $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值'); + $res = $this->pay->pay($recharge['recharge_type'], $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值', ['openid' => $openid]); if ($payType == PayServices::WEIXIN_PAY) { if (request()->isH5()) { @@ -100,7 +100,7 @@ class RechargeServices $payStstus = 'allinpay_pay'; } - return ['jsConfig' => $res, 'order_id' => $recharge['order_id'], 'pay_type' => strtoupper($payStstus)]; + return ['jsConfig' => $res, 'pay_key' => md5($recharge['order_id']), 'order_id' => $recharge['order_id'], 'pay_type' => strtoupper($payStstus)]; } } From 38a4e473341b63a09dc69e14520fb775ae0d8a88 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sat, 18 Feb 2023 17:30:29 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E4=B9=B0SVIP?= =?UTF-8?q?=E5=90=8A=E8=B5=B7=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/api/controller/v1/order/OtherOrderController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/OtherOrderController.php b/crmeb/app/api/controller/v1/order/OtherOrderController.php index 92b65bc94..a6b460891 100644 --- a/crmeb/app/api/controller/v1/order/OtherOrderController.php +++ b/crmeb/app/api/controller/v1/order/OtherOrderController.php @@ -157,8 +157,8 @@ class OtherOrderController */ public function pay_type(Request $request) { - $payType['ali_pay_status'] = sys_config('ali_pay_status', 0) != 0; - $payType['pay_weixin_open'] = sys_config('pay_weixin_open', 0) != 0; + $payType['ali_pay_status'] = sys_config('ali_pay_status', '0') != '0'; + $payType['pay_weixin_open'] = sys_config('pay_weixin_open', '0') != '0'; $payType['site_name'] = sys_config('site_name'); $payType['now_money'] = $request->user('now_money'); $payType['offline_pay_status'] = true; From e3b08cbd710b3b21bc6e524f6dbc0d85735aa97f Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 17:43:05 +0800 Subject: [PATCH 10/12] =?UTF-8?q?style:=20=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/annex/vip_paid/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue index 29de79881..e4280079f 100644 --- a/template/uni-app/pages/annex/vip_paid/index.vue +++ b/template/uni-app/pages/annex/vip_paid/index.vue @@ -469,7 +469,7 @@ this.groomList(); uni.hideLoading(); uni.showToast({ - title: this.$t(`成功开启0元试用`), + title: this.$t(`成功开启试用`), }); } }).catch(err => { @@ -488,7 +488,7 @@ this.groomList(); uni.hideLoading(); uni.showToast({ - title: this.$t(`成功开启0元试用`), + title: this.$t(`成功开启试用`), }); } }).catch(err => { From f25d936c4d36d8ee572c1836f1cd79a8ab52bc2b Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 17:43:35 +0800 Subject: [PATCH 11/12] =?UTF-8?q?improve:=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-app/pages/goods/cashier/index.vue | 16 +- .../pages/users/user_payment/index.vue | 1429 ++++++++--------- 2 files changed, 717 insertions(+), 728 deletions(-) diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue index 0266a6c55..269870de7 100644 --- a/template/uni-app/pages/goods/cashier/index.vue +++ b/template/uni-app/pages/goods/cashier/index.vue @@ -505,17 +505,11 @@ case 'ALIPAY_PAY': //#ifdef H5 - if (this.from === 'weixin') { - uni.redirectTo({ - url: `/pages/users/alipay_invoke/index?id=${orderId}&pay_key=${res.data.result.pay_key}` - }); - } else { - uni.hideLoading(); - that.formContent = res.data.result.jsConfig; - that.$nextTick(() => { - document.getElementById('alipaysubmit').submit(); - }) - } + uni.hideLoading(); + that.formContent = res.data.result.jsConfig; + that.$nextTick(() => { + document.getElementById('alipaysubmit').submit(); + }) //#endif // #ifdef MP uni.navigateTo({ diff --git a/template/uni-app/pages/users/user_payment/index.vue b/template/uni-app/pages/users/user_payment/index.vue index 779979922..e6438a971 100644 --- a/template/uni-app/pages/users/user_payment/index.vue +++ b/template/uni-app/pages/users/user_payment/index.vue @@ -1,718 +1,713 @@ - - - - - From f2d8547f504f99c44e1362423f7452d28946d16f Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 17:44:01 +0800 Subject: [PATCH 12/12] =?UTF-8?q?style:=20=E4=B8=8B=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/components/numberScroll.vue | 3 --- .../uni-app/pages/goods/order_confirm/index.vue | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/template/uni-app/components/numberScroll.vue b/template/uni-app/components/numberScroll.vue index 9a7fc8819..2ace75d54 100644 --- a/template/uni-app/components/numberScroll.vue +++ b/template/uni-app/components/numberScroll.vue @@ -78,7 +78,6 @@ let arr = new Array(num.toString().length); arr.fill(0); this.indexArr = arr; - console.log(this.indexArr) }, watch: { num: function(val, oldVal) { @@ -99,7 +98,6 @@ this.indexArr = arr; } this.numChange(val); - console.log(this.indexArr) } }, mounted() { @@ -129,7 +127,6 @@ } } this.indexArr = copyIndexArr; - console.log(this.indexArr) }) } } diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue index 81e7841f4..dfcc56490 100644 --- a/template/uni-app/pages/goods/order_confirm/index.vue +++ b/template/uni-app/pages/goods/order_confirm/index.vue @@ -1614,8 +1614,8 @@ .mark { background-color: #f9f9f9; - width: 345px; - height: 70px; + // width: 345px; + min-height: 70px; border-radius: 1px; margin-top: 15px; padding: 12px 14px; @@ -1626,7 +1626,7 @@ .mark-msg { color: #333; - font-size: 32rpx; + font-size: 28rpx; } } @@ -1669,11 +1669,12 @@ .order-submission .wrapper .item textarea { background-color: #f9f9f9; - width: 690rpx; - height: 140rpx; + width: 100%; + height: 135rpx; border-radius: 3rpx; margin-top: 30rpx; - padding: 25rpx 28rpx; + padding: 25rpx 28rpx; + font-size: 28rpx; box-sizing: border-box; }