Merge branch 'dev_v3_lqw' of http://git.dgtis.com/armg/wxapp_shuibei into dev_v3_lqw

components/productWindow/index.vue

@@ -428,7 +428,7 @@ function getCheckedValue() {
       width: 58rpx;
       border: 0;
       //border-radius: 4rpx 0 0 4rpx;
-      line-height: 48rpx;
+      line-height: 46rpx;
       background: #F5F7FA;
 
       &.on {
@@ -442,7 +442,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;
@@ -456,8 +456,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

@@ -1958,7 +1958,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/merchantCenters/productCenter.vue

@@ -126,7 +126,7 @@ const getGroomList = async () => {
   if (!goodScroll.value) return;
   try {
     loading.value = true;
-    params.value.merchantId = merchantInfo.value.id;
+    // params.value.merchantId = merchantInfo.value.id;
     params.value.keyword = searchVal.value;
     const { data } = await productsList(params.value);
     goodsList.value = [...goodsList.value, ...data.list] || [];

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>

pages/users/browsing_history/index.vue

@@ -22,8 +22,9 @@
         ></text>
       </view>
       <view class="no-data" v-if="isNoDataState">
-        <image
-            src="https://my-go-easy-im.oss-cn-shenzhen.aliyuncs.com/goeasy-im-%E6%B0%B4%E8%B4%9D%E5%95%86%E5%9F%8E/zhanwu_20250827104005_1720_6.png"
+        <image class="img"
+            :src="HTTP_REQUEST_URL_IMG+'noData.png'"
+               mode="widthFix"
         />
       </view>
       <view class="mores-txt flex" v-if="!goodScroll && !isNoDataState">
@@ -37,7 +38,7 @@
 import {computed, ref} from 'vue';
 import { onLoad, onShow, onReachBottom } from "@dcloudio/uni-app";
 import { footprintList } from "@/api/merchant.js";
-
+import { HTTP_REQUEST_URL_IMG } from "@/config/app";
 const records = ref([]);
 const loading = ref(false);
 const goodScroll = ref(true);
@@ -147,8 +148,11 @@ const toMerchant = (obj) => {
 .no-data {
   margin: 150rpx auto 0;
   text-align: center;
+  width: 100%;
+  height: 100%;
+  min-height: 300rpx;
 
-  img {
+  .img {
     width: 65%;
     height: auto;
   }

pages/users/login/index.vue

@@ -2,7 +2,19 @@
 	<div class="login-wrapper bglogin">
 		<up-navbar title="登录" placeholder>
 			<template #left>
-				<view class=""></view>
+<!--        <view-->
+<!--            v-if="appStore?.$wxConfig?.auditModeEnabled"-->
+<!--            @click="backHome"-->
+<!--        >-->
+<!--          <image src="@/static/images/tabbar/1-001.png" style="height: 40rpx;width: 40rpx;"></image>-->
+<!--        </view>-->
+        <view
+            class="back_extend"
+            v-if="appStore?.$wxConfig?.auditModeEnabled"
+            @click="backHome"
+        >
+          {{ "<" }} 回到首页
+        </view>
 			</template>
 		</up-navbar>
 		<div class="shading">
@@ -440,6 +452,7 @@
     backHome();
   }
 	onLoad(() => {
+    console.log(appStore.$wxConfig)
     merchantId.value = appStore.merchantId || '';
 		getLogoImage();
 	});
@@ -693,4 +706,11 @@
 	.footer {
 		padding: 48rpx 80rpx;
 	}
+  .back_extend {
+    //position: fixed;
+    //top: 50px;
+    //left: 10px;
+    //font-size: 26rpx;
+    //color: #999;
+  }
 </style>