5.21(优化

2024-05-21 18:53:57 +08:00
parent 419362f1ea
commit de648dad2d
8 changed files with 128 additions and 89 deletions
--- a/config.js
+++ b/config.js
@@ -1,10 +1,10 @@
 // 应用全局配置
 module.exports = {
 	//正式
-	baseUrl: 'https://cms.diyouzhijia.com/car_app_api',
+	// baseUrl: 'https://cms.diyouzhijia.com/car_app_api',
 	TOKENNAME: 'Authori-zation',
 	//薛磊测试
-	// baseUrl: 'http://192.168.31.226:8081/car_app_api',
+	baseUrl: 'http://192.168.31.226:8081/car_app_api',
 	fileUploadUrl: 'https://cms.diyouzhijia.com/car_app_api/api/front/upload/image',
 	WebSocketUrl: 'ws://121.199.24.205:9107/lxk/websocket',
 	WebSocketOpen: false,
--- a/data/tabsData2.js
+++ b/data/tabsData2.js
@@ -28,7 +28,7 @@ export const tabsList2 = [{
 	name: '助力中',
 	value: 0
 }, {
-	name: '助理成功',
+	name: '助力成功',
 	value: 1
 }, {
 	name: '助力失败',
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "滴友之家",
    "appid" : "__UNI__F2BE74F",
    "description" : "",
-    "versionName" : "1.3.1",
-    "versionCode" : 131,
+    "versionName" : "1.3.3",
+    "versionCode" : 133,
    "transformPx" : false,
    "app-plus" : {
        "usingComponents" : true,
--- a/pages/driver/index/consult_detail.nvue
+++ b/pages/driver/index/consult_detail.nvue
@@ -51,21 +51,21 @@
 			<view class="com_title">
 				<view class="tit_l">
 					<view class="" style="display: flex;flex-direction: row;">
-						<text :class="[showAll?'l_click':'l_l']" @click="allLook(1)"> 全部 </text>
+						<text :class="[showAll?'l_click':'l_l']" @click="allLook(1)"> 全部 ({{replyAllTotal}})</text>
 						<!-- <text :class="[showAll?'l_click':'l_l']"
 								v-if="replyAllTotal&&showAll">({{ replyAllTotal }})</text> -->
 					</view>
-					<view style="display: flex;flex-direction: row;">
-						<text :class="[showLook?'r_click':'l_r']" @click="allLook(2)"> 只看楼主 </text>
+			<!-- 		<view style="display: flex;flex-direction: row;">
+						<text :class="[showLook?'r_click':'l_r']" @click="allLook(2)"> 只看楼主 </text> -->
 						<!-- <text :class="[showLook?'l_click':'l_r']"
 								v-if="replyAllTotal&&showLook">({{ replyAllTotal }})</text> -->
-					</view>
+					<!-- </view> -->

 				</view>
-				<u-tabs :list="list" :scrollable='false' lineWidth="0" lineColor="#ffffff"
+				<!-- <u-tabs :list="list" :scrollable='false' lineWidth="0" lineColor="#ffffff"
 					:activeStyle="{color: '#111111'}" :inactiveStyle="{color: '#999999'}"
 					itemStyle="height: 34px; font-size: 28rpx;" @click="tabsBtn">
-				</u-tabs>
+				</u-tabs> -->
 			</view>
 		</cell>
 		<!-- //聊天列表 -->
--- a/pages/driver/mine/my_activity/detail.vue
+++ b/pages/driver/mine/my_activity/detail.vue
@@ -53,7 +53,11 @@
 				</view>
 				<view class="mt-4 mb-4" v-if="detail.isJoin">
 					<u-button shape="circle" color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)"
-						@click="sureBtn(1)">继续邀请 助力0元租车</u-button>
+						@click="sureBtn(1)">继续邀请  &nbsp;{{' '}}
+							<text v-if="helpGenre==2"> {{detail.subhead}}</text>
+							<text v-else-if="helpGenre==0"> {{detail.name}}</text>
+							<text v-else>{{detail.title}}</text>
+						</u-button>
 				</view>
 			</view>

@@ -104,7 +108,11 @@
 				<image v-show="helpType != 3" class="avatar" src="@/static/images/app/mine/pay.png" mode=""></image>
 				<text v-show="helpType != 3" class="f-26 c999 mb-3">用户昵称</text>
 				<view class="text-box flex-column align-center" v-show="helpType == 0 || helpType == 2">
-					<text v-show="helpType == 0" class="f-29 c222 fw-b">邀请您助力0元租车</text>
+					<text v-show="helpType == 0" class="f-29 c222 fw-b">邀请您助力
+						<text v-if="helpGenre==2"> {{detail.subhead}}</text>
+						<text v-else-if="helpGenre==0"> {{detail.name}}</text>
+						<text v-else>{{detail.title}}</text></u-button>
+					</text>
 					<text v-show="helpType == 2" class="f-29 c222 fw-b">您已为别人助力过，</text>
 					<text v-show="helpType == 2" class="f-29 c222 fw-b">很遗憾不能为他助力了!</text>
 				</view>
@@ -131,7 +139,10 @@
 		<view style="height:180rpx" v-if="!detail.isJoin" />
 		<view class="btn-bottom fixed-bottom bg-white" v-if="!detail.isJoin">
 			<u-button @click="sureBtn(0)" shape="circle"
-				color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)">参与并邀请好友 助力0元租车</u-button>
+				color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)">参与并邀请好友 &nbsp;{{' '}}
+							<text v-if="helpGenre==2"> {{detail.subhead}}</text>
+							<text v-else-if="helpGenre==0"> {{detail.name}}</text>
+							<text v-else>{{detail.title}}</text></u-button>
 		</view>
 	</view>
 </template>
@@ -170,11 +181,11 @@
 		methods: {
 			//邀请微信好友
 			weixinShareFn() {
-				// console.log('邀请', this.detail);
+				console.log('邀请', this.detail);
 				let shareData = {
 					imageUrl: this.detail.cover ? this.detail.cover :
 						'https://qicheoss.oss-cn-shanghai.aliyuncs.com/crmebimage/public/product/2024/01/24/c70ad2284470406280fb0e06200a63e2g4ht7zante.png',
-					content: this.detail.content
+					content: this.detail.name
 				}
 				this.shareShow = false
 				shareApi('WXSceneSession', shareData).then(res => {
--- a/pages/driver/mine/my_activity/my_activity.vue
+++ b/pages/driver/mine/my_activity/my_activity.vue
@@ -332,15 +332,20 @@
 					type: this.type
 				}
 				getCardHelpList(obj).then(res => {
-					console.log(res.data);
+					console.log(res.data.list);
+
 					res.data.list.forEach(item => {
+						console.log(JSON.parse(item.labels));
 						item.labels = JSON.parse(item.labels)
 						if (item.userList === null) {
 							item.userList = []
 						} else if (item.userList.length > 3) {
 							item.userList.length = 3
 						}
-						item.cover = item.cover.split(",")[0]
+						if (item.cover) {
+							item.cover = item.cover.split(",")[0]
+						}
+
 					})
 					this.$refs.paging.complete(res.data.list);
 				}).catch(err => {
--- a/pages/login/driver-login.vue
+++ b/pages/login/driver-login.vue
@@ -120,7 +120,7 @@
 							this.resendCodeTime--
 							if (this.resendCodeTime == 0) {
 								this.codeStatus = true
-								this.resendCodeTime=60
+								this.resendCodeTime = 60
 								clearInterval(this.timer)
 							}
 						}, 1000)
@@ -152,8 +152,10 @@
 				}
 			}
 		},
-		onReady() {
+		onLoad() {
 			uni.hideTabBar();
+		},
+		onReady() {
 			this.$refs.uForm.setRules(this.rules)
 		}
 	}
--- a/pages/login/server-login.vue
+++ b/pages/login/server-login.vue
@@ -1,27 +1,36 @@
 <!-- 服务商登录页 -->
 <template>
-  <view class="page">
-    <view class="login-now f-56 fw-5 c333">
-    	立即登录
-    </view>
+	<view class="page">
+		<view class="login-now f-56 fw-5 c333">
+			立即登录
+		</view>
 		<view class="login-r f-32 fw-4 color-c">
 			登录以实现您的需求
 		</view>
 		<view class="">
 			<u-form class="form-box" :model="form" :rules="rules" ref="uForm">
 				<u-form-item border-bottom>
-					<u-input type="number" disabledColor="#ffffff" disabled maxlength="11" placeholder="服务商类型" placeholder-class="placeholder-class" border="none" v-model="identityName">
+					<!-- {keyName: 'repair', text: '维修店'}, -->
+					<!-- {keyName: 'carDealers', text: '车商'} -->
+					<u-radio-group v-model="form.sid" @change="confirm" activeColor="#13AFA8" placement="row"
+						ange="groupChange">
+						<u-radio activeColor="#13AFA8" label="carDealers" name="carDealers">车商</u-radio>
+						<u-radio activeColor="#13AFA8" label="repair" name="repair" class="ml-24">维修店</u-radio>
+					</u-radio-group>
+					<!-- <u-input type="number" disabledColor="#ffffff" disabled maxlength="11" placeholder="服务商类型" placeholder-class="placeholder-class" border="none" v-model="identityName">
 						<view class="flex" slot="suffix" @click="identityShow = true">
 							<text class="f-30 c111">{{ identityName }}</text>
 							<u-icon name="arrow-right" color="#999999" size="12"></u-icon>
 						</view>
-					</u-input>
+					</u-input> -->
 				</u-form-item>
 				<u-form-item class="mt-44" border-bottom prop="phone">
-					<u-input type="number" maxlength="11" placeholder="请输入手机号码" placeholder-class="placeholder-class" border="none" v-model="form.phone"></u-input>
+					<u-input type="number" maxlength="11" placeholder="请输入手机号码" placeholder-class="placeholder-class"
+						border="none" v-model="form.phone"></u-input>
 				</u-form-item>
 				<u-form-item border-bottom class="mt-44" prop="captcha">
-					<u-input type="number" maxlength="6" placeholder="请输入验证码" placeholder-class="placeholder-class" border="none" v-model="form.captcha" >
+					<u-input type="number" maxlength="6" placeholder="请输入验证码" placeholder-class="placeholder-class"
+						border="none" v-model="form.captcha">
 						<text class="f-30 c111" v-show="!codeStatus" slot="suffix">{{resendCodeTime}}秒重新获取</text>
 						<text class="f-30 c111" v-show="codeStatus" slot="suffix" @click="getCode">获取验证码</text>
 					</u-input>
@@ -29,11 +38,13 @@
 			</u-form>
 		</view>
 		<view class="agreement-box flex align-center" @click="agreement">
-			<view class="frame flex justify-center align-center" :style="agree ? 'background: #13AFA8;' : 'border: 2rpx solid #999999'">
+			<view class="frame flex justify-center align-center"
+				:style="agree ? 'background: #13AFA8;' : 'border: 2rpx solid #999999'">
 				<u-icon v-show="agree" name="checkmark" size="8" color="#fff"></u-icon>
 			</view>
 			<view class="f-26 c444">
-				我已阅读并同意<text class="c-primary" @click.stop="navCommonFn('用户协议')">{{' 用户协议 '}}</text>和<text class="c-primary" @click.stop="navCommonFn('隐私政策')">{{' 隐私政策 '}}</text>
+				我已阅读并同意<text class="c-primary" @click.stop="navCommonFn('用户协议')">{{' 用户协议 '}}</text>和<text
+					class="c-primary" @click.stop="navCommonFn('隐私政策')">{{' 隐私政策 '}}</text>
 			</view>
 		</view>
 		<u-button class="login-btn mt-8" color="#13AFA8" shape="circle" @click="loginSumbit">登录</u-button>
@@ -41,46 +52,47 @@
 			<text class="serve-login" @click="gotoServeLogin">司机端登录</text>
 			<u-safe-bottom></u-safe-bottom>
 		</view>
-		<u-picker 
-			:show="identityShow" 
-			:columns="identityList" 
-			title="请选择" 
-			keyName="text" 
-			confirmColor="#13AFA8" 
-			cancelColor="#999999" 
-			@confirm="confirm" 
-			@cancel="cancel" 
-		/>
-  </view>
+		<u-picker :show="identityShow" :columns="identityList" title="请选择" keyName="text" confirmColor="#13AFA8"
+			cancelColor="#999999" @confirm="confirm" @cancel="cancel" />
+	</view>
 </template>

 <script>
-	import { getSendCode } from '@/api/login';
-  export default {
-    data() {
-      return {
+	import {
+		getSendCode
+	} from '@/api/login';
+	export default {
+		data() {
+			return {
 				agree: false,
 				codeStatus: true,
 				identityShow: false,
-				resendCodeTime: 60, 
+				resendCodeTime: 60,
 				timer: null,
-				identityName: '车商',
-				identityList: [[ 
-					// {keyName: 'platform', text: '平台'}, 
-					{keyName: 'repair', text: '维修店'}, 
-					{keyName: 'carDealers', text: '车商'}
-				]], 
+				identityName: 'repair',
+				identityList: [
+					[
+						// {keyName: 'platform', text: '平台'}, 
+						{
+							keyName: 'repair',
+							text: '维修店'
+						},
+						{
+							keyName: 'carDealers',
+							text: '车商'
+						}
+					]
+				],
 				form: {
 					phone: '',
 					captcha: '',
 					sid: 'carDealers'
 				},
 				rules: {
-					phone: [
-						{
-							required: true, 
+					phone: [{
+							required: true,
 							message: '请输入手机号',
-							trigger: ['change','blur'],
+							trigger: ['change', 'blur'],
 						},
 						{
 							validator: (rule, value, callback) => {
@@ -92,31 +104,31 @@
 					],
 					captcha: {
 						type: 'string',
-								required: true,
-								len: 6,
-								message: '请填写6位验证码',
-								trigger: ['blur']
+						required: true,
+						len: 6,
+						message: '请填写6位验证码',
+						trigger: ['blur']
 					},
 				}
-      }
-    },
-    methods: {
-		//用户协议
-		navCommonFn(type){
-			uni.navigateTo({
-				url:`/pages/common/textview/index?title=${type}`
-			})
+			}
 		},
-			confirm(e) {
-				this.identityName = e.value[0].text
-				this.form.sid = e.value[0].keyName
-				this.identityShow = false
+		methods: {
+			//用户协议
+			navCommonFn(type) {
+				uni.navigateTo({
+					url: `/pages/common/textview/index?title=${type}`
+				})
+			},
+			confirm() {
+				console.log(this.form.sid);
+				// this.identityName = e.value[0].text
+				// this.form.sid = e.value[0].keyName
+				// this.identityShow = false
 			},
 			cancel() {
 				this.identityShow = false
 			},
-			selectClick(e) {
-			},
+			selectClick(e) {},
 			agreement() {
 				this.agree = !this.agree
 			},
@@ -128,34 +140,32 @@
 			},
 			// 获取验证码
 			getCode() {
-				if(this.form.phone) {
-					if(this.codeStatus) {
+				if (this.form.phone) {
+					if (this.codeStatus) {
 						this.codeStatus = false
 						this.timer = setInterval(() => {
 							this.resendCodeTime--
-							if(this.resendCodeTime == 0) {
+							if (this.resendCodeTime == 0) {
 								this.codeStatus = true
-								this.resendCodeTime=60
+								this.resendCodeTime = 60
 								clearInterval(this.timer)
 							}
 						}, 1000)
-						getSendCode(this.form).then(res => {
-						}).catch(err => {
-						})
+						getSendCode(this.form).then(res => {}).catch(err => {})
 					}
-					
+
 				} else {
 					uni.$u.toast('请先输入手机号')
 				}
 			},
 			// 登录
 			loginSumbit() {
-				if(this.agree) {
+				if (this.agree) {
 					uni.showLoading({
 						title: '登录中'
 					})
 					this.$refs.uForm.validate().then(res => {
-						if(this.form.sid == 'platform') {
+						if (this.form.sid == 'platform') {
 							uni.hideLoading()
 							uni.$u.toast('平台模块开发中')
 						} else if (this.form.sid == 'repair') {
@@ -167,9 +177,9 @@
 									url: '/pages/repair/tabbar/repair'
 								})
 							})
-						} else if ( this.form.sid == 'carDealers') {
+						} else if (this.form.sid == 'carDealers') {
 							this.$store.dispatch('CarShopLogin', this.form).then(res => {
-								console.log(res,'dddddd');
+								console.log(res, 'dddddd');
 								uni.hideLoading()
 								// uni.$u.toast('车商模块开发中')
 								uni.switchTab({
@@ -189,27 +199,32 @@
 		onReady() {
 			this.$refs.uForm.setRules(this.rules)
 		}
-  }
+	}
 </script>

 <style lang="scss">
 	page {
 		padding: 290rpx 60rpx;
 	}
+
 	.login-now {
 		line-height: 84rpx;
 	}
+
 	.login-r {
 		margin-top: 8rpx;
 		line-height: 48rpx;
 	}
+
 	.form-box {
 		margin-top: 42rpx;
 		width: 100%;
 	}
+
 	.agreement-box {
 		margin-top: 32rpx;
 		line-height: 36rpx;
+
 		.frame {
 			margin-right: 14rpx;
 			width: 24rpx;
@@ -217,6 +232,7 @@
 			border-radius: 50%;
 		}
 	}
+
 	.login-btn {
 		width: 630rpx;
 		height: 96rpx;
@@ -226,23 +242,28 @@
 		font-weight: 600;
 		color: #FFFFFF;
 	}
+
 	.order-login {
 		bottom: 24rpx;
 		left: 50%;
 		transform: translateX(-50%);
+
 		.serve-login {
 			border-bottom: 1rpx solid #13AFA8;
 		}
 	}
-  .color-c {
+
+	.color-c {
 		color: #CDCDCD;
 	}
+
 	.mt-44 {
 		margin-top: 44rpx;
 	}
+
 	.placeholder-class {
 		font-size: 30rpx;
 		font-family: PingFang SC, PingFang SC;
 		color: #A4A7A6;
 	}
-</style>
+</style>