Merge branch 'XK_USER_INDEX_UPDATE20190613' into Development

src/views/car/car.vue

@@ -288,7 +288,7 @@
                                             </li>
                                             </li>
                                             <li class="mui-col-sm-8 mui-col-xs-8">
                                             <li class="mui-col-sm-8 mui-col-xs-8">
                                                 <span>封装规格：</span>
                                                 <span>封装规格：</span>
-                                                <p style="padding-left:60px;">{{item.encap||'- -'}}</p>
+                                                <p style="padding-left:60px;">{{item.goods_name||'- -'}}</p>
                                             </li>
                                             </li>
                                             <li class="mui-col-sm-4 mui-col-xs-4 t-r">
                                             <li class="mui-col-sm-4 mui-col-xs-4 t-r">
                                                 最小起订量：<font v-html="item.min_buy"></font>
                                                 最小起订量：<font v-html="item.min_buy"></font>
@@ -371,7 +371,7 @@
                                         </li>
                                         </li>
                                         <li class="mui-col-sm-8 mui-col-xs-8">
                                         <li class="mui-col-sm-8 mui-col-xs-8">
                                             <span>封装规格：</span>
                                             <span>封装规格：</span>
-                                            <p style="padding-left:60px;">{{item.encap||'- -'}}</p>
+                                            <p style="padding-left:60px;">{{item.goods_name||'- -'}}</p>
                                         </li>
                                         </li>
                                         <li class="mui-col-sm-4 mui-col-xs-4 t-r">
                                         <li class="mui-col-sm-4 mui-col-xs-4 t-r">
                                             最小起订量：<font v-html="item.min_buy"></font>
                                             最小起订量：<font v-html="item.min_buy"></font>

src/views/wallet/Cashier.vue

@@ -4,7 +4,7 @@
         <div class="cashier-content">
         <div class="cashier-content">
             <div class="cashier-detail">
             <div class="cashier-detail">
                 <p class="order-num">订单编号：{{orderInfoData.order_sn}}</p>
                 <p class="order-num">订单编号：{{orderInfoData.order_sn}}</p>
-                <p class="order-money">{{orderInfoData.order_amount_format}}</p>
+                <p class="order-money">{{orderInfoData.topay_amount_format}}</p>
             </div>
             </div>
             <ul class="form-wrap">
             <ul class="form-wrap">
                 <li class="inp-wrap">
                 <li class="inp-wrap">