Merge branch 'card-pwd'

orderDetails/cardOrder.html

@@ -10,6 +10,7 @@
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/vue3.global.js"></script>
     <script type="text/javascript" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js"></script>
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script>
+    <!-- <script src="../api2_0.js"></script> -->
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/libs.js"></script>
     <script src="https://cdn.bootcdn.net/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
 </head>
@@ -49,16 +50,19 @@
                 <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/orderDetails/copy.png"
                     alt="" @click="copyFunction(goods.card_number)" class="copy">
             </div>
-
             <div class="c-item" :class="{mt30:!goods.card_number}">
                 <div>
                     <p>卡密</p>
                     <p class="num">{{card_look_pwd}}</p>
                 </div>
+                <div @click="copyFunction(goods.card_password,1)">
                     <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/orderDetails/copy.png"
-                    alt="" @click="copyFunction(goods.card_password,1)" class="copy">
+                        alt="" class="copy">
+                    <span>&nbsp;复制</span>
                 </div>
             </div>
+            <p class="tip-card">复制查看卡密</p>
+        </div>
 
         <div class="but" v-show="goods.status==3" @click="toHome">
             重新兑换
@@ -111,7 +115,7 @@
                     }
                     if (res.code == 200) {
                         const { product_name, status, show_url, card_number, card_password, use_coupon, product, mask_card_password } = res.data;
-                        card_look_pwd.value = mask_card_password;
+                        card_look_pwd.value = mask_card_password.length > 16 ? mask_card_password.substring(0, 16) : mask_card_password;
                         goods.value = { product_name, time: res.data.goods.end_time, status, show_url, card_number, card_password, card_show: res.data.goods.card_show, use_coupon, detail_url: product.detail_url };
                         // 领取成功结算 5 
                         if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5 && status === 2) {

orderDetails/orderCss.css

@@ -256,7 +256,7 @@ body {
 }
 
 #app .refresh {
-  background: #5983FF;
+  background: #5983ff;
 }
 
 #app .card {
@@ -285,8 +285,6 @@ body {
 }
 
 #app .c-item {
-  display: flex;
-  align-items: center;
   padding: 0.12rem 0.16rem;
   background: #fff;
   border-radius: 0.1rem;
@@ -294,6 +292,8 @@ body {
   margin: 0 auto;
   margin-top: 0.2rem;
   box-sizing: border-box;
+  display: flex;
+  align-items: center;
   justify-content: space-between;
 }
 
@@ -304,6 +304,10 @@ body {
 
 #app .c-item .num {
   margin-left: 0.1rem;
+  width: 2.1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 #app .c-item .copy {
@@ -311,6 +315,11 @@ body {
   height: 0.15rem;
 }
 
+#app .c-item .card-copy {
+  display: flex;
+  justify-content: right;
+}
+
 #app .detail_url {
   display: block;
   margin: 0 auto;
@@ -321,3 +330,11 @@ body {
 #app .mt30 {
   margin-top: 0.4rem;
 }
+
+#app .tip-card {
+  font-size: 0.12rem;
+  color: #acbeeb;
+  /* padding-left: 0.2rem; */
+  padding-top: 1rem;
+  text-align: center;
+}