图片地址修改2

src/components/m-nav-bar/m-nav-bar.vue

@@ -13,7 +13,7 @@
     ></image>
     <text
       :style="{
-        color: theme,
+        color: theme == 'white'?'#fff':'#000',
       }"
       class="title"
       >{{ title }}</text

src/otherPages/collection/index.vue

@@ -6,14 +6,14 @@
     <view class="choose">
       <view
         v-if="type == 'wrong'"
-        class="choose-img"
+        class="choose-img choose-wrong"
         style="overflow: hidden; border-radius: 40rpx"
       >
-        <image
+        <!-- <image
           style="width: 100%"
           mode="widthFix"
           src="https://ndata.zzxcx.net/ctjk/mp-wx/collection/wrongBg3.png"
-        ></image>
+        ></image> -->
         <view class="choose-text1"> 做错题 </view>
         <view
           @click="
@@ -62,14 +62,14 @@
       </view>
       <view
         v-if="type == 'collect'"
-        class="choose-img"
+        class="choose-img choose-collection"
         style="overflow: hidden; border-radius: 40rpx"
       >
-        <image
+        <!-- <image
           style="width: 100%"
           mode="widthFix"
           src="https://ndata.zzxcx.net/ctjk/mp-wx/collection/collectionBg3.png"
-        ></image>
+        ></image> -->
         <view
           @click="
             () => {
@@ -200,7 +200,8 @@ export default {
       goArrow: "https://ndata.zzxcx.net/ctjk/mp-wx/collection/right_arrow.png",
       collectionBg:
         "https://ndata.zzxcx.net/ctjk/mp-wx/collection/collectionBg3.png",
-      collectionHeader: "https://ndata.zzxcx.net/ctjk/mp-wx/carVideo/banner.png",
+      collectionHeader:
+        "https://ndata.zzxcx.net/ctjk/mp-wx/carVideo/banner.png",
       query: {
         questionIds: "",
       },
@@ -578,6 +579,7 @@ export default {
     background-size: 100% 100%;
     background-repeat: no-repeat;
     background-attachment: fixed;
+
     .bg {
       width: 690rpx;
     }
@@ -645,6 +647,13 @@ export default {
       width: 100%;
     }
   }
+  .choose-wrong {
+    background: linear-gradient(315deg, #cdf2db 0%, #6be69b 100%);
+  }
+  .choose-collection {
+   
+background: linear-gradient(135deg, #59B6FC 0%, #D5EDFF 100%);
+  }
 }
 .collectionHeader {
   width: 100%;

src/otherPages/courseCatalog/components/courseDesc.vue

@@ -8,6 +8,11 @@
       ></image> -->
       <!-- <view class="intro-title"> 课程介绍 </view> -->
       <view class="intro-desc">
+        <image
+          class="intro-desc-title1"
+          mode="widthFix"
+          src="https://ndata.zzxcx.net/jklsj/xcx/courseCatalog/kecheng@2x.png"
+        ></image>
         <text>
           所有科三考场路线，有资深教练顾问团，结合当地考场科三考试规则，并有诸多当地资深教练共同协助拍摄制作的真实考试路线，视频清晰，各个项目点有文字和语音讲解仔细。让学员能在考前清楚了解考试路线项目点位，能消除学员考前很多疑虑和焦急的心态，是提高通过率，顺利过关！</text
         >
@@ -19,12 +24,21 @@
         mode="widthFx"
         src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/descBg.png"
       ></image> -->
-      <view class="intro-title"> 常见问题 </view>
+
       <view class="intro-question">
-        <view class="intro-question-title"
-          >
+        <image
+          class="intro-question-title1"
+          mode="widthFix"
+          src="https://ndata.zzxcx.net/jklsj/xcx/courseCatalog/changjian.png"
+        ></image>
+        <view class="intro-question-title2">
           <!-- <image src="" class=""></image> -->
-          视频线路和考试线路完全一样吗？</view>
+          <image
+            class="intro-question-wen"
+            src="https://ndata.zzxcx.net/jklsj/xcx/courseCatalog/wen.png"
+          ></image>
+          <text>视频线路和考试线路完全一样吗？</text>
+        </view>
         <view class="intro-question-answer"
           >模拟真实考场拍摄，考试内容与实际考试一致，请放心观看。因考试线路存在多条，请确认好考场线路。
         </view>
@@ -36,9 +50,27 @@
             margin-top: 30rpx;
           "
         ></view>
-        <view class="intro-question-title">考场视频有效期是多久？</view>
-        <view class="intro-question-answer"
-          >本产品有效期为自购买之日起6个月内有效，在有效期内，可反复观看。
+        <view class="intro-question-title2"
+          ><image
+            class="intro-question-wen"
+            src="https://ndata.zzxcx.net/jklsj/xcx/courseCatalog/wen.png"
+          ></image
+          ><text>考场视频有效期是多久？</text></view
+        >
+        <view class="intro-question-answer">
+         <text
+            >本产品有效期为自购买之日起6个月内有效，在有效期内，可反复观看。</text
+          >
+        </view>
+        <view class="intro-question-title2">
+          <image
+            class="intro-question-wen"
+            src="https://ndata.zzxcx.net/jklsj/xcx/courseCatalog/wen.png"
+          ></image
+          ><text>购买后可退款吗？</text></view
+        >
+        <view class="intro-question-answer">
+          <text>虚拟产品，不支持退款哦。 (购买前请仔细咨询清楚考场路线)。</text>
         </view>
       </view>
     </view>
@@ -80,10 +112,15 @@ export default {};
     .intro-desc {
       position: absolute;
       width: 100%;
-      top: 120rpx;
+      top: 40rpx;
       padding: 0 30rpx;
       left: 10rpx;
       color: #5c6066;
+      .intro-desc-title1 {
+        width: 178rpx;
+        display: block;
+        margin-bottom: 26rpx;
+      }
     }
   }
   .problem {
@@ -108,12 +145,16 @@ export default {};
     }
     .intro-question {
       position: absolute;
-      top: 70rpx;
+      top: 40rpx;
       left: 10rpx;
       padding: 0 30rpx;
       color: #5c6066;
     }
-    .intro-question-title {
+    .intro-question-title1 {
+      width: 178rpx;
+      display: block;
+    }
+    .intro-question-title2 {
       font-size: 34rpx;
       color: #0c1c12;
       padding-top: 30rpx;
@@ -121,6 +162,9 @@ export default {};
     .intro-question-wen {
       width: 45rpx;
       height: 45rpx;
+      display: inline-block;
+      margin-right: 14rpx;
+      vertical-align: bottom;
     }
     .intro-question-answer {
       font-size: 30rpx;

src/otherPages/courseCatalog/index.vue

@@ -59,6 +59,7 @@
       class="content"
     >
       <view id="courseCatalog-0" class="">
+        
         <course-catalog
           :price="query.price"
           :examId="query.examId"

src/otherPages/examRoadVideo/index.vue

@@ -424,7 +424,7 @@ export default {
   .rect {
     width: 100%;
     height: 406rpx;
-    background-image: url("https://ndata.zzxcx.net/ctjk/mp-wx/buyVideo/headerBg.png");
+    background-image: url("https://ndata.zzxcx.net/jklsj/xcx/buyVideo/headerBg.png");
     background-size: 100%;
   }
   .arc {

src/pages.json

@@ -181,7 +181,8 @@
     {
       "path": "pages/user/index",
       "style": {
-        "navigationBarTitleText": "用户信息"
+        "navigationBarTitleText": "用户信息",
+        "navigationStyle": "custom"
       }
     },
     

src/pages/user/index.vue

@@ -1,6 +1,11 @@
 <template>
   <view>
     <scroll-view scroll-y class="bg">
+      <view :style="{
+        height:navBarHeight+'px',
+        width:'100%'
+      }"></view>
+      <m-nav-bar theme="dark" title="用户信息"></m-nav-bar>
       <div class="user">
         <van-cell custom-class="head-cell" is-link label-class="" center>
           <view
@@ -21,9 +26,9 @@
             <image class="user-headImg" v-else :src="unLoginHead"></image>
             <view
               class="flex"
-              style="width: 60%; padding-left: 24rpx; text-align: left"
+              style="width: 60%; padding-left: 24rpx; text-align: left;margin-top:26rpx"
             >
-              <view style="font-size: 38rpx; color: #0a1a33; width: 100%">{{
+              <view style="font-size: 38rpx; color: #0a1a33; width: 100%;font-weight:bold;">{{
                 userInfo.nickName || "新用户"
               }}</view>
               <view style="font-size: 26rpx; color: #8a9099; width: 100%">
@@ -33,6 +38,7 @@
           </view>
         </van-cell>
         <van-cell
+         
           title-class="uni-app-fontsize-paragraph"
           title="三力测试"
           is-link
@@ -61,7 +67,7 @@
           center
         >
         </van-cell>
-         <van-cell
+        <van-cell
           title-class="uni-app-fontsize-paragraph"
           title="每日驾考资讯"
           is-link
@@ -69,7 +75,7 @@
           url="/otherPages/careEveryDay/index"
         >
         </van-cell>
-          <van-cell
+        <van-cell
           title-class="uni-app-fontsize-paragraph"
           title="生成分享二维码"
           is-link
@@ -77,7 +83,7 @@
           url="/otherPages/createReferCode/index"
         >
         </van-cell>
-            <van-cell
+        <van-cell
           title-class="uni-app-fontsize-paragraph"
           title="用户反馈"
           is-link
@@ -159,7 +165,12 @@
           unit-id="adunit-8eb44bbd7e3147d4"
         ></ad>
       </view>
-      <van-popup :z-index="9999" :close-on-click-overlay="true" position="bottom"  :show="userFormShow">
+      <van-popup
+        :z-index="9999"
+        :close-on-click-overlay="true"
+        position="bottom"
+        :show="userFormShow"
+      >
         <view class="userform">
           <view class="userform-close">
             <van-icon
@@ -183,14 +194,12 @@
               placeholder="请输入用户名"
             />
             <van-field
-            
               :value="userInfo.phone"
               clearable
               label="手机号"
               placeholder="请绑定手机号"
               @change="changeUserPhone"
             >
-         
             </van-field>
           </view>
           <view class="userform-bind">
@@ -229,6 +238,11 @@ export default {
     isVip() {
       return this.$store.getters.isVip;
     },
+    navBarHeight(){
+      let res = wx.getSystemInfoSync()
+      let navBarHeight = res.statusBarHeight
+      return navBarHeight
+    }
   },
   data() {
     return {
@@ -361,11 +375,11 @@ export default {
 }
 
 .list {
-  padding: 0 15rpx;
+  // padding: 0 15rpx;
 }
 
 .user {
-  padding: 0 15rpx;
+  // padding: 0 15rpx;
 
   /* height: 100vh; */
   .group {
@@ -380,8 +394,8 @@ export default {
 }
 
 .user-headImg {
-  width: 90rpx;
-  height: 90rpx;
+  width: 136rpx;
+  height: 136rpx;
   border-radius: 50%;
 }