1

components/tabbar/index.vue

@@ -94,44 +94,101 @@
   bottom: 10upx;
   border-radius: 150upx;
 }
+/* ----------------不显示图标导航样式-------------- */
+.txtBtn2 {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #b2b3b4;
+}
+.activeTxtBtn2 {
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 800;
+  /* color: #111111; */
+}
 </style>
 <template>
-  <view v-if="isShowIcon === 1">
-    <view
-      class="tabbarMain"
-      :class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
-      v-if="navs && navs.length > 0"
-    >
+  <view>
+    <view v-if="isShowIcon === 1">
+      <view
+        class="tabbarMain"
+        :class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
+        v-if="navs && navs.length > 0"
+      >
+        <view
+          class="tabBtnMina"
+          :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
+          mode=""
+        >
+          <view
+            class="itmMain"
+            v-for="(x, i) in navs"
+            :key="i"
+            @click.stop="goUrl(x.url)"
+          >
+            <image
+              class="imgse"
+              :fade-show="false"
+              v-if="active != i"
+              mode="heightFix"
+              :src="x.icon"
+            ></image>
+            <image
+              class="imgse"
+              :fade-show="false"
+              v-if="active === i"
+              mode="heightFix"
+              :src="x.active_icon"
+            ></image>
+            <text
+              class="txtBtn"
+              :style="{ color: active == i ? x.active_color : x.color }"
+              >{{ x.text }}</text
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view v-if="isShowIcon === 0">
       <view
-        class="tabBtnMina"
-        :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
-        mode=""
+        class="tabbarMain"
+        :class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
+        v-if="navs && navs.length > 0"
       >
         <view
-          class="itmMain"
-          v-for="(x, i) in navs"
-          :key="i"
-          @click.stop="goUrl(x.url)"
+          class="tabBtnMina"
+          :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
+          mode=""
         >
-          <image
-            class="imgse"
-            :fade-show="false"
-            v-if="active != i"
-            mode="heightFix"
-            :src="x.icon"
-          ></image>
-          <image
-            class="imgse"
-            :fade-show="false"
-            v-if="active === i"
-            mode="heightFix"
-            :src="x.active_icon"
-          ></image>
-          <text
-            class="txtBtn"
-            :style="{ color: active == i ? x.active_color : x.color }"
-            >{{ x.text }}</text
+          <view
+            class="itmMain"
+            v-for="(x, i) in navs"
+            :key="i"
+            @click.stop="goUrl(x.url)"
           >
+            <!-- <image
+              class="imgse"
+              :fade-show="false"
+              v-if="active != i"
+              mode="heightFix"
+              :src="x.icon"
+            ></image>
+            <image
+              class="imgse"
+              :fade-show="false"
+              v-if="active === i"
+              mode="heightFix"
+              :src="x.active_icon"
+            ></image> -->
+            <text
+              class="txtBtn"
+              :class="{ activeTxtBtn2: active == i }"
+              :style="{ color: active == i ? x.active_color : x.color }"
+              >{{ x.text }}</text
+            >
+          </view>
         </view>
       </view>
     </view>
@@ -156,6 +213,8 @@ export default {
     let data = uni.getStorageSync("basedata");
     if (data) {
       this.isShowIcon = data.navbar.isShowIcon;
+    } else {
+      this.isShowIcon = 1;
     }
   },
   mounted() {

pages/blindDate/postDetails2.vue

@@ -581,6 +581,8 @@
             align-items: center;
             font-weight: bold;
             margin-top: 15px;
+            box-sizing: border-box;
+            padding: 0 30rpx;
           "
         >
           <text>评论</text>
@@ -588,7 +590,10 @@
         </view>
 
         <u-empty v-if="g.length == 0" text="暂无回复" mode="list"></u-empty>
-        <view v-if="g.length > 0">
+        <view
+          v-if="g.length > 0"
+          style="box-sizing: border-box; padding: 0 30rpx"
+        >
           <view v-for="(x, i) in g" :key="i" style="width: 100%">
             <view
               class="pl-top"
@@ -1267,7 +1272,6 @@ export default {
         (res) => {
           this.ReplyNum = res.data.totalCount;
           this.commentData = res.data;
-          console.log(1155, this.commentData);
         }
       );
     },
@@ -1738,7 +1742,25 @@ export default {
               icon: "none",
             });
             // this.init(1);
-            // this.getActivityInfo();
+            if (type === 1) {
+              this.getCount();
+            } else {
+              this.request2(
+                {
+                  url: "/api/AppletMiai/GetActivityDiscussPageList",
+                  data: this.msg,
+                },
+                (res) => {
+                  if (res.resultCode == 1) {
+                    this.g = res.data.pageData;
+                    this.page_count = res.data.pageCount;
+                    if (this.page_count == 1) {
+                      this.status = "nomore";
+                    }
+                  }
+                }
+              );
+            }
           }
         }
       );
@@ -1771,8 +1793,25 @@ export default {
               duration: 2000,
               icon: "none",
             });
