diff --git a/common/betone_components/betone-list.vue b/common/betone_components/betone-list.vue
index e7a6f47..d4e17e3 100644
--- a/common/betone_components/betone-list.vue
+++ b/common/betone_components/betone-list.vue
@@ -103,14 +103,14 @@
         <betone-modal :title="'关闭原因'" :confirmText="'确认'" v-model="cloneVisible" @cancel="cloneVisible = false"
             @confirm="confirmCloseSub">
             <view class="modal-text">
-                <betone-new-input v-model="closeReason" placeholder="请输入" style="margin-bottom: 32rpx" />
+                <u-input :border="true"  v-model="closeReason" placeholder="请输入" style="margin-bottom: 32rpx" />
             </view>
         </betone-modal>
 
         <!-- 维修人员驳回 -->
         <betone-modal v-model="turnShow" :title="'驳回原因'" @confirm="turnFn" @cancel="turnShow = false">
             <view class="modal-text">
-                <betone-new-input v-model="repaiRejectReason" placeholder="请输入" style="margin-bottom: 32rpx" />
+                <u-input :border="true"  v-model="repaiRejectReason" placeholder="请输入" style="margin-bottom: 32rpx" />
             </view>
         </betone-modal>
 
diff --git a/common/betone_components/betone-new-input.vue b/common/betone_components/betone-new-input.vue
index 1e4bf70..670ce0d 100644
--- a/common/betone_components/betone-new-input.vue
+++ b/common/betone_components/betone-new-input.vue
@@ -132,7 +132,7 @@ export default {
       smsTxtr: "重新发送",
       isCountdown: true,
       tips: "",
-      seconds: 10,
+      seconds: 60,
     };
   },
   watch: {
diff --git a/common/betone_components/betone-pop.vue b/common/betone_components/betone-pop.vue
index c288150..0647b26 100644
--- a/common/betone_components/betone-pop.vue
+++ b/common/betone_components/betone-pop.vue
@@ -10,13 +10,13 @@
     >
       <view class="pop-content" :style="{width: width}">
         <view class="pop-title" v-if="title">{{ title }}</view>
-        <view class="pop-icon" v-if="icon">
+        <!-- <view class="pop-icon" v-if="icon">
           <u-image
             :width="iconSize"
             mode="widthFix"
             :src="`/static/img/betone-sp-component/pop/${icon}.svg`"
           ></u-image>
-        </view>
+        </view> -->
         <slot></slot>
       </view>
     </u-popup>
diff --git a/common/betone_components/betone-tabbar.vue b/common/betone_components/betone-tabbar.vue
index 0499c03..c81a316 100644
--- a/common/betone_components/betone-tabbar.vue
+++ b/common/betone_components/betone-tabbar.vue
@@ -5,9 +5,9 @@
       inactive-color="#999999"
       :border-top="borderTop"
       :list="list"
-      :height="154"
+      :height="124"
       :mid-button-size="170"
-      :icon-size="60"
+      :icon-size="50"
       @change="tabbatChange"
       v-model="current"
     ></u-tabbar>
diff --git a/pages.json b/pages.json
index 389da3a..2509aff 100644
--- a/pages.json
+++ b/pages.json
@@ -10,113 +10,6 @@
                 "navigationBarTextStyle": "white"
             }
         },
