Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master

src/pages/index/index.vue

@@ -22,8 +22,8 @@
           </view>
         </view>
         <view class="saleInfo">
-          <view class="info1"> <van-icon name="contact" />服务人员</view>
-          <view class="info2 one_line"> 销售{{ userinfo.EnterPhone2 }}</view>
+          <view class="info1"> <van-icon name="contact" size="23rpx" style="margin-right:10rpx;" />服务人员</view>
+          <view class="info2 one_line"> <text style="margin-right:10rpx;">销售</text>{{ userinfo.EnterPhone2 }}</view>
         </view>
       </view>
       <view class="baseInfo flex flex_wrap">
@@ -144,30 +144,30 @@ export default {
       indexData: {},
       baseInfo: [
         {
-          name: "校区",
+          name: "学区",
           desc: "",
-          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon1.png",
+          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon2.png",
           bgcolor: "#CCEDFE",
           jumpUrl: "/pages/exam/answerSheet",
         },
         {
           name: "课程",
           desc: "N1~N3",
-          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon2.png",
+          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon1.png",
           bgcolor: "#DDE6FF",
           jumpUrl: "/pages/course/course",
         },
         {
           name: "进度",
           desc: "上到哪里了",
-          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon3.png",
+          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon4.png",
           bgcolor: "#FFEFE4",
           jumpUrl: "/pages/progress/progress",
         },
         {
           name: "剩余课时",
           desc: "100",
-          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon4.png",
+          img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon3.png",
           bgcolor: "#FFEAFE",
           jumpUrl: "/pages/surplusTime/surplusTime",
         },
@@ -299,7 +299,7 @@ export default {
 }
 
 .saleInfo {
-  width: 190rpx;
+  width: 200rpx;
   height: 66rpx;
   background-color: #00acf9;
   border-radius: 33rpx 0rpx 0rpx 33rpx;
@@ -346,6 +346,7 @@ export default {
   font-family: PingFang SC;
   font-weight: bold;
   color: #0f1b35;
+  margin:-7rpx 0 3rpx 0;
 }
 
 .baseInfo_desc {