feat：修改评价区

pages/active/limited-time/limited-time.vue

@@ -26,12 +26,13 @@
             </view>
         </view>
 
-        <mescroll-uni ref="mescrollRef" top="710rpx" @down="downCallback" @up="upCallback" :up="upOption"
+        <mescroll-uni ref="mescrollRef" top="730rpx" @down="downCallback" @up="upCallback" :up="upOption"
             :down="downOption" @init="mescrollInit">
             <view class="setting-view">
                 <view class="name-box">
                     <view class="mescrollUniView">
-                        <productSeckillCard v-for="item in dataList" :key="item.id" :item="item" :actived-type="activedScekillType" :attributes="attributes" />
+                        <productSeckillCard v-for="item in dataList" :key="item.id" :item="item"
+                            :actived-type="activedScekillType" :attributes="attributes" />
                     </view>
                 </view>
             </view>

pages/login_package/login/login.vue

@@ -66,6 +66,21 @@
         </view>
       </view>
       <!-- #endif -->
+
+      <!-- #ifdef MP-WEIXIN -->
+      <view class="other_login">其他登录方式</view>
+      <!-- <view class="login_other_icon">
+        <view class="login_other_item" @click="wechatOneLogin">
+          <up-image src="/static/login/WXICON.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
+          微信登录
+        </view>
+      </view> -->
+      <view class="login_other_icon">
+        <view class="login_other_item_you" @click="jumpHome">
+          游客模式
+        </view>
+      </view>
+      <!-- #endif -->
     </view>
     <view class="policy_warp">
       <up-checkbox name="isCheck" usedAlone v-model:checked="isPolicy" shape="circle" activeColor="#7934F6" size="19"
@@ -183,6 +198,7 @@ export default {
           console.log(ret);
         });
     },
+
     jumpHome() {
       // const sysPlatform = getCurrentSysPlatform();
       // if(sysPlatform === "android"){
@@ -545,6 +561,17 @@ export default {
     align-items: center;
     margin-bottom: 80rpx;
   }
+
+  .login_other_item_you {
+    width: 500rpx;
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid #7934F6;
+    color: #7934F6;
+    border-radius: 10rpx;
+  }
 }
 
 .modal-overlay {

pages/supply_chain/supply_chain.vue

@@ -1,24 +1,26 @@
 <template>
   <view class="content-two">
-    <TopSafe></TopSafe>
+    <view class="top-header-container">
-    <view class="head-view">
+      <TopSafe></TopSafe>
-      <view class="head-search" @click="onJumpSearch">
+      <view class="head-view">
-        <u-icon size="24" name="search" color="#999"></u-icon>
+        <view class="head-search" @click="onJumpSearch">
-        <text class="text-28 text-fu" style="margin-left: 12rpx">搜索</text>
+          <u-icon size="24" name="search" color="#999"></u-icon>
+          <text class="text-28 text-fu" style="margin-left: 12rpx">搜索</text>
+        </view>
       </view>
-    </view>
+      <view class="tab-box">
-    <view class="tab-box">
+        <view class="tab-item" v-for="(item, index) in tabArr" :key="item.id" @click="onTab(item.id)">
-      <view class="tab-item" v-for="(item, index) in tabArr" :key="item.id" @click="onTab(item.id)">
 
-        <image :src="curTab == item.id ? item.iconActive : item.icon" mode="aspectFill" class="tab-img">
+          <image :src="curTab == item.id ? item.iconActive : item.icon" mode="aspectFill" class="tab-img">
-        </image>
+          </image>
-        <view class="tab-name" :style="{
+          <view class="tab-name" :style="{
-          color: curTab == item.id ? '#7A35F6' : '#666',
+            color: curTab == item.id ? '#7A35F6' : '#666',
-        }">{{ item.name }}</view>
+          }">{{ item.name }}</view>
+        </view>
       </view>
     </view>
-    <mescroll-uni ref="mescrollRef" :top="mescrollTop" @down="downCallback" @up="upCallback" :up="upOption"
+    <mescroll-uni ref="mescrollRef" :top="mescrollTop" :bottom="mescrollBottom" :safearea="isApp" @down="downCallback"
-      :down="downOption" @init="mescrollInit">
+      @up="upCallback" :up="upOption" :down="downOption" @init="mescrollInit">
       <view class="setting-view">
         <view class="name-box">
           <!-- 原来单个 v-for 替换成两列 -->
@@ -56,12 +58,32 @@ export default {
   mixins: [MescrollMixin],
   components: { Header, TopSafe, MyBtn, PingItem, CustomTabBar, MescrollUni },
   computed: {
+    isApp() {
+      // #ifdef APP-PLUS
+      return true;
+      // #endif
+      // #ifndef APP-PLUS
+      return false;
+      // #endif
+    },
     mescrollTop() {
       // #ifdef MP-WEIXIN
-      return '420rpx';
+      return '400rpx';
       // #endif
-      // #ifndef MP-WEIXIN
+      // #ifdef H5
-      return '336rpx';
+      return '260rpx';
+      // #endif
+      // #ifdef APP-PLUS
+      const statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0;
+      return (statusBarHeight * 2 + 248) + 'rpx';
+      // #endif
+    },
+    mescrollBottom() {
+      // #ifdef APP-PLUS
+      return '100rpx';
+      // #endif
+      // #ifndef APP-PLUS
+      return '0rpx';
       // #endif
     },
   },
@@ -122,6 +144,11 @@ export default {
     this.getSearchList()
   },
   onShow() {
+    /*#ifdef APP-PLUS*/
+    uni.hideTabBar({
+      animation: false,
+    });
+    /*#endif*/
     if (this.tabArr.length > 0) {
       const sortParams = uni.getStorageSync('sortParams');
       if (sortParams) {
@@ -195,6 +222,7 @@ export default {
         this.curTab = index;
         console.log("----", this.curTab)
         this.dataList = [];
+        this.mescroll && this.mescroll.scrollTo(0, 0);
         this.downCallback();
       }
     },
@@ -249,10 +277,21 @@ export default {
 
 <style lang="scss" scoped>
 .content-two {
-  height: calc(100vh);
+  min-height: 100vh;
-  padding-top: 80rpx;
   background-color: #fff;
-  // background-color: $app-bj;
+}
+
+.top-header-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  z-index: 99;
+  background-color: #fff;
+
+  /* #ifdef MP-WEIXIN */
+  padding-top: 40rpx;
+  /* #endif */
 }
 
 .head-view {

utils/config.js

@@ -1,10 +1,10 @@
-// export const BASE_URL = "https://api.tbmall.xin"; //生产
+export const BASE_URL = "https://api.tbmall.xin"; //生产
-// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
+export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
-// export const kefuBaseUrl = "https://admin.tbmall.xin/api";
+export const kefuBaseUrl = "https://admin.tbmall.xin/api";
 
-export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
+// export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
-export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
+// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
-export const kefuBaseUrl = "https://admin.o.tbmall.xin/api";
+// export const kefuBaseUrl = "https://admin.o.tbmall.xin/api";
 
 // https://h.o.tbmall.xin/#/
 // 客服接口属于管理后台服务，用户端接口已在后端单独放行。