commit -m

components/cm-module/cm-seller/home.vue

@@ -5,11 +5,11 @@
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-home tui-skeleton">
 			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isRequest"></banner>
+			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
 			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isRequest"></navbars>
+			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
 			<!-- 直播 -->
-			<page-special :templateData="templateData" v-if="isRequest"></page-special>
+			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
@@ -69,6 +69,8 @@
 				supplierObj:{},//供应商列表
 				isScrollTop:false,
 				isRequest:false,
+				isNavRequest:false,
+				isLiveRequest:false,
 			}
 		},
 		created() {
@@ -92,14 +94,15 @@
 				this.CommonService.GetHomeInit({source:2}).then(response =>{
 					let data = response.data
 					this.navBarsList = data.topMenuList
+					this.isNavRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			GetHomeTopDataInfo(){//金刚区分类
+			GetHomeTopDataInfo(){//直播、活动、文章模块
 				this.CommonService.GetHomeTopDataInfo({source:2}).then(response =>{
 					this.templateData = response.data
-					console.log(this.templateData)
+					this.isLiveRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -110,7 +113,6 @@
 					this.liveList = data.liveList;
 					this.pageList = data.homePageFloor;
 					this.supplierObj = data.supplierImage;
-					this.skeletonShow = false;
 					this.isRequest = true;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -122,9 +124,10 @@
 					this.bannerImageList = data.bannerImageList
 					this.mallPageModules = data.mallPageModules
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
+					this.skeletonShow = false;
 					this.GetHomeInit()
-					this.GetHomeFloorInfo()
 					this.GetHomeTopDataInfo()
+					this.GetHomeFloorInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

components/cm-module/supplier/home.vue

@@ -5,11 +5,11 @@
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-home tui-skeleton">
 			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isRequest"></banner>
+			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
 			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isRequest"></navbars>
+			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
 			<!-- 直播 -->
-			<page-special :templateData="templateData" v-if="isRequest"></page-special>
+			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
@@ -69,6 +69,8 @@
 				supplierObj:{},//供应商列表
 				isScrollTop:false,
 				isRequest:false,
+				isNavRequest:false,
+				isLiveRequest:false,
 			}
 		},
 		created() {
@@ -92,14 +94,15 @@
 				this.CommonService.GetHomeInit({source:2}).then(response =>{
 					let data = response.data
 					this.navBarsList = data.topMenuList
+					this.isNavRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			GetHomeTopDataInfo(){//金刚区分类
+			GetHomeTopDataInfo(){//直播、活动、文章模块
 				this.CommonService.GetHomeTopDataInfo({source:2}).then(response =>{
 					this.templateData = response.data
-					console.log(this.templateData)
+					this.isLiveRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -110,7 +113,6 @@
 					this.liveList = data.liveList;
 					this.pageList = data.homePageFloor;
 					this.supplierObj = data.supplierImage;
-					this.skeletonShow = false;
 					this.isRequest = true;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -122,9 +124,10 @@
 					this.bannerImageList = data.bannerImageList
 					this.mallPageModules = data.mallPageModules
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
+					this.skeletonShow = false;
 					this.GetHomeInit()
-					this.GetHomeFloorInfo()
 					this.GetHomeTopDataInfo()
+					this.GetHomeFloorInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

pages/goods/goods-classify.vue

@@ -220,6 +220,7 @@
 				windowHeight: '',
 				scrollHeight: '',
 				listQuery:Object.assign({}, defaultListQuery),
+				priceLoading:true,
 				loadding: false,
 				pullUpOn: true,
 				pullFlag: true,
@@ -321,7 +322,7 @@
 					const resData = JSON.parse(response.data);
 					const resList = resData.items;
 					this.totalPage = resData.total;
-					this.listData = [...this.listData,...resList];
+					this.listData = [...this.listData,...resList];					
 					this.GetProductPrice()
 					// 防上拉暴滑
 					this.pullFlag = false;
@@ -344,6 +345,7 @@
 				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
 					productIdArr.push(item.p_id)
 				})
+				this.priceLoading = true;
 				this.productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:this.productIds}).then(response =>{
 					if(response.data) {

pages/goods/instrument-details.vue

@@ -223,7 +223,7 @@
 					let pageMap = data.pageContentMap
 					this.secondFloorList = pageMap.secondFloorList
 					this.firstFloorList = pageMap.firstFloorList
-					this.crmDetailList = pageMap.crmDetailList
+					this.crmDetailList = pageMap.pcDetailList
 					this.html = this.$api.adaptRichTextImg(this.crmDetailList[0].content)
 					this.floorList = data.floorList
 					this.skeletonShow = false

pages/tabBar/home/index.vue

@@ -5,11 +5,11 @@
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-home tui-skeleton">
 			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isRequest"></banner>
+			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
 			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isRequest"></navbars>
+			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
 			<!-- 直播 -->
-			<page-special :templateData="templateData" v-if="isRequest"></page-special>
+			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
@@ -69,6 +69,8 @@
 				supplierObj:{},//供应商列表
 				isScrollTop:false,
 				isRequest:false,
+				isNavRequest:false,
+				isLiveRequest:false,
 			}
 		},
 		onLoad() {
@@ -113,14 +115,15 @@
 				this.CommonService.GetHomeInit({source:2}).then(response =>{
 					let data = response.data
 					this.navBarsList = data.topMenuList
+					this.isNavRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			GetHomeTopDataInfo(){//金刚区分类
+			GetHomeTopDataInfo(){//直播、活动、文章模块
 				this.CommonService.GetHomeTopDataInfo({source:2}).then(response =>{
 					this.templateData = response.data
-					console.log(this.templateData)
+					this.isLiveRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -131,7 +134,6 @@
 					this.liveList = data.liveList;
 					this.pageList = data.homePageFloor;
 					this.supplierObj = data.supplierImage;
-					this.skeletonShow = false;
 					this.isRequest = true;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -143,9 +145,10 @@
 					this.bannerImageList = data.bannerImageList
 					this.mallPageModules = data.mallPageModules
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
+					this.skeletonShow = false;
 					this.GetHomeInit()
-					this.GetHomeFloorInfo()
 					this.GetHomeTopDataInfo()
+					this.GetHomeFloorInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

second/pages/form/form.vue

@@ -3,8 +3,7 @@
 	     <view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
 	      <view class="my-maintenance" >
 	            <view class="newsTitle">
-					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手
-					设备/产品信息，每个商品需要收取您100元的展示费，展示期为6个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
+					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备/产品信息，每个商品需要收取您100元的展示费，展示期为6个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
 	             </view>
 				 <form>
 					 <view class="row fenlei"> 
@@ -125,13 +124,25 @@
 					 <view class="row">
 						 <view class="label">联系人</view>
 						 <view class="spacing">
-							  <input type="text" maxlength="6" v-model="secondParams.contactName"   placeholder="请输入联系人姓名" placeholder-class="placeholder">
+							  <input type="text" maxlength="15" v-model="secondParams.contactName" placeholder="请输入联系人姓名" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <view class="label">联系方式</view>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.contactMobile"    maxlength="11" placeholder="请输入联系人手机号 / 固话" placeholder-class="placeholder">
+							 <input type="text"  v-model="secondParams.contactMobile" maxlength="11" placeholder="请输入联系人手机号" placeholder-class="placeholder">
+					    </view> 
+					 </view>
+					 <view class="row">
+						 <view class="label">采美对接人</view>
+						 <view class="spacing">
+							 <input type="text"  v-model="secondParams.dockingPeopleName" maxlength="15" placeholder="请输入采美对接人姓名" placeholder-class="placeholder">
+					    </view> 
+					 </view>
+					 <view class="row">
+						 <view class="label">对接人联系方式</view>
+						 <view class="spacing">
+							 <input type="text"  v-model="secondParams.dockingPeopleMobile" maxlength="11" placeholder="请输入采美对接人手机号" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
@@ -192,10 +203,7 @@
 						</view>
 						<view class="productinfo">
 							 <view class="label unlogin-label" style="width: 100%;">免责声明</view>
-							 <textarea type="text"  class="smText" >
-								 鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，
-								 由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
-							 </textarea>
+							 <text class="smText" >鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！</text>
 						</view>
 						<view class="row Read">
 							<span  @click="changeBox($event)" class="iconfont xiangliao"
@@ -214,16 +222,16 @@
 				 </mpvue-city-picker>
 	          </view>
 			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
-					<view class="bjmain theresult">
-						<span class="title">发布提示</span>
-						<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为6个月</br>
-							支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
-						<view class="paybtn">
-							<view class="thegopay gozhofubao" @click.stop="quxiao">取消发布</view>
-							<view class="cancel closebtn" @click.stop="gopay">去支付</view>
-						</view>
+				<view class="bjmain theresult">
+					<span class="title">发布提示</span>
+					<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为6个月</br>
+						支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
+					<view class="paybtn">
+						<view class="thegopay gozhofubao" @click.stop="quxiao">取消发布</view>
+						<view class="cancel closebtn" @click.stop="gopay">去支付</view>
 					</view>
 				</view>
+			</view>
 		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 	</view>
 </template>
@@ -243,64 +251,66 @@
 		},
 		data(){
 			return{
+				userIdentity:0,
 				popupShow:false,
 				fenlei:[
-				            {name:'二手仪器',value:'1'},
-				            // {name:'临期产品',value:'2'},
-				            {name:'其他',value:'3'},
-				        ],
-				        radioList:[
-				            {name:'轻光电',value:'1',isChecked:false},
-				            {name:'重光电',value:'2',isChecked:false},
-				            {name:'耗材配件',value:'3',isChecked:false},
-				
-				        ],
-				        beauty:[
-				           {name:'医美',value:'1'},
-				           {name:'非医美',value:'2'},
-				        ],
-				        BrandList:[],
-				        isShow:false,
-				        GoodsImagesList:[],
-				        vShow_GoodsImages:false,
-				        secondParams:{
-				            secondHandType:'',//一级分类
-				            instrumentType:'',//二手仪器分类
-				            name:'',
-				            brandID:'',//品牌ID
-				            brandName:'',//其他品牌
-				            fixedYears:null,//出厂
-				            companyName:'',//公司名称
-				            maturityYears:'',//产品到期
-				            price1:'',//交易价
-				            detailTalkFlag:1,//是否启用详聊
-				            normalPrice:'',//市场价
-				            originalPrice:'',//采购价
-				            stock:'',//数量
-				            productQuality:'',//商品成色
-				            contactName:'',//联系人
-				            contactMobile:'',//联系方式
-				            secondProductType:'',//
-				            townId:'',//县区地址
-				            address:'',//详细地址
-				            image1:'',//图片
-				            productDetails:'',//商品详细信息
-				            source:1,
-				         },
-						 addressData:{
-						 	address:'请选择所在地区',
-						 	townID:'',			//区ID
-						 	cityID:'',			//区ID
-						 	provinceID:'',		//区ID
-						 	addressDetail: '',	//地址
-						 },
-				        brandname:'请选择品牌名称',
-				        checkbox:false,
-				        shoplogoTwo:false,
-				        vShow_secondBj:false,
-				        resultBj:false,
-				        vShow_detailTalkFlag:false,
-						playid:'',
+				   {name:'二手仪器',value:'1'},
+				   // {name:'临期产品',value:'2'},
+				   {name:'其他',value:'3'},
+				],
+				radioList:[
+				   {name:'轻光电',value:'1',isChecked:false},
+				   {name:'重光电',value:'2',isChecked:false},
+				   {name:'耗材配件',value:'3',isChecked:false},
+				],
+				beauty:[
+				   {name:'医美',value:'1'},
+				   {name:'非医美',value:'2'},
+				],
+				BrandList:[],
+				isShow:false,
+				GoodsImagesList:[],
+				vShow_GoodsImages:false,
+				secondParams:{
+					secondHandType:'',//一级分类
+					instrumentType:'',//二手仪器分类
+					name:'',
+					brandID:'',//品牌ID
+					brandName:'',//其他品牌
+					fixedYears:null,//出厂
+					companyName:'',//公司名称
+					maturityYears:'',//产品到期
+					price1:'',//交易价
+					detailTalkFlag:1,//是否启用详聊
+					normalPrice:'',//市场价
+					originalPrice:'',//采购价
+					stock:'',//数量
+					productQuality:'',//商品成色
+					contactName:'',//联系人
+					contactMobile:'',//联系方式
+					dockingPeopleName:'',//采美对接人姓名
+					dockingPeopleMobile:'',//采美对接人手机号
+					secondProductType:'',//
+					townId:'',//县区地址
+					address:'',//详细地址
+					image1:'',//图片
+					productDetails:'',//商品详细信息
+					source:2
+				 },
+				 addressData:{
+					address:'请选择所在地区',
+					townID:'',			//区ID
+					cityID:'',			//区ID
+					provinceID:'',		//区ID
+					addressDetail: '',	//地址
+				 },
+				brandname:'请选择品牌名称',
+				checkbox:false,
+				shoplogoTwo:false,
+				vShow_secondBj:false,
+				resultBj:false,
+				vShow_detailTalkFlag:false,
+				playid:'',
 			}
 		},
 		methods:{
@@ -422,9 +432,25 @@
 					return
 				}
 				if(!$reg.isMobile(this.secondParams.contactMobile)){
-					this.$util.msg('联系方式格式不正确',2000);
+					this.$util.msg('请填写正确的手机号',2000);
 					return
 				}
+				if(this.userIdentity === 3){
+					if(this.secondParams.dockingPeopleName == ''){
+						this.$util.msg('请输入采美对接人姓名',2000);
+						return
+					}
+					if(this.secondParams.dockingPeopleMobile == ''){
+						this.$util.msg('请输入采美对接人手机号',2000);
+						return
+					}
+				}
+				if(this.secondParams.dockingPeopleMobile !=''){
+					if(!$reg.isMobile(this.secondParams.dockingPeopleMobile)){
+						this.$util.msg('请填写正确的采美对接人手机号',2000);
+						return
+					}
+				}
 				if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
 					this.$util.msg('请完善联系地址',2000);
 					return
@@ -495,13 +521,18 @@
 				this.checkbox = !this.checkbox;
 			},
 		},
-		created(){
-			 this.SecondService.brandList().then(res =>{//品牌列表
-						if(res.code == 0){
-						   this.BrandList = res.data;
-						}
-					})
-			},
+		onShow() {
+			this.SecondService.brandList().then(res =>{//品牌列表
+				if(res.code == 0){
+				   this.BrandList = res.data;
+				}
+			})
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.userIdentity = resolve.userIdentity
+			}).catch(error =>{
+				console.log(error)
+			})
+		}
 	}
 </script>
 
@@ -526,13 +557,13 @@
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
 		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -25%;
 		    right: 40%;border-bottom: 20rpx solid #1890f9;position: absolute;}
-		.label{color: #666666;display: inline-block;width: 120rpx;}
+		.label{color: #666666;display: inline-block;}
 		.label.second{width: 155rpx;}
 		.row .spacing.second{width: 70%;}
 		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
 		.row.fenlei{height: auto;margin: 10rpx 0;border: 0}
 		.select {position: relative;color: #b2b2b2;text-align: left;user-select: none;}
-		.row .spacing{display: inline-block;margin-left: 50rpx;width: 75%;vertical-align:middle;position: relative}
+		.row .spacing{display: inline-block;margin-left: 50rpx;width: 430rpx;vertical-align:middle;position: relative}
 		.select .placeholder {position: relative;cursor: pointer;width: 100%;display: inline-block;}
 		.icon-xiayibu{right: 0rpx;;color: #b2b2b2;position: absolute}
 		.xiangliao{font-size: 26rpx;margin-right: 10rpx;color: #b2b2b2}

second/pages/product/product-list.vue

@@ -59,7 +59,7 @@
 								</view>
 		                        <view class="liulan_right">
 									<text class="iconfont  icon-kejian1"></text>
-		                           {{item.viewingNum}}
+		                           {{item.viewingNum ? item.viewingNum : '0'}}
 		                        </view>
 		                    </view>
 		                </view>

services/ajax.env.js

@@ -1,12 +1,11 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
-	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-t.caimei365.com'	 //采美测试地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+	// URL_CONFIG = 'http://192.168.2.68:8082'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8082'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.75:8082'	 //超超联调地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'