-            // this.init(1);
-            // this.getActivityInfo();
+            if (type === 1) {
+              this.getCount();
+            } else {
+              this.request2(
+                {
+                  url: "/api/AppletMiai/GetActivityDiscussPageList",
+                  data: this.msg,
+                },
+                (res) => {
+                  if (res.resultCode == 1) {
+                    this.g = res.data.pageData;
+                    this.page_count = res.data.pageCount;
+                    if (this.page_count == 1) {
+                      this.status = "nomore";
+                    }
+                  }
+                }
+              );
+            }
           }
         }
       );

pages/blindDate/postbar.vue

@@ -174,7 +174,7 @@
               </view>
               <view class="right">
                 <view class="activetitle">{{ x.ActivityTitle }}</view>
-                <view class="Content" v-html="x.Content"></view>
+                <view class="Content">{{ x.LabelList.join(",") }}</view>
                 <view class="hot" v-if="x.HotCommentList.length > 0">
                   <view class="hotTag">人气点评</view>
                   <view class="hotCon">{{ x.HotCommentList[0].Comment }}</view>
@@ -197,7 +197,12 @@
         <view style="width: 100%; height: 50px"></view>
       </scroll-view>
     </view>
-    <view class="release" v-if="isFaTie == 1" @click.stop="gopublishing()">
+    <view
+      class="release"
+      v-if="isFaTie == 1"
+      @click.stop="gopublishing()"
+      style="display: none"
+    >
       <!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image> -->
       <!-- 发布动态按钮 -->
       <view class="fbanniu">
@@ -479,14 +484,36 @@ export default {
       this.isShowFabu = !this.isShowFabu;
     },
     jumpfabu(type) {
-      if (type === 1) {
-        uni.navigateTo({
-          url: "/pages/blindDate/releasePosts",
-        });
+      this.u = uni.getStorageSync("mall_UserInfo");
+      if (!this.u) {
+        this.u = {
+          nickName: "未登录",
+          avatarUrl: "",
+        };
+        this.showAuth = true;
       } else {
-        uni.navigateTo({
-          url: "/pages/blindDate/postPublishing",
-        });
+        if (this.isAttestation == 1) {
+          //判断是否认证了
+          // uni.navigateTo({
+          //   url: "/pages/blindDate/postPublishing?ForumId=" + this.msg.ForumId,
+          // });
+          if (type === 1) {
+            uni.navigateTo({
+              url: "/pages/blindDate/releasePosts",
+            });
+          } else {
+            uni.navigateTo({
+              url:
+                "/pages/blindDate/postPublishing?ForumId=" + this.msg.ForumId,
+            });
+          }
+        } else if (this.isAttestation == 0) {
+          this.show = true;
+          this.showtext = "还未认证，是否去认证？";
+        } else if (this.isAttestation == 2) {
+          this.show = true;
+          this.showtext = "还未上传身份证信息,是否去上传？";
+        }
       }
     },
   },
@@ -763,6 +790,7 @@ export default {
     position: absolute;
     top: 60rpx;
     right: 30rpx;
+    z-index: 999;
     box-sizing: border-box;
     padding: 0 20rpx;
     .tiezi,

pages/index/index.vue

@@ -200,19 +200,20 @@
                 v-if="d.id == 'miaiactivityCustom'"
                 :goods="d.data"
               ></miaiactivityCustom>
-			  <!-- 瀑布流组件 -->
-			  <Pubu
-			    v-if="d.id == 'blindDatePPPlus'"
-			    :dataObj="d.data"
-			  ></Pubu>
+              <!-- 瀑布流组件 -->
+              <Pubu
+                v-if="d.id == 'blindDatePPPlus'"
+                :dataObj="d.data"
+                @refresh="refreshPage"
+              ></Pubu>
             </template>
           </view>
         </template>
-		
+
         <view v-if="showtabs == true">
           <tabbar></tabbar>
         </view>
-		
+
         <view
           class="tips_t"
           v-if="
@@ -333,7 +334,7 @@ export default {
       orderPopupdata: {}, //离线收益的弹窗
       showorder: false, //显示弹出
       carrierType: "", //载体type
-	  AppletID:0,//判断小程序的id,相亲：11
+      AppletID: 0, //判断小程序的id,相亲：11
     };
   },
   components: {
@@ -371,7 +372,7 @@ export default {
     miaiactivitytype,
     miaiactivityCustom,
     orderPopup,
-	Pubu
+    Pubu,
   },
   onLoad(options) {
     let that = this;
@@ -622,11 +623,7 @@ export default {
     }
     uni.showNavigationBarLoading();
   },
-  created() {
-	  let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
-	  this.AppletID = basedata.home_pages.id?basedata.home_pages.id:0;
-	  console.log(631,this.AppletID)
-  },
+  created() {},
   // #ifdef MP-WEIXIN
   onShareTimeline() {
     setTimeout(() => {
@@ -1541,6 +1538,11 @@ export default {
       //选择取消地址
       this.$refs.city[0].getPickcar(Name);
     },
+    refreshPage() {
+      //   this.init();
+      //   this.$forceUpdate();
+      //   console.log("tag", "刷新");
+    },
     yj() {
       uni.navigateTo({
         // url: '/pages/blindDate/persondetails?UserId=123978'
@@ -1639,5 +1641,4 @@ export default {
   font-size: 36rpx;
   color: #8f8f94;
 } */
-
 </style>