1.6

src/components/buy/index.vue

@@ -319,15 +319,7 @@ export default {
       this.buyType = type
       let query = { shopId: this.shopId, invite_code: this.invite_code };
       let invite = this.invite_code;
-      this.$sa.track("buyCourse", {
-        buyType:
-          this.groupDetail.goods_type === 2 && this.buyType === 0
-            ? "团购"
-            : "直购",
-        goodsID: this.shopId,
-        salesType: invite ? invite.split("-")[1] : "null",
-        salesID: invite ? Number(invite.split("-")[2]) : 0
-      });
+
       if (this.groupId) {
         query.group_order_id = this.groupId;
       }
@@ -360,7 +352,18 @@ export default {
         // console.log(comment.getUrlParam())
         query.cct_user_id = comment.getParamhref().cct_user_id;
       }
-      console.log(query);
+      this.$sa.track("buyCourse", {
+        buyType:
+            this.groupDetail.goods_type === 2 && this.buyType === 0
+                ? "团购"
+                : "直购",
+        goodsID: this.shopId,
+        salesType: invite ? invite.split("-")[1] : "null",
+        salesID: invite ? Number(invite.split("-")[2]) : 0,
+        gdt_vid: query.gdt_vid,
+        cct_user_id: query.cct_user_id,
+        redeem_code: this.$route.query.redeem_code
+      });
       // debugger
       this.$router.push({
         name: "buy",
@@ -545,7 +548,10 @@ export default {
             courseID: this.groupDetail.course_id,
             courseName: "",
             salesType: invite ? invite.split("-")[1] : "null",
-            salesID: invite ? Number(invite.split("-")[2]) : 0
+            salesID: invite ? Number(invite.split("-")[2]) : 0,
+            gdt_vid: this.$route.query.gdt_vid,
+            cct_user_id: this.$route.query.cct_user_id,
+            redeem_code: this.$route.query.redeem_code
           });
           if (this.groupDetail.goods_type === 2) {
             if (localStorage.getItem("cc_token")) {

src/components/buy/passShop.vue

@@ -398,7 +398,8 @@ export default {
             salesType: invite ? invite.split("-")[1] : "null",
             salesID: invite ? Number(invite.split("-")[2]) : 0,
             gdt_vid: query.gdt_vid,
-            cct_user_id: query.cct_user_id
+            cct_user_id: query.cct_user_id,
+            redeem_code: this.$route.query.redeem_code
           });
 
           // debugger
@@ -435,7 +436,8 @@ export default {
             salesType:invite?invite.split('-')[1]:'null',
             salesID:invite?Number(invite.split('-')[2]):0,
             gdt_vid: this.$route.query.gdt_vid,
-            cct_user_id: this.$route.query.cct_user_id
+            cct_user_id: this.$route.query.cct_user_id,
+            redeem_code: this.$route.query.redeem_code
           });
           if(window.location.href.indexOf('gdt_vid')>-1){
             json.gdt_vid = this.$route.query.gdt_vid

src/components/map/index.vue

 <template>
   <div>
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> pre
     <van-actionsheet
         v-model="actionsheetShow"
         :actions="actions"
@@ -527,8 +532,6 @@
               classID:this.classID,
               courseID:this.course_id.toString()
             });
-          }).catch(error => {
-            Toast('获取数据失败')
           })
         }else{
           Toast('课程还未开始哦')
@@ -761,7 +764,11 @@
   .actStar{height:20*@toVw;width:20*@toVw;background-position:0 -60*@toVw;display: inline-block}
   .clock{height:28*@toVw;width:28*@toVw;background-position:0 -80*@toVw;display: inline-block}
   .money{height:40*@toVw;width:40*@toVw;background-position:0 -108*@toVw;display: inline-block;animation: dodge 1s infinite;}
+<<<<<<< HEAD
   .goLesson{height:59*@toVw;width:169*@toVw;background-position:0 -148*@toVw;display: inline-block;margin-top:15*@toVw;margin-bottom: 10*@toVw }
+=======
+  .goLesson{height:59*@toVw;width:136*@toVw;background-position:0 -148*@toVw;display: inline-block;margin-top:15*@toVw;margin-bottom: 10*@toVw }
+>>>>>>> pre
   .van-actionsheet{
     .activit{color: yellowgreen;}
   }

src/components/public/bottomTab.vue

@@ -58,7 +58,7 @@ export default {
             this.$router.push({
             name: "map",
             query: {
-              course_type: this.userCourse2. start_periods_course_type
+              course_type: this.userCourse2.start_periods_course_type
             }
             });
           }else{

src/router/index.js

@@ -620,7 +620,7 @@ router.beforeEach((to, from, next) => {
   // extensionV1Shop
   // extensionV1
   // mpShop
-  if (to.name === 'spcShop' || to.name === 'mpShop' || to.name === 'extensionV1Shop' || to.name === 'extensionV1' || to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit'  || to.name === 'buyDetail'|| to.name === 'ybIndex' ) {
+  if (to.name === 'spcShop' || to.name === 'mpShop' || to.name === 'extensionV1Shop' || to.name === 'extensionV1' || to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit'  || to.name === 'buyDetail'|| to.name === 'passShop'|| to.name === 'ybIndex' ) {
     // 无需登录的页面
     console.log(488)
     next()