commit -m 地址

common/css/style/thorui.css

@@ -120,7 +120,7 @@
 }
 
 .tui-danger {
-	background-color: #ed3f14 !important;
+	background-color: #191919 !important;
 	color: #fff;
 }
 
@@ -1239,17 +1239,17 @@
 }
 
 .tui-danger-hover {
-	background: #c80808 !important;
+	background: #191919 !important;
 	color: #e5e5e5 !important;
 }
 
 .tui-danger-outline {
-	color: #eb0909 !important;
+	color: #191919 !important;
 	background: transparent;
 }
 
 .tui-danger-outline::after {
-	border: 1rpx solid #eb0909 !important;
+	border: 1rpx solid #191919 !important;
 }
 
 .tui-warning-hover {

common/json/data.json.js

@@ -1,39 +1,38 @@
-const beautyList =  [
-						{value:'1',name:'诊所'},
-						{value:'2',name:'门诊'},
-						{value:'3',name:'医院'},
-					]
-const mentuzCampNullList = [
-						{value:'1',name:'整形'},
-						{value:'2',name:'轻医美'},
-						{value:'3',name:'皮肤科'},
-					]
-const medicaCampNullList = [
-						{value:'1',name:'美容'},
-						{value:'2',name:'美体'},
-						{value:'3',name:'美发'},
-						{value:'4',name:'皮肤管理'},
-						{value:'5',name:'光电'},
-						{value:'6',name:'综合类'},
-						{value:'7',name:'中医养生'},
-						{value:'8',name:'spa'},
-					]
-
-const supplierList = [
-						{value:'1',name:'一类器械'},
-						{value:'2',name:'二类器械'},
-						{value:'3',name:'三类器械'},
-						{value:'4',name:'其他'},
-					]
-const supplierMedicaCampNullList = [
-						{value:'1',name:'产品'},
-						{value:'2',name:'仪器'},
-						{value:'3',name:'服务'},
-					]
+const addressList = [
+					{
+						address: "奥术大师大所打撒大是奥术大师大所打撒大是奥术大师大所打撒大是",
+						addressID: 2913,
+						city: "县",
+						cityID: 2,
+						defaultFlag: "1",
+						mobile: "13316418828",
+						phone: null,
+						postalCode: null,
+						province: "北京市",
+						provinceID: 1,
+						shouHuoRen: "郑大大",
+						town: "东城区282",
+						townID: 17,
+						userID: 11063
+					},
+					{
+						address: "奥术大师大所打撒大是奥术大师大所打撒大是奥术大师大所打撒大是",
+						addressID: 2913,
+						city: "县",
+						cityID: 2,
+						defaultFlag: "0",
+						mobile: "13316418828",
+						phone: null,
+						postalCode: null,
+						province: "北京市",
+						provinceID: 1,
+						shouHuoRen: "郑大大",
+						town: "东城区282",
+						townID: 17,
+						userID: 11063
+					},
+				]					
+					
 module.exports = {
-	beautyList,
-	mentuzCampNullList,
-	medicaCampNullList,
-	supplierList,
-	supplierMedicaCampNullList
+	addressList
 }

components/cm-custom/cm-drag.vue

@@ -13,7 +13,7 @@
 			<text v-if="cartNum > 0" class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 				{{cartNum >= 100 ? '99+' : cartNum}}
 			</text>
-			<image src='https://static.caimei365.com/app/img/icon/icon-cart-active@3x.png' mode="widthFix"></image>
+			<image src='https://static-b.caimei365.com/app/wisa/img/icon/cart.png' mode="widthFix"></image>
 		</view>
 	</view>
 </template>
@@ -121,7 +121,7 @@
 		width: 92rpx;
 		height: 92rpx;
 		border-radius: 50%;
-		background: rgba(255, 147, 0, 0.5);
+		background: rgba(182,118,47, 0.2);
 		position: fixed;
 		right: 24rpx;
 		bottom: 28%;

components/cm-module/listTemplate/buyagainList.vue

@@ -1,417 +0,0 @@
-<template>
-	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<list-skeleton v-if="showSkeleton"></list-skeleton>
-		<view class="product-container" v-if="!isShowEmpty" :style="{paddingTop:searchStatus?'112rpx':''}">
-			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="productList.length > 0">
-				<view v-for="(item,index) in productList" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productID)">
-					<image mode='widthFix' :src="item.mainImage"  class="list-img" alt="list-img"></image>
-					<view class="list-details-info">
-						<text class="list-details-title">{{item.name}}</text>
-						<text class="list-details-specs">规格：{{item.unit !=null ? item.unit : ''}}</text>
-						<text class="list-details-miniQuantity">起订量：{{item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
-						<view class="list-details-price">
-							<view class="list-shop">
-								<view class="list-price-none" v-if="item.repurchasePriceState">
-									<text class="price-none">￥{{item.discountPrice}}</text>
-									<text class="iconfont icon-wenhao" @click.stop="repurchModel"></text>
-								</view>
-								<view class="list-price" v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.price1 : item.retailPrice) | NumFormat }}
-									</text>
-								</view>
-							</view>
-							<button class="add-cart-btn" @click.stop="operationHanld(item)">数量</button>
-						</view>
-						<view class="list-details-price" v-if="item.actStatus==1">
-							<view class="floor-item-act">
-								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text>:￥{{ item.retailPrice | NumFormat }}</text>
-								</view>
-								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-							</view>
-							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-								<view class="floor-tags">阶梯价格</view>	
-							</view>
-						</view>	
-					</view>
-				</view>
-				<view v-if="showLoading && productList.length > 4 && !showRegularBtn">
-					<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-					<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-				</view>
-			</scroll-view>
-		</view>
-		<view class="empty-container" v-else>
-			<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AWdWzAAGlgAP0das422.png" mode="aspectFit"></image>
-			<text class="error-text">您还没有购买过任何商品哟~</text>
-		</view>
-		<!-- 可拖动悬浮按钮 -->
-		<cm-drag :cartNum="cartQuantity" 
-				 :isDock="true"
-				 :existTabBar="true" 
-				 @btnClick="btnClick" 
-				 @btnTouchstart="btnTouchstart" 
-				 @btnTouchend="btnTouchend">
-		</cm-drag>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
-	import modalLayer from "@/components/modal-layer"
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import cmDrag from '@/components/cm-custom/cm-drag.vue'
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'productList',
-		components:{
-			listSkeleton,
-			modalLayer,
-			uniStars,
-			cmDrag
-		},
-		data(){
-			return{
-				isShowClose:false,
-				searchInputVal:'',
-				isModallayer:false,
-				windowHeight: '',
-				showSkeleton: true,
-				isShowEmpty: false,
-				userID: '',
-				scrollHeight: '',
-				productList: [],
-				showLoading: false,
-				loadingNow: true,
-				loadingText: '上拉加载更多',
-				pageSize: 10,
-				pageNum: 1,
-				hasNextPage: false,
-				pullFlag: true,
-				fromRegularPurchasePage: false,
-				cartQuantity: 0,
-				showRegularBtn: false,
-				isPrecedence:false,
-				windowWidth:'',
-				windowHeight:'',
-			}
-		},
-		created() {
-			this.setScrollHeight();		
-			this.$parent.getClubProductNum()
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.userID = resolve.userID
-				this.getProductAgainInfo()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			scrolltolower() {
-				if(this.hasNextPage && this.pullFlag) {
-					this.getProductAgainInfo(true);
-				}
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			getProductAgainInfo(loadMore) {
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				this.isShowEmpty = false;				
-				if(loadMore) {this.pageNum += 1;}
-				let params = {userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.ProductService.GetRepeatBuyAgainProductList(params).then(response =>{
-					this.isShowWrapper = true
-					const responseData = response.data.pageDate;
-					if(responseData.results && responseData.results.length > 0){
-						this.hasNextPage = responseData.hasNextPage;
-						this.isShowEmpty = false;
-						if(loadMore) {
-							this.productList = [...this.productList,...responseData.results];
-						} else {
-							this.productList = [...responseData.results];
-							this.showSkeleton = false;
-						}
-						//价格显示处理
-						let isActFlg,newProductList=[];
-						this.productList.map((item, index)=> {
-							if(item.actStatus == 1){
-								isActFlg = true
-							}else if(item.actStatus == 1 && item.ladderPriceFlag == 1){
-								isActFlg = true
-							}else{
-								isActFlg = false
-							}
-							newProductList.push(Object.assign({},item,{isShowActFlg:isActFlg}))
-						})
-						this.productList = newProductList
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{
-							this.pullFlag = true;
-						},500)
-						// 底部提示文案
-						if(this.hasNextPage) {
-							this.loadingText = '上拉加载更多';
-						} else {
-							this.showLoading = true;
-							this.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) {
-							this.isShowEmpty = true;
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			operationHanld(prop){
-				this.$emit('operationConfim',prop)
-			},
-			navToDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
-				this.isModallayer = false;
-			},
-			repurchModel(){
-				this.$util.modal('','此商品的价格有变化,原来的购买价已不适用','知道了','',false,() =>{})
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
-				this.isShowClose = false
-			},
-			btnClick() {
-				this.$emit('goCartPage')
-			},
-			btnTouchstart() {
-				// console.log('btnTouchstart');
-			},
-			btnTouchend() {
-				// console.log('btnTouchend');
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-		}
-		.empty-container-image {
-			margin-top: -300rpx;
-		}
-		.toIndexPage {
-			bottom: 390rpx;
-		}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.all-type-list-content {
-		height: auto;
-		padding: 24rpx;
-		background: #fff;
-		margin-bottom: 2rpx;
-		display: flex;
-		flex-direction: row;
-		box-sizing: content-box;
-		.list-img {
-			width: 240rpx;
-			height: 240rpx !important;
-			margin-right: 26rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f3f3f3;
-		}
-	}
-	.list-details-info {
-		width: 442rpx;
-		flex-direction: column;
-		font-size: 26rpx;
-		position: relative;
-		.list-details-title {
-			line-height: 38rpx;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			line-clamp: 2;
-			-webkit-box-orient: vertical;
-		}
-		.list-details-specs {
-			width: 100%;
-			display: inline-block;
-			margin-top: 8rpx;
-			color: #999999;
-		}
-		.list-details-miniQuantity {
-			width: 100%;
-			display: inline-block;
-			margin-top: 7rpx;
-		}
-	}
-	.list-details-price {
-		width: 100%;
-		float: left;
-		line-height: 54rpx;
-		.floor-item-act{
-			height: 54rpx;
-			text-align: center;
-			box-sizing: border-box;
-			float: left;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				margin-left: 15rpx;
-				border: 1px solid #E15616;
-			}
-		}
-		.price-icon {
-			width: 22rpx;
-			height: 28rpx;
-			vertical-align: middle;
-			margin-right: 10rpx;
-		}
-		.price-icon + text {
-			font-size: 25rpx;
-			vertical-align: middle;
-		}
-		.list-login-now {
-			width: 375rpx;
-			color: #F8C499;
-			.p-no{
-				float: left;
-				font-size: $font-size-24;
-				color: $color-system;
-				margin-right: 10rpx;
-			}
-		}
-		.login-now {
-			padding: 10rpx 10rpx 10rpx 0;
-		}
-		.list-none{
-			margin-top: 15rpx;
-			.price-small{
-				font-size:$font-size-24;
-				line-height: 40rpx;
-				color: #FF2A2A;
-			}
-		}
-		.list-shop{
-			height: auto;
-			float: left;
-			.list-price {
-				width: 100%;
-				color: #FF2A2A;
-				float: left;
-				line-height:54rpx ;
-				align-items: center;
-				justify-content: center;
-				.price-larger {
-					font-size: $font-size-30;
-					display: inline-block;
-					&.none{
-						text-decoration: line-through;
-						color: #999999;
-					}
-				}
-			}
-			.list-price-none{
-				width: 100%;
-				.price-none{
-					text-decoration: line-through;
-					color: #999999;
-					display: inline-block;
-				}
-				.icon-wenhao{
-					font-size: $font-size-32;
-					color: #0091FF;
-					margin-left: 6rpx;
-				}
-			}
-		}
-		.add-cart-btn {
-			float: right;
-			width: 140rpx;
-			height: 54rpx;
-			line-height: 54rpx;
-			border-radius: 27rpx;
-			color: #fff;
-			font-size: 24rpx;
-			margin-right: 0;
-			background:#FFFFFF;
-			border: 1px solid #C9C9C9;
-			color: $text-color;
-		}
-	}
-	.cart-icon {
-		width: 92rpx;
-		height: 92rpx;
-		border-radius: 50%;
-		background: rgba(255, 147, 0, 0.5);
-		position: fixed;
-		right: 24rpx;
-		bottom: 28%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		cursor: pointer;
-		image {
-			width: 58rpx;
-			height: 58rpx;
-		}
-		text {
-			font-size: 28rpx;
-			position: absolute;
-			top: -10rpx;
-			right: 0;
-		}
-	}
-</style>

components/cm-module/listTemplate/commodityList.vue

@@ -1,449 +0,0 @@
-<!-- 分类商品模块 -->
-<template>
-	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<list-skeleton v-if="showSkeleton" :listType='0'></list-skeleton>
-		<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="toLower" scroll-y v-if="listData.length > 0">
-			<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
-				<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
-				<view class="list-details-info">
-					<text class="list-details-title">{{item.p_name}}</text>
-					<text class="list-details-specs">规格：{{item.p_unit}}</text>
-					<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">商品编码：{{item.p_code}}</view>
-					<view class="list-details-price">
-						<template v-if="userIdentity == 3">
-							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
-								</view>
-								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-							</view>
-							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-								<view class="floor-tags">阶梯价格</view>	
-							</view>
-						</template>
-						<template v-else>
-							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
-								</view>
-								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-							</view>
-							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-								<view class="floor-tags">阶梯价格</view>	
-							</view>
-						</template>
-						<view v-if="hasLogin" class="list-price">
-							<template v-if="userIdentity == 1">
-								<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
-								<template v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</template>	
-							<template v-if="userIdentity == 4">
-								<view class="price-larger" v-if="item.p_price_flag == '1'">
-									<text class="txt">￥未公开价格</text>
-								</view>
-								<view class="price-larger" v-if="item.p_price_flag == '2'">
-									<text class="txt">￥价格仅会员可见</text>
-								</view>
-								<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-								<template v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</template>
-							<template v-if="userIdentity == 3">
-								<template v-if="item.supplierId === shopId">
-									<view class="price-larger" v-if="item.p_price_flag == '1'">
-										<text class="txt">￥未公开价格</text>
-									</view>
-									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-								<template v-else>
-									<view  class="list-login-now">
-										<text class="p-no">￥</text>
-										<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-									</view>
-								</template>
-							</template>
-							<template v-if="userIdentity == 2">
-								<view class="price-larger" v-if="item.p_price_flag == '1'">
-									<text class="txt">￥未公开价格</text>
-								</view>
-								<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-								<template v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</template>
-						</view>	
-						<view  v-else class="list-login-now">
-							<text class="p-no">￥</text>
-							<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view v-if="showLoading && listData.length > 4">
-				<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-				<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-			</view>
-		</scroll-view>
-		<view class="empty-container" v-if="showEmpty">
-			<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"></image>
-			<text class="error-text">{{emptyText}}</text>
-		</view>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
-	import modalLayer from "@/components/modal-layer"
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import { searchQueryTinyType} from "@/services/public.js"
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'CommodityList',
-		components:{
-			listSkeleton,
-			modalLayer,
-			uniGrader
-		},
-		props: {
-			emptyText: {
-				type: String
-			},
-			serverUrl: {
-				type: String
-			},
-			typeId: {
-				type:Number
-			}
-		},
-		data(){
-			return{
-				clubStatus:'',
-				isModallayer:false,
-				windowHeight: '',
-				showSkeleton: true,
-				showEmpty: false,
-				userID:0,
-				shopId:0,
-				userIdentity:'',
-				priceLoading:true,
-				scrollHeight: '',
-				listData: [],
-				showLoading: false,
-				loadingNow: true,
-				loadingText: '上拉加载更多',
-				pageSize: 20,
-				pageNum: 1,
-				totalPage: 1,
-				pullFlag: true,
-				cartNum: 0,
-			}
-		},
-		created() {		
-			// console.log(this.typeId)
-			this.setScrollHeight();		
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity
-				this.getListFromServer();
-			}).catch(error =>{
-				this.getListFromServer();
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity'])
-		},
-		methods:{
-			toLower() {
-				if(this.totalPage>this.listData.length && this.pullFlag) {
-					this.getListFromServer(true);
-				}
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			getListFromServer(loadMore) {
-				this.getQueryGoodslist(loadMore)
-			},
-			getQueryGoodslist(loadMore){
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				if(loadMore) { this.pageNum += 1; }
-				let params ={
-						id:this.typeId,
-						identity:this.identity,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize,
-						sortField:'',
-						sortType:''
-				}
-				searchQueryTinyType(this.serverUrl,params).then(response=>{
-					const resData = JSON.parse(response.data);
-					const resList = resData.items;
-					if(resList && resList.length > 0){
-						this.showEmpty = false
-						this.totalPage = resData.total;
-						if(loadMore) {
-							this.listData = [...this.listData,...resList];
-							this.getProductPrice()
-							this.showSkeleton = false
-						} else {
-							this.listData = [...resList];
-							this.getProductPrice()
-							this.showSkeleton = false
-						}
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
-						// 底部提示文案
-						if(this.totalPage>this.listData.length) {
-							this.loadingText = '上拉加载更多';
-						} else {
-							this.showLoading = true;
-							this.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) { this.showEmpty = true; }
-					}
-					
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getProductPrice(){//获取价格
-				let productIdArr = [];
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
-				})
-				this.productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:this.productIds}).then(response =>{
-					if (response.data) {
-						this.listData = this.ReturnNewProducts(this.listData,response.data);
-					}
-					this.priceLoading = false;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewProducts(Array,list){//处理对应商品ID的商品价格
-				let NewArray = []
-				Array.map(item=>{
-					for (let i = 0; i < list.length; i++) {
-						if( item.p_id == list[i].productId ){
-							NewArray.push(Object.assign(item,list[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			navToDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
-				this.isModallayer = false;
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-			border-top: 2rpx solid rgba(0,0,0,0.07);
-		}
-		.empty-container-image {
-			margin-top: -300rpx;
-		}
-		.toIndexPage {
-			bottom: 390rpx;
-		}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.all-type-list-content {
-		height: 216rpx;
-		padding: 24rpx;
-		background: #fff;
-		margin-bottom: 2rpx;
-		display: flex;
-		flex-direction: row;
-		box-sizing: content-box;
-		.list-img {
-			width: 210rpx;
-			height: 218rpx !important;
-			margin-right: 26rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f3f3f3;
-		}
-	}
-	.list-details-info {
-		width: 466rpx;
-		display: flex;
-		flex-direction: column;
-		font-size: 26rpx;
-		position: relative;
-		.list-details-title {
-			line-height: 36rpx;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			line-clamp: 2;
-			-webkit-box-orient: vertical;
-		}
-		.list-details-specs {
-			margin-top: 8rpx;
-			color: #666666;
-		}
-		.list-details-miniQuantity {
-			margin-top: 7rpx;
-		}
-	}
-	.list-details-price {
-		width: 100%;
-		height: 54rpx;
-		line-height: 54rpx;
-		.floor-item-act{
-			height: 54rpx;
-			text-align: center;
-			box-sizing: border-box;
-			float: right;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				margin-left: 15rpx;
-				border: 1px solid #E15616;
-			}
-		}
-		.price-icon {
-			width: 22rpx;
-			height: 28rpx;
-			vertical-align: middle;
-			margin-right: 10rpx;
-		}
-		.price-icon + text {
-			font-size: 25rpx;
-			vertical-align: middle;
-		}
-		.list-login-now {
-			color: #F8C499;
-			float: left;
-			line-height: 54rpx;
-			.p-no{
-				float: left;
-				font-size: $font-size-24;
-				color: $text-color;
-			}
-		}
-		.login-now {
-			padding: 10rpx 10rpx 10rpx 0;
-		}
-		.list-price {
-			color: #FF2A2A;
-			height: 44rpx;
-			float: left;
-			.price-larger {
-				width: 100%;
-				height: 44rpx;
-				font-size: 32rpx;
-				&.none{
-					text-decoration: line-through;
-					color: #999999;
-				}
-				&.small{
-					font-size: $font-size-24;
-				}
-				.txt{
-					font-size: $font-size-24;
-					display: inline-block;
-					line-height: 44rpx;
-					text-align: left;
-					float: left;
-				}
-			}
-		}
-		.add-cart-btn {
-			width: 156rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			border-radius: 32rpx;
-			color: #fff;
-			font-size: 26rpx;
-			margin-right: 0;
-			background:linear-gradient(45deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
-		}
-	}
-	.cart-icon {
-		width: 92rpx;
-		height: 92rpx;
-		border-radius: 50%;
-		background: rgba(255, 147, 0, 0.5);
-		position: fixed;
-		right: 24rpx;
-		bottom: 30%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		cursor: pointer;
-		image {
-			width: 58rpx;
-			height: 58rpx;
-		}
-		text {
-			font-size: 28rpx;
-			position: absolute;
-			top: -10rpx;
-			right: 0;
-		}
-	}
-</style>

components/cm-module/listTemplate/productList.vue

@@ -24,7 +24,7 @@
 									</text>
 								</view>
 							</view>
-							<button class="add-cart-btn" @click.stop="operationHanld(item)">数量</button>
+							<button class="add-cart-btn" @click.stop="operationHanld(item)">购买</button>
 						</view>
 						<view class="list-details-price" v-if="item.actStatus==1">
 							<view class="floor-item-act">

components/cm-module/listTemplate/secondHand.vue

@@ -1,828 +0,0 @@
-<template>
-	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<view class="good-search clearfix" v-if="searchStatus">
-			<view class="good-search-top">
-				<view class="search-from name">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-						<input class="input"  
-							   type="text" 
-							   :focus="isFocus"
-							   confirm-type="search" 
-							   v-model="searchKeyword" 
-							   placeholder="请输入商品关键词" 
-							   @input="onShowClose" 
-							   @confirm="searchOpertor"
-							   maxlength="20"/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText"></text>
-				</view>
-				<view class="search-btn">
-					<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
-				</view>
-			</view>
-			<view class="good-search-tabs">
-				<view class="good-search-tabs-t">
-					<view class="tabs-item" 
-						  :class="{ active: tabIndex === 1 }" 
-						  @click="changeTabsFirst(1)">{{tabIndexSelectText}}
-						  <text class="iconfont icon-xiangxia1" :class="isTabIndexSelect ? 'reto': '' "></text>
-					</view>
-					<view class="tabs-item" :class="{ active: tabIndex === 2 }" @click="changeTabs(2)">临期产品</view>
-					<view class="tabs-item" :class="{ active: tabIndex === 3 }" @click="changeTabs(3)">其他</view>
-				</view>
-				<view class="tabs-item-first clearfix" v-if="isTabIndexSelect">
-					<view class="tabs-item" 
-						  v-for="(item,index) in screenTabs" 
-						  :key="index" 
-						  :class="{ active: screenTab === index }" 
-						  @click="changeScreenTabs(item,index)"
-					>
-						  {{item}}
-						  <text class="iconfont icon-gou" v-if="screenTab === index"></text>
-					</view>
-				</view>	
-			</view>
-		</view>
-		<!-- 顶部tab遮罩层 -->
-		<view class="popup-tabs" v-if="isTabIndexSelect" @touchmove.stop.prevent="discard" @tap="hideTabIndexSelect">
-			<view class="mask"></view>
-		</view>
-		<list-skeleton v-if="showSkeleton"></list-skeleton>
-		<view class="empty-container" v-if="isShowEmpty" >
-			<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"></image>
-			<text class="error-text">{{isShowEmptyText}}</text>
-		</view>
-		<!-- 二手商品 -->
-		<view class="product-container" v-else >
-			<view :class="tabIndex"  :style="{paddingTop:searchStatus?'160rpx':''}">
-				<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="listData.length > 0">
-					<view v-for="(item,index) in listData" :key="index" :id="item.id" :productid="item.productID" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productID)"  >
-					    <image mode='widthFix' :src="item.mainImage"  class="list-img" alt="list-img"></image>
-						<view class="list-details-info">
-							<view class="list-details-title"> 
-								<view class="tabs" v-if="item.newAdded == 1">
-									<image mode='widthFix' src="../../../static/temp/icon-new@2x.png"  class="list-tags"></image>
-								</view>
-								<view class="name" :style="{paddingLeft:item.newAdded == 1 ? '38rpx' :'0rpx'}">{{isInterceptHtmlFn(item.name)}}</text></view>
-							</view>	
-							<view class="list-details-price">
-								<view class="list-shop">
-									<view class="list-price">
-										<text class="price-larger">￥{{toFixedFn(item.price1)}}</text>
-									</view>
-								</view>
-								<button class="add-cart-btn" @click.stop="operationHanld(item)">数量</button>
-							</view>
-						</view>
-					</view>
-					<view v-if="showLoading && listData.length > 4 && !showRegularBtn">
-						<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-						<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 可拖动悬浮按钮,点击跳转购物车 ,暂时隐藏 ,后面需要的话放开即可 -->
-<!-- 		<cm-drag :cartNum="cartQuantity" 
-				 :isDock="true"
-				 :existTabBar="true" 
-				 @btnClick="btnClick" 
-				 @btnTouchstart="btnTouchstart" 
-				 @btnTouchend="btnTouchend">
-		</cm-drag>	 -->	
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
-	import modalLayer from "@/components/modal-layer"
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import cmDrag from '@/components/cm-custom/cm-drag.vue'
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'productList',
-		components:{
-			listSkeleton,
-			modalLayer,
-			uniStars,
-			cmDrag
-		},
-		props: {
-			searchStatus:{
-				type:Boolean,
-				default:false
-			}
-		},
-		data(){
-			return{
-				isShowClose:false,
-				isModallayer:false,
-				windowHeight: '',
-				showSkeleton: false,
-				isShowEmpty: false,
-				isShowEmptyText: '搜索相关商品',
-				clubUserId: '',
-				searchKeyword:'',//搜索关键字
-				secondHandType:1,//二手商品分类
-				instrumentType:'',//二手仪器分类
-				isFocus:false,
-				scrollHeight: '',
-				listData: [],
-				showLoading: false,
-				loadingNow: true,
-				loadingText: '上拉加载更多',
-				pageSize: 10,
-				pageNum: 1,
-				totalPage:1,
-				hasNextPage: false,
-				pullFlag: true,
-				cartQuantity: 0,
-				showRegularBtn: false,
-				isPrecedence:false,
-				ladderPriceList:[],//是否 阶梯,
-				goodsList:[],
-				isShow: false,
-				screenTabs:['二手仪器','轻光电','重光电','耗材配件'],
-				tabIndex:1,
-				screenTab:0,
-				isTabIndexSelect:false,
-				tabIndexSelectText:'二手仪器'
-			}
-		},
-		created() {
-			this.setScrollHeight();		
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				if(resolve.userIdentity == 1){
-					this.identity = 1
-				}
-			}).catch(error =>{
-				console.log(error)
-			})
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubUserId = resolve.userID
-			})
-			this.getProductAgainInfo()
-			this.isFocus = true
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			scrolltolower() {
-				if(this.hasNextPage && this.pullFlag) {
-					this.getProductAgainInfo(true);
-				}
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			getProductAgainInfo(loadMore) {//搜索商品
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				this.isShowEmpty = false;				
-				if(loadMore) {this.pageNum += 1;}
-				let params = {
-						secondHandType:this.secondHandType,
-						instrumentType:this.instrumentType,
-						searchKeyword:this.searchKeyword,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize
-				}
-				this.SellerService.GetOrderSecondHandProductList(params).then(response =>{
-					this.isShowWrapper = true
-					const resData = response.data
-					const results = resData.results
-					if(results && results.length > 0){
-						this.hasNextPage = resData.hasNextPage;
-						this.showEmpty = false;
-						if(loadMore) {
-							this.listData = [...this.listData,...results];
-						} else {
-							this.listData = [...results];
-							this.showSkeleton = false;
-						}
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
-						// 底部提示文案
-						if(this.hasNextPage) {
-							this.loadingText = '上拉加载更多';
-						} else {
-							this.showLoading = true;
-							this.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) {
-							this.isShowEmpty = true;
-							this.isShowEmptyText ='暂无相关商品'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			searchOpertor(){//搜索商品
-				if(this.searchKeyword == ''){
-					// this.$util.msg('请输入商品关键词',2000)
-					this.secondHandType = 1
-					this.instrumentType=''
-					this.getProductAgainInfo();
-				}else{
-					this.pageNum = 1
-					this.showSkeleton = true;
-					this.getProductAgainInfo();
-					this.isFocus = false
-				}
-			},
-			operationHanld(prop){
-				this.$emit('operationConfim',prop);
-			},
-			navToDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
-				this.isModallayer = false;
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchKeyword != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchKeyword = '';
-				this.listData =[];
-				this.isFocus = true
-				this.isShowClose = false;
-				this.loadingNow = false;
-				this.isShowEmpty = true;
-				this.isShowEmptyText ='暂无相关商品'
-				this.secondHandType = 1;
-				this.instrumentType='';
-				this.getProductAgainInfo();
-			},
-			isInterceptHtmlFn(text){
-				let name = this.$reg.interceptHtmlFn(text)
-				return name
-			},
-			changeTabs(index){
-				this.tabIndex = index
-				this.secondHandType = index
-				this.isTabIndexSelect = false
-				if(this.tabIndex == 2 || this.tabIndex ==3){
-					this.instrumentType = ''
-					this.getProductAgainInfo()
-				}
-			},
-			changeTabsFirst(index){
-				this.tabIndex = index
-				this.secondHandType = index
-				this.isTabIndexSelect = !this.isTabIndexSelect
-			},
-			changeScreenTabs(item,index){
-				this.screenTab = index
-				this.isTabIndexSelect = false
-				this.tabIndexSelectText = item
-				this.instrumentType = index
-				if(index==0){
-					this.instrumentType=''
-				}
-				this.getProductAgainInfo();
-			},
-			toFixedFn(text){//处理小数点后两位数
-				return Number(text).toFixed(2);
-			},
-			hideTabIndexSelect(){
-				this.isTabIndexSelect = false
-			},
-			discard(){
-				//丢弃
-			},
-			btnClick() {
-				this.$emit('goCartPage')
-			},
-			btnTouchstart() {
-				// console.log('btnTouchstart');
-			},
-			btnTouchend() {
-				// console.log('btnTouchend');
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	
-	.all-zuhe-list{
-		background: #FFFFFF;
-	}
-	.foot_conten{
-		width: 655rpx;
-		background: #fff;
-		font-size: 28rpx;
-		height: 80rpx;
-		// line-height: 80rpx;
-		display: inherit;
-		padding: 10px;
-		overflow: hidden;
-		margin: 20rpx auto;
-	}
-	.zuhe_foot-box{
-		float: left;
-		overflow: hidden;
-		white-space: nowrap;
-		// text-overflow: ellipsis;
-		width: 490rpx;
-	}
-	.zuhe_foot-box text{
-		margin-right: 36rpx;
-	}
-	.foot_text{
-		color: #FF2A2A;
-	}
-	.foot_conten .buycart{
-		width: 162rpx;
-		height: 64rpx;
-		background: #EFAF00 !important;
-		color: #fff;
-		font-size: 28rpx;
-		border-radius: 36rpx;
-		text-align: center;
-		line-height: 64rpx;
-		float: right;
-	}
-	.price-none{
-		font-size: 24rpx;
-		color: #666666;
-		}
-	.zuhe_title{
-		background:#FFFFFF;
-		height: 76rpx;
-		font-size: 28rpx;
-		color: #1675E1;
-		border-bottom: 4rpx solid #1675E1 ;
-		line-height: 76rpx;
-		padding-left: 30rpx;
-		&.active{
-			color: #E15616;
-			border-bottom: 4rpx solid #E15616;
-		}
-	}
-	.tabstyle{
-		width: 128rpx;
-		height: 76rpx;
-		font-size: 26rpx;
-		display: inline-block;
-		border-radius: 10rpx;
-		text-align: center;
-		line-height: 76rpx;
-		border: 2rpx solid #EEEEEE;
-		position: relative;
-		margin-right: 12rpx;
-		&.addstyle{
-			background: $btn-confirm;
-			color: #FFFFFF;
-			&::before{
-				content: "";
-				width: 0;
-				height: 0;
-				border-top: 20rpx solid transparent;
-				border-right: 20rpx solid #FFFFFF;
-				border-left: 20rpx solid transparent;
-				border-bottom: 20rpx solid #FFFFFF;
-				position: absolute;
-				right: 0;
-				bottom: 0;
-			}
-		}
-		.icon-gou{
-			width: 36rpx;
-			height: 36rpx;
-			line-height: 36rpx;
-			text-align: center;
-			color: #E15616;	
-			position: absolute;
-			bottom: -5rpx;
-			right: -5rpx;
-			font-weight: bold;
-			font-size: $font-size-28;
-		}
-	}
-	.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-		}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.good-search{
-		height: auto;
-		width: 702rpx;
-		padding: 10rpx 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-		position: fixed;
-		flex-direction: column;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.good-search-top{
-			width: 702rpx;
-			height: 70rpx;
-			flex: 1;
-			.search-from{
-				width: 582rpx;
-				height: 70rpx;
-				background: #F7F7F7;
-				border-radius: 40rpx;
-				float: left;
-				position: relative;
-				.input{
-					width: 340rpx;
-					height: 70rpx;
-					float: left;
-					line-height: 70rpx;
-					color: $text-color;
-					font-size: $font-size-24;
-				}
-				.icon-iconfonticonfontsousuo1{
-					width: 64rpx;
-					height: 70rpx;
-					line-height: 70rpx;
-					text-align: center;
-					display: block;
-					font-size: $font-size-38;
-					float: left;
-					color: #999999;
-				}
-				.icon-shanchu1{
-					font-size: $font-size-32;
-					color: #999999;
-					position: absolute;
-					width: 120rpx;
-					height: 70rpx;
-					line-height: 70rpx;
-					top: 0;
-					right: 0;
-					text-align: center;
-					z-index: 10;
-				}
-			}
-			.search-btn{
-				// width: 120rpx;
-				line-height: 70rpx;
-				text-align: center;
-				font-size: $font-size-28;
-				color: $color-system;
-				float: left;
-				background: #FFFFFF;
-				margin-left: 10rpx;
-			}
-		}
-		.good-search-tabs{
-			width: 702rpx;
-			height: auto;
-			flex: 1;
-			position: relative;
-			.good-search-tabs-t{
-				height: 64rpx;
-				width: 702rpx;
-				padding: 10rpx 0;
-				display: flex;
-				justify-content: center;
-				justify-items: center;
-				.tabs-item{
-					flex: 1;
-					height: 64rpx;
-					border-radius: 10rpx;
-					background: #F7F7F7;
-					margin-right: 22rpx;
-					line-height: 64rpx;
-					font-size: $font-size-28;
-					color: #333333;
-					text-align: center;
-					position: relative;
-					.icon-xiangxia1{
-						width: 64rpx;
-						height: 64rpx;
-						line-height: 64rpx;
-						text-align: center;
-						color: #333333;
-						font-size: $font-size-24;
-						transform:rotate(0deg);
-						&.reto{
-							transform:rotate(180deg);
-						}
-					}
-					&.active{
-						color: $color-system;
-						.icon-xiangxia1{
-							color: $color-system;
-						}
-					}
-					&:last-child{
-						margin-right: 0;
-					}
-				}
-			}
-			.tabs-item-first{
-				position: absolute;
-				bottom: -308rpx;
-				left: -24rpx;
-				height: auto;
-				width: 702rpx;
-				background-color: #FFF;
-				z-index: 999;
-				padding: 0 24rpx 10rpx 24rpx;
-				border-top: 1px solid #F7F7F7;
-				.tabs-item{
-					width: 100%;
-					height: 70rpx;
-					line-height: 70rpx;
-					font-size: $font-size-28;
-					color: #333333;
-					text-align: left;
-					float: left;
-					position: relative;
-					border-bottom: 1px solid #F7F7F7;
-					&:last-child{
-						border-bottom: none;
-					}
-					.icon-gou{
-						display: block;
-						width: 70rpx;
-						height: 70rpx;
-						line-height: 70rpx;
-						text-align: center;
-						color: #333333;
-						font-size: $font-size-40;
-						position: absolute;
-						right: 0;
-						top: 0;
-					}
-					&.active{
-						color: $color-system;
-						.icon-gou{
-							color: $color-system;
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	.all-type-list-content {
-		// height: 240rpx;
-		padding: 24rpx;
-		background: #fff;
-		margin-bottom: 2rpx;
-		display: flex;
-		flex-direction: row;
-		box-sizing: content-box;
-		.list-img {
-			width: 312rpx;
-			height: 207rpx !important;
-			margin-right: 26rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f3f3f3;
-		}
-	}		
-	.list-details-info {
-		width: 100%;
-		flex-direction: column;
-		font-size: 26rpx;
-		position: relative;
-		.list-details-title {
-			position: relative;
-			.tabs{
-				width: 38rpx;
-				height: 38rpx;
-				position: absolute;
-				top: 0;
-				left: 0;
-				image{
-					width: 38rpx;
-					height: 38rpx;
-					display: block;
-				}
-			}
-			.name{
-				width: 100%;
-				line-height: 38rpx;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				line-clamp: 2;
-				-webkit-box-orient: vertical;
-			}
-		}
-		.list-details-specs {
-			width: 100%;
-			display: inline-block;
-			margin-top: 8rpx;
-			color: #666666;
-		}
-		.list-details-miniQuantity {
-			width: 100%; 
-			display: inline-block;
-			margin-top: 7rpx;
-		}
-	}
-	.list-details-price {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;		
-		margin-top: 80rpx;
-		.price-icon {
-			width: 22rpx;
-			height: 28rpx;
-			vertical-align: middle;
-			margin-right: 10rpx;
-		}
-		.price-icon + text {
-			font-size: 25rpx;
-			vertical-align: middle;
-		}
-		.list-login-now {
-			width: 375rpx;
-			color: #F8C499;
-			position: absolute;
-			bottom: 0;
-			.p-no{
-				float: left;
-				font-size: $font-size-24;
-				color: $color-system;
-				margin-right: 10rpx;
-			}
-		}
-		.login-now {
-			padding: 10rpx 10rpx 10rpx 0;
-		}
-		.list-none{
-			margin-top: 15rpx;
-			.price-small{
-				font-size:$font-size-24;
-				line-height: 40rpx;
-				color: #FF2A2A;
-			}
-		}
-		.list-price-loding{
-			flex: 6;
-			font-size:$font-size-24;
-			line-height: 64rpx;
-			color: #FF2A2A;
-		}
-		.list-shop{
-			width: 100%;
-			height: auto;
-			flex: 6;
-			overflow: hidden;
-			.list-price {
-				// width: 100%;
-				color: #FF2A2A;
-				float: left;
-				line-height:36rpx ;
-				align-items: center;
-				justify-content: center;
-				.price-larger {
-					margin-top: 20rpx;
-					font-size: $font-size-30;
-					display: inline-block;
-					margin-right: 20rpx;
-				}
-				.zuhe_price-larger{
-					color: #666666;
-					// float: left;
-					// margin-right: 85rpx;
-				}
-				.price-two{
-					color: #666666;
-					float: left;
-					
-				}
-				.zuhe_list_zj{
-					color: #FF2A2A;
-				}
-				.price-view{
-					display: inline-block;
-					width: 40rpx;
-					border-radius: 10rpx;
-					font-size: $font-size-22;
-					text-align: center;
-					color: #FFFFFF;
-					height: 36rpx;
-					line-height: 36rpx;
-					margin-right: 8rpx;
-					&.ladder{
-						background: linear-gradient(135deg,rgba(255,0,0,1) 0%,rgba(242,143,49,1) 100%);
-					}
-					&.activity{
-						background: linear-gradient(135deg,rgba(128,0,255,1) 0%,rgba(242,49,153,1) 100%);
-					}
-				}
-			}
-			.zuhe_list_price .price-view{
-				margin-left:20rpx;
-				float: left;
-				margin-top: 5rpx;
-			}
-			.zuhe_list_price{
-				width: 400rpx;
-				overflow: hidden;
-				margin-top: 10rpx;
-			}
-			.count{
-				margin-top: 50rpx;
-				float: right;
-				border: 1px solid #EEEEEE;
-				border-radius: 10rpx;
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					.iconfont{
-						font-size: $font-size-24;
-						padding:0 16rpx;
-						color: $text-color;
-						text-align: center;
-						line-height: 48rpx;
-						font-weight: bold;
-					}
-					.btn-input{
-						width: 100rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #F8F8F8;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-24;
-						border-right: 1px solid #EEEEEE;
-						border-left: 1px solid #EEEEEE;
-					}
-				}
-			}
-			.list-price-none{
-				width: 100%;
-				.price-none{
-					text-decoration: line-through;
-					color: #999999;
-					display: inline-block;
-				}
-				.icon-wenhao{
-					font-size: $font-size-32;
-					color: #0091FF;
-					margin-left: 6rpx;
-				}
-			}
-		}
-		.add-cart-btn {
-			flex: 4;
-			width: 156rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			border-radius: 32rpx;
-			color: #333333;
-			font-size: 26rpx;
-			margin-right: 0;
-			// background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-			background: #FFFFFF;
-			border: 2rpx solid #C9C9C9;
-		}
-		.zuhe_btn{
-			float: right;
-		}
-	}
-	.popup-tabs{
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 888;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-	}
-</style>

components/thorui/tui-modal/tui-modal.vue

@@ -247,22 +247,22 @@
 	}
 
 	.tui-danger {
-		background: #E15616;
+		background: #191919;
 		color: #fff;
 	}
 
 	.tui-danger-hover {
-		background: #d53912;
+		background: #191919;
 		color: #e5e5e5;
 	}
 
 	.tui-danger-outline {
-		color: #E15616;
+		color: #191919;
 		background: transparent;
 	}
 
 	.tui-danger-outline::after {
-		border: 1px solid #E15616;
+		border: 1px solid #191919;
 	}
 
 	.tui-red {

pages.json

@@ -33,13 +33,21 @@
 	],
 	"subPackages": [{
 			"root": "pages/goods/", //商品模块
-			"pages": [{
-				"path": "product",
-				"style": {
-					"navigationBarTitleText": "商品详情",
-					"navigationStyle": "custom"
+			"pages": [
+				{
+					"path": "product",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "立即下单"
+					}
 				}
-			}]
+			]
 		},
 		{
 			"root": "pages/user/", //机构个人中心模块

pages/user/address/address.vue

@@ -13,15 +13,18 @@
 						<view class="u-box">
 							<text class="name">{{item.shouHuoRen}}</text>
 							<text class="mobile">{{item.mobile}}</text>
+							<text v-if="item.defaultFlag == 1" class="default-tags">默认</text>
 						</view>
 						<view class="u-box b-b">
-							<text class="address">收货地址：{{item.province}}{{item.city}}{{item.town}}{{item.address}}</text>
+							<text class="address"><text class="label">收货地址：</text>{{item.province}}{{item.city}}{{item.town}}{{item.address}}</text>
 						</view>
 						<view class="u-box b-t">
 							<view v-if="item.defaultFlag == 1" class="tag-left">
-								<view class="tag">默认地址</view>
+								<view class="tag"><text class="iconfont icon-xuanze"></text><text>已设为默认地址</text></view>
+							</view>
+							<view v-else class="tag-left">
+								<view class="tag"><text class="iconfont icon-weixuanze"></text><text>设为默认地址</text></view>
 							</view>
-							<view v-else class="tag-left"></view>
 							<view class="tag-right">
 								<view class="t-b"  @click.stop="deleteAddress(item.addressID)">
 									<text class="iconfont icon-shanchu"></text>
@@ -39,17 +42,15 @@
 			</scroll-view>
 			<view class="add-btn" @click="addAddress('add')">添加新地址</view>
 		</view>
-		<!-- 删除弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText' 
-					 @btnConfirm ='confirmDetele'>
-		</model-alert>
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
 	</view>
 </template>
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
 	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
+	import { addressList } from '@/common/json/data.json.js' //本地数据
+	
 	export default {
 		components:{
 			modelAlert
@@ -62,18 +63,21 @@
 				userID:'',
 				pageNum:1,
 				pageSize:10,
-				addressList: [],
+				addressList: addressList,
 				hasNextPage:false,
 				allowDataStatus:true,
 				wrapperHeight:'100%',
 				scrollHeight:'',
 				currPage:'',//当前页面
-				prevPage:''//上一个页面
+				prevPage:'',//上一个页面
+				modal:false,
+				contentModalText:''
 			}
 		},
 		onLoad(option){	
 			if(option.type=='select'){this.isSelect = true;}
 			this.setScrollHeight();
+			console.log(this.addressList)	
 		},
 		onReachBottom() {
 			if(this.isLoadMore) {
@@ -131,12 +135,12 @@
 			},
 			addAddress(type,item){
 				uni.navigateTo({
-					url: `/seller/pages/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+					url: `/pages/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
 				})
 			},
-			//删除收货地址
-			deleteAddress(id){
-				this.$util.modal('','确定要删除该地址？','确定','取消',true,() =>{
+			handleClick(e) {//用户操作订单
+				let index = e.index;
+				if(index == 1){
 					this.UserService.DeleteNewAddress({addressID:id,userID:this.userID}).then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
 						setTimeout(() =>{
@@ -152,19 +156,28 @@
 							})
 						},1000)
 					})
-				})
+				}
+				this.modal = false;
+			},
+			hideMobel(){
+				this.modal = false;
+			},
+			//删除收货地址
+			deleteAddress(id){
+				this.modal = true;
+				this.contentModalText = '确认删除该地址吗？';
 			}
 		},
 		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-				this.pageNum = 1;
-				this.addressList = [];
-				this.initAddressList();
-				var pages = getCurrentPages();
-				var prevPage = pages[pages.length - 2];  //上一个页面	
-					// prevPage.setData({select:''})
-			})
+			// this.$api.getStorage().then((resolve) =>{
+			// 	this.userID = resolve.userID
+			// 	this.pageNum = 1;
+			// 	this.addressList = [];
+			// 	// this.initAddressList();
+			// 	var pages = getCurrentPages();
+			// 	var prevPage = pages[pages.length - 2];  //上一个页面	
+			// 		// prevPage.setData({select:''})
+			// })
 		}
 	}
 </script>
@@ -189,15 +202,15 @@
 		padding: 24rpx;
 		background: #FFFFFF;
 		position: relative;
-		border-bottom: 1px solid #EBEBEB;
+		margin-bottom: 20rpx;
 	}
 	.wrapper{
 		display: flex;
 		flex-direction: column;
 		flex: 1;
 	}
-	.u-box.b-b{
-		
+	.u-box .label{
+		color: #999999;
 	}
 	.u-box.b-b{
 		margin-bottom:24rpx;
@@ -219,18 +232,36 @@
 		.mobile{
 			font-weight: bold;
 		}
+		.default-tags{
+			margin-left: 10rpx;
+			display: block;
+			width: 72rpx;
+			height: 32rpx;
+			border-radius: 16rpx;
+			background-color: #fff3e2;
+			color: #c4761f;
+			line-height: 32rpx;
+			text-align: center;
+			font-size: 22rpx;
+		}
 		.tag-left{
 			flex: 6;
 			.tag{
-				width: 120rpx;
+				width: 280rpx;
 				height: 40rpx;
-				background: $color-system;
-				border-radius: 20rpx;
-				font-size: $font-size-24;
-				color: #FFFFFF;
+				font-size: $font-size-26;
+				color: #999999;
 				line-height: 40rpx;
-				text-align: center;
-				padding: 0 6rpx;
+				.icon-xuanze{
+					color: #333333;
+					font-size: 38rpx;
+					margin-right: 10rpx;
+				}
+				.icon-weixuanze{
+					color: #999999;
+					font-size: 38rpx;
+					margin-right: 10rpx;
+				}
 			}
 		}
 		.tag-right{
@@ -247,11 +278,11 @@
 				}
 			}
 			.icon-shanchu{
-				color:#FF2A2A ;
+				color:#333333 ;
 				margin-right: 8rpx;
 			}
 			.icon-bianji{
-				color: #2A7AFF;
+				color: #333333;
 				margin-right: 8rpx;
 			}
 		}

pages/user/cart/cart.vue

@@ -13,7 +13,7 @@
 							<view class="shoptitle">
 								<!--选择商店的全部商品 :disabled="isNnder"-->
 								<view class="checkbox-box" @click.stop="checkShop(item)">
-									<view class="checkbox iconfont" :class="[item.checked ?'icon-yixuanze':'icon-weixuanze']"></view>
+									<view class="checkbox iconfont" :class="[item.checked ?'icon-xuanze':'icon-weixuanze']"></view>
 								</view>
 								<view v-if="item.promotions" class="floor-item-act">
 									<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>	
@@ -25,7 +25,7 @@
 									<view class="goods-pros-t">
 										<!--选择商品-->
 										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)">
-											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
+											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-xuanze':'icon-weixuanze']"></view>
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)">
 											<image :src="pros.mainImage ? pros.mainImage :''" alt="" />
@@ -90,7 +90,7 @@
 										<!--选择商品-->
 										<view class="checkbox-box" @click.stop="ischeckFailure(failure)" v-if="isshowDelbtn">
 											<button class="checkbox iconfont" 
-													:class="[ failure.productsChecked ? 'icon-yixuanze':'icon-weixuanze']">
+													:class="[ failure.productsChecked ? 'icon-xuanze':'icon-weixuanze']">
 											</button>
 										</view>
 										 <text class="img-tip">失效</text>
@@ -119,7 +119,7 @@
 				<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 					<view class="footer-le">
 						<view class="foot-check checkbox-box" @tap.stop="checkAll()">
-							<button class="checkbox iconfont" :class="[isCheckAll?'icon-yixuanze':'icon-weixuanze']"></button> 
+							<button class="checkbox iconfont" :class="[isCheckAll?'icon-xuanze':'icon-weixuanze']"></button> 
 							<view class="text">全选</view>
 						</view>
 						<view class="sum">
@@ -924,7 +924,7 @@
 			overflow: hidden;
 			background-color:#FFFFFF;
 			font-size: 36rpx;
-			color:$color-system;
+			color:#191919;
 			padding: 5rpx;
 			&.icon-weixuanze{
 				color: #b2b2b2;
@@ -1183,17 +1183,17 @@
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						border: 2rpx solid #ffe6dc;
+						border: 2rpx solid #e1e1e1;
 						border-radius: 30rpx;
 						height: 48rpx;
 						.iconfont{
 							font-size: $font-size-24;
 							padding:0 18rpx;
-							color: #999999;
+							color: #333333;
 							text-align: center;
 							line-height: 48rpx;
 							font-weight: bold;
-							background: #fef6f3;
+							background: #FFFFFF;
 							&.icon-jianhao{
 								border-radius: 30rpx 0 0 30rpx;
 							}
@@ -1208,8 +1208,10 @@
 							border-radius: 4rpx;
 							text-align: center;
 							font-size: $font-size-24;
-							border-bottom: 2rpx solid #ffe6dc;
-							border-top: 2rpx solid #ffe6dc;
+							border-bottom: 2rpx solid #e1e1e1;
+							border-top: 2rpx solid #e1e1e1;
+							color: #333333;
+							background-color: #f7f7f7;
 						}
 					}
 					.uni-numbox{

pages/user/cart/immediately.vue

@@ -569,18 +569,17 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					border: 2rpx solid #ffe6dc;
+					border: 2rpx solid #e1e1e1;
 					border-radius: 30rpx;
 					height: 48rpx;
-					margin-left: 20rpx;
 					.iconfont{
 						font-size: $font-size-24;
 						padding:0 18rpx;
-						color: #999999;
+						color: #333333;
 						text-align: center;
 						line-height: 48rpx;
 						font-weight: bold;
-						background: #fef6f3;
+						background: #FFFFFF;
 						&.icon-jianhao{
 							border-radius: 30rpx 0 0 30rpx;
 						}
@@ -589,13 +588,16 @@
 						}
 					}
 					.btn-input{
-						width: 80rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #FFFFFF;
+						width: 62rpx;
+						height: 44rpx;
+						line-height: 44rpx;
 						border-radius: 4rpx;
 						text-align: center;
-						font-size: $font-size-28;
+						font-size: $font-size-24;
+						border-bottom: 2rpx solid #e1e1e1;
+						border-top: 2rpx solid #e1e1e1;
+						color: #333333;
+						background-color: #f7f7f7;
 					}
 				}
 				.product-step{

uni.scss

@@ -12,10 +12,10 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 /* 颜色变量 */
-$color-system:#E15616;
+$color-system:#191919;
 $border-color:#EBEBEB;
 $text-color:#333333;
-$btn-confirm:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+$btn-confirm:#191919;
 $btn-cancel:#EEC1AB;
 $bg-color:#ffffff;
 $sub-bg-color: #F7F7F7;