Merge remote-tracking branch 'origin/send_coupon' into send_coupon

zxl

2025-10-14 0e85d5033e1d12210bdffaf697515ff250354d66

Merge remote-tracking branch 'origin/send_coupon' into send_coupon

 manager/src/views/order/order/orderDetail.vue

@@ -176,25 +176,40 @@
          <!-- 外层容器：循环遍历 userCheckTemplates 集合 -->
          <div class="check-template-list">
            <div class="template-item" v-for="(item, index) in orderInfo.userCheckTemplates" :key="item.id">
              <!-- 2. 模板标题：仅第一个循环项显示 templateName（index===0 控制） -->
              <div class="div-item" > <!-- 关键：仅首项渲染 -->
                <div class="div-item-left">商品模板：</div>
                <div class="div-item-right">
                  {{ item.templateName || '无模板标题' }} <!-- 处理空值默认显示 -->
                </div>
              </div>
              <!-- 4. 选择图片：渲染 chooseImg 字段（处理 null/空值） -->
              <div class="div-item">
                <div class="div-item-left">模板图片：</div>
                <div class="div-item-right">
                  <img
                    v-if="item.chooseImg"
                    :src="item.chooseImg"
                    alt="选择的图片"
                    class="selected-img"
                    style="max-width: 200px; max-height: 150px;"
                  >
                  <span v-else>无选择图片</span> <!-- 无图片时默认文本 -->
                </div>
              </div>
              <!-- 1. 商品模板：每个循环项都显示 subName -->
              <div class="div-item">
                <div class="div-item-left">商品模板：</div>
                <div class="div-item-left">模板标题：</div>
                <div class="div-item-right">
                  {{ item.subName || '无商品模板名称' }} <!-- 处理空值默认显示 -->
                </div>
              </div>

              <!-- 2. 模板标题：仅第一个循环项显示 templateName（index===0 控制） -->
              <div class="div-item" v-if="index === 0"> <!-- 关键：仅首项渲染 -->
                <div class="div-item-left">模板标题：</div>
                <div class="div-item-right">
                  {{ item.templateName || '无模板标题' }} <!-- 处理空值默认显示 -->
                </div>
              </div>


              <!-- 3. 文本内容：判断 content 是「图片URL」还是「纯文本」 -->
              <div class="div-item">
                <div class="div-item-left">文本内容：</div>
                <div class="div-item-left">{{isUrl(item.content)? '图片：':'文本内容'}}</div>
                <div class="div-item-right">
                  <!-- 正则判断：content 以 http/https 开头 → 渲染图片；否则渲染文本 -->
                  <img
@@ -208,20 +223,7 @@
                </div>
              </div>

              <!-- 4. 选择图片：渲染 chooseImg 字段（处理 null/空值） -->
              <div class="div-item">
                <div class="div-item-left">选择图片：</div>
                <div class="div-item-right">
                  <img
                    v-if="item.chooseImg"
                    :src="item.chooseImg"
                    alt="选择的图片"
                    class="selected-img"
                    style="max-width: 200px; max-height: 150px;"
                  >
                  <span v-else>无选择图片</span> <!-- 无图片时默认文本 -->
                </div>
              </div>


              <!-- 可选：循环项分隔线，优化视觉 -->
              <hr v-if="index !== orderInfo.userCheckTemplates.length - 1" style="margin: 15px 0; border: none; border-top: 1px solid #eee;">

 seller/src/views/order/order/orderDetail.vue

@@ -152,25 +152,40 @@
          <!-- 外层容器：循环遍历 userCheckTemplates 集合 -->
          <div class="check-template-list">
              <div class="template-item" v-for="(item, index) in orderInfo.userCheckTemplates" :key="item.id">
                <!-- 2. 模板标题：仅第一个循环项显示 templateName（index===0 控制） -->
                <div class="div-item" > <!-- 关键：仅首项渲染 -->
                  <div class="div-item-left">商品模板：</div>
                  <div class="div-item-right">
                    {{ item.templateName || '无模板标题' }} <!-- 处理空值默认显示 -->
                  </div>
                </div>
                <!-- 4. 选择图片：渲染 chooseImg 字段（处理 null/空值） -->
                <div class="div-item">
                  <div class="div-item-left">模板图片：</div>
                  <div class="div-item-right">
                    <img
                      v-if="item.chooseImg"
                      :src="item.chooseImg"
                      alt="选择的图片"
                      class="selected-img"
                      style="max-width: 200px; max-height: 150px;"
                    >
                    <span v-else>无选择图片</span> <!-- 无图片时默认文本 -->
                  </div>
                </div>
            <!-- 1. 商品模板：每个循环项都显示 subName -->
            <div class="div-item">
              <div class="div-item-left">商品模板：</div>
              <div class="div-item-left">模板标题：</div>
              <div class="div-item-right">
                {{ item.subName || '无商品模板名称' }} <!-- 处理空值默认显示 -->
              </div>
            </div>

            <!-- 2. 模板标题：仅第一个循环项显示 templateName（index===0 控制） -->
            <div class="div-item" v-if="index === 0"> <!-- 关键：仅首项渲染 -->
              <div class="div-item-left">模板标题：</div>
              <div class="div-item-right">
                {{ item.templateName || '无模板标题' }} <!-- 处理空值默认显示 -->
              </div>
            </div>


            <!-- 3. 文本内容：判断 content 是「图片URL」还是「纯文本」 -->
            <div class="div-item">
              <div class="div-item-left">文本内容：</div>
              <div class="div-item-left">{{isUrl(item.content)? '图片：':'文本内容'}}</div>
              <div class="div-item-right">
                <!-- 正则判断：content 以 http/https 开头 → 渲染图片；否则渲染文本 -->
                <img
@@ -184,20 +199,7 @@
              </div>
            </div>

            <!-- 4. 选择图片：渲染 chooseImg 字段（处理 null/空值） -->
            <div class="div-item">
              <div class="div-item-left">选择图片：</div>
              <div class="div-item-right">
                <img
                  v-if="item.chooseImg"
                  :src="item.chooseImg"
                  alt="选择的图片"
                  class="selected-img"
                  style="max-width: 200px; max-height: 150px;"
                >
                <span v-else>无选择图片</span> <!-- 无图片时默认文本 -->
              </div>
            </div>


            <!-- 可选：循环项分隔线，优化视觉 -->
            <hr v-if="index !== orderInfo.userCheckTemplates.length - 1" style="margin: 15px 0; border: none; border-top: 1px solid #eee;">