Merge branch 'master' of http://gitlab.jiucaiyun.cn/sph/SH_OrderLifeCycleU

src/views/myOrder/detail/orderDetail.vue

@@ -42,9 +42,7 @@
         <div class="info-text">
           <div style="display: flex">
             <span class="order-code">{{ detailData.orderNo }}</span>
-            <span class="order-copy" @click="onCopyOrderNo()">
-<!--              <van-icon :name="icons.copy"/>-->
-              复制</span>
+            <div class="order-copy" @click="onCopyOrderNo()"><span class="order-copy-text">复制</span></div>
           </div>
           下单时间: {{ detailData.orderDate }}
         </div>
@@ -116,7 +114,7 @@ import OrderState from '../components/orderState'
 import GoodsSimpleItem from '../components/goodsSimpleItem'
 import InvoiceSimpleItem from '../components/invoiceSimpleItem'
 import {getMyOrderList, getTrackInfo, getOrderInvoiceList} from '@/api/myOrder'
-import {copyToCliborad} from '@/utils/bridge'
+import {bridge} from '@/utils'
 
 export default {
   name: 'orderDetail',
@@ -178,8 +176,9 @@ export default {
     onBrowserBack() {
       this.$router.go(-1)
     },
+    /* 复制 */
     onCopyOrderNo() {
-      this.copyToCliborad(this.detailData.orderNo)
+      bridge.copyContent(this.detailData.orderNo)
     },
     /* 打开物流页面 */
     openLogistics() {
@@ -434,18 +433,20 @@ export default {
         /*主信息 复制按钮*/
         .order-copy {
           color: #555555;
-          border-radius: 15px;
+          border-radius: 7px;
           border: solid 1px #c0c0c0;
           background-color: #e4eceb;
-          padding: 2px;
-          transform: scale(0.85);
-          //display: flex;
-          //align-items: center;
-
-          //i {
-          //  color: #1296db;
-          //  font-size: 20px;
-          //}
+          width: 30px;
+          height: 15px;
+          text-align: center;
+          line-height: 15px;
+          margin-top:-3px;
+
+          .order-copy-text {
+            transform: scale(0.85);
+            display: inline-block;
+            //margin-top:-3px;
+          }
         }
       }
     }