diff --git a/backend/application/extra/common.php b/backend/application/extra/common.php index 63de2da..d101a33 100644 --- a/backend/application/extra/common.php +++ b/backend/application/extra/common.php @@ -19,10 +19,10 @@ return [ // 商户 API 证书(商户平台-账户中心-API安全 下载, v2/v3 共用同一套) 'private_key' => APP_PATH . 'extra/cert/apiclient_key.pem', // 商户证书私钥 绝对路径 'certificate' => APP_PATH . 'extra/cert/apiclient_cert.pem', // 商户API证书 绝对路径 - // 微信支付公钥模式(2024Q3+ 推荐): 公钥ID以 PUB_KEY_ID_ 开头, 公钥文件存放于 extra/cert/wechatpay_pub.pem + // 微信支付公钥模式(2024Q3+ 推荐): 公钥ID以 PUB_KEY_ID_ 开头, 公钥文件存放于 extra/cert/pub_key.pem // 两者都配置后无需再下载平台证书 - 'platform_certs' => (Env::get('wechat.pub_key_id') && is_file(APP_PATH . 'extra/cert/wechatpay_pub.pem')) - ? [Env::get('wechat.pub_key_id') => APP_PATH . 'extra/cert/wechatpay_pub.pem'] + 'platform_certs' => (Env::get('wechat.pub_key_id') && is_file(APP_PATH . 'extra/cert/pub_key.pem')) + ? [Env::get('wechat.pub_key_id') => APP_PATH . 'extra/cert/pub_key.pem'] : [], // 支付结果通知地址(也可在下单时单独覆盖) 'notify_url' => Env::get('app.url') . '/api/order/payNotify', diff --git a/frontend/miniapp/components/goods-card/index.js b/frontend/miniapp/components/goods-card/index.js index e22aace..c5bdc68 100644 --- a/frontend/miniapp/components/goods-card/index.js +++ b/frontend/miniapp/components/goods-card/index.js @@ -32,6 +32,12 @@ Component({ value: '¥', }, + // 是否展示"购买"引导按钮(仅商品列表等售卖场景开启) + showBuy: { + type: Boolean, + value: false, + }, + thresholds: { type: Array, value: [], diff --git a/frontend/miniapp/components/goods-card/index.wxml b/frontend/miniapp/components/goods-card/index.wxml index da251f1..ddd1d2f 100644 --- a/frontend/miniapp/components/goods-card/index.wxml +++ b/frontend/miniapp/components/goods-card/index.wxml @@ -19,6 +19,9 @@ + + + diff --git a/frontend/miniapp/components/goods-card/index.wxss b/frontend/miniapp/components/goods-card/index.wxss index 87d73d4..ae61928 100644 --- a/frontend/miniapp/components/goods-card/index.wxss +++ b/frontend/miniapp/components/goods-card/index.wxss @@ -112,6 +112,28 @@ line-height: 44rpx; } +/* "购买"引导按钮:圆形加号图标,沉底右对齐 */ +.goods-card__buy { + display: flex; + align-items: center; + justify-content: center; + align-self: flex-end; + margin-left: auto; + width: 52rpx; + height: 52rpx; + flex-shrink: 0; + color: var(--text-inverse); + background: var(--brand-gradient); + border-radius: var(--radius-round); + box-shadow: 0 4rpx 12rpx rgba(255, 95, 21, 0.28); + transition: transform 0.16s ease, box-shadow 0.16s ease; +} + +.goods-card__buy--hover { + transform: scale(0.9); + box-shadow: 0 2rpx 6rpx rgba(255, 95, 21, 0.2); +} + .goods-card__origin-price { order: 2; margin: 0 0 0 12rpx; diff --git a/frontend/miniapp/components/goods-list/index.js b/frontend/miniapp/components/goods-list/index.js index 2d09126..71c4a5b 100644 --- a/frontend/miniapp/components/goods-list/index.js +++ b/frontend/miniapp/components/goods-list/index.js @@ -17,6 +17,11 @@ Component({ type: Array, value: [], }, + // 是否展示卡片上的"购买"引导按钮 + showBuy: { + type: Boolean, + value: false, + }, }, data: { diff --git a/frontend/miniapp/components/goods-list/index.wxml b/frontend/miniapp/components/goods-list/index.wxml index c3bbcb6..11a74f0 100644 --- a/frontend/miniapp/components/goods-list/index.wxml +++ b/frontend/miniapp/components/goods-list/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/frontend/miniapp/pages/cart/components/cart-bar/index.wxml b/frontend/miniapp/pages/cart/components/cart-bar/index.wxml index 486a0d5..a487e9c 100644 --- a/frontend/miniapp/pages/cart/components/cart-bar/index.wxml +++ b/frontend/miniapp/pages/cart/components/cart-bar/index.wxml @@ -17,7 +17,6 @@ decimalSmaller class="cart-bar__total--bold cart-bar__total--price" /> - (不含运费) 已优惠 diff --git a/frontend/miniapp/pages/developer/join/index.js b/frontend/miniapp/pages/developer/join/index.js index 596104e..c3e72d7 100644 --- a/frontend/miniapp/pages/developer/join/index.js +++ b/frontend/miniapp/pages/developer/join/index.js @@ -12,6 +12,9 @@ Page({ languageSelected: [], frontSelected: [], backendSelected: [], + languageSelectedMap: {}, + frontSelectedMap: {}, + backendSelectedMap: {}, desc: '', job: '', workYears: 0, @@ -33,13 +36,21 @@ Page({ }); }, - handleGroupChange(event) { - console.log('group', event.detail.value); - const { field } = event.currentTarget.dataset; // 获取 data-field 的值 - console.log(field); - this.setData({ - [field + 'Selected']: event.detail.value, // 动态设置对应的Selected数组 - }); + onChipTap(e) { + const { field, value } = e.currentTarget.dataset; + const key = field + 'Selected'; + const mapKey = field + 'SelectedMap'; + const selected = this.data[key].slice(); + const map = Object.assign({}, this.data[mapKey]); + const idx = selected.indexOf(value); + if (idx > -1) { + selected.splice(idx, 1); + delete map[value]; + } else { + selected.push(value); + map[value] = true; + } + this.setData({ [key]: selected, [mapKey]: map }); }, onInputChange(e) { diff --git a/frontend/miniapp/pages/developer/join/index.json b/frontend/miniapp/pages/developer/join/index.json index c0a38de..026cf40 100644 --- a/frontend/miniapp/pages/developer/join/index.json +++ b/frontend/miniapp/pages/developer/join/index.json @@ -1,10 +1,6 @@ { "navigationBarTitleText": "人才入驻", "usingComponents": { - "t-tag": "tdesign-miniprogram/tag/tag", - "t-check-tag": "tdesign-miniprogram/check-tag/check-tag", - "t-checkbox": "tdesign-miniprogram/checkbox/checkbox", - "t-checkbox-group": "tdesign-miniprogram/checkbox-group/checkbox-group", "t-textarea": "tdesign-miniprogram/textarea/textarea", "t-input": "tdesign-miniprogram/input/input", "t-divider": "tdesign-miniprogram/divider/divider", diff --git a/frontend/miniapp/pages/developer/join/index.wxml b/frontend/miniapp/pages/developer/join/index.wxml index a9a47ed..d771176 100644 --- a/frontend/miniapp/pages/developer/join/index.wxml +++ b/frontend/miniapp/pages/developer/join/index.wxml @@ -3,25 +3,40 @@ 1.请选择你掌握的技术栈 - - - - - + + {{item}} + - - - - - + + {{item}} + - - - - - + + {{item}} + diff --git a/frontend/miniapp/pages/developer/join/index.wxss b/frontend/miniapp/pages/developer/join/index.wxss index e6ae58a..b55627e 100644 --- a/frontend/miniapp/pages/developer/join/index.wxss +++ b/frontend/miniapp/pages/developer/join/index.wxss @@ -170,10 +170,34 @@ page view { padding-left: 32rpx; } -.t-class-text { - margin-right: 15rpx; +/* ================= 技能胶囊多选(横排自动换行) ================= */ +.chip-list { + display: flex; + flex-wrap: wrap; + margin-right: -20rpx; } -.t-checkbox__icon--left { - margin-right: 3rpx !important; +.chip-item { + box-sizing: border-box; + max-width: 100%; + padding: 14rpx 36rpx; + margin: 0 20rpx 20rpx 0; + border: 2rpx solid var(--border-level-1); + border-radius: var(--radius-round); + background: var(--bg-grey); + font-size: 28rpx; + line-height: 44rpx; + color: var(--text-primary); + transition: background-color 0.2s ease, color 0.2s ease, border-color 0.2s ease; +} + +.chip-item:active { + opacity: 0.8; +} + +.chip-item--active { + background: var(--brand-light); + border-color: var(--brand); + color: var(--brand); + font-weight: 500; } \ No newline at end of file diff --git a/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.js b/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.js index 7e84c4c..25fffde 100644 --- a/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.js +++ b/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.js @@ -322,12 +322,5 @@ Component({ buyNum, }); }, - - handleBuyNumChange(e) { - const { value } = e.detail; - this.setData({ - buyNum: value, - }); - }, }, }); diff --git a/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.wxml b/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.wxml index 59cb3aa..b24ff77 100644 --- a/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.wxml +++ b/frontend/miniapp/pages/goods/details/components/goods-specs-popup/index.wxml @@ -54,9 +54,8 @@ 购买数量 - ({{limitBuyInfo}}) - + diff --git a/frontend/miniapp/pages/goods/list/index.wxml b/frontend/miniapp/pages/goods/list/index.wxml index 0210781..3f3981f 100644 --- a/frontend/miniapp/pages/goods/list/index.wxml +++ b/frontend/miniapp/pages/goods/list/index.wxml @@ -29,7 +29,7 @@ - + diff --git a/frontend/miniapp/pages/order/after-service-list/api.js b/frontend/miniapp/pages/order/after-service-list/api.js index 68bbf56..c630026 100644 --- a/frontend/miniapp/pages/order/after-service-list/api.js +++ b/frontend/miniapp/pages/order/after-service-list/api.js @@ -56,8 +56,6 @@ export const resp = { rightsStatusName: '已完成', rightsType: 20, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -239,8 +237,6 @@ export const resp = { rightsStatusName: '已审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -360,8 +356,6 @@ export const resp = { rightsStatusName: '已关闭', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -479,8 +473,6 @@ export const resp = { rightsStatusName: '已完成', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店', @@ -594,8 +586,6 @@ export const resp = { rightsStatusName: '已审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -709,8 +699,6 @@ export const resp = { rightsStatusName: '待审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店-大猫集团旗舰店', @@ -826,8 +814,6 @@ export const resp = { rightsStatusName: '已审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -941,8 +927,6 @@ export const resp = { rightsStatusName: '已审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -1055,8 +1039,6 @@ export const resp = { rightsStatusName: '已审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', @@ -1169,8 +1151,6 @@ export const resp = { rightsStatusName: '已审核', rightsType: 10, saasId: 123, - shippingFee: 99, - shippingFeeBear: 1, storeId: 123, storeName: '大猫集团旗舰店', uid: '123', diff --git a/frontend/miniapp/pages/order/apply-service/index.js b/frontend/miniapp/pages/order/apply-service/index.js index 78eadc9..9dd9621 100644 --- a/frontend/miniapp/pages/order/apply-service/index.js +++ b/frontend/miniapp/pages/order/apply-service/index.js @@ -154,10 +154,7 @@ Page({ current: res.data.refundableAmount, }, 'serviceFrom.returnNum': res.data.numOfSku, - amountTip: `最多可申请退款¥ ${priceFormat(res.data.refundableAmount, 2)},含发货运费¥ ${priceFormat( - res.data.shippingFeeIncluded, - 2, - )}`, + amountTip: `最多可申请退款¥ ${priceFormat(res.data.refundableAmount, 2)}`, maxApplyNum: res.data.numOfSkuAvailable, }); } catch (err) { diff --git a/frontend/miniapp/pages/order/order-confirm/index.wxml b/frontend/miniapp/pages/order/order-confirm/index.wxml index 75604fa..da005a7 100644 --- a/frontend/miniapp/pages/order/order-confirm/index.wxml +++ b/frontend/miniapp/pages/order/order-confirm/index.wxml @@ -26,16 +26,6 @@ 商品总额 - - 运费 - - - + - - - 免运费 - - 活动优惠 diff --git a/frontend/miniapp/pages/order/order-detail/index.wxml b/frontend/miniapp/pages/order/order-detail/index.wxml index 75967fb..84bdd1f 100644 --- a/frontend/miniapp/pages/order/order-detail/index.wxml +++ b/frontend/miniapp/pages/order/order-detail/index.wxml @@ -11,16 +11,6 @@ 商品总额 - 活动优惠 diff --git a/frontend/miniapp/pages/order/order-list/index.js b/frontend/miniapp/pages/order/order-list/index.js index 3e6dd10..a485040 100644 --- a/frontend/miniapp/pages/order/order-list/index.js +++ b/frontend/miniapp/pages/order/order-list/index.js @@ -115,7 +115,6 @@ Page({ })), buttons: order.buttonVOs || [], groupInfoVo: order.groupInfoVo, - freightFee: order.freightFee, }; }); } diff --git a/frontend/miniapp/pages/order/order-list/index.wxml b/frontend/miniapp/pages/order/order-list/index.wxml index 10e4802..1f92245 100644 --- a/frontend/miniapp/pages/order/order-list/index.wxml +++ b/frontend/miniapp/pages/order/order-list/index.wxml @@ -16,9 +16,6 @@ 总价 - ,运费 - -   实付  diff --git a/frontend/miniapp/pages/order/order-list/index.wxss b/frontend/miniapp/pages/order/order-list/index.wxss index 28cf74d..aa87f34 100644 --- a/frontend/miniapp/pages/order/order-list/index.wxss +++ b/frontend/miniapp/pages/order/order-list/index.wxss @@ -81,6 +81,7 @@ wr-order-goods-card:not(:first-child) .wr-goods-card { } .price-total .bold-price { + margin-left: 24rpx; color: var(--text-primary); font-size: 28rpx; line-height: 40rpx;