更新
This commit is contained in:
zmj
parent
b728bf6a4f
commit
e6e328dfd5
@ -318,3 +318,9 @@ export function qrcode(data) {
|
||||
export function merchantRecord(data) {
|
||||
return request.get(`merchantRecord`, data);
|
||||
}
|
||||
|
||||
|
||||
// 生成二维码
|
||||
export function mer_services_agree() {
|
||||
return request.get(`agreement/mer_services_agree`);
|
||||
}
|
||||
@ -70,7 +70,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx' } " -->
|
||||
<view class="card-content" :style="{height:isOpen[0]?'0':domHeight[0],padding: isOpen[0]?'0':'20rpx' } "
|
||||
<view class="card-content" :style="{height:isOpen[0]?'0':'auto',padding: isOpen[0]?'0':'20rpx' } "
|
||||
style="height: 0;padding: 0;">
|
||||
<view id="formheight1">
|
||||
<view class="form-tit">
|
||||
@ -160,7 +160,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card-content" :style="{height:isOpen[1]?'0':domHeight[1],padding: isOpen[1]?'0':'20rpx' } "
|
||||
<view class="card-content" :style="{height:isOpen[1]?'0':'auto',padding: isOpen[1]?'0':'20rpx' } "
|
||||
style="height: 0;padding: 0;">
|
||||
<view id="formheight2">
|
||||
<view class="form-tit">
|
||||
@ -275,7 +275,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card-content" :style="{height:isOpen[2]?'0':domHeight[2],padding: isOpen[2]?'0':'20rpx' } "
|
||||
<view class="card-content" :style="{height:isOpen[2]?'0':'auto',padding: isOpen[2]?'0':'20rpx' } "
|
||||
style="height: 0;padding: 0;">
|
||||
<view id='formheight3'>
|
||||
<view class="form-tit">
|
||||
@ -463,7 +463,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card-content" :style="{height:isOpen[3]?'0':domHeight[3],padding: isOpen[3]?'0':'20rpx' } "
|
||||
<view class="card-content" :style="{height:isOpen[3]?'0':'auto',padding: isOpen[3]?'0':'20rpx' } "
|
||||
style="height: 0;padding: 0;">
|
||||
<view id='formheight4'>
|
||||
<view class="form-tit">
|
||||
@ -553,7 +553,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card-content" :style="{height:isOpen[4]?'0':domHeight[4],padding: isOpen[4]?'0':'20rpx' } "
|
||||
<view class="card-content" :style="{height:isOpen[4]?'0':'auto',padding: isOpen[4]?'0':'20rpx' } "
|
||||
style="height: 0;padding: 0;">
|
||||
<view id='formheight5'>
|
||||
<view class="form-tit">
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
<form report-submit='true'>
|
||||
<view class='merchantsSettled'>
|
||||
<view class="merchantBgCount">
|
||||
<image mode="widthFix" class="merchantBg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png"
|
||||
alt="">
|
||||
<image mode="widthFix" class="merchantBg"
|
||||
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png" alt="">
|
||||
</view>
|
||||
<view class="application-record" @click="jumpToList" v-if="!mer_i_id">
|
||||
申请记录
|
||||
@ -36,9 +36,8 @@
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">姓名</text>
|
||||
<input type="text" maxlength="30" placeholder="请输入姓名"
|
||||
v-model="merchantData.user_name" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
<input type="text" maxlength="30" placeholder="请输入姓名" v-model="merchantData.user_name"
|
||||
@input="validateBtn" placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -121,7 +120,8 @@
|
||||
<view v-if="business_license" class='pictrue' @click='uploadpicText'>
|
||||
<image :src='business_license'></image>
|
||||
</view>
|
||||
<view v-else class='pictrue acea-row row-center-wrapper row-column' @click='uploadpicText'>
|
||||
<view v-else class='pictrue acea-row row-center-wrapper row-column'
|
||||
@click='uploadpicText'>
|
||||
<text class='iconfont icon-icon25201'></text>
|
||||
<view>上传图片</view>
|
||||
</view>
|
||||
@ -134,7 +134,14 @@
|
||||
</checkbox-group>
|
||||
<button class="settleAgree" @click="getConfig">《入驻协议》</button>
|
||||
</view> -->
|
||||
<view class="item no-border">
|
||||
<checkbox-group @change='ChangeIsAgree'>
|
||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
|
||||
</checkbox-group>
|
||||
<button class="settleAgree" @click="getConfig(0)">《入驻协议》 </button>
|
||||
<button class="settleAgree" @click="getConfig(1)">《商户服务协议》 </button>
|
||||
|
||||
</view>
|
||||
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
|
||||
提交申请
|
||||
</button>
|
||||
@ -144,7 +151,8 @@
|
||||
<view class="settlementAgreement" v-if="showProtocol">
|
||||
<view class="setAgCount" style="width: 656rpx;height: 458px;">
|
||||
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
|
||||
<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
|
||||
<div class="title" v-if='titFlag'>{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
|
||||
<div class="title" v-else></div>
|
||||
<view class="content">
|
||||
<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
<!-- <view v-html="protocol"></view> -->
|
||||
@ -178,7 +186,8 @@
|
||||
<!-- <button class="setAgCountbtna" @click="refuse">
|
||||
拒绝
|
||||
</button> -->
|
||||
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0" @click="agree">
|
||||
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
|
||||
@click="agree">
|
||||
<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
|
||||
<text v-else>同意本协议</text>
|
||||
</button>
|
||||
@ -252,7 +261,12 @@
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
import { Toast } from '../../../libs/uniApi';
|
||||
import {
|
||||
Toast
|
||||
} from '../../../libs/uniApi';
|
||||
import {
|
||||
mer_services_agree
|
||||
} from "@/api/activity.js"
|
||||
const app = getApp();
|
||||
export default {
|
||||
components: {
|
||||
@ -262,6 +276,7 @@ import { Toast } from '../../../libs/uniApi';
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
titFlag: true,
|
||||
company: '',
|
||||
organization_code: '',
|
||||
domain: HTTP_REQUEST_URL,
|
||||
@ -365,8 +380,7 @@ import { Toast } from '../../../libs/uniApi';
|
||||
this.$nextTick(function() {
|
||||
this.getGoodsDetails(options.mer_i_id)
|
||||
})
|
||||
}
|
||||
else this.getArea()
|
||||
} else this.getArea()
|
||||
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
|
||||
},
|
||||
onShow() {
|
||||
@ -493,16 +507,27 @@ import { Toast } from '../../../libs/uniApi';
|
||||
this.index2[2] = e.detail.value
|
||||
}
|
||||
},
|
||||
getConfig() {
|
||||
getConfig(type) {
|
||||
this.isType = false;
|
||||
this.showProtocol = true;
|
||||
// 获取配置
|
||||
|
||||
if (type == 0) {
|
||||
this.titFlag = true
|
||||
this.protocol = this.sys_intention_agree
|
||||
} else {
|
||||
this.titFlag = false
|
||||
mer_services_agree().then(res => {
|
||||
this.protocol = res.data.mer_services_agree
|
||||
})
|
||||
}
|
||||
// 获取配置
|
||||
// this.protocol = this.sys_intention_agree
|
||||
},
|
||||
/*获取发票说明*/
|
||||
getAgreement() {
|
||||
let that = this
|
||||
that.showProtocol = true;
|
||||
that.titFlag = true
|
||||
that.isType = true
|
||||
getAgreementApi('sys_merchant_type').then(res => {
|
||||
that.protocol = res.data.sys_merchant_type
|
||||
@ -1503,7 +1528,8 @@ import { Toast } from '../../../libs/uniApi';
|
||||
width: 100vw;
|
||||
height: 100%;
|
||||
border-radius: 40rpx 40rpx 0 0;
|
||||
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
|
||||
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
|
||||
/* 在上边框添加阴影 */
|
||||
}
|
||||
|
||||
.btn {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user