Merge branch 'develop' into test

README.md

@@ -214,3 +214,10 @@ update
 `2023.2.26`
 update
 - 增加 激活成功显示页面
+
+
+## v1.0.24
+`2023.2.27`
+update
+- 增加 激活成功页面在线图标
+- 优化 支付方式选择页面

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-26 16:07:34
+ * @LastEditTime: 2023-02-27 09:59:02
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.23F'; //版本号
+export const VERSION_MODEL = '1.0.24F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/active-status/index.vue

@@ -6,7 +6,8 @@
         </div>
         <div class="main">
             <div class="text success" v-if="isActive">
-                <p>激活成功，请重启设备，看到连接平台图标后，则可正常使用。</p>
+                <p>激活成功，请重启设备，看到连接平台</p>
+                <p class="img">图标<img src="../../assets/online.png"/>后，则可正常使用。</p>
             </div>
             <div class="text fail" v-else>
                 <p>电话卡激活失败！请进行实名认证与绑定SIM卡。如您已实名认证，请5分钟后，再进行设备绑定。</p>
@@ -105,7 +106,7 @@ export default {
 <style scoped lang="scss">
     .active-container {
         height: 100vh;
-        padding: 40px 60px;
+        padding: 40px 50px;
         .header {
             padding: 10px 0;
             @include center();
@@ -121,8 +122,18 @@ export default {
                 width: 100%;
                 font-size: 16px;
                 text-align: left;
-                letter-spacing: 1px;
                 font-weight: 500;
+                margin: 5px 0;
+                img {
+                    height: 25px;
+                    width: 60px;
+                    margin: 0 5px;
+                }
+                .img {
+                    display: flex;
+                    justify-content: flex-start;
+                    align-items: center;
+                }
             }
         }
         .van-button {

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-26 15:57:18
+ * @LastEditTime: 2023-02-27 09:53:05
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -75,25 +75,62 @@
         <!-- 底部支付类型选择 -->
         <div class="pay-radios">
             <div class="radios-con">
-                <van-radio-group v-model="radio" direction="horizontal"  @change="onRaidoChange">
+                <!-- <van-radio-group v-model="radio" direction="horizontal"  @change="onRaidoChange">
                     <van-radio name="1">
                         <template #default>
                             <span>微信支付</span>
-                            <!-- <img src="../../assets/wx_pay_icon.png"/> -->
+                            <img src="../../assets/wx_pay_icon.png"/>
                         </template>
                     </van-radio>
                     <van-radio name="2">
                         <template #default>
                             <span>支付宝</span>
-                            <!-- <img src="../../assets/alipay.png"/> -->
+                            <img src="../../assets/alipay.png"/>
                         </template>
                     </van-radio>
                     <van-radio name="3">
                         <template #default>
                             <span>花呗</span>
-                            <!-- <img src="../../assets/antpay.png"/> -->
+                            <img src="../../assets/antpay.png"/>
                         </template>
                     </van-radio>
+                </van-radio-group> -->
+                <van-radio-group v-model="radio" @change="onRaidoChange">
+                    <van-cell-group border >
+                        <van-cell clickable @click="radio = '1'"  center>
+                            <template #default>
+                                <div class="van-cell-text">
+                                    <img src="../../assets/wx-pay.png" alt="">
+                                    <span class="custom-title">微信支付</span>
+                                </div>
+                            </template>
+                            <template #right-icon>
+                                <van-radio name="1" />
+                            </template>
+                        </van-cell>
+                        <van-cell  clickable @click="radio = '2'">
+                            <template #default>
+                                <div class="van-cell-text">
+                                    <img src="../../assets/alipay.png"/>
+                                    <span class="custom-title">支付宝支付</span>
+                                </div>
+                            </template>
+                            <template #right-icon>
+                                <van-radio name="2" />
+                            </template>
+                        </van-cell>
+                        <van-cell  clickable @click="radio = '3'" >
+                            <template #default >
+                                <div class="van-cell-text">
+                                    <img src="../../assets/antpay.png"/>
+                                    <span class="custom-title">花呗支付</span>
+                                </div>
+                            </template>
+                            <template #right-icon>
+                                <van-radio name="3" />
+                            </template>
+                        </van-cell>
+                    </van-cell-group>
                 </van-radio-group>
             </div>
         </div>
@@ -308,7 +345,8 @@ export default {
                     })
                 } else {
                     this.packageIssue = 1;
-                    this.wxPay(data);
+                    // todo 暂时取消开放微信支付
+                    //this.wxPay(data);
                     console.log("openid为空");
                 }
             }
@@ -381,14 +419,17 @@ export default {
                         fail: err => {
                             console.log("支付出错了::", err);
                             that.$dialog.confirm({
-                                title: "支付失败",
-                                message: "出错了，请您重新进入"
+                                title: "温馨提示",
+                                message: "出错了，请您重新进入",
+                                showCancelButton: false
                             });
                         },
                         cancel: function(err) {
                             // 用户取消支付
                             that.$dialog.confirm({
-                                message: "您取消了支付"
+                                title: "温馨提示",
+                                message: "您取消了支付",
+                                showCancelButton: false
                             });
                             console.log("用户取消了支付::", err);
                         }
@@ -485,13 +526,14 @@ export default {
     background-color: white;
     height: 100vh;
     .topup-container {
+        position: relative;
         display: flex;
         justify-content: space-between;
         align-items: center;
         flex-direction: column;
         background-color: white;
         overflow: scroll;
-        height: calc(100vh - 4rem);
+        /* height: calc(100vh - 4rem); */
         .main {
             padding: 0 10px;
             display: flex;
@@ -646,14 +688,15 @@ export default {
         }
     }
     .pay-radios {
-        position: absolute;
-        bottom: 0;
+        position: relative;
+        top: 0;
         width: 100%;
         /* background-color: red; */
         /* padding: 0 15px; */
         .radios-con {
             padding: 20px 10px;
-            @include center();
+            /* @include center(); */
+            align-items: center;
             font-size: 18px;
             box-shadow: rgba(14, 30, 37, 0.12) 0 3px 5px 0,
                     rgba(14, 30, 37, 0.32) 0 2px 16px 0;
@@ -661,6 +704,14 @@ export default {
                 height: 35px;
                 width: auto;
             }
+            .van-cell-text {
+                display: flex;
+                justify-content: flex-start;
+                align-items: center;
+                span {
+                    padding: 0 5px;
+                }
+            }
         }
     }
 }