修改

pages.json

@@ -20,7 +20,7 @@
 		{
 			"path": "pages/mall/dapan",
 			"style": {
-				"navigationBarBackgroundColor": "#000000",
+				"navigationBarBackgroundColor": "#ffe079",
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "大盘"
 			}

pages/goods/goods_search/index.vue

@@ -78,7 +78,7 @@ function getProductList() {
     bastList.value = (bastList.value || []).concat(list)
     loading.value = false
     loadend.value = isLoadend
-    loadTitle.value = isLoadend ? "😕人家是有底线的~~" : "加载更多"
+    loadTitle.value = isLoadend ? "我是有底线的" : "加载更多"
     page.value += 1
     isbastList.value = true
   }).catch(() => {
@@ -134,7 +134,7 @@ onShow(() => {
 })
 onLoad((options)=>{
   query.value = options || {};
-  if(options){
+  if(options && options.cid){
     getProductList()
   }
 })

pages/goods_cate/goods_cate.vue

@@ -4,7 +4,7 @@
       <view class='acea-row row-between-wrapper input'>
         <text class='iconfont icon-sousuo'></text>
         <input type='text' placeholder='点击搜索商品信息' @confirm="searchSubmitValue" confirm-type='search' name="search"
-               placeholder-class='placeholder'></input>
+               placeholder-class='placeholder' @focus="searchSubmitValue"></input>
       </view>
     </view>
     <view class='aside' :style="{bottom: tabbarH + 'px',height: height + 'rpx'}">
@@ -155,15 +155,15 @@ const scroll = (e) => {
 const searchSubmitValue = (e) => {
   const searchValue = e.detail.value?.trim();
 
-  if (!searchValue) {
-    return uni.showToast({ title: '请填写要搜索的产品信息' });
-  }
+  // if (!searchValue) {
+  //   return uni.showToast({ title: '请填写要搜索的产品信息' });
+  // }
 
-  if (searchValue.length > 0) {
+  // if (searchValue.length > 0) {
     uni.navigateTo({
       url: '/pages/goods/goods_search/index?keyword=' + searchValue
     });
-  }
+  // }
 };
 
 // 页面加载

pages/merchantCenters/merchant.vue

@@ -101,6 +101,10 @@ import { onLoad, onShow, onReachBottom } from "@dcloudio/uni-app";
 import { getSbmerchantInfo } from "@/api/merchant.js";
 import merchantCate from "./components/merchant_cate.vue"
 import { getGroomList as getGroomListApi, } from "@/api/store.js";
+import { footprintScan } from "@/api/merchant.js";
+import { useAppStore } from "@/stores/app";
+const appStore = useAppStore();
+
 // 获取实时金价
 import useRealGoldPrice from "@/hooks/useRealGoldPrice";
 // 实时价格处理
@@ -158,10 +162,15 @@ onLoad((options) => {
 onReachBottom(() => {
   getGroomList();
 });
-const getSbmerchantInfoFn = () => {
+const getSbmerchantInfoFn = async () => {
   let data = {
     merchantId:query.value.merchantId
   }
+  let obj ={
+    merchantId:query.value.merchantId,
+    userId:appStore.userInfo.userId
+  }
+  await footprintScan(obj)
   getSbmerchantInfo(data).then((res) => {
     console.log(res);
     merchantInfo.value = res.data;

pages/users/browsing_history/index.vue

@@ -6,8 +6,8 @@
           :key="index"
           class="record-item"
       >
-        <view class="icon-container">
-          <image :src="record.merchantLogo" mode="aspectFit"></image>
+        <view>
+          <image class="icon-container" :src="record.merchantLogo" mode="aspectFit"></image>
         </view>
         <view class="info-container">
           <view class="shop-name">{{ record.merchantName }}</view>

pages/users/user_address/index.vue

@@ -15,7 +15,6 @@
               name="realName"
               :value="userAddress.realName"
               placeholder-class="placeholder"
-              maxlength="4"
             />
           </view>
           <view class="item acea-row row-between-wrapper">

pages/users/user_address_list/index.vue

@@ -41,14 +41,12 @@
               class="radio"
               :value="index.toString()"
               :name="item.id"
+              label="设为默认"
             >
-              <text>设为默认</text>
             </up-radio>
             <!-- #endif -->
             <!-- #ifdef MP -->
-            <up-radio class="radio" :name="item.id">
-              <text>设为默认</text>
-            </up-radio>
+            <up-radio class="radio" :name="item.id" label="设为默认"></up-radio>
             <!-- #endif -->
             <view class="acea-row row-middle">
               <view @click="editAddressFn(item.id)"
@@ -329,7 +327,7 @@ function getAddressListFn(isPage) {
 
 // 设置默认地址
 function radioChange(e) {
-  const addressId = e.detail.value; // 现在是地址ID
+  const addressId = e; // 现在是地址ID
   const address = addressList.value.find(item => item.id === addressId);
   if (!address) return Toast({ title: "您设置的默认地址不存在!" });
 

pages/users/user_goods_collection/index.vue

@@ -352,7 +352,7 @@ onReachBottom(() => {
 
     .name {
       width: 434rpx;
-      margin-bottom: 56rpx;
+      margin-bottom: 30rpx;
     }
   }
 
@@ -374,15 +374,15 @@ onReachBottom(() => {
 }
 
 .collectionGoods .item .pictrue {
-  width: 130rpx;
-  height: 130rpx;
+  width: 100rpx;
+  height: 100rpx;
   margin-right: 20rpx;
 }
 
 .collectionGoods .item .pictrue image {
   width: 100%;
   height: 100%;
-  border-radius: 14rpx;
+  border-radius: 16rpx;
 }
 
 .collectionGoods .item .text {