From a5b8c7a24ab057eb976bdd986d40ff4a8048e179 Mon Sep 17 00:00:00 2001
From: cc_zbp <487602586@qq.com>
Date: Thu, 25 May 2023 15:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue                  | 312 +---------
 pages/nongKe/gather/select_warehouse.vue | 717 +++++++++++++----------
 2 files changed, 397 insertions(+), 632 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 694c7af..afe2a0f 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -171,9 +171,7 @@
 </template>
 
 <script>
-  var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
   import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-
   import zbpSwiper from '@/components/zbpSwiper'
   import { mapState, mapGetters } from 'vuex'
   import { getWorkArticleCount, getSlideAPI } from '@/api/article.js'
@@ -190,53 +188,16 @@
       return {
         emptyText: '暂无可用应用',
         jurisdiction: false, // 是否有权限
-        product_id: '',
-        editGoodsCode: '',
-        editGoodsName: '',
-        editGoodsPrice: '',
-        editGoodsStore: '',
-        editGoodsShow: false, // 扫码修改商品信息
         mer_id: '',
-        statusBarHeight: statusBarHeight, //系统导航条高度
         userInfoData: { mer_info: { type_id: 0 } },
         prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
-        page: 0,
-        group_id: 1,
-        count: {
-          shuqiu: 0,
-          solve_count: 0,
-          time: 0
-        },
-        loading: true,
-        //消息提示图标
-        xiaoxi: {
-          maodun: 0,
-          saohei: 0,
-          shuqiu: 0,
-          sos: 0,
-          xiejiao: 0
-        },
-        swiperList: [],
-        swiper: {
-          url: [{
-            img: ''
-          }],
-          indicatorDots: true, // 显示面板指示点
-          vertical: false, // 滑动方向是否为纵向
-          autoplay: true, // 是否自动切换
-          interval: 2000, // 自动切换时间间隔
-          duration: 500 // 滑动动画时长
-        },
       };
     },
     computed: {
       ...mapGetters(['userInfo', 'location', 'isLogin'])
     },
     created() {},
-    onLoad() {
-      // uni.hideTabBar()
-      this.getBanner()
-    },
+    onLoad() {},
     onShow() {
       if (this.isLogin) {
         this.emptyText = '暂无可用应用'
@@ -245,50 +206,14 @@
         this.jurisdiction = true
       }
       this.getUserInfo()
-      this.group_id = this.userInfo.group_id
-      // this.get_count()
     },
-    // 下拉刷新
     onPullDownRefresh() {
-      this.getBanner()
       this.getUserInfo()
-      // this.get_count()
-      // 停止刷新
       uni.stopPullDownRefresh()
     },
     methods: {
-      // 轮播图请求
-      async getBanner() {
-        const { data } = await getDiy({ id: 0 })
-        if (data.value['1683638943100000']) {
-          this.swiper.url = data.value['1683638943100000'].swiperConfig.list
-        } else {
-          this.swiper.url = data.value['1683875164005000'].swiperConfig.list
-        }
-      },
-      async editGoodsClose() {
-        const data = {
-          price: this.editGoodsPrice,
-          stock: this.editGoodsStore,
-          id: this.product_id
-        }
-        const res = await microEadtProduct(data)
-        this.editGoodsShow = false
-      },
-      // 扫码核销
-      scanCode() {
-        if (this.userInfoData.is_wsxx === 0) return Toast("请完善商户信息")
-        uni.navigateTo({
-          url: `/pages/nongKe/gather/select_warehouse?mer_id=${this.mer_id}`
-        })
-      },
-      handeGo() {
-        uni.navigateTo({
-          url: `/pages/shopping/shopping?mer_id=${this.userInfoData.service.mer_id}`
-        })
-      },
       navigator(url, t) {
-        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
+        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
         uni.navigateTo({
           url: url
         })
@@ -302,70 +227,6 @@
             that.$set(this, 'jurisdiction', true);
           }
         });
