mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

界面UI修改 店铺

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-16 13:49:31 +08:00
parent 0714b75756
commit c8fe8ac933
5 changed files with 606 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

438
pages/order_details/index.vue
View File

File diff suppressed because it is too large Load Diff

12
pages/store/home/index.vue
View File

@ -142,14 +142,14 @@
<text class="sale_num">已销 {{item.sales}}{{item.sales>0?'+':''}}</text> <text class="sale_num">已销 {{item.sales}}{{item.sales>0?'+':''}}</text>
</view> </view>
<view class="tag"> <!-- 标签 -->
<view class="tag-item">24H发货</view> <view class="tag" v-if="item.mer_label_name && item.mer_label_name.length > 0">
<view class="tag-item" v-for="(ii,indx) in item.mer_label_name">{{ii}}</view>
</view> </view>
<view class="shop-detail"> <!-- 规格产地 -->
<text class="brand">品牌:123123</text> <view class="shop-detail" v-if="item.store_info">
<text class="unit">规格:{{item.unit_name}}</text> {{item.store_info}}
<!-- <text class="addr">产地:{{item}}</text> -->
</view> </view>
<view class="price"> <view class="price">

282
pages/store/settled/index.vue
View File

@ -1,30 +1,43 @@
<template> <template>
<view class="page"> <view class="page" :style="{'height':successful?'100vh':''}">
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
<view class="conten-top" :style="'height:'+statusBarHeight+'px'" :class="{'bar-top-bg':barBg}"
<view class="conten-top" :style="'height:'+statusBarHeight+'px'"> v-if="!successful">
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i <view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view> class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff;"></i></view>
<view class="" <view class=""
style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;"> style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:#fff;font-size: 32rpx;font-weight: bold;">
商家入驻 商家入驻
</view> </view>
</view> </view>
<view :style="'height:'+statusBarHeight+'px'"></view> <!-- #endif -->
<!-- #ifdef H5 -->
<view class="header" v-if="!successful">
<view class="title-bar" :class="{'bar-top-bg':barBg}">
<view class="title-bar-icon" @click="logout">
<i class="iconfont icon-xiangzuo"></i>
</view>
<view class="title-bar-txt">
商家入驻
</view>
</view>
</view>
<!-- #endif --> <!-- #endif -->
<view v-if="!successful" :style="viewColor"> <view v-if="!successful" :style="viewColor">
<form report-submit='true'> <form report-submit='true'>
<view class='merchantsSettled'> <view class='merchantsSettled'>
<view class="merchantBgCount"> <view class="merchantBgCount">
<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'" <image mode="widthFix" class="merchantBg"
alt=""> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7d0f8202403160938542943.webp" alt="">
</view> </view>
<view class="application-record" @click="jumpToList" v-if="!mer_i_id"> <view class="application-record" @click="jumpToList" v-if="!mer_i_id">
申请记录 申请记录
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<view class='list'> <view class='list'>
<view class="list-title">商家入驻</view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">商户名称</text> <text class="item-name">商户名称</text>
@ -45,11 +58,6 @@
v-model="mer_classification"> v-model="mer_classification">
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
</picker> </picker>
<!-- <picker @change="bindPickerChange" @columnchange="columnchange" mode="multiSelector" :value="index" :range="[array, bindPickerChangeidx]" range-key="cate_name">
<input placeholder="请选择商户分类" type="text" readonly disabled
v-model="mer_classification">
<view class='iconfont icon-jiantou'></view>
</picker> -->
</view> </view>
</view> </view>
</view> </view>
@ -81,10 +89,9 @@
:range="business" range-key="name" @columnchange="pickerColumnchange"> :range="business" range-key="name" @columnchange="pickerColumnchange">
<view class="businessBox" <view class="businessBox"
:style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}" :style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 16px;"> style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;">
{{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}} {{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}}
</view> </view>
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
</picker> </picker>
</view> </view>
@ -293,11 +300,9 @@
</view> </view>
<view class="settlementAgreement" v-if="isshow"> <view class="settlementAgreement" v-if="isshow">
<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;"> <view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx" <view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
@click="recuo"> @click="recuo">
<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i> <i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
<!-- <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image> -->
</view> </view>
<div class="title">{{detail.title}}</div> <div class="title">{{detail.title}}</div>
@ -310,7 +315,6 @@
</view> </view>
<view class="contenta" v-else> <view class="contenta" v-else>
<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
</view> </view>
<view class="setAgCountbtn"> <view class="setAgCountbtn">
@ -482,7 +486,8 @@
page: 1, page: 1,
limit: 10 limit: 10
}, },
codenote: [] codenote: [],
barBg: false, //导航栏背景
}; };
}, },
beforeDestroy() { beforeDestroy() {
@ -492,6 +497,13 @@
sys_intention_agree: '' sys_intention_agree: ''
}, mapGetters(['isLogin', 'viewColor', 'keyColor'])), }, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
onPageScroll(e) {
if (e.scrollTop > 50) {
this.barBg = true;
} else {
this.barBg = false;
}
},
onLoad(options) { onLoad(options) {
if (this.isLogin) { if (this.isLogin) {
this.getClassfication(); this.getClassfication();
@ -684,7 +696,6 @@
this.city_id = resData.city_id; this.city_id = resData.city_id;
this.area_id = resData.area_id this.area_id = resData.area_id
this.street_id = resData.street_id this.street_id = resData.street_id
// this.mer_storeType = resData.mer_storeType
this.village_id = resData.village_id; this.village_id = resData.village_id;
const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : ''; const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
@ -833,10 +844,8 @@
again() { again() {
this.getcaptcha() this.getcaptcha()
}, },
/**
* 上传文件 // 上传文件
*
*/
uploadpic: function() { uploadpic: function() {
let that = this; let that = this;
that.$util.uploadImageOne('upload/image', function(res) { that.$util.uploadImageOne('upload/image', function(res) {
@ -844,16 +853,15 @@
that.$set(that, 'pics', that.pics); that.$set(that, 'pics', that.pics);
}); });
}, },
uploadpicBack: function() { uploadpicBack: function() {
let that = this; let that = this;
that.$util.uploadImageOne('upload/image', function(res) { that.$util.uploadImageOne('upload/image', function(res) {
that.bank_front = res.data.path; that.bank_front = res.data.path;
}); });
}, },
/**
* 上传图片识别文字 // 上传图片识别文字
*
*/
uploadpicText: function() { uploadpicText: function() {
let that = this; let that = this;
that.$util.uploadImageOne('upload/image', function(res) { that.$util.uploadImageOne('upload/image', function(res) {
@ -876,16 +884,15 @@
}) })
}); });
}, },
/**
* 删除图片 // 删除图片
*
*/
DelPic: function(index) { DelPic: function(index) {
let that = this, let that = this,
pic = this.pics[index]; pic = this.pics[index];
that.pics.splice(index, 1); that.pics.splice(index, 1);
that.$set(that, 'pics', that.pics); that.$set(that, 'pics', that.pics);
}, },
getCode() { getCode() {
let that = this let that = this
getCodeApi().then(res => { getCodeApi().then(res => {
@ -896,6 +903,7 @@
}); });
}); });
}, },
async code(data) { async code(data) {
let that = this; let that = this;
if (!that.merchantData.phone) return that.$util.Tips({ if (!that.merchantData.phone) return that.$util.Tips({
@ -905,27 +913,22 @@
title: '请输入正确的手机号码' title: '请输入正确的手机号码'
}); });
await verify({ await verify({
phone: that.merchantData.phone, phone: that.merchantData.phone,
// key: that.codeKey, // key: that.codeKey,
// code: that.codeVal, // code: that.codeVal,
type: 'intention', type: 'intention',
captchaType: 'blockPuzzle', captchaType: 'blockPuzzle',
captchaVerification: data.captchaVerification captchaVerification: data.captchaVerification
}) }).then(res => {
.then(res => { that.$util.Tips({
that.$util.Tips({ title: res.msg
title: res.msg
});
that.sendCode();
})
.catch(res => {
that.$util.Tips({
title: res
});
if (res.status == 402) {
// that.getcaptcha();
}
}); });
that.sendCode();
}).catch(res => {
that.$util.Tips({
title: res
});
});
}, },
getcaptcha() { getcaptcha() {
@ -1053,72 +1056,6 @@
} }
} }
} }
// let that = this;
// if (that.validateForm() && that.validate) {
// if (this.num == 0) {
// let requestData = {
// phone: that.merchantData.phone,
// mer_name: that.merchantData.enterprise_name,
// name: that.merchantData.user_name,
// code: that.merchantData.yanzhengma,
// company_name: that.merchantData.company_name,
// address: that.merchantData.address,
// social_credit_code: that.merchantData.social_credit_code,
// merchant_category_id: that.merchantData.classification,
// mer_type_id: that.merchantData.mer_type,
// mer_storeType: this.mer_storeType,
// area_id: this.area_id,
// street_id: this.street_id,
// village_id: this.village_id,
// is_nmsc: this.isnum,
// images: that.pics
// }
// that.validate = false;
// if (that.mer_i_id) {
// updateGoodsRecord(that.mer_i_id, requestData).then(res => {
// if (res.status == 200) {
// title: '提交成功',
// that.loading = true;
// that.timer = setTimeout(() => {
// that.successful = true;
// that.validate = true;
// }, 1000)
// }
// }).catch(res => {
// this.isshow = false
// that.validate = true;
// that.$util.Tips({
// title: res
// });
// })
// } else {
// create(requestData).then(data => {
// if (data.status == 200) {
// title: '提交成功',
// that.loading = true;
// this.timer = setTimeout(() => {
// that.successful = true;
// that.validate = true;
// }, 1000)
// }
// }).catch(res => {
// that.validate = true;
// that.$util.Tips({
// title: res
// });
// })
// }
// } else {
// this.isshow = true
// this.countDown()
// }
// }
}, },
validateBtn: function() { validateBtn: function() {
let that = this, let that = this,
@ -1182,17 +1119,45 @@
if (!that.isAgree) return that.$util.Tips({ if (!that.isAgree) return that.$util.Tips({
title: '请勾选并同意入驻协议' title: '请勾选并同意入驻协议'
}); });
if (that.isShowCode && !that.codeVal) return that.$util.Tips({ if (that.isShowCode && !that.codeVal) return that.$util.Tips({
title: '请填写图片验证码' title: '请填写图片验证码'
}); });
if (!that.business_license) return that.$util.Tips({ if (!that.business_license) return that.$util.Tips({
title: '请上传营业执照' title: '请上传营业执照'
}); });
// if (that.pics.length == 0) return that.$util.Tips({
// title: '请上传一张或者多张图片'
// });
if (this.nature_business == 1 && !this.merchantData.bank_code) {
return that.$util.Tips({
title: '请输入对公账号'
});
}
if (this.nature_business != 1 && !this.merchantData.bank_code) {
return that.$util.Tips({
title: '请输入银行卡号'
});
}
if (!this.merchantData.bank_username) {
return that.$util.Tips({
title: '请输入开户银行'
});
}
if (!this.merchantData.bank_opening) {
return that.$util.Tips({
title: '请输入开户网点'
});
}
if (this.nature_business == 0 && !this.merchantData.bank_card_username) {
return that.$util.Tips({
title: '请输入持卡人姓名'
});
}
that.validate = true; that.validate = true;
return true; return true;
}, },
@ -1223,6 +1188,46 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.page {
width: 750rpx;
height: 2400rpx;
background: linear-gradient(180deg, #44AF38 0%, #72BE53 100%);
}
.header {
// height: 440rpx;
width: 100%;
text-align: center;
background-color: transparent;
// background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96ec1202403151608564555.webp);
background-position: center;
.title-bar {
position: fixed;
top: 0;
height: 88rpx;
line-height: 88rpx;
width: 100%;
z-index: 11;
.title-bar-icon {
position: absolute;
left: 30rpx;
.icon-xiangzuo {
font-size: 40rpx;
text-align: left;
color: #fff;
}
}
.title-bar-txt {
text-align: center;
color: #fff;
}
}
}
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked, /deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked { /deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important; border: 1px solid var(--view-theme) !important;
@ -1234,7 +1239,7 @@
.conten-top { .conten-top {
width: 100%; width: 100%;
text-align: center; text-align: center;
background-color: #fff; background-color: transparent;
position: absolute; position: absolute;
top: 0; top: 0;
position: fixed; position: fixed;
@ -1245,6 +1250,10 @@
color: #B2B2B2; color: #B2B2B2;
} }
.bar-top-bg {
background-color: #46CC4B;
}
.item-name { .item-name {
width: 190rpx; width: 190rpx;
} }
@ -1286,16 +1295,38 @@
padding: 22px 0; padding: 22px 0;
margin: 0 15px; margin: 0 15px;
position: absolute; position: absolute;
top: 300rpx; top: 400rpx;
width: calc(100% - 30px); width: calc(100% - 30px);
}
.list-title {
position: relative;
font-weight: 600;
font-size: 30rpx;
color: #40AE36;
text-align: center;
margin-bottom: 40rpx;
&::after {
content: "";
display: inline-block;
position: absolute;
bottom: 0;
left: 50%;
transform: translateX(-50%);
width: 233rpx;
height: 14rpx;
background: #40AE36;
opacity: 0.36;
filter: blur(6px);
}
} }
.application-record { .application-record {
position: absolute; position: absolute;
display: flex; display: flex;
align-items: center; align-items: center;
top: 240rpx; top: 320rpx;
right: 0; right: 0;
color: #fff; color: #fff;
font-size: 22rpx; font-size: 22rpx;
@ -1688,11 +1719,10 @@
.setAgCountbtnc { .setAgCountbtnc {
margin-top: 40rpx; margin-top: 40rpx;
// width: 200rpx;
height: 74rpx; height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%); background: linear-gradient(270deg, #3da834 0%, #72BE53 100%);
border-radius: 46rpx 46rpx; border-radius: 46rpx 46rpx;
opacity: 1; opacity: 1;
font-size: 25rpx; font-size: 25rpx;

208
pages/store/settled/unit.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<view class="page"> <view class="page" :style="{'height':successful?'100vh':''}">
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
<view class="conten-top" :style="'height:'+statusBarHeight+'px'" :class="{'bar-top-bg':barBg}" <view class="conten-top" :style="'height:'+statusBarHeight+'px'" :class="{'bar-top-bg':barBg}"
v-if="!successful"> v-if="!successful">
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i <view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff;"></i></view> class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff;"></i></view>
<view class="" <view class=""
style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:#fff;"> style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:#fff;font-size: 32rpx;font-weight: bold;">
种养殖户入驻 种养殖户入驻
</view> </view>
</view> </view>
@ -36,7 +36,9 @@
申请记录 申请记录
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<view class='list'> <view class='list'>
<view class="list-title">种养殖户入驻</view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">姓名</text> <text class="item-name">姓名</text>
@ -49,17 +51,21 @@
<view class="uni-list"> <view class="uni-list">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name businessBox">所在地</text> <text class="item-name businessBox">店铺所在地</text>
<picker mode=multiSelector @change="bindPickerChange2" :value="index2" <picker mode=multiSelector @change="bindPickerChange2" :value="index2"
:range="business" range-key="name" @columnchange="pickerColumnchange"> :range="business" range-key="name" @columnchange="pickerColumnchange">
<input class="businessBox" placeholder="请选择商圈" type="text" readonly disabled <view class="businessBox"
v-model="business_name"> :style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 32rpx;">
{{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}}
</view>
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
</picker> </picker>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="uni-list"> <view class="uni-list">
<view class="uni-list-cell"> <view class="uni-list-cell">
@ -73,6 +79,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="item no-border"> <view class="item no-border">
<view class='acea-row row-middle'> <view class='acea-row row-middle'>
<text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text> <text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text>
@ -97,6 +104,7 @@
@input="validateBtn" placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">开户银行</text> <text class="item-name">开户银行</text>
@ -105,6 +113,7 @@
placeholder-class='placeholder' /> placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">开户网点</text> <text class="item-name">开户网点</text>
@ -112,6 +121,7 @@
@input="validateBtn" placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">持卡人</text> <text class="item-name">持卡人</text>
@ -144,6 +154,7 @@
@input="validateBtn" placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item rel"> <view class="item rel">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">验证码</text> <text class="item-name">验证码</text>
@ -155,6 +166,7 @@
</button> </button>
</view> </view>
</view> </view>
<view class="item" v-if="isShowCode"> <view class="item" v-if="isShowCode">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">验证码</text> <text class="item-name">验证码</text>
@ -194,7 +206,6 @@
<view class="settlementAgreement" v-if="isshow"> <view class="settlementAgreement" v-if="isshow">
<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;"> <view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx" <view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
@click="recuo"> @click="recuo">
<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i> <i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
@ -206,11 +217,9 @@
<view class="contenta" v-if="detail.mer_services_agree"> <view class="contenta" v-if="detail.mer_services_agree">
<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
</view> </view>
<view class="contenta" v-else> <view class="contenta" v-else>
<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
</view> </view>
<view class="setAgCountbtn"> <view class="setAgCountbtn">
@ -274,7 +283,8 @@
import { import {
getStreet, getStreet,
getArea, getArea,
getVillage getVillage,
getCitys
} from "@/api/article.js" } from "@/api/article.js"
import { import {
mapGetters mapGetters
@ -349,9 +359,11 @@
StreetTyoeArr: [{ StreetTyoeArr: [{
area_id: '', area_id: '',
street_id: '', street_id: '',
city_id: '',
village_id: '' village_id: ''
}], }],
mer_storeType: '', mer_storeType: '',
city_id: '',
area_id: '', area_id: '',
street_id: '', street_id: '',
village_id: '', village_id: '',
@ -402,7 +414,7 @@
this.$nextTick(function() { this.$nextTick(function() {
this.getGoodsDetails(options.mer_i_id) this.getGoodsDetails(options.mer_i_id)
}) })
} else this.getArea() } else this.getCity()
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45; this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
}, },
@ -477,57 +489,88 @@
}, },
// 获取村 // 获取村
getVillage(e) { getVillage(street = null) {
const self = this; const self = this;
getVillage({ getVillage({
street_code: e street_code: street
}).then(res => { }).then(res => {
self.$set(self.business, 2, res.data); self.$set(self.business, 3, res.data);
if (self.mer_i_id && !this.business_name) { if (self.mer_i_id && !this.business_name) {
let area = self.business[0].find(item => item.code == self.area_id)?.name; let city = self.business[0].find(item => item.code == self.city_id)?.name;
let street = self.business[1].find(item => item.code == self.street_id)?.name; const zero = self.business[0].findIndex(item => item.code == self.city_id);
let village = self.business[2].find(item => item.id == self.village_id)?.name; this.index2[0] = zero;
this.business_name = `${area} ${street} ${village}`;
this.getArea(); let area = self.business[1].find(item => item.code == self.area_id)?.name;
const one = self.business[0].findIndex(item => item.code == self.area_id);
this.index2[1] = one;
let street = self.business[2].find(item => item.code == self.street_id)?.name;
const two = self.business[0].findIndex(item => item.code == self.street_id);
this.index2[2] = two;
let village = self.business[3].find(item => item.id == self.village_id)?.name;
const three = self.business[0].findIndex(item => item.code == self.village_id);
this.index2[3] = three;
this.business_name = `${city} ${area} ${street} ${village}`;
} }
}) })
}, },
//获取镇 //获取镇
getStreet(e, street) { getStreet(area = null, street = null) {
const self = this; const self = this;
getStreet({ getStreet({
area_code: e area_code: area
}).then(res => { }).then(res => {
self.$set(self.business, 1, res.data) this.business[2] = res.data;
self.getVillage(street ? street : self.business[1][0].code) street = street == null ? self.business[2][0].code : street;
self.getVillage(street)
}) })
}, },
//获取区 //获取区
getArea(code = null, street = null) { getArea(city = null, area = null, street = null) {
getArea({ getArea({
city_code: 510500 city_code: city
}).then(res => { }).then(res => {
this.business[1] = res.data;
area = area == null ? this.business[1][0].code : area;
this.getStreet(area, street)
})
},
// 获取市
getCity(city = null, area = null, street = null) {
getCitys().then(res => {
this.business[0] = res.data; this.business[0] = res.data;
this.code1 = code ? code : this.business[0][0].code; const code = this.business[0][0].code; //市 初始化
this.getStreet(this.code1, street) city = city == null ? code : city;
this.getArea(city, area, street);
}) })
}, },
//商圈数据变化 //商圈数据变化
pickerColumnchange(e) { pickerColumnchange(e) {
if (e.detail.column === 0) { if (e.detail.column === 0) { //第0列
this.getStreet(this.business[0][e.detail.value].code) this.getArea(this.business[0][e.detail.value].code);
this.index2[0] = e.detail.value this.index2[0] = e.detail.value
this.index2[1] = 0 this.index2[1] = 0
this.index2[2] = 0 this.index2[2] = 0
this.index2[3] = 0
} else if (e.detail.column === 1) { } else if (e.detail.column === 1) {
this.getVillage(this.business[1][e.detail.value].code) this.getStreet(this.business[1][e.detail.value].code)
this.index2[1] = e.detail.value this.index2[1] = e.detail.value
this.index2[2] = 0 this.index2[2] = 0
} else if (e.detail.column === 1) { this.index2[3] = 0
} else if (e.detail.column === 2) {
this.getVillage(this.business[2][e.detail.value].code)
this.index2[2] = e.detail.value this.index2[2] = e.detail.value
this.index2[3] = 0
} else if (e.detail.column == 3) {
this.index2[3] = e.detail.value
} }
}, },
@ -549,7 +592,6 @@
// 获取历史提交数据详情 // 获取历史提交数据详情
getGoodsDetails(id) { getGoodsDetails(id) {
getGoodsDetails(id).then(res => { getGoodsDetails(id).then(res => {
let resData = res.data let resData = res.data
this.merchantData.enterprise_name = resData.mer_name this.merchantData.enterprise_name = resData.mer_name
this.merchantData.user_name = resData.name this.merchantData.user_name = resData.name
@ -560,9 +602,9 @@
this.merchantData.invitation_code = resData.invitation_code this.merchantData.invitation_code = resData.invitation_code
this.merchantData.classification = resData.merchant_category_id this.merchantData.classification = resData.merchant_category_id
this.merchantData.mer_type = resData.mer_type_id this.merchantData.mer_type = resData.mer_type_id
this.city_id = resData.city_id;
this.area_id = resData.area_id this.area_id = resData.area_id
this.street_id = resData.street_id this.street_id = resData.street_id
this.mer_storeType = resData.mer_storeType
this.village_id = resData.village_id this.village_id = resData.village_id
const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : ''; const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
@ -578,7 +620,8 @@
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array) this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr) this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
this.business_name = ''; this.business_name = '';
this.getArea(this.area_id, this.street_id);
this.getCity(this.city_id, this.area_id, this.street_id);
if (resData.mer_type_id != 12) { if (resData.mer_type_id != 12) {
this.shoplist('mer_services_agree') this.shoplist('mer_services_agree')
} else { } else {
@ -605,66 +648,26 @@
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
// console.log(e.detail);
// this.index = e.target.value[1];
let idx = e.target.value; let idx = e.target.value;
// let idx = e.target.value[1];
this.merchantData.classification = this.array[idx]['merchant_category_id'] this.merchantData.classification = this.array[idx]['merchant_category_id']
this.mer_classification = this.array[idx]['category_name'] this.mer_classification = this.array[idx]['category_name']
// this.merchantData.classification = this.bindPickerChangeidx[idx]['store_category_id']
// this.mer_classification = this.bindPickerChangeidx[idx]['cate_name']
this.validateBtn() this.validateBtn()
}, },
columnchange(e) { columnchange(e) {
// console.log(e.detail);
if (e.detail.column == 0) { if (e.detail.column == 0) {
this.bindPickerChangeidx = this.array[e.detail.value].children; this.bindPickerChangeidx = this.array[e.detail.value].children;
} }
}, },
bindPickerChange1: function(e) {
this.index1 = e.target.value
let idx = e.target.value
this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
this.mer_storeType = this.storeTypeArr[idx]['type_name']
// console.log(this.merchantData.mer_type)
if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
this.shoplist('mer_services_agree')
} else {
this.shoplist('mer_supply_agree')
}
this.validateBtn()
},
bindPickerChange2: function(e) { bindPickerChange2: function(e) {
// console.log(e.detail.value)
this.index2 = e.detail.value this.index2 = e.detail.value
this.business_name = this.business_name =
`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}` `${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name} ${this.business[3][this.index2[3]].name}`
this.area_id = this.business[0][this.index2[0]].code this.city_id = this.business[0][this.index2[0]].code;
this.street_id = this.business[1][this.index2[1]].code this.area_id = this.business[1][this.index2[1]].code;
this.village_id = this.business[2][this.index2[2]].id this.street_id = this.business[2][this.index2[2]].code
// return; // 种养殖户入驻也不需要 this.village_id = this.business[3][this.index2[3]].id
if (this.merchantData.mer_type == 12) return; //市级供应链不需要查询镇农科公司
merstreet({
area_code: this.area_id
}).then((res) => {
if (res.code == 0) {
this.company = ''
this.organization_code = ''
// this.$util.Tips({
// title: res.msg
// });
return false;
} else {
this.company = res.data.title
this.organization_code = res.data.organization_code
}
}).catch(res => {
console.log(res)
})
}, },
// 获取商户分类 // 获取商户分类
@ -863,6 +866,7 @@
name: that.merchantData.user_name, name: that.merchantData.user_name,
code: that.merchantData.yanzhengma, code: that.merchantData.yanzhengma,
address: that.merchantData.address, address: that.merchantData.address,
city_id: this.city_id,
area_id: this.area_id, area_id: this.area_id,
street_id: this.street_id, street_id: this.street_id,
village_id: this.village_id, village_id: this.village_id,
@ -987,6 +991,30 @@
title: '请上传营业执照' title: '请上传营业执照'
}); });
if (!this.merchantData.bank_code) {
return that.$util.Tips({
title: '请输入银行卡号'
});
}
if (!this.merchantData.bank_username) {
return that.$util.Tips({
title: '请输入开户银行'
});
}
if (!this.merchantData.bank_opening) {
return that.$util.Tips({
title: '请输入开户网点'
});
}
if (!this.merchantData.bank_card_username) {
return that.$util.Tips({
title: '请输入持卡人姓名'
});
}
that.validate = true; that.validate = true;
return true; return true;
}, },
@ -1026,7 +1054,6 @@
} }
.header { .header {
height: 440rpx; height: 440rpx;
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -1129,6 +1156,29 @@
width: calc(100% - 30px); width: calc(100% - 30px);
} }
.list-title {
position: relative;
font-weight: 600;
font-size: 30rpx;
color: #40AE36;
text-align: center;
margin-bottom: 40rpx;
&::after {
content: "";
display: inline-block;
position: absolute;
bottom: 0;
left: 50%;
transform: translateX(-50%);
width: 233rpx;
height: 14rpx;
background: #40AE36;
opacity: 0.36;
filter: blur(6px);
}
}
.application-record { .application-record {
position: absolute; position: absolute;
display: flex; display: flex;

8
pages/users/order_confirm/index.vue
View File

@ -602,7 +602,13 @@
value: 'offline', value: 'offline',
title: '线下支付', title: '线下支付',
payStatus: 2, payStatus: 2,
}, }, {
"name": "对公转账",
"icon": "icon-yinhangqia",
value: 'public',
title: '对公转账',
payStatus: 1,
}
], ],
tagStyle: { tagStyle: {
img: 'width:100%;display:block;', img: 'width:100%;display:block;',