Prechádzať zdrojové kódy

COMMIT -m 接口联调

zhengjinyi 4 rokov pred
rodič
commit
57db993d1d

+ 1 - 1
components/tui-components/nomore/nomore.vue

@@ -18,7 +18,7 @@
 			//当前页面背景颜色
 			bgcolor: {
 				type: String,
-				default: "#FFFFFF"
+				default: "#F7F7F7"
 			},
 			//是否以圆点代替 "没有更多了"
 			isDot: {

+ 8 - 1
pages.json

@@ -64,11 +64,18 @@
 				"navigationBarTitleText":"商品详情",
 				"navigationStyle":"custom"
 			}
+		},
+		{
+			"path":"pages/goods/product-activi",
+			"style":{
+				"navigationBarTitleText":"商品详情",
+				"navigationStyle":"custom"
+			}
 		}
 
 	],
 	"subPackages": [{
-		"root": "pages/user/", //机构个人中心模块
+		"root": "pages/user/", //个人中心模块
 		"pages": [
 			{
 				"path": "address/addressManage",

+ 18 - 35
pages/goods/cart.vue

@@ -2,7 +2,7 @@
 	<view class="container cart clearfix" v-if="hasLogin" :style="{paddingTop:CustomBar+'px'}"> 	
 		<headerNavbar :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></headerNavbar>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
+		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn || goodsList.length == 0 ? '0rpx':'80rpx'}">
 			<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0" :style="{top:CustomBar+'px'}">
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>
@@ -157,7 +157,6 @@
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isIphoneX:this.$store.state.isIphoneX,
 				userId:'',
-				alertType:'',
 				popupShow:false,
 				handlerPros:{},//监听单挑促销商品
 				failureList:[],	//失效商品列表
@@ -384,7 +383,6 @@
 					item.reducedPrice = _reducedPrice
 					item.totalOriginalPrice = _totalOriginalPrice
 					item.totalPrice = _totalPrice
-					console.log('合计',item.totalPrice)
 				})
 			},
 			totalPeice(){//计算总价格,每次调用此方法,将初始值为0,遍历价格并累加
@@ -441,49 +439,34 @@
 			    })
 			},		
 			changeCountAdd(item,pros){//商品数量加加
-				if(pros.step === 2){
-					pros.isStep = false
-					pros.productCount += pros.min
-					this.processActivityPrice(pros)
-				}else{
-					pros.productCount++
-					this.processActivityPrice(pros)
-				}
+				pros.productCount++
+				this.processActivityPrice(pros)
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},
 			changeCountSub(item,pros){//商品数量减减
-				if(pros.productCount<=pros.min){
-					pros.productCount= pros.min
-					this.$util.msg(`该商品最小起订量为${pros.min}`,2000);
+				if(pros.productCount<=1){
+					pros.productCount= 1
+					this.$util.msg(`购买数量不能少于1`,2000);
 					return
 				}else{
-					if(pros.step === 2){
-						pros.isStep = false
-						pros.productCount -= pros.min
-					}else{
-						pros.productCount--
-					}
+					pros.productCount--
 					this.processActivityPrice(pros)
 				}
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},
 			changeInput(pros){//输入商品数量更新
-				pros.isStep = false
+				
 			},
 			changeNnmber(e,item,pros){//输入商品数量更新
 				let _value = Number(e.detail.value);
 				if(!this.$api.isNumber(_value)){
-					pros.productCount = pros.min
-				}else if(_value < pros.min){	
-					this.$util.msg(`该商品最小起订量为${pros.min}`,2000);
-					pros.productCount = pros.min
-				}else if(_value % pros.min != 0){
-					pros.isStep = true
-					pros.productCount = pros.min
+					pros.productCount = 1
+				}else if(_value <= 1){	
+					this.$util.msg(`购买数量不能少于1`,2000);
+					pros.productCount = 1
 				}else{
-					pros.isStep = false
 					pros.productCount = e.detail.value
 					this.processActivityPrice(pros)
 				}
@@ -491,14 +474,14 @@
 				this.totalShopPeice();
 			},
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
-				if(pros.ladderFlag == '0' || pros.actStatus == 1){
-					pros.price = pros.price
-				}else{
+				if(pros.activeStatus == 1){
 					pros.ladderList.forEach((item,index)=>{
 						if(pros.productCount>=item.buyNum){
 							pros.price = item.buyPrice
 						}
 					})
+				}else{
+					pros.price = pros.price
 				}
 			},
 			updateShoppogNum(pros){//加减购物车商品更新到后台
@@ -530,18 +513,18 @@
 					this.$util.msg("请先选择结算商品~",2000);
 					return
 				}
-				let productIds = '';
+				let cartIds  = '';
 				this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开,最后一个逗号去掉
 					el.productList.forEach(pros=>{
 						if(pros.productsChecked){
-						   productIds += pros.productId+','
+						   cartIds += pros.cartId+','
 						}
 					})
 				})
 				let cartPramsData={
 						allPrice:this.allPrice,
 						allCount:this.allCount,
-						productIds:productIds.substring(0,productIds.lastIndexOf(',')),
+						cartIds:cartIds.substring(0,cartIds.lastIndexOf(',')),
 						productCount:''
 					}
 				this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)

+ 1616 - 0
pages/goods/product-activi.vue

