feat: 需求变更

src/components/experience-pop/index.vue

@@ -6,7 +6,6 @@
     width="650rpx"
     :mask-close-able="flase"
     close-icon-color="#FFFFFF"
-    height="86%"
   >
     <view class="pop-view">
       <image mode="widthFix" class="image-view" :src="backgroundImage"></image>

src/components/notice-bar/index.vue

@@ -10,7 +10,7 @@
       <u-notice-bar
         mode="vertical"
         type="none"
-        font-size="26"
+        font-size="24"
         :list="[noticeText]"
         color="#FFFFFF"
         :volume-icon="false"
@@ -175,32 +175,32 @@ export default {
 <style lang="scss" scoped>
 .top {
   width: 100%;
-  margin-left: 15rpx;
   display: flex;
   align-items: center;
   .notice-image {
     width: 48rpx;
     height: 48rpx;
   }
-  .avatar {
-    .avatar-list {
-      margin-left: -15rpx;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      image {
-        width: 44rpx;
-        height: 44rpx;
-        border: 2rpx solid #ccc;
-        background: #fff;
-        border-radius: 50%;
-        margin-right: 1px;
-      }
-    }
-  }
+  // .avatar {
+  //   .avatar-list {
+  //     margin-left: -15rpx;
+  //     display: flex;
+  //     justify-content: flex-start;
+  //     align-items: center;
+  //     image {
+  //       width: 44rpx;
+  //       height: 44rpx;
+  //       border: 2rpx solid #ccc;
+  //       background: #fff;
+  //       border-radius: 50%;
+  //       margin-right: 1px;
+  //     }
+  //   }
+  // }
   .notice {
     flex: 1;
     width: 100%;
+    margin-left: -6rpx;
   }
 }
 </style>

src/components/question-bank-cell/index.vue

@@ -9,7 +9,9 @@
         共
         <text class="label-blue">{{ info.number || 0 }}</text
         >道精编试题，通过率
-        <text class="label-blue">{{ info.pass || $u.random(95, 99) }}%</text>
+        <text class="label-blue">{{
+          info.version || info.key || $u.random(95, 99) + '%'
+        }}</text>
       </view>
     </view>
     <u-button

src/components/subject-statistics/index.vue

@@ -178,7 +178,7 @@ export default {
         }
         .line-view {
           width: 2rpx;
-          background-color: #ffffff;
+          background-color: #7993ff;
           height: 70rpx;
         }
       }

src/pages/index/index.vue

@@ -92,10 +92,10 @@
       <view class="bottom-view">
         <image
           class="bottom-image"
-          :src="mokaodashiImage"
+          :src="slognImage"
           @click="handleClickBlank"
         ></image>
-        <view>想要轻松考过，首选模考大师</view>
+        <!-- <view>想要轻松考过，首选模考大师</view> -->
       </view>
     </view>
     <view class="experience-pop-view">
