界面优化
This commit is contained in:
jia
parent
cbbaec5448
commit
24acc9eefd
@ -15,18 +15,18 @@ const env = 'dev'; // 开发
|
||||
switch (env) {
|
||||
case 'prod':
|
||||
httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
httpApiTwo = 'https://nk.lihaink.cn'
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiTwo = 'https://nk.lihaink.cn'
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
break;
|
||||
case 'prew':
|
||||
httpApi = 'https://test.shop.lihaink.cn' //预发布环境
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
break;
|
||||
default:
|
||||
httpApi = "https://crmeb-test.shop.lihaink.cn" // 生产
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
}
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ switch (env) {
|
||||
// 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"
|
||||
@ -48,7 +48,7 @@ switch (env) {
|
||||
// // httpApiTwo = "baseUrl" // h5跨域配置
|
||||
// httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
|
||||
// // httpApiThree = 'baseUrlTest' // h5跨域配置
|
||||
|
||||
|
||||
// // #endif
|
||||
// } else if (process.env.NODE_ENV === 'production') {
|
||||
// httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
|
||||
@ -124,7 +124,7 @@
|
||||
}, {
|
||||
"path": "pages/moreProject/moreProject",
|
||||
"style": {
|
||||
"navigationBarTitleText": "更多功能",
|
||||
"navigationBarTitleText": "商户平台",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png">
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
@ -302,8 +302,8 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png">
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
@ -374,7 +374,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png">
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
@ -411,7 +411,11 @@
|
||||
</view>
|
||||
<view class="settlementAgreement" v-if="isFshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100%;">
|
||||
<i class="icon iconfont icon-cha" @click="recuo"></i>
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
|
||||
@click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
|
||||
</view>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||
<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
|
||||
@ -424,7 +428,6 @@
|
||||
拒绝
|
||||
</button>
|
||||
|
||||
|
||||
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
|
||||
<text v-if="num>0">请仔细阅读协议{{num}}S</text>
|
||||
<text v-else>同意</text>
|
||||
@ -439,8 +442,9 @@
|
||||
<view class="userpage-icon" @click="close">
|
||||
<image src="@/static/images/close.png" mode=""></image>
|
||||
</view>
|
||||
<form report-submit='true'>
|
||||
<view class='merchantsSettled'>
|
||||
|
||||
<form report-submit='true' style="height: 90%;">
|
||||
<view class='merchantsSettled' :style="{'height':Fheight}">
|
||||
<view class="title">填写信息</view>
|
||||
<view class='list'>
|
||||
<view class="item">
|
||||
@ -566,7 +570,7 @@
|
||||
data() {
|
||||
return {
|
||||
company: '',
|
||||
organization_code:'',
|
||||
organization_code: '',
|
||||
locationArr: ({}),
|
||||
emptyText: '暂无可用应用',
|
||||
jurisdiction: false, // 是否有权限
|
||||
@ -601,6 +605,7 @@
|
||||
cardno_front: '',
|
||||
cardno_back: ''
|
||||
},
|
||||
Fheight:0,
|
||||
|
||||
};
|
||||
},
|
||||
@ -608,7 +613,10 @@
|
||||
...mapGetters(['userInfo', 'isLogin'])
|
||||
},
|
||||
created() {},
|
||||
onLoad() {},
|
||||
onLoad() {
|
||||
this.Fheight = uni.getSystemInfoSync().windowHeight+'px';
|
||||
console.log(this.Fheight)
|
||||
},
|
||||
onShow() {
|
||||
if (this.isLogin) {
|
||||
this.emptyText = '暂无可用应用'
|
||||
@ -620,8 +628,6 @@
|
||||
this.getUserInfo()
|
||||
this.codelist()
|
||||
this.list()
|
||||
|
||||
|
||||
},
|
||||
|
||||
|
||||
@ -639,7 +645,7 @@
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
|
||||
//提交
|
||||
formSubmit: function(e) {
|
||||
let that = this;
|
||||
@ -838,10 +844,17 @@
|
||||
}
|
||||
|
||||
},
|
||||
//保证金缴纳
|
||||
margin(url) {
|
||||
uni.navigateTo({
|
||||
url: url+`?mer_id=` + this.mer_id
|
||||
})
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
||||
this.isFshow = true
|
||||
this.countDown()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: url + `?mer_id=` + this.mer_id
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
//商户设置
|
||||
buyserset() {
|
||||
@ -864,20 +877,20 @@
|
||||
getUserInfo().then(res => {
|
||||
this.userInfoData = res.data;
|
||||
this.merchantData.phone = res.data.phone
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
}).then((res) => {
|
||||
if(res.code==0){
|
||||
this.$util.Tips({
|
||||
title: res.msg
|
||||
});
|
||||
return false;
|
||||
}
|
||||
this.company=res.data.title
|
||||
this.organization_code=res.data.organization_code
|
||||
}).catch(res=>{
|
||||
console.log(res)
|
||||
})
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
}).then((res) => {
|
||||
if (res.code == 0) {
|
||||
this.$util.Tips({
|
||||
title: res.msg
|
||||
});
|
||||
return false;
|
||||
}
|
||||
this.company = res.data.title
|
||||
this.organization_code = res.data.organization_code
|
||||
}).catch(res => {
|
||||
console.log(res)
|
||||
})
|
||||
if (res.data.service == null) {
|
||||
// console.log('123');
|
||||
this.isShow = false
|
||||
@ -892,7 +905,7 @@
|
||||
// console.log(that.userInfoData);
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
//获取协议内容
|
||||
list() {
|
||||
business({
|
||||
@ -912,8 +925,8 @@
|
||||
|
||||
.userpage {
|
||||
width: 100%;
|
||||
height: 1368rpx;
|
||||
padding-top: 150rpx;
|
||||
|
||||
|
||||
background-color: #fff;
|
||||
position: relative;
|
||||
}
|
||||
@ -922,7 +935,7 @@
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
position: absolute;
|
||||
top: 60rpx;
|
||||
top: 65rpx;
|
||||
right: 60rpx;
|
||||
|
||||
image {
|
||||
@ -936,7 +949,8 @@
|
||||
}
|
||||
|
||||
.merchantsSettled {
|
||||
height: 1368rpx;
|
||||
height: 100%;
|
||||
padding-top: 80rpx;
|
||||
}
|
||||
|
||||
.merchantsSettled .title {
|
||||
@ -949,12 +963,8 @@
|
||||
.merchantsSettled .list {
|
||||
background-color: #fff;
|
||||
border-radius: 12px;
|
||||
|
||||
margin: 0 15px;
|
||||
position: absolute;
|
||||
|
||||
width: calc(100% - 30px);
|
||||
|
||||
}
|
||||
|
||||
.application-record {
|
||||
@ -973,7 +983,6 @@
|
||||
.item-card {
|
||||
display: flex;
|
||||
margin-top: 20rpx;
|
||||
|
||||
.item-carda {
|
||||
width: 298rpx;
|
||||
height: 175rpx;
|
||||
@ -1129,6 +1138,7 @@
|
||||
width: 588rpx;
|
||||
margin: 0 auto;
|
||||
height: 86rpx;
|
||||
|
||||
border-radius: 25px;
|
||||
text-align: center;
|
||||
line-height: 86rpx;
|
||||
@ -1199,27 +1209,15 @@
|
||||
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: 1050rpx;
|
||||
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;
|
||||
|
||||
height: 1050rpx;
|
||||
height: 75%;
|
||||
|
||||
overflow-y: scroll;
|
||||
|
||||
|
||||
@ -182,7 +182,7 @@
|
||||
</view>
|
||||
</form>
|
||||
<view class="settlementAgreement" v-if="showProtocol">
|
||||
<view class="setAgCount">
|
||||
<view class="setAgCount" style="width: 656rpx;height: 458px;">
|
||||
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
|
||||
<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
|
||||
<view class="content">
|
||||
@ -194,6 +194,10 @@
|
||||
<view class="settlementAgreement" v-if="isshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100%;">
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx" @click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
|
||||
</view>
|
||||
|
||||
<div class="title">{{detail.title}}</div>
|
||||
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||
<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
|
||||
@ -1303,25 +1307,25 @@
|
||||
}
|
||||
|
||||
.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;
|
||||
height: 1000rpx;
|
||||
height: 75%;
|
||||
overflow-y: scroll;
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 5.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.0 KiB |
@ -27,7 +27,7 @@ function baseRequest(url, method, data, {
|
||||
noVerify = false
|
||||
}) {
|
||||
|
||||
let Url = 'https://preview-worker-task.lihaink.cn',
|
||||
let Url = 'https://ceshi-worker-task.lihaink.cn',
|
||||
header = HEADER;
|
||||
|
||||
|
||||
@ -38,13 +38,13 @@ function baseRequest(url, method, data, {
|
||||
uni.request({
|
||||
url: Url + '/api/' + url,
|
||||
method: method || 'GET',
|
||||
// header: header,
|
||||
header: header,
|
||||
data: data || {},
|
||||
success: (res) => {
|
||||
// #ifdef APP-PLUS
|
||||
// console.log('app', Url + '/api/' + url, res.data);
|
||||
// #endif
|
||||
console.log(res.data.code)
|
||||
|
||||
if (noVerify)
|
||||
reslove(res.data, res);
|
||||
else if (res.data.status == 200)
|
||||
@ -58,7 +58,7 @@ function baseRequest(url, method, data, {
|
||||
})
|
||||
reject(res.data);
|
||||
} else if (res.statusCode==200) {
|
||||
console.log(res)
|
||||
|
||||
reslove(res.data,res.data);
|
||||
} else
|
||||
reject(res.data.message || '系统错误');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user