From 51e8f70480fd0e66a975fdde1b3aa02caf96221f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Thu, 21 Apr 2022 18:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E5=88=AB=E7=BA=A6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/js/config.js            | 2 +-
 pages/order/detail/index2.wxml  | 4 ++++
 pages/order/edit/index2.js      | 2 +-
 pages/order/edit/index2.wxml    | 8 ++++----
 pages/order/register/index.js   | 2 +-
 pages/order/register/index.wxml | 6 +++---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/commons/js/config.js b/commons/js/config.js
index 23d1132..3f9d48e 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -1,4 +1,4 @@
-const env = "p";
+const env = "d";
 
 const version = 1,
 
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index b892a53..11f472a 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -106,6 +106,10 @@
           </block>
         </block>
       </block>
+      <block wx:if="{{info.sa}}">
+        <view class="relative pt30 font-28 color-333">特别约定</view>
+        <view class="mt20 inner30 bds-1-eb line-height-16 font-28 color-666 ulib-r10">{{info.sa}}</view>
+      </block>
       <view class="relative bbs-1-eb pt30 pb30 text-right font-24 color-666" wx:if="{{info.inten_money}}">已付意向金<text class="pl5 pr5 color-f9394d">{{info.inten_money}}</text>元</view>
     </view>
 
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 658efe3..afd8ea7 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -72,7 +72,7 @@ Page({
 
     business_type:0,//0未执行到商务政策 1商务政策执行中 2商务政策成功 3商务政策失败
 
-    sa:'',//补充说明
+    sa:'',//特别约定
 
   },
   //生命周期函数--监听页面加载
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index 10caf9f..d596c3d 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -178,7 +178,7 @@
                 </view>
               </view>
             </block>
-            <view class="relative pt30 font-28 color-333">补充说明</view>
+            <view class="relative pt30 font-28 color-333">特别约定</view>
             <view class="pt10 pb30 line-height-16 font-28 color-666">{{sa}}</view>
           </block>
           <block wx:else>
@@ -249,8 +249,8 @@
                   <view class="mb20 inner20 bds-2-36afa2 text-center font-28 color-36afa2 ulib-r10" bindtap="addFine"><i class="iconfont mr10 font-24 icon-jia1"></i>添加</view>
               </view>
             </view>
-            <view class="relative pt30 font-28 color-333">补充说明</view>
-            <textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写补充说明" model:value='{{sa}}' always-embed='{{true}}' />
+            <view class="relative pt30 font-28 color-333">特别约定</view>
+            <textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写特别约定" model:value='{{sa}}' always-embed='{{true}}' />
           </block>
         </block>
       </view>
@@ -359,7 +359,7 @@
           </view>
         </view>
       </block>
-      <view class="relative pt30 font-28 color-333">补充说明</view>
+      <view class="relative pt30 font-28 color-333">特别约定</view>
       <view class="pt10 pb30 line-height-16 font-28 color-666">{{sa}}</view>
     </block>
     <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 21e9d0b..cdc26d7 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -100,7 +100,7 @@ Page({
     oncardArray:[],//上牌城市
     oncardIndex:-1,//上牌城市索引
 
-    sa:'',//补充说明
+    sa:'',//特别约定
 
   },
   //生命周期函数--监听页面加载
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 91f4cfb..d4c61a2 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -320,8 +320,8 @@
                 <view class="mb20 inner20 bds-2-36afa2 text-center font-28 color-36afa2 ulib-r10" bindtap="addFine"><i class="iconfont mr10 font-24 icon-jia1"></i>添加</view>
             </view>
           </view>
-          <view class="relative pt30 font-28 color-333">补充说明</view>
-          <textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写补充说明" model:value='{{sa}}' always-embed='{{true}}' />
+          <view class="relative pt30 font-28 color-333">特别约定</view>
+          <textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写特别约定" model:value='{{sa}}' always-embed='{{true}}' />
         </block>
       </view>
 
@@ -510,7 +510,7 @@
           </view>
         </view>
       </block>
-      <view class="relative pt30 font-28 color-333">补充说明</view>
+      <view class="relative pt30 font-28 color-333">特别约定</view>
       <view class="pt10 pb30 line-height-16 font-28 color-666">{{sa}}</view>
     </block>
     <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">