Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0

src/components/daily-pop/index.vue

@@ -5,7 +5,7 @@
     v-model="visible"
     safe-area-inset-bottom
     mode="center"
-    width="654rpx"
+    width="622rpx"
     :mask-close-able="false"
   >
     <view class="pop-view">

src/components/notice-bar/index.vue

@@ -137,7 +137,7 @@ export default {
         this.defaultUrl + (a3 > 9 ? 'a' : 'a0') + String(a3) + '.jpeg',
       ]
 
-      this.list = [this.noticeText]
+      // this.list = [this.noticeText]
       setInterval(() => {
         this.produceTime += this.duration
       }, this.duration)
@@ -164,7 +164,7 @@ export default {
       }
       this.avatars = [...array, this.defaultUrl + str]
 
-      this.list = [this.noticeText]
+      // this.list = [this.noticeText]
     },
   },
 }

src/pages/index/index.vue

@@ -68,7 +68,7 @@
           <view class="right-view">
             <view>{{ item.name }}</view>
             <view class="label-view"
-              ><text class="left-label" v-if="item.leftLabel">{{
+              ><text class="left-label" v-if="info.cardId">{{
                 item.leftLabel
               }}</text
               ><text>{{ item.label }}</text></view
@@ -381,9 +381,10 @@ export default {
           })
         }
       } else {
-        this.$u.route({
-          url: 'pages/learn/selectCategory',
-        })
+        this.show = true
+        // this.$u.route({
+        //   url: 'pages/learn/selectCategory',
+        // })
       }
     },
     handleClickLeftTop() {
@@ -392,10 +393,10 @@ export default {
       })
     },
     handleClickToast(type) {
-      var str = type == 'select' ? 'addExam' : 'detail'
+      // var str = type == 'select' ? 'selectCategory' : 'detail'
 
       this.$u.route({
-        url: 'pages/learn/' + str,
+        url: 'pages/learn/selectCategory',
         params: {
           // relationId: this.relationId,
           id: this.info.id,
@@ -463,9 +464,10 @@ export default {
         })
       } else {
         // 未选题库
-        this.$u.route({
-          url: 'pages/learn/selectCategory',
-        })
+        this.show = true
+        // this.$u.route({
+        //   url: 'pages/learn/selectCategory',
+        // })
       }
     },
     handleClick(path, params) {

src/pages/learn/examSetting.vue

@@ -33,7 +33,7 @@
     </view>
     <view class="exam-area">
       <view class="area-title-view">
-        <text class="rea-title-view">包括区域</text>
+        <text class="rea-title-view">报考区域</text>
         <text>请确认与所在考试省份一致</text>
       </view>
       <picker
@@ -91,9 +91,14 @@
       @submit="handleClickSubmit"
     >
       <view v-for="(value, key) in selected" :key="key" class="pop-content">
-        <view :class="['pop-content-text', { last: key == thirdKey }]">{{
-          value.label
-        }}</view>
+        <view :class="['pop-content-text', { last: key == thirdKey }]"
+          >{{ value.label
+          }}<text v-if="key != secondKey"
+            >({{
+              key == firstKey ? selectedTypeText : currentProvince.label
+            }})</text
+          ></view
+        >
         <u-icon v-if="key != thirdKey" name="arrow-downward"></u-icon>
       </view>
     </PopView>
@@ -162,16 +167,20 @@ export default {
     buttonDisabled() {
       return !(this.currentProvince.label && this.selectedTypeId)
     },
-    selectedType() {
-      for (var item of this.types) {
-        if (item.selected == true) {
-          return true
-        }
-      }
-      return false
+    typeTexts() {
+      return { '1': '初训', '2': '复训' }
+    },
+    selectedTypeText() {
+      return this.typeTexts[this.selectedTypeId]
     },
     thirdKey() {
-      return key3 || key2 || key1
+      return key3
+    },
+    firstKey() {
+      return key1
+    },
+    secondKey() {
+      return key2
     },
     selectedTypeId() {
       for (var item of this.types) {