hmy_farmer-main.git

			@@ -67,15 +67,31 @@
			</view>
			</view>
			<view class="desc m-t-12">
			<view class="m-r-15">已售:{{ dto.sales \|\| 0 }}</view>
			<view class="m-r-15">已售:{{ ((dto.sales\|\|0) +(dto.realSales\|\|0)) \|\| 0 }}</view>
			<view class="m-r-15">剩余:{{ dto.stock \|\| 0 }}</view>
			<view class=" ">{{ dto.unit \|\| '-' }}</view>
			</view>
			<view class="flex m-t-12">
			<view class="price m-r-a">
			<span class="num">{{ dto.price \|\| '-' }}</span>
			元/扎
			</view>
			<view class="flex m-t-12">
			<!-- #ifdef PUB_CUSTOMER_DEV -->
			<view>
			<view class="price m-r-a component-price-new">
			<span class="tip">会员价</span><span class="num p">{{ dto.priceMember \|\| dto.price \|\| '-' }}</span>
			元/扎
			</view>
			<view class="price m-r-a component-price-old">
			<span class="num">{{ dto.price \|\| '-' }}</span>
			元/扎
			</view>
			</view>
			<!-- #endif -->
			<!-- #ifndef PUB_CUSTOMER_DEV -->
			<view class="price m-r-a">
			<span class="num">{{ dto.price \|\| '-' }}</span>
			元/扎
			</view>
			<!-- #endif -->


			<view class="m-l-a m-r-15">
			<button open-type="contact" class="component-button-contact">
			<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
			@@ -103,7 +119,7 @@
			</view>
			<view class="info-detail" v-if="dto.params">
			<view class="title-before-blue" style="padding-top: 0rpx;padding-bottom: 0rpx;">详情</view>
			<view class="flex m-t-8" v-for="(param,index) of dto.params" :key="index">
			<view class="flex flex-wrap-normal m-t-8" v-for="(param,index) of dto.params" :key="index">
			<view class="label">{{ param.name}}：</view>
			<view class="value">{{ param.value \|\| '-'}}</view>
			</view>
			@@ -219,7 +235,7 @@
			}
			this.refreshShopNum()
			},
			onLoad(options) {
			async onLoad(options) {
			console.log('trade detail options', options)
			this.id = options.id \|\| ''

			@@ -229,22 +245,24 @@
			let tmp = this
			tmp.sharePartnerUserId = options.partnerUserId
			//合伙人绑定的，判断当前用户，是否有登录,登录没绑定，没登录先缓存合伙人id，等注册和登录时候再弄
			setTimeout(() => {
			//并且当前用户没有绑定
			if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {
			return
			}
			if (tmp.currentInfo.id) {
			tmp.bindPartnerUser(options.partnerUserId, '')
			} else {
			tmp.sharePartnerUserId = options.partnerUserId
			//没有登录到话设置到缓存
			if (tmp.sharePartnerUserId) {
			tmp.$storage.setItem('cache_sharePartnerUserId', tmp.sharePartnerUserId)
			}
			}
			// setTimeout(() => {
			//并且当前用户没有绑定
			if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {

			}else{
			if (tmp.currentInfo.id) {
			await tmp.bindPartnerUser(options.partnerUserId, '')
			} else {
			tmp.sharePartnerUserId = options.partnerUserId
			//没有登录到话设置到缓存
			if (tmp.sharePartnerUserId) {
			tmp.$storage.setItem('cache_sharePartnerUserId', tmp.sharePartnerUserId)
			}
			}
			}


			}, 1000)
			// }, 1000)
			}
			// #endif
			if (this.id) {
			@@ -590,24 +608,24 @@
			margin-top: 12rpx;
			display: flex;

			.tag {
			min-width: 80rpx;
			padding-left: 20rpx;
			padding-right: 20rpx;
			line-height: 36rpx;
			background: #FEE6E6;
			border-radius: 21rpx;
			font-size: 24rpx;
			color: #CD1212;
			margin-right: 12rpx;
			text-align: center;
			}

			.tag.green {
			color: rgba(110, 159, 102, 1);
			background: rgba(202, 229, 214, 1);
			border-radius: 21rpx;
			// opacity: 0.57;
			.tag {
			// min-width: 60rpx;
			padding-left: 10rpx;
			padding-right: 10rpx;
			line-height: 30rpx;
			background: #FEE6E6;
			border-radius: 10rpx;
			font-size: 18rpx;
			color: #CD1212;
			margin-right: 6rpx;
			text-align: center;
			}

			.tag.green {
			color: rgba(110, 159, 102, 1);
			background: rgba(202, 229, 214, 1);
			border-radius: 10rpx;
			// opacity: 0.57;
			}
			}