Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/user/ShoppingCart.vue

@@ -235,7 +235,9 @@ export default {
                     item.check = true;
                     this.price += Number(item.price);
                 });
-                this.price = this.price.toFixed(2);
+                if (parseInt(this.price.toString()) != parseFloat(this.price.toString())) {
+                    this.price = this.price.toFixed(2);
+                }
                 this.collectionListSelected = this.collectionList;
             } else {
                 this.price = 0;
@@ -266,7 +268,9 @@ export default {
                     }
                     this.price += item.price;
                 });
-                this.price = this.price.toFixed(2);
+                if (parseInt(this.price.toString()) != parseFloat(this.price.toString())) {
+                    this.price = this.price.toFixed(2);
+                }
                 // if (this.price == '0.0') {
                 //     this.price = 0;
                 // }

src/views/user/ShoppingCartSubmit.vue

@@ -7,7 +7,7 @@
                     <van-image width="80" height="80" :radius="6" :src="getImg(changeImgs(item.pic))" fit="cover" />
                     <div class="collection_information_right">
                         <div class="collection_information_right_name">{{ item.name }}</div>
-                        <div class="collection_information_right_no" v-if="item.type == 'DOMAIN'">
+                        <div class="collection_information_right_nos" v-if="item.type == 'DOMAIN'">
                             <!-- 剩余时长：{{ item.endTime }} -->
                         </div>
                         <div class="collection_information_right_no" v-else>{{ item.number }}</div>
@@ -370,10 +370,15 @@ export default {
                     font-weight: 400;
                     color: #939599;
                     line-height: 24px;
-                    // margin-bottom: 6px;
+                    margin-bottom: 6px;
+                }
+                .collection_information_right_nos {
+                    font-size: 12px;
+                    font-weight: 400;
+                    color: #939599;
+                    line-height: 24px;
                     margin-bottom: 30px;
                 }
-
                 .collection_information_right_price_one {
                     font-size: 14px;
                     font-weight: bold;