7.17(优化
This commit is contained in:
2
App.vue
2
App.vue
@@ -19,6 +19,8 @@
|
|||||||
// 初始化应用配置
|
// 初始化应用配置
|
||||||
this.initConfig()
|
this.initConfig()
|
||||||
this.getSys()
|
this.getSys()
|
||||||
|
|
||||||
|
// this.$tab.switchTab('/pages/tab/tab')
|
||||||
// if (uni.getStorageSync('userType') == 'driver') this.$tab.switchTab('/pages/driver/home/home')
|
// if (uni.getStorageSync('userType') == 'driver') this.$tab.switchTab('/pages/driver/home/home')
|
||||||
// if (uni.getStorageSync('userType') == 'repair') this.$tab.switchTab('/pages/repair/tabbar/repair')
|
// if (uni.getStorageSync('userType') == 'repair') this.$tab.switchTab('/pages/repair/tabbar/repair')
|
||||||
// if (uni.getStorageSync('userType') == 'carDealers') this.$tab.switchTab(
|
// if (uni.getStorageSync('userType') == 'carDealers') this.$tab.switchTab(
|
||||||
|
|||||||
@@ -333,4 +333,14 @@ export function categoryReportList() {
|
|||||||
'method': 'get',
|
'method': 'get',
|
||||||
|
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取未参加任务
|
||||||
|
*/
|
||||||
|
export function getJoinNum() {
|
||||||
|
return request({
|
||||||
|
'url': '/api/front/task/join/num',
|
||||||
|
'method': 'get'
|
||||||
|
})
|
||||||
}
|
}
|
||||||
@@ -121,9 +121,6 @@ export const tabsList8 = [{
|
|||||||
}, {
|
}, {
|
||||||
name: '限时优惠',
|
name: '限时优惠',
|
||||||
value: 2
|
value: 2
|
||||||
}, {
|
|
||||||
name: '助力抢券',
|
|
||||||
value: 3
|
|
||||||
}]
|
}]
|
||||||
|
|
||||||
export const storeInfoTabs = [{
|
export const storeInfoTabs = [{
|
||||||
|
|||||||
@@ -2,15 +2,15 @@
|
|||||||
"name" : "滴友之家",
|
"name" : "滴友之家",
|
||||||
"appid" : "__UNI__F2BE74F",
|
"appid" : "__UNI__F2BE74F",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.5.6",
|
"versionName" : "1.5.8",
|
||||||
"versionCode" : 156,
|
"versionCode" : 158,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"usingComponents" : true,
|
"usingComponents" : true,
|
||||||
"nvueCompiler" : "uni-app",
|
"nvueCompiler" : "uni-app",
|
||||||
"splashscreen" : {
|
"splashscreen" : {
|
||||||
"alwaysShowBeforeRender" : true,
|
"alwaysShowBeforeRender" : true,
|
||||||
"waiting" : true,
|
"waiting" : false,
|
||||||
"autoclose" : true,
|
"autoclose" : true,
|
||||||
"delay" : 0
|
"delay" : 0
|
||||||
},
|
},
|
||||||
@@ -126,9 +126,9 @@
|
|||||||
"useOriginalMsgbox" : true,
|
"useOriginalMsgbox" : true,
|
||||||
"iosStyle" : "common",
|
"iosStyle" : "common",
|
||||||
"android" : {
|
"android" : {
|
||||||
"hdpi" : "static/9png/drawable-hdpi/download.9.png",
|
"hdpi" : "static/9png/drawable-hdpi/2x_2.9.png",
|
||||||
"xhdpi" : "static/9png/drawable-xhdpi/download.9.png",
|
"xhdpi" : "static/9png/drawable-xhdpi/2x_2.9.png",
|
||||||
"xxhdpi" : "static/9png/drawable-xxhdpi/download.9.png"
|
"xxhdpi" : "static/9png/drawable-xxhdpi/2x_2.9.png"
|
||||||
},
|
},
|
||||||
"ios" : {
|
"ios" : {
|
||||||
"storyboard" : "static/CustomStoryboard.zip"
|
"storyboard" : "static/CustomStoryboard.zip"
|
||||||
|
|||||||
@@ -4,7 +4,11 @@
|
|||||||
"path" : "pages/tab/tab",
|
"path" : "pages/tab/tab",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText" : ""
|
"navigationBarTitleText" : "",
|
||||||
|
"navigationStyle": "custom",
|
||||||
|
"app-plus": {
|
||||||
|
"bounce": "none"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
<view class="function-list flex justify-around flex-wrap">
|
<view class="function-list flex justify-around flex-wrap">
|
||||||
<view class="function-list-cont" v-for="(item,index) in functionList" :key="index"
|
<view class="function-list-cont" v-for="(item,index) in functionList" :key="index"
|
||||||
@click="navigatorFn(item)">
|
@click="navigatorFn(item)">
|
||||||
|
<text v-if="index==5&&subscriptNum>0" class="subscript">{{subscriptNum}}</text>
|
||||||
<image style="width: 68rpx;height: 68rpx;" :src="item.imgae" mode=""></image>
|
<image style="width: 68rpx;height: 68rpx;" :src="item.imgae" mode=""></image>
|
||||||
<view class="f-24 c333">{{item.title}}</view>
|
<view class="f-24 c333">{{item.title}}</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -142,7 +143,8 @@
|
|||||||
mapGetters
|
mapGetters
|
||||||
} from 'vuex'
|
} from 'vuex'
|
||||||
import {
|
import {
|
||||||
brannerList
|
brannerList,
|
||||||
|
getJoinNum
|
||||||
} from '@/api/system/config'
|
} from '@/api/system/config'
|
||||||
import {
|
import {
|
||||||
getLocationFn
|
getLocationFn
|
||||||
@@ -166,7 +168,9 @@
|
|||||||
name: '玩转滴友',
|
name: '玩转滴友',
|
||||||
type: 2
|
type: 2
|
||||||
}],
|
}],
|
||||||
mobileType: {}
|
mobileType: {},
|
||||||
|
//角标数
|
||||||
|
subscriptNum: 0
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -194,7 +198,6 @@
|
|||||||
},
|
},
|
||||||
//nav
|
//nav
|
||||||
navigatorFn(item) {
|
navigatorFn(item) {
|
||||||
console.log(item);
|
|
||||||
if (item.type == 1) {
|
if (item.type == 1) {
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: item.url
|
url: item.url
|
||||||
@@ -245,6 +248,13 @@
|
|||||||
this.brannerList = res.data.list
|
this.brannerList = res.data.list
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
//获取未参加任务
|
||||||
|
getJoinNumFn() {
|
||||||
|
getJoinNum().then(res => {
|
||||||
|
this.subscriptNum = res.data
|
||||||
|
console.log(res);
|
||||||
|
})
|
||||||
|
},
|
||||||
// 点击轮播图
|
// 点击轮播图
|
||||||
brannerClick(e) {
|
brannerClick(e) {
|
||||||
if (this.brannerList[e].linkType == 0 || this.brannerList[e].linkType == 2 || this.brannerList[e]
|
if (this.brannerList[e].linkType == 0 || this.brannerList[e].linkType == 2 || this.brannerList[e]
|
||||||
@@ -289,8 +299,8 @@
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let deviceBrand=uni.getSystemInfoSync().deviceBrand
|
let deviceBrand = uni.getSystemInfoSync().deviceBrand
|
||||||
if(deviceBrand!='huawei'){
|
if (deviceBrand != 'huawei') {
|
||||||
this.getAddressFn()
|
this.getAddressFn()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -306,7 +316,8 @@
|
|||||||
this.mobileType = uni.getStorageSync('appDetail')
|
this.mobileType = uni.getStorageSync('appDetail')
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
//角标
|
||||||
|
this.getJoinNumFn()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -405,6 +416,21 @@
|
|||||||
.function-list-cont {
|
.function-list-cont {
|
||||||
width: 170rpx;
|
width: 170rpx;
|
||||||
margin-bottom: 34rpx;
|
margin-bottom: 34rpx;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
.subscript {
|
||||||
|
min-width: 32rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
line-height: 32rpx;
|
||||||
|
position: absolute;
|
||||||
|
top: -16rpx;
|
||||||
|
right: 32rpx;
|
||||||
|
padding: 4rpx;
|
||||||
|
background-color: red;
|
||||||
|
border-radius: 15px;
|
||||||
|
color: #ffffff;
|
||||||
|
z-index: 999;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
活动时间截止:
|
活动时间截止:
|
||||||
</view>
|
</view>
|
||||||
<view class="red f-26">
|
<view class="red f-26">
|
||||||
{{ detail.stopTime }}
|
{{ detail.stopTime }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="user-list flex-wrap mt-3">
|
<view class="user-list flex-wrap mt-3">
|
||||||
@@ -52,12 +52,15 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="mt-4 mb-4" v-if="detail.isJoin">
|
<view class="mt-4 mb-4" v-if="detail.isJoin">
|
||||||
<u-button shape="circle" color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)"
|
<u-button v-if="(templateData.helpNum - detail.userHelpNum)>0" shape="circle" color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)"
|
||||||
@click="sureBtn(1)">继续邀请 {{' '}}
|
@click="sureBtn(1)">继续邀请 {{' '}}
|
||||||
<text v-if="helpGenre==2"> {{detail.subhead}}</text>
|
<text v-if="helpGenre==2"> {{detail.subhead}}</text>
|
||||||
<text v-else-if="helpGenre==0"> {{detail.name}}</text>
|
<text v-else-if="helpGenre==0"> {{detail.name}}</text>
|
||||||
<text v-else>{{detail.title}}</text>
|
<text v-else>{{detail.title}}</text>
|
||||||
</u-button>
|
</u-button>
|
||||||
|
<u-button v-else @click="navActivity" shape="circle"
|
||||||
|
color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)">助力完成
|
||||||
|
</u-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@@ -139,11 +142,15 @@
|
|||||||
</u-popup>
|
</u-popup>
|
||||||
<view style="height:180rpx" v-if="!detail.isJoin" />
|
<view style="height:180rpx" v-if="!detail.isJoin" />
|
||||||
<view class="btn-bottom fixed-bottom bg-white" v-if="!detail.isJoin">
|
<view class="btn-bottom fixed-bottom bg-white" v-if="!detail.isJoin">
|
||||||
<u-button @click="sureBtn(0)" shape="circle"
|
<u-button v-if="!buttFlag" @click="sureBtn(0)" shape="circle"
|
||||||
color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)">参与并邀请好友 {{' '}}
|
color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)">参与并邀请好友 {{' '}}
|
||||||
<text v-if="helpGenre==2"> {{detail.subhead}}</text>
|
<text v-if="helpGenre==2"> {{detail.subhead}}</text>
|
||||||
<text v-else-if="helpGenre==0"> {{detail.name}}</text>
|
<text v-else-if="helpGenre==0"> {{detail.name}}</text>
|
||||||
<text v-else>{{detail.title}}</text></u-button>
|
<text v-else>{{detail.title}}</text>
|
||||||
|
</u-button>
|
||||||
|
<u-button v-else @click="sureBtn(0)" disabled shape="circle"
|
||||||
|
color="linear-gradient(90deg, #0BCBC2 0%, #0090FA 100%)">活动结束
|
||||||
|
</u-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
@@ -164,10 +171,12 @@
|
|||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
//助力按钮
|
||||||
|
buttFlag: false,
|
||||||
//邀请人头像
|
//邀请人头像
|
||||||
avatar:'',
|
avatar: '',
|
||||||
//邀请人名称
|
//邀请人名称
|
||||||
nickname:'',
|
nickname: '',
|
||||||
fromUid: 0,
|
fromUid: 0,
|
||||||
helpType: 0, // 0:未助力;1:邀请人助力;2:以为别人助力;3:助力成功
|
helpType: 0, // 0:未助力;1:邀请人助力;2:以为别人助力;3:助力成功
|
||||||
id: 0,
|
id: 0,
|
||||||
@@ -182,7 +191,7 @@
|
|||||||
labels: [],
|
labels: [],
|
||||||
helpGenre: 0,
|
helpGenre: 0,
|
||||||
activityId: 0,
|
activityId: 0,
|
||||||
isMould:false,
|
isMould: false,
|
||||||
parseStyle: {
|
parseStyle: {
|
||||||
img: 'width:750rpx;'
|
img: 'width:750rpx;'
|
||||||
},
|
},
|
||||||
@@ -192,17 +201,17 @@
|
|||||||
//邀请微信好友
|
//邀请微信好友
|
||||||
weixinShareFn() {
|
weixinShareFn() {
|
||||||
let fromUid = uni.getStorageSync('userInfo').id
|
let fromUid = uni.getStorageSync('userInfo').id
|
||||||
let cover=''
|
let cover = ''
|
||||||
let name=''
|
let name = ''
|
||||||
if(this.helpGenre==2){
|
if (this.helpGenre == 2) {
|
||||||
cover=this.detail.mainImage
|
cover = this.detail.mainImage
|
||||||
name=this.detail.subhead
|
name = this.detail.subhead
|
||||||
}else if(this.helpGenre==0){
|
} else if (this.helpGenre == 0) {
|
||||||
cover=this.detail.cover
|
cover = this.detail.cover
|
||||||
name=this.detail.name
|
name = this.detail.name
|
||||||
}else{
|
} else {
|
||||||
cover=this.detail.image
|
cover = this.detail.image
|
||||||
name=this.detail.title
|
name = this.detail.title
|
||||||
}
|
}
|
||||||
let shareData = {
|
let shareData = {
|
||||||
imageUrl: cover ? cover :
|
imageUrl: cover ? cover :
|
||||||
@@ -210,20 +219,22 @@
|
|||||||
content: name
|
content: name
|
||||||
}
|
}
|
||||||
this.shareShow = false
|
this.shareShow = false
|
||||||
shareApi('WXSceneSession', shareData,`pages/mine/my_activity/detail?type=help&id=${this.detail.id}&helpGenre=${this.helpGenre}&fromUid=${fromUid}&activityId=${this.activityId}&isMould=${this.isMould}`).then(res => {
|
shareApi('WXSceneSession', shareData,
|
||||||
|
`pages/mine/my_activity/detail?type=help&id=${this.detail.id}&helpGenre=${this.helpGenre}&fromUid=${fromUid}&activityId=${this.activityId}&isMould=${this.isMould}`
|
||||||
|
).then(res => {
|
||||||
console.log('分享成功');
|
console.log('分享成功');
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
getHelptatus(cardProductId, shareUid,activityId) {
|
getHelptatus(cardProductId, shareUid, activityId) {
|
||||||
helptatus({
|
helptatus({
|
||||||
cardProductId,
|
cardProductId,
|
||||||
shareUid,
|
shareUid,
|
||||||
activityId
|
activityId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
console.log('活动状态',res);
|
console.log('活动状态', res);
|
||||||
this.avatar=res.data.avatar
|
this.avatar = res.data.avatar
|
||||||
this.nickname=res.data.nickname
|
this.nickname = res.data.nickname
|
||||||
this.helpType = res.data.status
|
this.helpType = res.data.status
|
||||||
this.helpShow = true
|
this.helpShow = true
|
||||||
})
|
})
|
||||||
@@ -246,12 +257,13 @@
|
|||||||
// 助力
|
// 助力
|
||||||
helpBtn() {
|
helpBtn() {
|
||||||
// mainUid => 发起人uid cardProductId => 卡券商品id
|
// mainUid => 发起人uid cardProductId => 卡券商品id
|
||||||
let obj={
|
let obj = {
|
||||||
mainUid: this.fromUid,
|
mainUid: this.fromUid,
|
||||||
cardProductId: this.detail.id,
|
cardProductId: this.detail.id,
|
||||||
activityId: this.detail.activityId
|
activityId: this.detail.activityId
|
||||||
}
|
}
|
||||||
if(this.helpType!=1){
|
console.log('助力状态', this.helpType);
|
||||||
|
if (this.helpType == 0) {
|
||||||
orderHelpAPI(obj).then(res => {
|
orderHelpAPI(obj).then(res => {
|
||||||
this.helpType = 3
|
this.helpType = 3
|
||||||
this.helpShow = true
|
this.helpShow = true
|
||||||
@@ -273,7 +285,6 @@
|
|||||||
getInfo() {
|
getInfo() {
|
||||||
if (this.helpGenre == 0) {
|
if (this.helpGenre == 0) {
|
||||||
getCardProductInfoAPI(this.id).then(res => {
|
getCardProductInfoAPI(this.id).then(res => {
|
||||||
console.log( res.data);
|
|
||||||
if (res.data.helpList) {
|
if (res.data.helpList) {
|
||||||
let avatarArr = []
|
let avatarArr = []
|
||||||
res.data.helpList.forEach(item => {
|
res.data.helpList.forEach(item => {
|
||||||
@@ -282,15 +293,15 @@
|
|||||||
res.data.avatarArr = avatarArr
|
res.data.avatarArr = avatarArr
|
||||||
}
|
}
|
||||||
this.detail = res.data
|
this.detail = res.data
|
||||||
|
this.isExpired(this.detail.stopTime)
|
||||||
this.brannerList = res.data.image.split(',')
|
this.brannerList = res.data.image.split(',')
|
||||||
this.labels = JSON.parse(res.data.labels);
|
this.labels = JSON.parse(res.data.labels);
|
||||||
})
|
})
|
||||||
} else if (this.helpGenre == 1) {
|
} else if (this.helpGenre == 1) {
|
||||||
getInformationHelpAPI({
|
getInformationHelpAPI({
|
||||||
id:this.id,
|
id: this.id,
|
||||||
isMould:this.isMould
|
isMould: this.isMould
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
console.log( res.data);
|
|
||||||
if (res.data.helpList) {
|
if (res.data.helpList) {
|
||||||
let avatarArr = []
|
let avatarArr = []
|
||||||
res.data.helpList.forEach(item => {
|
res.data.helpList.forEach(item => {
|
||||||
@@ -299,12 +310,12 @@
|
|||||||
res.data.avatarArr = avatarArr
|
res.data.avatarArr = avatarArr
|
||||||
}
|
}
|
||||||
this.detail = res.data
|
this.detail = res.data
|
||||||
|
this.isExpired(this.detail.stopTime)
|
||||||
this.brannerList = res.data.image.split(',')
|
this.brannerList = res.data.image.split(',')
|
||||||
this.labels = JSON.parse(res.data.labels);
|
this.labels = JSON.parse(res.data.labels);
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
getProductHelpAPI(this.id).then(res => {
|
getProductHelpAPI(this.id).then(res => {
|
||||||
console.log( res.data);
|
|
||||||
if (res.data.helpList) {
|
if (res.data.helpList) {
|
||||||
let avatarArr = []
|
let avatarArr = []
|
||||||
res.data.helpList.forEach(item => {
|
res.data.helpList.forEach(item => {
|
||||||
@@ -313,37 +324,52 @@
|
|||||||
res.data.avatarArr = avatarArr
|
res.data.avatarArr = avatarArr
|
||||||
}
|
}
|
||||||
this.detail = res.data
|
this.detail = res.data
|
||||||
|
this.isExpired(this.detail.stopTime)
|
||||||
this.brannerList = res.data.image.split(',')
|
this.brannerList = res.data.image.split(',')
|
||||||
this.labels = JSON.parse(res.data.labels);
|
this.labels = JSON.parse(res.data.labels);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//获取活动详情
|
//获取活动详情
|
||||||
getHelpDetailFn(){
|
getHelpDetailFn() {
|
||||||
getHelpDetail(this.activityId).then(res=>{
|
getHelpDetail(this.activityId).then(res => {
|
||||||
console.log('活动详情',res.data);
|
console.log('活动详情', res.data);
|
||||||
this.templateData=res.data
|
this.templateData = res.data
|
||||||
|
|
||||||
// this.content=res.data.content
|
// this.content=res.data.content
|
||||||
// this.joinNum=res.data.joinNum
|
// this.joinNum=res.data.joinNum
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
//我的活动
|
||||||
|
navActivity() {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: '/pages/driver/mine/my_activity/my_activity'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//处理活动是否结束
|
||||||
|
isExpired(targetDateTime) {
|
||||||
|
const currentDate = new Date(); // 获取当前时间
|
||||||
|
const targetDate = new Date(targetDateTime); // 将目标时间字符串转换为Date对象
|
||||||
|
this.buttFlag = currentDate > targetDate; // 比较当前时间和目标时间
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(option) {
|
onLoad(option) {
|
||||||
this.helpGenre = option.helpGenre
|
this.helpGenre = option.helpGenre
|
||||||
this.activityId = option.activityId
|
this.activityId = option.activityId
|
||||||
this.id = option.id
|
this.id = option.id
|
||||||
this.isMould=option.isMould
|
this.isMould = option.isMould
|
||||||
if (option.type == 'help') {
|
if (option.type == 'help') {
|
||||||
this.type = option.type
|
this.type = option.type
|
||||||
this.uid = option.uid
|
this.uid = option.uid
|
||||||
this.fromUid = option.fromUid
|
this.fromUid = option.fromUid
|
||||||
if (option.uid != option.fromUid) {
|
if (option.uid != option.fromUid) {
|
||||||
this.getHelptatus(option.id, option.fromUid,option.activityId)
|
this.getHelptatus(option.id, option.fromUid, option.activityId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.init()
|
this.init()
|
||||||
//获取活动详情
|
//获取活动详情
|
||||||
this.getHelpDetailFn()
|
this.getHelpDetailFn(option.activityId)
|
||||||
|
console.log(option.activityId, option.id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -353,14 +379,14 @@
|
|||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
padding-top: 24rpx;
|
padding-top: 24rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.store-list img {
|
.store-list img {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-box {
|
.back-box {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 88rpx;
|
top: 88rpx;
|
||||||
|
|||||||
@@ -43,6 +43,11 @@
|
|||||||
<u-button color="#13AFA8" shape="circle"
|
<u-button color="#13AFA8" shape="circle"
|
||||||
:customStyle="{width: '160rpx', height: '56rpx', lineHeight: '56rpx',fontSize: '24rpx'}">提交订单</u-button>
|
:customStyle="{width: '160rpx', height: '56rpx', lineHeight: '56rpx',fontSize: '24rpx'}">提交订单</u-button>
|
||||||
</view>
|
</view>
|
||||||
|
<!-- v-if="item.status==1&&!item.isCreateOrder&&item.paid" -->
|
||||||
|
<view v-if="item.status==1&&!item.isCreateOrder&&item.paid" @click.stop="topOrderFn(item)">
|
||||||
|
<u-button color="#13AFA8" shape="circle"
|
||||||
|
:customStyle="{width: '160rpx', height: '56rpx', lineHeight: '56rpx',fontSize: '24rpx'}">查看订单</u-button>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -307,6 +312,21 @@
|
|||||||
topUpTypeClose() {
|
topUpTypeClose() {
|
||||||
this.topUpTypeShow = false
|
this.topUpTypeShow = false
|
||||||
},
|
},
|
||||||
|
topOrderFn(item){
|
||||||
|
if (item.helpGenre == 0) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url:`/pages/driver/mine/my_order/serveOrder/serve_order?tabOnecurrent=2`
|
||||||
|
})
|
||||||
|
} else if (item.helpGenre == 1) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url:`/pages/driver/mine/my_order/rentCars/rent_order`
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
uni.navigateTo({
|
||||||
|
url:`/pages/driver/mine/my_order/buyCars/buy_cars_order`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
topUpFn(item) {
|
topUpFn(item) {
|
||||||
this.helpGenre = item.helpGenre
|
this.helpGenre = item.helpGenre
|
||||||
if (item.helpGenre == 0) {
|
if (item.helpGenre == 0) {
|
||||||
|
|||||||
@@ -20,9 +20,8 @@
|
|||||||
<view class="list-cont" v-for="(item,index) in dataList" :key="index" @click="navParticularFn(item)">
|
<view class="list-cont" v-for="(item,index) in dataList" :key="index" @click="navParticularFn(item)">
|
||||||
<view class="user-data f-jcsb f-a-i">
|
<view class="user-data f-jcsb f-a-i">
|
||||||
<view class="f-a-i">
|
<view class="f-a-i">
|
||||||
<view class="user-data-image">
|
|
||||||
<image :src="item.avatar" mode=""></image>
|
<image class="user-data-image" :src="item.avatar" mode=""></image>
|
||||||
</view>
|
|
||||||
<view class="user-data-name">{{item.carDealerName}}</view>
|
<view class="user-data-name">{{item.carDealerName}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="user-data-state">
|
<view class="user-data-state">
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<z-paging ref="paging" v-model="dataList" @query="queryList">
|
<z-paging ref="paging" v-model="dataList" @query="queryList">
|
||||||
<view slot="top">
|
<view slot="top">
|
||||||
<view class="tab" style="background: #fff;">
|
<view class="tab" style="background: #fff;">
|
||||||
<u-tabs :list="tabsList5" :current="tabOnecurrent" @click="tabClick" :scrollable="true" lineColor="#111111"
|
<u-tabs :list="tabsList5" :current="tabOnecurrent" @click="tabClick" :scrollable="true" lineColor="#111111"
|
||||||
:activeStyle="{color: '#303133',fontWeight: 'bold',transform: 'scale(1.05)'}"
|
:activeStyle="{color: '#303133',fontWeight: 'bold',transform: 'scale(1.05)'}"
|
||||||
:inactiveStyle="{color: '#606266',transform: 'scale(1)'}"
|
:inactiveStyle="{color: '#606266',transform: 'scale(1)'}"
|
||||||
itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"></u-tabs>
|
itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"></u-tabs>
|
||||||
@@ -386,6 +386,8 @@
|
|||||||
this.typeOne = 2
|
this.typeOne = 2
|
||||||
}else if(this.tabOnecurrent==0){
|
}else if(this.tabOnecurrent==0){
|
||||||
this.typeOne = 1
|
this.typeOne = 1
|
||||||
|
}else if(this.tabOnecurrent==2){
|
||||||
|
this.typeOne = 3
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
@clear='clearBtn'></u-search>
|
@clear='clearBtn'></u-search>
|
||||||
</view>
|
</view>
|
||||||
<!-- Tabs 标签 -->
|
<!-- Tabs 标签 -->
|
||||||
<view class="tabs_view flex justify-between">
|
<view class="tabs_view flex justify-around">
|
||||||
<view class="tabs_list" v-for="(item,index) in tabsList8" :key="index" @click="clickTabs(item)">
|
<view class="tabs_list" v-for="(item,index) in tabsList8" :key="index" @click="clickTabs(item)">
|
||||||
<view :class="['inactive-style',actType==item.value?'active-tab':'']">{{item.name}}</view>
|
<view :class="['inactive-style',actType==item.value?'active-tab':'']">{{item.name}}</view>
|
||||||
<view v-if="actType==item.value" class="active-style"></view>
|
<view v-if="actType==item.value" class="active-style"></view>
|
||||||
@@ -74,6 +74,7 @@
|
|||||||
this.current = query.num
|
this.current = query.num
|
||||||
if (query.num == 1) {
|
if (query.num == 1) {
|
||||||
this.cardType = 2
|
this.cardType = 2
|
||||||
|
this.actType = 2
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
@@ -105,19 +106,6 @@
|
|||||||
},
|
},
|
||||||
// 卡券商品
|
// 卡券商品
|
||||||
queryList(pageNo, pageSize) {
|
queryList(pageNo, pageSize) {
|
||||||
// 助力
|
|
||||||
// if(this.cardType==3){
|
|
||||||
// getActivityListAPI({
|
|
||||||
// limit:pageSize,
|
|
||||||
// page:pageNo
|
|
||||||
// }).then(res=>{
|
|
||||||
// this.$refs.paging.complete(res.data.list)
|
|
||||||
// }).catch(err=>{
|
|
||||||
// this.$refs.paging.complete(false)
|
|
||||||
// })
|
|
||||||
// }else {
|
|
||||||
// 卡券 全部和秒杀
|
|
||||||
// console.log(this.cardType,'卡券类型');
|
|
||||||
// type => 1普通2秒杀3助力
|
// type => 1普通2秒杀3助力
|
||||||
let obj = {
|
let obj = {
|
||||||
limit: pageSize,
|
limit: pageSize,
|
||||||
@@ -134,9 +122,6 @@
|
|||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
this.$refs.paging.complete(false)
|
this.$refs.paging.complete(false)
|
||||||
})
|
})
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
// 详情页
|
// 详情页
|
||||||
toDetailPages(item) {
|
toDetailPages(item) {
|
||||||
@@ -152,7 +137,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
clickTabs(item) {
|
clickTabs(item) {
|
||||||
console.log(item, 'tabs点击');
|
console.log( 'tabs点击',item,);
|
||||||
this.actType = item.value
|
this.actType = item.value
|
||||||
// item.name => 名字 item.value => 1,2,3 item.index => 0,1,2
|
// item.name => 名字 item.value => 1,2,3 item.index => 0,1,2
|
||||||
if (item.value == 1) {
|
if (item.value == 1) {
|
||||||
|
|||||||
@@ -33,13 +33,13 @@
|
|||||||
<swiper class="swiper" circular previousMargin='0rpx' nextMargin="0rpx" :indicator-dots="false"
|
<swiper class="swiper" circular previousMargin='0rpx' nextMargin="0rpx" :indicator-dots="false"
|
||||||
:autoplay="false" interval="4000" duration="500" @change="actTrimChengFn">
|
:autoplay="false" interval="4000" duration="500" @change="actTrimChengFn">
|
||||||
<swiper-item v-for="(item,index) in couponList3" :key="index">
|
<swiper-item v-for="(item,index) in couponList3" :key="index">
|
||||||
<view id="showimage1" class="swiper-item flex">
|
<view id="showimage1" class="swiper-item flex" @click="toHotPages('help', item)">
|
||||||
<image class="swiper-item-image" :src="item.cover" mode="aspectFill"></image>
|
<image class="swiper-item-image" :src="item.cover" mode="aspectFill"></image>
|
||||||
<view class="swiper-item-cont flex flex-column justify-between">
|
<view class="swiper-item-cont flex flex-column justify-between">
|
||||||
<view class="swiper-item-cont-name">{{item.name}}</view>
|
<view class="swiper-item-cont-name">{{item.name}}</view>
|
||||||
<view class="swiper-item-cont-num flex justify-between align-center">
|
<view class="swiper-item-cont-num flex justify-between align-center">
|
||||||
<view>已助力<text class="cont-num">{{item.helpNum}}人</text></view>
|
<view>已助力<text class="cont-num">{{item.helpNum}}人</text></view>
|
||||||
<view>仅差<text class="cont-num">{{item.joinNum - item.helpNum}}人</text></view>
|
<view>仅差<text class="cont-num">{{(item.joinNum - item.helpNum)<0?0:(item.joinNum - item.helpNum)}}人</text></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="swiper-item-cont-schedule">
|
<view class="swiper-item-cont-schedule">
|
||||||
<view class="schedule-num" :style="{width:item.widthNum+'rpx' }"></view>
|
<view class="schedule-num" :style="{width:item.widthNum+'rpx' }"></view>
|
||||||
@@ -47,12 +47,9 @@
|
|||||||
<view class="swiper-item-cont-down flex justify-center align-center">
|
<view class="swiper-item-cont-down flex justify-center align-center">
|
||||||
<count-down :type="1" :stopTime="item.stopTime"></count-down>
|
<count-down :type="1" :stopTime="item.stopTime"></count-down>
|
||||||
</view>
|
</view>
|
||||||
<!-- <u-count-down :time="item.stopTime" format="DD:HH:mm:ss" autoStart millisecond
|
<view class="flex align-center justify-center" >
|
||||||
@change="onChange">
|
<view v-if="(item.joinNum - item.helpNum)>0" @click.stop="toHotPages('help', item)" class="swiper-item-cont-butt">立即助力</view>
|
||||||
|
<view v-else @click.stop="navActivity" class="swiper-item-cont-butt">助力完成</view>
|
||||||
</u-count-down> -->
|
|
||||||
<view class="flex align-center justify-center" @click="toHotPages('help', item)">
|
|
||||||
<view class="swiper-item-cont-butt">立即助力</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -118,7 +115,7 @@
|
|||||||
mode="aspectFill"></image>
|
mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="integral-list-butt " @click="navParticularsFn(item)">
|
<view class="integral-list-butt " @click="navParticularsFn(item)">
|
||||||
<text class="f-20 fff">¥{{parseInt(item.price)}}</text>
|
<text class="f-20 fff">¥{{item.price*1}}</text>
|
||||||
<text class="f-24 fff ml-2">{{item.integralNum}}积分</text>
|
<text class="f-24 fff ml-2">{{item.integralNum}}积分</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="integral-list-name c666 f-28"> {{item.name}}</view>
|
<view class="integral-list-name c666 f-28"> {{item.name}}</view>
|
||||||
@@ -167,6 +164,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import {
|
||||||
|
userCenterPersonalInfo
|
||||||
|
} from "@/api/system/user.js"
|
||||||
import CountDown from "@/components/count-down.vue"
|
import CountDown from "@/components/count-down.vue"
|
||||||
import {
|
import {
|
||||||
brannerList
|
brannerList
|
||||||
@@ -223,7 +223,7 @@
|
|||||||
couponList3: [],
|
couponList3: [],
|
||||||
couponHotList: [],
|
couponHotList: [],
|
||||||
//消息未读 数量
|
//消息未读 数量
|
||||||
unreadNum: 0,
|
// unreadNum: 0,
|
||||||
//积分商品列表
|
//积分商品列表
|
||||||
integralList: [],
|
integralList: [],
|
||||||
//话题列表
|
//话题列表
|
||||||
@@ -235,11 +235,11 @@
|
|||||||
onShow() {
|
onShow() {
|
||||||
this.city = uni.getStorageSync('current_city');
|
this.city = uni.getStorageSync('current_city');
|
||||||
this.getBranner()
|
this.getBranner()
|
||||||
let userInfo = uni.getStorageSync('userInfo')
|
userCenterPersonalInfo().then(res => {
|
||||||
this.unreadNum = userInfo.unreadNum
|
uni.setStorageSync('userInfo', res.data)
|
||||||
|
})
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
// uni.hideTabBar();
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//监听选择
|
//监听选择
|
||||||
@@ -378,6 +378,12 @@
|
|||||||
url: `/pages/driver/message/message`
|
url: `/pages/driver/message/message`
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
//我的活动
|
||||||
|
navActivity(){
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/pages/driver/mine/my_activity/my_activity'
|
||||||
|
})
|
||||||
|
},
|
||||||
// 点击轮播图
|
// 点击轮播图
|
||||||
brannerClick(e) {
|
brannerClick(e) {
|
||||||
console.log(this.branner[e]);
|
console.log(this.branner[e]);
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
<!-- 轮播图 -->
|
<!-- 轮播图 -->
|
||||||
<view v-if="showType < 4" style="height: 146rpx;" />
|
<view v-if="showType < 4" style="height: 146rpx;" />
|
||||||
<view class="swiper-box" v-if="showType == 1">
|
<view class="swiper-box" v-if="showType == 1">
|
||||||
<u-swiper circular imgMode="widthFix" bgColor="transparent" height="604rpx"
|
<u-swiper circular imgMode="aspectFit" bgColor="transparent" height="604rpx"
|
||||||
indicatorActiveColor="#13AFA8" keyName="image" @change="actTrimChengFn" :list="branner" indicator
|
indicatorActiveColor="#13AFA8" keyName="image" @change="actTrimChengFn" :list="branner" indicator
|
||||||
:indicatorStyle="{bottom:'0rpx'}">
|
:indicatorStyle="{bottom:'0rpx'}">
|
||||||
</u-swiper>
|
</u-swiper>
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: '/pages/driver/home/home'
|
url: '/pages/driver/index/index'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -216,6 +216,7 @@
|
|||||||
.image {
|
.image {
|
||||||
width: 112rpx;
|
width: 112rpx;
|
||||||
height: 112rpx;
|
height: 112rpx;
|
||||||
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-content {
|
.item-content {
|
||||||
@@ -250,6 +251,7 @@
|
|||||||
image {
|
image {
|
||||||
width: 28rpx;
|
width: 28rpx;
|
||||||
height: 28rpx;
|
height: 28rpx;
|
||||||
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<z-paging
|
<view>
|
||||||
ref="paging"
|
<image class="spread-its-tail" src="@/static/spread_its_tail.png" mode="aspectFill"></image>
|
||||||
:auto="false"
|
</view>
|
||||||
created-reload
|
|
||||||
:auto-clean-list-when-reload="false"
|
|
||||||
:pagingStyle="{background:'#F5F5F5'}">
|
|
||||||
<!-- 内容 -->
|
|
||||||
<template>
|
|
||||||
|
|
||||||
</template>
|
|
||||||
</z-paging>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -56,5 +48,8 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
.spread-its-tail{
|
||||||
|
width: 750rpx;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 53 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 207 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 446 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 679 KiB |
Reference in New Issue
Block a user