4.30(添加车商发布定金,租期选择

data/tabsData.js

@@ -91,27 +91,27 @@ export const tabsList5 = [{
 
 
 export const indexTabList = [{
-	name: '推荐',
-	value: 1,
-	type: 'true'
-}, {
-	name: '此地',
-	value: 4,
-	type: 'true'
-}, {
-	name: '关注',
-	value: 5,
-	type: 'true'
-}, {
-	name: '资讯',
-	value: 3,
-	type: 'true'
-},
-// {
-// 		name: '转租',
-// 		value: 2,
-// 		type: 'true'
-// 	},
+		name: '推荐',
+		value: 1,
+		type: 'true'
+	}, {
+		name: '此地',
+		value: 4,
+		type: 'true'
+	}, {
+		name: '关注',
+		value: 5,
+		type: 'true'
+	}, {
+		name: '资讯',
+		value: 3,
+		type: 'true'
+	},
+	// {
+	// 		name: '转租',
+	// 		value: 2,
+	// 		type: 'true'
+	// 	},
 ]
 
 export const tabsList8 = [{
@@ -128,13 +128,65 @@ export const tabsList8 = [{
 export const storeInfoTabs = [{
 	name: '详情',
 	value: 'detail'
-},{
+}, {
 	name: '评价',
 	value: 'comment'
-},{
+}, {
 	name: '订前必读',
 	value: 'read'
 }, {
 	name: '常见问题',
 	value: 'problem'
-}]
+}]
+
+export const leaseTermList = [
+	[{
+			name: '1个月',
+			id: 1
+		},
+		{
+			name: '2个月',
+			id: 2
+		},
+		{
+			name: '3个月',
+			id: 3
+		},
+		{
+			name: '4个月',
+			id: 4
+		},
+		{
+			name: '5个月',
+			id: 5
+		},
+		{
+			name: '6个月',
+			id: 6
+		},
+		{
+			name: '7个月',
+			id: 7
+		},
+		{
+			name: '8个月',
+			id: 8
+		},
+		{
+			name: '9个月',
+			id: 9
+		},
+		{
+			name: '10个月',
+			id: 10
+		},
+		{
+			name: '11个月',
+			id: 11
+		},
+		{
+			name: '12个月',
+			id: 12
+		}
+	]
+]

manifest.json

@@ -2,8 +2,8 @@
     "name" : "滴友之家",
     "appid" : "__UNI__F2BE74F",
     "description" : "",
-    "versionName" : "1.2.4",
-    "versionCode" : 124,
+    "versionName" : "1.2.5",
+    "versionCode" : 125,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/carShop/maintain_order/maintain_order.vue

@@ -35,7 +35,9 @@
 				</view>
 				<view class="item-title flex align-center justify-between">
 					<view class="item-title-left">维修项目</view>
-					<view class="item-title-right">{{item.projectList[0].name}}</view>
+					<view class="item-title-right">
+						<text>{{item.projectname}}</text>
+					</view>
 				</view>
 				<view class="item-title flex align-center justify-between">
 					<view class="item-title-left">维修价格</view>
@@ -153,7 +155,13 @@
 					orderType: this.orderType
 				}
 				getDealerList(obj).then(res => {
-					console.log(res.data.list);
+					res.data.list.forEach(item=>{
+						if(item.projectList.length){
+							item.projectname=item.projectList[0].name
+						}else{
+							item.projectname='--'
+						}
+					})
 					this.$refs.paging.complete(res.data.list);
 				})
 			},

pages/carShop/mine/car_info_list/car_form.vue

@@ -69,6 +69,10 @@
 					<u-input v-model="carInfo.stock" placeholder="请输入库存" inputAlign="right" border="none">
 					</u-input>
 				</u-form-item>
+				<u-form-item v-if="type!=1" label="定金" borderBottom ref="item1" labelWidth="140rpx">
+					<u-input v-model="carInfo.stock" placeholder="请输入定金" inputAlign="right" border="none">
+					</u-input>
+				</u-form-item>
 				<u-form-item v-if="type==1" label="车龄" prop="userInfo.carAgeType" borderBottom @click="autoAgeShow=true"
 					ref="item1" labelWidth="140rpx">
 					<u--input v-model="model1.userInfo.carAgeType" disabled disabledColor="#ffffff" placeholder="请选择"
@@ -118,6 +122,11 @@
 						</text>
 					</u-input>
 				</u-form-item>
+				<u-form-item v-if="type==1" label="押金" prop="userInfo.rentalPrice" borderBottom @click="" ref="item1"
+					labelWidth="140rpx">
+					<u-input v-model="model1.userInfo.rentalPrice" placeholder="请输入押金" inputAlign="right" border="none">
+					</u-input>
+				</u-form-item>
 			</u--form>
 		</view>
 		<!-- 品牌 -->

pages/driver/index/index.vue

@@ -641,6 +641,7 @@
 			brannerClick(e) {
 				if (this.brannerList[e].linkType == 2 || this.brannerList[e] == 3) {
 					let linkObj = JSON.parse(this.brannerList[e].linkUrl)
+					console.log(linkObj);
 					this.$tab.navigateTo(linkObj.linkUrl)
 				}
 			},
@@ -900,7 +901,7 @@
 						height: 224rpx;
 						// box-shadow: 0rpx 0rpx 4rpx 0rpx rgba(0, 0, 0, 0.09);
 						border-radius: 8rpx;
-						margin-bottom: 14rpx;
+						margin-bottom: 12rpx;
 						// margin-right: 10rpx;
 					}
 				}

