diff --git a/subPackages/sub_business_shared/order/index.vue b/subPackages/sub_business_shared/order/index.vue index b3e9772..523f66d 100644 --- a/subPackages/sub_business_shared/order/index.vue +++ b/subPackages/sub_business_shared/order/index.vue @@ -1,45 +1,50 @@ - - + + + + + diff --git a/subPackages/sub_salesperson/store-input/form.vue b/subPackages/sub_salesperson/store-input/form.vue index 66399c0..0319a1c 100644 --- a/subPackages/sub_salesperson/store-input/form.vue +++ b/subPackages/sub_salesperson/store-input/form.vue @@ -35,19 +35,40 @@ /> - - - + + + + {{ item.label }} + + - - - + + + {{ Number(form.is_shipping_free) === 1 ? '包邮' : '不包邮' }} + + - - - + + + {{ Number(form.subscribe_price_change) === 0 ? '订阅' : '不订阅' }} + + @@ -211,22 +232,17 @@ export default { // uView select/picker 显示状态控制 showStoreType: false, - showClinicType: false, - showYesNo: false, - showSub: false, showStartTime: false, showEndTime: false, showBankType: false, - clinicTypeIndex: 1, + clinicTypeIndex: 0, bankTypeIndex: 0, // uView 格式的下拉数据 storeTypes: [{ label: '诊所', value: 0 }, { label: '药店', value: 1 }], storeTypeIndex: 0, clinicTypes: [{ label: '西医诊所', value: 1 }, { label: '中医诊所', value: 2 }], - yesNo: [{ label: '不包邮', value: 0 }, { label: '包邮', value: 1 }], - subscribeOpts: [{ label: '订阅价格波动', value: 0 }, { label: '不订阅价格波动', value: 1 }], bankTypes: [{ label: '对公', value: 1 }, { label: '对私', value: 2 }, { label: '存折', value: 5 }], form: createDefaultStoreInputForm(), @@ -306,7 +322,17 @@ export default { this.bankTypeIndex = Math.max(0, this.bankTypes.findIndex((b) => b.value === Number(d.bank_account_type))) }) }, - yesNoLabel(v) { return Number(v) === 1 ? '包邮' : '不包邮' }, + + selectClinicType(idx) { + this.clinicTypeIndex = idx + this.form.clinic_type = this.clinicTypes[idx].value + }, + onShippingFreeChange(e) { + this.form.is_shipping_free = e.detail.value ? 1 : 0 + }, + onSubscribeChange(e) { + this.form.subscribe_price_change = e.detail.value ? 0 : 1 + }, // --- 下拉及选择器确认事件 --- onStoreTypeConfirm(e) { @@ -314,19 +340,11 @@ export default { this.form.type = selected.value this.storeTypeIndex = this.storeTypes.findIndex((item) => item.value === selected.value) }, - onClinicTypeConfirm(e) { - const selected = e[0]; - this.form.clinic_type = selected.value; - this.clinicTypeIndex = this.clinicTypes.findIndex(item => item.value === selected.value); - }, onBankTypeConfirm(e) { const selected = e[0]; this.form.bank_account_type = selected.value; this.bankTypeIndex = this.bankTypes.findIndex(item => item.value === selected.value); }, - onPickConfirm(field, e) { - this.form[field] = e[0].value; - }, onTimeConfirm(field, e) { this.form[field] = `${e.hour}:${e.minute}`; }, @@ -490,6 +508,31 @@ export default { .time-box { flex: 1; text-align: center; background: #f5f7fa; padding: 12rpx 0; border-radius: 8rpx; font-size: 28rpx; color: #606266; } .time-sep { margin: 0 20rpx; color: #999; } +.clinic-type-cards { display: flex; gap: 20rpx; width: 100%; } +.clinic-type-card { + flex: 1; + padding: 24rpx 16rpx; + text-align: center; + background: #f5f7fa; + border: 2rpx solid #e4e7ed; + border-radius: 12rpx; + box-sizing: border-box; +} +.clinic-type-card.active { + background: rgba(106, 205, 187, 0.08); + border-color: #6acdbb; +} +.clinic-type-label { font-size: 28rpx; color: #303133; } +.clinic-type-card.active .clinic-type-label { color: #6acdbb; font-weight: 600; } +.switch-row { + display: flex; + align-items: center; + justify-content: flex-end; + width: 100%; + gap: 16rpx; +} +.switch-hint { font-size: 26rpx; color: #86909c; } + /* 图片资料区域 */ .upload-group { margin-bottom: 30rpx; padding-bottom: 20rpx; border-bottom: 1rpx solid #f5f5f5; } .upload-group:last-child { border-bottom: none; } diff --git a/utils/utils.js b/utils/utils.js index 62c7394..d0b9d95 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -6,8 +6,8 @@ export function checkDev(key = '') { // 判断某些模块是否开启 switch (key) { case 'dev': - return false; - // return true; + // return false; + return true; case 'open-im': // return false; return true;