修改问题

components/productWindow/index.vue

@@ -427,7 +427,7 @@ function getCheckedValue() {
       width: 58rpx;
       border: 0;
       //border-radius: 4rpx 0 0 4rpx;
-      line-height: 48rpx;
+      line-height: 46rpx;
       background: #F5F7FA;
 
       &.on {
@@ -441,7 +441,7 @@ function getCheckedValue() {
       width: 58rpx;
       border: 0;
       //border-radius: 0 4rpx 4rpx 0;
-      line-height: 48rpx;
+      line-height: 46rpx;
       background: #F5F7FA;
       &.on {
         border-color: #e3e3e3;
@@ -455,8 +455,8 @@ function getCheckedValue() {
       color: #333;
       font-size: 24rpx;
       //border-radius: 12rpx;
-      line-height: 29px;
-      height: 50rpx;
+      line-height: 46rpx;
+      height: 100%;
 
       input {
         display: -webkit-inline-box;

pages/goods/goods_details/index.vue

@@ -1954,7 +1954,7 @@ action-sheet-item {
   border-radius: 40rpx;
 }
 .container{
-  margin-top: -40rpx;
+  margin-top: -10rpx;
   position: relative;
   z-index: 2;
   background-color: #F9F7F0;

pages/index/index.vue

@@ -288,10 +288,10 @@ onLoad(async (options) => {
     merchantId.value = '';
   }
 
-  if(isFirstLoad.value){
+  // if(isFirstLoad.value){
     await initPageData();
-    isFirstLoad.value = false;
-  }
+    // isFirstLoad.value = false;
+  // }
 
 });
 onShow(async () => {
@@ -314,9 +314,9 @@ onShow(async () => {
   } else {
     merchantId.value = '';
   }
-  if(!isFirstLoad.value){
-    await initPageData();
-  }
+  // if(!isFirstLoad.value){
+  //   await initPageData();
+  // }
 
   uni.setNavigationBarTitle({ title: site_name.value });
 

pages/merchantCenter/index.vue

@@ -146,9 +146,9 @@ const commonFunctions = computed(() => {
   const baseFunctions = [
     { src: `${HTTP_REQUEST_URL_IMG}setting/fabu.png`, name: '发布商品',pageUrl:'/pages/merchantCenters/postInformation',show:true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/shangpin.png`, name: '商品管理',pageUrl:'/pages/merchantCenters/productManagement',show:true },
-    { src: `${HTTP_REQUEST_URL_IMG}setting/kucun.png`, name: '库存管理',pageUrl:'/pages/users/user_asset/asset_info/asset_info' ,show:kcglShow.value},
+    { src: `${HTTP_REQUEST_URL_IMG}setting/kucun.png`, name: '库存管理',pageUrl:'/pages/users/user_asset/asset_info/asset_info' ,show:!kcglShow.value},
     { src: `${HTTP_REQUEST_URL_IMG}setting/jinqian.png`, name: '我的收益',pageUrl: '/pages/users/my_merchant/index' ,show:wdsyShow.value},
-    { src: `${HTTP_REQUEST_URL_IMG}setting/kabao.png`, name: '卡包管理',pageUrl: '/pages/users/card_page/index' ,show:kcglShow.value},
+    { src: `${HTTP_REQUEST_URL_IMG}setting/kabao.png`, name: '卡包管理',pageUrl: '/pages/users/card_page/index' ,show:!kcglShow.value},
     { src: `${HTTP_REQUEST_URL_IMG}setting/mendian.png`, name: '门店推广',pageUrl: '/pages/users/my_merchant/index',show:true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/dianpu.png`, name: '我的商城',pageUrl: `/pages/index/index` ,show:true},
   ];
@@ -162,48 +162,11 @@ const params = ref({
 });
 const merchantInfo = ref({})
 
-watch(
-    () => appStore.wxConfig,
-    (newVal) => {
-      const configDate = newVal || appStore.$wxConfig;
-      wxConfig.value = configDate;
-      const list = JSON.parse(configDate.essentialFunctions);
-
-      if (list[0].status == false) {
-        showIcons.value = false;
-      } else {
-        showIcons.value = true;
-      }
-      tradeList.value = [list[0], list[1]];
-      useList.value = [
-        {
-          ...list[2],
-          src: `${HTTP_REQUEST_URL_IMG}setting/mailiao.png`,
-        },
-        {
-          ...list[3],
-          src: `${HTTP_REQUEST_URL_IMG}setting/mailiao2.png`,
-        },
-        {
-          ...list[4],
-          src: `${HTTP_REQUEST_URL_IMG}setting/cunliao.png`,
-          iconName: "存料",
-        },
-        {
-          ...list[5],
-          src: `${HTTP_REQUEST_URL_IMG}setting/tiliao.png`,
-        },
-      ];
-      if(useList.value && useList.value.length>0 && showIcons.value){
-        kcglShow.value = true;
-      }
-    },
-    { deep: true, immediate: true }
-);
 
 // 页面加载
 onShow(() => {
   console.log(appStore.userInfo)
+  kcglShow.value = appStore?.$wxConfig?.auditModeEnabled;
   merchantInfo.value = appStore.userInfo.merchant;
   if (appStore.merchantId || appStore.userInfo?.merchant?.id) {
     wdsyShow.value = true;

pages/user/index.vue

@@ -24,7 +24,7 @@
           <view class="user-detail">
             <view class="name-vip" v-if="appStore.isLogin">
               <text class="name">{{ appStore.$userInfo?.nickname }}</text>
-              <image class="vip-tag" v-if="appStore.$userInfo?.svip && useList&&useList.length>0&&showIcons" mode="widthFix" :src="HTTP_REQUEST_URL_IMG+'sviplogo.png'"></image>
+              <image class="vip-tag" v-if="appStore.$userInfo?.svip && !(appStore?.$wxConfig?.auditModeEnabled)" mode="widthFix" :src="HTTP_REQUEST_URL_IMG+'sviplogo.png'"></image>
             </view>
             <view
               class="name-vip"
@@ -50,7 +50,7 @@
       </view>
 
       <!-- 会员开通提示 v-if="!userInfo.isVip"-->
-      <view class="vip-promote" v-if="useList&&useList.length>0&&showIcons">
+      <view class="vip-promote" v-if="!(appStore?.$wxConfig?.auditModeEnabled)">
         <image class="vipBG" :src="HTTP_REQUEST_URL_IMG+'vipBG.png'" mode="scaleToFill"></image>
         <view class="vip-text">
           <view class="title">
@@ -74,7 +74,7 @@
         <view
           class="transaction-detail"
           @click="viewTransactionDetail"
-          v-if="useList && useList.length > 0 && showIcons"
+          v-if="!(appStore?.$wxConfig?.auditModeEnabled)"
         >
           <text style="margin-right: 10rpx">交易明细</text>
           <uni-icons type="right" size="16" color="#666666"></uni-icons>