From bdb81e2948edd2045de7656e2f9abcc228c89401 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sun, 9 Aug 2020 23:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sourcecode/alipay/pages/user-order/user-order.acss | 2 ++
 sourcecode/baidu/pages/buy/buy.swan                | 5 +++--
 sourcecode/baidu/pages/user-order/user-order.css   | 2 ++
 sourcecode/baidu/pages/user-order/user-order.swan  | 1 +
 sourcecode/baidu/utils/tools.sjs                   | 8 ++++++++
 sourcecode/weixin/pages/user-order/user-order.wxss | 2 ++
 6 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 sourcecode/baidu/utils/tools.sjs

diff --git a/sourcecode/alipay/pages/user-order/user-order.acss b/sourcecode/alipay/pages/user-order/user-order.acss
index 05a03caed..0bb6ba73c 100644
--- a/sourcecode/alipay/pages/user-order/user-order.acss
+++ b/sourcecode/alipay/pages/user-order/user-order.acss
@@ -102,6 +102,8 @@
  */
 .pay-merge-submit {
   width: 220rpx;
+  height: 70rpx !important;
+  line-height: 74rpx !important;
   left: calc(50% - 110rpx);
   bottom: 50rpx;
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/buy/buy.swan b/sourcecode/baidu/pages/buy/buy.swan
index aa4265f95..e6e3b718e 100755
--- a/sourcecode/baidu/pages/buy/buy.swan
+++ b/sourcecode/baidu/pages/buy/buy.swan
@@ -119,6 +119,7 @@
   
     <!-- 优惠劵选择 -->
     <component-popup status="{{popup_plugins_coupon_status}}" position="bottom" bindonclose="plugins_coupon_close_event">
+      <import-sjs src="../../utils/tools.sjs" module="tools" />
       <view class="plugins-coupon-popup bg-white">
         <view class="close oh">
           <view class="fr" catchtap="plugins_coupon_close_event">
@@ -130,7 +131,7 @@
             <text data-wid="{{plugins_coupon_data[popup_plugins_coupon_index].warehouse_id}}" bindtap="plugins_coupon_not_use_event">不使用优惠劵</text>
           </view>
           <block s-for="item, index in plugins_coupon_data[popup_plugins_coupon_index].coupon_data.coupon_list" s-key="item">
-            <view class="item spacing-mt bg-white {{plugins_use_coupon_ids.indexOf(item.id) != -1 ? 'item-disabled' : ''}}" style="border:1px solid {{item.coupon.bg_color_value}};">
+            <view class="item spacing-mt bg-white {{tools.indexOf(plugins_use_coupon_ids, item.id) ? 'item-disabled' : ''}}" style="border:1px solid {{item.coupon.bg_color_value}};">
               <view class="v-left fl">
                 <view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
                   <text class="symbol">{{price_symbol}}</text>
@@ -143,7 +144,7 @@
               </view>
               <view class="v-right fr" style="background:{{item.coupon.bg_color_value}};" data-wid="{{plugins_coupon_data[popup_plugins_coupon_index].warehouse_id}}" data-value="{{item.id}}" bindtap="plugins_coupon_use_event">
                 <text class="circle"></text>
-                <text>{{plugins_use_coupon_ids.indexOf(item.id) != -1 ? '已选' : '选择'}}</text>
+                <text>{{tools.indexOf(plugins_use_coupon_ids, item.id) ? '已选' : '选择'}}</text>
               </view>
             </view>
           </block>
diff --git a/sourcecode/baidu/pages/user-order/user-order.css b/sourcecode/baidu/pages/user-order/user-order.css
index b29596d50..f8211df07 100755
--- a/sourcecode/baidu/pages/user-order/user-order.css
+++ b/sourcecode/baidu/pages/user-order/user-order.css
@@ -102,6 +102,8 @@
    */
   .pay-merge-submit {
     width: 220rpx;
+    height: 70rpx !important;
+    line-height: 74rpx !important;
     left: calc(50% - 110rpx);
     bottom: 50rpx;
   }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/user-order/user-order.swan b/sourcecode/baidu/pages/user-order/user-order.swan
index 50a539572..29715fbaf 100755
--- a/sourcecode/baidu/pages/user-order/user-order.swan
+++ b/sourcecode/baidu/pages/user-order/user-order.swan
@@ -1,3 +1,4 @@
+<import-sjs src="../../utils/tools.sjs" module="tools" />
 <!-- 导航 -->
 <view class="nav">
   <block s-for="item, index in nav_status_list" s-key="key">
diff --git a/sourcecode/baidu/utils/tools.sjs b/sourcecode/baidu/utils/tools.sjs
new file mode 100644
index 000000000..3ba62093a
--- /dev/null
+++ b/sourcecode/baidu/utils/tools.sjs
@@ -0,0 +1,8 @@
+function indexOf(arr, value) {
+  if (arr.indexOf(value) < 0) {
+      return false;
+  } else {
+      return true;
+  }
+}
+module.exports.indexOf = indexOf;
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/user-order/user-order.wxss b/sourcecode/weixin/pages/user-order/user-order.wxss
index 4b44b6b4b..f73e3c1ec 100755
--- a/sourcecode/weixin/pages/user-order/user-order.wxss
+++ b/sourcecode/weixin/pages/user-order/user-order.wxss
@@ -102,6 +102,8 @@
  */
 .pay-merge-submit {
   width: 220rpx;
+  height: 70rpx !important;
+  line-height: 74rpx !important;
   left: calc(50% - 110rpx);
   bottom: 50rpx;
 }
\ No newline at end of file