Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/learn/index.vue

@@ -9,13 +9,26 @@
                 :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
         </view>
         <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
-            style="height: 755rpx;">
+            style="height: 755rpx;padding-top: 30rpx;">
             <swiper-item class="swiper-item">
                 <scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom">
-                    <view class="standard" @click="goToPrint">
-                        <text>充电桩交付规范</text>
-                        <text>></text>
+                    <view class="currency-class" :style="{'background-image':'url(/static/photo/jianbian@3x.png)'}">
+                        <view class="class1" @click=ccc(courselist[0].id)>
+                            <image class="img" :src="rule.pic" mode=""></image>
+                            <view class="right u-margin-left-30 u-padding-top-10 u-padding-bottom-14 width-360">
+                                <view class="u-font-32 font-bold">
+                                    充电桩交付规范
+                                </view>
+                                <view class="u-font-24">
+                                    请点击学习
+                                </view>
+                            </view>
+                            <view class="line-percent">
+                                <text class="font-default-color">去查看</text>
+                            </view>
+                        </view>
                     </view>
+                    
                 </scroll-view>
             </swiper-item>
             <swiper-item class="swiper-item">
@@ -199,6 +212,9 @@
                     start: 0,
                 },
                 list: [],
+                rule: {
+                    pic: process.uniEnv.qn_base_url + "guifan1@3x.png"
+                },
                 courselist: [{
                         title: '服务规范',
                         desc: '为用户提供更好服务，自己赚更多钱',
@@ -473,14 +489,12 @@
                                 console.log(that.exam);
                                 if (res.data.examStatus == 2) {
                                     console.log("examStatus " + i + " 2");
-                                    that.applyExam();
                                     return;
                                 }
                                 if (res.data.examStatus == 1) {
                                     console.log("examStatus " + i + " 1");
                                     that.examList[i].isComplete = true;
                                     that.examScore = res.data.examScore;
-                                    that.postResult();
                                     return;
                                 }
                                 if (res.data.examStatus == 0) {
@@ -532,12 +546,17 @@
 
     /* //交付规范 */
     .standard {
-        width: 656rpx;
+        width: 690rpx;
+        height: 180rpx;
         display: flex;
         justify-content: space-between;
-        border-bottom: 1rpx solid #82848a;
-        padding: 0 34rpx;
-        margin: 72rpx auto;
+        /* border-bottom: 1rpx solid #82848a; */
+        /* padding: 0 34rpx; */
+        /* margin: 72rpx auto; */
+        border-radius: 12rpx;
+        padding: 30rpx;
+        margin-top: 30rpx;
+        background-color: #FFFFFF;
     }
 
     /* //培训通知 */
@@ -549,18 +568,22 @@
         overflow: hidden;
         background-color: #ffffff;
         border-radius: 12rpx;
+        padding: 30rpx;
     }
 
     .n-head {
         text-align: left;
-       /* margin: 30rpx 30rpx 0 30rpx;
-     */   margin-left: 30rpx;
+       
     }
 
     .news {
         height: 168rpx;
         overflow: hidden;
-        /* margin: 30rpx 30rpx 0 30rpx; */
+        margin-top: 30rpx;
+        /* margin-top: 30rpx;
+        margin-left: 30rpx;
+        margin-right: 30rpx;
+        margin-bottom: 0; */
     }
 
     /* //在线学习 */
@@ -665,4 +688,47 @@
     .content-line {
         margin-top: 30rpx;
     }
+    
+    .standard {
+        
+    }
+    
+    .standard-img {
+        width: 160rpx;
+        height: 120rpx;
+    }
+    
+   .standard-body {
+        height: 120rpx;
+        display: flex;
+    }
+    
+    .standard-body-title {
+        font-size: 32rpx;
+        font-weight: bold;
+        
+    }
+    
+    .width-360 {
+        width: 360rpx;
+    }
+    
+    .rule-back {
+        background-image: process.uniEnv.qn_base_url + "banner-xx@3x.png";
+    }
+    
+    /* <view class="standard" @click="goToPrint">
+        <!-- <text>充电桩交付规范</text>
+        <text>></text> -->
+        <view class="standard-img"></view>
+        <view class="standard-body">
+            <view class="standard-body-title">
+                充电桩交付规范
+            </view>
+            <view class="standard-body-title">
+                请点击学习
+            </view>
+        </view>
+        <view cl ass="standard-go-look-look">去查看</view>*/
+    
 </style>