no message

js_sdk/common.js

@@ -135,6 +135,9 @@ export default {
         }
         return fmt
     },
+    phoneNumber(phone) {
+        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2")
+    },
 
     replaceThumbnail: function (urlPath) {
         if (urlPath != null) {

pages.json

@@ -1,5 +1,32 @@
 {
     "pages": [
+        {
+            "path": "pages/chooseIdentity/index",
+            "style": {
+                "navigationStyle": "custom",
+                "navigationBarTitleText": "选择身份",
+                "app-plus": {
+                    "titleNView": {
+                        "buttons": [
+                            {
+                                "text": "\ue534",
+                                "fontSrc": "/static/uni.ttf",
+                                "fontSize": "22px",
+                                "color": "#FFFFFF"
+                            }
+                        ]
+                    }
+                },
+                "usingComponents": {
+                    "van-button": "/wxcomponents/weapp/dist/button/index",
+                    "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                    "van-field": "/wxcomponents/weapp/dist/field/index",
+                    "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                    "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                    "van-dialog": "/wxcomponents/weapp/dist/dialog/index"
+                }
+            }
+        },
         {
             "path": "pages/index/index",
             "style": {
@@ -157,14 +184,6 @@
             "van-circle": "/wxcomponents/weapp/dist/circle/index",
             "van-grid": "/wxcomponents/weapp/dist/grid/index",
             "van-calendar": "/wxcomponents/weapp/dist/calendar/index"
-        },
-        "watermark": {
-            "text": "这是水印",
-            "alpha": 0.3,
-            "fontSize": 30,
-            "color": "#000000",
-            "rotate": 30,
-            "zIndex": 1000
         }
     },
     "tabBar": {

pages/chooseIdentity/index.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="login">
+    <img src="./chooseIdentityImg/back.png" alt="" class="logobig" />
+    <div class="title">请选择您的身份</div>
+    <div class="title1">方便我们为您提供更准确的服务</div>
+
+    <div class="choose">
+      <div
+        @click="chooseIdentity(1)"
+        :class="isSelect === 1 ? 'select isselect' : 'select'"
+      >
+        <div>
+          <img class="headerImg" src="./chooseIdentityImg/header1.png" alt="" />
+        </div>
+        <div class="name">企业上报</div>
+        <div class="huan"><van-icon name="success" /></div>
+      </div>
+      <div
+        @click="chooseIdentity(2)"
+        :class="isSelect === 2 ? 'select isselect' : 'select'"
+        class="select"
+        style="margin-top: 20px"
+      >
+        <div>
+          <img class="headerImg" src="./chooseIdentityImg/header2.png" alt="" />
+        </div>
+        <div class="name">属地核查</div>
+        <div class="huan"><van-icon name="success" /></div>
+      </div>
+      <div
+        @click="chooseIdentity(3)"
+        :class="isSelect === 3 ? 'select isselect' : 'select'"
+        class="select"
+        style="margin-top: 20px"
+      >
+        <div>
+          <img class="headerImg" src="./chooseIdentityImg/header3.png" alt="" />
+        </div>
+        <div class="name">部门检查</div>
+        <div class="huan"><van-icon name="success" /></div>
+      </div>
+    </div>
+    <div class="btnbox">
+      <van-button class="btn" @click="goLogin">去登陆</van-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      loginForm: {},
+      isSelect: 1,
+    };
+  },
+  mounted() {},
+  methods: {
+    chooseIdentity(e) {
+      this.isSelect = e;
+    },
+    goLogin() {
+      if (this.isSelect == 1) {
+        uni.navigateTo({
+          url: "/pages/login/login",
+        });
+      }
+      if (this.isSelect == 2) {
+        uni.navigateTo({
+          url: "/pages/subPackages/phoneRegister/index",
+        });
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+.login {
+  background: white;
+  height: 100%;
+  overflow: hidden;
+  .logTit {
+    width: 80vw;
+    left: 10vw;
+    top: 45vw;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    z-index: 1;
+    color: rgba(51, 51, 51, 1);
+    font-size: 4vw;
+    p {
+      color: rgba(102, 102, 102, 1);
+      font-size: 4vw;
+      margin-top: 0.5vw;
+    }
+
+    .titletxt {
+      font-size: 48rpx;
+      font-family: Taipei Sans TC Beta-Bold, Taipei Sans TC Beta;
+      font-weight: bold;
+      color: #333333;
+    }
+    .titletxt2 {
+      font-size: 32rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666666;
+    }
+  }
+  .logobig {
+    width: 100vw;
+    height: 100vh;
+    position: absolute;
+    left: 0;
+    z-index: 0;
+  }
+  .title {
+    font-weight: bold;
+    font-size: 52rpx;
+    color: #222222;
+    position: absolute;
+    top: 342rpx;
+    width: 100%;
+    font-family: cursive;
+    text-align: center;
+  }
+  .title1 {
+    position: absolute;
+    top: 432rpx;
+    // left: 52px;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #354448;
+    width: 100%;
+    text-align: center;
+  }
+  .huan {
+    width: 40rpx;
+    height: 40rpx;
+    border: 4rpx solid #c0c2c3;
+    background: #ffffff;
+    color: #c0c2c3;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 40rpx;
+  }
+  .choose {
+    position: absolute;
+    top: 800rpx;
+    width: 100%;
+    .headerImg {
+      height: 88rpx;
+      width: 88rpx;
+    }
+    .select {
+      margin: auto;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 654rpx;
+      height: 128rpx;
+      background: #ffffff;
+      border-radius: 16rpx 16rpx 16rpx 16rpx;
+      padding: 20rpx 32rpx;
+      box-sizing: border-box;
+    }
+    .name {
+      margin-right: 160px;
+    }
+  }
+  .isselect {
+    border: 2rpx solid #4c7af3;
+    .huan {
+      background: #4c7af3;
+      color: white;
+    }
+  }
+  .btnbox {
+    position: absolute;
+    bottom: 170rpx;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    .btn {
+      button {
+        width: 594rpx;
+        height: 96rpx;
+        background: #4c7af3;
+        border-radius: 48rpx 48rpx 48rpx 48rpx;
+        text-align: center;
+        line-height: 96rpx;
+        color: white;
+      }
+
+      text-align: center;
+    }
+  }
+}
+</style>

pages/login2/login.vue

@@ -6,29 +6,37 @@
       class="logobig2"
     />
 
-<!--    <div class="logintype" v-if="loginStatus">-->
-<!--      <div-->
-<!--        @click="changeLoginType('企业用户')"-->
-<!--        :class="loginType == '企业用户' ? 'checkbox ischecked' : 'checkbox'"-->
-<!--      >-->
-<!--        企业用户-->
-<!--      </div>-->
-<!--      <div-->
-<!--        @click="changeLoginType('管理用户')"-->
-<!--        :class="loginType == '管理用户' ? 'checkbox ischecked' : 'checkbox'"-->
-<!--      >-->
-<!--        管理用户-->
-<!--      </div>-->
-<!--    </div>-->
+    <!--    <div class="logintype" v-if="loginStatus">-->
+    <!--      <div-->
+    <!--        @click="changeLoginType('企业用户')"-->
+    <!--        :class="loginType == '企业用户' ? 'checkbox ischecked' : 'checkbox'"-->
+    <!--      >-->
+    <!--        企业用户-->
+    <!--      </div>-->
+    <!--      <div-->
+    <!--        @click="changeLoginType('管理用户')"-->
+    <!--        :class="loginType == '管理用户' ? 'checkbox ischecked' : 'checkbox'"-->
+    <!--      >-->
+    <!--        管理用户-->
+    <!--      </div>-->
+    <!--    </div>-->
     <div class="loginBody">
       <div class="loginTypeBox">
         <div class="loginTypeItem" @click="changeLoginType('企业用户')">
-          <span class="loginTypeName" :class="loginType === '企业用户' ? 'ischecked' : ''">企业用户</span>
-          <div class="bottomLine" v-show="loginType==='企业用户'"></div>
+          <span
+            class="loginTypeName"
+            :class="loginType === '企业用户' ? 'ischecked' : ''"
+            >企业用户</span
+          >
+          <div class="bottomLine" v-show="loginType === '企业用户'"></div>
         </div>
         <div class="loginTypeItem" @click="changeLoginType('管理用户')">
-          <span class="loginTypeName" :class="loginType === '管理用户' ? 'ischecked' : ''">管理用户</span>
-          <div class="bottomLine" v-show="loginType==='管理用户'"></div>
+          <span
+            class="loginTypeName"
+            :class="loginType === '管理用户' ? 'ischecked' : ''"
+            >管理用户</span
+          >
+          <div class="bottomLine" v-show="loginType === '管理用户'"></div>
         </div>
       </div>
       <div class="loginBox">
@@ -36,7 +44,7 @@
           <img
             src="https://www.idea-co-sf.com/gardenProduct/image/comicon.svg"
             alt=""
-            style="height: 60rpx;left: 32rpx"
+            style="height: 60rpx; left: 32rpx"
           />
           <input
             type="text"
@@ -50,7 +58,7 @@
           <img
             src="https://www.idea-co-sf.com/gardenProduct/image/pswicon.svg"
             alt=""
-            style="height: 60rpx;left: 32rpx"
+            style="height: 60rpx; left: 32rpx"
           />
           <input
             type="password"
@@ -64,7 +72,7 @@
           <img
             src="https://www.idea-co-sf.com/gardenProduct/image/yzmicon.svg"
             alt=""
-            style="height: 60rpx;left: 32rpx"
+            style="height: 60rpx; left: 32rpx"
           />
           <input
             type="text"
@@ -79,24 +87,22 @@
             class="yanzhengImg"
           />
         </div>
-<!--        <div class="pswBox" @click="forgetPsw()">-->
-<!--          <p>忘记密码？</p>-->
-<!--        </div>-->
+        <!--        <div class="pswBox" @click="forgetPsw()">-->
+        <!--          <p>忘记密码？</p>-->
+        <!--        </div>-->
         <div>
-          <button
-            class="loginbtn"
-            @click="loginClick"
-            >提交
-          </button>
+          <button class="loginbtn" @click="loginClick">提交</button>
         </div>
       </div>
       <div class="bottomTips">
         <label class="radio">
-          <radio value="r1" checked="true" color="rgba(3, 101, 249, 1)"/>
-          已阅读并同意<span style="color: rgba(3, 101, 249, 1)">《服务协议条款及隐私政策》</span>
+          <radio value="r1" checked="true" color="rgba(3, 101, 249, 1)" />
+          已阅读并同意<span style="color: rgba(3, 101, 249, 1)"
+            >《服务协议条款及隐私政策》</span
+          >
         </label>
       </div>
-<!--      <van-dialog id="van-toast" />-->
+      <!--      <van-dialog id="van-toast" />-->
     </div>
   </div>
 </template>
@@ -126,7 +132,7 @@ export default {
   },
   onLoad(options) {
     if (options.loginType) {
-      this.loginType = options.loginType
+      this.loginType = options.loginType;
     }
   },
   methods: {
@@ -194,11 +200,11 @@ export default {
         },
       });
     },
-    loginClick(){
-      if(this.loginType==='企业用户'){
-        this.UserLogin()
-      }else{
-        this.login()
+    loginClick() {
+      if (this.loginType === "企业用户") {
+        this.UserLogin();
+      } else {
+        this.login();
       }
     },
     UserLogin() {
@@ -411,32 +417,32 @@ export default {
       display: none;
     }
   }
-  .loginBody{
+  .loginBody {
     background: white;
-    border-radius: 16px  16px  0  0;
+    border-radius: 16px 16px 0 0;
     position: relative;
     top: 336rpx;
     height: 1112rpx;
-    .loginTypeBox{
+    .loginTypeBox {
       display: flex;
       justify-content: space-evenly;
       font-size: 40rpx;
       padding-top: 48rpx;
       color: rgba(86, 93, 106, 1);
     }
-    .loginTypeItem{
+    .loginTypeItem {
       position: relative;
-      .bottomLine{
+      .bottomLine {
         width: 40px;
         height: 6px;
-        background: linear-gradient( 90deg, #0365F9 0%, #85B5FF 100%);
+        background: linear-gradient(90deg, #0365f9 0%, #85b5ff 100%);
         border-radius: 3px 3px 3px 3px;
         position: absolute;
         bottom: 0;
         z-index: 0;
         left: 40rpx;
       }
-      .loginTypeName{
+      .loginTypeName {
         position: relative;
         z-index: 1;
       }

pages/mine/mine.vue

@@ -1,58 +1,39 @@
 <template>
-  <view>
+  <view class="mine">
     <img src="../../static/mine/banner.png" class="banner" />
     <div class="info">
       <div class="headerandwelcome">
         <img src="../../static/mine/head.png" alt="" class="header" />
         <div class="weltxt">
-         <span style="font-size: 48rpx;font-weight: 600">欢迎您！</span>
-         <span style="font-size: 32rpx;margin-top: 5rpx">{{ getUserLocalStorageInfo.username?getUserLocalStorageInfo.username:'游客' }}</span>
-        </div>
-      </div>
-      <div class="cardBox" @tap="toMineMsg">
-        <div class="cardLeft">
-          <span style="color: #FFC97C;font-size: 28rpx">我的消息</span>
-          <span style="color: #FFFFFF;font-size: 40rpx;margin-left: 18rpx">0</span>
-        </div>
-        <img src="./image/rightIcon.png" class="rightIcon">
-      </div>
-      <div class="mineMenuBody">
-        <div v-for="item in menuList" class="mineMenuItem" @tap="toPath(item)">
-          <div class="redDoll" v-show="item.isNew"></div>
-          <img :src="item.img" class="menuImg" />
-          <span class="menuName">{{ item.name }}</span>
+          <span style="font-size: 48rpx; font-weight: 600">欢迎您！</span>
+          <span style="font-size: 32rpx; margin-top: 5rpx">{{
+            getUserLocalStorageInfo.username
+              ? getUserLocalStorageInfo.username
+              : "游客"
+          }}</span>
         </div>
       </div>
+
       <div class="labelpage">
-        <div
-            class="labelpage_row"
-            @click="toMineInfo"
-        >
+        <div class="labelpage_row" @click="toMineInfo">
           <div class="labelpage_text">
             <div class="labelpage_name">企业信息</div>
             <div class="labelpage_value">
               <img
-                  src="../../static/mine/youjiantou.png"
-                  style="width: 44rpx; height: 44rpx"
-                  alt=""
+                src="../../static/mine/youjiantou.png"
+                style="width: 44rpx; height: 44rpx"
+                alt=""
               />
             </div>
-            <div class="border"></div>
           </div>
         </div>
-        <div class="labelpage_row"
-             style="margin-top: 48rpx">
+        <div class="labelpage_row">
           <div class="labelpage_text">
             <div class="labelpage_name">当前版本号</div>
             <div class="labelpage_value">v1.0.1</div>
-            <div class="border"></div>
           </div>
         </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="editPassWord()"
-        >
+        <div class="labelpage_row" @click="editPassWord()">
           <div class="labelpage_text">
             <div class="labelpage_name">密码修改</div>
             <div class="labelpage_value">
@@ -62,14 +43,9 @@
                 alt=""
               />
             </div>
-            <div class="border"></div>
           </div>
         </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="changeUserType"
-        >
+        <div class="labelpage_row" @click="changeUserType">
           <div class="labelpage_text">
             <div class="labelpage_name">切换账号</div>
             <div class="labelpage_value">
@@ -79,14 +55,9 @@
                 alt=""
               />
             </div>
-            <div class="border"></div>
           </div>
         </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="outLogin()"
-        >
+        <div class="labelpage_row" @click="outLogin()">
           <div class="labelpage_text">
             <div class="labelpage_name">退出账号</div>
             <div class="labelpage_value">
@@ -101,50 +72,109 @@
       </div>
     </div>
     <van-popup
-        :show="show"
-        position="bottom"
-        custom-style="height: 40%;"
+      :show="show"
+      @close="onClose"
+      closeable
+      position="bottom"
+      custom-style="height:720rpx;"
     >
-      <van-picker :columns="columns" @cancel="onCancel" @confirm="onConfirm" show-toolbar/>
+      <div class="userType">用户类型</div>
+      <div class="choose">
+        <div
+          @click="chooseIdentity(1)"
+          :class="isSelect === 1 ? 'select isselect' : 'select'"
+        >
+          <div>
+            <img
+              class="headerImg"
+              src="./chooseIdentityImg/header1.png"
+              alt=""
+            />
+          </div>
+          <div class="name">企业上报</div>
+          <div class="huan"><van-icon name="success" /></div>
+        </div>
+        <div
+          @click="chooseIdentity(2)"
+          :class="isSelect === 2 ? 'select isselect' : 'select'"
+          class="select"
+          style="margin-top: 20px"
+        >
+          <div>
+            <img
+              class="headerImg"
+              src="./chooseIdentityImg/header2.png"
+              alt=""
+            />
+          </div>
+          <div class="name">属地核查</div>
+          <div class="huan"><van-icon name="success" /></div>
+        </div>
+        <div
+          @click="chooseIdentity(3)"
+          :class="isSelect === 3 ? 'select isselect' : 'select'"
+          class="select"
+          style="margin-top: 20px"
+        >
+          <div>
+            <img
+              class="headerImg"
+              src="./chooseIdentityImg/header3.png"
+              alt=""
+            />
+          </div>
+          <div class="name">部门检查</div>
+          <div class="huan"><van-icon name="success" /></div>
+        </div>
+      </div>
+      <div class="btnbox">
+        <van-button class="btn" @click="goLogin">确认</van-button>
+      </div>
+      <!-- <van-picker :columns="columns" @cancel="onCancel" @confirm="onConfirm" show-toolbar/> -->
     </van-popup>
   </view>
 </template>
 <script>
-import { getUserInfo, getUserLocalStorageInfo,switchCommonUser } from "@/js_sdk/http";
+import {
+  getUserInfo,
+  getUserLocalStorageInfo,
+  switchCommonUser,
+} from "@/js_sdk/http";
 export default {
   data() {
     return {
       userInfo: {},
       getUserLocalStorageInfo: getUserLocalStorageInfo(),
       userType: true,
-      show:false,
-      columns: ['普通用户', '企业用户', '管理用户'],
+      show: false,
+      isSelect: 1,
+      columns: ["普通用户", "企业用户", "管理用户"],
       menuList: [
         {
-          name: '我的收藏',
-          img: require('./image/sc.png'),
+          name: "我的收藏",
+          img: require("./image/sc.png"),
           isNew: false,
-          path: '/myCollection'
+          path: "/myCollection",
         },
         {
-          name: '我的活动',
-          img: require('./image/hd.png'),
+          name: "我的活动",
+          img: require("./image/hd.png"),
           isNew: false,
-          path: '/myActivities'
+          path: "/myActivities",
         },
         {
-          name: '我的订单',
-          img: require('./image/dd.png'),
+          name: "我的订单",
+          img: require("./image/dd.png"),
           isNew: false,
-          path: '/myOrder'
+          path: "/myOrder",
         },
         {
-          name: '我的反馈',
-          img: require('./image/fk.png'),
+          name: "我的反馈",
+          img: require("./image/fk.png"),
           isNew: false,
-          path: '/feedback'
-        }
-      ]
+          path: "/feedback",
+        },
+      ],
     };
   },
   onLoad() {
@@ -153,54 +183,64 @@ export default {
   },
 
   methods: {
+    onClose() {
+      console.log(123);
+      this.show = false;
+    },
+    chooseIdentity(e) {
+      this.isSelect = e;
+    },
     toPath(item) {
       if (item.path) {
         uni.navigateTo({
-          url:'/pages/subPackages/minePages' + item.path
-        })
+          url: "/pages/subPackages/minePages" + item.path,
+        });
       }
     },
-    toMineInfo(){
+    toMineInfo() {
       uni.navigateTo({
-        url:'/pages/subPackages/minePages/mineInfo'
-      })
+        url: "/pages/subPackages/minePages/mineInfo",
+      });
     },
-    toMineMsg(){
+    toMineMsg() {
       uni.navigateTo({
-        url:'/pages/subPackages/minePages/mineMessage'
-      })
+        url: "/pages/subPackages/minePages/mineMessage",
+      });
     },
-    onCancel(){
-      this.show = false
+    onCancel() {
+      this.show = false;
     },
-    onConfirm(e){
-      if (e.detail.value !== '普通用户'){
+    onConfirm(e) {
+      if (e.detail.value !== "普通用户") {
         uni.navigateTo({
           url: "/pages/login2/login?loginType=" + e.detail.value,
           success: function (e) {
             // uni.$emit('userType', 'OK')
           },
         });
-      }else {
+      } else {
         let data = {
           id: this.getUserLocalStorageInfo.id,
         };
         switchCommonUser(data).then((e) => {
-          if (e.errno === 0){
-            delete this.getUserLocalStorageInfo.userId
-            this.getUserLocalStorageInfo.userType = '3'
-            this.getUserLocalStorageInfo.username = ''
-            console.log(this.getUserLocalStorageInfo)
-            wx.setStorageSync("USERINFO", JSON.stringify(this.getUserLocalStorageInfo));
+          if (e.errno === 0) {
+            delete this.getUserLocalStorageInfo.userId;
+            this.getUserLocalStorageInfo.userType = "3";
+            this.getUserLocalStorageInfo.username = "";
+            console.log(this.getUserLocalStorageInfo);
+            wx.setStorageSync(
+              "USERINFO",
+              JSON.stringify(this.getUserLocalStorageInfo)
+            );
           }
           // console.log(e.data.user);
           // uni.clearStorageSync();
         });
       }
-      this.show = false
+      this.show = false;
     },
     changeUserType() {
-      this.show = true
+      this.show = true;
       // uni.navigateTo({
       //   url: "/pages/login2/login",
       //   success: function (e) {
@@ -233,6 +273,77 @@ export default {
 };
 </script>
 <style lang="scss">
+.mine {
+  .userType {
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #333333;
+    margin-top: 24rpx;
+    margin-left: 36rpx;
+    margin-bottom: 48rpx;
+  }
+  .btnbox {
+    margin-top: 30rpx;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    .btn {
+      button {
+        width: 594rpx;
+        height: 96rpx;
+        background: #4c7af3;
+        border-radius: 48rpx 48rpx 48rpx 48rpx;
+        text-align: center;
+        line-height: 96rpx;
+        color: white;
+      }
+
+      text-align: center;
+    }
+  }
+  .huan {
+    width: 40rpx;
+    height: 40rpx;
+    border: 4rpx solid #c0c2c3;
+    background: #ffffff;
+    color: #c0c2c3;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 40rpx;
+  }
+  .choose {
+    // position: absolute;
+    // top: 800rpx;
+
+    width: 100%;
+    .headerImg {
+      height: 88rpx;
+      width: 88rpx;
+    }
+    .select {
+      margin: auto;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 654rpx;
+      height: 128rpx;
+      background: #f5f6f8;
+      border-radius: 16rpx 16rpx 16rpx 16rpx;
+      padding: 20rpx 32rpx;
+      box-sizing: border-box;
+    }
+    .name {
+      margin-right: 160px;
+    }
+  }
+  .isselect {
+    border: 2rpx solid #4c7af3;
+    .huan {
+      background: #4c7af3;
+      color: white;
+    }
+  }
+}
 .banner {
   width: 100%;
   height: 100%;
@@ -240,15 +351,17 @@ export default {
   z-index: 1;
 }
 .headerandwelcome {
-  margin-bottom: 60rpx;
+  margin-bottom: 52rpx;
   height: 120rpx;
   width: 100%;
+  box-sizing: border-box;
   padding-left: 60rpx;
 }
 .info {
   position: absolute;
   //width: calc(100% - 64rpx);
-  margin: 60rpx 0 0 0;
+  margin: auto;
+  margin-top: 60rpx;
   z-index: 2;
 }
 .header {
@@ -268,7 +381,7 @@ export default {
   float: left;
   color: black;
 }
-.cardBox{
+.cardBox {
   width: 686rpx;
   height: 100rpx;
   box-sizing: border-box;
@@ -277,13 +390,13 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding:0 32rpx;
+  padding: 0 32rpx;
   margin-left: 32rpx;
-  .rightIcon{
+  .rightIcon {
     width: 36rpx;
     height: 36rpx;
   }
-  .cardLeft{
+  .cardLeft {
     display: flex;
     align-items: center;
   }
@@ -299,13 +412,14 @@ export default {
 .labelpage_row {
   display: flex;
   align-items: center;
-  height: 83rpx;
+  height: 112rpx;
+  width: 100%;
   width: 100%;
+  border-bottom: 2rpx solid #e6e6e6;
   img {
     height: 44rpx;
     width: 44rpx;
     float: left;
-    margin-right: 12rpx;
   }
   .labelpage_text {
     width: 100%;
@@ -371,6 +485,5 @@ export default {
     }
   }
 }
-
 </style>