Merge pull request 'style' (#5) from wpd_3 into master

Reviewed-on: #5

src/components/cardSecretBuy.vue

@@ -38,7 +38,7 @@
         <div class="itemList" @click="toTab(1)">
           <img v-if="tab==1" class="tabbar_item_img1" src="../assets/images/card_secret_buy/tabs_search_on.png" alt="">
           <img v-else class="tabbar_item_img1" src="../assets/images/card_secret_buy/tabs_search.png" alt="">
-          <span v-bind:class="[{'selected':tab==1}]">卡密搜索</span>
+          <span v-bind:class="[{'selected':tab==1}]">卡密查询</span>
         </div>
       </div>
     </div>

src/components/cardSecretQuery.vue

@@ -18,6 +18,10 @@
           <div>卡号:</div>
           <div>{{ cardid }}</div>
         </div>
+        <div class="detail-info" v-if="secret">
+          <div>密码:</div>
+          <div>{{ secret }}</div>
+        </div>
 
         <div class="detail-btn">
           <div @click="back()" class="back">返回</div>
@@ -39,6 +43,7 @@ export default {
 
       orderid: this.$route.query.orderid,
       cardid: "",
+      secret:"",
 
       copyText: '',
       clipboardInstance: null,
@@ -77,6 +82,7 @@ export default {
       }).then(response => {
           if (response.data.status) {
             this.cardid = response.data.data.cardid;
+            this.secret = response.data.data.secret;
             this.copyText = "订单编号：" + this.orderid + "\n" + "卡号：" + this.cardid;
           } else {
             this.promptshow(response.data.info);

src/components/orderSample.vue

@@ -6,9 +6,9 @@
     <div class="sample-content">
       <div class="sample-step step1">微信列表找到微信支付</div>
       <img class="step-icon" src="../assets/images/order_sample/order_sample_one.png" alt="" srcset="">
-      <div class="sample-step step2">微信列表找到微信支付</div>
+      <div class="sample-step step2">找到刚支付的订单</div>
       <img class="step-icon" src="../assets/images/order_sample/order_sample_two.png" alt="" srcset="">
-      <div class="sample-step step3">微信列表找到微信支付</div>
+      <div class="sample-step step3">点击查看详情，商户单号即为订单号</div>
       <img class="step-icon" src="../assets/images/order_sample/order_sample_three.png" alt="" srcset="">
     </div>
   </div>