-      },
-      CompanyCertification() {
-        uni.navigateTo({
-          url: '/pages/users/enter_company/enter_company'
-        })
-      },
-      navCeshi() {
-        uni.showToast({
-          title: "功能暂未开放",
-          icon: 'none'
-        })
-      },
-      purchase() {
-        uni.navigateTo({
-          url: '/pages/purchase/index'
-        })
-      },
-
-      // 跳议事大厅
-      voteList() {
-        uni.navigateTo({
-          url: '/pages/nongKe/article/vote_list'
-        });
-      },
-      navOpen(id, title, title2) {
-        uni.navigateTo({
-          url: '/pages/nongKe/article/open_list?category_id=' + id + '&title=' + title + '&title2=' +
-            title2
-        });
-      },
-      //合集文章
-      IndexArticle(id, title, title2, is_vote, time) {
-        let is_time = 0
-        if (time) {
-          is_time = time
-        }
-        uni.navigateTo({
-          url: '/pages/nongKe/article/list?category_id=' + id + '&title=' + title + '&title2=' + title2 +
-            '&is_vote=' +
-            is_vote + '&is_time=' + is_time
-        });
-      },
-
-      // 跳转党务公开
-      partyOpen() {
-        uni.navigateTo({
-          url: '/pages/nongKe/party/article/list'
-        });
-      },
-
-      // 采集信息 、 信息录入
-      peasantMsg() {
-        uni.navigateTo({
-          url: '/pages/nongKe/gather/entering'
-        });
-      },
-      // 保存
-      get_count() {
-        getWorkArticleCount().then(res => {
-          this.count = res
-          this.loading = false
-          //消息提示图标
-          this.xiaoxi = this.count.one
-        })
       }
     }
   };
@@ -380,91 +241,7 @@
     // padding-top: 180rpx;
     background: linear-gradient(#36A2FF, #fff);
   }
-
-  .work_header {
-    width: 693.93rpx;
-    height: 230rpx;
-    color: #fff;
-    margin: 0 auto;
-    position: relative;
-    margin-bottom: 21rpx;
-
-    .w_top {
-      width: 693.93rpx;
-      height: 184.25rpx;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      color: #fff;
-      font-size: 25rpx;
-      padding-left: 25rpx;
-      padding-right: 7rpx;
-      background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/5/oabg1%402x.png') no-repeat;
-      background-size: 693.93rpx 184.25rpx;
-
-      .yun {
-        font-weight: bold;
-        font-size: 42rpx;
-      }
-    }
-
-    .message_box {
-      padding: 0 43.86rpx;
-      width: 719.3rpx;
-      height: 78.95rpx;
-      position: absolute;
-      bottom: 0;
-      left: 50%;
-      transform: translate(-50%, 53%);
-      background-image: url("http://lihai001.oss-cn-chengdu.aliyuncs.com/storage/202303/4e5e92a2c82ee6af76ede722194924ed.jpg");
-      background-size: cover;
-      background-repeat: no-repeat;
-    }
-
-    .tenant_name {
-      font-size: 42.11rpx;
-      font-weight: bold;
-    }
-
-    .tabs_box {
-      padding: 35.09rpx 0 70.18rpx 0;
-
-      .tab_item {
-        font-size: 24.56rpx;
-        padding: 17.54rpx 21.05rpx;
-        border-radius: 4px;
-        border: 1px solid #fff;
-        margin-right: 19.3rpx;
-
-        &:last-child {
-          margin-right: 0;
-        }
-      }
-
-    }
-  }
-
-  .shop_box {
-    width: 694rpx;
-    height: 79rpx;
-    background: linear-gradient(207deg, #2199FC 0%, #2D96FF 100%);
-    box-shadow: 0rpx -4rpx 14rpx 2rpx rgba(25, 106, 170, 0.68);
-    border-radius: 0rpx 0rpx 14rpx 14rpx;
-    margin: 0 auto;
-    position: absolute;
-    bottom: 6rpx;
-    display: flex;
-    justify-content: space-between;
-    font-size: 28rpx;
-    align-items: center;
-    padding-left: 32rpx;
-    padding-right: 26rpx;
-
-    .s_shop {
-      font-size: 32rpx;
-    }
-  }
-
+  
   .com {
     margin-left: 50%;
     transform: translate(-50%);
@@ -475,55 +252,6 @@
     // margin-bottom: 175rpx;
   }
 
-  .topCard {
-    color: #fff;
-    width: 694.74rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .title {
-      font-size: 28.07rpx;
-
-      .num {
-        font-size: 82.46rpx;
-      }
-    }
-
-    .card_left {
-      width: 331.58rpx;
-      height: 336.84rpx;
-      border-radius: 14.04rpx;
-      padding: 21.05rpx 35.09rpx;
-      background-size: cover;
-      background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/5/oabg3%402x.png') no-repeat;
-      background-size: 331rpx 336rpx;
-    }
-
-    .card_right {
-
-      .postpone,
-      .over {
-        padding: 21.05rpx 35.09rpx;
-        width: 331.58rpx;
-        height: 159.65rpx;
-        background-size: cover;
-        background-repeat: no-repeat;
-        border-radius: 14.04rpx;
-        opacity: 1;
-      }
-
-      .postpone {
-        background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/5/oabg2%402x.png');
-      }
-
-      .over {
-        margin-top: 17.54rpx;
-        background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/5/oabg2%402x.png');
-      }
-    }
-  }
-
   .special_work {
     // padding: 17.54rpx;
     width: 694.74rpx;
@@ -588,38 +316,4 @@
     }
   }
 