@@ -154,7 +154,7 @@ export default {
       return process.uniEnv.qn_base_url + 'quanbutiku.png'
     },
     slognImage() {
-      return process.uniEnv.qn_base_url + 'slogn.png'
+      return process.uniEnv.qn_base_url + 'slogn-h.png'
     },
     marks() {
       return [
@@ -184,7 +184,7 @@ export default {
           this.data.questionWarehouse.echoMap.provinceId &&
           this.data.questionWarehouse.echoMap.provinceId.fullName,
         experience: this.canExperience,
-        pass: this.pass + '%',
+        pass: this.data.questionWarehouse.version,
         days: this.detail.totalDayCount || 0,
         today: this.detail.todayCount || 0,
         total: this.detail.totalCount || 0,
@@ -276,7 +276,6 @@ export default {
         this.selected = info
         page.info = null
         this.isAdd = this.selected.isAdd
-        this.pass = this.$u.random(95, 99)
         this.queryMyQuestionWarehouseDetail(this.selected.id)
       } else {
         this.queryMyQuestionWarehouseDetail(this.info.id || 0)
@@ -365,9 +364,6 @@ export default {
       var str = this.info.id ? 'selectedList' : 'selectCategory'
       this.$u.route({
         url: 'pages/learn/' + str,
-        params: {
-          pass: this.pass,
-        },
       })
     },
     // 每日一练
@@ -666,8 +662,8 @@ export default {
     .detail-view {
       display: flex;
       align-items: flex-start;
-      margin-top: 14rpx;
-      margin-bottom: 36rpx;
+      margin-top: 22rpx;
+      margin-bottom: 40rpx;
       .detail-item {
         color: #9ea5bb;
         font-size: 28rpx;
@@ -694,7 +690,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      margin: 30rpx 0 160rpx 0;
+      margin: 30rpx 0 140rpx 0;
       .sub-content-item {
         color: #5a6073;
         font-size: 26rpx;
@@ -759,9 +755,9 @@ export default {
       font-size: 26rpx;
       color: #adbdd4;
       .bottom-image {
-        width: 56rpx;
-        height: 56rpx;
-        margin-right: 14rpx;
+        width: 520rpx;
+        height: 28rpx;
+        // margin-right: 14rpx;
       }
     }
   }

src/pages/learn/boundQuestions.vue

@@ -61,7 +61,7 @@ export default {
 
   computed: {
     kapianImage() {
-      return process.uniEnv.qn_base_url + 'kapian.png'
+      return process.uniEnv.qn_base_url + 'kapianlizi.png'
     },
     customStyle() {
       return {

src/pages/learn/manualBinding.vue

@@ -103,7 +103,7 @@ export default {
       }
     },
     kapianImage() {
-      return process.uniEnv.qn_base_url + 'kapian.png'
+      return process.uniEnv.qn_base_url + 'kapianlizi.png'
     },
     placeplaceholderStyle() {
       return 'color:#9EA5BB;font-size:28rpx'

src/pages/learn/record.vue

@@ -260,7 +260,6 @@ export default {
           keys.sort()
           for (let index = 0; index < keys.length; index++) {
             const ele = keys[index]
-            console.log('ele', ele)
             this.chartData.categories.push(ele.replace(/\-/g, '.'))
             this.chartData.series[0].data.push(res[ele].totalCount || '')
             this.chartData.series[1].data.push(res[ele].rightCount || '')

src/pages/learn/selectCategory.vue

@@ -18,7 +18,7 @@
         <view
           v-for="(list, index) in items"
           :key="index"
-          class="label-list"
+          class="label-list-content"
           :style="{
             'min-height':
               key == secondKey && index + 1 == list.length
@@ -190,13 +190,22 @@ export default {
   background-size: 100% 520rpx;
   background-repeat: no-repeat;
   .select-category-content {
-    padding: 0 0 24rpx 24rpx;
+    ::-webkit-scrollbar {
+      width: 0;
+      height: 0;
+      color: transparent;
+      display: none;
+    }
+    padding-bottom: 24rpx;
     height: 100%;
     overflow: auto;
     position: relative;
 
     .label-list {
       margin-bottom: 20rpx;
+      .label-list-content {
+        margin: 0 24rpx;
+      }
       .label-title {
         font-size: 32rpx;
         font-weight: bold;
@@ -208,8 +217,10 @@ export default {
       }
 
       .label-content {
+        flex-wrap: wrap;
+        display: flex;
+        justify-content: space-between;
         .label-item {
-          padding-right: 22rpx;
           padding-bottom: 24rpx;
           flex-shrink: 0;
           display: inline-block;

src/pages/learn/selectedList.vue

@@ -51,7 +51,6 @@ export default {
     return {
       list: [], // 已选题库列表
       loading: true,
-      currentPass: null,
     }
   },
   computed: {
@@ -69,9 +68,6 @@ export default {
     },
   },
   onLoad(e) {
-    if (e && e.pass) {
-      this.currentPass = e.pass
-    }
     this.loadList() // 获取已选题库列表
   },
   methods: {
@@ -99,9 +95,6 @@ export default {
           for (var item of res) {
             if (item && item.echoMap && item.echoMap.questionWarehouseId) {
               item.echoMap.questionWarehouseId.number = item.number
-              if (item.questionWarehouseId == this.questionWarehouseId) {
-                item.echoMap.questionWarehouseId.pass = this.currentPass
-              }
             }
           }
           this.list = res