关注完成

src/otherPages/collection/index.vue

@@ -411,7 +411,7 @@ export default {
   methods: {
     changeOrderPicker(e){
       console.log(e)
-      this.query.orderBy =Number(e.detail.value) ===0?'asc':'desc'
+      this.query.orderBy =Number(e.detail.value) ===0?'asc':'desc';
       this.typeOrder[this.type] = Number(e.detail.value)
     },
     changeOrderBy(str){

src/pages/user/index.vue

@@ -12,8 +12,8 @@
             <image class="user-headImg" v-else :src="unLoginHead"></image>
             <view class="flex" style="width: 60%; padding-left: 24rpx; text-align: left">
               <view style="font-size: 38rpx; color: #0a1a33; width: 100%">{{
-                userInfo.nickName || "新用户"
-              }}</view>
+            userInfo.nickName || "新用户"
+          }}</view>
               <view style="font-size: 26rpx; color: #8a9099; width: 100%">
                 {{ userInfo.phone || "点击绑定手机号" }}</view>
             </view>
@@ -25,13 +25,15 @@
         <van-cell title-class="uni-app-fontsize-paragraph" title="考前须知" is-link center
           url="/otherPages/marked/index?markdown=考前须知">
         </van-cell>
-        <van-cell title-class="uni-app-fontsize-paragraph" title="关注公众号" is-link center url="/otherPages/careGzh/index">
+        <van-cell @click="goCareGzh" title-class="uni-app-fontsize-paragraph" title="关注公众号" is-link center>
+        </van-cell>
+        <van-cell @click="goVideoGroup" title-class="uni-app-fontsize-paragraph" title="关注视频号" is-link center>
         </van-cell>
         <van-cell title-class="uni-app-fontsize-paragraph" title="电子资料" is-link @click="
-          goPath(
-            '/pages/extraWeb/index?src=https://nbjk-h5.zzxcx.net/pdfImages'
-          )
-          " center>
+            goPath(
+              '/pages/extraWeb/index?src=https://nbjk-h5.zzxcx.net/pdfImages'
+            )
+            " center>
         </van-cell>
         <van-cell title-class="uni-app-fontsize-paragraph" title="每日驾考资讯" is-link center
           url="/otherPages/careEveryDay/index">
@@ -40,10 +42,10 @@
         <van-cell title-class="uni-app-fontsize-paragraph" title="生成分享二维码" is-link center
           url="/otherPages/createReferCode/index">
         </van-cell>
-        <van-cell title-class="uni-app-fontsize-paragraph" title="用户反馈" is-link center url="/otherPages/userAdvise/index">
+        <van-cell title-class="uni-app-fontsize-paragraph" title="用户反馈" is-link center
+          url="/otherPages/userAdvise/index">
         </van-cell>
-        <van-cell title-class="uni-app-fontsize-paragraph" title="捐赠" is-link center
-          url="/otherPages/donation/index">
+        <van-cell title-class="uni-app-fontsize-paragraph" title="捐赠" is-link center url="/otherPages/donation/index">
         </van-cell>
         <!-- <van-cell title="我要提现" value="" is-link center @click="goCashOut">
         </van-cell> -->
@@ -51,7 +53,7 @@
 				<template #icon>
 					<m-icon type="hyyxq" class="cell-icon" />
 				</template>
-			</van-cell> -->
+</van-cell> -->
         <!-- <van-cell
           title="我的推广积分"
           value=""
@@ -101,9 +103,9 @@
         <view class="userform">
           <view class="userform-close">
             <van-icon @click="() => {
-              userFormShow = false;
-            }
-              " color="#a8a8a8" size="18" name="cross" />
+            userFormShow = false;
+          }
+            " color="#a8a8a8" size="18" name="cross" />
           </view>
           <view>
             <van-field :value="userInfo.nickName" required clearable label="用户名" @change="changeUserName"
@@ -122,6 +124,19 @@
 			<ad unit-id="adunit-d8c1548cc9663765"></ad>
 		</view> -->
     </scroll-view>
+    <view class="care" :style="careVisible ? '' : 'display:none'">
+      <view class="dialog">
+        <view class="title">请先关注公众号</view>
+        <official-account></official-account>
+        <view @click="() => {
+            careVisible = false;
+          }
+            " class="confirm">
+          关闭</view>
+
+
+      </view>
+    </view>
     <view style="height: 48px;width: 100%;"></view>
   </view>
 </template>
@@ -147,13 +162,45 @@ export default {
   data() {
     return {
       userFormShow: false,
+      careVisible: false,
       userInfo: uni.getStorageSync("userInfo"),
+
     };
   },
   mounted() {
     this.$store.dispatch("GetInfo");
   },
   methods: {
+    goCareGzh() {
+      const launchScene = wx.getLaunchOptionsSync().scene
+      console.log(launchScene)
+      switch (launchScene) {
+        case 1011:
+
+        case 1017:
+
+        case 1025:
+
+        case 1047:
+
+        case 1124:
+          this.careVisible = true
+          break;
+
+        default:
+          uni.navigateTo({
+            url: "/otherPages/careGzh/index",
+
+          })
+          break;
+      }
+    },
+    goVideoGroup() {
+      wx.openChannelsActivity({
+        finderUserName: "sphQVbhe9O04tqB",
+        feedId: "export/UzFfAgtgekIEAQAAAAAAJXo6IOZ81wAAAAstQy6ubaLX4KHWvLEZgBPEoqNUAhgxcvaHzNPgMJrCizVlT8Vn4kaJKobMZZuP"
+      })
+    },
     sendUserInfo() {
       api.user.userInfoUserInfo(this.userInfo).then((res) => {
         this.userFormShow = false;
@@ -227,6 +274,7 @@ export default {
       this.$mp.page.getTabBar()) {
       this.$mp.page.getTabBar().init()
     }
+
   }
 };
 </script>
@@ -236,6 +284,51 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
+.care {
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.35);
+  position: fixed;
+  z-index: 10;
+  top: 0;
+  left: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  align-content: center;
+
+  .dialog {
+    width: 300px;
+    height: calc(84px + 144rpx);
+    background: #fff;
+    border-radius: 16rpx;
+    overflow: hidden;
+
+    .title {
+      width: 100%;
+      height: 72rpx;
+      text-align: center;
+      font-size: 32rpx;
+      line-height: 72rpx;
+      color: #333;
+      background: #fff;
+
+      font-weight: bold;
+    }
+
+    .confirm {
+      width: 100%;
+      height: 72rpx;
+      text-align: center;
+      font-size: 40rpx;
+      line-height: 72rpx;
+      color: #ee0a24;
+      background: #fff;
+      letter-spacing: 15px;
+    }
+  }
+}
+
 .userform {
   width: 100%;
   height: 450rpx;