@@ -0,0 +1,1616 @@
+<template>
+	<view class="product" :style="{paddingBottom: userIdentity==1 && userIdentity == 3 ? '0rpx' :'188rpx',paddingTop:CustomBar+'px'}">
+		<custom-p   v-if="isHeaderPoduct"
+					:systeminfo='systeminfo' 
+					:navbar-data='nvabarData' 
+					:headerBtnPosi ="headerBtnPosi" 
+					:headerColor="headerColor" 
+					:type="isShareType"
+					:page='backPage'>
+		</custom-p>
+		<view class="product-topnav" v-if='isNavbarFiexd' :class="navbarFiexd" :style="{top:CustomBar +'px'}">
+			<view class="navbar">
+				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
+					<text>商品</text>
+					<text class="line"></text>
+				</view>
+				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 1 }" @click="tabClick(1)">
+					<text>详情</text>
+					<text class="line"></text>
+				</view>	
+				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 2 }" @click="tabClick(2)">
+					<text>服务项目</text>
+					<text class="line"></text>
+				</view>	
+			</view>	
+		</view>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="2"></tui-skeleton>
+		<template v-else >
+			<view class="container-product tui-skeleton">
+				<view class="container-product-main product-details0">
+					<view class="product-top">
+						<view class="banner-section">
+							<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode" >
+								<swiper class="banner tui-banner tui-skeleton-rect"  @change="swiperChange" :duration='800' :autoplay="false" :circular="true" >
+									<swiper-item v-for="(item, index) in productImage" :key="index" class="banner-item"> 
+										<image :src="item" @click="previewImg(index)" class="product-img" />
+									</swiper-item>
+								</swiper>
+								<view class="swiper__dots-box">
+									<tui-tag padding="12rpx 24rpx" type="translucent" shape="circleLeft" size="32rpx" :scaleMultiple="0.82" originRight>{{ current + 1 }}/{{ productImage.length }}</tui-tag>
+								</view>
+							</uni-swiper-dot>
+						</view>
+						<view class="product-wrap clearfix">
+							<view class="wrap-top">
+								<view class="wrap-top-price">
+									<cm-price v-if="isRequest"
+											  :product="product"
+											  :userIdentity="userIdentity"
+											  :promotions="product.promotions"
+											  :ladderList="ladderList"/>
+								</view>
+								<view class="p-title tui-skeleton-fillet">
+									<view class="p-title-name" :class="product.beautyActFlag == '1' ? 'indent' : ''"> {{product.name == undefined ? '' : product.name}} </view>
+									<button open-type="share" class="p-title-share tui-share-position" @tap="onShare">
+										<view class=""><text class="iconfont icon-fenxiang"></text></view>
+										<view class="">分享</view>
+									</button>
+								</view>
+								<view class="wrap-label" v-if="product.tagsList.length>0">
+									<view class="label-a tui-skeleton-fillet" v-for="(label,index) in  product.tagsList" :key="index">{{label}}</view>
+								</view>
+								<view class="product-seve">
+									<text class="iconfont icon-wuyoushouhou tui-skeleton-rect"><text class="text">无忧退货</text></text>
+									<text class="iconfont icon-wuyoushouhou tui-skeleton-rect"><text class="text">快速退款</text></text>
+									<text class="iconfont icon-wuyoushouhou tui-skeleton-rect"><text class="text">正品保证</text></text>
+								</view>
+							</view>
+						</view>			
+					</view>
+					<view class="product-parameter" @click="showPopup">
+						<text class="title">参数:</text>
+						<text class="name">品牌  起订量  分类...</text>
+						<text class="iconfont icon-chakangengduo"></text>
+					</view>
+				</view>
+				<view class="product-details product-details1">
+					<!-- 商品详情 -->
+					<view class="title">
+						<view class="title-tab">商品详情</view>
+					</view>
+					<view class="content tui-banner product-rich-text tui-skeleton-rect">
+						<parser :html="html" :img-mode="widthFix" v-if="product.productDetail.detailInfo"></parser>
+						<view class="product-rich-text-none" v-else>暂无商品信息</view>
+					</view>
+				</view>	
+				<view class="product-details service product-details2">
+					<!-- 服务项目 -->
+					<view class="title">
+						<view class="title-tab">服务项目</view>
+					</view>
+					<view class="content service" v-if="product.productDetail.orderInfo || product.productDetail.serviceInfo">
+						<cm-service :product="product.productDetail" v-if="isRequest"></cm-service>
+					</view>
+					<view class="content-none"  v-else>
+						<text>暂无服务项目</text>
+					</view>
+				</view>				
+				<!-- 商品参数 -->
+				<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
+					<view class="tui-popup-box clearfix">
+						<view class="title">商品参数</view>
+						<div class="tui-popup-main">
+							<scroll-view class="tui-popup-scroll"  scroll-y="true">
+								<view class="content-tr">
+									<view class="content-td">品牌</view>
+									<view class="content-th">{{product.brandName == null? '其他' : product.brandName}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">分类</view>
+									<view class="content-th">{{product.typeName == null? '暂无' : product.typeName}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">包装规格</view> 
+									<view class="content-th">{{product.unit}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">库存</view>
+									<view class="content-th">{{product.stock}}</view>
+								</view>
+								<view class="content-tr" v-if="product.parametersList.length>0" v-for="(item, index) in product.parametersList" :key="index">
+									<view class="content-td">{{item.paramsName}}</view>
+									<view class="content-th">{{item.paramsContent}}</view>
+								</view>
+							</scroll-view>
+						</div>
+						<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
+							<view class="tui-flex-1">
+								<view class="tui-button" @click="hidePopup()">收起</view>
+							</view>
+						</view>
+					</view>	
+				</tui-bottom-popup>	
+				<!-- 底部按钮 -->
+				<view class="menu">
+					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
+						<!-- 已下架商品提示 -->
+						<view class="product-invalid" v-if="isShowButton" :style="{bottom :isIphoneX ? '168rpx' : '100rpx'}">
+							<text>商品已经下架啦,非常抱歉!</text>
+						</view>
+						<view class="bottom-le">
+							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/index/index')">
+								<text class="iconfont icon-fanhuishouye"></text>
+								<text>首页</text>
+							</view>
+							<button class="item-bt" open-type="contact" @bindcontact="handleContact" >
+								<text class="iconfont icon-kefu"></text>
+								<text>客服</text>
+							</button>
+							<view class="item-bt" @click="buyProductCart()">
+								<text class="iconfont icon-gouwuche"></text>
+								<text>购物车</text>
+								<text  	v-if="hasLogin && goodsData.cartCount>0"
+										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+										:class="[goodsData.cartCount < 10 ? 'goleft':'']">
+										{{ goodsData.cartCount >= 100 ? '99+': goodsData.cartCount}}
+								</text>
+								<view class="animation-num"  :class="isAnimation ? 'animation' : 'restion'">+1</view>
+							</view>
+						</view>
+						<view class="bottom-ri">
+							<button  
+									:disabled="isShowButton" 
+									class="btn btn-cart" 
+									:class="[isShowButton ? 'disabled':'']"
+									@tap.stop="btnGetConfirm('add')">加入购物车</button>
+							<button  
+									:disabled="isShowButton" 
+									class="btn btn-bay" 
+									:class="[isShowButton ? 'disabled':'']"
+									@tap.stop="btnGetConfirm('buy')">立即购买</button>
+						</view>
+					</view>	
+				</view>
+				<!--底部选择模态层弹窗组件 -->	
+				<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
+					<!-- 遮罩层 -->
+					<view class="mask"></view>
+					<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-352rpx' : '-296rpx'}">
+						<view class="content">
+							<view class="layer-smimg">
+								<image :src="product.mainImage" mode=""></image>
+							</view>
+							<view class="layer-nunbox">
+								<view class="layer-nunbox-t">
+									<view class="layer-nunbox-text">数量:</view>
+									<view class="number-box">
+										<view  class="iconfont icon-jianhao" :class="[isQuantity==true ? 'disabled' : '']" @click="changeCountSub()"></view>
+										<input class="btn-input" type="number" v-model="number" maxlength='4'  @blur="changeNumber($event)">
+										<view  class="iconfont icon-jiahao" @click="changeCountAdd()"></view>
+									</view>
+								</view>
+								<view class="layer-nunbox-b">
+									<view class="text">单价:
+										<text class="p sm">¥</text>
+										<text class="p bg">{{buyRetailPrice | NumFormat}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="btn"><view class="button" @click.stop="btnConfirm">确定</view></view>
+					</view>
+				</view>
+				<!-- 侧边 -->
+				<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
+	import cmPrice from "@/components/cm-module/productDetails/cm-price.vue" //价格显示
+	import cmAttributes from "@/components/cm-module/productDetails/cm-attributes.vue" //规格信息
+	import parser from "@/components/jyf-Parser/index" //富文本处理
+	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import cmService from "@/components/cm-module/productDetails/cm-service" //服务项目
+	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/services/wxLogin.js"
+	import { debounce } from '@/common/config/common.js'
+	var isPreviewImg;
+	export default{
+		components:{
+			customP,
+			parser,
+			tuiSkeleton,
+			cmPrice,
+			cmAttributes,
+			cmService
+		},
+		data(){
+			return{			
+				nvabarData: {							 //顶部自定义导航
+					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+					title: ''		// 导航栏 中间的标题
+				},
+				clickPath:'/search/pages/search/search',
+				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
+				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
+				mode:'round',
+				iconClass:'icon-aixin',
+				iconColor:'#ff9100',
+				specClass: '',//规格弹窗css类,控制开关动画
+				isBtnType:'',
+				isRequest:false,
+				isScrollTop:false,
+				current:0,
+				isShareType:'',
+				isHeaderPoduct:false,
+				isNavbarFiexd:false,
+				navbarFiexd:'none',
+				ladderPriceFlag:'',
+				ladderList:'',
+				isEvaluate:false,
+				isAnimation:false,
+				skeletonShow:true,
+				isQuantity:false,
+				disabled:false,
+				tabCurrentIndex:0,
+				userId:'',
+				productId:0,
+				userIdentity:0,//用户类型
+				goodsData:{},//自定义数据
+				product:{},//采美
+				productImage:[],
+				retailPrice:0,
+				buyRetailPrice:0,
+				stock:0,
+				number:1,
+				productsList:[],
+				goodListData:[],
+				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+				systeminfo: this.setSysteminfo(),		 //获取设备信息
+				isIphoneX:this.$store.state.isIphoneX,
+				windowHeight: '',
+				headerColor:false,
+				backPage:1,
+				linkPath:'',
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				popupShow:false,//参数弹窗
+				tabSelectFlag:false,
+				sectionPropsArr: [],
+				scrollTopArray:[],
+				sectionTopRangeArr: [],
+				winHeight:'',
+				isShowButton:false,
+				heUserId:0,
+				hasActiviType:false
+			}
+		},
+		onLoad(option) {
+			console.log(option)
+			if(this.isShareType =='share'){
+				wxLogin.wxLoginAuthorize()
+			}
+			this.productId = option.productId;//获取商品ID
+			this.isShareType = option.type
+			this.linkPath = option.path
+			this.isHeaderPoduct = true
+			if(option.page == 2){
+				this.backPage = option.page
+			}
+			if(option.heUserId){
+				this.heUserId = option.heUserId
+				this.hasActiviType = true
+			}
+			this.getWinHeight()
+		},
+		computed: {
+			...mapState(['hasLogin','isWxAuthorize','identity'])
+		},
+		filters:{
+			NumFormat(value) {//处理金额
+				return Number(value).toFixed(2);
+			}
+		},	
+		methods:{
+			initData(){// 初始化商品详情查询
+				this.ProductService.QueryProductDetils(
+					{
+						productId:this.productId,
+					}
+				)
+				.then(response =>{	
+					//购物车数量				
+					this.skeletonShow = false
+					this.productImage=[];
+					this.product = response.data
+					//已删除/已冻结
+					if(this.product.validFlag === 2){
+						this.isShowButton = true
+					}
+					this.ladderPriceFlag = this.product.ladderPriceFlag;
+					this.html = this.product.productDetail == null ? this.html : this.$api.adaptRichTextImg(this.product.productDetail.detailInfo);
+					this.stock = this.product.stock
+					//处理商品图片列表
+					this.product.imageList.forEach(item =>{
+						this.productImage.push(item);
+					})
+					//处理阶梯价格
+					if(this.product.ladderList.length>0){
+						this.ladderList = this.product.ladderList;
+					}
+					this.retailPrice = this.product.price.toFixed(2);
+					this.buyRetailPrice = this.product.price;
+					setTimeout(()=>{
+						this.getSectionProps();
+					},2000)
+					console.log(this.userId)
+					if(this.userId > 0){
+						this.GetCartNumber()
+					}
+					this.isRequest = true
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			GetCartNumber(){//查询购物车数量
+				this.ProductService.QueryShoppingQuantity({userId:this.userId}).then(response => {
+					this.goodsData.cartCount = response.data
+					this.$store.commit('updateAllNum',response.data)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			swiperChange(e) {//顶部商品图片切换
+				const index = e.detail.current;
+				this.current = index;
+			},
+			previewImg (index) {//顶部商品图片预览
+				isPreviewImg = true
+				let previewUrls = this.productImage
+				uni.previewImage({
+					current: index, 	//图片索引
+					urls: previewUrls, //必须是http图片,本地图片无效
+					longPressActions:''
+				})
+			},
+			tabClick(index) {//商品详情&&供应商信息tab切换
+				this.tabSelectFlag = true
+				this.tabCurrentIndex = index;
+				let classIndex = '.product-details'+index;
+				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
+				  uni.createSelectorQuery().select(classIndex).boundingClientRect((res)=>{//最外层盒子节点
+				    uni.pageScrollTo({
+				      duration:300,//过渡时间必须为0,uniapp bug,否则运行到手机会报错
+				      scrollTop:res.top - data.top - 150,//滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
+				    })
+						setTimeout(()=>{
+							this.tabSelectFlag = false;
+						},500)
+				  }).exec()
+				}).exec()
+			},
+			handleContact(e){//跳转小程序客服
+
+			},
+			buyProductCart(){//底部购物车按钮点击
+				if(this.hasLogin){
+					this.$api.navigateTo('/pages/goods/cart')
+				}else{					
+					this.$api.navigateTo('/pages/login/login')
+				}
+			},
+			btnGetConfirm(type){//加入购物车&&立即购买点击
+				if(this.hasLogin){
+					this.showSpec(type);
+				}else{					
+					this.$api.navigateTo('/pages/login/login')
+				}
+			},	
+			changeCountAdd(){//popup弹窗数量增加按钮
+				this.number++
+				this.processActivityPrice()
+			},
+			changeCountSub(){//popup弹窗数量减按钮
+				if(this.number == 1){
+					this.isQuantity = true
+					this.$util.msg('购买数量不能低于1',2000);
+					return
+				}else{
+					this.number--
+					this.processActivityPrice()
+					this.isQuantity =false
+				}
+			 },
+			changeNumber(e){
+				let _value = e.detail.value;
+				if(!this.$api.isNumber(_value)){
+					this.number = 1
+				}else if(_value == 1){	
+					this.$util.msg('购买数量不能低于1',2000);
+					this.number = 1
+				}else{
+					this.number = e.detail.value
+				}
+				this.processActivityPrice()
+			},
+			processActivityPrice(){//单独处理活动价格和阶梯价格
+				if(this.ladderPriceFlag == '0' && this.product.actStatus == 0 || this.product.actStatus == 1){
+					this.buyRetailPrice = this.product.retailPrice
+				}else{
+					this.ladderList.forEach((item,index)=>{
+						if(this.number>=item.buyNum){
+							this.buyRetailPrice = item.buyPrice
+						}
+					})
+				}
+			},
+			showSpec(type) {//显示选择数量确认弹窗
+				this.isBtnType = type
+				this.specClass = 'show';
+			},
+			hideSpec() {//关闭选择数量确认弹窗
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			btnConfirm() {//加入购物车&&立即购买跳转订单页并关闭弹窗
+				if(this.isBtnType == 'add'){				
+					this.getAddProductCart()				
+				}else{
+					this.toConfirmation()
+				}
+			},
+			toConfirmation(){//跳转确认订单页面
+				this.specClass = 'hide';
+				let productStp ={
+						allPrice:this.number*this.buyRetailPrice,
+						allCount:this.number,
+						productId:this.product.productId,
+						productCount:this.number,
+						heUserId:this.heUserId
+				}	
+				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			getAddProductCart(){//增加购物车成功和toast弹窗提示成功	
+				this.ProductService.shoppingAddCart(
+					{
+						productId:this.productId,
+						userId:this.userId,
+						productCount:this.number,
+						heUserId:this.heUserId*1,
+					}
+				)
+				.then(response => {
+					this.specClass = 'hide';
+					this.$util.msg('加入购物车成功',1500,true,'success')
+					this.isAnimation = true
+					setTimeout(() => {this.specClass = 'none'}, 200)
+					setTimeout(() => {this.isAnimation = false},2000)
+					this.GetCartNumber()
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			
+			navToLogin(){
+				authorize.checkLogin()
+				.then(res => {
+					this.$store.commit('setLoginType',8)
+					this.$store.commit('setLoginproductId',this.productId)
+					this.$api.navigateTo(`/pages/login/login?id=${this.productId}`)
+				})
+				.catch(err => {
+					this.$api.navigateTo('/pages/authorization/authorization?type=1')
+				})
+			},
+			setHeaderBtnPosi(){
+				// 获得胶囊按钮位置信息
+				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
+				return headerBtnPosi
+			},
+			setSysteminfo(){
+				let systeminfo;
+				uni.getSystemInfo({ // 获取设备信息
+					success: (res) => {
+						systeminfo = res
+					},
+				})
+				return systeminfo
+			},
+			discard(){
+				//丢弃
+			},
+			onShare(res){//分享转发
+				if (res.from === 'button') {
+			      // 来自页面内转发按钮
+			    }
+				return {
+				  title: `${this.product.name}`,
+				  path: `pages/goods/product?type=share&id=${this.productId}`,
+				  imageUrl:`${this.productImage[0]}`
+				}
+			},
+			showPopup(){
+				this.popupShow = true
+			},
+			hidePopup(){
+				this.popupShow = false
+			},
+			getSectionProps() {//获取每个tab对应区域的scrollTop值
+				let className = '.product-details',
+					sectionPropsArr = [];
+				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
+				  uni.createSelectorQuery().selectAll(className).boundingClientRect((res)=>{//最外层盒子节点
+						res.forEach((item, index) => {
+							sectionPropsArr.push({
+								className: `${className}${index}`,
+								scrollTop: item.top - data.top - 150
+							})
+						})
+						this.sectionPropsArr = sectionPropsArr;
+						this.sectionTopRangeArr = this.getSectionRange(sectionPropsArr);
+				  }).exec()
+				}).exec()
+			},
+			getSectionRange(arr) {// 获取每个tab对应区域的区间
+				let sectionScrollTopList = [];
+				for(let i = 0; i < arr.length; i++) {
+					let thisScrollTop = arr[i].scrollTop;
+					if(i < arr.length - 1) {
+						let nextScrollTop = arr[i+1].scrollTop;
+						if(i == 0) {
+							sectionScrollTopList.push(`0-${thisScrollTop}`);
+						} else if(i == arr.length - 1){
+							sectionScrollTopList.push(`${thisScrollTop}-${nextScrollTop - this.winHeight}`);
+						} else {
+							sectionScrollTopList.push(`${thisScrollTop}-${nextScrollTop}`);
+						}
+					} else {
+						sectionScrollTopList.push(`${thisScrollTop}-${thisScrollTop+500}`);
+					}
+				}
+				return sectionScrollTopList;
+			},
+			activeTab: debounce((top, _this)=> {//当滑动时也能同步激活tab
+				const { sectionTopRangeArr } = _this;
+				if(sectionTopRangeArr.length > 0) {
+					sectionTopRangeArr.forEach((item, index) => {
+						let splitItem = item.split('-'),
+							openInterval = Number(splitItem[0]),
+							closedInterval = Number(splitItem[1]);
+						if(top >= openInterval && top < closedInterval) {
+							_this.tabCurrentIndex = index;
+						}
+					})
+				}
+			},100, true),
+			getWinHeight() {
+				this.winHeight = wx.getSystemInfoSync().windowHeight;
+			},
+		},
+		onPageScroll(e){//实时获取到滚动的值
+			const { scrollTop } = e;
+			if(!this.tabSelectFlag) {
+				this.activeTab(scrollTop, this);
+			}
+			if(e.scrollTop>60){
+				this.headerColor = true
+				this.navbarFiexd = 'fixed'
+				this.isNavbarFiexd = true
+				this.nvabarData={							
+					showCapsule: 1, 
+					title: '商品详情', 		
+				}
+			}else{
+				this.headerColor = false
+				this.isNavbarFiexd = false
+				this.navbarFiexd = 'none'
+				this.nvabarData={
+					showCapsule: 1, 
+					title: '', 		
+				}
+			}
+			if(e.scrollTop>700){
+				this.isScrollTop = true
+			}else{
+				this.isScrollTop = false
+			}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `${this.product.name}`,
+			  path: `pages/goods/product?type=share&id=${this.productId}`,
+			  imageUrl:`${this.productImage[0]}`
+			}
+		},
+		onShow() {
+			this.$api.getStorage().then((resolve) => {
+				this.userId = resolve.userId ? resolve.userId : '';	
+				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 0
+				if (isPreviewImg) {
+					isPreviewImg = false;
+					return;
+				} else {
+					this.initData();
+				}
+			}).catch(error =>{
+				this.initData();
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #FFFFFF;
+	}
+	.banner-section{
+		width: 100%;
+		height: 750rpx;
+		position: relative;
+	}	
+	.banner{
+		width: 100%;
+		height: 750rpx;
+		.product-img{
+			width: 750rpx;
+		}
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.swiper__dots-box{
+		position: absolute;
+		color: #fff;
+		bottom: 30rpx;
+		right: 0;
+	}
+	.product-wrap{
+		width: 100%;
+		height: auto;
+		padding: 24rpx 0 0 0;
+		background-color: #FFFFFF;
+		border-bottom: 20rpx solid #F7F7F7;
+		.wrap-top{
+			width: 702rpx;
+			padding: 0 24rpx;
+			height: auto;
+			float: left;
+			padding-bottom:20rpx;
+			border-bottom: 1px solid #F8F8F8;
+			.p-title{
+				width: 100%;
+				height: auto;
+				float: left;
+				position: relative;
+				.p-title-name{
+					width:602rpx;
+					height: auto;
+					float: left;
+					line-height:48rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					-o-text-overflow: ellipsis;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.p-title-share{
+					width: 96rpx;
+					height: 96rpx;
+					position: absolute;
+					right: 0;
+					text-align: center;
+					color: #999999;
+					font-size: $font-size-24;
+					box-sizing: border-box;
+					display: block;
+					background: transparent;
+					border-radius: 0;
+					border: 0;
+					margin: 0;
+					padding: 8rpx 0;
+					z-index: 990;
+					.icon-fenxiang1{
+						font-size: $font-size-34;
+					}
+				}
+				.tui-share-btn::after {
+					border: 0;
+				}
+			}
+			.wrap-main-text{
+				line-height: 56rpx;
+				color: #FF2A2A;
+				font-size: $font-size-26;
+				display: block;
+				float: left;
+				font-weight: normal;
+			}
+			.wrap-main-none{
+				display: block;
+				width: 256rpx;
+				height: 44rpx;
+				padding-left: 20rpx;
+				border-radius: 11rpx;
+				background: $btn-confirm;
+				float: right;
+				line-height: 44rpx;
+				color: #FFFFFF;
+				text-align: center;
+				font-size: $font-size-24;
+			}
+			
+			.p-price-none{
+				height: 44rpx;
+				line-height: 44rpx;
+				float: left;
+				font-size: $font-size-24;
+				color: #666;
+				text-decoration: line-through;
+				margin-left: 8rpx;
+			}
+			.p-minBuy{
+				height: 44rpx;
+				line-height: 44rpx;
+				float: right;
+				padding: 0 18rpx;
+				border-radius: 22rpx;
+				background-color: #f7f7f7;
+				color: #7F7F7F;
+				font-size: 24rpx;
+				text-align: center;
+				.min-text{
+					margin: 0 6rpx;
+				}
+			}
+			.p-login{
+				height: 56rpx;
+				line-height: 56rpx;
+				color: $color-system;
+				font-size: $font-size-24;
+				&.grade{
+					.price-left{
+						float: left;
+						.none{
+							display: block;
+							font-size: $font-size-20;
+							line-height: 48rpx;
+							color: #4A4B54;
+							float: left;
+							font-weight: bold;
+							margin-left: 5rpx;
+							text{
+								letter-spacing: 4rpx;
+								font-size: $font-size-32;
+							}
+						}
+					}
+				}
+				.p-no{
+					float: left;
+					margin-right: 5rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+				}
+				.p-login-btn{
+					display: block;
+					height: 44rpx;
+					padding: 0 10rpx 0 20rpx;
+					border-radius: 11rpx;
+					background: $btn-confirm;
+					float: right;
+					line-height: 44rpx;
+					color: #FFFFFF;
+					text-align: center;
+					font-size: $font-size-24;
+				}
+			}
+		}
+		.wrap-label{
+			float: left;
+			width: 100%;
+			box-sizing: border-box;
+			.label-a{
+				padding: 0 18rpx;
+				line-height: 32rpx;
+				font-size: $font-size-20;
+				color:$color-system;
+				text-align: center;
+				border-radius: 6rpx;
+				background:#fff3f7;
+				margin: 0 20rpx 15rpx 0;
+				display: inline-block;
+			}
+		}
+		.wrap-top-price{
+			float: left;
+			width: 100%;
+			box-sizing: border-box;
+			.wrap-main-item{
+				width: 100%;
+				height: 56rpx;
+				.p-price{
+					height: 56rpx;
+					line-height: 56rpx;
+					float: left;
+					color: $color-system;
+					font-weight: bold;
+					.txt{
+						margin:0 2rpx;
+					}
+					.txt.sm{
+						font-size: $font-size-26;
+					}
+					.txt.big{
+						font-size: $font-size-34;
+					}
+				}
+			}
+			.floor-item-act{
+				width: 80rpx;
+				height: 30rpx;
+				margin-top: 15rpx;
+				margin-left: 20rpx;
+				float: left;
+				.tag{
+					display: inline-block;
+					width: 80rpx;
+					height: 30rpx;
+					background: url(https://static.caimei365.com/app/mini-hehe/icon/icon-active.png)top center no-repeat;
+					background-size: contain;
+					font-size: 22rpx;
+					line-height: 30rpx;
+					text-align: center;
+					color: #f83c6c;
+					float: left;
+				}
+			}
+			.floor-item-btn{
+				float: left;
+				height: 40rpx;
+				margin-top: 8rpx;
+				margin-left: 10rpx;
+				.btn{
+					line-height: 40rpx;
+					padding: 0 20rpx;
+					height: 40rpx;
+					background: $btn-confirm;
+					color: #FFFFFF;
+					font-size: $font-size-20;
+					border-radius: 4rpx;
+				}
+			}
+		}
+		.wrap-info{
+			float: left;
+			width: 702rpx;
+			padding: 24rpx 24rpx 0 24rpx;
+			border-bottom: 1px solid #F8F8F8;
+			.info-viewT{
+				width: 100%;
+				min-height: 40rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 40rpx;
+				text-align: left;
+				&.none{
+					color: #999999;
+				}
+				.info-viewL{
+					min-width: 350rpx;
+					float: left;
+					margin-bottom: 24rpx;
+				}
+				.info-viewR{
+					min-width: 352rpx;
+					float: left;
+					margin-bottom: 24rpx;
+				}
+			}
+			.info-viewB{
+				width: 100%;
+				height: auto;
+			}
+			.info-f{
+				width: 50%;
+				float: left;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 40rpx;
+				margin-bottom: 24rpx;
+				text-align: left;
+			}
+		}
+	}
+	.product-seve{
+		width: 100%;
+		height: 60rpx;
+		background-color: #FFFFFF;
+		position: relative;
+		display: flex;
+		line-height: 60rpx;
+		.label{
+			font-size: $font-size-28;
+			color: #333333;
+		}
+		.iconfont{
+			color: $color-system;
+			margin-right: 20rpx;
+			font-size: $font-size-30;
+		}
+		.text{
+			font-size: $font-size-22;
+			color: #999999;
+			margin-left: 10rpx;
+		}
+	}
+	.product-parameter{
+		width: 702rpx;
+		height: 90rpx;
+		padding: 0 24rpx;
+		background-color: #FFFFFF;
+		position: relative;
+		display: flex;
+		border-bottom: 20rpx solid #F7F7F7;
+		.title{
+			line-height: 90rpx;
+			display: inline-block;
+			float: left;
+			font-size: $font-size-28;
+			color: #666666;
+		}
+		.name{
+			float: right;
+			line-height: 90rpx;
+			display: inline-block;
+			float: left;
+			font-size: $font-size-28;
+			color: $text-color;
+			float: right;
+			padding-right: 48rpx;
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+			text-align: right;
+		}
+		.icon-chakangengduo{
+			line-height: 90rpx;
+			display: inline-block;
+			position: absolute;
+			width: 48rpx;
+			top: 0;
+			right: 0;
+			color: #b2b2b2;
+		}
+	}
+	.product-details {
+		width: 100%;
+		background: #FFFFFF;
+		border-bottom: 20rpx solid #F7F7F7;
+		&.service{
+			border-bottom: none;
+		}
+		&.recommend{
+			background-color: #F7F7F7;
+			border-bottom: none;
+			.title{
+				.title-tab{
+					background-color: #F7F7F7;
+					color: $text-color;
+				}
+			}
+		}
+		.product-rich-text-none{
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			text-align: left;
+			font-size: 24rpx;
+			color: #999999;
+			line-height: 60rpx;
+		}
+		.content-none{
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: left;
+			font-size: $font-size-26;
+			color: #999999;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+		}
+		.title{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			.title-tab{
+				width: 100%;
+				height: 100rpx;
+				background: #fff;
+				z-index: 10;
+				font-size: $font-size-30;
+				text-align: left;
+				color: $text-color;
+				line-height: 100rpx;
+				font-weight: 600;
+			}
+			.title-msg{
+				width: 100%;
+				height: 236rpx;
+				padding: 18rpx;
+				background-color: rgba(225,86,22, 0.1);
+				color: $color-system;
+				box-sizing: border-box;
+				margin-bottom: 30rpx;
+				.tit{
+					line-height: 46rpx;
+					font-size: $font-size-24;
+					text-align: left;
+				}
+				.txt{
+					line-height: 38rpx;
+					font-size: $font-size-20;
+					text-align: justify;
+				}
+			}
+		}
+		.content{
+			width: 100%;
+			background-color: #FFFFFF;
+		}
+	}
+	.isLower{
+		width: 100%;
+		height: 116rpx;
+		line-height: 116rpx;
+		text-align: center;
+		color: #000000;
+		font-size: $font-size-32;
+		font-weight: bold;
+	}
+	.product-invalid{
+		width: 100%;
+		height: 80rpx;
+		background-color: #666666;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: $font-size-26;
+		color: #FFFFFF;
+		position: fixed;
+		bottom: 180rpx;
+		left: 0;
+	}
+	.bottom-btn{
+		width: 100%;
+		height: 100rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background: #FFFFFF;
+		z-index: 999;
+		.bottom-le{
+			width: 300rpx;
+			height: 100rpx;
+			padding:10rpx 20rpx 10rpx 0;
+			float: left;
+			box-sizing: border-box;
+			.item-bt{
+				width: 80rpx;
+				height: 100%;
+				margin-right:15rpx;
+				display: flex;
+				float: left;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				font-size: $font-size-22;
+				color: #666666;
+				line-height: 34rpx;
+				position: relative;
+				.iconfont{
+					display: block;
+					width: 36rpx;
+					height: 36rpx;
+					text-align: center;
+					font-size: 34rpx;
+				}
+				.animation-num{
+					font-size:$font-size-32 ;
+					color: #FF2A2A;
+					position: absolute;
+					top: -12rpx;
+					right: 4rpx;
+					font-weight: bold;
+				}
+				.animation{
+					animation: showAmnation 2.2s ease-in-out both;
+				}
+				.restion{
+					animation: hideAmnation 1s ease-in-out both;
+				}
+				.icon-num{
+					position: absolute;
+					right:-12rpx;
+					top: -5rpx;
+				}
+				.icon-num.goleft{
+					right: 2rpx;
+				}
+				&:last-child{
+					margin-right: 0;
+				}
+				image {
+					width: 44rpx;
+					height: 44rpx;
+				}
+				button.contact-btn{
+					width: 100%;
+					height: 100%;
+					margin: 0;
+					padding: 0;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+					font-size: $font-size-24;
+					text-align: center;
+					text-decoration: none;
+					line-height: 34rpx;
+					border-radius: 0;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+					color: $text-color;
+					background-color:#FFFFFF;
+				}
+			}
+		}
+		.bottom-ri{
+			width: 450rpx;
+			height: 100%;
+			float: right;
+			display: flex;
+			box-sizing: border-box;
+			padding: 13rpx 20rpx 13rpx 0;
+			.btn{
+				flex: 1;
+				width: 200rpx;
+				line-height: 80rpx;
+				text-align: center;
+				font-size: $font-size-24;
+				color: #FFFFFF;
+			}
+			.btn-cart{
+				background-color: #ffeff4;
+				color: $color-system;
+				border-radius: 42rpx 0 0 42rpx;
+			}
+			.btn-cart.disabled{
+				background-color: #ffeff4;
+				color: #ff457b;
+			}
+			.btn-bay{
+				background:$btn-confirm;
+				border-radius: 0 42rpx 42rpx 0;
+			}
+			.btn-bay.disabled{
+				background:$btn-confirm;
+				color: ffffff;
+				opacity: 0.2;
+			}
+		}
+	}
+	.uni-badge--small {
+		-webkit-transform: scale(.8);
+		-ms-transform: scale(.8);
+		transform: scale(.8);
+		-webkit-transform-origin: center center;
+		-ms-transform-origin: center center;
+		transform-origin: center center;
+	}
+	.uni-badge {
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		font-size: 12px;
+		line-height: 1;
+		display: inline-block;
+		padding: 3px 6px;
+		color: #333;
+		border-radius: 100px;
+		background-color: #f1f1f1;
+	}
+	.uni-badge-error {
+		color: #fff;
+		background-color: #dd524d;
+	}
+	.product-topnav{
+		width: 100%;
+		height: 60rpx;
+		box-sizing: border-box;
+		background: #FFFFFF;
+		z-index: 1000;
+		position: fixed;
+		opacity: 1;
+		left: 0;
+		&.fixed{
+			animation: showFixedColor 0.1s ease-in-out both;
+		}
+		&.none{
+		   animation: hideFixedColor 0.1s ease-in-out both;
+		}
+		.navbar {
+			width: 100%;
+			height: 60rpx;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			display: flex;
+			.nav-item {
+				display: flex;
+				flex: 1;
+				justify-content: center;
+				align-items: center;
+				height: 60rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				position: relative;
+				float: left;
+				position: relative;
+				.line{
+					width: 60rpx;
+					height: 2px;
+					border-radius: 1px;
+					background: #FFFFFF;
+					position: absolute;
+					bottom: 0;
+					left: 50%;
+					margin-left: -30rpx;
+				}
+				&.current{
+					color:$color-system;
+					.line{
+						background: $color-system;
+					}
+				}
+			}
+		}
+	}
+	
+	@keyframes showFixedColor {
+		0% {background: rgba(255,255,255,0);}
+		50% {background: rgba(255,255,255,0.5);}
+		100% {background: rgba(255,255,255,1);}
+	}
+	@keyframes hideFixedColor {
+		0% {background: rgba(255,255,255,1);}
+		50% {background: rgba(255,255,255,0.5);}
+		100% {background: rgba(255,255,255,0);}
+	}
+	/* 加入购物模态层*/
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(-100%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(-100%);
+		}
+		100% {
+			transform: translateY(0);
+		}
+	}
+	@keyframes showAmnation {
+		0% {
+			top: -12rpx;
+			opacity: 0;
+		}
+		50% {
+			top: -60rpx;
+			opacity: 1;
+		}
+		100% {
+			top: -100rpx;
+			opacity: 0;
+		}
+	}
+	@keyframes hideAmnation {
+		0% {
+			top: -100rpx;
+			opacity: 0;
+		}
+		100% {
+			top: -12rpx;
+			opacity: 0;
+		}
+	}
+	.popup {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+		display: none;
+		.mask{
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 21;
+			background-color: rgba(0, 0, 0, 0.6);
+		}
+		.layer {
+			position: fixed;
+			z-index: 22;
+			bottom: -294rpx;
+			width: 702rpx;
+			padding: 24rpx 24rpx 36rpx 24rpx;
+			height: 260rpx;
+			border-radius: 20rpx 20rpx 0 0;
+			background-color: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: space-between;
+			.content {
+				width: 100%;
+			}
+			.btn {
+				width: 100%;
+				height: 88rpx;
+				margin-top: 20rpx;
+				.button {
+					width: 100%;
+					height: 88rpx;
+					color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: $btn-confirm;
+					font-size: $font-size-28;
+					border-radius: 44rpx;
+				}
+			}
+		}
+		
+		&.show {
+			display: block;
+			.mask{
+				animation: showPopup 0.2s linear both;
+			}
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
+		}
+		&.hide {
+			display: block;
+			.mask{
+				animation: hidePopup 0.2s linear both;
+			}
+			
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
+		}
+		&.none {
+			display: none;
+		}
+		&.service {
+			.row {
+				margin: 30upx 0;
+				.title {
+					font-size: 30upx;
+					margin: 10upx 0;
+				}
+				.description {
+					font-size: 28upx;
+					color: #999;
+				}
+			}
+		}
+		.layer-smimg{
+			width: 114rpx;
+			height: 114rpx;
+			float: left;
+			border-radius: 10rpx;
+			margin-right: 24rpx;
+			image{
+				width: 114rpx;
+				height: 114rpx;	
+				border-radius: 10rpx;
+			}
+		}
+		.layer-nunbox{
+			justify-content: space-between;
+			align-items: center;
+			width: 536rpx;
+			height: auto;
+			float: left;
+			.layer-nunbox-t{
+				width: 100%;
+				height:44rpx;
+				position:relative;
+				display: flex;
+				margin-bottom: 10rpx;
+				.text{
+					font-size: $font-size-24;
+					line-height: 48rpx;
+					color: #999999;
+				}
+				.layer-nunbox-text{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+				}
+				.number-box {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
+					.iconfont {
+						font-size: $font-size-24;
+						padding: 0 14rpx;
+						color: #666666;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #ffffff;
+						&.icon-jianhao {
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao {
+							border-radius: 0 30rpx 30rpx 0;
+						}
+					}
+					.btn-input {
+						width: 56rpx;
+						height: 44rpx;
+						line-height: 44rpx;
+						border-radius: 4rpx;
+						text-align: center;
+						font-size: $font-size-24;
+						color: #333333;
+						background-color: #f7f7f7;
+					}
+				}
+				.product-step{
+					position: absolute;
+					left: 45rpx;
+					bottom: 0;
+					height: 44rpx;
+					background: #FFFFFF;
+				}
+			}
+			.layer-nunbox-b{
+				width: 100%;
+				height:44rpx;
+				margin-top: 30rpx;
+			}
+			.text{
+				line-height: 44rpx;
+				font-size: $font-size-28;
+				.p{
+					color: #FF2A2A;
+				}
+				.p:first-child{
+					margin-left: 30rpx;
+				}
+				.p.sm{
+					font-size: $font-size-24;
+				}
+			}
+		}
+	}
+	.tui-popup-box {
+		position: relative;
+		box-sizing: border-box;
+		min-height: 220rpx;
+		padding:0rpx 24rpx 0 24rpx;
+		.title{
+			font-size: $font-size-34;
+			color: $text-color;
+			line-height: 88rpx;
+			text-align: center;
+			float: left;
+			width: 100%;
+			height: 88rpx;
+		}
+		.tui-popup-main{
+			width: 100%;
+			float: left;
+			.tui-popup-scroll{
+				width: 100%;
+				height: 320rpx;
+				.content-tr{
+					width: 100%;
+					min-height: 58rpx;
+					line-height: 58rpx;
+					display: flex;
+					.content-td{
+						display: flex;
+						flex: 3;
+						font-size: $font-size-26;
+						color: #999999;
+						line-height: 58rpx;
+						text-align: left;
+					}
+					.content-th{
+						display: flex;
+						flex: 7;
+						font-size: $font-size-26;
+						color: #333333;
+						line-height: 58rpx;
+						text-align: left;
+						padding-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
+	.tui-popup-btn {
+		width: 100%;
+		height: auto;
+		float: left;
+		margin-top: 24rpx;
+		.tui-button{
+			width: 100%;
+			height: 88rpx;
+			background: $btn-confirm;
+			line-height: 88rpx;
+			text-align: center;
+			color: #FFFFFF;
+			font-size: $font-size-28;
+			border-radius: 44rpx;
+		}
+	}
+	/*富文本样式*/
+	rich-text.p{
+		width: 702rpx !important;
+		padding: 0 24rpx;
+		text-align: justify;
+	}
+	rich-text.img{
+		width: 100%;
+		height: auto;
+	}
+</style>

+ 24 - 25
pages/goods/product.vue

@@ -288,6 +288,9 @@
 			}
 		},
 		onLoad(option) {
+			if(this.isShareType =='share'){
+				wxLogin.wxLoginAuthorize()
+			}
 			this.productId = option.productId;//获取商品ID
 			this.isShareType = option.type
 			this.linkPath = option.path
@@ -295,11 +298,6 @@
 			if(option.page == 2){
 				this.backPage = option.page
 			}
-			if(this.isShareType =='share'){
-				if(uni.getStorageSync('_WX_State')){
-					wxLogin.wxLoginAuthorize()
-				}
-			}
 			this.getWinHeight()
 		},
 		computed: {
@@ -393,25 +391,17 @@
 
 			},
 			buyProductCart(){//底部购物车按钮点击
-				if(uni.getStorageSync('_WX_State')){
-					if(this.hasLogin){
-						this.$api.navigateTo('/pages/goods/cart')
-					}else{					
-						this.$api.navigateTo('/pages/login/login')
-					}
-				}else{
-					this.$api.navigateTo('/pages/authorize/authorize')
+				if(this.hasLogin){
+					this.$api.navigateTo('/pages/goods/cart')
+				}else{					
+					this.$api.navigateTo('/pages/login/login')
 				}
 			},
 			btnGetConfirm(type){//加入购物车&&立即购买点击
-				if(uni.getStorageSync('_WX_State')){
-					if(this.hasLogin){
-						this.showSpec(type);
-					}else{					
-						this.$api.navigateTo('/pages/login/login')
-					}
-				}else{
-					this.$api.navigateTo('/pages/authorize/authorize')
+				if(this.hasLogin){
+					this.showSpec(type);
+				}else{					
+					this.$api.navigateTo('/pages/login/login')
 				}
 			},	
 			changeCountAdd(){//popup弹窗数量增加按钮
@@ -474,8 +464,8 @@
 				let productStp ={
 						allPrice:this.number*this.buyRetailPrice,
 						allCount:this.number,
-						productIds:this.product.productId,
-						productCount:this.number
+						productId:this.product.productId,
+						productCount:this.number,
 				}	
 				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
 				setTimeout(() => {
@@ -483,14 +473,23 @@
 				}, 200);
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功	
-				this.ProductService.shoppingAddCart({productId:this.productId,userId:this.userId,productCount:this.number}).then(response => {
+				this.ProductService.shoppingAddCart(
+					{
+						productId:this.productId,
+						userId:this.userId,
+						productCount:this.number,
+						heUserId:0,
+					}
+				)
+				.then(response => {
 					this.specClass = 'hide';
 					this.$util.msg('加入购物车成功',1500,true,'success')
 					this.isAnimation = true
 					setTimeout(() => {this.specClass = 'none'}, 200)
 					setTimeout(() => {this.isAnimation = false},2000)
 					this.GetCartNumber()
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},

+ 1 - 3
pages/goods/search.vue

@@ -112,9 +112,7 @@
 		onLoad(option) {
 			console.log(option)
 			if(option.type =='share'){
-				if(uni.getStorageSync('_WX_State')){
-					wxLogin.wxLoginAuthorize()
-				}	
+				wxLogin.wxLoginAuthorize()
 			}
 			this.$api.getStorage().then((resolve) =>{
 				this.userIdentity = resolve.userIdentity;

+ 1 - 3
pages/login/login.vue

@@ -182,9 +182,7 @@ export default {
 		}
 	},
 	onShow() {
-		if(uni.getStorageSync('_WX_State')){
-			wxLogin.wxLoginAuthorize()
-		}
+		wxLogin.wxLoginAuthorize()
 	}
 }
 </script>

+ 18 - 35
pages/tabBar/cart/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container cart clearfix" v-if="hasLogin"> 	
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
+		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn || goodsList.length == 0 ? '0rpx':'80rpx'}">
 			<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0">
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>
@@ -145,7 +145,6 @@
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isIphoneX:this.$store.state.isIphoneX,
 				userId:'',
-				alertType:'',
 				popupShow:false,
 				handlerPros:{},//监听单挑促销商品
 				failureList:[],	//失效商品列表
@@ -372,7 +371,6 @@
 					item.reducedPrice = _reducedPrice
 					item.totalOriginalPrice = _totalOriginalPrice
 					item.totalPrice = _totalPrice
-					console.log('合计',item.totalPrice)
 				})
 			},
 			totalPeice(){//计算总价格,每次调用此方法,将初始值为0,遍历价格并累加
@@ -429,49 +427,34 @@
 			    })
 			},		
 			changeCountAdd(item,pros){//商品数量加加
-				if(pros.step === 2){
-					pros.isStep = false
-					pros.productCount += pros.min
-					this.processActivityPrice(pros)
-				}else{
-					pros.productCount++
-					this.processActivityPrice(pros)
-				}
+				pros.productCount++
+				this.processActivityPrice(pros)
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},
 			changeCountSub(item,pros){//商品数量减减
-				if(pros.productCount<=pros.min){
-					pros.productCount= pros.min
-					this.$util.msg(`该商品最小起订量为${pros.min}`,2000);
+				if(pros.productCount<=1){
+					pros.productCount= 1
+					this.$util.msg(`购买数量不能少于1`,2000);
 					return
 				}else{
-					if(pros.step === 2){
-						pros.isStep = false
-						pros.productCount -= pros.min
-					}else{
-						pros.productCount--
-					}
+					pros.productCount--
 					this.processActivityPrice(pros)
 				}
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},
 			changeInput(pros){//输入商品数量更新
-				pros.isStep = false
+				
 			},
 			changeNnmber(e,item,pros){//输入商品数量更新
 				let _value = Number(e.detail.value);
 				if(!this.$api.isNumber(_value)){
-					pros.productCount = pros.min
-				}else if(_value < pros.min){	
-					this.$util.msg(`该商品最小起订量为${pros.min}`,2000);
-					pros.productCount = pros.min
-				}else if(_value % pros.min != 0){
-					pros.isStep = true
-					pros.productCount = pros.min
+					pros.productCount = 1
+				}else if(_value <= 1){	
+					this.$util.msg(`购买数量不能少于1`,2000);
+					pros.productCount = 1
 				}else{
-					pros.isStep = false
 					pros.productCount = e.detail.value
 					this.processActivityPrice(pros)
 				}
@@ -479,14 +462,14 @@
 				this.totalShopPeice();
 			},
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
-				if(pros.ladderFlag == '0' || pros.actStatus == 1){
-					pros.price = pros.price
-				}else{
+				if(pros.activeStatus == 1){
 					pros.ladderList.forEach((item,index)=>{
 						if(pros.productCount>=item.buyNum){
 							pros.price = item.buyPrice
 						}
 					})
+				}else{
+					pros.price = pros.price
 				}
 			},
 			updateShoppogNum(pros){//加减购物车商品更新到后台
@@ -518,18 +501,18 @@
 					this.$util.msg("请先选择结算商品~",2000);
 					return
 				}
-				let productIds = '';
+				let cartIds  = '';
 				this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开,最后一个逗号去掉
 					el.productList.forEach(pros=>{
 						if(pros.productsChecked){
-						   productIds += pros.productId+','
+						   cartIds += pros.cartId+','
 						}
 					})
 				})
 				let cartPramsData={
 						allPrice:this.allPrice,
 						allCount:this.allCount,
-						productIds:productIds.substring(0,productIds.lastIndexOf(',')),
+						cartIds:cartIds.substring(0,cartIds.lastIndexOf(',')),
 						productCount:''
 					}
 				this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)

+ 2 - 6
pages/tabBar/index/index.vue

@@ -164,13 +164,9 @@
 			},
 			handAddCarts(pro){
 				if(!this.hasLogin){
-					if(!uni.getStorageSync('_WX_State')){
-						this.$api.navigateTo(`/pages/authorize/authorize?type=1`)
-					}else{
-						this.$api.navigateTo(`/pages/login/login`)
-					}
+					this.$api.navigateTo(`/pages/login/login`)
 				}else{
-					this.ProductService.shoppingAddCart({productId:pro.productId,userId:this.userId,productCount:1}).then(response => {
+					this.ProductService.shoppingAddCart({productId:pro.productId,userId:this.userId,productCount:1,heUserId:0}).then(response => {
 						this.$util.msg('加入购物车成功',1500,true,'success')
 						this.GetCartNumber()
 					}).catch(error =>{

+ 20 - 16
pages/tabBar/user/index.vue

@@ -20,7 +20,7 @@
 			<view class="order-wrap">
 				<view class="more">
 					<text class="title">我的订单</text>
-					<view @click="navigator('/pages/user/order/order-list?state=0')">
+					<view @click="OrderNavigator(0)">
 						<text class="more-right">全部订单</text>
 						<text class="iconfont icon-chakangengduo"></text>
 					</view>
@@ -30,7 +30,7 @@
 				<view class="order-nav">
 					<view
 						class="order-nav-item"
-						@click="navigator('/pages/user/order/order-list?state=1')"
+						@click="OrderNavigator(1)"
 					>
 						<image :src="StaticUrl+'icon-order-1@2x.png'" mode="widthFix"></image>
 						<text>待付款</text>
@@ -42,7 +42,7 @@
 					</view>
 					<view
 						class="order-nav-item"
-						@click="navigator('/pages/user/order/order-list?state=2')"
+						@click="OrderNavigator(2)"
 					>
 						<image :src="StaticUrl+'icon-order-2@2x.png'" mode="widthFix"></image>
 						<text>待发货</text>
@@ -54,7 +54,7 @@
 					</view>
 					<view
 						class="order-nav-item"
-						@click="navigator('/pages/user/order/order-list?state=3')"
+						@click="OrderNavigator(3)"
 					>
 						<image :src="StaticUrl+'icon-order-3@2x.png'" mode="widthFix"></image>
 						<text>已发货</text>
@@ -66,7 +66,7 @@
 					</view>
 					<view
 						class="order-nav-item"
-						@click="navigator('/pages/user/order/order-list?state=4')"
+						@click="OrderNavigator(3)"
 					>
 						<image :src="StaticUrl+'icon-order-4@2x.png'" mode="widthFix"></image>
 						<text>退货/款</text>
@@ -178,26 +178,30 @@ export default {
 				this.$util.msg(error.msg, 2000)
 			})
 		},
-		// 客服
-		handleContact(e) {
+		handleContact(e) {// 客服
 			console.log(e.detail.path)
 			console.log(e.detail.query)
 		},
-		// 栏目跳转
-		navigator(url) {
-			if(!uni.getStorageSync('_WX_State')){
-				this.$api.navigateTo('/pages/authorize/authorize')
-			}else{
-				if(this.hasLogin){
-					this.$api.navigateTo(url)
+		OrderNavigator(state){// 栏目跳转
+			if(this.hasLogin){
+				if(this.UserInfo.userIdentity == 2){
+					this.$api.navigateTo(`/pages/user/order/order-list-retail?state=${state}`)
 				}else{
-					this.$api.navigateTo('/pages/login/login')
+					this.$api.navigateTo(`/pages/user/order/order-list?state=${state}`)
 				}
+			}else{
+				this.$api.navigateTo('/pages/login/login')
+			}
+		},
+		navigator(url) {
+			if(this.hasLogin){
+				this.$api.navigateTo(url)
+			}else{
+				this.$api.navigateTo('/pages/login/login')
 			}
 		},
 	},
 	onShow() {
-		console.log(this.hasLogin)
 		if(this.hasLogin){
 			this.GetUserInfo()
 		}

+ 39 - 9
pages/user/activity/activity.vue

@@ -28,6 +28,8 @@
 </template>
 
 <script>
+	import wxLogin from "@/services/wxLogin.js"
+	import { mapState,mapMutations} from 'vuex';
 	export default{
 		data(){
 			return{
@@ -38,6 +40,7 @@
 					pageNum:1,
 					pageSize:10
 				},
+				UserId:0,//存储普通用户ID
 				hasNextPage:false,
 				productList:[],//商品列表
 			}
@@ -53,6 +56,9 @@
 				return Number(text).toFixed(2)
 			}
 		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity','isActivity'])
+		},
 		methods:{
 			GetProductActivityDetails(){//初始化活动详情
 				this.ProductService.GetProductActivityDetails(this.listQuery).then(response => {
@@ -75,15 +81,26 @@
 				})
 			},
 			Details(pro){
-				this.$api.navigateTo(`/pages/goods/product?productId=${pro.productId}`)
+				this.$api.navigateTo(`/pages/goods/product-activi?productId=${pro.productId}&heUserId=${this.listQuery.userId}`)
 			},
 			handAddCarts(pro){
-				this.ProductService.shoppingAddCart({productId:pro.productId,userId:this.listQuery.userId,productCount:1}).then(response => {
-					this.$util.msg('加入购物车成功',1500,true,'success')
-					this.GetCartNumber()
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
+				if(!this.hasLogin){
+					this.$api.navigateTo(`/pages/login/login`)
+				}else{
+					this.ProductService.shoppingAddCart(
+						{
+							productId:pro.productId,
+							userId:this.UserId*1,
+							productCount:1,
+							heUserId:this.listQuery.userId*1,
+						}
+					).then(response => {
+						this.$util.msg('加入购物车成功',1500,true,'success')
+						this.GetCartNumber()
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000);
+					})
+				}
 			},
 		},
 		onPullDownRefresh() {//下拉刷新
@@ -97,8 +114,21 @@
 			}
 		},
 		onShow() {
-			
-		}
+			wxLogin.wxLoginQuick()
+			this.$api.getStorage().then((resolve) => {
+				this.UserId = resolve.userId ? resolve.userId : '';	
+			})
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: '活动名称活动名称活动名称活动名称活动名称活动名称',
+			  path: `/pages/user/activity/activity?activityId=${this.listQuery.activityId}&userId=${this.listQuery.userId}`,
+			  imageUrl:'https://static.caimei365.com/app/mini-hehe/icon/icon-index-share.jpg'
+			}
+		},
 	}
 </script>
 

+ 9 - 10
pages/user/order/create-order.vue

@@ -57,9 +57,7 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				productsList:[],
 				params:{
-					userId:0,
-					productIds:'',
-					productCount:0
+					userId:0
 				},
 				subParams:{
 					userId:0,
@@ -78,11 +76,11 @@
 			if(option.type =='prodcut'){
 				this.subParams.cartType = 2
 				this.params.productCount = data.data.productCount
-				this.params.productIds = data.data.productIds
+				this.params.productId = data.data.productId
+				this.params.heUserId = data.data.heUserId ? data.data.heUserId : 0
 			}else{
 				this.subParams.cartType = 1 
-				this.params.productCount = data.data.productCount
-				this.params.productIds = data.data.productIds
+				this.params.cartIds = data.data.cartIds
 			}
 			this.$api.getStorage().then((resolve) =>{
 				this.params.userId = this.subParams.userId =  resolve.userId ? resolve.userId : 0
@@ -140,13 +138,14 @@
 				// 处理商品信息及留言
 				this.subParams.orderInfo = this.goodsData.map(el => {
 					let productInfo = [];
-					el.productList.forEach(item => {
+					el.productList.forEach(pros => {
 						productInfo.push({
-							productId:item.productId,
-							productNum:item.productCount
+							productId:pros.productId,
+							productNum:pros.productCount,
+							heUserId:pros.heUserId
 						})
 					})				
-					return {shopId:el.shopId,note:el.note?el.note:'',productInfo:productInfo}
+					return {shopId:el.shopId, note:el.note ? el.note:'' , productInfo:productInfo}
 				})
 				console.log(this.subParams)
 				this.isSubLoading = true;	

+ 35 - 35
pages/user/order/order-list-retail.vue

@@ -83,7 +83,7 @@
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text='nomoreText'></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>
@@ -126,8 +126,6 @@
 	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import { orderDataList } from '@/common/json/data.json.js' //本地数据
-	
 	
 	export default {
 		components: {
@@ -307,37 +305,38 @@
 					this.skeletonShow = false
 					this.isOnloadFlag = false
 				},1500)
-				let orderItem = this.orderTabBar[0];
-				// let state = orderItem.state;
-				// if(source === 'tabChange' && orderItem.loaded === true){
-				// 	//tab切换只有第一次需要加载数据
-				// 	return;
-				// }
+				let orderItem = this.orderTabBar[index];
+				let state = orderItem.state;
+				if(source === 'tabChange' && orderItem.loaded === true){
+					//tab切换只有第一次需要加载数据
+					return;
+				}
 				setTimeout(()=>{
-					// this.$api.getStorage().then((resolve) =>{
-					// 	this.userId = resolve.userId
-					// 	this.organizeId = resolve.organizeId
-					// 	this.OrderService.QueryOrderList(
-					// 		{
-					// 			orderState:index,
-					// 			organizeId:resolve.organizeId,
-					// 			pageNum:1,
-					// 			pageSize:this.pageSize,
-					// 			}
-					// 	)
-					// 	.then(response =>{
+					this.$api.getStorage().then((resolve) =>{
+						this.userId = resolve.userId
+						this.OrderService.QueryOrderDealerList(
+							{
+								orderState:index,
+								orderType:this.screenTab,
+								userId:resolve.userId,
+								pageNum:1,
+								pageSize:this.pageSize,
+							}
+						)
+						.then(response =>{
+							let data = response.data
 							//loaded新字段用于表示数据加载完毕,如果为空可以显示空白页
-							let orderList = orderDataList.filter(item=>{
-									//添加不同状态下订单的表现形式
-									item = Object.assign(item, this.StateExpFormat(item.state));
-									return item;
+							let orderList = data.list.filter(item=>{
+								//添加不同状态下订单的表现形式
+								item = Object.assign(item, this.StateExpFormat(item.state));
+								return item;
 							});
 							orderItem.orderList =[];
 							orderList.forEach(item=>{
 								orderItem.orderList.push(item);
 							})
 							this.$set(orderItem, 'loaded', true);
-							this.hasNextPage = response.data.hasNextPage;
+							this.hasNextPage = data.hasNextPage;
 							if(this.hasNextPage){
 								this.pullUpOn = false
 								this.nomoreText = '上拉显示更多'
@@ -349,27 +348,28 @@
 									this.nomoreText = '已至底部'
 								}
 							}
-					// 	}).catch(error =>{
-					// 		this.$util.msg(error.msg,2000);
-					// 	})
-					// })
+						}).catch(error =>{
+							this.$util.msg(error.msg,2000);
+						})
+					})
 				}, 600);	
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
-				this.OrderService.QueryOrderList(
+				this.OrderService.QueryOrderDealerList(
 					{
 						orderState:index,
-						organizeId:this.organizeId,
+						orderType:this.screenTab,
+						userId:this.userId,
 						pageNum:this.pageNum,
 						pageSize:this.pageSize
 					}
 				)
 				.then(response =>{
 					let orderItem = this.orderTabBar[index];
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					orderItem.orderList = orderItem.orderList.concat(resData)
+					let data = response.data
+					this.hasNextPage = data.hasNextPage;
+					orderItem.orderList = orderItem.orderList.concat(data.list)
 					this.pullFlag = false;// 防上拉暴滑
 					setTimeout(()=>{this.pullFlag = true;},500)
 					if(this.hasNextPage){

+ 1 - 1
pages/user/order/order-list.vue

@@ -75,7 +75,7 @@
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text='nomoreText'></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>

+ 7 - 3
pages/user/order/search-order.vue

@@ -93,7 +93,7 @@
 						</view>
 						<!--加载loadding-->
 						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text='nomoreText'></tui-nomore>
 						<!--加载loadding-->
 					</view>
 				</view>
@@ -227,8 +227,10 @@
 				 * @param:pageSize(每页条数)
 				 * @param:userId(全局变量组织ID)
 				 */ 
-				this.OrderService.SearchOrderInfo(
+				this.OrderService.QueryOrderDealerList(
 					{
+						orderState:0,
+						orderType:0,
 						searchWord:this.searchInputVal,
 						userId:this.userId,
 						pageNum:1,
@@ -271,8 +273,10 @@
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
-				this.OrderService.SearchOrderInfo(
+				this.OrderService.QueryOrderDealerList(
 					{
+						orderState:0,
+						orderType:0,
 						searchWord:this.searchInputVal,
 						userId:this.userId,
 						pageNum:this.pageNum,

+ 8 - 0
services/order.service.js

@@ -30,6 +30,14 @@ export default class OrderService {
 			isLoading: true ,
 		})
 	}
+	/* 分销者订单列表 */
+	QueryOrderDealerList (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/order/dealer/list', 
+			data, 
+			isLoading: true ,
+		})
+	}
 	/* 查询订单详情 */
 	QueryOrderDetails (data = {}) {
 		return this.AjaxService.get({