商家入驻以及工作台协议流程修改
This commit is contained in:
parent
c5749eacd9
commit
34667a8355
@ -303,8 +303,8 @@ export function getDeliveryType(merId) {
|
||||
/*
|
||||
商品 -- 获取交易协议内容
|
||||
*/
|
||||
export function business() {
|
||||
return request.get(`business/agree?type=business_apply_agree`, {}, {
|
||||
export function business(data) {
|
||||
return request.get(`business/agree`, data, {
|
||||
noAuth: true
|
||||
});
|
||||
}
|
||||
@ -319,5 +319,5 @@ export function intention(data) {
|
||||
商品 -- 同意提交申请
|
||||
*/
|
||||
export function intentionbus(data) {
|
||||
return request.post(`intention/business`, {});
|
||||
return request.post(`intention/settlement`, data);
|
||||
}
|
@ -577,6 +577,6 @@ export function vicinityStoreApi(data) {
|
||||
/*
|
||||
商家入驻 -- 获取商户入驻申请协议内容
|
||||
*/
|
||||
export function agreeiness() {
|
||||
return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true });
|
||||
export function agreeiness(data) {
|
||||
return request.get(`business/agree`, data, { noAuth: true });
|
||||
}
|
@ -10,6 +10,8 @@ let httpApiThree
|
||||
// let httpApi = 'http://192.168.31.110:8324' // 测试
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
// httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
// httpApi = 'https://test.shop.lihaink.cn' //预发布环境
|
||||
|
||||
httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||
// httpApi = "http://192.168.0.222"
|
||||
// httpApi = "http://192.168.0.108:8325"
|
||||
@ -25,9 +27,11 @@ if (process.env.NODE_ENV === "development") {
|
||||
|
||||
// #endif
|
||||
} else if (process.env.NODE_ENV === 'production') {
|
||||
httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
// httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
|
||||
// httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||
// httpApi ='https://test.shop.lihaink.cn' //预发布环境
|
||||
|
||||
httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||
httpApiTwo = 'https://nk.lihaink.cn' // 生产
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
|
||||
}
|
||||
|
62
pages.json
62
pages.json
@ -1,32 +1,32 @@
|
||||
{
|
||||
"pages": [
|
||||
//#ifdef APP-PLUS
|
||||
//启动页
|
||||
{
|
||||
"path": "pages/guide/judge",
|
||||
"style": {
|
||||
"enablePullDownRefresh": false,
|
||||
"onReachBottomDistance": 100,
|
||||
"navigationStyle": "custom",
|
||||
"app-plus": {
|
||||
"contentAdjust": false,
|
||||
"bounce": "none"
|
||||
//#ifdef APP-PLUS
|
||||
//启动页
|
||||
{
|
||||
"path": "pages/guide/judge",
|
||||
"style": {
|
||||
"enablePullDownRefresh": false,
|
||||
"onReachBottomDistance": 100,
|
||||
"navigationStyle": "custom",
|
||||
"app-plus": {
|
||||
"contentAdjust": false,
|
||||
"bounce": "none"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/guide/guide",
|
||||
"style": {
|
||||
"enablePullDownRefresh": false,
|
||||
"onReachBottomDistance": 100,
|
||||
"navigationStyle": "custom",
|
||||
"app-plus": {
|
||||
"contentAdjust": false,
|
||||
"bounce": "none"
|
||||
},
|
||||
{
|
||||
"path": "pages/guide/guide",
|
||||
"style": {
|
||||
"enablePullDownRefresh": false,
|
||||
"onReachBottomDistance": 100,
|
||||
"navigationStyle": "custom",
|
||||
"app-plus": {
|
||||
"contentAdjust": false,
|
||||
"bounce": "none"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
// #endif
|
||||
},
|
||||
// #endif
|
||||
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
|
||||
{
|
||||
"path": "pages/index/index",
|
||||
@ -1122,18 +1122,6 @@
|
||||
"navigationBarTitleText": "商品管理",
|
||||
"enablePullDownRefresh": true
|
||||
}
|
||||
},{
|
||||
"path": "transactionApplication/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "交易申请",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},{
|
||||
"path": "transactionApplication/application",
|
||||
"style": {
|
||||
"navigationBarTitleText": "申请记录",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "goodsOnSale/index",
|
||||
|
@ -37,12 +37,7 @@
|
||||
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
|
||||
<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">交易申请</text>
|
||||
</view>
|
||||
|
||||
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
|
||||
</image>
|
||||
@ -157,13 +152,8 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
|
||||
<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">交易申请</text>
|
||||
</view>
|
||||
<!-- <view class="examine"
|
||||
|
||||
<!-- <view class="examine"
|
||||
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
|
||||
</image>
|
||||
@ -263,12 +253,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
|
||||
<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">交易申请</text>
|
||||
</view>
|
||||
|
||||
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
|
||||
</image>
|
||||
@ -322,12 +307,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
|
||||
<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">交易申请</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -351,11 +331,11 @@
|
||||
</view>
|
||||
|
||||
|
||||
<view class="examine" v-if="userInfoData.mer_info.setting_status==1" @click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
|
||||
<!-- <view class="examine" v-if="userInfoData.mer_info.setting_status==1" @click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
|
||||
<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">交易申请</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -366,6 +346,29 @@
|
||||
<view class="" style="padding-top: 1px;" v-else>
|
||||
<emptyPage title="暂无信息"></emptyPage>
|
||||
</view>
|
||||
<view class="settlementAgreement" v-if="isFshow">
|
||||
<view class="setAgCount">
|
||||
<i class="icon iconfont icon-cha" @click="recuo"></i>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
|
||||
<view class="contenta">
|
||||
<jyf-parser :html="detail.mer_settlement_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
|
||||
</view>
|
||||
<view class="setAgCountbtn">
|
||||
<button class="setAgCountbtna" @click="refuse">
|
||||
拒绝
|
||||
</button>
|
||||
|
||||
|
||||
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
|
||||
<text v-if="num>0">请仔细阅读协议{{num}}S</text>
|
||||
<text v-else>同意</text>
|
||||
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
@ -375,12 +378,15 @@
|
||||
import emptyPage from '@/components/emptyPage.vue';
|
||||
import zbpSwiper from '@/components/zbpSwiper'
|
||||
import {
|
||||
|
||||
|
||||
mapGetters
|
||||
} from 'vuex'
|
||||
|
||||
import {
|
||||
|
||||
business,
|
||||
intentionbus
|
||||
} from "@/api/product"
|
||||
import {
|
||||
|
||||
getUserInfo
|
||||
} from '@/api/user.js'
|
||||
import {
|
||||
@ -416,11 +422,16 @@
|
||||
isShow: false,
|
||||
bgColor: '',
|
||||
isFshow: false,
|
||||
street: ''
|
||||
street: '',
|
||||
detail: {},
|
||||
tagStyle: {
|
||||
img: 'width:100%;display:block;'
|
||||
},
|
||||
num: 15
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['userInfo', 'isLogin'])
|
||||
...mapGetters(['userInfo', 'isLogin'])
|
||||
},
|
||||
created() {},
|
||||
onLoad() {},
|
||||
@ -433,18 +444,95 @@
|
||||
this.jurisdiction = true
|
||||
}
|
||||
this.getUserInfo()
|
||||
|
||||
this.list()
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
methods: {
|
||||
navigator(url, t) {
|
||||
|
||||
uni.navigateTo({
|
||||
url: url
|
||||
//同意
|
||||
agree() {
|
||||
intentionbus({
|
||||
status: 1
|
||||
}).then((res) => {
|
||||
|
||||
if (res.status == 200) {
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success',
|
||||
})
|
||||
this.getUserInfo()
|
||||
this.isFshow = false
|
||||
}
|
||||
}).catch((err) => {
|
||||
this.$util.Tips({
|
||||
title: err,
|
||||
icon: 'error',
|
||||
})
|
||||
})
|
||||
},
|
||||
//拒绝
|
||||
refuse() {
|
||||
uni.switchTab({
|
||||
url: '/pages/gather/gather'
|
||||
})
|
||||
},
|
||||
//关闭弹窗
|
||||
recuo() {
|
||||
|
||||
if (this.num > 0) {
|
||||
this.num = 15
|
||||
this.isFshow = false
|
||||
} else {
|
||||
this.num = 0
|
||||
this.isFshow = false
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
countDown() {
|
||||
let {
|
||||
num
|
||||
} = this;
|
||||
// if (num === 3) this.nums = true;
|
||||
num = num > 0 ? num - 1 : "0";
|
||||
setTimeout(() => {
|
||||
|
||||
this.num = num;
|
||||
if (num == '0') {
|
||||
// this.launchApp()
|
||||
return
|
||||
}
|
||||
|
||||
if (this.isFshow == false && this.num > 0) {
|
||||
this.num = 15
|
||||
return
|
||||
}
|
||||
this.countDown();
|
||||
}, 1000);
|
||||
|
||||
|
||||
},
|
||||
//获取协议内容
|
||||
list() {
|
||||
business({
|
||||
type: 'mer_settlement_agree'
|
||||
}).then(res => {
|
||||
this.detail = res.data
|
||||
})
|
||||
},
|
||||
navigator(url, t) {
|
||||
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
||||
this.isFshow = true
|
||||
this.countDown()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: url
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
getUserInfo: function() {
|
||||
let that = this;
|
||||
getUserInfo().then(res => {
|
||||
@ -473,6 +561,150 @@
|
||||
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
|
||||
}
|
||||
|
||||
.settlementAgreement {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: rgba(0, 0, 0, .5);
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount {
|
||||
background: #fff;
|
||||
width: 656rpx;
|
||||
// height: 458px;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
border-radius: 12rpx;
|
||||
-webkit-border-radius: 12rpx;
|
||||
padding: 52rpx;
|
||||
-webkit-transform: translate(-50%, -50%);
|
||||
-moz-transform: translate(-50%, -50%);
|
||||
transform: translate(-50%, -50%);
|
||||
overflow: hidden;
|
||||
|
||||
.content {
|
||||
height: 900rpx;
|
||||
overflow-y: scroll;
|
||||
|
||||
/deep/ p {
|
||||
font-size: 13px;
|
||||
line-height: 22px;
|
||||
}
|
||||
|
||||
/deep/ img {
|
||||
max-width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount .icon {
|
||||
font-size: 42rpx;
|
||||
color: #b4b1b4;
|
||||
position: absolute;
|
||||
top: 15rpx;
|
||||
right: 15rpx;
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount .title {
|
||||
color: #333;
|
||||
font-size: 32rpx;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount .content {
|
||||
margin-top: 32rpx;
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
height: 756rpx;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
|
||||
.settlementAgreement .setAgCount .contenta {
|
||||
margin-top: 32rpx;
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
|
||||
/*#ifdef H5*/
|
||||
height: 600rpx;
|
||||
/*#endif*/
|
||||
/*#ifdef APP-PLUS*/
|
||||
height: 530rpx;
|
||||
/*#endif*/
|
||||
|
||||
overflow-y: scroll;
|
||||
|
||||
|
||||
}
|
||||
|
||||
.setAgCountbtn {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
|
||||
.setAgCountbtna {
|
||||
margin-top: 40rpx;
|
||||
width: 150rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
border: 2rpx solid #B3B3B3;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #737373;
|
||||
|
||||
}
|
||||
|
||||
.setAgCountbtnb {
|
||||
margin-top: 40rpx;
|
||||
padding-left: 20rpx;
|
||||
padding-right: 20rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
background: #cecece;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
|
||||
}
|
||||
|
||||
.setAgCountbtnc {
|
||||
margin-top: 40rpx;
|
||||
width: 150rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
.bg-img {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
@ -47,7 +47,7 @@
|
||||
<swiper-item :class="{ active: 1 == swiperCur }">
|
||||
<view class="slide-navigator">
|
||||
<!-- 隐藏暂时不需要 -->
|
||||
<!-- <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
|
||||
<!-- <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
|
||||
hover-class='none'>
|
||||
<image mode='widthFix' class="image" src="../static/images/product_freight.png">
|
||||
</image>
|
||||
@ -60,7 +60,7 @@
|
||||
src="../static/images/product_specification.png"></image>
|
||||
<text class="text">规格模板</text>
|
||||
</navigator>
|
||||
<!-- <navigator class="item"
|
||||
<!-- <navigator class="item"
|
||||
:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
|
||||
hover-class='none'>
|
||||
<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
|
||||
|
@ -1,163 +0,0 @@
|
||||
<template>
|
||||
|
||||
<view class="content">
|
||||
<view class="">
|
||||
|
||||
|
||||
<view class="content_con" v-for="(item,index) in datalist" :key='index'>
|
||||
<view class="content_title">
|
||||
<view class="content_title_a" v-if="item.status==1">
|
||||
已通过
|
||||
</view>
|
||||
|
||||
<view class="content_title_c" v-else-if="item.status==2">
|
||||
已拒绝
|
||||
</view>
|
||||
<view class="content_title_b" v-else-if="item.status==0">
|
||||
审核中
|
||||
</view>
|
||||
|
||||
<view class="content_title_d">
|
||||
{{item.mer_name}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="" v-if="item.fail_msg" style="margin-top: -50rpx;color: red;">
|
||||
拒绝原因:{{item.fail_msg}}
|
||||
</view>
|
||||
<view class="content_detail">
|
||||
<view class="" style="display: flex;">
|
||||
<view style="width:150rpx;"> 申请人:</view>
|
||||
<span>{{item.name}}</span><text style="margin-left: 20rpx;">{{item.phone}}</text>
|
||||
</view>
|
||||
<view class="" style="display: flex;">
|
||||
|
||||
<view style="width:150rpx;"> 申请时间:</view>
|
||||
<span>{{item.create_time}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="" style="padding-top: 1px;" v-if='datalist.length==0'>
|
||||
<emptyPage title="暂无申请信息"></emptyPage>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import emptyPage from '@/components/emptyPage.vue';
|
||||
import {
|
||||
intention
|
||||
} from "@/api/product"
|
||||
export default {
|
||||
components: {
|
||||
emptyPage
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
datalist: [],
|
||||
where: {
|
||||
type: 2,
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.list()
|
||||
},
|
||||
methods: {
|
||||
list() {
|
||||
intention(this.where).then(res => {
|
||||
this.datalist = res.data.list
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.content {
|
||||
padding: 12rpx 12rpx;
|
||||
}
|
||||
|
||||
.content_con {
|
||||
padding: 42rpx 32rpx;
|
||||
height: 294rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 21rpx 21rpx;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
||||
.content_title {
|
||||
display: flex;
|
||||
margin-bottom: 70rpx;
|
||||
|
||||
}
|
||||
.content_title_a {
|
||||
width: 89rpx;
|
||||
height: 37rpx;
|
||||
line-height: 37rpx;
|
||||
text-align: center;
|
||||
background: #16C295;
|
||||
font-size: 23rpx;
|
||||
font-family: DingTalk JinBuTi-Regular, DingTalk JinBuTi;
|
||||
font-weight: 400;
|
||||
color: #FFFFFF;
|
||||
border-radius: 15rpx 0 15rpx 0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
.content_title_b {
|
||||
width: 89rpx;
|
||||
height: 37rpx;
|
||||
line-height: 37rpx;
|
||||
text-align: center;
|
||||
background: #3274F9;
|
||||
font-size: 23rpx;
|
||||
font-family: DingTalk JinBuTi-Regular, DingTalk JinBuTi;
|
||||
font-weight: 400;
|
||||
color: #FFFFFF;
|
||||
border-radius: 15rpx 0 15rpx 0;
|
||||
|
||||
}
|
||||
|
||||
.content_title_c {
|
||||
width: 89rpx;
|
||||
height: 37rpx;
|
||||
line-height: 37rpx;
|
||||
text-align: center;
|
||||
background: #ff0000;
|
||||
font-size: 23rpx;
|
||||
font-family: DingTalk JinBuTi-Regular, DingTalk JinBuTi;
|
||||
font-weight: 400;
|
||||
color: #FFFFFF;
|
||||
border-radius: 15rpx 0 15rpx 0;
|
||||
|
||||
}
|
||||
|
||||
.content_title_d {
|
||||
font-size: 33rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
margin-left: 20rpx;
|
||||
margin-top: -7rpx;
|
||||
|
||||
}
|
||||
|
||||
.content_detail {
|
||||
|
||||
font-size: 30rpx;
|
||||
font-family: PingFang SC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
|
||||
view {
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</style>
|
@ -1,241 +0,0 @@
|
||||
<template>
|
||||
<view v-if="!successful" class="content">
|
||||
|
||||
<view class="content-detail">
|
||||
<view class="content-title">
|
||||
<view class="content-title-a">
|
||||
交易申请协议
|
||||
</view>
|
||||
<view class="content-title-b" @click="navation">
|
||||
申请记录
|
||||
</view>
|
||||
</view>
|
||||
<view class="">
|
||||
|
||||
<view v-html="detail.business_apply_agree">
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="content-bottom" v-if="type==0">
|
||||
<view class="bottombtn_no" @click="noagree">拒绝</view>
|
||||
<view class="bottom_agree" @click="agree">同意</view>
|
||||
</view>
|
||||
<view class="content-bottom" v-if="type==1||type==3">
|
||||
<view class="bottom_agree" @click="agree">重新申请</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="settledSuccessMain" v-else>
|
||||
<view class="settledSuccessful">
|
||||
|
||||
<image class="image" src="@/pages/store/static/images/settledSuccessful.svg">
|
||||
<view class="title">恭喜,您的资料提交成功!</view>
|
||||
<view class="info">预计15个工作日内审核完毕,平台客服会及时与您联系!</view>
|
||||
<view class="goHome" hover-class="none" @click="goHome">
|
||||
返回首页
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
business,
|
||||
intentionbus
|
||||
} from "@/api/product"
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
detail: {},
|
||||
type: 0,
|
||||
successful: false
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.type = e.business_status
|
||||
|
||||
this.list()
|
||||
},
|
||||
methods: {
|
||||
//获取协议内容
|
||||
list() {
|
||||
business().then(res => {
|
||||
this.detail = res.data
|
||||
})
|
||||
},
|
||||
|
||||
// 首页
|
||||
goHome() {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
});
|
||||
},
|
||||
//跳转
|
||||
navation() {
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/product/transactionApplication/application'
|
||||
})
|
||||
},
|
||||
//拒绝申请
|
||||
noagree() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/moreProject/moreProject'
|
||||
})
|
||||
|
||||
},
|
||||
//同意申请
|
||||
agree() {
|
||||
intentionbus().then(res => {
|
||||
if (res.status == 200) {
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success',
|
||||
})
|
||||
this.successful=true
|
||||
|
||||
}
|
||||
|
||||
|
||||
}).catch((err) => {
|
||||
|
||||
this.$util.Tips({
|
||||
title: err,
|
||||
icon: 'error',
|
||||
})
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.content {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.content-detail {
|
||||
padding: 20rpx 20rpx;
|
||||
color: #333333;
|
||||
font-size: 28rpx;
|
||||
margin-bottom: 155rpx;
|
||||
|
||||
.content-title {
|
||||
color: #333333;
|
||||
font-size: 32rpx;
|
||||
text-align: center;
|
||||
margin-top: 40rpx;
|
||||
margin-bottom: 40rpx;
|
||||
|
||||
.content-title-b {
|
||||
width: 165rpx;
|
||||
height: 70rpx;
|
||||
font-size: 26rpx;
|
||||
font-family: PingFang SC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
line-height: 70rpx;
|
||||
background: linear-gradient(90deg, #F84221 0%, #FF6D20 100%);
|
||||
box-shadow: 0px 4rpx 11rpx 2rpx rgba(252, 89, 32, 0.49);
|
||||
border-radius: 37rpx 0px 0px 37rpx;
|
||||
opacity: 1;
|
||||
position: absolute;
|
||||
top: 40rpx;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content-bottom {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
bottom: 0;
|
||||
position: fixed;
|
||||
height: 175rpx;
|
||||
background: #FFFFFF;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
|
||||
|
||||
.bottombtn_no {
|
||||
margin-top: 42rpx;
|
||||
width: 249rpx;
|
||||
height: 84rpx;
|
||||
text-align: center;
|
||||
line-height: 84rpx;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
border: 2rpx solid #B3B3B3;
|
||||
font-size: 33rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #737373;
|
||||
|
||||
}
|
||||
|
||||
.bottom_agree {
|
||||
margin-top: 42rpx;
|
||||
width: 249rpx;
|
||||
height: 84rpx;
|
||||
text-align: center;
|
||||
line-height: 84rpx;
|
||||
background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
|
||||
font-size: 33rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
}
|
||||
.settledSuccessMain {
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.settledSuccessful {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
padding: 0 56px;
|
||||
height: auto;
|
||||
background: #fff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.settledSuccessful .image {
|
||||
width: 189px;
|
||||
height: 157px;
|
||||
margin-top: 66px;
|
||||
}
|
||||
|
||||
.settledSuccessful .title {
|
||||
color: #333333;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-top: 35px;
|
||||
}
|
||||
|
||||
.settledSuccessful .info {
|
||||
color: #A0A0A0;
|
||||
font-size: 13px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.settledSuccessful .goHome {
|
||||
margin: 60px auto 0;
|
||||
line-height: 43px;
|
||||
color: #282828;
|
||||
font-size: 15px;
|
||||
border: 1px solid #B4B4B4;
|
||||
border-radius: 60px;
|
||||
}
|
||||
</style>
|
@ -194,9 +194,10 @@
|
||||
<view class="settlementAgreement" v-if="isshow">
|
||||
<view class="setAgCount">
|
||||
<i class="icon iconfont icon-cha" @click="recuo"></i>
|
||||
<div class="title">商户入驻协议</div>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
|
||||
<view class="contenta">
|
||||
<jyf-parser :html="detail.sys_intention_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
|
||||
</view>
|
||||
<view class="setAgCountbtn">
|
||||
@ -343,7 +344,7 @@
|
||||
},
|
||||
mer_i_id: null, // 商户申请id
|
||||
isType: false,
|
||||
num: 30,
|
||||
num: 15,
|
||||
detail: {}
|
||||
};
|
||||
},
|
||||
@ -380,7 +381,7 @@
|
||||
//关闭弹窗
|
||||
recuo() {
|
||||
if (this.num > 0) {
|
||||
this.num = 30
|
||||
this.num = 15
|
||||
this.isshow = false
|
||||
} else {
|
||||
this.num = 0
|
||||
@ -409,7 +410,7 @@
|
||||
return
|
||||
}
|
||||
if (this.isshow == false && this.num > 0) {
|
||||
this.num = 30
|
||||
this.num = 15
|
||||
return
|
||||
}
|
||||
this.countDown();
|
||||
@ -420,7 +421,7 @@
|
||||
|
||||
//获取商户入驻申请协议
|
||||
shoplist() {
|
||||
agreeiness().then(res => {
|
||||
agreeiness({type:'mer_services_agree'}).then(res => {
|
||||
// console.log(res)
|
||||
this.detail = res.data
|
||||
})
|
||||
|
@ -2,9 +2,9 @@
|
||||
const version = '2.0.36'
|
||||
|
||||
// 开发环境才提示,生产环境不会提示
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
if (process.env.NODE_ENV == 'development') {
|
||||
// console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
|
||||
console.log('当前属于测试环境')
|
||||
console.log(process.env.NODE_ENV,'当前属于开发环境')
|
||||
}
|
||||
|
||||
export default {
|
||||
|
Loading…
x
Reference in New Issue
Block a user