-  .head-wrapper {
-    z-index: 999;
-    display: flex;
-    align-items: center;
-    position: fixed;
-    left: 30rpx;
-    top: 0;
-    /* #ifdef MP */
-    height: 43px;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 114rpx;
-    /* #endif */
-  }
-
-  .head-menu {
-    display: flex;
-    align-items: center;
-    height: 54rpx;
-    width: 140rpx;
-    background: rgba(0, 0, 0, .25);
-    border-radius: 27rpx;
-
-    .iconfont {
-      flex: 1;
-      text-align: center;
-      color: #fff;
-      box-sizing: border-box;
-
-      &.icon-xiangzuo {
-        border-right: 1px solid #fff;
-      }
-    }
-  }
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 20acd1a..5ec3283 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -8,29 +8,18 @@
         </view>
       </block>
     </view>
-
-			<view class="list-box animated listA" :class="goods.length > 0 ? 'fadeIn on' : ''">
-				<view class="item" v-for="(item, index) in goods" :key="index" @click="addGoods(item)">
-					<view class="pictrue" :class="'cont'+conStyle">	
-						<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
-					</view>
-					<view class="text-info" style="display: flex; flex-direction: column; justify-content: space-between;">
-						<view>
-							<view  class="title">{{ item.store_name }}</view>
-							<view class="merchant_info">
-								<view v-if="item.merchant && item.merchant.type_name" :style="'background:'+labelColor" class="font-bg-red">{{item.merchant.type_name}}</view>
-							</view>
-						</view>
-						<view class="price acea-row" :style="'color:'+priceColor">
-							<view>
-								¥
-								<text>{{ item.price }}</text>
-							</view>
-							<view style="padding-left: 180rpx;font-size: 34rpx;font-weight: 550" >加入仓库</view>
-						</view>			
-					</view>
-				</view>
-			</view>
+    <view class="list-box listA" :class="goods.length > 0 ? 'fadeIn on' : ''">
+      <view class="item" v-for="(item, index) in goods" :key="index">
+        <view class="pictrue">
+          <easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+        </view>
+        <view class="text-info">
+          <view class="title">{{ item.store_name }}</view>
+          <view class="price">¥<text>{{ item.price }}</text></view>
+          <view class="add-btn" @click="addGoods(item)">加入仓库</view>
+        </view>
+      </view>
+    </view>
     <u-popup :show="editGoodsShow" @close="editGoodsClose" :round="18" mode="center">
       <view class="edit_goods_box">
         <view class="edit_name flex_a_c edit_name_no">
@@ -53,7 +42,8 @@
         </view>
       </view>
     </u-popup>
-	<u-modal :show="addGoodsShow"  content='是否添加到你的仓库中?' @cancel="addGoodsclose()" @close="addGoodsclose()" @confirm="addGoodsopen()" :closeOnClickOverlay="true" :showCancelButton="true"></u-modal>
+    <u-modal :show="addGoodsShow" content='是否添加到你的仓库中?' @cancel="addGoodsclose()" @close="addGoodsclose()"
+      @confirm="addGoodsopen()" :closeOnClickOverlay="true" :showCancelButton="true"></u-modal>
     <u-popup :show="searchGoodsShow" @close="searchGoodsClose" :round="18" mode="center">
       <view class="search_goods_box">
         <input type="text" v-model="searchGoodsName" class="searchGoods" placeholder="请输入商品名称">
