优化

pagesGood/CnumberBox.vue → components/CnumberBox.vue

@@ -38,12 +38,12 @@
 		},
 		methods: {
 			numPlus() {
-			    this.number = this.number + this.step
+			    this.number = Number(this.number) + Number(this.step)
 				this.$emit('getNum',this.number);
 			},
 			numReduce() {
-			    if ((this.number - this.step) >= this.minNum) {
-				    this.number = this.number - this.step
+			    if ((Number(this.number) - Number(this.step)) >= Number(this.minNum)) {
+				    this.number = Number(this.number) - Number(this.step)
 			    }
 				this.$emit('getNum',this.number);
 			}
@@ -57,5 +57,6 @@
 	.main {
 		display: flex;
 		align-items: center;
+		justify-content: flex-end;
 	}
 </style>

pagesGood/goodDetails.vue

@@ -33,7 +33,7 @@
 			<!-- 			<text class="iconfont iconfangxiang"></text>
  -->
 		</view>
-		<view class="buy-num" v-if="goodData.productType != 2">
+		<view class="buy-num" v-if="goodData.productType != 2 && !minePlant">
 			<view class="buy-text">购买数量：</view>
 			<!-- <view style="display: flex;">
 				<uni-icons type="minus-filled" size="20" color="#A67A54" @click="number>1?number--:''"></uni-icons>
@@ -112,7 +112,7 @@
 <script>
 	const NET = require('@/utils/request')
 	const API = require('@/config/api')
-	import CnumberBox from '@/pagesGood/CnumberBox.vue'
+	import CnumberBox from '@/components/CnumberBox.vue'
 	export default {
 		components: {
 			CnumberBox
@@ -254,8 +254,8 @@
 						url: '/pagesGood/shopDetails?goodId=' + this.goodId
 					});
 				} else {
-					uni.navigateTo({
-						url: 'pages/cart/cart'
+					uni.switchTab({
+						url: '/pages/cart/cart'
 					});
 				}
 			},

pagesGood/goodList.vue

@@ -1,5 +1,15 @@
 <template>
 	<view class="container">
+		<view v-if="goodType == 2" class="auction-main">
+			<view class="auction-title" @click="isOpen = !isOpen">拍卖说明
+			    <u-icon :name="isOpen?'arrow-up-fill':'arrow-down-fill'" color="#ffffff" style="margin-left:5px"></u-icon>
+			</view>
+			<view v-if="isOpen" class="auction-explain">
+				<p>1、竞买人必须具备本公司发布的公告或有关规定中注明的竞买条件，否则不得参加竞买。</p>
+				<p>2、竞买人必须具备本公司发布的公告或有关规定中注明的竞买条件，否则不得参加竞买。</p>
+				<p>3、竞买人必须具备本公司发布的公告或有关规定中注明的竞买条件，否则不得参加竞买。</p>
+			</view>
+		</view>
 		<view class="search-box" v-if="goodsList.length">
 			<uni-search-bar ref="searchBar" radius="5" placeholder="搜索" :defaultText="goodName" clearButton="auto" cancelButton="none"
 			 bgColor="#ffffff" @confirm="search" class="search-bar" />
@@ -51,6 +61,7 @@
 				goodsList: [],
 				modalShow: false,
 				goodItem: {},
+				isOpen: false
 			}
 		},
 		onLoad(options) {
@@ -189,6 +200,26 @@
 		width: 100%;
 		height: 100%;
 		background-color: #f7f7f7;
+        .auction-main {
+			 // background: #52A63A;
+		 }
+		.auction-title {
+			height: 35px;
+			background:#52A63A;
+			color: #FFFFFF;
+			text-align: center;
+			padding: 5px;
+		}
+		.auction-explain {
+			background:#52A63A;
+			color: #FFFFFF;
+			border-radius: 0 0 8px 8px;
+			text-align: center;
+			padding: 10px;
+			p {
+			  margin-bottom: 5px;
+			}
+		}
 
 		.search-box {
 			width: 100%;

pagesMain/entrustForm.vue

@@ -6,7 +6,8 @@
 					<!-- <u-number-box digit :positive-integer="false" :min="0" v-model="entrustForm.payAomount" bg-color="#51A539" color="#ffffff"></u-number-box> -->
 				</u-cell-item>
 				<u-cell-item title="委托时长(小时)" title-width="190" :arrow="false">
-					<u-number-box digit :min="1" v-model="entrustForm.entrustDurationTime" bg-color="#51A539" color="#ffffff"></u-number-box>
+					<!-- <u-number-box digit :min="1" v-model="entrustForm.entrustDurationTime" bg-color="#51A539" color="#ffffff"></u-number-box> -->
+					<CnumberBox @getNum="getNum" minNum="1"></CnumberBox>
 				</u-cell-item>
 				<u-cell-item title="委托开始时间" title-width="180" @click="dateShow = true">
 					<text class="">{{entrustForm.entrustStartTime}}</text>
@@ -25,7 +26,11 @@
 <script>
 	const NET = require('@/utils/request')
 	const API = require('@/config/api')
+	import CnumberBox from '@/components/CnumberBox.vue'
 	export default {
+		components: {
+			CnumberBox
+		},
 		data() {
 			return {
 				price: 0,
@@ -64,6 +69,10 @@
 			this.orderId = options.orderId
 		},
 		methods: {
+			// 获取子组件的购买数量
+			getNum(num) {
+				this.entrustForm.entrustDurationTime = num
+			},
 			//  设置时间
 			setDate(data) {
 				this.entrustForm.entrustStartTime = data.year + '-' + data.month + '-' + data.day + ' ' + data.hour + ':' + data.minute +