pages/driver/serve/hot_list.vue

@@ -101,6 +101,7 @@
 			// 去详情
 			toDetailPages(item) {
 				//，0卡券助力，1租车助力，2租卖灵活助力
+				// console.log(item.id,this.helpGenre,this.activityId);
 				this.$store.dispatch('CardId', item.id)
 				if (this.type == 'hot') {
 					uni.navigateTo({

pages/driver/showroom/confirmOrder/confirmOrder.vue

@@ -72,10 +72,13 @@
 					</u-form-item>
 					<u-form-item border-bottom>
 						<view class="">
-							<view class="f-32">
-								选择租期
+							<view style="width: 654rpx;" class="flex justify-between align-center">
+								<view class="f-32 ">
+									选择租期
+								</view>
+								<view @click="leaseTermShow=true">{{formProductData.monthRentName}}</view>
 							</view>
-							<view class="">
+							<!-- <view class="">
 								<u-radio-group v-model="formProductData.monthRent" activeColor="#13AFA8" placement="row"
 									ange="groupChange">
 									<view style="width:638rpx" class="flex align-center justify-between mt-32">
@@ -89,7 +92,7 @@
 											name="12">12个月</u-radio>
 									</view>
 								</u-radio-group>
-							</view>
+							</view> -->
 						</view>
 					</u-form-item>
 				</view>
@@ -362,10 +365,15 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-picker :show="leaseTermShow" @cancel="leaseTermShow=false" @confirm="leaseTermConFn"
+			@close="leaseTermShow=false" :columns="leaseTermList" keyName="name"></u-picker>
 	</view>
 </template>
 
 <script>
+	import {
+		leaseTermList
+	} from "@/data/tabsData.js"
 	import {
 		mapGetters
 	} from 'vuex'
@@ -388,6 +396,8 @@
 		},
 		data() {
 			return {
+				//选择日期弹出层
+				leaseTermShow: false,
 				//协议选中
 				isAgreement: false,
 				//购车类型
@@ -399,19 +409,7 @@
 				value: '',
 				keyName: '',
 				orderType: 2, // 1 租买；2租车；0：卖车   
-				radiolist: [{
-						name: '3个月'
-					},
-					{
-						name: '6个月'
-					},
-					{
-						name: '9个月'
-					},
-					{
-						name: '12个月'
-					}
-				],
+				leaseTermList: leaseTermList,
 				form: {
 					attrListData: '',
 					carType: '',
@@ -462,6 +460,12 @@
 		},
 		mounted() {},
 		methods: {
+			//选择租期
+			leaseTermConFn(e) {
+				this.formProductData.monthRentName = e.value[0].name
+				this.formProductData.monthRent = e.value[0].id 
+				this.leaseTermShow = false
+			},
 			//用户协议
 			navCommonFn(type) {
 				uni.navigateTo({
@@ -677,7 +681,7 @@
 			eventChannel.on('form', (data) => {
 				console.log('确认订单', data);
 				this.formProductData = data
-				this.formProductData.monthRent = String(data.monthRent)
+				this.formProductData.monthRentName = String(data.monthRent) + '个月'
 				this.disMonthRent = this.formProductData.monthRent
 				this.attrListData = [data.attrList]
 			})
@@ -858,7 +862,7 @@
 	}
 
 	.top-up-popup {
-		padding: 24rpx ;
+		padding: 24rpx;
 
 		.top-up-popup-allprice {
 			font-size: 32rpx;