@@ -72,7 +62,7 @@
 <script>
   import { productCreate } from '@/api/product.js'
   import { microSeachBarCode, microEadtProduct } from '@/api/store.js'
-  import { seachBarCodeAPI,post_product_import } from '@/api/api.js'
+  import { seachBarCodeAPI, post_product_import } from '@/api/api.js'
   import { Toast } from '@/libs/uniApi'
   export default {
     data() {
@@ -98,8 +88,8 @@
         searchGoodsShow: false,
         searchGoodsName: '',
         goods: [],
-		item:[],
-		addGoodsShow:false
+        item: [],
+        addGoodsShow: false
       }
     },
     onLoad(e) {
@@ -108,23 +98,23 @@
     onShow() {},
     methods: {
       addGoods(item) {
-		  this.addGoodsShow=true
-		  this.item=item
+        this.addGoodsShow = true
+        this.item = item
+      },
+      addGoodsopen() {
+        if (this.item) {
+          post_product_import(this.item.product_id).then(e => {
+            if (e.status == 200) {
+              Toast(e.data.msg)
+              this.addGoodsShow = false
+            }
+          })
+        }
+        this.item = []
+      },
+      addGoodsclose() {
+        this.addGoodsShow = false
       },
-	  addGoodsopen(){
-		  if(this.item){
-			  post_product_import(this.item.product_id).then(e=>{
-			  			if(e.status==200){
-							Toast(e.data.msg)
-							this.addGoodsShow=false
-						}
-			  })
-		  }
-		  this.item=[]
-	  },
-	  addGoodsclose(){
-		  this.addGoodsShow=false
-	  },
       openSearch() {},
       async searchGoodsClose() {
         const rq = {
@@ -132,9 +122,9 @@
           name: this.searchGoodsName
         }
         const { data } = await seachBarCodeAPI(rq).catch(err => Toast(err))
-		if(data.list.length ==0){
-			Toast("暂无搜索商品")
-		}
+        if (data.list.length == 0) {
+          Toast("暂无搜索商品")
+        }
         this.goods = data.list
         this.searchGoodsShow = false
       },
@@ -307,283 +297,364 @@
       }
     }
   }
