Merge branch 'master' into 12/16SAAS

src/components/MPayment.vue

@@ -16,16 +16,21 @@
                     <div class="title-section">支付宝支付</div>
                     <div class="value-section"><van-radio name="zfb"></van-radio></div>
                 </div>
-                <div class="payment-item" @click="payType = 'wx'">
+                <!-- @click="payType = 'wx'" -->
+                <div class="payment-item centerLine">
                     <div class="logo-section">
-                        <img class="logo" src="@/assets/images/wx_icon.png" alt="">
+                        <img class="logo" src="@/assets/images/wx_default_icon.png" alt="">
                     </div>
                     <div class="title-section">微信支付</div>
-                    <div class="value-section"><van-radio name="wx"></van-radio></div>
+                    <div class="value-section"><van-radio name="wx" disabled></van-radio></div>
                 </div>
             </van-radio-group>
 
-            <div class="blank"></div>
+            <div class="blank">
+                <p style="padding: 0.1rem 0.12rem;color: red;font-size: .14rem;text-align: center;">
+                    温馨提示：由于微信支付升级，临时暂停支付通道
+                </p>
+            </div>
             <van-button type="primary" block @click="onSubmit">确认支付</van-button>
         </van-popup>
     </div>