ss

src/components/map/index.vue

@@ -602,23 +602,31 @@
               if(x !== this.hpLessonList.length){
                 this.swiperLesson.slideTo(x-1)
               }else if(this.$route.query.category_id){
-
               }
               if(this.$route.query.category_id){
-                let dom = document.getElementsByClassName('cid'+this.$route.query.category_id);
-                if(dom.length>0 && dom[0].style.display !== 'none'){
-                  this.scroll_to(dom[0].offsetTop);
-                  let data = null ;
-                  let index = 0;
-                  this.lessonList.forEach(i=>{
-                    i.forEach((x,i)=>{
-                      if(x.id == this.$route.query.category_id){
-                        data = x;
-                        index = i+1
-                      }
-                    })
+                // 从公众号推送消息点击进入
+                if(this.$route.query.hasOwnProperty('course_type')){
+                  let dom = document.getElementsByClassName('cid'+this.$route.query.category_id);
+                  if(dom.length>0 && dom[0].style.display !== 'none'){
+                    this.scroll_to(dom[0].offsetTop);
+                    let data = null ;
+                    let index = 0;
+                    this.lessonList.forEach(i=>{
+                      i.forEach((x,i)=>{
+                        if(x.id == this.$route.query.category_id){
+                          data = x;
+                          index = i+1
+                        }
+                      })
+                    });
+                    this.showDia(data,index)
+                  }
+                }else{
+                  this.$router.replace({
+                    name: "secMap",
+                    query: {
+                    }
                   });
-                  this.showDia(data,index)
                 }
               }else if(this.$route.query.back_id){
                 let dom = document.getElementsByClassName('cid'+this.$route.query.back_id);

src/components/mine/address.vue

@@ -28,7 +28,7 @@
       <div class="head next">
         <i></i>
         下期收货地址
-        <span class="fl-r"><span class="iconfont icon-bianji"></span> 修改 </span>
+        <span class="fl-r" @click="goEdit" ><span class="iconfont icon-bianji"></span> 修改 </span>
       </div>
       <div class="content">
         <div class="top">
@@ -71,7 +71,10 @@ export default {
       getUserAdressApi().then(res => {
         // this.starNum = res.last_value
         this.addressInfo = res;
-      });
+      })
+    },
+    goEdit(){
+      this.$router.push({name:'addressEdit'})
     }
   }
 };

src/components/mine/addressEdit.vue

 <template>
   <div class="address2">
-    <div style="padding: 10px">
+    <div >
+      <!-- <van-cell title="单元格" value="内容" /> -->
       <mt-field label="收货人" v-model="receiveName"></mt-field>
       <mt-field label="手机号" v-model="receiveMobile"></mt-field>
       <mt-cell title="所在地区" :value="addressArea" @click.native="showPicker" is-link></mt-cell>
@@ -15,11 +16,12 @@
 <script>
 import MyAddress from '@/components/address-picker/Address.vue'
 import {saveAddressApi,getUserAdressApi} from "../../service/api";
-import { Toast } from 'vant';
+import { Cell, Toast } from 'vant';
 export default {
   name: "address",
   components: {
-    MyAddress
+    MyAddress,
+    [Cell.name]:Cell
   },
   data() {
     return {
@@ -106,14 +108,16 @@ export default {
       })
     }
   }
-  }
-};
+}
+
 </script>
 
 <style scoped lang="less">
 @import "../../util/public";
 .address2 {
   background: #f5f5f9;
+  .mint-cell{color: #333333;}
+  .mint-cell-value{color: #333333;}
   .head{
     i{display: inline-block;border-radius: 50%; width: 11 * @toVw;height: 11 * @toVw; }
     padding: 13 * @toVw;
@@ -177,7 +181,6 @@ export default {
     font-size: 12 * @toVw;
     line-height: 23 * @toVw;
   }
-  
 }
 @media screen and (orientation: landscape) {
 }

src/components/subAccount/index.vue

@@ -213,7 +213,7 @@ export default {
   }
   .warntip{
     .title{
-      font-weight: 600;
+      font-weight: bold;
       font-size: 14* @toVw;
     }
     margin-top: 20* @toVw;
@@ -225,6 +225,7 @@ export default {
   .btnBox{
     text-align: center;
     margin-top: 58* @toVw;
+    font-weight: 700;
     .van-button--info{width: 132* @toVw;}
   }
   .info{

src/router/index.js

@@ -39,6 +39,15 @@ const router =new Router({
         title:'唱唱启蒙'
       }
     },
+    {
+      path: '/addressEdit',
+      name: 'addressEdit',
+      component: e=>require(['@/components/mine/addressEdit'],e),//
+      meta:{
+        deep:0,
+        noNew:true,
+      }
+    },
     {
       path: '/subAccept',
       name: 'subAccept',