From c68712252c5aa35e965ea89895c3ee9fe77be7fc Mon Sep 17 00:00:00 2001 From: honghong <2401639944@qq.com> Date: Tue, 3 Dec 2024 09:25:51 +0800 Subject: [PATCH] 优化 --- components/custom/dynamics.vue | 4 ++-- contract/index/index.vue | 8 ++++++++ homePage/demand/detail.vue | 8 +++++--- pages/login/index.vue | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 70 insertions(+), 11 deletions(-) diff --git a/components/custom/dynamics.vue b/components/custom/dynamics.vue index 62a93d9..2203338 100644 --- a/components/custom/dynamics.vue +++ b/components/custom/dynamics.vue @@ -5,7 +5,7 @@ <image :src="item" mode="aspectFit" class="" v-for="(item,index) in itemDetail.imgs" :key="index"></image> </view> - <image :src="itemDetail.imgs[0]" mode="aspectFit" class="bg" v-else></image> + <image :src="itemDetail.imgs[0]" mode="aspectFill" class="bg" v-else></image> <view class="" style="padding: 20rpx;"> <!-- <view class="dynamic-title">{{itemDetail.forumTitle}}</view> --> @@ -24,7 +24,7 @@ src="https://img0.baidu.com/it/u=1893171979,2260795920&fm=253&fmt=auto&app=120&f=JPEG?w=506&h=500" mode="widthFix"></image> </view> --> - <view class="dynamic-date">{{itemDetail.createTime}}</view> + <!-- <view class="dynamic-date">{{itemDetail.createTime}}</view> --> <view class="d-flex a-center j-sb mt-two" > <view class="d-flex a-center " style="width: 100%; justify-content: space-between;"> <view class="d-flex a-center" > diff --git a/contract/index/index.vue b/contract/index/index.vue index 79cbe98..f68f432 100644 --- a/contract/index/index.vue +++ b/contract/index/index.vue @@ -55,6 +55,14 @@ {{contractInfo.area}} </view> </view> + <view class="index-cet-tt" v-if="contractStatus != 1 && contractStatus != 2 && contractStatus != 3"> + <view class="index-cet-tt-lf"> + 优惠券: + </view> + <view class="index-cet-tt-rg"> + -{{contractInfo.discountPrice||0}} + </view> + </view> <view class="index-cet-tt"> <view class="index-cet-tt-lf"> 付款金额: diff --git a/homePage/demand/detail.vue b/homePage/demand/detail.vue index be04fd4..8a4f732 100644 --- a/homePage/demand/detail.vue +++ b/homePage/demand/detail.vue @@ -126,7 +126,9 @@ this.$refs.childPopup.show = true; }, // 回复按钮点击事件 - handleOpenRely(replyId,replyUserId,replyUserName){ + handleOpenRely(replyId,replyUserId,replyUserName,id, commentIdData){ + this.dataid = id + this.commentIdDatas = commentIdData this.replyData = { commentId:replyId,//回复对话的id userId:replyUserId,//回复人的id @@ -137,13 +139,13 @@ this.$refs.childPopup.show = true; }, async handleSubmit() { - console.log('不仅吗======') + // console.log('======') let params; if (this.isReply) { // 表示回复 params = { forumId: this.detailData.demandId, - parentCommentId:this.replyData.commentId, + parentCommentId: this.dataid=='1'?this.replyData.commentId:this.commentIdDatas, repliedId:this.replyData.commentId, repliedUserId:this.replyData.userId, commentType: 'demand', diff --git a/pages/login/index.vue b/pages/login/index.vue index d466524..fe470d2 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -29,8 +29,18 @@ borderRadius: '30rpx', }"></u--input> </view> - </view> - <view class=" d-flex a-center" style="margin-top: 10vh;"> + </view> + + + <view class="a-center" style="margin-top: 10vh;"> + <view class="index-cent-btm-xy"> + <image @click="clickxy" v-if="dlxz" src="../../static/images/dlxz.png" mode=""></image> + <image @click="clickxy" v-else src="../../static/images/dlwxz.png" mode=""></image> + <view class=""> + 阅读并同意<span @click="handleRead('user')">《用户协议》</span>及<span + @click="handleRead('privacy')">《隐私协议》</span> + </view> + </view> <button class="full-button" @click="handleLogin">登 录</button> </view> @@ -72,13 +82,37 @@ trigger: ['change', 'blur'], } ] - }, + }, + dlxz: false, } }, methods: { - ...mapActions(['wxPhoneLogin']), - handleLogin() { + ...mapActions(['wxPhoneLogin']), + + clickxy() { + this.dlxz = !this.dlxz + }, + handleRead(v){ + if(v == 'user'){ // 用户协议 + this.$uniGo.navigateTo({ + url: `/shop/agreement/index` + }) + }else{ // 隐私协议 + this.$uniGo.navigateTo({ + url: `/shop/privacy/index` + }) + } + }, + + handleLogin() { + if (!this.dlxz) { + return uni.showToast({ + title: '请先阅读并同意协议!', + icon: 'none' + }) + return + } this.wxPhoneLogin(this.form) return if (this.form.username) { @@ -153,7 +187,7 @@ background: linear-gradient(180deg, rgba(255, 255, 255, 0.96) 0%, rgba(255, 255, 255, 0.96) 81%, rgba(255, 255, 255, 0.97) 100%); border-radius: 30rpx 30rpx 0 0; margin-top: -20rpx; - + padding-bottom: 30rpx; &-box { padding-top: 80rpx; @@ -218,5 +252,20 @@ text-align: center; text-decoration-line: underline; margin-top: 80rpx; + } + + .index-cent-btm-xy{ + display: flex; + align-items: center; + font-weight: 400; + font-size: 22rpx; + color: #666666; + margin-bottom: 22rpx; + + >image { + width: 42rpx; + height: 42rpx; + margin-right: 10rpx; + } } </style> \ No newline at end of file -- libgit2 0.26.0