1、su-tabbar:底部导航的层级数加大
2、招租列表的调接口不传my=1的参数 3、首页平台推荐的调接口不传my=1的参数和平台推荐的查看更多与顶部的食堂招租跳转一个页面 4、个人中心:页面数据收藏、足迹和优惠券的数据回显 5、我的足迹隐藏不需要部分; 6、修改个人信息页面:隐藏修改手机号的按钮,删除相关逻辑
This commit is contained in:
		
							parent
							
								
									54f0643445
								
							
						
					
					
						commit
						e597673831
					
				@ -223,7 +223,6 @@
 | 
			
		||||
			page: listQuery.value.page,
 | 
			
		||||
			limit: listQuery.value.limit,
 | 
			
		||||
			cate_ids: listQuery.value.cate_ids,
 | 
			
		||||
			my: 1,
 | 
			
		||||
			order: 'normal',
 | 
			
		||||
			status: 1,
 | 
			
		||||
			province: listQuery.value.province,
 | 
			
		||||
 | 
			
		||||
@ -76,7 +76,7 @@
 | 
			
		||||
					<!-- 推荐标题 -->
 | 
			
		||||
					<view class="recom-titleBox">
 | 
			
		||||
						<view style="font-size: 38rpx;line-height: 38rpx;font-weight: 800;color: #333333;">平台推荐</view>
 | 
			
		||||
						<view class="title-more">
 | 
			
		||||
						<view class="title-more" @click="toPage('/pages/canteenRent/rentList')">
 | 
			
		||||
							<view style="font-size: 26rpx;line-height: 26rpx;font-weight: 400;color: #999999;">查看更多
 | 
			
		||||
							</view>
 | 
			
		||||
							<image style="width: 28rpx;height: 28rpx;margin-left: 20rpx;"
 | 
			
		||||
@ -292,7 +292,6 @@
 | 
			
		||||
			page: listQuery.value.page,
 | 
			
		||||
			limit: listQuery.value.limit,
 | 
			
		||||
			cate_ids: listQuery.value.cate_ids,
 | 
			
		||||
			my: 1,
 | 
			
		||||
			order: 'normal',
 | 
			
		||||
			status: 1,
 | 
			
		||||
			recommend: 1,
 | 
			
		||||
 | 
			
		||||
@ -26,7 +26,7 @@
 | 
			
		||||
								<!-- <view class="UnAuthenBox weight8 fs-20" v-if="authenInfo.status == -1 && isLogin == true">未认证</view>
 | 
			
		||||
								<view class="authenticationBox weight8 fs-20" v-if="authenInfo.status == 1 && isLogin == true">已认证</view> -->
 | 
			
		||||
							</view>
 | 
			
		||||
							<view class="fs-28 weight4" style="margin-top: 30rpx;">剩余拨打次数: {{ userInfo.mobile_num ? userInfo.mobile_num : 0 }}次</view>
 | 
			
		||||
							<view class="fs-28 weight4" style="margin-top: 30rpx;">剩余拨打次数: {{ userInfo.all_mobile_num ? userInfo.all_mobile_num : 0 }}次</view>
 | 
			
		||||
						</view>
 | 
			
		||||
						<view class="head-signInBox" @click="toPage('/pages/app/sign')">
 | 
			
		||||
							<image style="width: 46rpx;height: 44rpx;" src="https://jiangxiaoxian.0rui.cn/signIn.png"
 | 
			
		||||
@ -39,11 +39,11 @@
 | 
			
		||||
					<!-- 四个主内容 -->
 | 
			
		||||
					<view class="head-secondBox">
 | 
			
		||||
						<view class="collect" @click="toPage('/pages/user/goods-collect')">
 | 
			
		||||
							<view class="collect-num">14</view>
 | 
			
		||||
							<view class="collect-num">{{ userInfo.collect_number ? userInfo.collect_number : 0 }}</view>
 | 
			
		||||
							<view class="collect-text">收藏</view>
 | 
			
		||||
						</view>
 | 
			
		||||
						<view class="feetPrint" @click="toPage('/pages/user/goods-log')">
 | 
			
		||||
							<view class="feetPrint-num">14</view>
 | 
			
		||||
							<view class="feetPrint-num">{{ userInfo.footprint_number ? userInfo.footprint_number : 0 }}</view>
 | 
			
		||||
							<view class="feetPrint-text">足迹</view>
 | 
			
		||||
						</view>
 | 
			
		||||
						<view class="feetPrint" @click="toPage('/pages/user/wallet/score')">
 | 
			
		||||
