@tplc/business 0.7.68 → 0.7.70

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.7.70](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/compare/v1.0.28...v0.7.70) (2026-01-15)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **wd-img:** remove unnecessary class from image component for cleaner styling ([05e83d5](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/commit/05e83d5a211aba9d90704b7e871f0a29a4962d7a))
+
+
+### ✨ Features | 新功能
+
+* 修改字段 ([8ed5c88](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/commit/8ed5c880145b1d96d1afdd3848da9a6d20ae2ed5))
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.7.68 ([03c52e5](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/commit/03c52e5aa2bed75f0bd7cf66c0d3934d1196329a))
+* **release:** 0.7.69 ([658ab2d](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/commit/658ab2d29555b2f148956fbd8e2600e02ea7d84d))
+
+
+### ♻️ Code Refactoring | 代码重构
+
+* **types:** remove unused type definitions and clean up component type files for better maintainability ([923135e](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/commit/923135ebed7bcbee56deb891cdbc42206cb40b2a))
+
+### [0.7.69](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/compare/v0.7.68...v0.7.69) (2026-01-14)
+
 ### [0.7.68](https://gitlab888.30jia.com.cn/tourism-front/zero-code-pro/compare/v1.0.27...v0.7.68) (2026-01-14)
 
 

package/components/lcb-action-view/components/PayPopup/index.vue

@@ -12,7 +12,7 @@
         <lcb-order-payment
           v-model="form.payType"
           v-model:payCardId="form.payCardId"
-          v-model:paymentInfoItems="form.paymentInfoItems"
+          v-model:paymentInfoJson="form.paymentInfoJson"
           :data="dataInfo?.commitPagePaymentMethod"
           @onWalletPriceChange="onWalletPriceChange"
           v-if="dataInfo?.commitPagePaymentMethod"
