From 08e8cb937303cb20082c41ac0dd60a2375a4efa9 Mon Sep 17 00:00:00 2001
From: meng <heibai2006@qq.com>
Date: Sun, 26 Feb 2023 08:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E9=A1=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/index.wxml |  4 ++--
 pages/order/pay/index.wxml    | 28 +++++-----------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 47f1d70..4da4b25 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -175,11 +175,11 @@
             <view class="fui-list noclick" wx:if="{{item.diyformfields.length>0}}">
                 <view class="fui-list-inner">
                     <view class="text">
-                        <view bindtap="diyshow" class="look-diyinfo {{diyshow[item.id]?'open':''}}" data-id="{{item.id}}">{{diyshow[item.id]?'展开':'收起'}}提交的资料</view>
+                        <view bindtap="diyshow" class="look-diyinfo {{!diyshow[item.id]?'':'open'}}" data-id="{{item.id}}">{{!diyshow[item.id]?'展开':'收起'}}提交的资料</view>
                     </view>
                 </view>
             </view>
-            <view hidden="{{diyshow[item.id]}}" wx:if="{{item.diyformfields.length>0}}">
+            <view hidden="{{!diyshow[item.id]}}" wx:if="{{item.diyformfields.length>0}}">
                 <template is="diyform" data="{{diyform:item}}"></template>
             </view>
         </block>
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 6bc5ace..06bc3f7 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -1,29 +1,11 @@
 <loading wx:if="{{!show}}">加载中...</loading>
-
+<import src="/pages/common/diyform_view.wxml"></import>
 <view class="page {{successData.seckill_color}}" wx:if="{{!success&&show}}">
-    <view class="fui-cell-group diyform-container" style="margin-top:0" wx:if="{{list.wpfw.open_wpfw >0}}">
-        <view class="fui-cell" wx:for="{{diyform.diyformfields}}" wx:for-item="field">
-            <view class="fui-cell-label" wx:if="{{field.data_type==13}}" style="width: auto;">{{field.tp_name}}</view>
-            <view class="fui-cell-label" wx:if="{{field.data_type!=13}}">{{field.tp_name}}</view>
-            <view class="fui-cell-info" wx:if="{{field.data_type!=13}}"></view>
-            <view class="fui-cell-remark noremark" wx:if="{{field.data_type!=13}}">
-                <view wx:if="{{field.data_type==0||field.data_type==1||field.data_type==2||field.data_type==6||field.data_type==7||field.data_type==14}}">{{diyform.diyformdata[field.diy_type]}}</view>
-                <view wx:if="">{{diyform.diyformdata[field.diy_type]}}</view>
-                <view wx:if="{{field.data_type==3}}">
-                    <text wx:for="{{diyform.diyformdata[field.diy_type]}}">{{item}} </text>
-                </view>
-                <view wx:if="{{field.data_type==5}}">
-                    <view class="fui-images fui-images-sm">
-                        <image class="image image-sm" src="{{item}}" wx:for="{{diyform.diyformdata[field.diy_type]}}"></image>
-                    </view>
-                </view>
-                <view wx:if="{{field.data_type==8}}">{{diyform.diyformdata[field.diy_type][0]}} 至 {{diyform.diyformdata[field.diy_type][1]}}</view>
-                <view wx:if="{{field.data_type==9}}">{{diyform.diyformdata[field.diy_type].province+' '+diyform.diyformdata[field.diy_type].city}}</view>
-                <view wx:if="{{field.data_type==10}}">{{diyform.diyformdata[field.diy_type].name1}}</view>
-                <view wx:if="{{field.data_type==11}}">{{diyform.diyformdata[field.diy_type]}}</view>
-            </view>
-        </view>
+    <view wx:if="{{list.wpfw.open_wpfw >0}}">
+        <template is="diyform" data="{{diyform:diyform}}"></template>
     </view>
+    <template is="diyform" data="{{diyform:list}}"></template>
+    
     <view class="fui-cell-group">
         <view class="fui-cell">
             <view class="fui-cell-label">订单编号</view>