Merge branch 'rel-master'

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-03 17:08:43
+ * @LastEditTime: 2023-03-05 11:48:02
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -52,11 +52,11 @@
                                 <span>合计</span><span class="orange price">{{item.packagePrice}}元</span>
                             </p>
                         </div>
-                        <div class="package-buy">
+                        <!-- <div class="package-buy">
                             <div class="buy-btn" @click="onBuy(item)">
                                 <p>第一步：充值话费</p>
                             </div>
-                        </div>
+                        </div> -->
                         <div class="radios-con">
                             <div class="pay-type">
                                 <p>支付方式：</p>
@@ -88,6 +88,11 @@
                                 </van-radio>
                             </van-radio-group>
                         </div>
+                        <div class="package-buy">
+                            <div class="buy-btn" @click="onBuy(item)">
+                                <p>第一步：充值话费</p>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -313,7 +318,7 @@ export default {
                 packageName: /* data.productModel */ data.packageName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
                 packageIssue: 12, //分期
-                packagePrice: process.env.NODE_ENV === "production" ?/*  data.packagePrice * 100 */1 : 1  //总金额单位为分，测试环境写死
+                packagePrice: process.env.NODE_ENV === "production" ? /* data.packagePrice * 100 */1 : 1  //总金额单位为分，测试环境写死
             };
             this.$toast.clear();
             APICore.payLiveBaseDevice(reqBody)
@@ -408,7 +413,7 @@ export default {
                 packageName: /* data.productModel + ',' +  */data.packageName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
                 packageIssue: this.packageIssue, //分期
-                packagePrice: process.env.NODE_ENV === "production" ?/*  data.packagePrice * 100 */1 : 1 //总金额单位为分，测试环境写死
+                packagePrice: process.env.NODE_ENV === "production" ? /* data.packagePrice * 100 */1 : 1 //总金额单位为分，测试环境写死
             };
             this.$toast.clear();
             APICore.payLiveBaseDevice(reqBody)
@@ -522,7 +527,7 @@ export default {
             .package-order-container {
                 position: relative;
                 margin: 10px 0;
-                padding: 0 0 0 20px;
+               /*  padding: 0 0 0 20px; */
                 z-index: 999;
                 box-shadow: rgba(14, 30, 37, 0.12) 0 3px 5px 0,
                     rgba(14, 30, 37, 0.32) 0 2px 16px 0;
@@ -560,7 +565,7 @@ export default {
                     }
                 }
                 .order-content {
-                    padding: 15px 0;
+                    padding: 15px 10px;
                     .title {
                         display: flex;
                         justify-content: flex-start;
@@ -619,6 +624,7 @@ export default {
                     }
                     .package-buy {
                         padding: 5px 8px;
+                        @include center();
                             .buy-btn {
                                 height: 40px;
                                 width: 200px;