Skip to content

J
jz_Travel
Commit 5b0323a2 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

parents 57190e4d 95bf45ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 723 additions and 107 deletions
manifest.json
View file @ 5b0323a2
...@@ -77,9 +77,10 @@ ...@@ -77,9 +77,10 @@
"usingComponents" : true, "usingComponents" : true,
"permission" : { "permission" : {
"scope.userLocation" : { "scope.userLocation" : {
"desc" : "你的位置信息将用于小程序位置接口的效果展示" "desc" : "需要获取您的位置以提供精准服务"
} }
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
"optimization" : { "optimization" : {
"subPackages" : true "subPackages" : true
} }
......
pages/bigredrnvelope/ActivityInProgress.vue
View file @ 5b0323a2
This diff is collapsed.
pages/bigredrnvelope/PaymentProgress.vue
View file @ 5b0323a2
<template> <template>
<view class="PaymentProBox column"> <view class="PaymentProBox column">
<view class="PaymentProTitle row items-center justify-center"> <view class="PaymentProTitle row items-center justify-center">
<!-- {{authInfor.ContractStatus}}--{{ authInfor.Status }} -->
<image v-if="authInfor.Status==1||authInfor.Status==3" :src="stateImg[0]" /> <image v-if="authInfor.Status==1||authInfor.Status==3" :src="stateImg[0]" />
<image v-if="authInfor.ContractStatus==5&&authInfor.Status==2" :src="stateImg[1]" /> <image v-if="authInfor.ContractStatus==5&&authInfor.Status==2" :src="stateImg[1]" />
<text> <text>
...@@ -11,7 +12,7 @@ ...@@ -11,7 +12,7 @@
打款中 打款中
</template> </template>
<template v-if="(authInfor.ContractStatus==1||authInfor.ContractStatus==5)&&authInfor.Status==2"> <template v-if="(authInfor.ContractStatus==1||authInfor.ContractStatus==5)&&authInfor.Status==2">
已完成 {{authInfor.ContractStatus==1?'未生效':'已完成'}}
</template> </template>
</text> </text>
</view> </view>
...@@ -64,14 +65,15 @@ ...@@ -64,14 +65,15 @@
<view class="PaymentProCJDText">{{ item.Name }}</view> <view class="PaymentProCJDText">{{ item.Name }}</view>
</view> </view>
<view class="PaymentProCJDBoxR"> <view class="PaymentProCJDBoxR">
<template v-if="type==2&&((authInfor.Status==1&&!index)||authInfor.Status==3)">{{ item.Time }}</template> <template v-if="(type==2&&((authInfor.Status==1&&!index)||authInfor.Status==3))
||(type==3&&item.Status==2)">{{ item.Time }}</template>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="PaymentProButBox row"> <view class="PaymentProButBox row">
<view class="PaymentProBut PaymentProButL col">返回</view> <view class="PaymentProBut PaymentProButL col" @click="goBack">返回</view>
<view v-if="(type==2&&authInfor.Status==3)||type==3" <view v-if="(type==2&&authInfor.Status==3)||type==3"
class="PaymentProBut PaymentProButR col" class="PaymentProBut PaymentProButR col"
@click="goUrl"> @click="goUrl">
...@@ -156,16 +158,23 @@ export default { ...@@ -156,16 +158,23 @@ export default {
this.getSignDetails() this.getSignDetails()
}, },
methods: { methods: {
goBack(){
if(this.type==2){
uni.redirectTo({
url: '/pages/bigredrnvelope/list'
})
}else if(this.type==3){
uni.redirectTo({
url: '/pages/bigredrnvelope/list'
})
}
},
goUrl(){ goUrl(){
if(this.type==2){ if(this.type==2){
uni.navigateTo({//结算中 uni.navigateTo({//合同修改
url: `/pages/bigredrnvelope/signAcontract?ContractId=${this.ContractId}` url: `/pages/bigredrnvelope/signAcontract?ContractId=${this.ContractId}`
}) })
}else if(this.type==3){//进行中 }else if(this.type==3){//可结算
uni.navigateTo({
url: `/pages/bigredrnvelope/ActivityInProgress?ContractId=${this.ContractId}`
})
}else if(this.type==4){//可结算
uni.navigateTo({ uni.navigateTo({
url: `/pages/bigredrnvelope/SettableList?ContractId=${this.ContractId}` url: `/pages/bigredrnvelope/SettableList?ContractId=${this.ContractId}`
}) })
...@@ -187,11 +196,30 @@ export default { ...@@ -187,11 +196,30 @@ export default {
this.toExamineSteps[0].Time = data.CreateTime this.toExamineSteps[0].Time = data.CreateTime
this.toExamineSteps[1].Time = data.UpdateTime this.toExamineSteps[1].Time = data.UpdateTime
this.stepList = JSON.parse(JSON.stringify(this.toExamineSteps)) this.stepList = JSON.parse(JSON.stringify(this.toExamineSteps))
}else{
for(let i=0;i<data.AuditSteps.length;i++){
let record = data.AuditSteps[i]
let Time = ''
if(record.AuditRecordList.length>0){
Time = data.AuditSteps[i].AuditRecordList[0].AduitDate
}
let obj = {
Name: i?record.AuditDescription:record.AuditRecordList[0].AuditName,
Id: i+1,
Time: Time,
Status: record.Status,
}
this.stepList.push(obj)
if(obj.Status==2){
this.StepNum = i
}
}
} }
uni.hideLoading() setTimeout(()=>{
uni.hideLoading()
},500)
} }
}) })
}, },
getInfor(){ getInfor(){
this.apipost('app_customer_GetAuthenticationDetails',{ this.apipost('app_customer_GetAuthenticationDetails',{
......
pages/bigredrnvelope/SettableList.vue
View file @ 5b0323a2
This diff is collapsed.
pages/bigredrnvelope/list.vue
View file @ 5b0323a2
...@@ -9,34 +9,38 @@ ...@@ -9,34 +9,38 @@
style="width: 100%;height: 1px;flex: 1;"> style="width: 100%;height: 1px;flex: 1;">
<view class="bigRedEnvLCBox"> <view class="bigRedEnvLCBox">
<!-- activeDaiKQ activeJinXZ activeChaK activeChaKJD--> <!-- activeDaiKQ activeJinXZ activeChaK activeChaKJD-->
<view class="bigRedEnvLC " v-for="(item,index) in dataList" :key="index" <view class="bigRedEnvLC" v-for="(item,index) in dataList" :key="index"
:class="[{'activeDaiKQ':item.ContractStatus==3&&item.Status==2, :class="[{'activeDaiKQ':item.ContractStatus==3&&item.Status==2,
'activeJinXZ':item.ContractStatus==2&&item.Status==2, 'activeJinXZ':(item.ContractStatus==2&&item.Status==2)||item.ContractStatus==1,
'activeChaK':(item.ContractStatus==4||ContractStatus==5)&&Status==2, 'activeChaK':(item.ContractStatus==4||item.ContractStatus==5)&&item.Status==2,
'activeChaKJD':item.Status==1||item.Status==3}]"> 'activeChaKJD':item.Status==1||item.Status==3}]">
<view class="bigRedEnvLCBj"> <view class="bigRedEnvLCBj">
<view class="row items-center"> <view class="row items-center">
<view class="bigRedEnvLCLeft col"> <view class="bigRedEnvLCLeft col">
<view class="bigRedEnvLCLTitle"><text>{{ item.C_ProductName }}</text></view> <view class="bigRedEnvLCLTitle"><text>{{ item.C_ProductName }}</text></view>
<view v-if="item.Status!=1" class="bigRedEnvLCLTime"> <view v-if="item.Status!=1" class="bigRedEnvLCLTime">
<template v-if="item.ContractStatus==3&&item.Status==2">提交时间：{{ item.C_PayDate }}</template> <template v-if="item.ContractStatus==2&&item.Status==2">提交时间：{{ item.C_PayDate }}</template>
<template v-if="(item.ContractStatus==4||ContractStatus==5)&&Status==2">结算时间{{ item.JieSuan }}</template> <template v-if="item.ContractStatus==3&&item.Status==2">结算时间：{{ item.JieSuan }}</template>
<template v-if="(item.ContractStatus==4||item.ContractStatus==5)&&item.Status==2">结算时间：{{ item.C_PayDate }}</template>
</view> </view>
</view> </view>
<view class="bigRedEnvLCRight"> <view class="bigRedEnvLCRight">
<view class="bigRedEnvLCbigRedEnvLCLTimeRBox column" <view class="bigRedEnvLCRBox column"
v-if="item.Status!=1&&item.Status!=3" v-if="item.Status!=1&&item.Status!=3"
@click="(item.ContractStatus==4||item.ContractStatus==5)&&Status==2?goDetails(item,3):''"> @click="item.ContractStatus==2&&item.Status==2?goDetails(item,3):
item.ContractStatus==3&&item.Status==2?goDetails(item,4):
(item.ContractStatus==4||item.ContractStatus==5)&&item.Status==2?goDetails(item,5):''">
<view class="bigRedEnvLCRTitle">- <view class="bigRedEnvLCRTitle">-
<text> <text>
<template v-if="item.ContractStatus==3&&item.Status==2">待开启</template> <template v-if="item.ContractStatus==3&&item.Status==2">待开启</template>
<template v-if="item.ContractStatus==2&&item.Status==2">进行中</template> <template v-if="item.ContractStatus==2&&item.Status==2">进行中</template>
<template v-if="item.ContractStatus==4&&Status==2">结算中</template> <template v-if="item.ContractStatus==1">待生效</template>
<template v-if="item.ContractStatus==4&&item.Status==2">结算中</template>
<template v-if="item.ContractStatus==5&&item.Status==2">已完成</template> <template v-if="item.ContractStatus==5&&item.Status==2">已完成</template>
</text> -</view> </text> -</view>
<view class="bigRedEnvLCRText"> <view class="bigRedEnvLCRText">
¥ ¥
<text>{{ item.TotalClosePrice }}</text> <text>{{ item.TotalClosePrice.toFixed(2) }}</text>
</view> </view>
<view class="bigRedEnvLCRTYg">预估</view> <view class="bigRedEnvLCRTYg">预估</view>
</view> </view>
...@@ -120,13 +124,18 @@ export default { ...@@ -120,13 +124,18 @@ export default {
let path = ''; let path = '';
if(type==1){ if(type==1){
path = 'signAcontract?' path = 'signAcontract?'
}else if(type==2){ }else if(type==2){//合同进度
path =`PaymentProgress?type=${type}&` path =`PaymentProgress?type=${type}&`
}else if(type==3){ //进行中
path =`ActivityInProgress?`
}else if(type==4){ //待开启
path =`SettableList?`
}else if(type==5){ //提现完成
path =`PaymentProgress?type=3&`
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/bigredrnvelope/${path}ContractId=${item.ContractId}` url: `/pages/bigredrnvelope/${path}ContractId=${item.ContractId}`
}) })
}, },
getList(){ getList(){
uni.showLoading({ uni.showLoading({
...@@ -209,7 +218,7 @@ export default { ...@@ -209,7 +218,7 @@ export default {
} }
.bigRedEnvLCLeft{ .bigRedEnvLCLeft{
color: #E95E2F; color: #E95E2F;
position: relative; // position: relative;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -223,7 +232,7 @@ export default { ...@@ -223,7 +232,7 @@ export default {
font-size: 20rpx; font-size: 20rpx;
margin-top: 10rpx; margin-top: 10rpx;
position: absolute; position: absolute;
bottom: -30rpx; bottom: 20rpx;
} }
.bigRedEnvLCRight{ .bigRedEnvLCRight{
width: 171rpx; width: 171rpx;
...@@ -234,7 +243,7 @@ export default { ...@@ -234,7 +243,7 @@ export default {
width: 165rpx; width: 165rpx;
height: 207rpx; height: 207rpx;
position: absolute; position: absolute;
top: -112rpx; top: -109rpx;
padding: 15rpx 19rpx 0 19rpx; padding: 15rpx 19rpx 0 19rpx;
} }
.bigRedEnvLiYou{ .bigRedEnvLiYou{
...@@ -276,7 +285,7 @@ export default { ...@@ -276,7 +285,7 @@ export default {
font-size: 18rpx; font-size: 18rpx;
color: #A4571F; color: #A4571F;
text-align: center; text-align: center;
margin-top: 5rpx; // margin-top: 5rpx;
} }
.bigRedEnvLCRText text{ .bigRedEnvLCRText text{
font-size: 27rpx; font-size: 27rpx;
......
plugin/api.js
View file @ 5b0323a2
...@@ -129,7 +129,10 @@ export default { ...@@ -129,7 +129,10 @@ export default {
// curPage.onReady() // curPage.onReady()
}else{ }else{
console.log(uni.getStorageSync("LoginState"),'---log') console.log(uni.getStorageSync("LoginState"),'---log')
if(uni.getStorageSync("LoginState")) return if(uni.getStorageSync("LoginState")) {
uni.removeStorageSync("LoginState")
return
}
uni.setStorageSync("LoginState",true) uni.setStorageSync("LoginState",true)
setTimeout(()=>{ setTimeout(()=>{
uni.redirectTo({ uni.redirectTo({
......
uni_modules/mrsong-charts/components/mrsong-charts/mrsong-charts.vue
View file @ 5b0323a2
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<text class="chart-title">{{ title }}</text> <text class="chart-title">{{ title }}</text>
</slot> </slot>
</view> </view>
<view class="charts-box"> <view class="charts-box"
:style="{'height':height}">
<slot name="unit"> <slot name="unit">
<view v-if="unit" class="chart-unit">单位：{{ unit ? `(${unit})` : '' }}</view> <view v-if="unit" class="chart-unit">单位：{{ unit ? `(${unit})` : '' }}</view>
</slot> </slot>
...@@ -87,6 +88,10 @@ export default { ...@@ -87,6 +88,10 @@ export default {
align: { align: {
type: String, type: String,
default: 'center' default: 'center'
},
height:{
type: String,
default: '600px'
} }
}, },
data() { data() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment