7.1(优化

This commit is contained in:
Hong
2024-07-01 19:06:51 +08:00
parent e160d39a42
commit 03a00128ab
17 changed files with 379 additions and 538 deletions

View File

@@ -30,4 +30,14 @@ export function getPlatformList(params) {
method: 'get',
params
})
}
/**
* 加入返佣 /api/front/return/commission/platform/join/{platformId}
*/
export function getPlatformJoin(platformId) {
return request({
url: `/api/front/return/commission/platform/join/${platformId}`,
method: 'get',
})
}

View File

@@ -2,10 +2,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,

View File

@@ -81,14 +81,7 @@
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/showroom/carList/carList",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/showroom/carRental/index",
"style": {
@@ -472,14 +465,6 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/index/consult_detail",
"style": {
"navigationBarTitleText": "资讯",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/index/detail",
"style": {
@@ -651,7 +636,16 @@
],
"subPackages": [{
"root": "pagesA",
"pages": [{
"pages": [
{
"path": "index/consult_detail",
"style": {
"navigationBarTitleText": "资讯",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "serve/message/message",
"style": {
"navigationBarTitleText": "消息",
@@ -746,6 +740,14 @@
"enablePullDownRefresh": false
}
},
{
"path": "showroom/carList/carList",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "showroom/confirmOrder/confirmOrder",
"style": {

View File

@@ -38,7 +38,8 @@
</view>
<view class="home-income-center flex justify-center align-center">
<view v-if="incomeData.isJoin"><text class="home-income-center-text">+</text>
{{incomeData.toDay}}</view>
{{incomeData.toDay}}
</view>
<view class="home-income-center-button" v-else @click="$tab.navigateTo('/pagesA/rebate/rebate')">
点击加入流水返佣
</view>
@@ -65,7 +66,7 @@
<u-tabs :list="tabList" @click="tabClick" :scrollable="true" lineColor="#13AFA8"
:activeStyle="{color: '#303133',fontWeight: 600,transform: 'scale(1.05)',fontSize: '31rpx'}"
:inactiveStyle="{color: '#606266',fontWeight:500,transform: 'scale(1)',fontSize: '31rpx'}"
itemStyle="padding-left: 15px; padding-right: 15px; height: 30px;"></u-tabs>
itemStyle="padding-left: 30rpx; padding-right: 30rpx; height: 80rpx;"></u-tabs>
<view class="list-box">
<view v-for="(item,index) in dataList" :key="index" @click="toDetailPages(item,index)">
<block>
@@ -88,7 +89,7 @@
</view>
<view class="consult-list" v-else>
<view class="consult-list-left-title">
<u--text :lines="2" bold size="16" :text="item.title"></u--text>
{{item.title}}
</view>
<view v-if="item.image.length==2" class="flex justify-between flex-wrap">
<image class="consult-image-two" @click.stop="examineFn(item.image,imageIndex)"
@@ -140,7 +141,7 @@
data() {
return {
//数据统计
incomeData:{},
incomeData: {},
config: getApp().globalData.config,
dataList: [],
functionList,
@@ -158,7 +159,7 @@
methods: {
toDetailPages(item, index) {
uni.navigateTo({
url: `/pages/driver/index/consult_detail?id=${item.id}`
url: `/pagesA/index/consult_detail?id=${item.id}`
})
},
// 一级tab
@@ -242,7 +243,7 @@
getReturnIncomeFn() {
getReturnIncome().then(res => {
console.log('首页统计', res);
this.incomeData=res.data
this.incomeData = res.data
})
}
},
@@ -274,22 +275,24 @@
padding-top: 24rpx;
.consult-list {
.consult-list-left-title {
font-weight: 500;
font-size: 34rpx;
color: #111111;
line-height: 38rpx;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.consult-list-left {
min-height: 150rpx;
width: calc(100% - 234rpx);
margin-right: 16rpx;
.consult-list-left-title {
font-weight: 600;
font-size: 34rpx;
color: #111111;
line-height: 38rpx;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.consult-list-name {
font-size: 26rpx;

View File

@@ -204,7 +204,7 @@
<image v-if="item.userIsLike"
:src="`${config.aliyunOssUrl}/static/images/app/icon/like.png`"></image>
<!-- #endif -->
{{item.likeNum}}
{{item.likeNum+item.likeVirtually|filtersLikeNum}}
</view>
</view>
</view>
@@ -319,6 +319,12 @@
promptBox,
popupbox
},
filters: {
filtersLikeNum(value) {
if (!value) return 0;
return formatNumber(value);
}
},
data() {
return {
//发布box
@@ -563,7 +569,7 @@
this.$store.dispatch('changeTrendsData', item)
if (this.actTabType == 3) {
uni.navigateTo({
url: `/pages/index/consult_detail?id=${item.id}`
url: `/pagesA/index/consult_detail?id=${item.id}`
})
} else {
uni.navigateTo({
@@ -644,7 +650,6 @@
res.data.list.forEach(item => {
item.shareNum = formatNumber(item.shareNum)
item.replyNum = formatNumber(item.replyNum)
item.likeNum = formatNumber(item.likeNum)
// if(item.strCreateTime){
// item.strCreateTime = formatDate(item.strCreateTime)
// }
@@ -693,7 +698,6 @@
res.data.list.forEach(item => {
item.shareNum = formatNumber(item.shareNum)
item.replyNum = formatNumber(item.replyNum)
item.likeNum = formatNumber(item.likeNum)
if (item.image != '') {
item.image = item.image.split(",")
} else {
@@ -743,7 +747,6 @@
res.data.list.forEach(item => {
item.shareNum = formatNumber(item.shareNum)
item.replyNum = formatNumber(item.replyNum)
item.likeNum = formatNumber(item.likeNum)
if (item.image != '') {
item.image = item.image.split(",")
} else {

View File

@@ -23,7 +23,7 @@
</view>
<view class="bus-coo-form-item">
<u-form-item label="开通板块" prop="modelInfo.plate" ref="item1" labelWidth="180rpx" @click="showPlate = true">
<u-input v-model="plate" border="none" placeholder="请选择开通板块" :disabled='true' disabledColor='#fff'>
<u-input v-model="plate" disabled disabledColor="#fff" border="none" placeholder="请选择开通板块" :disabled='true' >
<template slot="suffix">
<u-icon name="arrow-down-fill" color="#999" size="10"></u-icon>
</template>

View File

@@ -33,7 +33,7 @@
<u--text :lines="1" size="14" :text="refundDeta.name"></u--text>
</view>
<view class="f-jcsb integral-specification">
<text class="">{{refundDeta.content}}</text>
<text class=""> 数量</text>
<view class="">X {{refundDeta.num}}</view>
</view>
<view class="f-a-i" v-if="refundDeta.totalIntegral">

View File

@@ -23,7 +23,7 @@
</view>
<view class="deposit flex-column">
<text class="f-26 c111">押金()</text>
<text class="f-40 c111 fw-b mt-2">{{myWallet.depositMoney}}</text>
<text class="f-40 c111 fw-b mt-2">{{myWallet.depositMoney?myWallet.depositMoney:0}}</text>
</view>
</view>
<view class="amount-title">
@@ -131,8 +131,11 @@
},
queryList(page, limit){
balanceList({page, limit,month:this.timeData, ...this.query}).then(res => {
// console.log(res);
this.$refs.paging.complete(res.data.list[0].list)
if (res.data.list[0]) {
this.$refs.paging.complete(res.data.list[0].list)
} else {
this.$refs.paging.complete([])
}
}).catch(err => {
this.$refs.paging.complete(false)
})

View File

@@ -1,5 +1,5 @@
<template>
<view>
<view style="width: 750rpx;">
<view class="serve-header">
<image class="serve-bj" :src="`${config.aliyunOssUrl}/static/images/app/home/serve_bj.png`" mode="aspectFill"></image>
</view>
@@ -637,7 +637,7 @@
.swiper-line-list {
position: absolute;
bottom: 23rpx;
width: 750rpx;
width: 690rpx;
}
.swiper-line-box2{
width: 32rpx;
@@ -837,6 +837,7 @@
}
.serve-header {
width: 750rpx;
position: relative;
height: 1rpx;

View File

@@ -1,428 +0,0 @@
<template>
<view class="serve">
<!-- 大图 轮播 -->
<u-swiper height="750rpx" keyName="image" :list="branner" indicator radius='0'></u-swiper>
<!-- 三个 -->
<view class="threeview">
<view class="th_one" @click="toRepairPages">
<!-- #ifdef MP-WEIXIN -->
<image class="one_img" :src="`${config.aliyunOssUrl}/static/images/app/serve/serve_weixiu.png`" mode=""></image>
<!-- #endif -->
<!-- #ifdef APP -->
<image class="one_img" src="@/static/images/app/serve/serve_weixiu.png" mode=""></image>
<!-- #endif -->
<view class="one_txt"> 维修 </view>
</view>
<!-- style="margin: 0 16rpx;" -->
<view class="th_one" @click="toCouponsPages(1)">
<!-- #ifdef MP-WEIXIN -->
<image class="one_img" :src="`${config.aliyunOssUrl}/static/images/app/serve/serve_coupons.png`" mode=""></image>
<!-- #endif -->
<!-- #ifdef APP -->
<image class="one_img" src="@/static/images/app/serve/serve_coupons.png" mode=""></image>
<!-- #endif -->
<view class="one_txt"> 卡券 </view>
</view>
<!-- <view class="th_one" @click="studyBtn">
<image class="one_img" :src="`${config.aliyunOssUrl}/static/images/app/serve/serve_study.png`" mode=""></image>
<view class="one_txt"> 学习 </view>
</view> -->
</view>
<!-- 助力活动 -->
<view class="activity">
<view class="ac_up" @click="toMyActivityListPage">
<view class="up_l">助力活动</view>
<view class="up_r">
<view class="up_r_txt">查看更多</view>
<u-icon name="arrow-right" color="#999999" size="10"></u-icon>
</view>
</view>
<view class="ac_down">
<image class="down_img" v-for="(item,index) in couponList3" :key="item.id" :src="item.cover" mode="" @click="toHotPages('help', item)"></image>
</view>
</view>
<!-- 限时秒杀 -->
<view class="activity">
<view class="ac_up" @click="toCouponsPages(2)">
<view class="up_l">限时秒杀</view>
<view class="up_r">
<view class="up_r_txt">查看更多</view>
<u-icon name="arrow-right" color="#999999" size="10"></u-icon>
</view>
</view>
<view class="ac_down">
<view class="down_view" v-for="(item,index) in couponList2" :key="item.id" @click="toDetailPages(item)">
<image class="view_img" :src="item.cover" mode=""></image>
<view class="view_txt"> {{item.name || '--'}} </view>
<view class="view_price">{{item.price || '--'}} </view>
</view>
</view>
</view>
<!-- 热销推荐 -->
<view class="activity">
<view class="ac_up" @click="toHotPages('hot')">
<view class="up_l">热销推荐</view>
<view class="up_r">
<view class="up_r_txt">查看更多</view>
<u-icon name="arrow-right" color="#999999" size="10"></u-icon>
</view>
</view>
<!-- <scroll-view scroll-x> -->
<view class="ac_down">
<view class="down_view" v-for="(item,index) in couponHotList" :key="item.id" @click="toDetailPages(item)">
<image class="view_img" :src="item.cover" mode=""></image>
<view class="view_txt"> {{item.name || '--'}} </view>
<view class="view_price"> {{item.price || '--'}} </view>
</view>
</view>
<!-- </scroll-view> -->
</view>
</view>
</template>
<script>
import { brannerList } from '@/api/system/config';
import config from '@/config';
import { getCardProductListAPI } from '@/api/serve/coupons'
import { getActivityListAPI, getHelpDetail } from '@/api/serve/index'
import { mapGetters } from 'vuex'
export default {
data() {
return {
menuWidth: getApp().globalData.menuWidth,
price:198,
config,
branner: [], // 轮播图列表
keyword:'',
couponData2:{
limit:2,
page:1,
type:2
},
couponData3:{
limit:2,
page:1,
// type:3
},
couponHot:{
limit:2,
page:1,
isHot:true
},
couponList2:[],
couponList3:[],
couponHotList:[],
//消息未读 数量
unreadNum:0
};
},
computed: {
...mapGetters(['selectCity'])
},
onShow() {
this.init()
let userInfo = uni.getStorageSync('userInfo')
this.unreadNum = userInfo.unreadNum
},
methods:{
init(){
this.getbrannerList()
this.getCardProductList2()
this.getCardProductList()
this.getActivityList()
},
// 获取轮播图
getbrannerList(){
brannerList({type: 4}).then(res => {
this.branner = res.data.list
})
},
// 2秒杀 // isHot=>true 热销
getCardProductList2(){
getCardProductListAPI(this.couponData2).then(res=>{
this.couponList2=res.data.list
})
},
// 热销
getCardProductList(){
getCardProductListAPI(this.couponHot).then(res=>{
this.couponHotList=res.data.list
})
},
// 助力
getActivityList(){
getActivityListAPI(this.couponData3).then(res=>{
this.couponList3=res.data.list
})
},
// 去热销列表
toHotPages(type, item){
console.log(item);
if(type=='hot'){
uni.navigateTo({
url:`/pages/serve/hot_list?type=${type}&id=${item && item.id}&name=${item && item.name}`
})
}else{
console.log(item.productId,);
uni.navigateTo({
url: `/pages/mine/my_activity/detail?id=${item.productId}&helpGenre=${item.helpType}&activityId=${item.id}&isMould=${item.isMould}`
})
}
},
// 活动列表
toMyActivityListPage(){
uni.navigateTo({
url:`/pages/serve/activity_list`
})
},
// 去活动详情
toMyactivityPages(item){
getHelpDetail(item.id).then(res => {
})
// uni.navigateTo({
// url:`/pages/mine/my_activity/detail?id=${item.id}`
// })
},
// 去详情
toDetailPages(item){
this.$store.dispatch('CardId', item.id)
uni.navigateTo({
url:`/pages/serve/coupons/cou_detail?id=${item.id}`
})
},
selectCityBtn(){
// console.log('选择城市');
uni.navigateTo({
url:'/pagesA/serve/repair/re_create/select_city'
})
},
// 卡券
toCouponsPages(num){
uni.navigateTo({
url:`/pages/serve/coupons/coupons?num=${num}`
})
// &active=${true}
},
// 维修
toRepairPages(){
uni.navigateTo({
url:`/pages/serve/repair/repair`
})
},
// 消息 (两个)
toMessagePages(){
// uni.navigateTo({
// url:`/pagesA/serve/message/message`
// })
uni.navigateTo({
url:`/pages/message/message`
})
},
studyBtn(){
this.$toast('开发中~~')
}
}
}
</script>
<style lang="scss">
.administration {
margin-right: 180rpx;
}
.posi_l{
// border: 1px solid red;
display: flex;
// justify-content: space-between;
align-items: center;
.l_txt{
font-size: 28rpx;
font-weight: 600;
color: #111111;
margin: 0 10rpx;
}
}
.posi_r{
position: relative;
.r_img{
width: 48rpx;
height: 48rpx;
}
.r_num{
position: absolute;
top: -10rpx;
right: -10rpx;
width: 32rpx;
height: 32rpx;
background: #F20808;
border-radius: 68rpx 68rpx 68rpx 68rpx;
opacity: 1;
text-align: center;
line-height: 32rpx;
font-size: 20rpx;
font-weight: 400;
color: #FFFFFF;
}
}
.activity{
// border: 1px solid red;
margin-top: 35rpx;
padding: 0 32rpx;
.ac_up{
display: flex;
justify-content: space-between;
align-items: center;
.up_l{
font-size: 36rpx;
font-weight: bold;
color: #000000;
}
.up_r{
display: flex;
justify-content: space-between;
align-items: center;
.up_r_txt{
font-size: 30rpx;
font-weight: 400;
color: #999999;
margin-right: 16rpx;
}
}
}
.ac_down{
display: flex;
flex-wrap: wrap;
align-content: flex-start;
justify-content: space-between;
// align-items: center;
// border: 1px solid red;
margin-top: 16rpx;
.down_img{
width: 335rpx;
height: 184rpx;
border-radius: 8rpx;
}
.down_view{
// margin-right: 20rpx;
// border: 1px solid blue;
margin-bottom: 24rpx;
.view_img{
width: 335rpx;
height: 335rpx;
border-radius: 8rpx;
}
.view_txt{
width: 335rpx;
height: 80rpx;
font-size: 30rpx;
font-weight: 400;
color: #111111;
margin-top: 16rpx;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.view_price{
font-size: 32rpx;
font-family: Roboto, Roboto;
font-weight: 600;
color: #111111;
margin-top: 16rpx;
}
}
}
}
.threeview{
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 32rpx;
padding: 0 32rpx;
// border: 1px solid;
.th_one{
// border: 1px solid red;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 335rpx;
height: 144rpx;
background: #F8F8F8;
border-radius: 0rpx 0rpx 0rpx 0rpx;
opacity: 1;
.one_img{
width: 48rpx;
height: 48rpx;
}
.one_txt{
font-size: 20rpx;
font-weight: 400;
color: #666666;
}
}
}
.positioningcity{
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 24rpx;
.posi_l{
display: flex;
justify-content: space-between;
align-items: center;
.l_imgtop{
width: 24rpx;
height: 28rpx;
}
.l_txt{
font-size: 28rpx;
font-weight: 600;
color: #111111;
margin: 0 10rpx;
}
.l_imgfoot{
width: 10rpx;
height: 20rpx;
}
}
.posi_r{
position: relative;
.r_img{
width: 48rpx;
height: 48rpx;
}
.r_num{
position: absolute;
top: -10rpx;
right: -10rpx;
width: 32rpx;
height: 32rpx;
background: #F20808;
border-radius: 68rpx 68rpx 68rpx 68rpx;
opacity: 1;
text-align: center;
line-height: 32rpx;
font-size: 20rpx;
font-weight: 400;
color: #FFFFFF;
}
}
}
.serve{
// border: 1px solid red;
// padding:0 32rpx 32rpx 32rpx;
}
</style>

View File

@@ -313,11 +313,11 @@
// console.log('价格', this.priceId);
// console.log('车龄', this.carAgeId);
// console.log('租期', this.tenancyId);
this.$tab.navigateTo(`./carList/carList?type=${this.form.type}&brandId=${this.brandId}`)
this.$tab.navigateTo(`/pagesA/showroom/carList/carList?type=${this.form.type}&brandId=${this.brandId}`)
},
// 去商家
toCarListPages() {
this.$tab.navigateTo(`./carList/carList?type=${this.form.type}&brandId=${this.brandId}`)
this.$tab.navigateTo(`/pagesA/showroom/carList/carList?type=${this.form.type}&brandId=${this.brandId}`)
},
//tab this.$refs.paging.reload()
actTabFn(type) {

View File

@@ -68,6 +68,9 @@
:topUpTypeClose="topUpTypeClose" @topUpTypeFn="topUpTypeFn"></PaymentType> -->
<u-popup :show="paymentShow" @close="topUpTypeClose" :closeable="false" round="16" closeOnClickOverlay>
<view class="top-up-popup">
<view class="top-up-popup-allprice">
合计{{commodityDeta.currentPrice* commodityNum}}+{{commodityDeta.integralNum* commodityNum}}积分
</view>
<view class="top-up-popup-title">选择支付方式</view>
<view>
<view class="top-up-popup-type f-jcsb f-a-i">
@@ -93,7 +96,7 @@
<!-- #endif -->
</view>
</view>
<view class="top-up-popup-type f-jcsb f-a-i">
<view class="top-up-popup-type f-jcsb f-a-i" v-if="commodityDeta.currentPrice>0">
<view class="f-a-i">
<!-- #ifdef MP-WEIXIN -->
<image :src="`${config.aliyunOssUrl}/static/images/app/mine/wx.png`" mode=""></image>
@@ -118,21 +121,21 @@
</view>
<view class="top-up-popup-type f-jcsb f-a-i" v-if="false">
<view class="f-a-i">
<!-- <image :src="`${config.aliyunOssUrl}/static/images/app/mine/zfb.png`" mode=""></image> -->
<!-- #ifdef APP -->
<image src="@/static/images/app/mine/zfb.png" mode=""></image>
<view class="top-up-popup-type-zfb">支付宝</view>
<!-- #endif -->
</view>
<view class="f-a-i" @click="actTypeFn('zfb')">
<!-- <image v-if="topUpType=='zfb'"
:src="`${config.aliyunOssUrl}/static/images/app/mine/act.png`" mode=""></image>
<image v-else :src="`${config.aliyunOssUrl}/static/images/app/mine/act_no.png`" mode="">
</image> -->
<!-- #ifdef APP -->
<image v-if="topUpType=='zfb'" src="@/static/images/app/mine/act.png" mode=""></image>
<image v-else src="@/static/images/app/mine/act_no.png" mode=""></image>
@@ -173,8 +176,8 @@
orderNo: '',
//支付类型
topUpType: 'ye',
objData:{
orderNo:'',
objData: {
orderNo: '',
payChannel: 'mini',
payType: 'weixin'
}
@@ -193,7 +196,7 @@
this.objData.orderNo = res.data.orderNo
})
},
actTypeFn(type) {
this.topUpType = type
// 支付方式:weixin,alipay,yue
@@ -227,34 +230,26 @@
uni.navigateTo({
url: `/pages/welfare/payment_state/payment_state?resultType=err`
})
}).catch(res=>{
}).catch(res => {
this.paymentShow = false
})
} else if (this.topUpType == 'wx') {
// payType: this.topUpType == 'ye' ? 'yue' : this.topUpType == 'wx' ? 'weixin' : 'alipay'
// uni.showToast({
// title: '目前不支持微信支付宝',
// duration: 2000,
// icon: 'none'
// });
frontPayintegral(this.objData).then(res => {
this.paymentShow = false
let jsConfig = res.data.jsConfig
wxpayPaymentFn(jsConfig).then(wxpayRes=>{
uni.navigateTo({
url: `/pages/welfare/payment_state/payment_state?resultType=res`
})
}).catch(wxpayErr=>{
uni.navigateTo({
url: `/pages/welfare/payment_state/payment_state?resultType=err`
})
frontPayintegral(this.objData).then(res => {
this.paymentShow = false
let jsConfig = res.data.jsConfig
wxpayPaymentFn(jsConfig).then(wxpayRes => {
uni.navigateTo({
url: `/pages/welfare/payment_state/payment_state?resultType=res`
})
}).catch(res=>{
this.paymentShow = false
})
}).catch(wxpayErr => {
uni.navigateTo({
url: `/pages/welfare/payment_state/payment_state?resultType=err`
})
})
}).catch(res => {
this.paymentShow = false
})
}
},
//关闭支付
topUpTypeClose() {
@@ -295,12 +290,12 @@
font-weight: bold;
color: #000000;
padding: 24rpx 0;
border-bottom: 1rpx solid #F4F4F4;
// border-bottom: 1rpx solid #F4F4F4;
}
.top-up-popup-type {
margin-top: 48rpx;
.top-up-popup-type-zfb,
.top-up-popup-type-wx {
margin-left: 16rpx;
@@ -427,4 +422,11 @@
justify-content: center;
align-items: center;
}
.top-up-popup-allprice {
font-size: 32rpx;
font-weight: 500;
color: #000000;
padding: 24rpx 0;
border-bottom: 1rpx solid #E6E6E6;
}
</style>

View File

@@ -0,0 +1,211 @@
<template>
<view>
<view class="chat-input-bar">
<view class="chat-input-container">
<view class="u-flex u-flex-items-center" style="background-color: #FFFFFF;">
<!-- 输入框 -->
<view style="flex: 1;position: relative;overflow: hidden;" @click.stop="openPinglun">
<u-textarea autoHeight fixed :showConfirmBar="false" border="none" confirmHold
:autoFocus="autoFocus" :placeholder="placeholder" :disabled="disabled"
:cursor-spacing="20" v-model="value" :focus="focus" @blur="blur"
@focus="emojiShow=false,more=false" @linechange="linechange"
:customStyle="'background-color: #f2f0f4; border-radius: '+ borderRadius +'rpx;'" />
<view style="position: absolute;left: 0;top: 0;flex: 1;" @click="openPinglun" v-if="open" />
</view>
<!--表情按钮 -->
<view style="margin-left: 20rpx;" @click.stop="emojiShow = !emojiShow,more=false,blur()">
<image src="https://jimte.oss-cn-hangzhou.aliyuncs.com/xcximage/douyin/expression.png"
style="width: 48rpx;height: 48rpx;" />
</view>
<!--发送按钮 -->
<view v-if="value!==''" style="margin-left: 20rpx;" @click.stop="sendSMS(value,0)">
<image
src="https://smfwq2.oss-cn-shanghai.aliyuncs.com/2023/12/25/63571017a4a042b682e1c6be08a3cdda.png"
style="width: 48rpx;height: 48rpx;" />
</view>
</view>
</view>
</view>
<!-- 功能 -->
<template v-if="more">
<u-grid col="4" :border="false" @click="gridItemTap" customStyle="background-color: #fff;" ref="grid">
<u-grid-item v-for="(item,index) in gridItem" :key="index" customStyle="margin-bottom: 10rpx;">
<u-image :src="item.img" width="52" height="52" />
<view style="margin-top: 10rpx;">
<u-text :text="item.text" color="#999" size="24rpx" align="center" />
</view>
</u-grid-item>
</u-grid>
</template>
<!-- 表情 -->
<template v-else-if="emojiShow">
<view>
<!-- #ifdef APP-PLUS -->
<waterfall column-count="8" column-width="auto" column-gap="0" left-gap="10"
style="height: 400rpx;background-color: #fff;">
<cell v-for="(item,index) in emoicon" :key="index" style="padding: 10rpx;" @click="value += item">
<text style="font-size: 54rpx;">{{item}}</text>
</cell>
</waterfall>
<!-- #endif -->
<!-- #ifndef APP-PLUS -->
<u-list height="400rpx" customStyle="background-color:#fff;padding:10rpx 0;">
<u-grid col="10">
<u-grid-item v-for="(item,index) in emoicon" :key="index" @click="value += item"
customStyle="margin-bottom:20rpx;">
<u-list-item>
<text style="font-size: 54rpx;text-align: left;">{{item}}</text>
</u-list-item>
</u-grid-item>
</u-grid>
</u-list>
<!-- #endif -->
</view>
</template>
</view>
</template>
<script>
import utils from "@/utils/util.js";
export default {
name: "chat-input-bar",
props: {
groupID: '',
placeholder:''
},
data() {
return {
value: '',
borderRadius: 50, //评论框圆角大小
emojiShow: false, //表情显示
autoFocus: false, //自动焦点
focus: true,
disabled: false,
open: true,
more: false,
// placeholder: "我也来说两句...",
emoicon: [
"😁", "😋", "😜", "😉", "😌", "😅", "😳", "😊", "😝", "😰", "😠", "😩", "😲", "😞", "😭", "😍",
"😖", "😱", "😡", "😚", "😤", "🐼", "🐲", "😺", "😸", "😹", "😽", "🙀", "🐴", "🐮", "🍺", "🔥",
"💔", "🉑", "💢", "💣", "💩", "💪", "👍", "👊", "👋", "👌", "👐"
],
gridItem: [{
img: 'https://jimte.oss-cn-hangzhou.aliyuncs.com/xcximage/douyin/album.png',
text: '相册'
}, ]
};
},
methods: {
//发送
sendSMS(value, type) {
if (!value) return uni.$u.toast('内容不能为空');
this.$emit('sendSMS', {
msg: value,
msgType: type
});
this.value = '';
},
//点击更多事件
gridItemTap(index) {
switch (index) {
case 0:
// 从相册选择图片
utils.uploadImageOne({
count: 1,
sizeType: ['original'],
sourceType: ['album', 'camera'],
dir: 'crmebimage/public/product/'
}, null, (res) => {
uni.hideLoading();
this.sendSMS(res.data, 1);
});
break;
case 1:
// 从相册选择视频
utils.uploadVideo({
dir: 'crmebimage/public/product/'
}, null, true, res => {
uni.hideLoading();
this.sendSMS(res.data, 2);
});
break;
case 2:
//语音通话
this.$emit('TUICallKit', 1);
break;
case 3:
//语音通话
this.$emit('TUICallKit', 2);
break;
}
},
//输入框行数变化时
linechange({
detail
}) {
if (Math.abs(detail.height) < 26) {
this.borderRadius = 50
} else {
this.borderRadius = 10
}
},
//打开输入框
openPinglun() {
this.emojiShow = false;
this.more = false;
// #ifndef APP-PLUS
this.open = false;
uni.$u.debounce(() => {
this.autoFocus = true;
}, 50);
// #endif
// #ifdef APP-PLUS
if (plus.os.name == "iOS") {
this.open = false;
this.disabled = false;
uni.$u.debounce(() => {
this.autoFocus = true;
}, 50);
} else {
this.focus = true;
this.$nextTick(() => {
this.open = false;
if (!this.open) {
plus.key.showSoftKeybord();
}
});
}
// #endif
},
//失去焦点
blur() {
// #ifdef APP-PLUS
if (plus.os.name == "iOS") {
this.disabled = true;
this.autoFocus = false;
}
this.open = true;
plus.key.hideSoftKeybord();
// #endif
// #ifndef APP-PLUS
this.open = true;
// #endif
},
}
}
</script>
<style scoped>
.chat-input-bar {
display: flex;
flex-direction: row;
align-items: center;
/* border-top: solid 1px #f5f5f5; */
background-color: #fff;
/* padding: 30rpx 15rpx 78rpx; */
}
.chat-input-container {
flex: 1;
}
</style>

View File

@@ -520,7 +520,7 @@
}
return {
title: this.detailObj.title || '分享图片', //
path: `/pages/index/consult_detail?id=${this.noteId}&authorId=${this.authorId}$type=${this.type}`,
path: `/pagesA/index/consult_detail?id=${this.noteId}&authorId=${this.authorId}$type=${this.type}`,
imageUrl: this.detaImage.length ? this.detaImage[0] : '',
};
},

View File

@@ -459,7 +459,7 @@
})
} else if (this.actTab == 5) {
uni.navigateTo({
url: `/pages/index/consult_detail?id=${item.id}`
url: `/pagesA/index/consult_detail?id=${item.id}`
})
} else {
uni.navigateTo({

View File

@@ -3,22 +3,27 @@
<view class="rebate">
<view class="rebate-header-bj">
<view class="rebate-header">
<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit.png`" mode=""></image>
<image class="rebate-header-tit"
:src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit.png`" mode=""></image>
<view class="rebate-header-cont flex justify-between">
<view>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_01.png`" mode=""></image>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_01.png`" mode="">
</image>
<view>平台齐全</view>
</view>
<view>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_02.png`" mode=""></image>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_02.png`" mode="">
</image>
<view>单单返佣</view>
</view>
<view>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_03.png`" mode=""></image>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_03.png`" mode="">
</image>
<view>月返千元</view>
</view>
<view>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_04.png`" mode=""></image>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_04.png`" mode="">
</image>
<view>提现秒到</view>
</view>
</view>
@@ -28,7 +33,7 @@
<u-swiper keyName="image" :list="brannerList" height="180rpx"></u-swiper>
</view>
<view class="rebate-shop">
<z-paging use-page-scroll :fixed="false" style="max-height: 1150rpx;" ref="paging" v-model="dataList"
<z-paging use-page-scroll :fixed="false" style="maxHeight: 1150rpx;" ref="paging" v-model="dataList"
@query="queryList">
<view class="rebate-shop-hea flex justify-between align-center">
<view class="f-36 fw-5 c333">返佣平台</view>
@@ -44,20 +49,28 @@
<image class="rebate-shop-list-image" :src="item.image" mode="aspectFill"></image>
<view class="rebate-shop-list-name">
<view class="f-30 c333 fw-6">{{item.name}}</view>
<view class="f-28 c333 fw-5" style="margin-top: 10rpx;">今日返佣最高<text
class="f-28 red ml-3">{{item.ratio*100}}%</text></view>
<view class="f-28 c333 fw-5" style="margin-top: 10rpx;">今日返佣最高
<text v-if="item.way==0" class="f-28 red ml-3">
{{item.ratio*100}}%</text>
<text v-else class="f-28 red ml-3">
{{item.eachMoney}}/
</text>
</view>
</view>
<view class="rebate-shop-list-status f-30">
<view class="rebate-status1" v-if="item.status==1">已加入</view>
<view class="rebate-status3" v-else-if="item.status==2">审核中</view>
<view class="rebate-status3" v-else-if="item.status==3">未通过</view>
<view class="rebate-status1" v-if="item.status==3">已加入</view>
<view class="rebate-status3" v-else-if="item.status==1">审核中</view>
<view class="rebate-status3" v-else-if="item.status==2">未通过</view>
<view class="rebate-status4" v-else @click="joinRebateFn(item)">加入返佣</view>
</view>
</view>
</z-paging>
</view>
<view class="rebate-header">
<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit2.png`" mode=""></image>
<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit2.png`"
mode=""></image>
<view class="rebate-header-cont flex justify-between">
<view>
<image :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_05.png`" mode=""></image>
@@ -77,26 +90,28 @@
</view>
</view>
<view class="rebate-header mt-2">
<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit3.png`" mode=""></image>
<image class="rebate-header-tit" :src="`${config.aliyunOssUrl}/static/images/app/home/home_rebate_tit3.png`"
mode=""></image>
<view class="fulizhengce-bj f-30 c333">
<view>1.享受平台限时免抽佣金奖励</view>
<view>2.每月最高可获得1000元流水返佣奖励</view>
<view>3.有机会享受平台0元喷漆0元租车权益</view>
</view>
<view class="staple c999">
<view class="f-28 c666 mt-24">注意事项</view>
<view class="mt-24 f-26">如显示审核未通过请联系客服 400-9966-409</view>
<view class="mt-24 f-26">具体返佣比例请查看活动规则</view>
<view class="mt-24 f-26">本活动最终解释权归滴友之家所有</view>
<view class=" staple-tit ">注意事项</view>
<view class=" staple-p">如显示审核未通过请联系客服 400-9966-409</view>
<view class=" staple-p">具体返佣比例请查看活动规则</view>
<view class="staple-p">本活动最终解释权归滴友之家所有</view>
</view>
</view>
<view class="pb-4 pt-2"></view>
<view style="padding-bottom: 40rpx;padding-top: 20rpx;"></view>
</view>
</template>
<script>
import {
getPlatformList
getPlatformList,
getPlatformJoin
} from "@/api/home/home.js"
import {
mapGetters
@@ -112,7 +127,7 @@
return {
brannerList: [],
dataList: [],
config: getApp().globalData.config,
config: getApp().globalData.config,
};
},
onShow() {
@@ -124,9 +139,17 @@
//加入返佣
joinRebateFn(item) {
console.log(item);
uni.navigateTo({
url: `/pagesA/rebate/rebate_web?contract=${item.link}`
getPlatformJoin(item.id).then(res => {
uni.navigateTo({
url: `/pagesA/rebate/rebate_web?contract=${item.link}`
})
}).catch(err => {
console.log(err);
uni.navigateTo({
url: '/pages/mine/my_authentication/my_authentication'
})
})
},
//获取列表
queryList(page, limit) {
@@ -144,7 +167,7 @@
},
onLoad() {
brannerList({
type: 6
type: 8
}).then(res => {
this.brannerList = res.data.list
})
@@ -282,5 +305,16 @@
.staple {
text-align: left;
.staple-tit {
font-size: 28rpx;
color: #666;
margin-top: 24rpx;
}
.staple-p {
margin-top: 24rpx;
font-size: 26rpx;
}
}
</style>

View File

@@ -374,9 +374,9 @@
},
link(item) {
if (this.type == 2) {
this.$tab.navigateTo(`../carRental/index?id=${item.id}`)
this.$tab.navigateTo(`/pages/showroom/carRental/index?id=${item.id}`)
} else {
this.$tab.navigateTo(`../carBuy/index?id=${item.id}&type=${this.type}`)
this.$tab.navigateTo(`/pages/showroom/carBuy/index?id=${item.id}&type=${this.type}`)
}
}
}