Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/IntegralMall/productDetail.vue

@@ -175,11 +175,6 @@
     color:#666666;
     margin:10px 0 0 53px;
   }
-  .proDuiRemind{
-    font-size:12px;
-    color:#666666;
-    margin:10px 0 0 53px;
-  }
 </style>
 
 <template>
@@ -218,9 +213,6 @@
           <div class="pd_quota" v-if="detail.quota!=0">
               限购数量：{{detail.quota}}
           </div>
-          <div class="proDuiRemind">
-            该商品一经兑换，概不退换，请知晓！
-          </div>
           <div class="_yunfei">
             <span class="_yunfei_name">运费</span>
             <div>
@@ -229,7 +221,7 @@
             </div>
           </div>
           <div class="_tips">
-            <p><i class="iconfont icon-tixing"></i>这里是相关的一些比较重要一点的提示说明，比如平台的一些简单规则等等。。。</p>
+            <p><i class="iconfont icon-tixing"></i>该商品一经兑换，概不退换，请知晓！</p>
           </div>
           <div class="_btn_dui">
             <span @click="PlacingOrder()">立即兑换</span>