+
   .list-box {
-  	display: flex;
-  	flex-wrap: wrap;
-  	justify-content: space-between;
-  	padding: 20rpx 28rpx 0;
-  	.item {
-  		width: 328rpx;
-  		margin-bottom: 20rpx;
-  		overflow: hidden;
-  		position: relative;
-  		&.on {
-  			border-radius: 0;
-  		}
-  		.pictrue_log {
-  			width: 92rpx;
-  			height: 44rpx;
-  			font-size: 26rpx;
-  			line-height: 44rpx;
-  		}
-  		.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image {
-  			width: 100%;
-  			display: block;
-  			position: relative;
-  			.border-picture {
-  				position: absolute;
-  				top: 0;
-  				left: 0;
-  				width: 100%;
-  				height: 100%;
-  				background: center/cover no-repeat;
-  			}
-  		}
-  		.picture1,/deep/.picture1 image,/deep/.picture1 .easy-loadimage,/deep/.picture1 uni-image {			
-  			height: 346rpx;
-  			position: relative;
-  			.border-picture {
-  				position: absolute;
-  				top: 0;
-  				left: 0;
-  				width: 100%;
-  				height: 100%;
-  				background: center/cover no-repeat;
-  			}
-  			.sell_out {
-  				display: flex;
-  				width: 150rpx;
-  				height: 150rpx;
-  				align-items: center;
-  				justify-content: center;
-  				border-radius: 100%;
-  				background: rgba(0,0,0,.6);
-  				color: #fff;
-  				font-size: 30rpx;
-  				position: absolute;
-  				top: 50%;
-  				left: 50%;
-  				margin: -75rpx 0 0 -75rpx;
-  				&::before{
-  					content: "";
-  					display: block;
-  					width: 140rpx;
-  					height: 140rpx;
-  					border-radius: 100%;
-  					border: 1px dashed #fff;
-  					position: absolute;
-  					top: 5rpx;
-  					left: 5rpx;
-  				}
-  			}
-  		}
-  		.cont1,/deep/.cont1 image,/deep/.cont1 .easy-loadimage,/deep/.cont1 uni-image,.cont1 .border-picture{
-  			border-radius: 16rpx;
-  		}
-  		.text-info {
-  			padding: 10rpx 20rpx 15rpx;
-  			.title {
-  				color: #222222;
-  				overflow:hidden; 
-  				text-overflow: ellipsis; 
-  				display: -webkit-box; 
-  				-webkit-line-clamp: 2; 
-  				-webkit-box-orient: vertical;
-  			}
-  			.old-price {
-  				margin-top: 4rpx;
-  				font-size: 26rpx;
-  				color: #999;
-  				text-decoration: line-through;
-  				text {
-  					margin-right: 2px;
-  					font-size: 20rpx;
-  				}
-  			}
-  			.price {
-  				display: flex;
-  				margin-top: 20rpx;
-  				font-size: 26rpx;
-  				align-items: center;
-  				text {
-  					font-size: 36rpx;
-  					font-weight: 550;
-  				}
-  				.ot-price{
-  					color: #aaa;
-  					font-size: 26rpx;
-  					text-decoration: line-through;
-  					margin-left: 6rpx;
-  					font-weight: normal;
-  					margin-top: 10rpx;
-  				}	
-  			}
-  		}
-  		.pictrue {
-  			position: relative;
-  		}		
-  		.border-picture {
-  			position: absolute;
-  			top: 0;
-  			left: 0;
-  			width: 100%;
-  			height: 100%;
-  			border-radius: 8rpx;
-  			background: center/cover no-repeat;
-  		}
-  	}
-  	.merchant_info{
-  		display: flex;
-  		align-items: center;
-  		margin-top: 20rpx;
-  		.merchant_type{
-  			color: #fff;
-  			line-height: 30rpx;
-  			padding: 0 10rpx;
-  			border-radius: 2rpx;
-  			font-size: 22rpx;
-  		}
-  		.txt {
-  			display: flex;
-  			align-items: center;
-  			justify-content: center;
-  			width: 56rpx;
-  			height: 28rpx;
-  			margin-left: 15rpx;
-  			border: 1px solid $theme-color;
-  			border-radius: 4rpx;
-  			font-size: 20rpx;
-  			font-weight: normal;
-  			&.delivery{
-  				margin-left: 0;
-  				color: #FF9000;
-  				border-color: #FF9000;
-  			}
-  		}
-  	}
-  	&.on {
-  		display: flex;
-  	}
-  	&.listA {
-  		.item {
-  			display: flex;
-  			width: 100%;
-  			.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image {
-  				width: 220rpx;
-  				height: 220rpx;		
-  			}
-  			.sell_out {
-  				display: flex;
-  				width: 110rpx;
-  				height: 110rpx;
-  				align-items: center;
-  				justify-content: center;
-  				border-radius: 100%;
-  				background: rgba(0,0,0,.6);
-  				color: #fff;
-  				font-size: 24rpx;
-  				position: absolute;
-  				top: 50%;
-  				left: 50%;
-  				margin: -55rpx 0 0 -55rpx;
-  				&::before{
-  					content: "";
-  					display: block;
-  					width: 100rpx;
-  					height: 100rpx;
-  					border-radius: 100%;
-  					border: 1px dashed #fff;
-  					position: absolute;
-  					top: 5rpx;
-  					left: 5rpx;
-  				}
-  			}
-  			.text-info {
-  				width: 490rpx;
-  			}
-  		}
-  	}
-  	&.listB {
-  		justify-content: inherit;
-  		.item {
-  			width: 31.3%;
-  			margin-right: 3.05%;
-  			.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image {
-  				height: 220rpx;	
-  			}
-  			.sell_out {
-  				display: flex;
-  				width: 110rpx;
-  				height: 110rpx;
-  				align-items: center;
-  				justify-content: center;
-  				border-radius: 100%;
-  				background: rgba(0,0,0,.6);
-  				color: #fff;
-  				font-size: 24rpx;
-  				position: absolute;
-  				top: 50%;
-  				left: 50%;
-  				margin: -55rpx 0 0 -55rpx;
-  				&::before{
-  					content: "";
-  					display: block;
-  					width: 100rpx;
-  					height: 100rpx;
-  					border-radius: 100%;
-  					border: 1px dashed #fff;
-  					position: absolute;
-  					top: 5rpx;
-  					left: 5rpx;
-  				}
-  			}
-  			&:nth-child(3n) {
-  				margin-right: 0;
-  			}
-  			.price{
-  				display: flex;	
-  				align-items: center;
-  				justify-content: center;
-  				font-size: 20rpx;
-  				text{
-  					font-size: 28rpx;
-  				}
-  			}
-  			.text-info{
-  				padding: 10rpx 4rpx;
-  			}
-  		}
-  	}
-  	&.listC{
-  		.item{
-  			width: 100%;
-  			.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image{
-  				height: 320rpx;			
-  			}
-  			.price{
-  				margin-top: 20rpx;
-  				font-size: 40rpx;
-  				display: flex;
-  				align-items: center;
-  				.old-price{
-  					font-weight: normal;
-  					font-size: 22rpx;
-  					margin-left: 10rpx;
-  				}
-  			}
-  		}
-  	}
-  	&.listS{
-  		.price{
-  			font-size: 40rpx;
-  			display: flex;
-  			align-items: baseline;
-  			.old-price{
-  				font-weight: normal;
-  				font-size: 22rpx;
-  				margin-left: 10rpx;
-  			}
-  		}
-  	}
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    padding: 20rpx 28rpx 0;
+
+    .item {
+      width: 328rpx;
+      margin-bottom: 20rpx;
+      overflow: hidden;
+      position: relative;
+      border-radius: 8px;
+      background-color: #fff;
+
+      &.on {
+        border-radius: 0;
+      }
+
+      .pictrue_log {
+        width: 92rpx;
+        height: 44rpx;
+        font-size: 26rpx;
+        line-height: 44rpx;
+      }
+
+      .pictrue,
+      /deep/image,
+      /deep/.easy-loadimage,
+      /deep/uni-image {
+        width: 100%;
+        display: block;
+        position: relative;
+
+        .border-picture {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          background: center/cover no-repeat;
+        }
+      }
+
+      .picture1,
+      /deep/.picture1 image,
+      /deep/.picture1 .easy-loadimage,
+      /deep/.picture1 uni-image {
+        height: 346rpx;
+        position: relative;
+
+        .border-picture {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          background: center/cover no-repeat;
+        }
+
+        .sell_out {
+          display: flex;
+          width: 150rpx;
+          height: 150rpx;
+          align-items: center;
+          justify-content: center;
+          border-radius: 100%;
+          background: rgba(0, 0, 0, .6);
+          color: #fff;
+          font-size: 30rpx;
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          margin: -75rpx 0 0 -75rpx;
+
+          &::before {
+            content: "";
+            display: block;
+            width: 140rpx;
+            height: 140rpx;
+            border-radius: 100%;
+            border: 1px dashed #fff;
+            position: absolute;
+            top: 5rpx;
+            left: 5rpx;
+          }
+        }
+      }
+
+      .cont1,
+      /deep/.cont1 image,
+      /deep/.cont1 .easy-loadimage,
+      /deep/.cont1 uni-image,
+      .cont1 .border-picture {
+        border-radius: 16rpx;
+      }
+
+      .text-info {
+        padding: 10rpx 20rpx 15rpx;
+        display: flex;
+        flex-direction: column;
+
+        .add-btn {
+          align-self: flex-end;
+          text-align: center;
+          width: 175.44rpx;
+          color: #fff;
+          margin-top: auto;
+          padding: 7.02rpx 21.05rpx;
+          border-radius: 100px;
+          background: $uni-theme-bg-color;
+        }
+
+        .title {
+          font-size: 31.58rpx;
+          margin-bottom: 10.53rpx;
+          color: #222222;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+
+        .old-price {
+          margin-top: 4rpx;
+          font-size: 26rpx;
+          color: #999;
+          text-decoration: line-through;
+
+          text {
+            margin-right: 2px;
+            font-size: 20rpx;
+          }
+        }
+
+        .price {
+          display: flex;
+          margin-top: 20rpx;
+          font-size: 26rpx;
+          align-items: center;
+
+          text {
+            font-size: 36rpx;
+            font-weight: 550;
+          }
+
+          .ot-price {
+            color: #aaa;
+            font-size: 26rpx;
+            text-decoration: line-through;
+            margin-left: 6rpx;
+            font-weight: normal;
+            margin-top: 10rpx;
+          }
+        }
+      }
+
+      .pictrue {
+        position: relative;
+      }
+
+      .border-picture {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        border-radius: 8rpx;
+        background: center/cover no-repeat;
+      }
+    }
+
+    .merchant_info {
+      display: flex;
+      align-items: center;
+      margin-top: 20rpx;
+
+      .merchant_type {
+        color: #fff;
+        line-height: 30rpx;
+        padding: 0 10rpx;
+        border-radius: 2rpx;
+        font-size: 22rpx;
+      }
+
+      .txt {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 56rpx;
+        height: 28rpx;
+        margin-left: 15rpx;
+        border: 1px solid $theme-color;
+        border-radius: 4rpx;
+        font-size: 20rpx;
+        font-weight: normal;
+
+        &.delivery {
+          margin-left: 0;
+          color: #FF9000;
+          border-color: #FF9000;
+        }
+      }
+    }
+
+    &.on {
+      display: flex;
+    }
+
+    &.listA {
+      .item {
+        display: flex;
+        width: 100%;
+
+        .pictrue,
+        /deep/image,
+        /deep/.easy-loadimage,
+        /deep/uni-image {
+          width: 220rpx;
+          height: 220rpx;
+        }
+
+        .sell_out {
+          display: flex;
+          width: 110rpx;
+          height: 110rpx;
+          align-items: center;
+          justify-content: center;
+          border-radius: 100%;
+          background: rgba(0, 0, 0, .6);
+          color: #fff;
+          font-size: 24rpx;
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          margin: -55rpx 0 0 -55rpx;
+
+          &::before {
+            content: "";
+            display: block;
+            width: 100rpx;
+            height: 100rpx;
+            border-radius: 100%;
+            border: 1px dashed #fff;
+            position: absolute;
+            top: 5rpx;
+            left: 5rpx;
+          }
+        }
+
+        .text-info {
+          width: 490rpx;
+        }
+      }
+    }
+
+    &.listB {
+      justify-content: inherit;
+
+      .item {
+        width: 31.3%;
+        margin-right: 3.05%;
+
+        .pictrue,
+        /deep/image,
+        /deep/.easy-loadimage,
+        /deep/uni-image {
+          height: 220rpx;
+        }
+
+        .sell_out {
+          display: flex;
+          width: 110rpx;
+          height: 110rpx;
+          align-items: center;
+          justify-content: center;
+          border-radius: 100%;
+          background: rgba(0, 0, 0, .6);
+          color: #fff;
+          font-size: 24rpx;
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          margin: -55rpx 0 0 -55rpx;
+
+          &::before {
+            content: "";
+            display: block;
+            width: 100rpx;
+            height: 100rpx;
+            border-radius: 100%;
+            border: 1px dashed #fff;
+            position: absolute;
+            top: 5rpx;
+            left: 5rpx;
+          }
+        }
+
+        &:nth-child(3n) {
+          margin-right: 0;
+        }
+
+        .price {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 20rpx;
+
+          text {
+            font-size: 28rpx;
+          }
+        }
+
+        .text-info {
+          padding: 10rpx 4rpx;
+        }
+      }
+    }
+
+    &.listC {
+      .item {
+        width: 100%;
+
+        .pictrue,
+        /deep/image,
+        /deep/.easy-loadimage,
+        /deep/uni-image {
+          height: 320rpx;
+        }
+
+        .price {
+          margin-top: 20rpx;
+          font-size: 40rpx;
+          display: flex;
+          align-items: center;
+
+          .old-price {
+            font-weight: normal;
+            font-size: 22rpx;
+            margin-left: 10rpx;
+          }
+        }
+      }
+    }
+
+    &.listS {
+      .price {
+        font-size: 40rpx;
+        display: flex;
+        align-items: baseline;
+
+        .old-price {
+          font-weight: normal;
+          font-size: 22rpx;
+          margin-left: 10rpx;
+        }
+      }
+    }
   }
 </style>
\ No newline at end of file