@ -51,7 +51,7 @@
 | 
			
		||||
							<view class="feetPrint-text">积分</view>
 | 
			
		||||
						</view>
 | 
			
		||||
						<view class="collect" @click="toPage('/pages/coupon/list')">
 | 
			
		||||
							<view class="collect-num">14</view>
 | 
			
		||||
							<view class="collect-num">{{ userInfo.coupon_number ? userInfo.coupon_number : 0 }}</view>
 | 
			
		||||
							<view class="collect-text">优惠券</view>
 | 
			
		||||
						</view>
 | 
			
		||||
					</view>
 | 
			
		||||
 | 
			
		||||
@ -2,14 +2,14 @@
 | 
			
		||||
  <s-layout title="我的足迹" :bgStyle="{ color: '#f2f2f2' }">
 | 
			
		||||
    <view class="cart-box ss-flex ss-flex-col ss-row-between">
 | 
			
		||||
      <!-- 头部 -->
 | 
			
		||||
      <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
 | 
			
		||||
        <view class="header-left ss-flex ss-col-center ss-font-26">
 | 
			
		||||
       <!-- <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
 | 
			
		||||
       <view class="header-left ss-flex ss-col-center ss-font-26">
 | 
			
		||||
          共
 | 
			
		||||
          <text class="goods-number ui-TC-Main ss-flex">
 | 
			
		||||
            {{ state.pagination.total }}
 | 
			
		||||
          </text>
 | 
			
		||||
          件商品
 | 
			
		||||
        </view>
 | 
			
		||||
        </view> 
 | 
			
		||||
        <view class="header-right">
 | 
			
		||||
          <button
 | 
			
		||||
            v-if="state.editMode && state.pagination.total"
 | 
			
		||||
@ -26,7 +26,7 @@
 | 
			
		||||
            编辑
 | 
			
		||||
          </button>
 | 
			
		||||
        </view>
 | 
			
		||||
      </view>
 | 
			
		||||
      </view>-->
 | 
			
		||||
      <!-- 内容 -->
 | 
			
		||||
      <view class="cart-content">
 | 
			
		||||
        <view
 | 
			
		||||
@ -64,30 +64,7 @@
 | 
			
		||||
          </view>
 | 
			
		||||
        </view>
 | 
			
		||||
      </view>
 | 
			
		||||
      <!-- 底部 -->
 | 
			
		||||
      <su-fixed bottom :val="0" placeholder v-show="state.editMode">
 | 
			
		||||
        <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
 | 
			
		||||
          <view class="footer-left ss-flex ss-col-center">
 | 
			
		||||
            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
 | 
			
		||||
              <radio
 | 
			
		||||
                :checked="state.selectAll"
 | 
			
		||||
                color="var(--ui-BG-Main)"
 | 
			
		||||
                style="transform: scale(0.7)"
 | 
			
		||||
                @tap.stop="onSelectAll"
 | 
			
		||||
              />
 | 
			
		||||
              <view>全选</view>
 | 
			
		||||
            </label>
 | 
			
		||||
          </view>
 | 
			
		||||
          <view class="footer-right">
 | 
			
		||||
            <button
 | 
			
		||||
              class="ss-reset-button ui-BG-Main-Gradient pay-btn ss-font-28 ui-Shadow-Main"
 | 
			
		||||
              @tap="onCancel"
 | 
			
		||||
            >
 | 
			
		||||
              删除足迹
 | 
			
		||||
            </button>
 | 
			
		||||
          </view>
 | 
			
		||||
        </view>
 | 
			
		||||
      </su-fixed>
 | 
			
		||||
 | 
			
		||||
    </view>
 | 
			
		||||
    <uni-load-more
 | 
			
		||||
      v-if="state.pagination.total > 0"
 | 
			
		||||
