lhl 2 lat temu
rodzic
commit
d110628c94

+ 1 - 1
App.vue

@@ -3,7 +3,7 @@
 	export default {
 		
 		onLaunch: function() {
-			// console.log('進來了');
+			console.log('進來了');
 			// #ifdef H5
 			let siteinfo=require('./siteinfo.js');
 			var script = document.createElement('script');

+ 1 - 1
components/ui-component/component-unit/market_price/index.vue

@@ -4,7 +4,7 @@
             'my_shop_price': true,
             'is-del': del
         }" :data-orgp="value" :data-currency="currency" :data-original_amount="value">
-		${{ value }}
+		{{ value }}
 	</span>
 </template>
 

+ 1 - 1
components/ui-component/component-unit/shop_price/index.vue

@@ -4,7 +4,7 @@
         :data-orgp="value"
         :data-currency="currency"
         :data-original_amount="value">
-        ${{ value }}
+        {{ value }}
     </span>
 </template>
 

+ 4 - 0
main.js

@@ -76,7 +76,10 @@ Vue.prototype.$getuid = () => {
 const getUrlParms = name => {
 	const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`)
 	const r = window.location.search.substr(1).match(reg)
+	console.log(r,'r');
+	
 	if (r !== null)
+	
 		return unescape(r[2])
 	return null
 }
@@ -225,6 +228,7 @@ const start = () => {
 	})
 	// #ifdef H5
 	Vue.prototype.$uuid = Vue.prototype.$getUrlParms("uuid")
+	console.log(Vue.prototype.$getUrlParms("pid"),'Vue.prototype.$getUrlParms("pid")');
 	Vue.prototype.$bindid.getbindid({
 		pid: Vue.prototype.$getUrlParms("pid")
 	}, Vue.prototype.$store);

+ 8 - 6
pages/land/land.vue

@@ -31,19 +31,18 @@
 				</view>
 			</u-sticky>
 			<view style="padding-bottom: 120rpx;padding-top: 15rpx;">
-				<view @click="$until.toUrl('/pagesB/pages/chooseland/chooseland?landid=' + item2.id)"
+				<view @click="$until.toUrl('/pagesD/pages/product/product?id=' + item2.id)"
 					open-type="navigate" hover-class="none" class="base_item" v-for="(item2, index2) in farmlist"
 					:key="index2">
-					<u--image :src="item2.soil_cover_pic" radius="8" width="100%" height="26vh"></u--image>
+					<u--image :src="item2.pic || default_img" radius="8" width="100%" height="26vh"></u--image>
 					<view class="case_titleblock">
-						<view class="case_title">{{ item2.soil_name }}</view>
+						<view class="case_title">{{ item2.name }}</view>
 					</view>
-					<view class="case_title_sm">{{ item2.soil_desc }}</view>
+					<!-- <view class="case_title_sm">{{ item2.soil_desc }}</view> -->
 					<view class="price_selection">
 						<view class="commodity_price">
 							价格:
-							<text class="commodity_price_red text-neutral">¥{{ item2.show_price }}</text>
-							元起
+							<text class="commodity_price_red text-neutral">¥{{ item2.price }}</text>
 						</view>
 						<view class="choose_land bg-primary">选择土地</view>
 					</view>
@@ -65,7 +64,10 @@
 			tabbar
 		},
 		data() {
+			let siteinfo = getApp().globalData.siteinfo;
+			const img = siteinfo.root_img + '/static/app/imgs/default-goods.png';
 			return {
+				default_img: img,
 				offset: 45,
 				primary: this.$theme.primary,
 				status: 'loadmore',

+ 9 - 1
pagesA/pages/distribution/goCode/goCode.vue

@@ -18,7 +18,15 @@
 		},
 		onShow() {
 			var that = this;
-			mineApi.myqrcode().then(ret=>{
+			mineApi.myqrcode({
+			// #ifdef MP-WEIXIN
+			apptype: 'weixin'
+			// #endif
+			// #ifdef H5
+			apptype: 'h5'
+			// #endif
+			}).then(ret=>{
+				
 				if(ret.status == 200){
 					that.code1 = ret.data.img
 				}else{

+ 625 - 256
pagesB/pages/myland/myland.vue

@@ -1,92 +1,70 @@
 <template>
-	<view :class="[AppTheme]" class="container">
-		<!-- 头部切换 -->
-		<!-- #ifdef APP-PLUS || MP-WEIXIN -->
+	<view :class="[AppTheme]" class="content">
+	
+		<!-- #ifdef APP-PLUS||MP-WEIXIN -->
 		<u-sticky offsetTop="0" style="z-index: 10;">
 			<!-- #endif -->
 			<!-- #ifdef H5 -->
 			<u-sticky offsetTop="-44" style="z-index: 10;">
 				<!-- #endif -->
-				<view class="head_fixation">
-					<u-tabs :scrollable="false" ref="uTabs" :list="navList" lineWidth="30" :lineColor="primary"
-						:activeStyle="{
+				<view class="navbar">
+					<u-tabs ref="uTabs" :list="navList" :activeStyle="{
 			        color: primary,
 			        transform: 'scale(1.05)'
 			    }" :inactiveStyle="{
-			        color: '#606266', 
+			        color: '#606266',
 			        transform: 'scale(1)'
-			    }" :current="current" @click="tabsChange">
+			    }" lineWidth="30" :scrollable="false" :lineColor="primary" :current="tabCurrentIndex" @click="tabClick">
 					</u-tabs>
 				</view>
 			</u-sticky>
-			<!-- 订单列表 -->
-			<view class="order_list">
-				<view v-if="orderlist.length" class="order_item" v-for="(item, index) in orderlist" :key="index">
-					<view class="farm_name">{{ item.soil_name }}</view>
-					<view class="bor_solp"></view>
-					<view @click="navTo('/pagesE/pages/plotdetails/plotdetails?orderid=' + item.id)"
-						open-type="navigate" class="order_detil" v-if="item.status_pay === 2">
-						<image class="seed_item_thumbnail" mode="aspectFill" :src="item.soil_cover_pic">
-						</image>
-						<view class="right_deile">
-							<view class="article_title_p1">
-								<view class="atintl_icon bg-primary">{{ item.serve_name }}</view>
-								<view class="astin_text">{{ item.subdivision_name }}</view>
+	
+			<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+				<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex" @touchmove.stop="">
+					<scroll-view  class="list-scroll-content" scroll-y @scrolltolower="handle">
+						<view>
+							<view class="notes-con" v-for="(item, index) in orderlist" :key="index">
+								<view class="total-share" @click.stop="goDetails(item.id)">
+									<view class="ts-left">
+										<view class="ts-h">
+											<view class="ts-bg bg-primary"><text class="all-p ">农场认养</text></view>
+											<text class="expect">订单:{{ item.id }}</text>
+										</view>
+										<view class="ts-f">
+											<view>
+												<view class="num">{{ item.payprice }}</view>
+												<view class="sam zi">元</view>
+											</view>
+											<view>
+												<view class="num">3</view>
+												<view class="sam zi">年</view>
+											</view>
+											<view>
+												<view class="num">{{ item.soil_number }}</view>
+												<view class="sam zi">平方米</view>
+											</view>
+										</view>
+									</view>
+									<view class="ts-right">
+										<view class="abso  border-primary">
+											<image :src="settingFile.root_img+'/static/app/imgs/mine/17.png'" mode="" />
+											<view class="now  text-primary" v-if="swiperCurrent == 1">已到期</view>
+											<view class="now  text-primary" v-if="swiperCurrent == 0">托管中</view>
+										</view>
+									</view>
+								</view>
+								<view class="action-box b-t">
+									<button class="action-btn recom  text-primary border-primary"
+										@click="goOrderDetail(item)" >查看订单</button>
+								</view>
 							</view>
-							<view class="article_title_p2">到期日期:{{ item.period_time }}</view>
-							<view class="article_title_p3">租赁面积:{{ item.subdivision_area }}m²</view>
 						</view>
-					</view>
-					<view @click="lookorderbyid(item.id)" class="order_detil" v-if="item.status_pay === 1">
-						<image class="seed_item_thumbnail" mode="aspectFill" :src="item.soil_cover_pic">
-						</image>
-						<view class="right_deile">
-							<view class="article_title_p1">
-								<view class="atintl_icon bg-primary">{{ item.serve_name }}</view>
-								<view class="astin_text">{{ item.subdivision_name }}</view>
-							</view>
-							<view class="article_title_p2">到期日期:{{ item.period_time }}</view>
-							<view class="article_title_p3">租赁面积:{{ item.subdivision_area }}㎡</view>
-						</view>
-					</view>
-					<view class="bor_solp"></view>
-					<view class="pay_status">
-						<view class="pay_status_text text-neutral" v-if="item.status_period === 0">待支付
-						</view>
-						<view class="pay_status_text text-primary" v-if="item.status_period === 1">租赁中
-						</view>
-						<view class="pay_status_text text-base" v-if="item.status_period === 2">已过期</view>
-						<view class="pay_status_text text-neutral" v-if="item.status_period === 3">退款中
-						</view>
-						<view class="pay_status_text text-base" v-if="item.status_period === 4">已退款</view>
-						<view class="pay_status_text text-primary" v-if="item.status_period === 6">订单已关闭
-						</view>
-						<view class="pay_status_text text-primary" v-if="item.status_period === 7">终止租赁
-						</view>
-						<view class="nsnnsss">
-							<view class="action-btn recom  text-primary  border-primary" @click="refund(item.id,index)"
-								v-if="item.status_pay === 2 && item.status_period==1 && item.isback==1">退款
-							</view>
-							<view class="action-btn recom  text-primary  border-primary" @click="uporderdata(item)"
-								v-if="item.status_pay === 1&&item.status_period === 0">去付款</view>
-						</view>
-					</view>
-				</view>
-				<u-loadmore v-if="orderlist.length" :line="true" :status="status" :dashed='false' />
-				<view class="footer_bottom"></view>
-				<!-- 订单为空显示 -->
-				<view v-if="orderlist.length==0">
-					<u-empty text="暂无订单" mode="order" margin-top="100" custom-style="#fff">
-					</u-empty>
-				</view>
-			</view>
-
-			<payment ref="payment" :channel="4" :alipay="true" :weixinpay="true" :zhtpay="true"></payment>
-			<!-- 回到顶部 -->
-			<u-back-top :scroll-top="scrollTop" :custom-style="customstyle"></u-back-top>
-			<!-- 模拟框 -->
-			<u-modal v-model="modalshow" :content="content" :show-cancel-button="true" @confirm="modalconfirm()"
-				@cancel="modalcancel()"></u-modal>
+						<u-modal :showCancelButton="true" :title="title" :content="content" :show="flag"
+							@confirm="confirm" @cancel="cancel"></u-modal>
+						<u-loadmore :line="true" :status="loadingType" />
+					</scroll-view >
+				</swiper-item>
+			</swiper>
 	</view>
 </template>
 
@@ -96,6 +74,9 @@
 	export default {
 		data() {
 			return {
+				triggered: true, //设置当前下拉刷新的状态
+				refresherEnabled: true,
+				tabCurrentIndex: 0,
 				status: 'loadmore',
 				primary: this.$theme.primary,
 				settingFile: getApp().globalData.siteinfo,
@@ -113,12 +94,18 @@
 					background: '#F4F6F8'
 				},
 				navList: [{
-						name: '全部'
+						name: '全部',
+						loadingType: 'more'
 					},
 					{
-						name: '租赁中'
+						name: '租赁中',
+						loadingType: 'more'
 					}
 				],
+				loadingType: 'more',
+				
+				flag: false,
+				title: '温馨提示',
 				current: 0,
 				swiperCurrent: 0,
 				nomorelist: false,
@@ -168,6 +155,20 @@
 		},
 		onShow() {},
 		methods: {
+			tabClick(e) {
+				this.p = 1;
+				this.tabCurrentIndex = e.index;
+				this.tabsChange(e)
+			},
+			goOrderDetail(item) {
+				uni.navigateTo({
+					url: `/pagesD/pages/order/orderDetail?sid=${item.sid}&id=${item.id}`
+				});
+			},
+			step: function(i) {
+				var id = 'progress' + i;
+				return id;
+			},
 			refund(id, index) {
 				var that = this;
 				let tmplIdsone = that.$config.temlist;
@@ -362,190 +363,558 @@
 	};
 </script>
 
-<style lang="scss">
-	.action-btn {
-		width: 160upx;
-		height: 60upx;
-		margin: 0;
-		margin-left: 24upx;
-		padding: 0;
-		text-align: center;
-		line-height: 60upx;
-		font-size: $font-sm + 2upx;
-		background: #fff;
-		border-radius: 100px;
-
-		&:after {
+<style lang="scss" scoped>
+	page{
+			height: 101%;
+		}
+		.content {
+			background: $page-color-base;
+			height:100%;
+			box-sizing: border-box;
+		}
+	
+		.swiper-box {
+			height: calc(100vh - 44px);
+		}
+	
+		.list-scroll-content {
+			height: 100%;
+			overflow-y: auto;
+		}
+	
+		.navbar {
+			height: 40px;
+			padding: 0 5px;
+			background: #fff;
+			box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+			width: 100%;
+			z-index: 10;
+	
+			.nav-item {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+				font-size: 15px;
+				position: relative;
+	
+				&.current {
+	
+					&:after {
+						content: '';
+						position: absolute;
+						left: 50%;
+						bottom: 0;
+						transform: translateX(-50%);
+						width: 44px;
+						height: 0;
+						border-bottom-width: 2px;
+						border-bottom-style: solid;
+					}
+				}
+			}
+		}
+	
+		.uni-swiper-item {
+			height: auto;
+		}
+	
+		.order-item {
+			display: flex;
+			flex-direction: column;
+			padding-left: 30upx;
+			background: #fff;
+			margin-top: 16upx;
+	
+			.i-top {
+				display: flex;
+				align-items: center;
+				height: 80upx;
+				padding-right: 30upx;
+				font-size: $font-base;
+				color: $font-color-dark;
+				position: relative;
+	
+				.time {
+					flex: 1;
+				}
+	
+				.state {
+					color: $base-color;
+				}
+	
+				.del-btn {
+					padding: 10upx 0 10upx 36upx;
+					font-size: $font-lg;
+					color: $font-color-light;
+					position: relative;
+	
+					&:after {
+						content: '';
+						width: 0;
+						height: 30upx;
+						border-left: 1px solid $border-color-dark;
+						position: absolute;
+						left: 20upx;
+						top: 50%;
+						transform: translateY(-50%);
+					}
+				}
+			}
+	
+			/* 多条商品 */
+			.goods-box {
+				height: 160upx;
+				padding: 20upx 0;
+				white-space: nowrap;
+	
+				.goods-item {
+					width: 120upx;
+					height: 120upx;
+					display: inline-block;
+					margin-right: 24upx;
+				}
+	
+				.goods-img {
+					display: block;
+					width: 100%;
+					height: 100%;
+				}
+			}
+	
+			/* 单条商品 */
+			.goods-box-single {
+				display: flex;
+				padding: 20upx 0;
+	
+				.goods-img {
+					display: block;
+					width: 120upx;
+					height: 120upx;
+				}
+	
+				.right {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					padding: 0 30upx 0 24upx;
+					overflow: hidden;
+	
+					.title {
+						font-size: $font-base + 2upx;
+						color: $font-color-dark;
+						line-height: 1;
+					}
+	
+					.attr-box {
+						font-size: $font-sm + 2upx;
+						color: $font-color-light;
+						padding: 10upx 12upx;
+					}
+	
+					.price {
+						font-size: $font-base + 2upx;
+						color: $font-color-dark;
+	
+						&:before {
+							content: '¥';
+							font-size: $font-sm;
+							margin: 0 2upx 0 8upx;
+						}
+					}
+				}
+			}
+	
+			.price-box {
+				display: flex;
+				justify-content: flex-end;
+				align-items: baseline;
+				padding: 20upx 30upx;
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+	
+				.num {
+					margin: 0 8upx;
+					color: $font-color-dark;
+				}
+	
+				.price {
+					font-size: $font-lg;
+					color: $font-color-dark;
+	
+					&:before {
+						content: '¥';
+						font-size: $font-sm;
+						margin: 0 2upx 0 8upx;
+					}
+				}
+			}
+	
+			.action-box {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				height: 100upx;
+				position: relative;
+				padding-right: 30upx;
+			}
+	
+			.action-btn {
+				width: 160upx;
+				height: 60upx;
+				margin: 0;
+				margin-left: 24upx;
+				padding: 0;
+				text-align: center;
+				line-height: 60upx;
+				font-size: $font-sm + 2upx;
+				background: #fff;
+				border-radius: 100px;
+	
+				&:after {
+					border-radius: 100px;
+				}
+	
+				&.recom {
+					background: #fff9f9;
+				}
+			}
+		}
+	
+		/* load-more */
+		.uni-load-more {
+			display: flex;
+			flex-direction: row;
+			height: 80upx;
+			align-items: center;
+			justify-content: center;
+		}
+	
+		.uni-load-more__text {
+			font-size: 28upx;
+			color: #999;
+		}
+	
+		.uni-load-more__img {
+			height: 24px;
+			width: 24px;
+			margin-right: 10px;
+		}
+	
+		.uni-load-more__img>view {
+			position: absolute;
+		}
+	
+		.uni-load-more__img>view view {
+			width: 6px;
+			height: 2px;
+			border-top-left-radius: 1px;
+			border-bottom-left-radius: 1px;
+			background: #999;
+			position: absolute;
+			opacity: 0.2;
+			transform-origin: 50%;
+			animation: load 1.56s ease infinite;
+		}
+	
+		.uni-load-more__img>view view:nth-child(1) {
+			transform: rotate(90deg);
+			top: 2px;
+			left: 9px;
+		}
+	
+		.uni-load-more__img>view view:nth-child(2) {
+			transform: rotate(180deg);
+			top: 11px;
+			right: 0;
+		}
+	
+		.uni-load-more__img>view view:nth-child(3) {
+			transform: rotate(270deg);
+			bottom: 2px;
+			left: 9px;
+		}
+	
+		.uni-load-more__img>view view:nth-child(4) {
+			top: 11px;
+			left: 0;
+		}
+	
+		.load1,
+		.load2,
+		.load3 {
+			height: 24px;
+			width: 24px;
+		}
+	
+		.load2 {
+			transform: rotate(30deg);
+		}
+	
+		.load3 {
+			transform: rotate(60deg);
+		}
+	
+		.load1 view:nth-child(1) {
+			animation-delay: 0s;
+		}
+	
+		.load2 view:nth-child(1) {
+			animation-delay: 0.13s;
+		}
+	
+		.load3 view:nth-child(1) {
+			animation-delay: 0.26s;
+		}
+	
+		.load1 view:nth-child(2) {
+			animation-delay: 0.39s;
+		}
+	
+		.load2 view:nth-child(2) {
+			animation-delay: 0.52s;
+		}
+	
+		.load3 view:nth-child(2) {
+			animation-delay: 0.65s;
+		}
+	
+		.load1 view:nth-child(3) {
+			animation-delay: 0.78s;
+		}
+	
+		.load2 view:nth-child(3) {
+			animation-delay: 0.91s;
+		}
+	
+		.load3 view:nth-child(3) {
+			animation-delay: 1.04s;
+		}
+	
+		.load1 view:nth-child(4) {
+			animation-delay: 1.17s;
+		}
+	
+		.load2 view:nth-child(4) {
+			animation-delay: 1.3s;
+		}
+	
+		.load3 view:nth-child(4) {
+			animation-delay: 1.43s;
+		}
+	
+		@-webkit-keyframes load {
+			0% {
+				opacity: 1;
+			}
+	
+			100% {
+				opacity: 0.2;
+			}
+		}
+	</style>
+	<style lang="scss">
+		page {
+			width: 100%;
+			height: 100%;
+		}
+	
+		// .subrecord {
+		// width: 100%;
+		// min-height: 100%;
+		// padding-top: 0.1rpx;
+		// padding-bottom: 20rpx;
+		// background: #f1f1f1;
+		// position: relative;
+		.no-data {
+			width: 160rpx;
+			height: 160rpx;
+			position: absolute;
+			top: 35%;
+			left: 50%;
+			margin-left: -80rpx;
+		}
+	
+		.no-data image {
+			width: 100%;
+			height: 100%;
+		}
+	
+		.notes-con {
+			width: calc(100% - 40rpx);
+			margin: 0 auto;
+			border-radius: 20rpx;
+			background-color: #ffffff;
+		}
+	
+		.total-share {
+			width: 100%;
+			display: flex;
+			justify-content: flex-start;
+			margin: 20rpx auto;
+		}
+	
+		.action-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			height: 100upx;
+			position: relative;
+			padding-right: 30upx;
+		}
+	
+		.action-btn {
+			width: 160upx;
+			height: 60upx;
+			margin: 0;
+			margin-left: 24upx;
+			padding: 0;
+			text-align: center;
+			line-height: 60upx;
+			font-size: $font-sm + 2upx;
+			background: #fff;
 			border-radius: 100px;
+	
+			&:after {
+				border-radius: 100px;
+			}
+	
+			&.recom {
+				background: #fff9f9;
+				border-width: 1rpx;
+				border-style: solid;
+			}
 		}
-
-		&.recom {
-			background: #fff9f9;
-			border-width: 1rpx;
+	
+		.ts-left {
+			margin-top: 16rpx;
+			margin-left: 20rpx;
+		}
+	
+		.total-share .ts-h,
+		.ts-f {
+			width: 472rpx;
+		}
+	
+		.ts-f {
+			margin-top: -14rpx;
+		}
+	
+		.total-share .ts-h {
+			height: 70rpx;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin-bottom: 50rpx;
+			margin-top: 10rpx;
+		}
+	
+		.total-share .ts-h .ts-bg {
+			width: 74rpx;
+			height: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 16rpx;
+			background-size: 100%;
+			margin-right: 16rpx;
+			text-align: center;
+		}
+	
+		.total-share .ts-h .all-p {
+			font-size: 20rpx;
+			font-family: PingFang SC;
+			font-weight: 800;
+			color: rgba(255, 255, 255, 1);
+			letter-spacing: 6rpx;
+			margin-left: 5rpx;
+			margin-top: -8rpx;
+		}
+	
+		.total-share .ts-h .expect {
+			display: inline-block;
+			width: 360rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			-o-text-overflow: ellipsis;
+			white-space: nowrap;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: rgba(0, 0, 0, 1);
+		}
+	
+		.ts-f {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+	
+		.ts-f .red-pre {
+			font-size: 52rpx;
+			font-family: PingFang SC;
+			font-weight: 800;
+			color: rgba(255, 31, 31, 1);
+		}
+	
+		.ts-f .num {
+			position: relative;
+			top: 14rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 800;
+			color: rgba(0, 0, 0, 1);
+			text-align: center;
+		}
+	
+		.ts-f .sam {
+			text-align: center;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: rgba(102, 102, 102, 1);
+		}
+	
+		.ts-f .sam.zi {
+			margin-top: 24rpx;
+		}
+	
+		.ts-right {
+			margin-left: 10rpx;
+			/*float: right;*/
+			position: relative;
+			margin-top: 40rpx;
+		}
+	
+		.ts-right .abso {
+			width: 140rpx;
+			height: 140rpx;
+			position: absolute;
+			font-size: 24rpx;
+			left: 46rpx;
+			border-width: 4rpx;
 			border-style: solid;
+			border-radius: 50%;
+			text-align: center;
+			padding-top: 26rpx;
+			box-sizing: border-box;
+	
+			image {
+				width: 45rpx;
+				height: 51rpx;
+			}
 		}
-	}
-
-	.container {
-		background: $page-color-base;
-		height: 100%;
-		box-sizing: border-box;
-	}
-
-	.nomorelist {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 30rpx;
-		color: #333;
-		margin-bottom: 20rpx;
-	}
-
-	.tabbom {
-		// margin: 85rpx 0 0 0;
-	}
-
-	.swiper-box {
-		height: calc(100vh - 44px);
-		overflow-y: auto;
-	}
-
-	.footer_bottom {
-		width: 100%;
-		height: 40rpx;
-	}
-
-	.anjnaa {
-		width: 100%;
-		height: 1rpx;
-	}
-
-	.head_fixation {
-		width: 100%;
-		z-index: 11;
-		background-color: #ffffff;
-	}
-
-	.data_display {
-		padding: 0 17.5rpx;
-		background-color: #ffffff;
-		font-variant: common-ligatures;
-	}
-
-	.sort_set {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 75rpx;
-	}
-
-	.order_list {
-		overflow-y: auto;
-		height: 100%;
-	}
-
-	.sort_item {
-		font-size: 32rpx;
-		color: #333;
-		padding-bottom: 15rpx;
-		border-bottom: 3px solid transparent;
-	}
-
-	.order_item {
-		width: 97%;
-		margin: 25rpx auto;
-		padding: 30rpx 0;
-		background-color: #ffffff;
-		border-radius: 15rpx;
-		box-shadow: 2px 4px 12px rgba(0, 0, 0, 0.08);
-	}
-
-	.farm_name {
-		font-size: 34rpx;
-		color: #000;
-		padding: 0 20rpx;
-	}
-
-	.bor_solp {
-		background-color: #999;
-		height: 1rpx;
-		width: 100%;
-		transform: scaleY(0.3);
-		margin: 25rpx 0;
-	}
-
-	.order_detil {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 20rpx;
-	}
-
-	.seed_item_thumbnail {
-		object-fit: cover;
-		border-radius: 10rpx;
-		width: 180rpx;
-		height: 126rpx;
-	}
-
-	.right_deile {
-		width: calc(100% - 215rpx);
-	}
-
-	.article_title_p1 {
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-
-		.atintl_icon {
-			border-radius: 0 10rpx 0 10rpx;
-			padding: 5rpx 10rpx;
-			font-size: 28rpx;
-			color: #ffffff;
+	
+		.abso .yet {
+			margin-left: 16rpx;
+			width: 46rpx;
+			height: 52rpx;
 		}
-
-		.astin_text {
-			font-size: 28rpx;
-			color: #000;
-			margin-left: 15rpx;
+	
+		.abso .now {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 800;
 		}
-	}
-
-	.article_title_p2 {
-		font-size: 26rpx;
-		color: #757575;
-		margin: 25rpx 0;
-	}
-
-	.article_title_p3 {
-		font-size: 26rpx;
-		color: #757575;
-	}
-
-	.pay_status {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 0 20rpx;
-	}
-
-	.pay_status_text {
-		font-size: 28rpx;
-	}
-
-	.pay_status_button {
-		border-radius: 40rpx;
-		color: #ffffff;
-		min-width: 90rpx;
-		height: 40rpx;
-		padding: 10rpx 25rpx 10rpx 25rpx;
-		line-height: 40rpx;
-		font-size: 28rpx;
-		text-align: center;
-		margin: 0 10rpx;
-	}
-
-	.nsnnsss {
-		display: flex;
-		justify-content: flex-start;
-	}
 </style>

+ 1 - 1
pagesD/pages/order/order.vue

@@ -67,7 +67,7 @@
 								<button class="action-btn" @click="cancelOrder(item)"
 									v-if="item.status == 1 && item.type != 4">取消订单</button>
 								<button class="action-btn recom  text-primary  border-primary"
-									@click="goOrderDetail(item)">查看订单</button>
+									@click="goOrderDetail(item)">查看订单{{item.sid}}</button>
 								<button class="action-btn recom  text-primary  border-primary" @click="pay(item)"
 									v-if="item.status == 1 && item.type != 4">去付款</button>
 								<button class="action-btn recom  text-primary  border-primary"

+ 76 - 2
pagesD/pages/product/product.vue

@@ -64,7 +64,17 @@
                 </view>
             </view>      -->
 		</view>
-
+		<view v-if="ifpeon" class="sel">
+			<view>
+				<u-checkbox-group size='35rpx' active-color="green" @change="checkboxChange(tarp)">
+					<u-checkbox v-model="tarpty" shape="circle" :checked="isChecked"></u-checkbox>
+				</u-checkbox-group>
+			</view>
+			<text class="text" @click="goContract(partyinfo.id, 2)">
+				阅读并同意
+				<text class="text-primary">《{{ partyinfo != null ? partyinfo.name : '暂无' }}》</text>
+			</text>
+		</view>
 		<!-- 评价 -->
 		<!--        <view class="eva-section">
             <view class="e-header">
@@ -219,17 +229,26 @@
 		<!-- 分享 -->
 		<sharebox ref="sbox" v-if="sharedata" :data="sharedata"></sharebox>
 		<admyself :opshow="true"></admyself>
+		<tarpty :list='parttext' :tarptyshow="tarptyshow" @tarptycolse='tarptycolse' :type='2'></tarpty>
 	</view>
 </template>
 <script>
 	import api from '@/api/mall/index.js';
 	import nologin from '@/components/nologin/nologin.vue';
+	import tarpty from '@/components/ui-tarpty/ui-tarpty.vue';
 	export default {
 		components: {
-			nologin
+			nologin,
+			tarpty
 		},
 		data() {
 			return {
+				parttext: '',
+				isChecked: false,
+				tarptyshow: false,
+				tarpty: false,
+				partyinfo: {},
+				ifpeon: false,
 				primary: this.$theme.primary,
 				goodslike: false,
 				specClass: 'none',
@@ -285,6 +304,26 @@
 			return data;
 		},
 		methods: {
+			checkboxChange(e) {
+			
+				if (this.tarp == 1) {
+					this.tarp = 2
+					this.tarpty = true
+				} else {
+					this.tarpty = false
+					this.tarp = 1
+				}
+			},
+			goContract(id, type) {
+				console.log(id,type,'kkkkkk')
+				if (!this.parttext) {
+					this.$api.msg(`暂无租赁协议,联系客服添加`);
+					return;
+				} else {
+					this.tarptyshow = true
+				}
+				console.log(this.tarptyshow,'this.tarptyshow')
+			},
 			gostoredetail(farmid) { //跳转店铺详情
 			 
 				uni.navigateTo({
@@ -471,6 +510,12 @@
 			// 购买
 			buy(e) {
 				let that = this;
+				if(that.ifpeon) {
+					if (!this.tarpty) {
+						this.$api.msg(`请同意${that.partyinfo.name}`);
+						return;
+					}
+				}
 				that.isOpen = e
 				// #ifdef MP-WEIXIN
 				if (that.$store.state.islogin()) {
@@ -495,6 +540,12 @@
 				}).then(res => {
 					let arr = []; //创建空数组
 					if (res.status == 200) {
+						if(res.data.party && res.data.party.id) {
+							that.ifpeon = true
+							that.partyinfo = res.data.party
+							that.parttext = that.partyinfo.content
+							console.log(res.data.party,'res.data.party');
+						}
 						that.sharedata = res.data.sharedata;
 						that.farm_info=res.data.farm;
 						that.sharedata.title = res.data.cache.name;
@@ -1224,4 +1275,27 @@
 			 margin-top: 20rpx;
 			 padding: 20rpx 20rpx 0rpx 20rpx;
 	}
+	.sel {
+		height: 96rpx;
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #f2f2f2;
+		background-color: #ffffff;
+	}
+	
+	.sel .ipt {
+		height: 40rpx;
+		width: 40rpx;
+		border-radius: 10rpx;
+	}
+	
+	.sel .text {
+		position: relative;
+		top: -2rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: rgba(0, 0, 0, 1);
+	}
 </style>