Compare commits
No commits in common. "5338356fce77a1f84814fd538673f6889731f9a4" and "99b9f6cbfb310756298e9b939f6b49422d0a8209" have entirely different histories.
5338356fce
...
99b9f6cbfb
|
|
@ -1,9 +1,9 @@
|
|||
const install = (Vue, vm) => {
|
||||
uni.setStorageSync('deptId', 100);
|
||||
Vue.prototype.$u.http.setConfig({
|
||||
baseUrl: 'http://192.168.1.9:4101', //键辉本地
|
||||
// baseUrl: 'http://192.168.1.6:4101', //键辉本地
|
||||
// baseUrl: 'http://192.168.2.221:4101', //景森本地
|
||||
// baseUrl: 'https://ele.ccttiot.com/prod-api', //线上 小鹿appid： wx8a05cf95418a6859 小兔骑骑appid：wx38f96c87621a87ab 遇福兴https://fu.chuantewulian.cn wxcb1d6a5d9dca8bbe
|
||||
baseUrl: 'https://ele.ccttiot.com/prod-api', //线上 小鹿appid： wx8a05cf95418a6859 小兔骑骑appid：wx38f96c87621a87ab 遇福兴https://fu.chuantewulian.cn wxcb1d6a5d9dca8bbe
|
||||
// baseUrl: 'https://cc.ccttiot.com/prod-api', //叉车线上
|
||||
// baseUrl:'https://ysd.chuantewulian.cn/prod-api', //嵛山岛线上api 嵛山岛appid：wx4d178f8c80348214
|
||||
loadingText: '努力加载中~',
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<u-navbar title="优惠中心" :border-bottom="false" :background="bgc" back-icon-color="#333333" title-color='#333333'
|
||||
title-size='36' height='36' id="navbar">
|
||||
</u-navbar>
|
||||
<view hover-class="app-tap-hover" class="verify-entry" @click="goVerify" v-if="areaCouponVerifyEnabled">
|
||||
<view hover-class="app-tap-hover" class="verify-entry" @click="goVerify" v-if="area != null && area.douyinEnable == true">
|
||||
<view class="verify-entry-cards">
|
||||
<view class="card card-back">
|
||||
<image src="https://api.ccttiot.com/%E7%BE%8E%E5%9B%A2-copy-1772093915776.png" mode="aspectFit" />
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
areaId:'',
|
||||
channelId:'',
|
||||
zfflag:true,
|
||||
areaCouponVerifyEnabled: false,
|
||||
area: {},
|
||||
redirectUrl: '',
|
||||
redirectRemark: ''
|
||||
}
|
||||
|
|
@ -152,13 +152,13 @@
|
|||
},
|
||||
getAreaDetail() {
|
||||
if (!this.areaId) {
|
||||
this.areaCouponVerifyEnabled = false;
|
||||
this.area = {};
|
||||
return;
|
||||
}
|
||||
this.$u.get(`/app/areaAbility/one?areaId=${this.areaId}&abilityCode=COUPON_VERIFY`).then((res) => {
|
||||
this.areaCouponVerifyEnabled = !!(res.code == 200 && res.data)
|
||||
}).catch(() => {
|
||||
this.areaCouponVerifyEnabled = false
|
||||
this.$u.get(`/app/area/detail?id=${this.areaId}`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.area = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 请求channelId
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@
|
|||
show: false,
|
||||
huiyuanlist: [],
|
||||
huiyuanobj: {},
|
||||
areaCouponVerifyEnabled: false,
|
||||
areaDouyinEnable: false,
|
||||
zfflag: true,
|
||||
jieliuflag: true,
|
||||
videoUrl: '',
|
||||
|
|
@ -218,7 +218,7 @@
|
|||
computed: {
|
||||
// 特惠购卡/团购核销显示
|
||||
showCardVerifyEntry() {
|
||||
return this.huiyuanlist.length > 0 || this.areaCouponVerifyEnabled
|
||||
return this.huiyuanlist.length > 0 || this.areaDouyinEnable
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
|
|
@ -790,15 +790,9 @@
|
|||
|
||||
// ── 运营区详情（引导视频/抖音核销） ──────────
|
||||
getAreaDetail() {
|
||||
if (!this.bikeobj || !this.bikeobj.areaId) {
|
||||
this.areaCouponVerifyEnabled = false
|
||||
return
|
||||
}
|
||||
if (!this.bikeobj || !this.bikeobj.areaId) return
|
||||
this.$u.get(`/app/area/detail?id=${this.bikeobj.areaId}`).then((res) => {
|
||||
if (res.code != 200 || !res.data) {
|
||||
this.areaCouponVerifyEnabled = false
|
||||
return
|
||||
}
|
||||
if (res.code != 200 || !res.data) return
|
||||
const data = res.data
|
||||
const areaId = data.id
|
||||
if (data.guideEnable && data.guideVideo) {
|
||||
|
|
@ -810,18 +804,7 @@
|
|||
this.showGuideVideo = true
|
||||
}
|
||||
}
|
||||
this.getAreaCouponVerifyEnabled(areaId)
|
||||
})
|
||||
},
|
||||
getAreaCouponVerifyEnabled(areaId) {
|
||||
if (!areaId) {
|
||||
this.areaCouponVerifyEnabled = false
|
||||
return
|
||||
}
|
||||
this.$u.get(`/app/areaAbility/one?areaId=${areaId}&abilityCode=COUPON_VERIFY`).then((res) => {
|
||||
this.areaCouponVerifyEnabled = !!(res.code == 200 && res.data)
|
||||
}).catch(() => {
|
||||
this.areaCouponVerifyEnabled = false
|
||||
this.areaDouyinEnable = data.douyinEnable
|
||||
})
|
||||
},
|
||||
|
||||
|
|
@ -1277,6 +1260,7 @@
|
|||
price: this.yucobj,
|
||||
appId: this.$store.state.appid,
|
||||
channelId: this.channelId,
|
||||
creditUserId: this.selectedSubPayment,
|
||||
checkVideo: this.videoUrl,
|
||||
appType: 1,
|
||||
areaPromotionId: areaPromotionId
|
||||
|
|
@ -1326,6 +1310,12 @@
|
|||
title: '提示', content: '您当前还未实名认证，是否前去实名认证？', showCancel: true,
|
||||
success: function(res) { if (res.confirm) uni.navigateTo({ url: '/page_user/shiming?areaId=' + that.bikeobj.areaId }) }
|
||||
})
|
||||
} else if (resp.code == 10002) {
|
||||
uni.hideLoading()
|
||||
uni.showModal({
|
||||
title: '提示', content: '您当前驾驶证未认证，是否前去认证？', showCancel: true,
|
||||
success: function(res) { if (res.confirm) uni.navigateTo({ url: '/page_user/renzheng/jiashizheng' }) }
|
||||
})
|
||||
} else {
|
||||
uni.hideLoading()
|
||||
uni.showToast({ title: resp.msg, icon: 'none', duration: 2000 })
|
||||
|
|
|
|||
|
|
@ -206,6 +206,20 @@
|
|||
开启后用户必须先拍摄全车视频才能下单
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card_li">
|
||||
<view class="tops">
|
||||
<view class="card_left">
|
||||
短信通知服务
|
||||
</view>
|
||||
<view class="card_right">
|
||||
<u-switch v-model="form.msgSwitch"></u-switch>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tips">
|
||||
开启短信通知，短信费用0.1元/条，从余额中扣除
|
||||
</view>
|
||||
</view>
|
||||
<view class="card_li">
|
||||
<view class="tops">
|
||||
<view class="card_left">
|
||||
|
|
@ -876,6 +890,13 @@
|
|||
}
|
||||
this.startTime = res.data.areaTimeStart
|
||||
this.endTime = res.data.areaTimeEnd
|
||||
res.data.authentication.filter(item => {
|
||||
if (item == 1) {
|
||||
this.shimflag = true
|
||||
} else if (item == 2) {
|
||||
this.jiasflag = true
|
||||
}
|
||||
})
|
||||
this.scspflag = res.data.needCheckVideo
|
||||
if (res.data.status == 1) {
|
||||
this.timeflag = false
|
||||
|
|
@ -982,6 +1003,16 @@
|
|||
},
|
||||
sub() {
|
||||
if (this.submitting) return
|
||||
let authentication = []
|
||||
if (this.shimflag == true && this.jiasflag == true) {
|
||||
authentication = [1, 2]
|
||||
} else if (this.shimflag == true && this.jiasflag == false) {
|
||||
authentication = [1]
|
||||
} else if (this.shimflag == false && this.jiasflag == true) {
|
||||
authentication = [2]
|
||||
} else if (this.shimflag == false && this.jiasflag == false) {
|
||||
authentication = []
|
||||
}
|
||||
if (this.form.enableTempUnlock === true) {
|
||||
const tempUnlockMax = Number(this.form.tempUnlockMax)
|
||||
const tempUnlockSeconds = Number(this.form.tempUnlockSeconds)
|
||||
|
|
@ -1007,6 +1038,7 @@
|
|||
areaTimeStart: this.startTime,
|
||||
areaTimeEnd: this.endTime,
|
||||
status: this.timeflag == true ? '0' : '1',
|
||||
authentication: authentication,
|
||||
needCheckVideo: this.scspflag,
|
||||
enableTempUnlock: this.form.enableTempUnlock === true,
|
||||
tempUnlockMax: Number(this.form.tempUnlockMax || 0),
|
||||
|
|
@ -1578,6 +1610,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.card_li:last-child {
|
||||
// border-bottom: 1rpx solid #fff;
|
||||
}
|
||||
|
||||
.tips {
|
||||
width: 100%;
|
||||
font-weight: 500;
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="bottom-content">
|
||||
<view hover-class="app-tap-hover" class="kefu" @click="getyajin" v-if="info.suitDepositDeduction">
|
||||
<view hover-class="app-tap-hover" class="kefu" @click="getyajin" v-if="info.suitDepositDeduction && info.isCredit == false">
|
||||
<view class="kefu-main">
|
||||
押金抵扣
|
||||
</view>
|
||||
|
|
@ -447,6 +447,7 @@ import ZhimaNoDepositBadge from '@/components/zhima-no-deposit-badge/zhima-no-de
|
|||
selectedCoupon: null,
|
||||
youhuiobj:{},
|
||||
vipUserId:null,
|
||||
creditUserId:'',
|
||||
channelobj:{},
|
||||
// 押金退还申请相关
|
||||
showRefundModal: false,
|
||||
|
|
@ -781,6 +782,9 @@ import ZhimaNoDepositBadge from '@/components/zhima-no-deposit-badge/zhima-no-de
|
|||
if (res.code == 200) {
|
||||
this.channelId = res.data[0].id
|
||||
this.channelobj = res.data
|
||||
if(res.data[0].subList != null && res.data[0].subList.length > 0){
|
||||
this.creditUserId = res.data[0].subList[0].id
|
||||
}
|
||||
this.getCouponList()
|
||||
} else {
|
||||
uni.showToast({
|
||||
|
|
@ -855,6 +859,7 @@ import ZhimaNoDepositBadge from '@/components/zhima-no-deposit-badge/zhima-no-de
|
|||
orderId: this.id,
|
||||
payAmount: this.info.totalFee,
|
||||
channelId: this.channelId,
|
||||
creditUserId:this.creditUserId,
|
||||
appId: this.$store.state.appid,
|
||||
vipUserId:this.vipUserId,
|
||||
fee
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user