@@ -44,7 +44,7 @@ const form = ref({
   payCardId: '',
   toStoreFlag: false,
   walletAccountId: '' as string | undefined,
-  paymentInfoItems: [] as any[],
+  paymentInfoJson: {} as Record<string, any>,
 })
 
 const [pay] = usePay(() =>

package/components/lcb-order-payment/lcb-order-payment.vue

@@ -2,7 +2,7 @@
   <view class="pay-group">
     <wd-radio-group v-model="groupValue" @change="onChange">
       <block v-for="item in data" :key="item.title">
-        <!-- instead: 一级单选，选中后展示表单 -->
+        <!-- instead: 一级单选，选中后展示弹窗入口 -->
         <view v-if="item.type === 'instead'">
           <wd-radio :value="item.type" shape="dot" cell v-if="item.type === 'instead'">
             <view>
@@ -24,14 +24,36 @@
               </view>
             </view>
           </wd-radio>
-          <lcb-form
-            custom-class="ml-56rpx"
-            v-if="payType === item.type && item.items"
-            :fields="item.items"
-            :bottomFixed="false"
-            submitText=""
-            v-model="insteadForm"
-          />
+          <!-- 选中代下单时显示入口/回显卡片 -->
+          <view class="ml-56rpx mt-16rpx" v-if="payType === item.type && item.items">
+            <!-- 未填写时：显示填写入口 -->
+            <view v-if="!hasInsteadFormData" class="instead-entry" @click="openInsteadPopup(item)">
+              <view class="entry-content">
+                <wd-icon name="edit" size="32rpx" color="#999" />
+                <text class="entry-text">{{ t('请填写代下单信息') }}</text>
+              </view>
+              <wd-icon name="xiangyou" class-prefix="lcb" size="28rpx" color="#999" />
+            </view>
+
+            <!-- 已填写时：显示回显卡片 -->
+            <view v-else class="instead-preview" @click="openInsteadPopup(item)">
+              <view class="preview-content">
+                <view v-for="field in item.items" :key="field.field" class="preview-row">
+                  <text class="preview-label">{{ field.fieldCustomName }}</text>
+                  <text class="preview-value">{{ getDisplayValue(field) }}</text>
+                </view>
+              </view>
+              <view class="edit-action">
+                <text class="edit-text">{{ t('修改') }}</text>
+                <wd-icon
+                  name="xiangyou"
+                  class-prefix="lcb"
+                  size="24rpx"
+                  color="var(--wd-color-primary)"
+                />
+              </view>
+            </view>
+          </view>
         </view>
 
         <wd-radio :value="item.type" shape="dot" cell v-else-if="!(item.content || item.items)">
@@ -106,13 +128,97 @@
       </block>
     </wd-radio-group>
     <wd-message-box />
+
+    <!-- 代下单信息填写弹窗 -->
+    <wd-popup
+      v-model="insteadPopupVisible"
+      position="center"
+      closable
+      custom-style="width: 90%; max-height: 80%; border-radius: 16rpx; overflow: hidden;"
+    >
+      <view class="instead-popup">
+        <view class="popup-header">
+          <text class="popup-title">{{ t('填写代下单信息') }}</text>
+        </view>
+        <scroll-view scroll-y class="popup-body">
+          <wd-form ref="insteadFormRef" :model="tempInsteadForm">
+            <wd-cell-group border>
+              <wd-cell
+                v-for="field in currentInsteadItem?.items"
+                :key="field.field"
+                :title="field.fieldCustomName"
+                :required="field.requiredFlag"
+                :prop="field.field"
+                title-width="200rpx"
+                :rules="field.requiredFlag ? [{ required: true, message: t('内容不能为空') }] : []"
+              >
+                <wd-input
+                  v-if="field.frontInputType === 'input'"
+                  :placeholder="field.frontPlaceholder || t('请输入') + field.fieldCustomName"
+                  v-model="tempInsteadForm[field.field]"
+                  v-bind="field.props"
+                  no-border
+                />
+                <wd-input-number
+                  v-else-if="field.frontInputType === 'number'"
+                  :placeholder="field.frontPlaceholder || t('请输入') + field.fieldCustomName"
+                  v-model="tempInsteadForm[field.field]"
+                  v-bind="field.props"
+                  no-border
+                />
+                <wd-textarea
+                  v-else-if="field.frontInputType === 'inputArea'"
+                  :placeholder="field.frontPlaceholder || t('请输入') + field.fieldCustomName"
+                  v-model="tempInsteadForm[field.field]"
+                  v-bind="field.props"
+                />
+                <wd-picker
+                  v-else-if="field.frontInputType === 'selector'"
+                  :columns="getPopupColumns(field.frontInputContent)"
+                  v-model="tempInsteadForm[field.field]"
+                  v-bind="field.props"
+                />
+                <wd-datetime-picker
+                  v-else-if="field.frontInputType === 'date'"
+                  v-model="tempInsteadForm[field.field]"
+                  v-bind="field.props"
+                />
+                <wd-radio-group
+                  v-else-if="
+                    field.frontInputType === 'radio' || field.frontInputType === 'radioTag'
+                  "
+                  v-model="tempInsteadForm[field.field]"
+                  v-bind="field.props"
+                  inline
+                  :shape="field.frontInputType === 'radioTag' ? 'button' : 'dot'"
+                >
+                  <wd-radio
+                    v-for="opt in getPopupColumns(field.frontInputContent)"
+                    :key="opt"
+                    :value="opt"
+                  >
+                    {{ opt }}
+                  </wd-radio>
+                </wd-radio-group>
+              </wd-cell>
+            </wd-cell-group>
+          </wd-form>
+        </scroll-view>
+        <view class="popup-footer">
+          <wd-button type="primary" block @click="onInsteadFormSubmit">
+            {{ t('确认') }}
+          </wd-button>
+        </view>
+      </view>
+    </wd-popup>
   </view>
 </template>
 
 <script lang="ts" setup>
-import type { LcbOrderPaymentProps } from './types'
+import type { LcbOrderPaymentProps, ChildContent } from './types'
+import type { LcbFormField } from '../lcb-form/types'
 import { useMessage, useTranslate } from '@tplc/wot'
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch, onMounted, computed } from 'vue'
 const { translate: t } = useTranslate()
 defineOptions({
   name: 'OrderPayment',
@@ -123,11 +229,11 @@ defineOptions({
   },
 })
 const props = defineProps<LcbOrderPaymentProps>()
-const emits = defineEmits(['onWalletPriceChange'])
+const emits = defineEmits(['onWalletPriceChange', 'refresh'])
 const payType = defineModel<string>()
 const payCardId = defineModel<string>('payCardId')
-// 代下单（instead）表单数据：提交到父级 form.paymentInfoItems
-const paymentInfoItems = defineModel<any[]>('paymentInfoItems')
+// 代下单（instead）表单数据：提交到父级 form.paymentInfoJson
+const paymentInfoJson = defineModel<Record<string, any>>('paymentInfoJson')
 const insteadForm = ref<Record<string, any>>({})
 const getGroupValue = (payType: string, payCardId: string) => {
   return payType ? `${payType}${payCardId ? '-' + payCardId : ''}` : undefined
@@ -140,28 +246,17 @@ watch([payType, payCardId], ([newPayType, newPayCardId]) => {
 })
 
 const syncInsteadPaymentInfo = () => {
-  if (!paymentInfoItems.value) return
+  if (!paymentInfoJson.value) return
   if (payType.value !== 'instead') {
-    paymentInfoItems.value = []
+    paymentInfoJson.value = {}
     return
   }
   const selected = props.data?.find((d) => d.type === 'instead')
   if (!selected) {
-    paymentInfoItems.value = []
+    paymentInfoJson.value = {}
     return
   }
-  const rawItems: any[] = (selected as any).items || []
-  paymentInfoItems.value = [
-    {
-      ...(selected as any),
-      // 保留原始 items（字段定义），同时补上用户输入值，方便后端直接取用
-      items: rawItems.map((f: any) => ({
-        ...f,
-        value: f?.field ? insteadForm.value?.[f.field] : undefined,
-      })),
-      form: { ...insteadForm.value },
-    },
-  ]
+  paymentInfoJson.value = insteadForm.value
 }
 
 watch(payType, () => {
@@ -248,6 +343,62 @@ const onModifyPrice = (price: number, max: number) => {
       }
     })
 }
+
+// ==================== 代下单弹窗相关 ====================
+const insteadPopupVisible = ref(false)
+const currentInsteadItem = ref<ChildContent | null>()
+const tempInsteadForm = ref<Record<string, any>>({})
+const insteadFormRef = ref()
+
+// 是否已填写表单数据
+const hasInsteadFormData = computed(() => {
+  return (
+    Object.keys(insteadForm.value).length > 0 &&
+    Object.values(insteadForm.value).some((v) => v !== undefined && v !== '' && v !== null)
+  )
+})
+
+// 打开弹窗
+const openInsteadPopup = (item: ChildContent) => {
+  currentInsteadItem.value = item
+  // 如果已有数据，用于回显编辑
+  tempInsteadForm.value = { ...insteadForm.value }
+  insteadPopupVisible.value = true
+}
+
+// 获取弹窗表单选项
+const getPopupColumns = (frontInputContent: string) => {
+  try {
+    return JSON.parse(frontInputContent || '[]')
+  } catch {
+    return []
+  }
+}
+
+// 表单提交
+const onInsteadFormSubmit = async () => {
+  if (!insteadFormRef.value) return
+  const { valid } = await insteadFormRef.value.validate()
+  if (!valid) return
+
+  insteadForm.value = { ...tempInsteadForm.value }
+  insteadPopupVisible.value = false
+  syncInsteadPaymentInfo()
+  emits('refresh')
+}
+
+// 获取字段显示值
+const getDisplayValue = (field: LcbFormField) => {
+  const value = insteadForm.value[field.field]
+  if (value === undefined || value === null || value === '') {
+    return '-'
+  }
+  // 处理数组类型（checkbox等）
+  if (Array.isArray(value)) {
+    return value.join('、')
+  }
+  return value
+}
 </script>
 <style lang="scss">
 .pay-group {
@@ -272,13 +423,132 @@ const onModifyPrice = (price: number, max: number) => {
       padding: 0px !important;
     }
   }
+}
 