-        {
-            "path": "pages/my/my",
-            "style": {
-                "navigationStyle": "custom",
-                "navigationBarTextStyle": "white"
-            }
-        },
-        {
-            "path": "pages/my/records",
-            "style": {
-                "navigationBarTitleText": "记录",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/my/feedback",
-            "style": {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/submission/index",
-            "style": {
-                "navigationBarTitleText": "维修报送",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/submission/submissionDetails",
-            "style": {
-                "navigationBarTitleText": "维修报送",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/submission/records",
-            "style": {
-                "navigationBarTitleText": "报送记录",
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#efefef",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/submission/recordsdetails",
-            "style": {
-                "navigationBarTitleText": "维修详情",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-        {
-            "path": "pages/submission/evaluate",
-            "style": {
-                "navigationBarTitleText": "评价",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-        {
-            "path": "pages/submission/sendOrders",
-            "style": {
-                "navigationBarTitleText": "工单",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-        {
-            "path": "pages/order/tasking",
-            "style": {
-                "navigationStyle": "custom",
-                "navigationBarTextStyle": "white"
-            }
-        },
-        {
-            "path": "pages/order/location",
-            "style": {
-                "navigationBarTitleText": "查看位置",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
         {
             "path": "pages/login/login",
             "style": {
@@ -144,33 +37,100 @@
                 "navigationStyle": "custom",
                 "navigationBarTextStyle": "white"
             }
-        },
+        }
+    ],
+    "subPackages": [
         {
-            "path": "pages/inspection/quest",
-            "style": {
-                "navigationStyle": "custom",
-                "navigationBarTextStyle": "white"
-            }
+            "root": "pages/forgot",
+            "pages": [
+                {
+                    "path": "forgotPassword",
+                    "style": {
+                        "navigationBarTitleText": "忘记密码",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                }
+            ]
         },
         {
-            "path": "pages/inspection/plan",
-            "style": {
-                "navigationBarTitleText": "巡检计划",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
+            "root": "pages/inspection",
+            "pages": [
+                {
+                    "path": "quest",
+                    "style": {
+                        "navigationStyle": "custom",
+                        "navigationBarTextStyle": "white"
+                    }
+                },
+                {
+                    "path": "questDetails",
+                    "style": {
+                        "navigationBarTitleText": "巡检任务单",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "plan",
+                    "style": {
+                        "navigationBarTitleText": "巡检计划",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "planDetails",
+                    "style": {
+                        "navigationBarTitleText": "巡检计划详情",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "questOrder",
+                    "style": {
+                        "navigationBarTitleText": "巡检任务单",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
                 }
-            }
+            ]
         },
         {
-            "root": "pages",
+            "root": "pages/order",
             "pages": [
                 {
-                    "path": "pages/inspection/questOrder",
+                    "path": "tasking",
                     "style": {
-                        "navigationBarTitleText": "巡检任务单",
+                        "navigationStyle": "custom",
+                        "navigationBarTextStyle": "white"
+                    }
+                },
+                {
+                    "path": "location",
+                    "style": {
+                        "navigationBarTitleText": "查看位置",
                         "enablePullDownRefresh": false,
                         "navigationBarTextStyle": "black",
                         "navigationBarBackgroundColor": "#F8F8F8",
@@ -180,16 +140,71 @@
                     }
                 }
             ]
-        }
-    ],
-    "subPackages": [
+        },
         {
-            "root": "pages",
+            "root": "pages/my",
             "pages": [
                 {
-                    "path": "inspection/planDetails",
+                    "path": "my",
                     "style": {
-                        "navigationBarTitleText": "巡检计划详情",
+                        "navigationStyle": "custom",
+                        "navigationBarTextStyle": "white"
+                    }
+                },
+                {
+                    "path": "records",
+                    "style": {
+                        "navigationBarTitleText": "记录",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                },
+                {
+                    "path": "feedback",
+                    "style": {
+                        "navigationBarTitleText": "意见反馈",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/submission",
+            "pages": [
+                {
+                    "path": "index",
+                    "style": {
+                        "navigationBarTitleText": "维修报送",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                },
+                {
+                    "path": "submissionDetails",
+                    "style": {
+                        "navigationBarTitleText": "维修报送",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                },
+                {
+                    "path": "records",
+                    "style": {
+                        "navigationBarTitleText": "报送记录",
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#efefef",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "recordsdetails",
+                    "style": {
+                        "navigationBarTitleText": "维修详情",
                         "enablePullDownRefresh": false,
                         "navigationBarTextStyle": "black",
                         "navigationBarBackgroundColor": "#F8F8F8",
@@ -199,9 +214,9 @@
                     }
                 },
                 {
-                    "path": "inspection/questDetails",
+                    "path": "evaluate",
                     "style": {
-                        "navigationBarTitleText": "巡检任务单",
+                        "navigationBarTitleText": "评价",
                         "enablePullDownRefresh": false,
                         "navigationBarTextStyle": "black",
                         "navigationBarBackgroundColor": "#F8F8F8",
@@ -211,10 +226,15 @@
                     }
                 },
                 {
-                    "path": "login/forgotPassword",
+                    "path": "sendOrders",
                     "style": {
-                        "navigationStyle": "custom",
-                        "navigationBarTextStyle": "white"
+                        "navigationBarTitleText": "工单",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
                     }
                 }
             ]
diff --git a/pages/forgot/forgotPassword.vue b/pages/forgot/forgotPassword.vue
new file mode 100644
index 0000000..bd46030
--- /dev/null
+++ b/pages/forgot/forgotPassword.vue
@@ -0,0 +1,147 @@
+<template>
+    <view class="page_css">
+        <view class="container">
+            <betone-header-top :title="title" />
+            <u-form :model="forgotInfo" :rules="rules" ref="forgotForm">
+                <u-form-item prop="mobile" :border-bottom="false" label-position="top" label="手机号" :required="true">
+                    <u-input v-model="forgotInfo.mobile" :border="true" placeholder="请输入" />
+                </u-form-item>
+                <u-form-item prop="verificationCode" :border-bottom="false" label-position="top" label="验证码"
+                    :required="true">
+                    <betone-new-input v-model="forgotInfo.verificationCode" placeholder="请输入手机6位数验证码" :isSms="true"
+                        @ch="sendCode" ref="verificationCode" />
+                </u-form-item>
+                <u-form-item prop="password" :border-bottom="false" label-position="top" label="密码" :required="true">
+                    <u-input v-model="forgotInfo.password" type="password" :border="true" :password-icon="true" />
+                </u-form-item>
+                <u-form-item prop="confirmPassword" :border-bottom="false" label-position="top" label="确认密码"
+                    :required="true">
+                    <u-input v-model="forgotInfo.confirmPassword" type="password" :border="true"
+                        :password-icon="true" />
+                </u-form-item>
+            </u-form>
+            <u-button class="item-bottom" type="primary" @click="formSubmit()">
+                确定
+            </u-button>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+
+    data() {
+        return {
+            title: "忘记密码",
+            forgotInfo: {
+                mobile: '',
+                verificationCode: '',//验证码
+                password: "",//密码
+                confirmPassword: '',//确认密码
+            },
+            rules: {
+                mobile: [
+                    {
+                        type: "string",
+                        required: true,
+                        message: "请输入手机号",
+                        trigger: ["blur", "change"],
+                    },
+                    {
+                        validator: (rule, value, callback) => {
+                            return this.$u.test.mobile(value);
+                        },
+                        message: '请输入正确的手机号',
+                        trigger: ["change", "blur"]
+                    },
+                ],
+                password: [
+                    {
+                        type: "string",
+                        required: true,
+                        message: "请输入密码",
+                        trigger: ["blur", "change"],
+                    },
+                    {
+                        min: 8,
+                        max: 16,
+                        message: '长度在8-16个字符之间'
+                    },
+                ],
+                confirmPassword: [
+                    {
+                        type: "string",
+                        required: true,
+                        message: "请确认密码",
+                        trigger: ["blur"],
+                    },
+                    {
+                        asyncValidator: (rules, value, callback) => {
+                            if (value != this.forgotInfo.password) {
+                                callback(new Error('两次密码校验不一致'))
+                            }
+                            callback()
+                        },
+                        message: '两次密码校验不一致',
+                        trigger: ["blur"]
+                    },
+                ],
+                verificationCode: {
+                    type: "string",
+                    required: true,
+                    message: "请输入验证码",
+                    trigger: ["blur", "change"],
+                },
+            },
+        }
+    },
+    onReady() {
+        this.$refs.forgotForm.setRules(this.rules);
+    },
+    methods: {
+        // 发送验证码
+        sendCode() {
+            if (this.registerInfo.phoneNumber == '') {
+                uni.$u.toast("请先输入手机号");
+                return false;
+            }
+            let query = {
+                phone: this.registerInfo.phoneNumber
+            }
+            this.$u.api.sendVerify(query).then(res => {
+                if (res.code == 200) {
+                    this.$refs.verificationCode.sendSuceess()
+                }
+            })
+
+        },
+        formSubmit() {
+            this.$refs.forgotForm.validate(valid => {
+                if (valid) {
+                    console.log('校验通过')
+                    uni.$u.toast('修改成功，请登录');
+                    setTimeout(() => {
+                        uni.navigateTo({
+                            url: "/pages/login/login",
+                        });
+                    }, 1000)
+                } else {
+                    console.log('校验失败')
+                }
+            })
+
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.page_css {
+    .container {
+        padding: 32rpx 64rpx 32rpx 64rpx;
+
+        .item-bottom {
+            margin-top: 64rpx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue
index f27fd8f..1f0286a 100644
--- a/pages/inspection/quest.vue
+++ b/pages/inspection/quest.vue
@@ -305,6 +305,7 @@ export default {
         },
         //跳转工单
         openWorkOrder(item, type) {
+          
             let param = {
                 id: item.id,
                 type: 'view',
diff --git a/pages/inspection/questOrder.vue b/pages/inspection/questOrder.vue
index 4649ac3..a5ad87f 100644
--- a/pages/inspection/questOrder.vue
+++ b/pages/inspection/questOrder.vue
@@ -15,10 +15,12 @@
             <view class="info_title">巡检配置</view>
             <u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
                 <u-form-item label="巡检内容:" prop="dispatchTime" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.taskContent" placeholder="" :disabled="true" />
+                    <!-- <betone-new-input label="" v-model="detailForm.taskContent" placeholder=""  /> -->
+                    <u-input v-model="detailForm.taskContent" :disabled="true" :border="true" />
                 </u-form-item>
                 <u-form-item label="任务开始时间:" prop="dispatchTime" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.startTime" placeholder="" :disabled="true" />
+                    <!-- <betone-new-input label="" v-model="detailForm.startTime" placeholder="" :disabled="true" /> -->
+                    <u-input v-model="detailForm.startTime" :disabled="true" :border="true" />
                 </u-form-item>
                 <u-form-item label="预约上门时间:" prop="customerOpinion" :border-bottom="false">
                     <u-input v-if="reservationDisabled" v-model="reservationTime" type="select"
diff --git a/pages/login/forgotPassword.vue b/pages/login/forgotPassword.vue
deleted file mode 100644
index 938c821..0000000
--- a/pages/login/forgotPassword.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-    <view class="page_css">
-        <view class="container">
-            <betone-header-top :title="title" />
-            <u-form labelPosition="left" :model="forgotInfo" :rules="rules" ref="registerForm">
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="手机号">
-                    <u-input v-model="forgotInfo.mobile" :border="true" placeholder="请输入" />
-                </u-form-item>
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="验证码">
-
-                </u-form-item>
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="密码">
-                    <u-input v-model="forgotInfo.password" type="password" :border="true" :password-icon="true" />
-                </u-form-item>
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="确认密码">
-                    <u-input v-model="forgotInfo.confirmPassword" type="password" :border="true" :password-icon="true" />
-                </u-form-item>
-            </u-form>
-            <!-- <u-button @click="submit">确定</u-button> -->
-        </view>
-    </view>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            title: "忘记密码",
-            forgotInfo: {
-                mobile: '',
-                verificationCode:'',//验证码
-                password:"",//密码
-                confirmPassword:'',//确认密码
-            },
-            rules: {
-                mobile: [
-                    {
-                        required: true,
-                        message: '请输入手机号',
-                        trigger: ['change', 'blur'],
-                    },
-                    {
-                        // 自定义验证函数，见上说明
-                        validator: (rule, value, callback) => {
-                            // 上面有说，返回true表示校验通过，返回false表示不通过
-                            // this.$u.test.mobile()就是返回true或者false的
-                            return this.$u.test.mobile(value);
-                        },
-                        message: '手机号码不正确',
-                        // 触发器可以同时用blur和change
-                        trigger: ['change', 'blur'],
-                    }
-                ]
-            },
-        }
-    }
-}
-</script>
-<style lang="scss" scoped>
-.page_css {
-    .container {
-        padding: 32rpx 64rpx 32rpx 64rpx;
-
-    }
-}
-</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 109171c..dfc6b6e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,18 +3,20 @@
     <view class="container">
       <view class="title">科研医疗建筑运维平台</view>
       <view class="sp-login-form">
-        <u-input v-model="userInfo.username" :border="true" placeholder="请输入手机号" style="margin-bottom: 32rpx" prefix-icon="search" />
-        <u-input v-model="userInfo.pwd" type="password" :border="true" :password-icon="true" placeholder="请输入密码" style="margin-bottom: 32rpx" />
-        <!-- <betone-new-input :value="userInfo.username" placeholder="请输入用户名" icon="account-fill"
-          style="margin-bottom: 32rpx" @changevalue="userInfo.username = $event" />
-        <betone-new-input style="margin-bottom: 32rpx" v-model="userInfo.pwd" placeholder="请输入密码" :type="'password'"
-          icon="lock-fill" @changevalue="userInfo.pwd = $event" /> -->
+        <view style="margin-bottom: 32rpx">
+          <u-input v-model="userInfo.username" :border="true" placeholder="请输入手机号" />
+        </view>
+        <view style="margin-bottom: 32rpx">
+          <u-input v-model="userInfo.pwd" type="password" :border="true" :password-icon="true" placeholder="请输入密码" />
+        </view>
         <u-checkbox-group>
           <u-checkbox @change="rememberPwdChange" v-model="rememberPwd" key="index" name="记住密码">记住密码</u-checkbox>
         </u-checkbox-group>
-        <u-button class="item-bottom" type="primary" :disabled="disabled" @click="formSubmit()">
-          登录
-        </u-button>
+        <view class="item-bottom">
+          <u-button type="primary" :disabled="disabled" @click="formSubmit()">
+            登录
+          </u-button>
+        </view>
         <view class="footer">
           <span @click="linkRegister()">注册账号</span>
           <span @click="forgotPassword()">忘记密码</span>
@@ -45,7 +47,6 @@ export default {
   },
   computed: {
     disabled() {
-      console.log(11111111111, this.userInfo)
       return !this.userInfo.username || !this.userInfo.pwd;
     },
   },
@@ -85,7 +86,7 @@ export default {
         uni.showToast({ title: "请输入密码", icon: "none" });
         return false;
       }
-     this.BetLoading.show();
+      this.BetLoading.show();
       // // 实例化smCrypto
       // const smCryptoInstance = new smCrypto.SM2Instance();
       // // 设置密钥
@@ -114,7 +115,7 @@ export default {
       this.$u.api
         .login(bjectToQueryString(formdata), formdata)
         .then((res) => {
-         
+
           uni.setStorage({
             key: "userinfo",
             data: res,
@@ -123,10 +124,9 @@ export default {
             key: "token",
             data: res.access_token,
           });
-          console.log(555555555,res.detail.status)
           this.$store.dispatch("changeTabbar", res);
 
-         this.BetLoading.hide();
+          this.BetLoading.hide();
         })
         .catch((err) => {
           if (err.error_code == 2004) {
@@ -135,7 +135,7 @@ export default {
             });
             return false
           }
-         this.BetLoading.hide();
+          this.BetLoading.hide();
         });
     },
 
@@ -161,9 +161,9 @@ export default {
         url: "/pages/register/index",
       });
     },
-    forgotPassword(){
+    forgotPassword() {
       uni.navigateTo({
-        url: "/pages/login/forgotPassword",
+        url: "/pages/forgot/forgotPassword",
       });
     },
   },
@@ -207,6 +207,7 @@ export default {
 
     .item-bottom {
       margin-bottom: 32rpx;
+      margin-top: 32rpx;
     }
 
     .footer {
@@ -225,15 +226,16 @@ export default {
         &:nth-child(1) {
           text-align: left;
           position: relative;
-          // &::before {
-          //   content: "";
-          //   width: 1px;
-          //   height: 20rpx;
-          //   position: absolute;
-          //   top: 10rpx;
-          //   right: 0;
-          //   background: rgb(58, 98, 215);
-          // }
+
+          &::before {
+            content: "";
+            width: 1px;
+            height: 20rpx;
+            position: absolute;
+            top: 10rpx;
+            right: 0;
+            background: rgb(58, 98, 215);
+          }
         }
 
         &:nth-child(2) {
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 72a099b..724017a 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -2,33 +2,35 @@
   <view class="page_css">
     <view class="container">
       <betone-header-top :title="title" />
-      <u-form labelPosition="left" :model="registerInfo" :rules="rules" ref="registerForm">
-        <u-form-item prop="businessName" :border-bottom="false" label-width="0">
-          <betone-new-input label="企业名称" v-model="registerInfo.businessName" placeholder="请输入" :isRequire="true" />
+      <u-form label-position="top" :model="registerInfo" :rules="rules" ref="registerForm">
+        <u-form-item prop="businessName" :border-bottom="false" label="企业名称" :required="true">
+          <u-input v-model="registerInfo.businessName" :border="true" placeholder="请输入手机号"
+            style="margin-bottom: 32rpx" />
         </u-form-item>
-        <u-form-item prop="area" :border-bottom="false" label-width="0">
+        <u-form-item prop="area" :border-bottom="false" label="实验室地址" :required="true">
           <view @click.stop="addMap()" style="width: 100%;height: 100%;">
-            <betone-new-input label="实验室地址" v-model="registerInfo.area" placeholder="请选择" :isRequire="true"
-              type="select" />
+            <betone-new-input v-model="registerInfo.area" placeholder="请选择" type="select" />
           </view>
         </u-form-item>
-        <u-form-item prop="personName" :border-bottom="false" label-width="0">
-          <betone-new-input label="负责人姓名" v-model="registerInfo.personName" placeholder="请输入" :isRequire="true" />
+        <u-form-item prop="personName" :border-bottom="false" label="负责人姓名" :required="true">
+
+          <u-input v-model="registerInfo.personName" type="text" :border="true" placeholder="请输入"
+            style="margin-bottom: 32rpx" />
         </u-form-item>
-        <u-form-item prop="phoneNumber" :border-bottom="false" label-width="0">
-          <betone-new-input label="手机号" v-model="registerInfo.phoneNumber" placeholder="请输入" :isRequire="true" />
+        <u-form-item prop="phoneNumber" :border-bottom="false" label="手机号" :required="true">
+
+          <u-input v-model="registerInfo.phoneNumber" type="text" :border="true" placeholder="请输入"
+            style="margin-bottom: 32rpx" />
         </u-form-item>
-        <u-form-item prop="verificationCode" :border-bottom="false" label-width="0">
-          <betone-new-input label="手机验证码" v-model="registerInfo.verificationCode" placeholder="请输入手机6位数验证码"
-            :isSms="true" @ch="sendCode" :isRequire="true" ref="verificationCode" />
+        <u-form-item prop="verificationCode" :border-bottom="false" >
+          <betone-new-input label="手机验证码" :isRequire="true" v-model="registerInfo.verificationCode" placeholder="请输入手机6位数验证码"
+            :isSms="true" @ch="sendCode" ref="verificationCode" />
         </u-form-item>
-        <u-form-item prop="password" :border-bottom="false" label-width="0">
-          <betone-new-input label="设置密码" v-model="registerInfo.password" placeholder="请输入8-16位数字与字母的组合"
-            :isRequire="true" type="password" />
+        <u-form-item prop="password" :border-bottom="false" label="设置密码" :required="true">
+          <u-input v-model="registerInfo.password" type="password" placeholder="请输入8-16位数字与字母的组合" :border="true" :password-icon="true" />
         </u-form-item>
-        <u-form-item prop="confirmPassword" :border-bottom="false" label-width="0">
-          <betone-new-input label="确认密码" v-model="registerInfo.confirmPassword" placeholder="请再次输入密码" :isRequire="true"
-            type="password" />
+        <u-form-item prop="confirmPassword" label="确认密码" :border-bottom="false" :required="true">
+          <u-input v-model="registerInfo.confirmPassword" type="password" :border="true" :password-icon="true" />
         </u-form-item>
 
         <u-form-item prop="checked" :border-bottom="false">
@@ -189,7 +191,7 @@ export default {
               uni.$u.toast("请勾选《注册服务协议》及《隐私权政策》");
               return false;
             }
-           this.BetLoading.show();
+            this.BetLoading.show();
             let query_ = {
               "deptName": this.registerInfo.businessName,//企业名称
               "address": this.registerInfo.area,//详细地址
@@ -201,7 +203,7 @@ export default {
               "verifyCode": this.registerInfo.verificationCode,//验证码
             }
             this.$u.api.registerUser(query_).then(res => {
-             this.BetLoading.hide();
+              this.BetLoading.hide();
               if (res.code == 200) {
                 setTimeout(() => {
                   uni.navigateTo({
@@ -212,11 +214,11 @@ export default {
                 uni.$u.toast(res.msg);
               }
             }).finally(err => {
-             this.BetLoading.hide();
+              this.BetLoading.hide();
               uni.$u.toast(err.data.msg);
             })
           } else {
-           this.BetLoading.hide();
+            this.BetLoading.hide();
             console.log('验证失败');
           }
         });
@@ -249,7 +251,7 @@ export default {
         this.selectMap = e
         console.log('选中地点', e)
         uni.$emit('commitCheck', e);
-        this.registerInfo.area =e.province+e.city+e.district+e.address
+        this.registerInfo.area = e.province + e.city + e.district + e.address
       }
       this.mapInfo.showMapSelect = false
     }
@@ -274,5 +276,8 @@ export default {
   /deep/.u-form-item__body__right__message {
     margin-left: 0 !important;
   }
+  /deep/.arrow{
+    top: 15rpx;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/pages/submission/components/subForm.vue b/pages/submission/components/subForm.vue
index 8230187..2d54d6e 100644
--- a/pages/submission/components/subForm.vue
+++ b/pages/submission/components/subForm.vue
@@ -3,31 +3,31 @@
         <view class="container">
             <view v-for="(item, index) in breakdownInfo" :key="index">
                 <betone-header-top :titleMin="'故障信息'" />
-                <u-form labelPosition="left" :rules="rules" :ref="`breakdownForm${index}`" :model="item">
-                    <u-form-item  prop="businessName" :border-bottom="false">
+                <u-form labelPosition="top" :rules="rules" :ref="`breakdownForm${index}`" :model="item">
+                    <u-form-item prop="businessName" :border-bottom="false" label="设备名称">
                         <view @click="itemIndexFn(index)" style="width: 100%">
-                            <betone-new-input :disabled="formDisabled" label="设备名称:" v-model="item.deviceName"
-                                placeholder="请输入" endIcon="scan" @scanSuccess="scanSuccess" :endScanIndex="index" />
+                            <betone-new-input :disabled="formDisabled" v-model="item.deviceName" placeholder="请输入"
+                                endIcon="scan" @scanSuccess="scanSuccess" :endScanIndex="index" />
                         </view>
                     </u-form-item>
-                    <u-form-item  prop="businessName" :border-bottom="false">
-                        <betone-new-input :disabled="formDisabled" label="故障位置:" v-model="item.faultLocation"
+                    <u-form-item prop="businessName" :border-bottom="false" label="故障位置">
+                        <u-input v-model="item.faultLocation" :disabled="formDisabled" type="text" :border="true"
                             placeholder="请输入" />
                     </u-form-item>
-                    <u-form-item  prop="businessName" :border-bottom="false">
-                        <betone-new-input :disabled="formDisabled" label="故障专业类型:" v-model="item.faultType"
+                    <u-form-item prop="businessName" :border-bottom="false" label="故障专业类型">
+                        <u-input v-model="item.faultType" :disabled="formDisabled" type="text" :border="true"
                             placeholder="请输入" />
                     </u-form-item>
-                    <u-form-item  prop="faultDescribe" :border-bottom="false" label-width="0">
-                        <betone-new-input :disabled="formDisabled" label="故障描述:" v-model="item.faultDescribe"
-                            placeholder="请输入" type="textarea" :height="150" :isRequire="true" />
+                    <u-form-item prop="faultDescribe" :border-bottom="false" label="故障描述:" :required="true">
+                        <u-input v-model="item.faultDescribe" :disabled="formDisabled" type="textarea" :border="true"
+                            placeholder="请输入" :height="150" />
                     </u-form-item>
-                    <u-form-item label="故障视频:" prop="businessName" :border-bottom="false" label-position="top">
+                    <u-form-item label="故障视频" prop="businessName" :border-bottom="false" label-position="top">
                         <betone-upload :disabled="formDisabled" :type="'video'" v-model="item.videoAttaches"
                             @changeFile="changeVideo" :formIndex="index">
                         </betone-upload>
                     </u-form-item>
-                    <u-form-item label="故障图片:" prop="businessName" :border-bottom="false" label-width="180"
+                    <u-form-item label="故障图片" prop="businessName" :border-bottom="false" label-width="180"
                         label-position="top">
                         <betone-upload :disabled="formDisabled" :type="'images'" v-model="item.picAttaches"
                             @changeFile="changePic" :formIndex="index">
@@ -196,7 +196,7 @@ export default {
             })
         },
         // 扫码成功
-        scanSuccess(e,index) {
+        scanSuccess(e, index) {
             // 扫码返回  设备id  
             let id_ = e.toString()
             this.$u.api.getDeviceDetail({ id: id_ }).then(res => {
diff --git a/static/images/addImg.png b/static/images/addImg.png
index e7b37ac..4b61231 100644
Binary files a/static/images/addImg.png and b/static/images/addImg.png differ
diff --git a/static/images/avatr.png b/static/images/avatr.png
index e298c8a..5c68758 100644
Binary files a/static/images/avatr.png and b/static/images/avatr.png differ
diff --git a/static/images/betone-sp-component/acpay.png b/static/images/betone-sp-component/acpay.png
deleted file mode 100644
index 6fc6bdb..0000000
Binary files a/static/images/betone-sp-component/acpay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/acpwd.png b/static/images/betone-sp-component/acpwd.png
deleted file mode 100644
index 90c0c7a..0000000
Binary files a/static/images/betone-sp-component/acpwd.png and /dev/null differ
diff --git a/static/images/betone-sp-component/addImg.png b/static/images/betone-sp-component/addImg.png
new file mode 100644
index 0000000..4b61231
Binary files /dev/null and b/static/images/betone-sp-component/addImg.png differ
diff --git a/static/images/betone-sp-component/addup.png b/static/images/betone-sp-component/addup.png
deleted file mode 100644
index 100d64d..0000000
Binary files a/static/images/betone-sp-component/addup.png and /dev/null differ
diff --git a/static/images/betone-sp-component/agree/check.png b/static/images/betone-sp-component/agree/check.png
deleted file mode 100644
index 7a283cd..0000000
Binary files a/static/images/betone-sp-component/agree/check.png and /dev/null differ
diff --git a/static/images/betone-sp-component/agree/no-checke.png b/static/images/betone-sp-component/agree/no-checke.png
deleted file mode 100644
index 91b6e5f..0000000
Binary files a/static/images/betone-sp-component/agree/no-checke.png and /dev/null differ
diff --git a/static/images/betone-sp-component/al.png b/static/images/betone-sp-component/al.png
deleted file mode 100644
index 56b5bd0..0000000
Binary files a/static/images/betone-sp-component/al.png and /dev/null differ
diff --git a/static/images/betone-sp-component/ar.png b/static/images/betone-sp-component/ar.png
deleted file mode 100644
index 5de4e9f..0000000
Binary files a/static/images/betone-sp-component/ar.png and /dev/null differ
diff --git a/static/images/betone-sp-component/assets-bg.png b/static/images/betone-sp-component/assets-bg.png
deleted file mode 100644
index 5461503..0000000
Binary files a/static/images/betone-sp-component/assets-bg.png and /dev/null differ
diff --git a/static/images/betone-sp-component/auth2.png b/static/images/betone-sp-component/auth2.png
deleted file mode 100644
index 1233941..0000000
Binary files a/static/images/betone-sp-component/auth2.png and /dev/null differ
diff --git a/static/images/betone-sp-component/avatr.png b/static/images/betone-sp-component/avatr.png
new file mode 100644
index 0000000..5c68758
Binary files /dev/null and b/static/images/betone-sp-component/avatr.png differ
diff --git a/static/images/betone-sp-component/awl.png b/static/images/betone-sp-component/awl.png
deleted file mode 100644
index 837f58f..0000000
Binary files a/static/images/betone-sp-component/awl.png and /dev/null differ
diff --git a/static/images/betone-sp-component/awr.png b/static/images/betone-sp-component/awr.png
deleted file mode 100644
index 0c9afc6..0000000
Binary files a/static/images/betone-sp-component/awr.png and /dev/null differ
diff --git a/static/images/betone-sp-component/bank.png b/static/images/betone-sp-component/bank.png
deleted file mode 100644
index 297e529..0000000
Binary files a/static/images/betone-sp-component/bank.png and /dev/null differ
diff --git a/static/images/betone-sp-component/bankac.png b/static/images/betone-sp-component/bankac.png
deleted file mode 100644
index a86fad8..0000000
Binary files a/static/images/betone-sp-component/bankac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/bell.png b/static/images/betone-sp-component/bell.png
deleted file mode 100644
index 5466e61..0000000
Binary files a/static/images/betone-sp-component/bell.png and /dev/null differ
diff --git a/static/images/betone-sp-component/buser.png b/static/images/betone-sp-component/buser.png
deleted file mode 100644
index c49f22f..0000000
Binary files a/static/images/betone-sp-component/buser.png and /dev/null differ
diff --git a/static/images/betone-sp-component/buy-his-ac.png b/static/images/betone-sp-component/buy-his-ac.png
deleted file mode 100644
index 21deb77..0000000
Binary files a/static/images/betone-sp-component/buy-his-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/buy-his-df.png b/static/images/betone-sp-component/buy-his-df.png
deleted file mode 100644
index 3df244e..0000000
Binary files a/static/images/betone-sp-component/buy-his-df.png and /dev/null differ
diff --git a/static/images/betone-sp-component/c.png b/static/images/betone-sp-component/c.png
deleted file mode 100644
index 2e48f07..0000000
Binary files a/static/images/betone-sp-component/c.png and /dev/null differ
diff --git a/static/images/betone-sp-component/cl.png b/static/images/betone-sp-component/cl.png
deleted file mode 100644
index 58864c5..0000000
Binary files a/static/images/betone-sp-component/cl.png and /dev/null differ
diff --git a/static/images/betone-sp-component/clogo-new.png b/static/images/betone-sp-component/clogo-new.png
deleted file mode 100644
index 0e648cc..0000000
Binary files a/static/images/betone-sp-component/clogo-new.png and /dev/null differ
diff --git a/static/images/betone-sp-component/clogo.png b/static/images/betone-sp-component/clogo.png
deleted file mode 100644
index e75c06e..0000000
Binary files a/static/images/betone-sp-component/clogo.png and /dev/null differ
diff --git a/static/images/betone-sp-component/close.png b/static/images/betone-sp-component/close.png
index 84ede53..a6c1af5 100644
Binary files a/static/images/betone-sp-component/close.png and b/static/images/betone-sp-component/close.png differ
diff --git a/static/images/betone-sp-component/cp.png b/static/images/betone-sp-component/cp.png
deleted file mode 100644
index 6189cbf..0000000
Binary files a/static/images/betone-sp-component/cp.png and /dev/null differ
diff --git a/static/images/betone-sp-component/cyn-b.png b/static/images/betone-sp-component/cyn-b.png
deleted file mode 100644
index 05c57aa..0000000
Binary files a/static/images/betone-sp-component/cyn-b.png and /dev/null differ
diff --git a/static/images/betone-sp-component/cyn.png b/static/images/betone-sp-component/cyn.png
deleted file mode 100644
index 1dd8555..0000000
Binary files a/static/images/betone-sp-component/cyn.png and /dev/null differ
diff --git a/static/images/betone-sp-component/dcog.png b/static/images/betone-sp-component/dcog.png
deleted file mode 100644
index 436cda9..0000000
Binary files a/static/images/betone-sp-component/dcog.png and /dev/null differ
diff --git a/static/images/betone-sp-component/dcogw.png b/static/images/betone-sp-component/dcogw.png
deleted file mode 100644
index 1c510cc..0000000
Binary files a/static/images/betone-sp-component/dcogw.png and /dev/null differ
diff --git a/static/images/betone-sp-component/defaultuser.png b/static/images/betone-sp-component/defaultuser.png
deleted file mode 100644
index 092edf2..0000000
Binary files a/static/images/betone-sp-component/defaultuser.png and /dev/null differ
diff --git a/static/images/betone-sp-component/defaultuser2.png b/static/images/betone-sp-component/defaultuser2.png
deleted file mode 100644
index d139683..0000000
Binary files a/static/images/betone-sp-component/defaultuser2.png and /dev/null differ
diff --git a/static/images/betone-sp-component/defaultuser3.png b/static/images/betone-sp-component/defaultuser3.png
deleted file mode 100644
index e66c7ed..0000000
Binary files a/static/images/betone-sp-component/defaultuser3.png and /dev/null differ
diff --git a/static/images/betone-sp-component/dn.png b/static/images/betone-sp-component/dn.png
deleted file mode 100644
index bbf1d2b..0000000
Binary files a/static/images/betone-sp-component/dn.png and /dev/null differ
diff --git a/static/images/betone-sp-component/dropdown.png b/static/images/betone-sp-component/dropdown.png
deleted file mode 100644
index b7a5e82..0000000
Binary files a/static/images/betone-sp-component/dropdown.png and /dev/null differ
diff --git a/static/images/betone-sp-component/duplicate.png b/static/images/betone-sp-component/duplicate.png
deleted file mode 100644
index 1365b0d..0000000
Binary files a/static/images/betone-sp-component/duplicate.png and /dev/null differ
diff --git a/static/images/betone-sp-component/el.png b/static/images/betone-sp-component/el.png
deleted file mode 100644
index 0d98f21..0000000
Binary files a/static/images/betone-sp-component/el.png and /dev/null differ
diff --git a/static/images/betone-sp-component/emj.png b/static/images/betone-sp-component/emj.png
deleted file mode 100644
index a06c03d..0000000
Binary files a/static/images/betone-sp-component/emj.png and /dev/null differ
diff --git a/static/images/betone-sp-component/err.png b/static/images/betone-sp-component/err.png
deleted file mode 100644
index e0b410a..0000000
Binary files a/static/images/betone-sp-component/err.png and /dev/null differ
diff --git a/static/images/betone-sp-component/eye copy.png b/static/images/betone-sp-component/eye copy.png
deleted file mode 100644
index 098db3f..0000000
Binary files a/static/images/betone-sp-component/eye copy.png and /dev/null differ
diff --git a/static/images/betone-sp-component/eye-off.png b/static/images/betone-sp-component/eye-off.png
index 2839731..90f99df 100644
Binary files a/static/images/betone-sp-component/eye-off.png and b/static/images/betone-sp-component/eye-off.png differ
diff --git a/static/images/betone-sp-component/eye.png b/static/images/betone-sp-component/eye.png
index 098db3f..b14c9a5 100644
Binary files a/static/images/betone-sp-component/eye.png and b/static/images/betone-sp-component/eye.png differ
diff --git a/static/images/betone-sp-component/filter.png b/static/images/betone-sp-component/filter.png
deleted file mode 100644
index ec994f0..0000000
Binary files a/static/images/betone-sp-component/filter.png and /dev/null differ
diff --git a/static/images/betone-sp-component/g.png b/static/images/betone-sp-component/g.png
deleted file mode 100644
index 79ab354..0000000
Binary files a/static/images/betone-sp-component/g.png and /dev/null differ
diff --git a/static/images/betone-sp-component/imgbox.png b/static/images/betone-sp-component/imgbox.png
deleted file mode 100644
index 07a2dcd..0000000
Binary files a/static/images/betone-sp-component/imgbox.png and /dev/null differ
diff --git a/static/images/betone-sp-component/language-switch.png b/static/images/betone-sp-component/language-switch.png
deleted file mode 100644
index d6ca324..0000000
Binary files a/static/images/betone-sp-component/language-switch.png and /dev/null differ
diff --git a/static/images/betone-sp-component/logo-sp.png b/static/images/betone-sp-component/logo-sp.png
deleted file mode 100644
index 5a391fc..0000000
Binary files a/static/images/betone-sp-component/logo-sp.png and /dev/null differ
diff --git a/static/images/betone-sp-component/logo.png b/static/images/betone-sp-component/logo.png
deleted file mode 100644
index 91a24da..0000000
Binary files a/static/images/betone-sp-component/logo.png and /dev/null differ
diff --git a/static/images/betone-sp-component/mme.png b/static/images/betone-sp-component/mme.png
deleted file mode 100644
index 7df4c3b..0000000
Binary files a/static/images/betone-sp-component/mme.png and /dev/null differ
diff --git a/static/images/betone-sp-component/mquick.png b/static/images/betone-sp-component/mquick.png
deleted file mode 100644
index dc235a2..0000000
Binary files a/static/images/betone-sp-component/mquick.png and /dev/null differ
diff --git a/static/images/betone-sp-component/msell.png b/static/images/betone-sp-component/msell.png
deleted file mode 100644
index ff38001..0000000
Binary files a/static/images/betone-sp-component/msell.png and /dev/null differ
diff --git a/static/images/betone-sp-component/mu.png b/static/images/betone-sp-component/mu.png
deleted file mode 100644
index 9bb38b3..0000000
Binary files a/static/images/betone-sp-component/mu.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-about.png b/static/images/betone-sp-component/my-about.png
deleted file mode 100644
index 9b4226c..0000000
Binary files a/static/images/betone-sp-component/my-about.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-add.png b/static/images/betone-sp-component/my-add.png
deleted file mode 100644
index 852f20f..0000000
Binary files a/static/images/betone-sp-component/my-add.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-arrow.png b/static/images/betone-sp-component/my-arrow.png
deleted file mode 100644
index dcd9562..0000000
Binary files a/static/images/betone-sp-component/my-arrow.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-buy.png b/static/images/betone-sp-component/my-buy.png
deleted file mode 100644
index cb86428..0000000
Binary files a/static/images/betone-sp-component/my-buy.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-copy.png b/static/images/betone-sp-component/my-copy.png
deleted file mode 100644
index 63eccff..0000000
Binary files a/static/images/betone-sp-component/my-copy.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-cus.png b/static/images/betone-sp-component/my-cus.png
deleted file mode 100644
index 7092b71..0000000
Binary files a/static/images/betone-sp-component/my-cus.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-edit.png b/static/images/betone-sp-component/my-edit.png
deleted file mode 100644
index f418b01..0000000
Binary files a/static/images/betone-sp-component/my-edit.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-guadan.png b/static/images/betone-sp-component/my-guadan.png
deleted file mode 100644
index 455895a..0000000
Binary files a/static/images/betone-sp-component/my-guadan.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-help.png b/static/images/betone-sp-component/my-help.png
deleted file mode 100644
index fd21c81..0000000
Binary files a/static/images/betone-sp-component/my-help.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-pay.png b/static/images/betone-sp-component/my-pay.png
deleted file mode 100644
index 1beb70c..0000000
Binary files a/static/images/betone-sp-component/my-pay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-safe.png b/static/images/betone-sp-component/my-safe.png
deleted file mode 100644
index 8c88b57..0000000
Binary files a/static/images/betone-sp-component/my-safe.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-sell.png b/static/images/betone-sp-component/my-sell.png
deleted file mode 100644
index 85b977b..0000000
Binary files a/static/images/betone-sp-component/my-sell.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-suggest.png b/static/images/betone-sp-component/my-suggest.png
deleted file mode 100644
index 1441284..0000000
Binary files a/static/images/betone-sp-component/my-suggest.png and /dev/null differ
diff --git a/static/images/betone-sp-component/my-user.png b/static/images/betone-sp-component/my-user.png
deleted file mode 100644
index 02c7561..0000000
Binary files a/static/images/betone-sp-component/my-user.png and /dev/null differ
diff --git a/static/images/betone-sp-component/no-auth.png b/static/images/betone-sp-component/no-auth.png
deleted file mode 100644
index a032dcc..0000000
Binary files a/static/images/betone-sp-component/no-auth.png and /dev/null differ
diff --git a/static/images/betone-sp-component/not-found.png b/static/images/betone-sp-component/not-found.png
deleted file mode 100644
index 7298c27..0000000
Binary files a/static/images/betone-sp-component/not-found.png and /dev/null differ
diff --git a/static/images/betone-sp-component/null.svg b/static/images/betone-sp-component/null.svg
deleted file mode 100644
index 2a6ba42..0000000
--- a/static/images/betone-sp-component/null.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="236px" height="170px" viewBox="0 0 236 170" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 2备份</title>
-    <g id="24.2.23/改颜色" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="缺省页" transform="translate(-70.000000, -327.000000)">
-            <g id="编组-2备份" transform="translate(70.000000, 327.000000)">
-                <g id="编组-2" transform="translate(3.000000, 8.000000)">
-                    <path d="M1.15952713,86.4493832 C9.61090723,124.376489 43.1975673,143.902897 72.2343843,151.2136 C101.271201,158.524304 158.458911,158.524304 201.13796,120.624295 C220.860541,103.110175 237.542004,66.2072931 221.68648,35.8166135 C208.35199,10.2580628 180.6398,-2.3102229 152.227976,6.7623668 C110.820303,19.9848483 95.6846167,44.8277782 78.0908054,39.1187297 C68.9209547,36.1431878 42.0171394,28.4341586 23.2069533,37.5232749 C5.92681707,45.8730683 -3.42545173,65.8734565 1.15952713,86.4493832 Z" id="路径-2" fill="#99DBFF" opacity="0.25"></path>
-                    <path d="M193.496502,24.3892062 C194.03718,23.8486689 194.913678,23.8487829 195.454216,24.3894608 C195.505912,24.441171 195.553431,24.4968959 195.596325,24.5561124 L199.481193,29.9192686 C199.586318,30.0643957 199.553889,30.2672649 199.408762,30.3723895 C199.295221,30.4546343 199.141698,30.4546533 199.028137,30.3724366 L193.663345,26.4884054 C193.04439,26.0402906 192.905896,25.1752592 193.354011,24.5563037 C193.397006,24.4969172 193.444653,24.4410421 193.496502,24.3892062 Z M202.376285,21.6249978 C203.1332,21.7313475 203.660587,22.4311616 203.554237,23.1880763 C203.544043,23.2606332 203.528103,23.332266 203.506567,23.4022992 L201.5602,29.7317705 C201.507528,29.9030561 201.325974,29.9992115 201.154689,29.9465397 C201.020692,29.9053345 200.928311,29.7827319 200.925646,29.6425677 L200.799772,23.0220191 C200.78524,22.2576995 201.393063,21.6263158 202.157383,21.6117841 C202.230585,21.6103923 202.303782,21.6148108 202.376285,21.6249978 Z" id="形状结合" fill="#000000" transform="translate(198.329323, 26.022571) rotate(-270.000000) translate(-198.329323, -26.022571) "></path>
-                    <path d="M56.3925065,131.401807 C28.8834097,118.594203 25.872195,104.351677 47.3588625,88.6742299 C48.9708173,87.4980896 63.3739494,78.591178 78.4475938,74.7193644 C107.63379,67.2226035 136.627527,66.7452129 159.529024,54.7744535 C168.29405,50.1929182 172.374042,44.9628806 171.769001,39.0843409" id="路径-10" stroke="#000000" stroke-width="1.29789" stroke-dasharray="2.163149952888489"></path>
-                    <ellipse id="椭圆形" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF" cx="95.4815995" cy="141.477144" rx="58.9749938" ry="13.5228559"></ellipse>
-                    <ellipse id="椭圆形" fill="#080508" cx="95.4815995" cy="145.263544" rx="55.7286639" ry="9.73645627"></ellipse>
-                    <g id="脸蛋" transform="translate(177.721958, 33.835211) rotate(27.000000) translate(-177.721958, -33.835211) translate(164.195583, 20.312355)">
-                        <ellipse id="椭圆形" fill="#5669EF" cx="13.5263747" cy="13.5228559" rx="13.5263747" ry="13.5228559"></ellipse>
-                        <ellipse id="椭圆形" fill="#000000" cx="10.0636228" cy="10.2773705" rx="1" ry="3.24548542"></ellipse>
-                        <ellipse id="椭圆形备份" fill="#000000" cx="16.5562827" cy="10.2773705" rx="1" ry="3.24548542"></ellipse>
-                        <rect id="矩形" fill="#000000" x="7.57476985" y="19.148364" width="11.9032098" height="1.08182847" rx="0.540914237"></rect>
-                    </g>
-                    <g id="牌牌" transform="translate(79.764379, 0.000000)">
-                        <path d="M35.4666828,59.7994336 L27.904142,7.74674626 C27.7277687,6.53277559 28.2511008,5.32312329 29.2566548,4.62048998 L32.9993332,2.00528418 C33.9786225,1.32100336 35.3272125,1.56015499 36.0114934,2.53944429 C36.2039429,2.81486301 36.3295884,3.13132603 36.3784694,3.46374585 L45.1206263,62.9155968 L45.1206263,62.9155968" id="路径-11" fill="#000000"></path>
-                        <path d="M9.87266955,8.20200594 L60.738908,8.2040505 C64.9200319,8.20482728 68.3094606,11.5942559 68.3102374,15.7753798 L68.3110205,35.2520614 C68.3117973,39.4334231 64.9222702,42.8232227 60.7409085,42.8233908 C60.7407056,42.8233908 60.7405027,42.8233908 60.7402999,42.8227821 L9.87406138,42.8207376 C5.69293747,42.8199608 2.30350883,39.4305322 2.302732,35.2494083 L2.30194895,15.7727266 C2.30117215,11.591365 5.69069922,8.20156537 9.87206087,8.20139726 C9.87226377,8.20139726 9.87246667,8.20139726 9.87266955,8.20200594 Z" id="矩形" stroke="#000000" stroke-width="1.081575" fill="#EFE05D" transform="translate(35.306485, 25.512394) rotate(-9.000000) translate(-35.306485, -25.512394) "></path>
-                    </g>
-                    <g id="手" transform="translate(74.773284, 54.256505)">
-                        <path d="M57.1551612,4.33177743 L65.01875,15.3838148 L68.8696447,20.874971 L67.3520484,30.8470663 L68.8696447,47.7832566 L58.8012372,62.7316841 L42.5159924,70.4748231 L42.515377,99.6357774 L0.586376956,99.8167774 L0.448376956,98.8479837 L1.5378483,92.9905412 L14.8011318,37.524566 L29.4234023,10.0261366 L44.5147347,6.24877763 L57.1551612,4.33177743 Z" id="形状结合" fill="#FFFFFF"></path>
-                        <path d="M20.7083152,81.270582 C28.4473038,81.270582 35.8178508,81.5461875 42.5159483,82.0442847 L42.5159483,99.9697919 C35.8178508,100.467889 28.4473038,100.743495 20.7083152,100.743495 C13.6285924,100.743495 6.85721167,100.512845 0.626918354,100.09221 L0.448376956,98.8479837 L1.5378483,92.9905412 L4.23643999,81.7028911 C9.44235377,81.4218867 14.9741991,81.270582 20.7083152,81.270582 Z" id="形状结合" fill="#FFFFFF"></path>
-                        <path d="M34.5779538,30.0249824 C35.8167535,42.253005 32.796652,50.9094695 25.5176494,55.9943761" id="路径-4" stroke="#000000" stroke-width="1.081575" stroke-linecap="round"></path>
-                        <path d="M45.5289874,5.56101798 C51.7772292,3.48878131 56.5117672,2.37313776 59.7326014,2.21408734 C70.1746991,1.69843832 74.6181356,8.98252732 70.6177666,19.5179019" id="路径-8" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF"></path>
-                        <path d="M52.1086675,16.3695616 C58.1334136,15.4008564 62.2282259,15.1461199 64.3931044,15.6053521 C70.8013444,16.9647218 74.093069,23.3754713 70.2204036,30.8470663" id="路径-7" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF"></path>
-                        <path d="M52.6699918,27.0266266 C68.8428705,24.9752933 74.3359719,30.0503119 69.149296,42.2516822" id="路径-6" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF"></path>
-                        <line x1="42.5159924" y1="71.9772468" x2="42.5159924" y2="99.8849379" id="路径-9" stroke="#000000" stroke-width="1.081575"></line>
-                        <path d="M60.5160145,53.0457867 C48.4867129,55.7965558 43.1529529,53.4558573 44.5147347,46.0236912 C45.7554552,39.2522389 57.6137855,37.2094311 65.0842836,40.0835396 C69.9129158,41.9412488 72.1238475,44.9495304 71.509258,49.2452346 C70.3144469,57.5964261 60.2058522,73.2940761 32.6075468,72.6849" id="路径-5" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF" stroke-linecap="round"></path>
-                        <path d="M60.5160145,53.0457867 C48.4867129,55.7965558 43.1529529,53.4558573 44.5147347,46.0236912 C45.7554552,39.2522389 57.6137855,37.2094311 65.0842836,40.0835396 C69.9129158,41.9412488 72.1238475,44.9495304 71.509258,49.2452346 C70.3144469,57.5964261 60.2058522,73.2940761 32.6075468,72.6849" id="路径-5" stroke="#000000" stroke-width="1.081575" stroke-linecap="round"></path>
-                        <path d="M0.182498262,99.8849379 C-1.15412258,48.0837373 4.8513345,16.8592085 18.1988695,6.21135135 C38.220172,-9.76043433 51.7775486,8.68791656 52.5358789,21.0058533 C52.7895084,25.1256832 53.0449877,33.3642598 49.6528928,37.624922 C47.1196769,40.8067839 43.7615052,41.1943617 40.528505,39.6633128 C34.926824,37.01053 32.5221027,22.752849 32.5221027,16.9392024" id="路径-3" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF" stroke-linecap="round"></path>
-                    </g>
-                    <path d="M66.3463964,76.3316439 C64.1801266,72.4693902 59.1142039,71.137111 51.1486281,72.3348063 C47.4702963,72.5165963 47.4702963,71.3788639 51.1486281,68.9216094 C53.0139702,67.6754955 55.2809412,66.5768201 56.8126072,65.0132448 C59.8114581,61.9519188 61.7938893,58.2294432 58.5582926,52.8477633 C56.4174323,50.1177539 56.1277972,48.9092741 57.6893871,49.222324 C60.031772,49.6918989 64.9395867,53.0550953 66.7877932,52.0167389 C68.0199309,51.3245012 68.2707262,49.1961353 67.5401792,45.631641 C68.4763048,47.0573599 69.3604188,47.7702194 70.1925213,47.7702194 C71.4406751,47.7702194 73.3220554,45.772 74.2038022,44.1299516 C75.085549,42.4879032 75.6343742,38.2618585 75.6343742,41.4337636 C75.6343742,44.6056688 76.0124128,54.8325562 76.8813381,56.5319815 C77.7502633,58.2314068 75.7501795,57.7303962 74.5426891,55.1487351 C73.3351987,52.5670739 74.2768785,49.083856 71.530886,50.6917343 C68.7848935,52.2996127 71.0133217,54.8353609 71.0133217,55.9355262 C71.0133217,57.0356916 68.454824,57.3933896 66.3463964,56.9626856 C64.2379689,56.5319815 63.3414802,56.3275484 63.3414802,60.2536107 C63.3414802,64.179673 61.3961402,67.2942828 58.5582926,68.1079461 C62.350215,70.3232829 64.6264261,72.105943 65.386926,73.4559266 C66.1474258,74.8059101 66.4672493,75.7644826 66.3463964,76.3316439 Z" id="路径-12" fill="#FFFFFF"></path>
-                    <g id="0" transform="translate(114.859424, 25.165098) rotate(-7.000000) translate(-114.859424, -25.165098) translate(107.896722, 14.836900)" fill="#000000" fill-rule="nonzero">
-                        <path d="M6.78244458,0.00122943512 C4.38859155,0.0430142952 2.62509673,1.10402352 1.46509637,3.24041398 C0.438443065,5.04034908 -0.0486465819,7.44343365 0.00382742851,10.4496677 C0.0563014389,13.4559017 0.626960806,15.8405232 1.71580553,17.6035322 C2.94917233,19.6703023 4.74910743,20.6969556 7.14296046,20.6551707 C9.508978,20.6138717 11.2719869,19.525027 12.4603087,17.4159862 C13.486962,15.6160511 13.9740516,13.2129665 13.9215776,10.2067325 C13.8691036,7.20049842 13.2984442,4.81587692 12.2095995,3.05286798 C10.9479113,0.958748249 9.14846211,-0.0400695545 6.78244458,0.00122943512 Z M6.81645551,1.94971446 C8.59792754,1.91861875 9.89488015,2.84267572 10.7077992,4.74972088 C11.287831,6.07610748 11.626089,7.90790593 11.6669021,10.246088 C11.7072293,12.5564345 11.4331063,14.3989221 10.9002039,15.772579 C10.1538491,17.6789974 8.89042156,18.67559 7.10894953,18.7066857 C5.32747751,18.7377814 4.03003902,17.7858889 3.21760582,15.9066793 C2.63708816,14.5524572 2.32666571,12.7201728 2.28633846,10.4098263 C2.24552534,8.07164428 2.49181289,6.22964255 3.02520112,4.88382112 C3.77107007,2.94956723 5.03498349,1.98081017 6.81645551,1.94971446 Z" id="形状"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/betone-sp-component/ok.png b/static/images/betone-sp-component/ok.png
deleted file mode 100644
index 1ddb00b..0000000
Binary files a/static/images/betone-sp-component/ok.png and /dev/null differ
diff --git a/static/images/betone-sp-component/p.png b/static/images/betone-sp-component/p.png
deleted file mode 100644
index 69cd945..0000000
Binary files a/static/images/betone-sp-component/p.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/alipay-ac.png b/static/images/betone-sp-component/pay-icon/alipay-ac.png
deleted file mode 100644
index a6ee219..0000000
Binary files a/static/images/betone-sp-component/pay-icon/alipay-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/alipay.png b/static/images/betone-sp-component/pay-icon/alipay.png
deleted file mode 100644
index 1362d9b..0000000
Binary files a/static/images/betone-sp-component/pay-icon/alipay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/bankCard-ac.png b/static/images/betone-sp-component/pay-icon/bankCard-ac.png
deleted file mode 100644
index 227c584..0000000
Binary files a/static/images/betone-sp-component/pay-icon/bankCard-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/bankCard.png b/static/images/betone-sp-component/pay-icon/bankCard.png
deleted file mode 100644
index d77fa7f..0000000
Binary files a/static/images/betone-sp-component/pay-icon/bankCard.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/bkash.png b/static/images/betone-sp-component/pay-icon/bkash.png
deleted file mode 100644
index 9809aaf..0000000
Binary files a/static/images/betone-sp-component/pay-icon/bkash.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/br_banktransfer-ac.png b/static/images/betone-sp-component/pay-icon/br_banktransfer-ac.png
deleted file mode 100644
index bbde58b..0000000
Binary files a/static/images/betone-sp-component/pay-icon/br_banktransfer-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/br_banktransfer.png b/static/images/betone-sp-component/pay-icon/br_banktransfer.png
deleted file mode 100644
index 17ad975..0000000
Binary files a/static/images/betone-sp-component/pay-icon/br_banktransfer.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/easypaisa.png b/static/images/betone-sp-component/pay-icon/easypaisa.png
deleted file mode 100644
index d8e1316..0000000
Binary files a/static/images/betone-sp-component/pay-icon/easypaisa.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/fps-ac.png b/static/images/betone-sp-component/pay-icon/fps-ac.png
deleted file mode 100644
index 98cbdca..0000000
Binary files a/static/images/betone-sp-component/pay-icon/fps-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/fps.png b/static/images/betone-sp-component/pay-icon/fps.png
deleted file mode 100644
index e8d18e1..0000000
Binary files a/static/images/betone-sp-component/pay-icon/fps.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/freecharge-ac.png b/static/images/betone-sp-component/pay-icon/freecharge-ac.png
deleted file mode 100644
index 32db1cc..0000000
Binary files a/static/images/betone-sp-component/pay-icon/freecharge-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/freecharge.png b/static/images/betone-sp-component/pay-icon/freecharge.png
deleted file mode 100644
index f139bf6..0000000
Binary files a/static/images/betone-sp-component/pay-icon/freecharge.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/gcash-ac.png b/static/images/betone-sp-component/pay-icon/gcash-ac.png
deleted file mode 100644
index 2ab0cbb..0000000
Binary files a/static/images/betone-sp-component/pay-icon/gcash-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/gcash.png b/static/images/betone-sp-component/pay-icon/gcash.png
deleted file mode 100644
index 7099e07..0000000
Binary files a/static/images/betone-sp-component/pay-icon/gcash.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/grabpay-ac.png b/static/images/betone-sp-component/pay-icon/grabpay-ac.png
deleted file mode 100644
index 7fcd3ac..0000000
Binary files a/static/images/betone-sp-component/pay-icon/grabpay-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/grabpay.png b/static/images/betone-sp-component/pay-icon/grabpay.png
deleted file mode 100644
index 1815034..0000000
Binary files a/static/images/betone-sp-component/pay-icon/grabpay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/help2pay-ac.png b/static/images/betone-sp-component/pay-icon/help2pay-ac.png
deleted file mode 100644
index 2f50569..0000000
Binary files a/static/images/betone-sp-component/pay-icon/help2pay-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/help2pay.png b/static/images/betone-sp-component/pay-icon/help2pay.png
deleted file mode 100644
index e136c8a..0000000
Binary files a/static/images/betone-sp-component/pay-icon/help2pay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/jazzcash.png b/static/images/betone-sp-component/pay-icon/jazzcash.png
deleted file mode 100644
index 28c5a05..0000000
Binary files a/static/images/betone-sp-component/pay-icon/jazzcash.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/jp_banktransfer-ac.png b/static/images/betone-sp-component/pay-icon/jp_banktransfer-ac.png
deleted file mode 100644
index 8fb0f90..0000000
Binary files a/static/images/betone-sp-component/pay-icon/jp_banktransfer-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/jp_banktransfer.png b/static/images/betone-sp-component/pay-icon/jp_banktransfer.png
deleted file mode 100644
index cdf7040..0000000
Binary files a/static/images/betone-sp-component/pay-icon/jp_banktransfer.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/linepay-ac.png b/static/images/betone-sp-component/pay-icon/linepay-ac.png
deleted file mode 100644
index a0eb79b..0000000
Binary files a/static/images/betone-sp-component/pay-icon/linepay-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/linepay.png b/static/images/betone-sp-component/pay-icon/linepay.png
deleted file mode 100644
index 3b1b19b..0000000
Binary files a/static/images/betone-sp-component/pay-icon/linepay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/mercado_pago.png b/static/images/betone-sp-component/pay-icon/mercado_pago.png
deleted file mode 100644
index fd165a8..0000000
Binary files a/static/images/betone-sp-component/pay-icon/mercado_pago.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/mex_bank-ac.png b/static/images/betone-sp-component/pay-icon/mex_bank-ac.png
deleted file mode 100644
index 8fb0f90..0000000
Binary files a/static/images/betone-sp-component/pay-icon/mex_bank-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/mex_bank.png b/static/images/betone-sp-component/pay-icon/mex_bank.png
deleted file mode 100644
index cdf7040..0000000
Binary files a/static/images/betone-sp-component/pay-icon/mex_bank.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/mobikwik.png b/static/images/betone-sp-component/pay-icon/mobikwik.png
deleted file mode 100644
index 5c8df3e..0000000
Binary files a/static/images/betone-sp-component/pay-icon/mobikwik.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/netbanking.png b/static/images/betone-sp-component/pay-icon/netbanking.png
deleted file mode 100644
index 49ffc0f..0000000
Binary files a/static/images/betone-sp-component/pay-icon/netbanking.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/onelinebank-ac.png b/static/images/betone-sp-component/pay-icon/onelinebank-ac.png
deleted file mode 100644
index 227c584..0000000
Binary files a/static/images/betone-sp-component/pay-icon/onelinebank-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/onelinebank.png b/static/images/betone-sp-component/pay-icon/onelinebank.png
deleted file mode 100644
index d77fa7f..0000000
Binary files a/static/images/betone-sp-component/pay-icon/onelinebank.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/paymaya-ac.png b/static/images/betone-sp-component/pay-icon/paymaya-ac.png
deleted file mode 100644
index dfc4109..0000000
Binary files a/static/images/betone-sp-component/pay-icon/paymaya-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/paymaya.png b/static/images/betone-sp-component/pay-icon/paymaya.png
deleted file mode 100644
index a760bfa..0000000
Binary files a/static/images/betone-sp-component/pay-icon/paymaya.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/payme-ac.png b/static/images/betone-sp-component/pay-icon/payme-ac.png
deleted file mode 100644
index 784fd46..0000000
Binary files a/static/images/betone-sp-component/pay-icon/payme-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/payme.png b/static/images/betone-sp-component/pay-icon/payme.png
deleted file mode 100644
index 936628b..0000000
Binary files a/static/images/betone-sp-component/pay-icon/payme.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/paypal.png b/static/images/betone-sp-component/pay-icon/paypal.png
deleted file mode 100644
index 324764d..0000000
Binary files a/static/images/betone-sp-component/pay-icon/paypal.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/paytm-ac.png b/static/images/betone-sp-component/pay-icon/paytm-ac.png
deleted file mode 100644
index 76cb42f..0000000
Binary files a/static/images/betone-sp-component/pay-icon/paytm-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/paytm.png b/static/images/betone-sp-component/pay-icon/paytm.png
deleted file mode 100644
index a6acf7c..0000000
Binary files a/static/images/betone-sp-component/pay-icon/paytm.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/pix-ac.png b/static/images/betone-sp-component/pay-icon/pix-ac.png
deleted file mode 100644
index f3e7c99..0000000
Binary files a/static/images/betone-sp-component/pay-icon/pix-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/pix.png b/static/images/betone-sp-component/pay-icon/pix.png
deleted file mode 100644
index 1ca474e..0000000
Binary files a/static/images/betone-sp-component/pay-icon/pix.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/pk_banktransfer-ac.png b/static/images/betone-sp-component/pay-icon/pk_banktransfer-ac.png
deleted file mode 100644
index 8fb0f90..0000000
Binary files a/static/images/betone-sp-component/pay-icon/pk_banktransfer-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/pk_banktransfer.png b/static/images/betone-sp-component/pay-icon/pk_banktransfer.png
deleted file mode 100644
index cdf7040..0000000
Binary files a/static/images/betone-sp-component/pay-icon/pk_banktransfer.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/spei-ac.png b/static/images/betone-sp-component/pay-icon/spei-ac.png
deleted file mode 100644
index 03d8d5e..0000000
Binary files a/static/images/betone-sp-component/pay-icon/spei-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/spei.png b/static/images/betone-sp-component/pay-icon/spei.png
deleted file mode 100644
index a1e199f..0000000
Binary files a/static/images/betone-sp-component/pay-icon/spei.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/tngwallet-ac.png b/static/images/betone-sp-component/pay-icon/tngwallet-ac.png
deleted file mode 100644
index c2a2823..0000000
Binary files a/static/images/betone-sp-component/pay-icon/tngwallet-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/tngwallet.png b/static/images/betone-sp-component/pay-icon/tngwallet.png
deleted file mode 100644
index 41d8c22..0000000
Binary files a/static/images/betone-sp-component/pay-icon/tngwallet.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/unionpay-ac.png b/static/images/betone-sp-component/pay-icon/unionpay-ac.png
deleted file mode 100644
index b598832..0000000
Binary files a/static/images/betone-sp-component/pay-icon/unionpay-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/unionpay.png b/static/images/betone-sp-component/pay-icon/unionpay.png
deleted file mode 100644
index bbcaed3..0000000
Binary files a/static/images/betone-sp-component/pay-icon/unionpay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/upaisa-ac.png b/static/images/betone-sp-component/pay-icon/upaisa-ac.png
deleted file mode 100644
index b1af727..0000000
Binary files a/static/images/betone-sp-component/pay-icon/upaisa-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/upaisa.png b/static/images/betone-sp-component/pay-icon/upaisa.png
deleted file mode 100644
index 55e5ae8..0000000
Binary files a/static/images/betone-sp-component/pay-icon/upaisa.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/wechat-ac.png b/static/images/betone-sp-component/pay-icon/wechat-ac.png
deleted file mode 100644
index 04f6228..0000000
Binary files a/static/images/betone-sp-component/pay-icon/wechat-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay-icon/wechat.png b/static/images/betone-sp-component/pay-icon/wechat.png
deleted file mode 100644
index 422fcf1..0000000
Binary files a/static/images/betone-sp-component/pay-icon/wechat.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pay.png b/static/images/betone-sp-component/pay.png
deleted file mode 100644
index 949c7f5..0000000
Binary files a/static/images/betone-sp-component/pay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/payalts.png b/static/images/betone-sp-component/payalts.png
deleted file mode 100644
index 4813ea0..0000000
Binary files a/static/images/betone-sp-component/payalts.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pendingorder-arrow.png b/static/images/betone-sp-component/pendingorder-arrow.png
deleted file mode 100644
index 7dc03d2..0000000
Binary files a/static/images/betone-sp-component/pendingorder-arrow.png and /dev/null differ
diff --git a/static/images/betone-sp-component/pic-default.png b/static/images/betone-sp-component/pic-default.png
new file mode 100644
index 0000000..9bff423
Binary files /dev/null and b/static/images/betone-sp-component/pic-default.png differ
diff --git a/static/images/betone-sp-component/pop/dtz.svg b/static/images/betone-sp-component/pop/dtz.svg
deleted file mode 100644
index 823965f..0000000
--- a/static/images/betone-sp-component/pop/dtz.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="76" height="60" viewBox="0 0 76 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M27.9531 29.3281L30.1797 35.3047C31.5859 39.0547 31.7031 43.1562 30.6484 46.9062L30.4141 47.375L3.46094 37.5312C2.17188 37.0625 1.23438 35.8906 1 34.4844C0.882812 33.0781 1.46875 31.6719 2.64062 30.9688L3.69531 30.2656C7.67969 27.5703 10.8438 23.7031 12.4844 19.1328L14.125 14.4453C17.1719 6.47656 26.0781 2.375 34.0469 5.30469C34.6328 5.42188 35.2188 5.65625 35.6875 6.00781C28.1875 10.9297 24.7891 20.5391 27.9531 29.3281ZM31.4688 28.0391C28.4219 19.7188 32.7578 10.4609 41.0781 7.41406C49.5156 4.36719 58.7734 8.70312 61.8203 17.0234L64.0469 23C65.6875 27.4531 68.6172 31.3203 72.6016 34.0156L74.2422 35.0703C75.4141 35.8906 76 37.1797 75.8828 38.5859C75.6484 39.9922 74.7109 41.1641 73.4219 41.75L38.6172 54.4062C37.2109 54.875 35.8047 54.5234 34.75 53.5859C33.6953 52.6484 33.3438 51.125 33.6953 49.8359L34.1641 47.9609C35.5703 43.3906 35.3359 38.4688 33.6953 34.0156L31.4688 28.0391ZM57.25 56.75C54.7891 56.75 52.5625 55.5781 51.2734 53.8203L64.8672 48.7812C64.8672 49.0156 64.8672 49.1328 64.8672 49.25C64.8672 53.4688 61.4688 56.75 57.25 56.75ZM12.0156 44.6797L25.7266 49.7188C24.4375 51.7109 22.0938 53 19.5156 53C15.2969 53 11.8984 49.7188 11.8984 45.5C11.8984 45.2656 12.0156 44.9141 12.0156 44.6797Z" fill="#42D200"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/faceS.svg b/static/images/betone-sp-component/pop/faceS.svg
deleted file mode 100644
index 551ad68..0000000
--- a/static/images/betone-sp-component/pop/faceS.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="63" height="61" viewBox="0 0 63 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31.5 60.5C20.7188 60.5 10.875 54.875 5.48438 45.5C0.09375 36.2422 0.09375 24.875 5.48438 15.5C10.875 6.24219 20.7188 0.5 31.5 0.5C42.1641 0.5 52.0078 6.24219 57.3984 15.5C62.7891 24.875 62.7891 36.2422 57.3984 45.5C52.0078 54.875 42.1641 60.5 31.5 60.5ZM20.7188 38.7031C20.0156 37.8828 18.8438 37.8828 18.0234 38.4688C17.2031 39.1719 17.2031 40.3438 17.7891 41.1641C20.4844 44.2109 24.9375 47.375 31.5 47.375C37.9453 47.375 42.3984 44.2109 45.0938 41.1641C45.6797 40.3438 45.6797 39.1719 44.8594 38.4688C44.0391 37.8828 42.8672 37.8828 42.1641 38.7031C40.1719 41.1641 36.5391 43.625 31.5 43.625C26.3438 43.625 22.8281 41.1641 20.7188 38.7031ZM18.375 24.875C18.375 26.9844 20.0156 28.625 22.125 28.625C24.2344 28.625 25.875 26.9844 25.875 24.875C25.875 22.8828 24.2344 21.125 22.125 21.125C20.0156 21.125 18.375 22.8828 18.375 24.875ZM40.875 21.125C38.7656 21.125 37.125 22.8828 37.125 24.875C37.125 26.9844 38.7656 28.625 40.875 28.625C42.9844 28.625 44.625 26.9844 44.625 24.875C44.625 22.8828 42.9844 21.125 40.875 21.125Z" fill="#FFD13A"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/faceY.svg b/static/images/betone-sp-component/pop/faceY.svg
deleted file mode 100644
index 885bd27..0000000
--- a/static/images/betone-sp-component/pop/faceY.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="63" height="61" viewBox="0 0 63 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31.5 60.5C20.7188 60.5 10.875 54.875 5.48438 45.5C0.09375 36.2422 0.09375 24.875 5.48438 15.5C10.875 6.24219 20.7188 0.5 31.5 0.5C42.1641 0.5 52.0078 6.24219 57.3984 15.5C62.7891 24.875 62.7891 36.2422 57.3984 45.5C52.0078 54.875 42.1641 60.5 31.5 60.5ZM42.1641 46.7891C42.8672 47.6094 44.0391 47.6094 44.8594 47.0234C45.6797 46.3203 45.6797 45.1484 45.0938 44.3281C42.3984 41.2812 37.9453 38 31.5 38C24.9375 38 20.4844 41.2812 17.7891 44.3281C17.2031 45.1484 17.2031 46.3203 18.0234 47.0234C18.8438 47.6094 20.0156 47.6094 20.7188 46.7891C22.8281 44.3281 26.3438 41.75 31.5 41.75C36.5391 41.75 40.1719 44.3281 42.1641 46.7891ZM18.375 24.875C18.375 26.9844 20.0156 28.625 22.125 28.625C24.2344 28.625 25.875 26.9844 25.875 24.875C25.875 22.8828 24.2344 21.125 22.125 21.125C20.0156 21.125 18.375 22.8828 18.375 24.875ZM40.875 21.125C38.7656 21.125 37.125 22.8828 37.125 24.875C37.125 26.9844 38.7656 28.625 40.875 28.625C42.9844 28.625 44.625 26.9844 44.625 24.875C44.625 22.8828 42.9844 21.125 40.875 21.125Z" fill="#FFD13A"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/nike.svg b/static/images/betone-sp-component/pop/nike.svg
deleted file mode 100644
index d624cac..0000000
--- a/static/images/betone-sp-component/pop/nike.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="53" height="61" viewBox="0 0 53 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M41.25 15.5C41.25 23.8203 34.4531 30.5 26.25 30.5C17.9297 30.5 11.25 23.8203 11.25 15.5C11.25 7.29688 17.9297 0.5 26.25 0.5C34.4531 0.5 41.25 7.29688 41.25 15.5ZM35.9766 36.4766C45.3516 38 52.5 46.0859 52.5 55.8125V56.75C52.5 58.8594 50.7422 60.5 48.75 60.5H3.75C1.64062 60.5 0 58.8594 0 56.75V55.8125C0 46.0859 7.03125 38 16.4062 36.4766L26.25 51.125L35.9766 36.4766Z" fill="#42D200"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/noTz.svg b/static/images/betone-sp-component/pop/noTz.svg
deleted file mode 100644
index 6dd2786..0000000
--- a/static/images/betone-sp-component/pop/noTz.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="77" height="61" viewBox="0 0 77 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.45312 1.20312L22.7969 14.6797C25.4922 10.5781 29.7109 7.53125 34.75 6.59375V4.25C34.75 2.25781 36.3906 0.5 38.5 0.5C40.4922 0.5 42.25 2.25781 42.25 4.25V6.59375C50.8047 8.23438 57.25 15.8516 57.25 24.875V28.9766C57.25 32.375 58.5391 35.6562 61 38L61.1172 38.2344C63.4609 40.4609 64.75 43.625 64.75 46.9062C64.75 47.0234 64.6328 47.2578 64.6328 47.4922L74.8281 55.5781C76.1172 56.5156 76.3516 58.2734 75.2969 59.4453C74.3594 60.7344 72.6016 60.9688 71.4297 59.9141L2.05469 5.53906C0.765625 4.60156 0.53125 2.84375 1.58594 1.67188C2.52344 0.382812 4.28125 0.148438 5.45312 1.20312ZM19.75 28.9766V26.6328L48.5781 49.25H14.5938C13.3047 49.25 12.25 48.1953 12.25 46.9062C12.25 43.625 13.5391 40.4609 15.7656 38.2344L16 38C18.3438 35.6562 19.75 32.375 19.75 28.9766ZM46 53C46 54.9922 45.1797 56.9844 43.7734 58.3906C42.3672 59.7969 40.4922 60.5 38.5 60.5C36.5078 60.5 34.5156 59.7969 33.1094 58.3906C31.7031 56.9844 31 54.9922 31 53H38.5H46Z" fill="#FFD13A"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/payW.svg b/static/images/betone-sp-component/pop/payW.svg
deleted file mode 100644
index b15aca1..0000000
--- a/static/images/betone-sp-component/pop/payW.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="57" height="61" viewBox="0 0 57 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M30.0234 0.851562L52.0547 10.2266C54.6328 11.3984 56.625 13.8594 56.625 16.9062C56.5078 28.625 51.7031 49.8359 31.5469 59.5625C29.5547 60.5 27.3281 60.5 25.3359 59.5625C5.17969 49.8359 0.375 28.625 0.375 16.9062C0.257812 13.8594 2.25 11.3984 4.82812 10.2266L26.8594 0.851562C27.3281 0.617188 27.9141 0.5 28.5 0.5C28.9688 0.5 29.5547 0.617188 30.0234 0.851562ZM35.0625 24.875C35.0625 21.3594 32.0156 18.3125 28.5 18.3125C24.8672 18.3125 21.9375 21.3594 21.9375 24.875C21.9375 27.5703 23.4609 29.7969 25.6875 30.8516V38.9375C25.6875 40.5781 26.8594 41.75 28.5 41.75C30.0234 41.75 31.3125 40.5781 31.3125 38.9375V30.8516C33.4219 29.7969 35.0625 27.5703 35.0625 24.875Z" fill="#42D200"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/success.svg b/static/images/betone-sp-component/pop/success.svg
deleted file mode 100644
index 2652947..0000000
--- a/static/images/betone-sp-component/pop/success.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="61" height="61" viewBox="0 0 61 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.5 30.5C0.5 13.9766 13.8594 0.5 30.5 0.5C47.0234 0.5 60.5 13.9766 60.5 30.5C60.5 47.1406 47.0234 60.5 30.5 60.5C13.8594 60.5 0.5 47.1406 0.5 30.5ZM43.9766 25.3438C45.2656 24.0547 45.2656 22.0625 43.9766 20.7734C42.6875 19.4844 40.6953 19.4844 39.4062 20.7734L26.75 33.4297L21.4766 28.2734C20.1875 26.9844 18.1953 26.9844 16.9062 28.2734C15.6172 29.5625 15.6172 31.5547 16.9062 32.8438L24.4062 40.3438C25.6953 41.6328 27.6875 41.6328 28.9766 40.3438L43.9766 25.3438Z" fill="#42D200"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/tz.svg b/static/images/betone-sp-component/pop/tz.svg
deleted file mode 100644
index ec8dea5..0000000
--- a/static/images/betone-sp-component/pop/tz.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="61" height="61" viewBox="0 0 61 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M30.5 0.5C32.4922 0.5 34.25 2.25781 34.25 4.25V6.59375C42.8047 8.23438 49.25 15.8516 49.25 24.875V27.1016C49.25 32.6094 51.2422 38 54.875 42.1016L55.6953 43.0391C56.75 44.2109 56.9844 45.7344 56.3984 47.1406C55.8125 48.4297 54.4062 49.25 53 49.25H8C6.47656 49.25 5.07031 48.4297 4.48438 47.1406C3.89844 45.7344 4.13281 44.2109 5.1875 43.0391L6.00781 42.1016C9.64062 38 11.75 32.6094 11.75 27.1016V24.875C11.75 15.8516 18.1953 8.23438 26.75 6.59375V4.25C26.75 2.25781 28.3906 0.5 30.5 0.5ZM35.7734 58.3906C34.3672 59.7969 32.4922 60.5 30.5 60.5C28.5078 60.5 26.5156 59.7969 25.1094 58.3906C23.7031 56.9844 23 54.9922 23 53H30.5H38C38 54.9922 37.1797 56.9844 35.7734 58.3906Z" fill="#00A6FF"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/wait.svg b/static/images/betone-sp-component/pop/wait.svg
deleted file mode 100644
index c889bba..0000000
--- a/static/images/betone-sp-component/pop/wait.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="66" height="60" viewBox="0 0 66 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.5 5.5C13.5 3.64062 15.0312 2 17 2C18.8594 2 20.5 3.64062 20.5 5.5V9H34.5V5.5C34.5 3.64062 36.0312 2 38 2C39.8594 2 41.5 3.64062 41.5 5.5V9H46.75C49.5938 9 52 11.4062 52 14.25V19.5H3V14.25C3 11.4062 5.29688 9 8.25 9H13.5V5.5ZM52 23V23.1094C51.3438 23.1094 50.7969 23 50.25 23C39.5312 23 31 31.6406 31 42.25C31 48.8125 34.1719 54.6094 39.0938 58H8.25C5.29688 58 3 55.7031 3 52.75V23H50.25H52ZM66 42.25C66 47.9375 62.9375 53.0781 58.125 55.9219C53.2031 58.7656 47.1875 58.7656 42.375 55.9219C37.4531 53.0781 34.5 47.9375 34.5 42.25C34.5 36.6719 37.4531 31.5312 42.375 28.6875C47.1875 25.8438 53.2031 25.8438 58.125 28.6875C62.9375 31.5312 66 36.6719 66 42.25ZM50.25 33.5C49.2656 33.5 48.5 34.375 48.5 35.25V42.25C48.5 43.2344 49.2656 44 50.25 44H55.5C56.375 44 57.25 43.2344 57.25 42.25C57.25 41.375 56.375 40.5 55.5 40.5H52V35.25C52 34.375 51.125 33.5 50.25 33.5Z" fill="#42D200"/>
-</svg>
diff --git a/static/images/betone-sp-component/pop/warn.svg b/static/images/betone-sp-component/pop/warn.svg
deleted file mode 100644
index 241fe00..0000000
--- a/static/images/betone-sp-component/pop/warn.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="57" height="61" viewBox="0 0 57 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M30.0234 0.851562L52.0547 10.2266C54.6328 11.3984 56.625 13.8594 56.625 16.9062C56.5078 28.625 51.7031 49.8359 31.5469 59.5625C29.5547 60.5 27.3281 60.5 25.3359 59.5625C5.17969 49.8359 0.375 28.625 0.375 16.9062C0.257812 13.8594 2.25 11.3984 4.82812 10.2266L26.8594 0.851562C27.3281 0.617188 27.9141 0.5 28.5 0.5C28.9688 0.5 29.5547 0.617188 30.0234 0.851562ZM28.5 15.5C26.8594 15.5 25.6875 16.7891 25.6875 18.3125V31.4375C25.6875 33.0781 26.8594 34.25 28.5 34.25C30.0234 34.25 31.3125 33.0781 31.3125 31.4375V18.3125C31.3125 16.7891 30.0234 15.5 28.5 15.5ZM24.75 41.75C24.75 43.8594 26.3906 45.5 28.5 45.5C30.4922 45.5 32.25 43.8594 32.25 41.75C32.25 39.7578 30.4922 38 28.5 38C26.3906 38 24.75 39.7578 24.75 41.75Z" fill="#F92D2D"/>
-</svg>
diff --git a/static/images/betone-sp-component/pwd.png b/static/images/betone-sp-component/pwd.png
deleted file mode 100644
index a4406ee..0000000
Binary files a/static/images/betone-sp-component/pwd.png and /dev/null differ
diff --git a/static/images/betone-sp-component/quick.png b/static/images/betone-sp-component/quick.png
deleted file mode 100644
index 793ab5c..0000000
Binary files a/static/images/betone-sp-component/quick.png and /dev/null differ
diff --git a/static/images/betone-sp-component/refresh.png b/static/images/betone-sp-component/refresh.png
deleted file mode 100644
index 3af73d4..0000000
Binary files a/static/images/betone-sp-component/refresh.png and /dev/null differ
diff --git a/static/images/betone-sp-component/rs1.png b/static/images/betone-sp-component/rs1.png
deleted file mode 100644
index 4e78b1b..0000000
Binary files a/static/images/betone-sp-component/rs1.png and /dev/null differ
diff --git a/static/images/betone-sp-component/rt.png b/static/images/betone-sp-component/rt.png
deleted file mode 100644
index 1643df1..0000000
Binary files a/static/images/betone-sp-component/rt.png and /dev/null differ
diff --git a/static/images/betone-sp-component/safe.png b/static/images/betone-sp-component/safe.png
deleted file mode 100644
index 962d821..0000000
Binary files a/static/images/betone-sp-component/safe.png and /dev/null differ
diff --git a/static/images/betone-sp-component/scans.png b/static/images/betone-sp-component/scans.png
deleted file mode 100644
index b3e016a..0000000
Binary files a/static/images/betone-sp-component/scans.png and /dev/null differ
diff --git a/static/images/betone-sp-component/security-big-auth.png b/static/images/betone-sp-component/security-big-auth.png
deleted file mode 100644
index ac47476..0000000
Binary files a/static/images/betone-sp-component/security-big-auth.png and /dev/null differ
diff --git a/static/images/betone-sp-component/security-pay.png b/static/images/betone-sp-component/security-pay.png
deleted file mode 100644
index 9d23b3b..0000000
Binary files a/static/images/betone-sp-component/security-pay.png and /dev/null differ
diff --git a/static/images/betone-sp-component/sell-his-ac.png b/static/images/betone-sp-component/sell-his-ac.png
deleted file mode 100644
index 8e00932..0000000
Binary files a/static/images/betone-sp-component/sell-his-ac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/sell-his-df.png b/static/images/betone-sp-component/sell-his-df.png
deleted file mode 100644
index 81f4cf5..0000000
Binary files a/static/images/betone-sp-component/sell-his-df.png and /dev/null differ
diff --git a/static/images/betone-sp-component/sl.png b/static/images/betone-sp-component/sl.png
deleted file mode 100644
index b5f8bb8..0000000
Binary files a/static/images/betone-sp-component/sl.png and /dev/null differ
diff --git a/static/images/betone-sp-component/success.png b/static/images/betone-sp-component/success.png
deleted file mode 100644
index 9930da7..0000000
Binary files a/static/images/betone-sp-component/success.png and /dev/null differ
diff --git a/static/images/betone-sp-component/support.png b/static/images/betone-sp-component/support.png
deleted file mode 100644
index a6d6d87..0000000
Binary files a/static/images/betone-sp-component/support.png and /dev/null differ
diff --git a/static/images/betone-sp-component/tnb.png b/static/images/betone-sp-component/tnb.png
deleted file mode 100644
index 7d3a207..0000000
Binary files a/static/images/betone-sp-component/tnb.png and /dev/null differ
diff --git a/static/images/betone-sp-component/tnw.png b/static/images/betone-sp-component/tnw.png
deleted file mode 100644
index a32fb49..0000000
Binary files a/static/images/betone-sp-component/tnw.png and /dev/null differ
diff --git a/static/images/betone-sp-component/uok.png b/static/images/betone-sp-component/uok.png
deleted file mode 100644
index 05340d8..0000000
Binary files a/static/images/betone-sp-component/uok.png and /dev/null differ
diff --git a/static/images/betone-sp-component/uok2.png b/static/images/betone-sp-component/uok2.png
deleted file mode 100644
index a44d8c7..0000000
Binary files a/static/images/betone-sp-component/uok2.png and /dev/null differ
diff --git a/static/images/betone-sp-component/utp.png b/static/images/betone-sp-component/utp.png
deleted file mode 100644
index d722e07..0000000
Binary files a/static/images/betone-sp-component/utp.png and /dev/null differ
diff --git a/static/images/betone-sp-component/wait.png b/static/images/betone-sp-component/wait.png
deleted file mode 100644
index b4c16c2..0000000
Binary files a/static/images/betone-sp-component/wait.png and /dev/null differ
diff --git a/static/images/betone-sp-component/warning.png b/static/images/betone-sp-component/warning.png
deleted file mode 100644
index 9701118..0000000
Binary files a/static/images/betone-sp-component/warning.png and /dev/null differ
diff --git a/static/images/betone-sp-component/weixin.png b/static/images/betone-sp-component/weixin.png
deleted file mode 100644
index 0c261b1..0000000
Binary files a/static/images/betone-sp-component/weixin.png and /dev/null differ
diff --git a/static/images/betone-sp-component/weixinac.png b/static/images/betone-sp-component/weixinac.png
deleted file mode 100644
index de088ee..0000000
Binary files a/static/images/betone-sp-component/weixinac.png and /dev/null differ
diff --git a/static/images/betone-sp-component/zhifubao.png b/static/images/betone-sp-component/zhifubao.png
deleted file mode 100644
index 7d0eb69..0000000
Binary files a/static/images/betone-sp-component/zhifubao.png and /dev/null differ
diff --git a/static/images/betone-sp-component/zhifubaoac.png b/static/images/betone-sp-component/zhifubaoac.png
deleted file mode 100644
index b7e9e63..0000000
Binary files a/static/images/betone-sp-component/zhifubaoac.png and /dev/null differ
diff --git a/static/images/home/alarm.png b/static/images/home/alarm.png
index a6d12d5..08054dd 100644
Binary files a/static/images/home/alarm.png and b/static/images/home/alarm.png differ
diff --git a/static/images/home/bs_jl.png b/static/images/home/bs_jl.png
index 6a1defe..366f8ba 100644
Binary files a/static/images/home/bs_jl.png and b/static/images/home/bs_jl.png differ
diff --git a/static/images/home/full.png b/static/images/home/full.png
index e706f9b..1fdc0e4 100644
Binary files a/static/images/home/full.png and b/static/images/home/full.png differ
diff --git a/static/images/home/lab.png b/static/images/home/lab.png
index fb61036..3ad309e 100644
Binary files a/static/images/home/lab.png and b/static/images/home/lab.png differ
diff --git a/static/images/home/lab_xj.png b/static/images/home/lab_xj.png
index 583e900..159f28c 100644
Binary files a/static/images/home/lab_xj.png and b/static/images/home/lab_xj.png differ
diff --git a/static/images/loadmore.png b/static/images/loadmore.png
index 21cfffa..da8df57 100644
Binary files a/static/images/loadmore.png and b/static/images/loadmore.png differ
diff --git a/static/images/pic-default.png b/static/images/pic-default.png
index 565220a..9bff423 100644
Binary files a/static/images/pic-default.png and b/static/images/pic-default.png differ
diff --git a/static/images/position/destination.png b/static/images/position/destination.png
index f0e6b98..3b867b8 100644
Binary files a/static/images/position/destination.png and b/static/images/position/destination.png differ
diff --git a/static/images/position/weixiu.png b/static/images/position/weixiu.png
index df09137..45ac878 100644
Binary files a/static/images/position/weixiu.png and b/static/images/position/weixiu.png differ
diff --git a/static/images/submit/sign_icon.png b/static/images/submit/sign_icon.png
index 387b404..f480a9a 100644
Binary files a/static/images/submit/sign_icon.png and b/static/images/submit/sign_icon.png differ
diff --git a/static/images/submit/video-icon.webp b/static/images/submit/video-icon.webp
index 02802d5..832f9ac 100644
Binary files a/static/images/submit/video-icon.webp and b/static/images/submit/video-icon.webp differ
diff --git a/static/images/submit/wuliao.png b/static/images/submit/wuliao.png
index 8434c3b..6af358c 100644
Binary files a/static/images/submit/wuliao.png and b/static/images/submit/wuliao.png differ
diff --git a/static/scss/_variable.scss b/static/scss/_variable.scss
index b450278..11b2c8b 100644
--- a/static/scss/_variable.scss
+++ b/static/scss/_variable.scss
@@ -25,7 +25,7 @@ $unit:rpx;
 
 
 $inputBg: #fff;
-$inputBorder: rgba(220,220,220,1);
+$inputBorder: rgb(220, 223, 230);
 $btnColor:#3c9cff; //页面文字按钮的颜色
 // $img:		"@/static/images/betone-business/";
 $img2:		"@/static/images/betone-sp-component/";
\ No newline at end of file
diff --git a/static/scss/business/betone-my.scss b/static/scss/business/betone-my.scss
index 34b5375..ef87df6 100644
--- a/static/scss/business/betone-my.scss
+++ b/static/scss/business/betone-my.scss
@@ -30,16 +30,16 @@
       margin-right: 16rpx;
       position: relative;
 
-      .add {
-        background: url("#{$img2}my-add.png") no-repeat;
-        position: absolute;
-        $size: 60rpx;
-        width: $size;
-        height: $size;
-        background-size: $size;
-        right: 5rpx;
-        bottom: -10rpx;
-      }
+      // .add {
+      //   background: url("#{$img2}my-add.png") no-repeat;
+      //   position: absolute;
+      //   $size: 60rpx;
+      //   width: $size;
+      //   height: $size;
+      //   background-size: $size;
+      //   right: 5rpx;
+      //   bottom: -10rpx;
+      // }
 
       .u-upload {
         $size: 60rpx;
@@ -128,31 +128,31 @@
         white-space: nowrap;
       }
 
-      .copy {
-        display: inline-block;
-        $size: 40rpx;
-        width: $size;
-        height: $size;
-        background: url("#{$img2}my-copy.png") no-repeat;
-        background-size: $size;
-      }
+      // .copy {
+      //   display: inline-block;
+      //   $size: 40rpx;
+      //   width: $size;
+      //   height: $size;
+      //   background: url("#{$img2}my-copy.png") no-repeat;
+      //   background-size: $size;
+      // }
     }
 
-    &-auth {
-      font-size: 20rpx;
-      height: 28rpx;
-      line-height: 28rpx;
-      border-radius: 10rpx;
-      padding: 0 16rpx 0 27rpx;
-      background: url("#{$img2}ok.png") no-repeat 6rpx 50%;
-      background-color: $light;
-      color: $desc;
-      background-size: 22rpx !important;
-
-      &.not {
-        background-image: url("#{$img2}no-auth.png");
-      }
-    }
+    // &-auth {
+    //   font-size: 20rpx;
+    //   height: 28rpx;
+    //   line-height: 28rpx;
+    //   border-radius: 10rpx;
+    //   padding: 0 16rpx 0 27rpx;
+    //   background: url("#{$img2}ok.png") no-repeat 6rpx 50%;
+    //   background-color: $light;
+    //   color: $desc;
+    //   background-size: 22rpx !important;
+
+    //   // &.not {
+    //   //   background-image: url("#{$img2}no-auth.png");
+    //   // }
+    // }
   }
 
   .main {
diff --git a/static/scss/sp-components/sp-new-input.scss b/static/scss/sp-components/sp-new-input.scss
index 7004a83..b5a1382 100644
--- a/static/scss/sp-components/sp-new-input.scss
+++ b/static/scss/sp-components/sp-new-input.scss
@@ -2,7 +2,7 @@
     // margin-bottom: 40rpx;
     .label {
         color: $txt;
-        font-size: 32rpx;
+        font-size: 28rpx;
         line-height: 42rpx;
         padding-bottom: 16rpx;
     }
@@ -15,7 +15,7 @@
     align-items: center;
     background: $inputBg;
     padding: 0;
-    border: 1rpx solid $inputBorder;
+    border: 2rpx solid $inputBorder;
     .sp-new-input-icon {
         width: 38rpx;
         color: rgba(190, 190, 190, 1);
@@ -120,14 +120,14 @@
         line-height: 40rpx;
         padding-left: 24rpx;
     }
-    .scan {
-        @include icon("#{$img2}scans.png",
-        40,
-        40);
-        position: absolute;
-        right: 16rpx;
-        top: 16rpx;
-    }
+    // .scan {
+    //     @include icon("#{$img2}scans.png",
+    //     40,
+    //     40);
+    //     position: absolute;
+    //     right: 16rpx;
+    //     top: 16rpx;
+    // }
     .sub {
         text-align: right;
         font-size: 24rpx;
diff --git a/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue b/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
index 7cb3ae7..722b668 100644
--- a/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
+++ b/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -20,7 +20,7 @@
 		<view class="u-gab" v-if="cancelBtn">
 		</view>
 		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class"
-		    :hover-stay-time="150" v-if="cancelBtn" @tap="close">{{cancelTextCom}}</view>
+		    :hover-stay-time="150" v-if="cancelBtn" @tap="close">{{cancelText}}</view>
 	</u-popup>
 </template>
 
@@ -102,21 +102,9 @@
 			// 取消按钮的文字提示
 			cancelText: {
 				type: String,
-				default: ''
+				default: '取消'
 			}
 		},
-    data() {
-      return {
-        cancelTextCom: ""
-      }
-    },
-    created() {
-      if(!this.cancelText) {
-        this.cancelTextCom = this.$t('betPageTReceiptPaymentInfo.delText4')
-      }else {
-        this.cancelTextCom = this.cancelText
-      }
-    },
 		computed: {
 			// 顶部提示的样式
 			tipsStyle() {
diff --git a/uni_modules/uview-ui/components/u-button/u-button.vue b/uni_modules/uview-ui/components/u-button/u-button.vue
index 405996f..82c3a6f 100644
--- a/uni_modules/uview-ui/components/u-button/u-button.vue
+++ b/uni_modules/uview-ui/components/u-button/u-button.vue
@@ -212,7 +212,7 @@ export default {
 		// 节流，一定时间内只能触发一次
 		throttleTime: {
 			type: [String, Number],
-			default: 3000
+			default: 1000
 		},
 		// 按住后多久出现点击态，单位毫秒
 		hoverStartTime: {
@@ -248,21 +248,12 @@ export default {
 			rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
 			rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
 			fields: {}, // 波纹按钮节点信息
-			waveActive: false ,// 激活水波纹
-			lock: false,
+			waveActive: false // 激活水波纹
 		};
 	},
 	methods: {
 		// 按钮点击
 		click(e) {
-			if(this.lock) return;
-			
-			this.$emit('click', e);
-			this.lock = true;
-			clearTimeout(this.timer);
-			this.timer = setTimeout(() => {
-				this.lock = false;
-			}, this.throttleTime);
 			// 进行节流控制，每this.throttle毫秒内，只在开始处执行
 			this.$u.throttle(() => {
 				// 如果按钮时disabled和loading状态，不触发水波纹效果
@@ -275,7 +266,7 @@ export default {
 						this.getWaveQuery(e);
 					});
 				}
-				
+				this.$emit('click', e);
 			}, this.throttleTime);
 		},
 		// 查询按钮的节点信息
diff --git a/uni_modules/uview-ui/components/u-car-keyboard/u-car-keyboard.vue b/uni_modules/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
index 04f6d97..84b1467 100644
--- a/uni_modules/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
+++ b/uni_modules/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
@@ -8,7 +8,7 @@
 						{{ item }}
 					</view>
 				</view>
-				<view @click="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
+				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
 				 hover-class="u-hover-class">
 					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
 				</view>
diff --git a/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue b/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue
index a6efd44..dd8bd31 100644
--- a/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue
+++ b/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue
@@ -33,11 +33,6 @@
 
 <script>
 export default {
-	data() {
-		return {
-			currentFlg: 0,
-		}
-	},
 	props: {
 		// 显示的内容，数组
 		list: {
@@ -177,8 +172,7 @@ export default {
 		},
 		// 点击关闭按钮
 		close() {
-			
-			this.$emit('close', this.currentFlg || 0);
+			this.$emit('close');
 		},
 		// 点击更多箭头按钮
 		getMore() {
@@ -186,7 +180,6 @@ export default {
 		},
 		change(e) {
 			let index = e.detail.current;
-			this.currentFlg = index;
 			if(index == this.list.length - 1) {
 				this.$emit('end');
 			}
@@ -241,7 +234,4 @@ export default {
 	/* #endif */
 	align-items: center;
 }
-::v-deep .u-right-icon .uicon-close {
-	color: #707070 !important;
-} 
 </style>
diff --git a/uni_modules/uview-ui/components/u-count-down/u-count-down.vue b/uni_modules/uview-ui/components/u-count-down/u-count-down.vue
index 9d3a57c..7285d67 100644
--- a/uni_modules/uview-ui/components/u-count-down/u-count-down.vue
+++ b/uni_modules/uview-ui/components/u-count-down/u-count-down.vue
@@ -10,7 +10,7 @@
 			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
 			v-if="showDays && (hideZeroDay || (!hideZeroDay && d != '00'))"
 		>
-			{{ separator == 'colon' ? ':' : tUCountDown.text1 }}
+			{{ separator == 'colon' ? ':' : '天' }}
 		</view>
 		<view class="u-countdown-item" :style="[itemStyle]" v-if="showHours">
 			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">
@@ -22,7 +22,7 @@
 			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
 			v-if="showHours"
 		>
-			{{ separator == 'colon' ? ':' : tUCountDown.text2 }}
+			{{ separator == 'colon' ? ':' : '时' }}
 		</view>
 		<view class="u-countdown-item" :style="[itemStyle]" v-if="showMinutes">
 			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">
@@ -34,7 +34,7 @@
 			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
 			v-if="showMinutes"
 		>
-			{{ separator == 'colon' ? ':' : tUCountDown.text3 }}
+			{{ separator == 'colon' ? ':' : '分' }}
 		</view>
 		<view class="u-countdown-item" :style="[itemStyle]" v-if="showSeconds">
 			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">
@@ -46,7 +46,7 @@
 			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
 			v-if="showSeconds && separator == 'zh'"
 		>
-			{{tUCountDown.text4}}
+			秒
 		</view>
 	</view>
 </template>
@@ -202,10 +202,7 @@ export default {
 			if(this.fontSize) style.fontSize = this.fontSize +  'rpx';
 			if(this.color) style.color = this.color;
 			return style;
-		},
-    tUCountDown() {
-      return this.$t('tUCountDown')
-    }
+		}
 	},
 	mounted() {
 		// 如果自动倒计时
diff --git a/uni_modules/uview-ui/components/u-input-decimal/u-input-decimal.vue b/uni_modules/uview-ui/components/u-input-decimal/u-input-decimal.vue
deleted file mode 100644
index 505fd9d..0000000
--- a/uni_modules/uview-ui/components/u-input-decimal/u-input-decimal.vue
+++ /dev/null
@@ -1,370 +0,0 @@
-<template>
-	<view
-		class="u-input-decimal"
-		:class="{
-			'u-input--border': border,
-			'u-input--error': validateState
-		}"
-		:style="{
-			padding: `0 ${border ? 20 : 0}rpx`,
-			borderColor: borderColor,
-			textAlign: inputAlign
-		}"
-		@tap.stop="inputClick"
-	>
-		<input
-			class="u-input__input"
-			type="number"
-			:style="[getStyle]"
-			v-model="defaultValue"
-			:placeholder="placeholder"
-			:placeholderStyle="placeholderStyle"
-			:disabled="disabled || type === 'select'"
-			:maxlength="inputMaxlength"
-			:focus="focus"
-			:confirmType="confirmType"
-			:cursor-spacing="getCursorSpacing"
-			:selection-end="uSelectionEnd"
-			:selection-start="uSelectionStart"
-			:show-confirm-bar="showConfirmbar"
-			@focus="onFocus"
-			@blur="handleBlur"
-			@input="handleInput"
-			@confirm="onConfirm"
-		/>
-		<view class="u-input__right-icon u-flex">
-			<view class="u-input__right-icon__clear u-input__right-icon__item" @tap="onClear" v-if="clearable && value != '' && focused">
-				<u-icon size="32" name="close-circle-fill" color="#c0c4cc"/>
-			</view>
-			<view class="u-input__right-icon__clear u-input__right-icon__item" v-if="passwordIcon && type == 'password'">
-				<u-icon size="32" :name="!showPassword ? 'eye' : 'eye-fill'" color="#c0c4cc" @click="showPassword = !showPassword"/>
-			</view>
-			<view class="u-input__right-icon--select u-input__right-icon__item" v-if="type == 'select'" :class="{
-				'u-input__right-icon--select--reverse': selectOpen
-			}">
-				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import Emitter from '../../libs/util/emitter.js';
-
-/**
- * input 输入框
- * @description 此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
- * @tutorial http://uviewui.com/components/input.html
- * @property {Boolean} clearable 是否显示右侧的清除图标(默认true)
- * @property {} v-model 用于双向绑定输入框的值
- * @property {String} input-align 输入框文字的对齐方式(默认left)
- * @property {String} placeholder placeholder显示值(默认 '请输入内容')
- * @property {Boolean} disabled 是否禁用输入框(默认false)
- * @property {String Number} maxlength 输入框的最大可输入长度(默认140)
- * @property {String Number} decimalLength 小数位数最大长度(默认10)
- * @property {String Number} selection-start 光标起始位置，自动聚焦时有效，需与selection-end搭配使用（默认-1）
- * @property {String Number} maxlength 光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认-1）
- * @property {String Number} cursor-spacing 指定光标与键盘的距离，单位px(默认0)
- * @property {String} placeholderStyle placeholder的样式，字符串形式，如"color: red;"(默认 "color: #c0c4cc;")
- * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type为text时生效(默认done)
- * @property {Object} custom-style 自定义输入框的样式，对象形式
- * @property {Boolean} focus 是否自动获得焦点(默认false)
- * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true(默认false)
- * @property {Boolean} password-icon type为password时，是否显示右侧的密码查看图标(默认true)
- * @property {Boolean} border 是否显示边框(默认false)
- * @property {String} border-color 输入框的边框颜色(默认#dcdfe6)
- * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效(默认true)
- * @property {String Number} height 高度，单位rpx(text类型时为70，textarea时为100)
- * @example <u-input v-model="value" :type="type" :border="border" />
- */
-export default {
-	name: 'u-input',
-	mixins: [Emitter],
-	props: {
-		value: {
-			type: [String, Number],
-			default: ''
-		},
-		// 输入框的类型，textarea，text，number
-		type: {
-			type: String,
-			default: 'text'
-		},
-		inputAlign: {
-			type: String,
-			default: 'left'
-		},
-		placeholder: {
-			type: String,
-			default: '请输入内容'
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		maxlength: {
-			type: [Number, String],
-			default: 140
-		},
-		decimalLength: {
-			type: [Number, String],
-			default: 10
-		},
-		placeholderStyle: {
-			type: String,
-			default: 'color: #c0c4cc;'
-		},
-		confirmType: {
-			type: String,
-			default: 'done'
-		},
-		// 输入框的自定义样式
-		customStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true
-		fixed: {
-			type: Boolean,
-			default: false
-		},
-		// 是否自动获得焦点
-		focus: {
-			type: Boolean,
-			default: false
-		},
-		// 密码类型时，是否显示右侧的密码图标
-		passwordIcon: {
-			type: Boolean,
-			default: true
-		},
-		// input|textarea是否显示边框
-		border: {
-			type: Boolean,
-			default: false
-		},
-		// 输入框的边框颜色
-		borderColor: {
-			type: String,
-			default: '#dcdfe6'
-		},
-		autoHeight: {
-			type: Boolean,
-			default: true
-		},
-		// type=select时，旋转右侧的图标，标识当前处于打开还是关闭select的状态
-		// open-打开，close-关闭
-		selectOpen: {
-			type: Boolean,
-			default: false
-		},
-		// 高度，单位rpx
-		height: {
-			type: [Number, String],
-			default: ''
-		},
-		// 是否可清空
-		clearable: {
-			type: Boolean,
-			default: true
-		},
-		// 指定光标与键盘的距离，单位 px
-		cursorSpacing: {
-			type: [Number, String],
-			default: 0
-		},
-		// 光标起始位置，自动聚焦时有效，需与selection-end搭配使用
-		selectionStart: {
-			type: [Number, String],
-			default: -1
-		},
-		// 光标结束位置，自动聚焦时有效，需与selection-start搭配使用
-		selectionEnd: {
-			type: [Number, String],
-			default: -1
-		},
-		// 是否自动去除两端的空格
-		trim: {
-			type: Boolean,
-			default: true
-		},
-		// 是否显示键盘上方带有”完成“按钮那一栏
-		showConfirmbar:{
-			type:Boolean,
-			default:true
-		}
-	},
-	data() {
-		return {
-			defaultValue: this.value,
-			inputHeight: 70, // input的高度
-			textareaHeight: 100, // textarea的高度
-			validateState: false, // 当前input的验证状态，用于错误时，边框是否改为红色
-			focused: false, // 当前是否处于获得焦点的状态
-			showPassword: false, // 是否预览密码
-			lastValue: '', // 用于头条小程序，判断@input中，前后的值是否发生了变化，因为头条中文下，按下键没有输入内容，也会触发@input时间
-		};
-	},
-	watch: {
-		value(nVal, oVal) {
-			this.defaultValue = nVal;
-			// 当值发生变化，且为select类型时(此时input被设置为disabled，不会触发@input事件)，模拟触发@input事件
-			if(nVal != oVal) this.handleInput({
-				detail: {
-					value: nVal
-				}
-			})
-		},
-	},
-	computed: {
-		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
-		inputMaxlength() {
-			return Number(this.maxlength);
-		},
-		getStyle() {
-			let style = {};
-			// 如果没有自定义高度，就根据type为input还是textare来分配一个默认的高度
-			style.minHeight = this.height ? this.height + 'rpx' : this.type == 'textarea' ?
-				this.textareaHeight + 'rpx' : this.inputHeight + 'rpx';
-			style = Object.assign(style, this.customStyle);
-			return style;
-		},
-		//
-		getCursorSpacing() {
-			return Number(this.cursorSpacing);
-		},
-		// 光标起始位置
-		uSelectionStart() {
-			return String(this.selectionStart);
-		},
-		// 光标结束位置
-		uSelectionEnd() {
-			return String(this.selectionEnd);
-		}
-	},
-	created() {
-		// 监听u-form-item发出的错误事件，将输入框边框变红色
-		this.$on('on-form-item-error', this.onFormItemError);
-	},
-	methods: {
-		/**
-		 * change 事件
-		 * @param event
-		 */
-		handleInput(event) {
-			let value = event.detail.value;
-			// 限制小数位数
-			let newValue = value.toString().match(/^\d+(?:\.\d{0,2})?/);
-			value = newValue != null ? newValue[0]:'';
-			// console.log(value);
-			// vue 原生的方法 return 出去
-			this.$emit('input', value);
-			// 过一个生命周期再发送事件给u-form-item，否则this.$emit('input')更新了父组件的值，但是微信小程序上
-			// 尚未更新到u-form-item，导致获取的值为空，从而校验混论
-			// 这里不能延时时间太短，或者使用this.$nextTick，否则在头条上，会造成混乱
-			setTimeout(() => {
-				// 当前model 赋值
-				this.defaultValue = value;
-				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
-				// #ifdef MP-TOUTIAO
-				if(this.$u.trim(value) == this.lastValue) return ;
-				this.lastValue = value;
-				// #endif
-				// 将当前的值发送到 u-form-item 进行校验
-				this.dispatch('u-form-item', 'on-form-change', value);
-			}, 40)
-		},
-		/**
-		 * blur 事件
-		 * @param event
-		 */
-		handleBlur(event) {
-			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
-			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
-			setTimeout(() => {
-				this.focused = false;
-			}, 100)
-			// vue 原生的方法 return 出去
-			this.$emit('blur', event.detail.value);
-			setTimeout(() => {
-				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
-				// #ifdef MP-TOUTIAO
-				if(this.$u.trim(value) == this.lastValue) return ;
-				this.lastValue = value;
-				// #endif
-				// 将当前的值发送到 u-form-item 进行校验
-				this.dispatch('u-form-item', 'on-form-blur', event.detail.value);
-			}, 40)
-		},
-		onFormItemError(status) {
-			this.validateState = status;
-		},
-		onFocus(event) {
-			this.focused = true;
-			this.$emit('focus');
-		},
-		onConfirm(e) {
-			this.$emit('confirm', e.detail.value);
-		},
-		onClear(event) {
-			this.$emit('input', '');
-		},
-		inputClick() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-
-.u-input {
-	position: relative;
-	flex: 1;
-	@include vue-flex;
-
-	&__input {
-		//height: $u-form-item-height;
-		font-size: 28rpx;
-		color: $u-main-color;
-		flex: 1;
-	}
-
-	&__textarea {
-		width: auto;
-		font-size: 28rpx;
-		color: $u-main-color;
-		padding: 10rpx 0;
-		line-height: normal;
-		flex: 1;
-	}
-
-	&--border {
-		border-radius: 6rpx;
-		border-radius: 4px;
-		border: 1px solid $u-form-item-border-color;
-	}
-
-	&--error {
-		border-color: $u-type-error!important;
-	}
-
-	&__right-icon {
-
-		&__item {
-			margin-left: 10rpx;
-		}
-
-		&--select {
-			transition: transform .4s;
-
-			&--reverse {
-				transform: rotate(-180deg);
-			}
-		}
-	}
-}
-</style>
diff --git a/uni_modules/uview-ui/components/u-input/u-input.vue b/uni_modules/uview-ui/components/u-input/u-input.vue
index 15e1373..f2aea72 100644
--- a/uni_modules/uview-ui/components/u-input/u-input.vue
+++ b/uni_modules/uview-ui/components/u-input/u-input.vue
@@ -57,7 +57,7 @@
 		/>
 		<view class="u-input__right-icon u-flex">
 			<view class="u-input__right-icon__clear u-input__right-icon__item" @tap="onClear" v-if="clearable && value != '' && focused">
-				<u-icon size="40" name="close-circle-fill" color="#c0c4cc"/>
+				<u-icon size="32" name="close-circle-fill" color="#c0c4cc"/>
 			</view>
 			<view class="u-input__right-icon__clear u-input__right-icon__item" v-if="passwordIcon && type == 'password'">
 				<u-icon size="32" :name="!showPassword ? 'eye' : 'eye-fill'" color="#c0c4cc" @click="showPassword = !showPassword"/>
diff --git a/uni_modules/uview-ui/components/u-link/u-link.vue b/uni_modules/uview-ui/components/u-link/u-link.vue
index 7d9e7a1..2dd2a73 100644
--- a/uni_modules/uview-ui/components/u-link/u-link.vue
+++ b/uni_modules/uview-ui/components/u-link/u-link.vue
@@ -66,7 +66,6 @@
 				// #endif
 				// #ifdef MP
 				uni.setClipboardData({
-          showToast: false,
 					data: this.href,
 					success: () => {
 						uni.hideToast();
diff --git a/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue b/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue
index a58271b..6b852a8 100644
--- a/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue
+++ b/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue
@@ -76,9 +76,9 @@
 				type: Object,
 				default () {
 					return {
-						loadmore: '',
-						loading: '',
-						nomore: ''
+						loadmore: '加载更多',
+						loading: '正在加载...',
+						nomore: '没有更多了'
 					}
 				}
 			},
@@ -114,10 +114,6 @@
 				dotText: "●"
 			}
 		},
-    created() {
-    
-    },
-
 		computed: {
 			// 加载的文字显示的样式
 			loadTextStyle() {
@@ -145,22 +141,12 @@
 			// 显示的提示文字
 			showText() {
 				let text = '';
-				if(this.status == 'loadmore') text = this.loadText.loadmore ? this.loadText.loadmore : this.loadTextCom.loadmore;
-				else if(this.status == 'loading') text = this.loadText.loading ? this.loadText.loading : this.loadTextCom.loading;
-				else if(this.status == 'nomore' && this.isDot) text = this.dotText || this.loadTextCom.nomore
-				else text = this.loadText.nomore || this.loadTextCom.nomore
+				if(this.status == 'loadmore') text = this.loadText.loadmore;
+				else if(this.status == 'loading') text = this.loadText.loading;
+				else if(this.status == 'nomore' && this.isDot) text = this.dotText;
+				else text = this.loadText.nomore;
 				return text;
-			},
-      tComULoadmore() {
-        return this.$t('tComULoadmore')
-      },
-      loadTextCom() {
-        return {
-          loadmore : this.$t('tComULoadmore.text1'),
-          loading : this.$t('tComULoadmore.text2'),
-          nomore : this.$t('tComULoadmore.text3')
-        }
-      }
+			}
 		},
 		methods: {
 			loadMore() {
diff --git a/uni_modules/uview-ui/components/u-modal/u-modal.vue b/uni_modules/uview-ui/components/u-modal/u-modal.vue
index 1ea4302..ce58113 100644
--- a/uni_modules/uview-ui/components/u-modal/u-modal.vue
+++ b/uni_modules/uview-ui/components/u-modal/u-modal.vue
@@ -43,7 +43,6 @@
 	 * @property {String} content 模态框内容（默认"内容"）
 	 * @property {Boolean} show-title 是否显示标题（默认true）
 	 * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false）
-	 * @property {Boolean} auto-close 是否自动关闭，只对确定按钮有效（默认true）
 	 * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true）
 	 * @property {Stringr | Number} negative-top modal往上偏移的值
 	 * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false）
@@ -168,11 +167,6 @@
 				type: Boolean,
 				default: false
 			},
-			// 是否自动关闭，只对确定按钮有效
-			autoClose: {
-				type: Boolean,
-				default: true
-			},
 			// 是否允许点击遮罩关闭modal
 			maskCloseAble: {
 				type: Boolean,
@@ -213,14 +207,11 @@
 		},
 		methods: {
 			confirm() {
-				if (this.autoClose) {
-					// 自动关闭
-					if (this.asyncClose) {
-						// 异步关闭
-						this.loading = true;
-					} else {
-						this.$emit('input', false);
-					}
+				// 异步关闭
+				if (this.asyncClose) {
+					this.loading = true;
+				} else {
+					this.$emit('input', false);
 				}
 				this.$emit('confirm');
 			},
diff --git a/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue b/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue
index bbcee11..41a6cc4 100644
--- a/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue
+++ b/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue
@@ -8,7 +8,6 @@
 				:color="color"
 				:bgColor="bgColor"
 				:list="list"
-        :isDiyIcon="isDiyIcon"
 				:volumeIcon="volumeIcon"
 				:moreIcon="moreIcon"
 				:volumeSize="volumeSize"
@@ -18,7 +17,6 @@
 				:speed="speed"
 				:playState="playState"
 				:padding="padding"
-				:autoplay="autoplay"
 				@getMore="getMore"
 				@close="close"
 				@click="click"
@@ -186,11 +184,7 @@ export default {
 		noListHidden: {
 			type: Boolean,
 			default: true
-		},
-     isDiyIcon: {
-      type: Boolean,
-			default: false
-    }
+		}
 	},
 	computed: {
 		// 如果设置show为false，或者设置了noListHidden为true，且list长度又为零的话，隐藏组件
@@ -205,8 +199,8 @@ export default {
 			this.$emit('click', index);
 		},
 		// 点击关闭按钮
-		close(e) {
-			this.$emit('close', e);
+		close() {
+			this.$emit('close');
 		},
 		// 点击更多箭头按钮
 		getMore() {
diff --git a/uni_modules/uview-ui/components/u-number-keyboard/u-number-keyboard.vue b/uni_modules/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
index 4a38826..6425a1f 100644
--- a/uni_modules/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
+++ b/uni_modules/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
@@ -12,7 +12,7 @@
 			    @tap="keyboardClick(item)">
 				<view class="u-keyboard-grids-btn">{{ item }}</view>
 			</view>
-			<view class="u-keyboard-grids-item u-bg-gray" hover-class="u-hover-class" :hover-stay-time="100" @click.stop="backspaceClick"
+			<view class="u-keyboard-grids-item u-bg-gray" hover-class="u-hover-class" :hover-stay-time="100" @touchstart.stop="backspaceClick"
 			    @touchend="clearTimer">
 				<view class="u-keyboard-back u-keyboard-grids-btn">
 					<u-icon name="backspace" :size="38" :bold="true"></u-icon>
@@ -101,9 +101,9 @@
 				this.$emit('backspace');
 				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
 				this.timer = null;
-				// this.timer = setInterval(() => {
-				// 	this.$emit('backspace');
-				// }, 250);
+				this.timer = setInterval(() => {
+					this.$emit('backspace');
+				}, 250);
 			},
 			clearTimer() {
 				clearInterval(this.timer);
diff --git a/uni_modules/uview-ui/components/u-parse/libs/trees.vue b/uni_modules/uview-ui/components/u-parse/libs/trees.vue
index 64d51c3..2b24820 100644
--- a/uni_modules/uview-ui/components/u-parse/libs/trees.vue
+++ b/uni_modules/uview-ui/components/u-parse/libs/trees.vue
@@ -237,7 +237,6 @@
 							// #endif
 							// #ifndef APP-PLUS
 							uni.setClipboardData({
-                showToast: false,
 								data: attrs.href,
 								success: () =>
 									uni.showToast({
diff --git a/uni_modules/uview-ui/components/u-radio/u-radio.vue b/uni_modules/uview-ui/components/u-radio/u-radio.vue
index c91d74f..1d9a439 100644
--- a/uni_modules/uview-ui/components/u-radio/u-radio.vue
+++ b/uni_modules/uview-ui/components/u-radio/u-radio.vue
@@ -1,22 +1,17 @@
 <template>
-	<view style="width: 100%; flex: 0 0 100%;">
-		<view class="u-radio" :style="[radioStyle]">
-			<view class="u-radio__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
-				<u-icon
-					class="u-radio__icon-wrap__icon"
-					name="checkbox-mark"
-					:size="elIconSize" 
-					:color="iconColor"/>
-			</view>
-			<view class="u-radio__label" @tap="onClickLabel" :style="{
-				fontSize: $u.addUnit(labelSize)
-			}">
-				<slot />
-			</view>
+	<view class="u-radio" :style="[radioStyle]">
+		<view class="u-radio__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
+			<u-icon
+				class="u-radio__icon-wrap__icon"
+			    name="checkbox-mark"
+			    :size="elIconSize" 
+				:color="iconColor"/>
+		</view>
+		<view class="u-radio__label" @tap="onClickLabel" :style="{
+			fontSize: $u.addUnit(labelSize)
+		}">
+			<slot />
 		</view>
-		
-		<slot name="form"></slot>
-		
 	</view>
 </template>
 
diff --git a/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue b/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue
index 78e3a47..f4683f1 100644
--- a/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue
+++ b/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue
@@ -12,10 +12,7 @@
 	>
 		<view class="u-direction-row">
 			<view class="u-icon-wrap">
-        <view class="iconfont icon-guangbo" v-if="isDiyIcon"></view>
-        <block v-else>
-				  <u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
-        </block>
+				<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
 			</view>
 			<view class="u-notice-box" id="u-notice-box">
 				<view
@@ -26,10 +23,8 @@
 						animationPlayState: animationPlayState,
 					}"
 				>
-					<view class="u-notice-text" @tap="click" :style="[textStyle]"
-					:class="['u-type-' + type]">
-          <view v-for="(text, index) of list" :key="index">{{text}}</view>
-          </view>
+					<text class="u-notice-text" @tap="click" :style="[textStyle]"
+					:class="['u-type-' + type]">{{showText}}</text>
 				</view>
 			</view>
 			<view class="u-icon-wrap">
@@ -103,7 +98,7 @@ export default {
 		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
 		speed: {
 			type: [Number, String],
-			default: 30
+			default: 160
 		},
 		// 播放状态，play-播放，paused-暂停
 		playState: {
@@ -114,11 +109,7 @@ export default {
 		padding: {
 			type: [Number, String],
 			default: '18rpx 24rpx'
-		},
-    isDiyIcon: {
-      type: Boolean,
-			default: false
-    }
+		}
 	},
 	data() {
 		return {
@@ -133,6 +124,7 @@ export default {
 		list: {
 			immediate: true,
 			handler(val) {
+				this.showText = val.join('，');
 				this.$nextTick(() => {
 					this.initSize();
 				});
@@ -260,12 +252,9 @@ export default {
 }
 
 .u-notice-text {
-  display: flex;
-  align-items: center;
 	font-size: 26rpx;
 	word-break: keep-all;
-	white-space: nowrap;
-  line-height: 44rpx;
+	white-space: nowrap
 }
 
 @keyframes u-loop-animation {
diff --git a/uni_modules/uview-ui/components/u-select/u-select.vue b/uni_modules/uview-ui/components/u-select/u-select.vue
index 43f431a..1285845 100644
--- a/uni_modules/uview-ui/components/u-select/u-select.vue
+++ b/uni_modules/uview-ui/components/u-select/u-select.vue
@@ -1,6 +1,6 @@
 <template>
-  <view class="u-select">
-    <!-- <view class="u-select__action" :class="{
+	<view class="u-select">
+		<!-- <view class="u-select__action" :class="{
 			'u-select--border': border
 		}" @tap.stop="selectHandler">
 			<view class="u-select__action__icon" :class="{
@@ -9,420 +9,343 @@
 				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
 			</view>
 		</view> -->
-    <u-popup
-      :maskCloseAble="maskCloseAble"
-      mode="bottom"
-      :popup="false"
-      v-model="value"
-      length="auto"
-      :safeAreaInsetBottom="safeAreaInsetBottom"
-      @close="close"
-      :z-index="uZIndex"
-    >
-      <view class="u-select">
-        <view
-          v-if="showHeader"
-          class="u-select__header"
-          @touchmove.stop.prevent=""
-        >
-          <view
-            class="u-select__header__cancel u-select__header__btn"
-            :style="{ color: cancelColor }"
-            hover-class="u-hover-class"
-            :hover-stay-time="150"
-            @tap="getResult('cancel')"
-          >
-            {{ cancelText }}
-          </view>
-          <view class="u-select__header__title">
-            {{ title }}
-          </view>
-          <view
-            class="u-select__header__confirm u-select__header__btn"
-            :style="{ color: moving ? cancelColor : confirmColor }"
-            hover-class="u-hover-class"
-            :hover-stay-time="150"
-            @touchmove.stop=""
-            @tap.stop="getResult('confirm')"
-          >
-            {{ confirmText }}
-          </view>
-        </view>
-        <view v-if="isShowsearch" class="search-wrap">
-          <u-search
-            :placeholder="searchPlac"
-            @change="searchChange"
-            :show-action="false"
-            v-model="keyword"
-          ></u-search>
-        </view>
-        <view class="u-select__body">
-          <picker-view
-            @change="columnChange"
-            class="u-select__body__picker-view"
-            :value="defaultSelector"
-            @pickstart="pickstart"
-            @pickend="pickend"
-          >
-            <picker-view-column
-              v-for="(item, index) in columnData"
-              :key="index"
-            >
-              <view
-                class="u-select__body__picker-view__item"
-                v-for="(item1, index1) in item"
-                :key="index1"
-                @click="confirm"
-              >
-                <view class="u-line-1">{{ item1[labelName] }}</view>
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </u-popup>
-  </view>
+		<u-popup :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
+			<view class="u-select">
+				<view class="u-select__header" @touchmove.stop.prevent="">
+					<view
+						class="u-select__header__cancel u-select__header__btn"
+						:style="{ color: cancelColor }"
+						hover-class="u-hover-class"
+						:hover-stay-time="150"
+						@tap="getResult('cancel')"
+					>
+						{{cancelText}}
+					</view>
+					<view class="u-select__header__title">
+						{{title}}
+					</view>
+					<view
+						class="u-select__header__confirm u-select__header__btn"
+						:style="{ color: moving ? cancelColor : confirmColor }"
+						hover-class="u-hover-class"
+						:hover-stay-time="150"
+						@touchmove.stop=""
+						@tap.stop="getResult('confirm')"
+					>
+						{{confirmText}}
+					</view>
+				</view>
+				<view class="u-select__body">
+					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend">
+						<picker-view-column v-for="(item, index) in columnData" :key="index">
+							<view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="index1">
+								<view class="u-line-1">{{ item1[labelName] }}</view>
+							</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-/**
- * select 列选择器
- * @description 此选择器用于单列，多列，多列联动的选择场景。(从1.3.0版本起，不建议使用Picker组件的单列和多列模式，Select组件是专门为列选择而构造的组件，更简单易用。)
- * @tutorial http://uviewui.com/components/select.html
- * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
- * @property {Array} list 列数据，数组形式，见官网说明
- * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
- * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
- * @property {String} cancel-color 取消按钮的颜色（默认#606266）
- * @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
- * @property {String} confirm-text 确认按钮的文字
- * @property {String} cancel-text 取消按钮的文字
- * @property {String} default-value 提供的默认选中的下标，见官网说明
- * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker(默认true)
- * @property {String Number} z-index 弹出时的z-index值(默认10075)
- * @property {String} value-name 自定义list数据的value属性名 1.3.6
- * @property {String} label-name 自定义list数据的label属性名 1.3.6
- * @property {String} child-name 自定义list数据的children属性名，只对多列联动模式有效 1.3.7
- * @event {Function} confirm 点击确定按钮，返回当前选择的值
- * @example <u-select v-model="show" :list="list"></u-select>
- */
+	/**
+	 * select 列选择器
+	 * @description 此选择器用于单列，多列，多列联动的选择场景。(从1.3.0版本起，不建议使用Picker组件的单列和多列模式，Select组件是专门为列选择而构造的组件，更简单易用。)
+	 * @tutorial http://uviewui.com/components/select.html
+	 * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
+	 * @property {Array} list 列数据，数组形式，见官网说明
+	 * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {String} cancel-color 取消按钮的颜色（默认#606266）
+	 * @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
+	 * @property {String} confirm-text 确认按钮的文字
+	 * @property {String} cancel-text 取消按钮的文字
+	 * @property {String} default-value 提供的默认选中的下标，见官网说明
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker(默认true)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} value-name 自定义list数据的value属性名 1.3.6
+	 * @property {String} label-name 自定义list数据的label属性名 1.3.6
+	 * @property {String} child-name 自定义list数据的children属性名，只对多列联动模式有效 1.3.7
+	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
+	 * @example <u-select v-model="show" :list="list"></u-select>
+	 */
 
 export default {
-  props: {
-    // 列数据
-    list: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
-    // 是否显示边框
-    border: {
-      type: Boolean,
-      default: true,
-    },
-    // 通过双向绑定控制组件的弹出与收起
-    value: {
-      type: Boolean,
-      default: false,
-    },
-    // "取消"按钮的颜色
-    cancelColor: {
-      type: String,
-      default: "#606266",
-    },
-    // "确定"按钮的颜色
-    confirmColor: {
-      type: String,
-      default: "#2979ff",
-    },
-    // 弹出的z-index值
-    zIndex: {
-      type: [String, Number],
-      default: 0,
-    },
-    safeAreaInsetBottom: {
-      type: Boolean,
-      default: false,
-    },
-    // 是否允许通过点击遮罩关闭Picker
-    maskCloseAble: {
-      type: Boolean,
-      default: true,
-    },
-    // 提供的默认选中的下标
-    defaultValue: {
-      type: Array,
-      default() {
-        return [0];
-      },
-    },
-    // 模式选择，single-column-单列，mutil-column-多列，mutil-column-auto-多列联动
-    mode: {
-      type: String,
-      default: "single-column",
-    },
-    // 自定义value属性名
-    valueName: {
-      type: String,
-      default: "value",
-    },
-    // 自定义label属性名
-    labelName: {
-      type: String,
-      default: "label",
-    },
-    // 自定义多列联动模式的children属性名
-    childName: {
-      type: String,
-      default: "children",
-    },
-    // 顶部标题
-    title: {
-      type: String,
-      default: "",
-    },
-    // 取消按钮的文字
-    cancelText: {
-      type: String,
-      default: "取消",
-    },
-    // 确认按钮的文字
-    confirmText: {
-      type: String,
-      default: "确认",
-    },
-    isShowsearch: {
-      type: Boolean,
-      default: false,
-    },
-    searchPlac: {
-      type: String,
-      default: "请输入搜索关键词",
-    },
-    showHeader: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data() {
-    return {
-      // 用于列改变时，保存当前的索引，下一次变化时比较得出是哪一列发生了变化
-      defaultSelector: [0],
-      // picker-view的数据
-      columnData: [],
-      // 每次队列发生变化时，保存选择的结果
-      selectValue: [],
-      // 上一次列变化时的index
-      lastSelectIndex: [],
-      // 列数
-      columnNum: 0,
-      // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
-      moving: false,
-      copyList: [],
-      keyword: "",
-    };
-  },
-  watch: {
-    // 在select弹起的时候，重新初始化所有数据
-    value: {
-      immediate: true,
-      handler(val) {
-        if (val) {
-          setTimeout(() => {
-            this.keyword = "";
-            this.init();
-          }, 10);
-        }
-      },
-    },
-  },
-  computed: {
-    uZIndex() {
-      // 如果用户有传递z-index值，优先使用
-      return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-    },
-  },
-  methods: {
-    // 标识滑动开始，只有微信小程序才有这样的事件
-    pickstart() {
-      // #ifdef MP-WEIXIN
-      this.moving = true;
-      // #endif
-    },
-    // 标识滑动结束
-    pickend() {
-      // #ifdef MP-WEIXIN
-      this.moving = false;
-      // #endif
-    },
-    init() {
-      if (this.keyword && this.isShowsearch) {
-        this.copyList = this.list.filter((item) =>
-          item.label.includes(this.keyword)
-        );
-      } else {
-        this.copyList = JSON.parse(JSON.stringify(this.list));
-      }
-      setTimeout(() => {
-        this.setColumnNum();
-        this.setDefaultSelector();
-        this.setColumnData();
-        this.setSelectValue();
-      }, 100);
-    },
-    // 获取默认选中列下标
-    setDefaultSelector() {
-      // 如果没有传入默认选中的值，生成长度为columnNum，用0填充的数组
-      this.defaultSelector =
-        this.defaultValue.length == this.columnNum
-          ? this.defaultValue
-          : Array(this.columnNum).fill(0);
-      this.lastSelectIndex = this.$u.deepClone(this.defaultSelector);
-    },
-    // 计算列数
-    setColumnNum() {
-      // 单列的列数为1
-      if (this.mode == "single-column") this.columnNum = 1;
-      // 多列时，this.list数组长度就是列数
-      else if (this.mode == "mutil-column") this.columnNum = this.copyList.length;
-      // 多列联动时，通过历遍this.list的第一个元素，得出有多少列
-      else if (this.mode == "mutil-column-auto") {
-        let num = 1;
-        let column = this.copyList;
-        // 只要有元素并且第一个元素有children属性，继续历遍
-        while (column[0][this.childName]) {
-          column = column[0] ? column[0][this.childName] : {};
-          num++;
-        }
-        this.columnNum = num;
-      }
-    },
-    // 获取需要展示在picker中的列数据
-    setColumnData() {
-      let data = [];
-      this.selectValue = [];
-      if (this.mode == "mutil-column-auto") {
-        // 获得所有数据中的第一个元素
-        let column =
-          this.copyList[this.defaultSelector.length ? this.defaultSelector[0] : 0];
-        // 通过循环所有的列数，再根据设定列的数组，得出当前需要渲染的整个列数组
-        for (let i = 0; i < this.columnNum; i++) {
-          // 第一列默认为整个list数组
-          if (i == 0) {
-            data[i] = this.copyList;
-            column = column[this.childName];
-          } else {
-            // 大于第一列时，判断是否有默认选中的，如果没有就用该列的第一项
-            data[i] = column;
-            column = column[this.defaultSelector[i]][this.childName];
-          }
-        }
-      } else if (this.mode == "single-column") {
-        data[0] = this.copyList;
-      } else {
-        data = this.copyList;
-      }
-      this.columnData = data;
-    },
-    // 获取默认选中的值，如果没有设置defaultValue，就默认选中每列的第一个
-    setSelectValue() {
-      let tmp = null;
-      for (let i = 0; i < this.columnNum; i++) {
-        tmp = this.columnData[i][this.defaultSelector[i]];
-        let data = {
-          value: tmp ? tmp[this.valueName] : null,
-          label: tmp ? tmp[this.labelName] : null,
-        };
-        // 判断是否存在额外的参数，如果存在，就返回
-        if (tmp && tmp.extra) data.extra = tmp.extra;
-        this.selectValue.push(data);
-      }
-    },
-    // 列选项
-    columnChange(e) {
-      let index = null;
-      let columnIndex = e.detail.value;
-      // 由于后面是需要push进数组的，所以需要先清空数组
-      this.selectValue = [];
-      if (this.mode == "mutil-column-auto") {
-        // 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
-        this.lastSelectIndex.map((val, idx) => {
-          if (val != columnIndex[idx]) index = idx;
-        });
-        this.defaultSelector = columnIndex;
-        for (let i = index + 1; i < this.columnNum; i++) {
-          // 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
-          // 默认是队列的第一个为默认选项
-          this.columnData[i] =
-            this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][
-              this.childName
-            ];
-          // 改变的列之后的所有列，默认选中第一个
-          this.defaultSelector[i] = 0;
-        }
-        // 在历遍的过程中，可能由于上一步修改this.columnData，导致产生连锁反应，程序触发columnChange，会有多次调用
-        // 只有在最后一次数据稳定后的结果是正确的，此前的历遍中，可能会产生undefined，故需要判断
-        columnIndex.map((item, index) => {
-          let data = this.columnData[index][columnIndex[index]];
-          let tmp = {
-            value: data ? data[this.valueName] : null,
-            label: data ? data[this.labelName] : null,
-          };
-          // 判断是否有需要额外携带的参数
-          if (data && data.extra !== undefined) tmp.extra = data.extra;
-          this.selectValue.push(tmp);
-        });
-        // 保存这一次的结果，用于下次列发生变化时作比较
-        this.lastSelectIndex = columnIndex;
-      } else if (this.mode == "single-column") {
-        let data = this.columnData[0][columnIndex[0]];
-        // 初始默认选中值
-        let tmp = {
-          value: data ? data[this.valueName] : null,
-          label: data ? data[this.labelName] : null,
-        };
-        // 判断是否有需要额外携带的参数
-        if (data && data.extra !== undefined) tmp.extra = data.extra;
-        this.selectValue.push(tmp);
-      } else if (this.mode == "mutil-column") {
-        // 初始默认选中值
-        columnIndex.map((item, index) => {
-          let data = this.columnData[index][columnIndex[index]];
-          // 初始默认选中值
-          let tmp = {
-            value: data ? data[this.valueName] : null,
-            label: data ? data[this.labelName] : null,
-          };
-          // 判断是否有需要额外携带的参数
-          if (data && data.extra !== undefined) tmp.extra = data.extra;
-          this.selectValue.push(tmp);
-        });
-      }
-    },
-    close() {
-      this.$emit("input", false);
-    },
-    // 点击确定或者取消
-    getResult(event = null) {
-      // #ifdef MP-WEIXIN
-      if (this.moving) return;
-      // #endif
-      if (event) this.$emit(event, this.selectValue);
-      this.close();
-    },
-    selectHandler() {
-      this.$emit("click");
-    },
-    searchChange() {
-      this.init();
-    },
-    confirm() {
-      setTimeout(() => {
-        this.getResult("confirm");
-      }, 100);
-    },
-  },
+	props: {
+		// 列数据
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 是否显示边框
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 通过双向绑定控制组件的弹出与收起
+		value: {
+			type: Boolean,
+			default: false
+		},
+		// "取消"按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// "确定"按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 弹出的z-index值
+		zIndex: {
+			type: [String, Number],
+			default: 0
+		},
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许通过点击遮罩关闭Picker
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 提供的默认选中的下标
+		defaultValue: {
+			type: Array,
+			default() {
+				return [0];
+			}
+		},
+		// 模式选择，single-column-单列，mutil-column-多列，mutil-column-auto-多列联动
+		mode: {
+			type: String,
+			default: 'single-column'
+		},
+		// 自定义value属性名
+		valueName: {
+			type: String,
+			default: 'value'
+		},
+		// 自定义label属性名
+		labelName: {
+			type: String,
+			default: 'label'
+		},
+		// 自定义多列联动模式的children属性名
+		childName: {
+			type: String,
+			default: 'children'
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确认'
+		}
+	},
+	data() {
+		return {
+			// 用于列改变时，保存当前的索引，下一次变化时比较得出是哪一列发生了变化
+			defaultSelector: [0],
+			// picker-view的数据
+			columnData: [],
+			// 每次队列发生变化时，保存选择的结果
+			selectValue: [],
+			// 上一次列变化时的index
+			lastSelectIndex: [],
+			// 列数
+			columnNum: 0,
+			// 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+			moving: false
+		};
+	},
+	watch: {
+		// 在select弹起的时候，重新初始化所有数据
+		value: {
+			immediate: true,
+			handler(val) {
+				if(val) setTimeout(() => this.init(), 10);
+			}
+		},
+	},
+	computed: {
+		uZIndex() {
+			// 如果用户有传递z-index值，优先使用
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		},
+	},
+	methods: {
+		// 标识滑动开始，只有微信小程序才有这样的事件
+		pickstart() {
+			// #ifdef MP-WEIXIN
+			this.moving = true;
+			// #endif
+		},
+		// 标识滑动结束
+		pickend() {
+			// #ifdef MP-WEIXIN
+			this.moving = false;
+			// #endif
+		},
+		init() {
+			this.setColumnNum();
+			this.setDefaultSelector();
+			this.setColumnData();
+			this.setSelectValue();
+		},
+		// 获取默认选中列下标
+		setDefaultSelector() {
+			// 如果没有传入默认选中的值，生成长度为columnNum，用0填充的数组
+			this.defaultSelector = this.defaultValue.length == this.columnNum ? this.defaultValue : Array(this.columnNum).fill(0);
+			this.lastSelectIndex = this.$u.deepClone(this.defaultSelector);
+		},
+		// 计算列数
+		setColumnNum() {
+			// 单列的列数为1
+			if(this.mode == 'single-column') this.columnNum = 1;
+			// 多列时，this.list数组长度就是列数
+			else if(this.mode == 'mutil-column') this.columnNum = this.list.length;
+			// 多列联动时，通过历遍this.list的第一个元素，得出有多少列
+			else if(this.mode == 'mutil-column-auto') {
+				let num = 1;
+				let column = this.list;
+				// 只要有元素并且第一个元素有children属性，继续历遍
+				while(column[0][this.childName]) {
+					column = column[0] ? column[0][this.childName] : {};
+					num ++;
+				}
+				this.columnNum = num;
+			}
+		},
+		// 获取需要展示在picker中的列数据
+		setColumnData() {
+			let data = [];
+			this.selectValue = [];
+			if(this.mode == 'mutil-column-auto') {
+				// 获得所有数据中的第一个元素
+				let column = this.list[this.defaultSelector.length ? this.defaultSelector[0] : 0];
+				// 通过循环所有的列数，再根据设定列的数组，得出当前需要渲染的整个列数组
+				for (let i = 0; i < this.columnNum; i++) {
+					// 第一列默认为整个list数组
+					if (i == 0) {
+						data[i] = this.list;
+						column = column[this.childName];
+					} else {
+						// 大于第一列时，判断是否有默认选中的，如果没有就用该列的第一项
+						data[i] = column;
+						column = column[this.defaultSelector[i]][this.childName];
+					}
+				}
+			} else if(this.mode == 'single-column') {
+				data[0] = this.list;
+			} else {
+				data = this.list;
+			}
+			this.columnData = data;
+		},
+		// 获取默认选中的值，如果没有设置defaultValue，就默认选中每列的第一个
+		setSelectValue() {
+			let tmp = null;
+			for(let i = 0; i < this.columnNum; i++) {
+				tmp = this.columnData[i][this.defaultSelector[i]];
+				let data = {
+					value: tmp ? tmp[this.valueName] : null,
+					label: tmp ? tmp[this.labelName] : null
+				};
+				// 判断是否存在额外的参数，如果存在，就返回
+				if(tmp && tmp.extra) data.extra = tmp.extra;
+				this.selectValue.push(data)
+			}
+		},
+		// 列选项
+		columnChange(e) {
+			let index = null;
+			let columnIndex = e.detail.value;
+			// 由于后面是需要push进数组的，所以需要先清空数组
+			this.selectValue = [];
+			if(this.mode == 'mutil-column-auto') {
+				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+				this.lastSelectIndex.map((val, idx) => {
+					if (val != columnIndex[idx]) index = idx;
+				});
+				this.defaultSelector = columnIndex;
+				for (let i = index + 1; i < this.columnNum; i++) {
+					// 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
+					// 默认是队列的第一个为默认选项
+					this.columnData[i] = this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][this.childName];
+					// 改变的列之后的所有列，默认选中第一个
+					this.defaultSelector[i] = 0;
+				}
+				// 在历遍的过程中，可能由于上一步修改this.columnData，导致产生连锁反应，程序触发columnChange，会有多次调用
+				// 只有在最后一次数据稳定后的结果是正确的，此前的历遍中，可能会产生undefined，故需要判断
+				columnIndex.map((item, index) => {
+					let data = this.columnData[index][columnIndex[index]];
+					let tmp = {
+						value: data ? data[this.valueName] : null,
+						label: data ? data[this.labelName] : null,
+					};
+					// 判断是否有需要额外携带的参数
+					if(data && data.extra !== undefined) tmp.extra = data.extra;
+					this.selectValue.push(tmp);
+
+				})
+				// 保存这一次的结果，用于下次列发生变化时作比较
+				this.lastSelectIndex = columnIndex;
+			} else if(this.mode == 'single-column') {
+				let data = this.columnData[0][columnIndex[0]];
+				// 初始默认选中值
+				let tmp = {
+					value: data ? data[this.valueName] : null,
+					label: data ? data[this.labelName] : null,
+				};
+				// 判断是否有需要额外携带的参数
+				if(data && data.extra !== undefined) tmp.extra = data.extra;
+				this.selectValue.push(tmp);
+			} else if(this.mode == 'mutil-column') {
+				// 初始默认选中值
+				columnIndex.map((item, index) => {
+					let data = this.columnData[index][columnIndex[index]];
+					// 初始默认选中值
+					let tmp = {
+						value: data ? data[this.valueName] : null,
+						label: data ? data[this.labelName] : null,
+					};
+					// 判断是否有需要额外携带的参数
+					if(data && data.extra !== undefined) tmp.extra = data.extra;
+					this.selectValue.push(tmp);
+				})
+			}
+		},
+		close() {
+			this.$emit('input', false);
+		},
+		// 点击确定或者取消
+		getResult(event = null) {
+			// #ifdef MP-WEIXIN
+			if (this.moving) return;
+			// #endif
+			if (event) this.$emit(event, this.selectValue);
+			this.close();
+		},
+		selectHandler() {
+			this.$emit('click');
+		}
+	}
 };
 </script>
 
@@ -430,67 +353,65 @@ export default {
 @import "../../libs/css/style.components.scss";
 
 .u-select {
-  &__action {
-    position: relative;
-    line-height: $u-form-item-height;
-    height: $u-form-item-height;
 
-    &__icon {
-      position: absolute;
-      right: 20rpx;
-      top: 50%;
-      transition: transform 0.4s;
-      transform: translateY(-50%);
-      z-index: 1;
+	&__action {
+		position: relative;
+		line-height: $u-form-item-height;
+		height: $u-form-item-height;
 
-      &--reverse {
-        transform: rotate(-180deg) translateY(50%);
-      }
-    }
-  }
+		&__icon {
+			position: absolute;
+			right: 20rpx;
+			top: 50%;
+			transition: transform .4s;
+			transform: translateY(-50%);
+			z-index: 1;
 
-  &__hader {
-    &__title {
-      color: $u-content-color;
-    }
-  }
+			&--reverse {
+				transform: rotate(-180deg) translateY(50%);
+			}
+		}
+	}
 
-  &--border {
-    border-radius: 6rpx;
-    border-radius: 4px;
-    border: 1px solid $u-form-item-border-color;
-  }
+	&__hader {
+		&__title {
+			color: $u-content-color;
+		}
+	}
 
-  &__header {
-    @include vue-flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 80rpx;
-    padding: 0 40rpx;
-  }
+	&--border {
+		border-radius: 6rpx;
+		border-radius: 4px;
+		border: 1px solid $u-form-item-border-color;
+	}
 
-  &__body {
-    width: 100%;
-    height: 500rpx;
-    overflow: hidden;
-    background-color: #fff;
+	&__header {
+		@include vue-flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 80rpx;
+		padding: 0 40rpx;
+	}
 
-    &__picker-view {
-      height: 100%;
-      box-sizing: border-box;
+	&__body {
+		width: 100%;
+		height: 500rpx;
+		overflow: hidden;
+		background-color: #fff;
 
-      &__item {
-        @include vue-flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 32rpx;
-        color: $u-main-color;
-        padding: 0 8rpx;
-      }
-    }
-  }
-}
-.search-wrap {
-  padding: 20rpx 30rpx 30rpx;
+		&__picker-view {
+			height: 100%;
+			box-sizing: border-box;
+
+			&__item {
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32rpx;
+				color: $u-main-color;
+				padding: 0 8rpx;
+			}
+		}
+	}
 }
 </style>
diff --git a/uni_modules/uview-ui/components/u-sticky/u-sticky.vue b/uni_modules/uview-ui/components/u-sticky/u-sticky.vue
index a7f7234..d9bc34c 100644
--- a/uni_modules/uview-ui/components/u-sticky/u-sticky.vue
+++ b/uni_modules/uview-ui/components/u-sticky/u-sticky.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="u-sticky-wrap" :class="[elClass]" :style="{
-			height: fixed ? height + 'rpx' : 'auto',
+			height: fixed ? height + 'px' : 'auto',
 			backgroundColor: bgColor
 		}">
 			<view class="u-sticky" :style="{
@@ -109,7 +109,7 @@
 
 				this.disconnectObserver('contentObserver');
 				this.$uGetRect('.' + this.elClass).then((res) => {
-					this.height = res.height
+					this.height = res.height;
 					this.left = res.left;
 					this.width = res.width;
 					this.$nextTick(() => {
diff --git a/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue b/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue
index c2a4a23..2e1b6a2 100644
--- a/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue
+++ b/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue
@@ -1,6 +1,5 @@
 <template>
 	<view v-if="show" class="u-tabbar" @touchmove.stop.prevent="() => {}">
-		<view class="u-tabbar__contentblue"></view>
 		<view class="u-tabbar__content safe-area-inset-bottom" :style="{
 			height: $u.addUnit(height),
 			backgroundColor: bgColor,
@@ -13,11 +12,10 @@
 				backgroundColor: bgColor
 			}">
 				<view :class="[
-					midButton && item.midButton ? 'u-tabbar__content__circle__button' : 'u-tabbar__content__item__button',
-					elIconPath(index).includes('s=1') ? 'ac' : '',
+					midButton && item.midButton ? 'u-tabbar__content__circle__button' : 'u-tabbar__content__item__button'
 				]">
 					<u-icon
-						:size="midButton && item.midButton ? midButtonSize : item.isHideText && isActive(index) ? '92rpx' : iconSize"
+						:size="midButton && item.midButton ? midButtonSize : iconSize"
 						:name="elIconPath(index)"
 						img-mode="scaleToFill"
 						:color="elColor(index)"
@@ -31,7 +29,7 @@
 				<view class="u-tabbar__content__item__text" :style="{
 					color: elColor(index)
 				}">
-					<text class="u-line-1" v-if="!item.isHideText || !isActive(index)">{{item.text}}</text>
+					<text class="u-line-1">{{item.text}}</text>
 				</view>
 			</view>
 			<view v-if="midButton" class="u-tabbar__content__circle__border" :class="{
@@ -65,12 +63,12 @@
 			// 整个tabbar的背景颜色
 			bgColor: {
 				type: String,
-				default: 'transparent'
+				default: '#ffffff'
 			},
 			// tabbar的高度，默认50px，单位任意，如果为数值，则为rpx单位
 			height: {
 				type: [String, Number],
-				default: '180rpx'
+				default: '50px'
 			},
 			// 非凸起图标的大小，单位任意，数值默认rpx
 			iconSize: {
@@ -112,7 +110,7 @@
 			// 是否显示顶部的横线
 			borderTop: {
 				type: Boolean,
-				default: false
+				default: true
 			},
 			// 是否隐藏原生tabbar
 			hideTabBar: {
@@ -167,17 +165,7 @@
 						return index == this.value ? this.activeColor : this.inactiveColor;
 					}
 				}
-			},
-      isActive() {
-        return (index)=> {
-          let pagePath = this.list[index].pagePath;
-          if(pagePath == this.pageUrl || pagePath == '/' + this.pageUrl) {
-            return true
-          }else {
-            return false
-          }
-        }
-      }
+			}
 		},
 		mounted() {
 			this.midButton && this.getMidButtonLeft();
@@ -212,7 +200,7 @@
 				// 如果有配置pagePath属性，使用uni.switchTab进行跳转
 				if(this.list[index].pagePath) {
 					uni.switchTab({
-						url: "/" + this.list[index].pagePath
+						url: this.list[index].pagePath
 					})
 				} else {
 					// 如果配置了papgePath属性，将不会双向绑定v-model传入的value值
@@ -250,16 +238,9 @@
 	}
 
 	.u-tabbar {
-		&__contentblue{
-			background-color: rgba(255, 255, 255, .8);
-			backdrop-filter: brightness(200%) saturate(180%) blur(5px);
-			// height: calc(180rpx + constant(safe-area-inset-bottom));
-			height: calc(180rpx + env(safe-area-inset-bottom));
-			
-		}
-		&__contentblue,
+
 		&__content {
-			display: flex;
+			@include vue-flex;
 			align-items: center;
 			position: relative;
 			position: fixed;
@@ -278,7 +259,7 @@
 				top: -48rpx;
 				position: absolute;
 				z-index: 4;
-				// background-color: #ffffff;
+				background-color: #ffffff;
 				// 由于安卓的无能，导致只有3个tabbar item时，此css计算方式有误差
 				// 故使用js计算的形式来定位，此处不注释，是因为js计算有延后，避免出现位置闪动
 				left: 50%;
@@ -292,29 +273,18 @@
 			&__item {
 				flex: 1;
 				justify-content: center;
-				// height: 100%;
-				padding-top: 0rpx;
-				
-				// @include vue-flex;
-				// flex-direction: column;
-				// align-items: center;
+				height: 100%;
+				padding: 12rpx 0;
+				@include vue-flex;
+				flex-direction: column;
+				align-items: center;
 				position: relative;
 
 				&__button {
-					// position: absolute;
-					// top: 50%;
-					// left: 50%;
-					// transform: translate(-50%);
-					$size: 112rpx;
-					width: $size;
-					height: $size;
-					border-radius: 20rpx;
-					margin: 0 auto;
-					line-height: 96rpx;
-					text-align: center;
-					&.ac {
-						background: #00A6FF;
-					}
+					position: absolute;
+					top: 14rpx;
+					left: 50%;
+					transform: translateX(-50%);
 				}
 
 				&__text {
@@ -348,7 +318,7 @@
 					justify-content: center;
 					align-items: center;
 					position: absolute;
-					// background-color: #ffffff;
+					background-color: #ffffff;
 					top: -40rpx;
 					left: 50%;
 					z-index: 6;
diff --git a/uni_modules/uview-ui/components/u-upload/u-upload.vue b/uni_modules/uview-ui/components/u-upload/u-upload.vue
index 450cbd9..f4d4b76 100644
--- a/uni_modules/uview-ui/components/u-upload/u-upload.vue
+++ b/uni_modules/uview-ui/components/u-upload/u-upload.vue
@@ -26,16 +26,12 @@
 				height="16"
 				class="u-progress"
 				:percent="item.progress"
-			>
-				{{
-					item.progress === 100 ? '100%' : ''
-				}}
-			</u-line-progress>
+			></u-line-progress>
 			<view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
 			<image @tap.stop="doPreviewImage(item.url || item.path, index)" class="u-preview-image" v-if="!item.isImage" :src="item.url || item.path" :mode="imageMode"></image>
 		</view>
 		<slot name="file" :file="lists"></slot>
-		<view style="display: inline-block;" @tap="showList = true" v-if="maxCount > lists.length">
+		<view style="display: inline-block;" @tap="selectFile" v-if="maxCount > lists.length">
 			<slot name="addBtn"></slot>
 			<view
 				v-if="!customBtn"
@@ -51,7 +47,6 @@
 				<view class="u-add-tips">{{ uploadText }}</view>
 			</view>
 		</view>
-    <u-action-sheet :list="actionList"  @click="clickSheet" :cancel-text="$t('tComUUpload.modal3')" v-model="showList"></u-action-sheet>
 	</view>
 </template>
 
@@ -267,8 +262,7 @@ export default {
 		return {
 			lists: [],
 			isInCount: true,
-			uploading: false,
-      showList: false
+			uploading: false
 		};
 	},
 	watch: {
@@ -292,24 +286,6 @@ export default {
 			this.$emit('on-list-change', n, this.index);
 		}
 	},
-  computed: {
-    tComUUpload() {
-      return this.$t('tComUUpload')
-    },
-    betPageTUpload() {
-      return this.$t('betPageTUpload')
-    },
-    actionList() {
-      return [
-      {
-        text: this.betPageTUpload.btntext3,
-      },
-        {
-        text: this.betPageTUpload.btntext4,
-      }
-    ]
-    }
-  },
 	methods: {
 		// 清除列表
 		clear() {
@@ -320,10 +296,9 @@ export default {
 			this.uploadFile();
 		},
 		// 选择图片
-		selectFile(index) {
+		selectFile() {
 			if (this.disabled) return;
-			const { name = '', maxCount, multiple, maxSize, sizeType, lists, camera, compressed, maxDuration } = this;
-      const sourceType = index === 0 ? ['camera'] : ['album']
+			const { name = '', maxCount, multiple, maxSize, sizeType, lists, camera, compressed, maxDuration, sourceType } = this;
 			let chooseFile = null;
 			const newMaxCount = maxCount - lists.length;
 			// 设置为只选择图片的时候使用 chooseImage 来实现
@@ -348,11 +323,11 @@ export default {
 						if (!multiple && index >= 1) return;
 						if (val.size > maxSize) {
 							this.$emit('on-oversize', val, this.lists, this.index);
-							this.showToast(this.tComUUpload.toast9);
+							this.showToast('超出允许的文件大小');
 						} else {
 							if (maxCount <= lists.length) {
 								this.$emit('on-exceed', val, this.lists, this.index);
-								this.showToast(this.tComUUpload.toast10);
+								this.showToast('超出最大允许的文件个数');
 								return;
 							}
 							lists.push({
@@ -389,9 +364,8 @@ export default {
 			this.lists[index].progress = 0;
 			this.lists[index].error = false;
 			this.lists[index].response = null;
-      // 重新上传
 			uni.showLoading({
-				title: this.tComUUpload.toast1
+				title: '重新上传'
 			});
 			this.uploadFile(index);
 		},
@@ -435,8 +409,7 @@ export default {
 			}
 			// 检查上传地址
 			if (!this.action) {
-        // 请配置上传地址
-				this.showToast(this.tComUUpload.toast2, true);
+				this.showToast('请配置上传地址', true);
 				return;
 			}
 			this.lists[index].error = false;
@@ -449,7 +422,6 @@ export default {
 				formData: this.formData,
 				header: this.header,
 				success: res => {
-					console.log("res::::vvv===>>>", res);
 					// 判断是否json字符串，将其转为json格式
 					let data = this.toJson && this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data;
 					if (![200, 201, 204].includes(res.statusCode)) {
@@ -485,17 +457,13 @@ export default {
 			this.lists[index].error = true;
 			this.lists[index].response = null;
 			this.$emit('on-error', err, index, this.lists, this.index);
-			this.showToast(this.tComUUpload.toast3);
+			this.showToast('上传失败，请重试');
 		},
 		// 删除一个图片
 		deleteItem(index) {
-      // 提示
-      // 您确定要删除此项吗？
 			uni.showModal({
-				title: this.tComUUpload.modal1,
-				content: this.tComUUpload.modal2,
-        cancelText: this.tComUUpload.modal3,
-        confirmText: this.tComUUpload.modal4,
+				title: '提示',
+				content: '您确定要删除此项吗？',
 				success: async (res) => {
 					if (res.confirm) {
 						// 先检查是否有定义before-remove移除前钩子
@@ -510,13 +478,11 @@ export default {
 									this.handlerDeleteItem(index);
 								}).catch(err => {
 									// 如果进入promise的reject，终止删除操作
-                  // 已终止移除
-									this.showToast(this.tComUUpload.toast4);
+									this.showToast('已终止移除');
 								})
 							} else if(beforeResponse === false) {
 								// 返回false，终止删除
-                // 已终止移除
-								this.showToast(this.tComUUpload.toast4);
+								this.showToast('已终止移除');
 							} else {
 								// 如果返回true，执行删除操作
 								this.handlerDeleteItem(index);
@@ -538,8 +504,7 @@ export default {
 			this.lists.splice(index, 1);
 			this.$forceUpdate();
 			this.$emit('on-remove', index, this.lists, this.index);
-      // 移除成功
-			this.showToast(this.tComUUpload.toast5);
+			this.showToast('移除成功');
 		},
 		// 用户通过ref手动的形式，移除一张图片
 		remove(index) {
@@ -560,9 +525,8 @@ export default {
 					this.$emit('on-preview', url, this.lists, this.index);
 				},
 				fail: () => {
-          // 预览图片失败
 					uni.showToast({
-						title: this.tComUUpload.toast6,
+						title: '预览图片失败',
 						icon: 'none'
 					});
 				}
@@ -588,14 +552,9 @@ export default {
 				// 转为小写
 				return ext.toLowerCase() === fileExt;
 			})
-      // 不允许选择 | 格式的文件
-			if(!noArrowExt) this.showToast(`${this.tComUUpload.toast7}${fileExt}${this.tComUUpload.toast8}`);
+			if(!noArrowExt) this.showToast(`不允许选择${fileExt}格式的文件`);
 			return noArrowExt;
-		},
-    // 拍照 | 选择一张照片
-    clickSheet(index) {
-      this.selectFile(index)
-    },
+		}
 	}
 };
 </script>
@@ -637,7 +596,6 @@ export default {
 .u-add-tips {
 	margin-top: 20rpx;
 	line-height: 40rpx;
-  text-align: center;
 }
 
 .u-add-wrap__hover {
@@ -678,9 +636,6 @@ export default {
 	right: 8rpx;
 	z-index: 9;
 	width: auto;
-	height: 28rpx !important;
-	font-size: 24rpx !important;
-	color: #000 !important;
 }
 
 .u-error-btn {
diff --git a/uni_modules/uview-ui/index.js b/uni_modules/uview-ui/index.js
index 77eea72..d38a3bf 100644
--- a/uni_modules/uview-ui/index.js
+++ b/uni_modules/uview-ui/index.js
@@ -117,7 +117,6 @@ const $u = {
 uni.$u = $u
 
 const install = Vue => {
-	
 	Vue.mixin(mixin) 
 	if (Vue.prototype.openShare) {
 		Vue.mixin(mpShare);
diff --git a/uni_modules/uview-ui/libs/request/index.js b/uni_modules/uview-ui/libs/request/index.js
index ddac994..1f5f471 100644
--- a/uni_modules/uview-ui/libs/request/index.js
+++ b/uni_modules/uview-ui/libs/request/index.js
@@ -25,7 +25,6 @@ class Request {
 		options.params = options.params || {};
 		options.header = Object.assign({}, this.config.header, options.header);
 		options.method = options.method || this.config.method;
-		options.timeout = 10000; // 不支持对外修改内部默认改为10秒
 
 		return new Promise((resolve, reject) => {
 			options.complete = (response) => {
@@ -83,13 +82,13 @@ class Request {
 			// 加一个是否已有timer定时器的判断，否则有两个同时请求的时候，后者会清除前者的定时器id
 			// 而没有清除前者的定时器，导致前者超时，一直显示loading
 			if(this.config.showLoading && !this.config.timer) {
-				// this.config.timer = setTimeout(() => {
-				// 	uni.showLoading({
-				// 		title: this.config.loadingText,
-				// 		mask: this.config.loadingMask
-				// 	})
-				// 	this.config.timer = null;
-				// }, this.config.loadingTime);
+				this.config.timer = setTimeout(() => {
+					uni.showLoading({
+						title: this.config.loadingText,
+						mask: this.config.loadingMask
+					})
+					this.config.timer = null;
+				}, this.config.loadingTime);
 			}
 			uni.request(options);
 		})
diff --git a/uni_modules/uview-ui/theme.scss b/uni_modules/uview-ui/theme.scss
index 9df86b0..f3bb36d 100644
--- a/uni_modules/uview-ui/theme.scss
+++ b/uni_modules/uview-ui/theme.scss
@@ -1,31 +1,38 @@
 // 此文件为uView的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
 // uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
 // 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
 $u-main-color: #303133;
 $u-content-color: #606266;
 $u-tips-color: #909399;
 $u-light-color: #c0c4cc;
 $u-border-color: #e4e7ed;
 $u-bg-color: #f3f4f6;
+
 $u-type-primary: #2979ff;
 $u-type-primary-light: #ecf5ff;
 $u-type-primary-disabled: #a0cfff;
 $u-type-primary-dark: #2b85e4;
-$u-type-warning: #f90;
-$u-type-warning-disabled: #FFE500;
-$u-type-warning-dark:#f90;
-$u-type-warning-light:#f90;
+
+$u-type-warning: #ff9900;
+$u-type-warning-disabled: #fcbd71;
+$u-type-warning-dark: #f29100;
+$u-type-warning-light: #fdf6ec;
+
 $u-type-success: #19be6b;
 $u-type-success-disabled: #71d5a1;
 $u-type-success-dark: #18b566;
 $u-type-success-light: #dbf1e1;
-$u-type-error: #FF6363;
+
+$u-type-error: #fa3534;
 $u-type-error-disabled: #fab6b6;
-$u-type-error-dark: #FF6363;
-$u-type-error-light: #FF6363;
+$u-type-error-dark: #dd6161;
+$u-type-error-light: #fef0f0;
+
 $u-type-info: #909399;
 $u-type-info-disabled: #c8c9cc;
 $u-type-info-dark: #82848a;
 $u-type-info-light: #f4f4f5;
+
 $u-form-item-height: 70rpx;
-$u-form-item-border-color: #dcdfe6;
\ No newline at end of file
+$u-form-item-border-color: #dcdfe6;