展厅28

api/mine/business_cooperation.js

@@ -0,0 +1,20 @@
+
+import request from '@/utils/request'
+
+//  添加意向合作  /api/front/intended/cooperation/add
+export function addCooperationAPI(data) {
+	return request({
+		url: '/api/front/intended/cooperation/add',
+		method: 'post',
+		data
+	})
+}
+
+//  合作类目列表    /api/front/intended/category/Category/list
+//            /api/front/intended/category/list
+export function categoryListAPI(){
+	return request({
+		url:`/api/front/intended/category/list`,
+		method:'get'
+	})
+}

pages.json

@@ -71,7 +71,53 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
-		}, {
+		}, 
+		{
+			"path" : "pages/showroom/carList/carList",
+			"style" :
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/showroom/carRental/index",
+			"style" :
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/showroom/carBuy/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/showroom/carBuy/predetermine",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+				
+			}
+		},
+		{
+			"path" : "pages/showroom/confirmOrder/confirmOrder",
+			"style" : 
+			{
+				"navigationBarTitleText" : "确认订单",
+				"navigationBarBackgroundColor": "#f5f5f5"
+			}
+		},
+		{
 			"path": "pages/serve/index",
 			"style": {
 				"navigationBarTitleText": "服务",

pages/mine/business_cooperation/business_cooperation.vue

@@ -3,8 +3,8 @@
 		<view class="f-36 c000 bus-coo-title">服务商入住</view>
 		<u--form labelPosition="left" :model="model1" :rules="rules" ref="uForm">
 			<view class="bus-coo-form-item">
-				<u-form-item label="公司名称" prop="userInfo.userName" ref="item1" labelWidth="180rpx">
-					<u-input v-model="model1.userInfo.userName" border="none" placeholder="请输入公司名称">
+				<u-form-item label="公司名称" prop="modelInfo.companyName" ref="item1" labelWidth="180rpx">
+					<u-input v-model="model1.modelInfo.companyName" border="none" placeholder="请输入公司名称">
 						<template slot="suffix">
 							<view>/这是公司名</view>
 						</template>
@@ -12,8 +12,8 @@
 				</u-form-item>
 			</view>
 			<view class="bus-coo-form-item">
-				<u-form-item label="入住类目" prop="userInfo.label" ref="item1" labelWidth="180rpx">
-					<u-input v-model="model1.userInfo.label" border="none" placeholder="请选择入住类目">
+				<u-form-item label="入住类目" prop="modelInfo.category" ref="item1" labelWidth="180rpx"  @click="openCategory" >
+					<u-input v-model="category" border="none" placeholder="请选择入住类目">
 						<template slot="suffix">
 							<u-icon name="arrow-down-fill" color="#999" size="16"></u-icon>
 						</template>
@@ -21,8 +21,8 @@
 				</u-form-item>
 			</view>
 			<view class="bus-coo-form-item">
-				<u-form-item label="开通板块" prop="userInfo.type" ref="item1" labelWidth="180rpx">
-					<u-input v-model="model1.userInfo.type" border="none" placeholder="请选择开通板块">
+				<u-form-item label="开通板块" prop="modelInfo.plate" ref="item1" labelWidth="180rpx" @click="showPlate = true">
+					<u-input v-model="plate" border="none" placeholder="请选择开通板块">
 						<template slot="suffix">
 							<u-icon name="arrow-down-fill" color="#999" size="16"></u-icon>
 						</template>
@@ -30,13 +30,13 @@
 				</u-form-item>
 			</view>
 			<view class="bus-coo-form-item">
-				<u-form-item label="联系人" prop="userInfo.name" ref="item1" labelWidth="180rpx">
-					<u-input v-model="model1.userInfo.name" border="none" placeholder="请输入联系人"> </u-input>
+				<u-form-item label="联系人" prop="modelInfo.contactName" ref="item1" labelWidth="180rpx">
+					<u-input v-model="model1.modelInfo.contactName" border="none" placeholder="请输入联系人"> </u-input>
 				</u-form-item>
 			</view>
 			<view class="bus-coo-form-item">
-				<u-form-item label="手机号码" prop="userInfo.pall" ref="item1" labelWidth="180rpx">
-					<u-input v-model="model1.userInfo.pall" border="none" placeholder="请输入手机号码"> </u-input>
+				<u-form-item label="手机号码" prop="modelInfo.phone" ref="item1" labelWidth="180rpx">
+					<u-input v-model="model1.modelInfo.phone" maxlength='11' border="none" placeholder="请输入手机号码"> </u-input>
 				</u-form-item>
 			</view>
 			<view class="bus-coo-form-butt">
@@ -48,37 +48,123 @@
 			<view>如果需要其他类型的商务合作，请联系我们</view>
 			<view>400-1569-258</view>
 		</view>
+		<u-action-sheet
+			:show="showPlate"
+			:actions="actions"
+			title="请选择开通板块"
+			@close="showPlate = false"
+			@select="plateSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+			:show="showCategory"
+			:actions="actions1"
+			title="请选择入住类目"
+			@close="showCategory = false"
+			@select="categorySelect"
+		>
+		</u-action-sheet>
 	</view>
 </template>
 
 <script>
+	import { addCooperationAPI,categoryListAPI} from '@/api/mine/business_cooperation.js'
 	export default {
 		data() {
 			return {
 				model1: {
-					userInfo: {
-						name: 'uView UI',
+					modelInfo: {
+						companyName:'',
+						category:'',
+						plate:'',
+						contactName:'',
+						phone:'',
 					},
 				},
+				category:'',
+				plate:'',
 				rules: {
-					'userInfo.name': {
-						type: 'string',
+					'userInfo.companyName': {
 						required: true,
-						message: '请填写姓名',
+						message: '请填写',
+						trigger: ['blur', 'change']
+					},'userInfo.category': {
+						required: true,
+						message: '请选择',
+						trigger: ['blur', 'change']
+					},'userInfo.plate': {
+						required: true,
+						message: '请选择',
+						trigger: ['blur', 'change']
+					},'userInfo.contactName': {
+						required: true,
+						message: '请填写',
 						trigger: ['blur', 'change']
 					},
+					'userInfo.phone': [
+						{
+							required: true, 
+							message: '请输入手机号',
+							trigger: ['change','blur'],
+						},
+						{
+							// 自定义验证函数
+							validator: (rule, value, callback) => {
+								// 上面有说，返回true表示校验通过，返回false表示不通过
+								// uni.$u.test.mobile()就是返回true或者false的
+								return uni.$u.test.mobile(value);
+							},
+							message: '手机号码不正确',
+							// 触发器可以同时用blur和change
+							trigger: ['change','blur'],
+						}
+					]
 				},
-			};
+				showPlate:false,
+				actions:[
+					{id:1,name: '车商'},
+					{id:2,name: '维修店'},
+				],
+				showCategory:false,
+				actions1:[],
+			}
+		},
+		onShow() {
+			this.categoryList()
 		},
 		methods: {
-			sexSelect(e) {
-				this.model1.userInfo.sex = e.name
-				this.$refs.uForm.validateField('userInfo.sex')
+			openCategory(){
+				this.showCategory=true
+				// console.log(this.actions1,'999999999999999999999');
+			},
+			categoryList(){
+				categoryListAPI().then(res=>{
+					// console.log(res,'1111');
+					// this.actions1=res.data
+					res.data.forEach(ele => {
+						ele.name=ele.categoryName
+					});
+					this.actions1=res.data
+				})
+			},
+			plateSelect(e) {
+				// console.log(e,'开通板块');
+				this.model1.modelInfo.plate = e.id
+				this.plate=e.name
+				this.$refs.uForm.validateField('plate')
+			},
+			categorySelect(e) {
+				// console.log(e,'类目e');
+				this.model1.modelInfo.category = e.id
+				this.category=e.name
+				this.$refs.uForm.validateField('category')
 			},
 			//提交
 			submitFn(){
-				uni.redirectTo({
-					url:'/pages/mine/business_cooperation/submit'
+				addCooperationAPI(this.model1.modelInfo).then(res=>{
+					uni.redirectTo({
+						url:'/pages/mine/business_cooperation/submit'
+					})
 				})
 			},
 		},

pages/showroom/carBuy/index.vue

@@ -94,7 +94,7 @@
 			navBackFn(type) {
 				if (type == 'tabbar') {
 					uni.switchTab({
-						url: '/pages/driver/index/index'
+						url: '/pages/index/index'
 					})
 				} else {
 					uni.navigateBack()

pages/showroom/carBuy/predetermine.vue

@@ -10,22 +10,22 @@
 			</view>
 			<view slot="right">
 				<!-- #ifdef MP-WEIXIN -->
-				<view class="flex collect-share" style="">
+				<view class="flex collect-share" style="margin-right: 160rpx;">
 				<!-- #endif -->
-					<!-- #ifdef APP -->
-					<view class="flex collect-share" style="margin-right: 0;">
-					<!-- #endif -->
-						<u-icon v-if="!commodityDeta.userIsCollect" name="star" :color="showType <= 2 && '#fff'|| '#000'" size="20"></u-icon>
-						<u-icon v-else name="star-fill" color="#F78D1F" size="20"></u-icon>
-						<u-icon style="margin-left: 20rpx;" name="share-square"
-							:color="showType <= 2 && '#fff'|| '#000'" size="20"></u-icon>
-					</view>
+				<!-- #ifdef APP -->
+				<view class="flex collect-share" style="margin-right: 0;">
+				<!-- #endif -->
+					<u-icon v-if="!commodityDeta.userIsCollect" name="star" :color="showType <= 2 && '#fff'|| '#000'" size="20"></u-icon>
+					<u-icon v-else name="star-fill" color="#F78D1F" size="20"></u-icon>
+					<u-icon style="margin-left: 20rpx;" name="share-square"
+						:color="showType <= 2 && '#fff'|| '#000'" size="20"></u-icon>
 				</view>
+			</view>
 		</u-navbar>
 		<view :class="['branner-box', showType <= 2 && 'branner-box-color']">
 			<view v-show="showType!=3" class="">
 				<!-- #ifdef MP-WEIXIN -->
-				<view :style="{height: `${$u.sys().statusBarHeight}px;`}" />
+				<view style="height: {{statusHeight}}px" />
 				<!-- #endif -->
 				<!-- #ifdef APP -->
 				<view :style="`height: ${$u.sys().statusBarHeight}px;`" />
@@ -34,28 +34,44 @@
 				<view v-show="showType != 4" style="height: 48rpx;" />
 			</view>
 			<view v-show="showType<=2" class="delivery-time flex align-center">
+				<!-- #ifdef MP-WEIXIN -->
+				<image :src="`${config.aliyunOssUrl}/static/images/app/icon/clock-1.png`" mode=""></image>
+				<!-- #endif -->
+				<!-- #ifdef APP -->
 				<image src="@/static/images/app/icon/clock-1.png" mode=""></image>
+				<!-- #endif -->
 				预计下单后2-4周内交付
 			</view>
+			<view class="">
+			</view>
 			<!-- 轮播图 -->
 			<view v-show="showType < 3" style="height: 146rpx;" />
+			<!-- 图库 -->
 			<view class="swiper-box" v-show="showType == 1">
 				<u-swiper circular imgMode="aspectFit" bgColor="transparent" height="604rpx"
 					indicatorActiveColor="#13AFA8" keyName="image" @change="actTrimChengFn" :list="branner" indicator
 					:indicatorStyle="{bottom:'0rpx'}">
 				</u-swiper>
 			</view>
+			<!-- 内饰 -->
 			<u-swiper v-show="showType == 3" circular :current="colorIndex" :autoplay="false" imgMode="aspectFit"
 				bgColor="#D9D9D9" height="750rpx" keyName="image" :list="colorList" @change="actTrimChengFn">
 			</u-swiper>
 			<view v-show="showType ==3" style="height: 108rpx;" />
+			<!-- 外观 内饰 -->
 			<view class="out-box" v-show="showType == 2 || showType == 3" v-if="colorList.length">
 				<u-swiper v-show="showType==2" circular :current="colorIndex" :autoplay="false" imgMode="aspectFit"
 					bgColor="transparent" height="476rpx" keyName="image" :list="colorList" @change="actTrimChengFn">
 				</u-swiper>
 				<view class="swiper-line-box">
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="swiper-line"
+						style="transform: translateX( {{tranX}} rpx);transition: transform 0.5s;" />
+					<!-- #endif -->
+					<!-- #ifdef APP -->
 					<view class="swiper-line"
 						:style="`transform: translateX(${96 / (colorList.length-1) * colorIndex}rpx);transition: transform 0.5s;`" />
+					<!-- #endif -->
 				</view>
 				<view class="color-info flex-column-center">
 					<view class="">
@@ -63,23 +79,37 @@
 					</view>
 					<view class="color-info-all">
 						￥{{colorList[colorIndex].addPrice}}
-						<!-- <text>{{colorList[colorIndex].price}}</text> -->
 					</view>
 				</view>
 				<view class="color-list flex-wrap align-center justify-center">
+					<!-- #ifdef MP-WEIXIN -->
+					<view @click="actTrimClickFn(index)"
+						:class="['color-item', colorIndex == index && 'active-color-item']"
+						style="background: {{item.color}}" v-for="(item,index) in colorList" :key="index" />
+					<!-- #endif -->
+					<!-- #ifdef APP -->
 					<view @click="actTrimClickFn(index)"
 						:class="['color-item', colorIndex == index && 'active-color-item']"
 						:style="`background: ${item.color}`" v-for="(item,index) in colorList" :key="index" />
+					<!-- #endif -->
 				</view>
 				<view class="tip">
 					颜色以实物为准
 				</view>
 			</view>
+			<!-- #ifdef MP-WEIXIN -->
+			<view v-show="showType==4" class="image-box"
+				style="height: calc(100vh - {{ statusHeight }}px - 424rpx)">
+				<image :src="commodityDeta.equityImage" mode="widthFix"></image>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef APP -->
 			<view v-show="showType==4" class="image-box"
 				:style="{height: `calc(100vh - ${$u.sys().statusBarHeight}px - 424rpx)`}">
 				<image :src="commodityDeta.equityImage" mode="widthFix"></image>
 			</view>
-			<view v-show="showType!=4" style="height: 340rpx;" />
+			<!-- #endif -->
+			<view v-show="showType!=4" style="height: 340rpx" />
 			<view class="btns-box flex align-center justify-between">
 				<view :class="['btn-item', showType == 1 && 'active_item']" @click="changeShowType(1)">
 					图库
@@ -143,9 +173,18 @@
 				endTrimIds: {
 					appearaceId: '', //外观
 					interiorId: '', //内饰
-				}
+				},
+				statusHeight:wx.getSystemInfoSync().statusBarHeight,
+				// statusHeight:$u.sys().statusBarHeight
 			};
 		},
+
+		computed: {
+		    tranX () {
+				let tranX=(96/(this.colorList.length-1)*this.colorIndex)
+				return tranX
+		    }
+		},
 		methods: {
 			//监听选择
 			actTrimChengFn(e) {
@@ -175,7 +214,7 @@
 					this.endTrimIds.interior = this.commodityDeta.interiorList[0]
 				}
 				uni.navigateTo({
-					url: `/pages/driver/showroom/confirmOrder/confirmOrder?type=${this.type}`,
+					url: `/pages/showroom/confirmOrder/confirmOrder?type=${this.type}`,
 					success:res=>{
 						 // 通过eventChannel向被打开页面传送数据
 						res.eventChannel.emit('form', {...this.endTrimIds,...this.commodityDeta})
@@ -212,8 +251,6 @@
 						})
 					}
 				}
-
-
 			},
 			//详情
 			getProductInfoFn() {
@@ -269,6 +306,7 @@
 	.branner-box {
 		width: 750rpx;
 		height: 1222rpx;
+		 // border: 1px solid red;
 
 		.delivery-time {
 			margin: 0 auto;
@@ -289,18 +327,20 @@
 		}
 
 		.swiper-box {
+			// border: 1px solid red;
 			padding: 0 27rpx;
 			width: 750rpx;
 			height: 604rpx;
-			background: url('@/static/images/app/showroom/platform.png');
+			background: url('https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/images/app/showroom/platform.png');
 			background-repeat: no-repeat;
 			background-size: contain;
 			background-position: bottom;
 		}
 
 		.btns-box {
+			// border: 1px solid red;
 			position: fixed;
-			bottom: 200rpx;
+			bottom: 272rpx;
 			left: 50%;
 			transform: translateX(-50%);
 			width: 686rpx;
@@ -326,6 +366,7 @@
 		.buy-btn-box {
 			width: 750rpx;
 			background-color: #fff;
+			// border: 1px solid blue;
 
 			.btn-info {
 				padding: 32rpx 24rpx;
@@ -352,7 +393,9 @@
 		}
 
 		.out-box {
+			border: 1px solid palegreen;
 			.swiper-line-box {
+				border: 1px solid blue;
 				margin: 0 auto;
 				width: 128rpx;
 				height: 6rpx;
@@ -360,6 +403,7 @@
 				border-radius: 3rpx;
 
 				.swiper-line {
+					border: 1px solid;
 					width: 32rpx;
 					height: 6rpx;
 					background: #13AFA8;

pages/showroom/carRental/index.vue

@@ -364,7 +364,7 @@
 			examineFn(arr,index){
 				uni.previewImage({
 					current:index,
-					urls:arr
+					url:arr
 				})
 			},
 			//车商发布列表 
@@ -385,7 +385,7 @@
 			navEndOrderFn() {
 				this.$store.dispatch('Cardmoney', null)
 				uni.navigateTo({
-					url: `/pages/driver/showroom/confirmOrder/confirmOrder?type=2`,
+					url: `/pages/showroom/confirmOrder/confirmOrder?type=2`,
 					success: res => {
 						// 通过eventChannel向被打开页面传送数据
 						res.eventChannel.emit('form', {
@@ -460,7 +460,7 @@
 				let id = this.commodityDeta.id
 				let commodityNum = this.commodityNum
 				uni.navigateTo({
-					url: `/pages/driver/welfare/rightsInterests/confirm_order?id=${id}&commodityNum=${commodityNum}`
+					url: `/pages/welfare/rightsInterests/confirm_order?id=${id}&commodityNum=${commodityNum}`
 				})
 			},
 			//弹出层
@@ -471,7 +471,7 @@
 			navBackFn(type) {
 				if (type == 'tabbar') {
 					uni.switchTab({
-						url: '/pages/driver/index/index'
+						url: '/pages/index/index'
 					})
 				} else {
 					uni.navigateBack()
@@ -493,7 +493,7 @@
 			//去评论列表
 			navEvaluateFn(item){
 				uni.navigateTo({
-					url: `/pages/driver/mine/my_order/evaluate_order/evaluate_list?id=${item.id}`
+					url: `/pages/mine/my_order/evaluate_order/evaluate_list?id=${item.id}`
 				})
 			},
 		},

pages/showroom/confirmOrder/confirmOrder.vue

@@ -247,9 +247,9 @@
 		<view style="height: 264rpx;" />
 		<view class="btn-box fixed-bottom">
 			<view class="radio-box flex align-center">
-				<image v-if="isAgreement" @click="isAgreement=false" src="@/static/images/accessory/ok_end.png" mode="">
+				<image v-if="isAgreement" @click="isAgreement=false" src="@/static/images/app/accessory/ok_end.png" mode="">
 				</image>
-				<image v-else @click="isAgreement=true" src="@/static/images/accessory/no_end.png" mode=""></image>
+				<image v-else @click="isAgreement=true" src="@/static/images/app/accessory/no_end.png" mode=""></image>
 
 				<text class="text-agree">请仔细阅读并勾选租车</text><text class="text-agree color-primary">《用户协议》</text>
 			</view>
@@ -467,7 +467,7 @@
 			// 使用优惠券
 			useCouponsBtn() {
 				uni.navigateTo({
-					url: `/pages/driver/serve/coupons/cou_card`
+					url: `/pages/serve/coupons/cou_card`
 				})
 			},
 			//整理数据
@@ -525,13 +525,13 @@
 			//支付成功
 			navPayOkFn(){
 				uni.redirectTo({
-					url: `/pages/driver/serve/coupons/payresult?resultType=res&type=buyCar`
+					url: `/pages/serve/coupons/payresult?resultType=res&type=buyCar`
 				})
 			},
 			//支付失败
 			navPayOnFn(){
 				uni.redirectTo({
-					url: `/pages/driver/serve/coupons/payresult?resultType=err&type=buyCar`
+					url: `/pages/serve/coupons/payresult?resultType=err&type=buyCar`
 				})
 			},
 			// 去支付

pages/showroom/index.vue

@@ -309,11 +309,18 @@
 			},
 			// getProductListFn(){},
 			link(item) {
+				console.log(item,'link数据');
 				if (this.form.type == 2) {
 					console.log('111222333');
-					this.$tab.navigateTo(`./carRental/index?id=${item.id}`)
+					// uni.navigateTo(`/pages/showroom/carRental/index?id=${item.id}`)
+					uni.navigateTo({
+						url:`/pages/showroom/carRental/index?id=${item.id}`
+					})
 				} else {
-					this.$tab.navigateTo(`./carBuy/index?id=${item.id}&type=${this.form.type}`)
+					console.log('445566');
+					uni.navigateTo({
+						url:`/pages/showroom/carBuy/index?id=${item.id}&type=${this.form.type}`
+					})
 				}
 			},
 			fixed(e) {