手机卡，油卡支付宝充值

src/static/common.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.4.16"
+  "version": "1.4.17"
 }

src/views/index/oilRecharge.vue

@@ -38,7 +38,7 @@
             <div class="selectCard">选择油卡</div>
             <el-form :model="petroleum" :rules="petroleumRule" ref="petroleum">
               <el-form-item prop="petroleumCard">
-                <el-input v-model="petroleum.petroleumCard" placeholder="请输入以9开头的16位中石油加油卡号" />
+                <el-input v-model.trim="petroleum.petroleumCard" placeholder="请输入以9开头的16位中石油加油卡号" />
               </el-form-item>
             </el-form>
             <div class="alert">

src/views/index/phoneRecharge.vue

@@ -14,7 +14,7 @@
         <div class="selectCard">选择手机号</div>
         <el-form :model="phoneForm" :rules="phoneFormRule" ref="phoneForm">
           <el-form-item prop="phoneCard">
-            <el-input v-model="phoneForm.phoneCard" placeholder="请输入11位手机号码" />
+            <el-input v-model.trim="phoneForm.phoneCard" placeholder="请输入11位手机号码" />
           </el-form-item>
         </el-form>
         <div class="alert">

src/views/order/payment.ts

@@ -38,7 +38,7 @@ export default class UserIndex extends Vue {
         }else{
             this.data.model = false;
         }
-        let isWeiXin = () => { return navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1 }
+        let isWeiXin = () => { return navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1 }        
         if (isWeiXin()) {
               this.data.zhifupay = false
         }
@@ -114,12 +114,29 @@ export default class UserIndex extends Vue {
         //     platform: 'weixin',
         //     pay:'wappay'
         // });
-        let res = await Http.getInstance().getWeixin({
-            order_sn: this.data.orderSn,
-            platform: 'weixin',
-            pay:'wappay'
-        });
-        console.log(res)
+        // 社保支付
+        // let res = await Http.getInstance().getWeixin({
+        //     order_sn: this.data.orderSn,
+        //     platform: 'weixin',
+        //     pay:'wappay'
+        // });
+        // 合并
+        let res
+        if (this.data.recharfe) {
+            res = await Http.getInstance().getWeixin({
+                order_sn: this.data.orderSn,
+                platform: 'weixin',
+                pay:'wappay'
+            });
+            // console.log('社保支付',res)
+        } else {
+            res = await Http.getInstance().RechargeOrderPay({
+                order_sn: this.data.orderSn,
+                platform: 'weixin',
+                pay:'wappay'
+            });
+            // console.log('卡支付',res)
+        }
 
         window.location.replace(
             res.data.mweb_url+'&redirect_url='+encodeURIComponent(window.location.href+'?tip=yes'))
@@ -141,12 +158,27 @@ export default class UserIndex extends Vue {
         // }
     }
     async alipayment() {
-
-        let res = await Http.getInstance().getAlipay({
-            order_sn: this.data.orderSn,
-            platform: 'alipay',
-            pay:'wappay'
-        });
+        // 社保
+        // let res = await Http.getInstance().getAlipay({
+        //     order_sn: this.data.orderSn,
+        //     platform: 'alipay',
+        //     pay:'wappay'
+        // });
+        // 合并后
+        let res
+        if (this.data.recharfe) {
+            res = await Http.getInstance().getAlipay({
+                order_sn: this.data.orderSn,
+                platform: 'alipay',
+                pay:'wappay'
+            });
+        } else {
+            res = await Http.getInstance().RechargeOrderPay({
+                order_sn: this.data.orderSn,
+                platform: 'alipay',
+                pay:'wappay'
+            });
+        }
         console.log(res.data)
         this.data.model = true;
         this.data.html = res.data
@@ -161,12 +193,16 @@ export default class UserIndex extends Vue {
         let openid = localStorage.getItem('openid');
         let res
         if (this.data.recharfe) {
+            console.log(123);
+            
             res = await Http.getInstance().getWeixin({
                 order_sn: this.data.orderSn, platform: 'weixin', pay: 'wxpay', openid: openid
             });
         } else {
+            console.log(111);
+            
             res = await Http.getInstance().RechargeOrderPay({
-                order_sn: this.data.orderSn, openid: openid
+                order_sn: this.data.orderSn, platform: 'weixin', pay: 'wxpay', openid: openid
             });
         }
         res.data.jsApiList = ['chooseWXPay'];

src/views/order/payment.vue

@@ -12,7 +12,7 @@
             </div>
         </div>
         <div class="payment mt-4">
-            <h6 class="zhifu-way" v-if="data.recharfe">请选择支付方式</h6>
+            <h6 class="zhifu-way" v-if="data.zhifupay">请选择支付方式</h6>
             <ul class="list-group list-group-flush"  v-if="data.zhifupay">
                 <li class="list-group-item d-flex align-items-center" @click="weixin" >
                    <div>
@@ -23,7 +23,7 @@
                         <img class="pay-img-xiao" src="../../assets/image/pay-cost_11.png"  v-if="!data.isShowA" alt="">
                     </div>
                 </li>
-                <li class="list-group-item d-flex align-items-center"  @click="zhifubao" v-if="data.recharfe">
+                <li class="list-group-item d-flex align-items-center"  @click="zhifubao">
                    <div>
                        <img class="pay-img-da" src="../../assets/image/ico-13.png" alt="">
                    </div>

src/views/social/social.ts

@@ -86,7 +86,7 @@ export default class Social extends Vue {
                 code: this.data.citycode
             });
             this.data.social_basic = res.data;
-            console.log('缴纳额度', res);
+            console.log('缴费明细', res);
             // this.data.social_type = this.data.social_type - 1;
 
             localStorage.setItem('pensionMin', this.data.social_basic.pension[0])
@@ -170,6 +170,7 @@ export default class Social extends Vue {
         }
         // console.log('from', form)
         let res = await Http.getInstance().calcBill(Utils.getInstance().serialize(form));
+        console.log('五险一金', res);
         this.data.social_calc = res.data.social;
         this.data.service_calc = res.data.service;
         this.data.discount = res.data.discount;