@ -152,48 +129,7 @@
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  // 格式化价格
 | 
			
		||||
  function formatPrice(e) {
 | 
			
		||||
    return e.length === 1 ? e[0] : e.join('~');
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // 单选选中
 | 
			
		||||
  const onSelect = (id) => {
 | 
			
		||||
    if (!state.selectedCollectList.includes(id)) {
 | 
			
		||||
      state.selectedCollectList.push(id);
 | 
			
		||||
    } else {
 | 
			
		||||
      state.selectedCollectList.splice(state.selectedCollectList.indexOf(id), 1);
 | 
			
		||||
    }
 | 
			
		||||
    state.selectAll = state.selectedCollectList.length === state.pagination.data.length;
 | 
			
		||||
  };
 | 
			
		||||
  // 全选
 | 
			
		||||
  const onSelectAll = () => {
 | 
			
		||||
    state.selectAll = !state.selectAll;
 | 
			
		||||
    if (!state.selectAll) {
 | 
			
		||||
      state.selectedCollectList = [];
 | 
			
		||||
    } else {
 | 
			
		||||
      state.pagination.data.forEach((item) => {
 | 
			
		||||
        if (state.selectedCollectList.includes(item.goods_id)) {
 | 
			
		||||
          state.selectedCollectList.splice(state.selectedCollectList.indexOf(item.goods_id), 1);
 | 
			
		||||
        }
 | 
			
		||||
        state.selectedCollectList.push(item.goods_id);
 | 
			
		||||
      });
 | 
			
		||||
    }
 | 
			
		||||
  };
 | 
			
		||||
  async function onCancel() {
 | 
			
		||||
    if (state.selectedCollectList) {
 | 
			
		||||
      state.selectedCollectList = state.selectedCollectList.toString();
 | 
			
		||||
      const { code } = await sheep.$api.user.view.delete({
 | 
			
		||||
        goods_id: state.selectedCollectList,
 | 
			
		||||
      });
 | 
			
		||||
      if (code === 1) {
 | 
			
		||||
        state.editMode = false;
 | 
			
		||||
        state.selectedCollectList = [];
 | 
			
		||||
        state.selectAll = false;
 | 
			
		||||
        state.pagination = pagination;
 | 
			
		||||
        getData();
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  // 加载更多
 | 
			
		||||
  function loadmore() {
 | 
			
		||||
    if (state.loadStatus !== 'noMore') {
 | 
			
		||||
 | 
			
		||||
@ -95,10 +95,10 @@
 | 
			
		||||
          >
 | 
			
		||||
            <template v-slot:right>
 | 
			
		||||
              <view class="ss-flex ss-col-center">
 | 
			
		||||
                <su-radio v-if="userInfo.verification?.mobile" :modelValue="true" />
 | 
			
		||||
                 <!--<su-radio v-if="userInfo.verification?.mobile" :modelValue="true" />
 | 
			
		||||
                <button v-else class="ss-reset-button ss-flex ss-col-center ss-row-center">
 | 
			
		||||
                  <text class="_icon-forward" style="color: #bbbbbb; font-size: 26rpx"></text>
 | 
			
		||||
                </button>
 | 
			
		||||
                </button> -->
 | 
			
		||||
              </view>
 | 
			
		||||
            </template>
 | 
			
		||||
          </uni-easyinput>
 | 
			
		||||
 | 
			
		||||
@ -261,12 +261,18 @@ export default {
 | 
			
		||||
      }),
 | 
			
		||||
  },
 | 
			
		||||
  goodsLog: {
 | 
			
		||||
    list: (params) =>
 | 
			
		||||
      request({
 | 
			
		||||
        url: 'user.goods_log',
 | 
			
		||||
        method: 'GET',
 | 
			
		||||
        params,
 | 
			
		||||
      }),
 | 
			
		||||
	  list: (params) =>
 | 
			
		||||
	    request({
 | 
			
		||||
	      url: 'meal.information/footprint_list',
 | 
			
		||||
	      method: 'GET',
 | 
			
		||||
	      params,
 | 
			
		||||
	    }),
 | 
			
		||||
    // list: (params) =>
 | 
			
		||||
    //   request({
 | 
			
		||||
    //     url: 'user.goods_log',
 | 
			
		||||
    //     method: 'GET',
 | 
			
		||||
    //     params,
 | 
			
		||||
    //   }),
 | 
			
		||||
  },
 | 
			
		||||
  favorite: {
 | 
			
		||||
    do: (id) =>
 | 
			
		||||
 | 
			
		||||
@ -83,7 +83,7 @@
 | 
			
		||||
      // 元素层级z-index
 | 
			
		||||
      zIndex: {
 | 
			
		||||
        type: [String, Number],
 | 
			
		||||
        default: 10,
 | 
			
		||||
        default: 100000,
 | 
			
		||||
      },
 | 
			
		||||
      // 选中标签的颜色
 | 
			
		||||
      activeColor: {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user