合并分支 '1iuzhen' 到 'master'

用户确认页显示内容修改



查看合并请求 !86

@@ -34,10 +34,12 @@
         <i class="iconfont icon-icon-test1"></i>基本信息
         <i class="iconfont icon-icon-test1"></i>基本信息
     </div>
     </div>
     <volist name="orderInfo.groupA" id="vo">
     <volist name="orderInfo.groupA" id="vo">
-        <div class="item_info">
-            <p class="info_item">{$vo.name}</p>
-            <p>{$vo.user_choose}</p>
-        </div>
+        <notempty name="vo.user_choose">
+            <div class="item_info">
+                <p class="info_item">{$vo.name}</p>
+                <p>{$vo.user_choose}</p>
+            </div>
+        </notempty>
     </volist>
     </volist>
 </div>
 </div>
 
 
@@ -48,10 +50,12 @@
             <i class="iconfont icon-icon-test2"></i>订购人信息
             <i class="iconfont icon-icon-test2"></i>订购人信息
         </div>
         </div>
         <volist name="orderInfo.groupB" id="vo">
         <volist name="orderInfo.groupB" id="vo">
-            <div class="item_info">
-                <p class="info_item">{$vo.name}</p>
-                <p>{$vo.user_choose}</p>
-            </div>
+            <notempty name="vo.user_choose">
+                <div class="item_info">
+                    <p class="info_item">{$vo.name}</p>
+                    <p>{$vo.user_choose}</p>
+                </div>
+            </notempty>
         </volist>
         </volist>
     </div>
     </div>
 </notempty>
 </notempty>
@@ -63,10 +67,12 @@
             <i class="iconfont icon-shouhuodizhi"></i>收货信息
             <i class="iconfont icon-shouhuodizhi"></i>收货信息
         </div>
         </div>
         <volist name="orderInfo.groupC" id="vo">
         <volist name="orderInfo.groupC" id="vo">
-            <div class="item_info">
-                <p class="info_item">{$vo.name}</p>
-                <p>{$vo.user_choose}</p>
-            </div>
+            <notempty name="vo.user_choose">
+                <div class="item_info">
+                    <p class="info_item">{$vo.name}</p>
+                    <p>{$vo.user_choose}</p>
+                </div>
+            </notempty>
         </volist>
         </volist>
     </div>
     </div>
 </notempty>
 </notempty>
@@ -78,15 +84,17 @@
             <i class="iconfont icon-gouwugouwuchedinggou"></i>订购信息
             <i class="iconfont icon-gouwugouwuchedinggou"></i>订购信息
         </div>
         </div>
         <volist name="orderInfo.groupD" id="vo">
         <volist name="orderInfo.groupD" id="vo">
-            <div class="item_info">
-                <eq name="vo.type" value="8">
-                    <p class="info_item" style="display: flex;align-items: center;">{$vo.name}</p>
-                    <p class="detail_image"><img src="{:cmf_get_asset_url($vo['user_choose'])}"/></p>
-                    <else/>
-                    <p class="info_item">{$vo.name}</p>
-                    <p>{$vo.user_choose}</p>
-                </eq>
-            </div>
+            <notempty name="vo.user_choose">
+                <div class="item_info">
+                    <eq name="vo.type" value="8">
+                        <p class="info_item" style="display: flex;align-items: center;">{$vo.name}</p>
+                        <p class="detail_image"><img src="{:cmf_get_asset_url($vo['user_choose'])}"/></p>
+                        <else/>
+                        <p class="info_item">{$vo.name}</p>
+                        <p>{$vo.user_choose}</p>
+                    </eq>
+                </div>
+            </notempty>
         </volist>
         </volist>
     </div>
     </div>
 </notempty>
 </notempty>