-  :deep(.lcb-form) {
-    :deep(.wd-cell) {
-      .wd-cell__wrapper {
-        padding: 24rpx 0rpx !important;
-      }
+// 代下单填写入口
+.instead-entry {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+  background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
+  border: 2rpx dashed #e5e5e5;
+  border-radius: 16rpx;
+  cursor: pointer;
+  transition: all 0.2s ease;
+
+  &:active {
+    background: linear-gradient(135deg, #f0f1f2 0%, #f8f8f8 100%);
+  }
+
+  .entry-content {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+  }
+
+  .entry-text {
+    color: #999;
+    font-size: 28rpx;
+  }
+}
+
+// 代下单回显卡片
+.instead-preview {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+  background: linear-gradient(135deg, #f0f7ff 0%, #ffffff 100%);
+  border: 2rpx solid #e8f4ff;
+  border-radius: 16rpx;
+  cursor: pointer;
+  transition: all 0.2s ease;
+
+  &:active {
+    background: linear-gradient(135deg, #e5f2ff 0%, #f5f5f5 100%);
+  }
+
+  .preview-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+  }
+
+  .preview-row {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    font-size: 26rpx;
+  }
+
+  .preview-label {
+    color: #999;
+    flex-shrink: 0;
+  }
+
+  .preview-value {
+    color: #333;
+    font-weight: 500;
+    word-break: break-all;
+  }
+
+  .edit-action {
+    display: flex;
+    align-items: center;
+    gap: 4rpx;
+    flex-shrink: 0;
+    margin-left: 16rpx;
+  }
+
+  .edit-text {
+    color: var(--wd-color-primary);
+    font-size: 26rpx;
+  }
+}
+
+// 代下单弹窗
+.instead-popup {
+  display: flex;
+  flex-direction: column;
+  max-height: 70vh;
+  background: #fff;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+
+  .popup-header {
+    padding: 32rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+    box-sizing: border-box;
+    text-align: center;
+  }
+
+  .popup-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333;
+    text-align: center;
+  }
+
+  .popup-body {
+    flex: 1;
+    padding: 24rpx 32rpx;
+    overflow-y: auto;
+    max-height: 50vh;
+    box-sizing: border-box;
+
+    :deep(.wd-cell__wrapper) {
+      padding: 16rpx 0rpx !important;
     }
   }
+
+  .popup-footer {
+    padding: 24rpx 32rpx;
+    border-top: 1rpx solid #f0f0f0;
+    box-sizing: border-box;
+    flex-shrink: 0;
+  }
 }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tplc/business",
-  "version": "0.7.68",
+  "version": "0.7.70",
   "keywords": [
     "业务组件"
   ],

package/types/components/lcb-order-payment/lcb-order-payment.vue.d.ts

@@ -3,7 +3,7 @@ declare let __VLS_typeProps: LcbOrderPaymentProps
 type __VLS_PublicProps = {
   modelValue?: string
   payCardId?: string
-  paymentInfoItems?: any[]
+  paymentInfoJson?: Record<string, any>
 } & typeof __VLS_typeProps
 declare const _default: import('vue').DefineComponent<
   __VLS_TypePropsToOption<__VLS_PublicProps>,
@@ -16,7 +16,8 @@ declare const _default: import('vue').DefineComponent<
   {
     'update:modelValue': (modelValue: string) => void
     'update:payCardId': (payCardId: string) => void
-    'update:paymentInfoItems': (paymentInfoItems: any[]) => void
+    'update:paymentInfoJson': (paymentInfoJson: Record<string, any>) => void
+    refresh: (...args: any[]) => void
     onWalletPriceChange: (...args: any[]) => void
   },
   string,
@@ -24,8 +25,9 @@ declare const _default: import('vue').DefineComponent<
   Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToOption<__VLS_PublicProps>>> & {
     'onUpdate:modelValue'?: ((modelValue: string) => any) | undefined
     onOnWalletPriceChange?: ((...args: any[]) => any) | undefined
+    onRefresh?: ((...args: any[]) => any) | undefined
     'onUpdate:payCardId'?: ((payCardId: string) => any) | undefined
-    'onUpdate:paymentInfoItems'?: ((paymentInfoItems: any[]) => any) | undefined
+    'onUpdate:paymentInfoJson'?: ((paymentInfoJson: Record<string, any>) => any) | undefined
   },
   {},
   {}