mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-09 17:35:36 +08:00
parent b5b1be3d39
commit 938a980186
3 changed files with 161 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pages/store/applicationRecord/index.vue
View File

@ -10,9 +10,12 @@
<view class="line"></view>
<view class="card-bottom">
<view class="card-status">
<image class="status-icon" v-if="item.status === 0" src="../static/images/pending.png" mode=""></image>
<image class="status-icon" v-else-if="item.status === 1" src="../static/images/passed.png" mode=""></image>
<image class="status-icon" v-else-if="item.status === 2" src="../static/images/not-pass.png" mode=""></image>
<image class="status-icon" v-if="item.status === 0" src="../static/images/pending.png" mode="">
</image>
<image class="status-icon" v-else-if="item.status === 1" src="../static/images/passed.png"
mode=""></image>
<image class="status-icon" v-else-if="item.status === 2" src="../static/images/not-pass.png"
mode=""></image>
<text class="status-text">{{statusText(item.status)}}</text>
</view>
<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
@ -83,7 +86,6 @@
},
// 跳转逻辑
jump(item) {
console.log(item)
if ([0, 2].includes(item.status)) {
uni.navigateTo({
url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}`
@ -125,53 +127,64 @@
align-items: center;
background-color: #F5F5F5;
padding: 20rpx 30rpx;
.card-list {
width: 100%;
background-color: #fff;
padding: 20rpx 24rpx;
margin: 10rpx 20rpx;
border-radius: 12rpx;
.card-top {
height: 140rpx;
.title {
font-size: 28rpx;
font-weight: bold;
color: #333333;
}
.time {
color: #999999;
font-size: 24rpx;
padding: 5rpx 0;
}
.reason {
color: #E93323;
font-weight: bold;
font-size: 24rpx;
}
}
.line {
height: 2rpx;
margin: 20rpx 0 20rpx 0;
background-color: #EEEEEE;
}
.card-bottom {
display: flex;
justify-content: space-between;
align-items: center;
color: #333;
.card-status {
display: flex;
align-items: center;
.status-icon {
width: 30rpx;
height: 30rpx;
margin: 10rpx;
}
.status-text {
font-size: 28rpx;
font-weight: 500;
}
}
.status-btn {
font-size: 26rpx;
color: #555;
@ -182,19 +195,22 @@
}
}
}
.no-shop {
width: 100%;
background-color: #fff;
height: 100vh;
.pictrue {
display: flex;
flex-direction: column;
align-items: center;
color: $uni-nothing-text;
image {
width: 414rpx;
height: 380rpx;
}
}
}
</style>
</style>

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

@ -87,18 +87,7 @@
</view>
</view>
</view>
<!-- <view class="item">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
<text class="item-name businessBox">邀请码(选填)</text>
<input type="text" maxlength="30" placeholder="请输入邀请码"
v-model="merchantData.invitation_code" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
</view>
</view> -->
<view class="item">
<view class="uni-list">
<view class="uni-list-cell">
@ -106,11 +95,8 @@
<text class="item-name">公司性质</text>
<picker @change="natureBusinessChange" mode="selector" :value="index"
:range="companyTypeList">
<input v-if="nature_business==1" placeholder="请选择公司性质" type="text" readonly
disabled value="对公户">
<input v-else-if="nature_business==2" placeholder="请选择公司性质" type="text"
readonly disabled value="个体户">
<input v-else placeholder="请选择公司性质" type="text" readonly disabled value="">
<input placeholder="请选择公司性质" type="text" readonly
:value="nature_business===''?'':nature_business==1?'对公户':'个体户'">
<view class='iconfont icon-jiantou'></view>
</picker>
</view>
@ -141,7 +127,6 @@
<input type="text" maxlength="30" placeholder="自动识别"
v-model="merchantData.address" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
</view>
@ -154,7 +139,6 @@
<input type="text" maxlength="30" placeholder="自动识别"
v-model="merchantData.company_name" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
</view>
@ -174,18 +158,10 @@
<input type="text" maxlength="30" placeholder="自动识别"
v-model="merchantData.social_credit_code" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
</view>
</view>
<!-- <view class="item">
<view class="acea-row row-middle">
<text class="item-name">是否农贸市场</text>
<u-switch v-model="isnm" @change="change" activeColor="#42CA4C"></u-switch>
</view>
</view> -->
<view class="item no-border">
<view class='acea-row row-middle'>
<text class="item-title">请上传行业相关其他资质证明图片</text>
@ -204,87 +180,89 @@
</view>
</view>
</view>
<view class="item" v-if="nature_business==1">
<view class="acea-row row-middle">
<text class="item-name">对公账号</text>
<input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item" v-else>
<view class="acea-row row-middle">
<text class="item-name">银行卡号</text>
<input type="number" placeholder="请输入银行卡号" v-model="merchantData.bank_code"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户银行</text>
<input type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户网点</text>
<input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
<view class="item" v-if="nature_business==2">
<view class="acea-row row-middle">
<text class="item-name">持卡人</text>
<input type="text" placeholder="请输入持卡人姓名" v-model="merchantData.bank_card_username"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item no-border" v-if="nature_business==2">
<view class='acea-row row-middle'>
<text class="item-title" style="margin-right: 20rpx;">请上传银行卡正面照片</text>
<text class="item-desc">(支持JPG、PNG、JPEG)</text>
<view class="upload">
<view v-if="bank_front" class='pictrue' @click='uploadpicBack'>
<image :src='bank_front'></image>
</view>
<view v-else class='pictrue acea-row row-center-wrapper row-column' @click='uploadpicBack'>
<text class='iconfont icon-icon25201'></text>
<view>上传图片</view>
</view>
</view>
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">联系电话</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item rel">
<view class="acea-row row-middle">
<text class="item-name">验证码</text>
<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
@click="handleVerify">
{{ text }}
</button>
</view>
</view>
<view class="item" v-if="isShowCode">
<view class="acea-row row-middle">
<text class="item-name">验证码</text>
<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
@input="validateBtn" placeholder-class='placeholder' />
<view class="imageCode" @click="again">
<image :src="codeUrl" />
</view>
</view>
</view>
<view class="item" v-if="nature_business==1">
<view class="acea-row row-middle">
<text class="item-name">对公账号</text>
<input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item" v-else>
<view class="acea-row row-middle">
<text class="item-name">银行卡号</text>
<input type="number" placeholder="请输入银行卡号" v-model="merchantData.bank_code"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户银行</text>
<input type="text" maxlength="30" placeholder="请输入开户银行名称"
v-model="merchantData.bank_username" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">开户网点</text>
<input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item" v-if="nature_business==2">
<view class="acea-row row-middle">
<text class="item-name">持卡人</text>
<input type="text" placeholder="请输入持卡人姓名" v-model="merchantData.bank_card_username"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item no-border" v-if="nature_business==2">
<view class='acea-row row-middle'>
<text class="item-title" style="margin-right: 20rpx;">请上传银行卡正面照片</text>
<text class="item-desc">(支持JPG、PNG、JPEG)</text>
<view class="upload">
<view v-if="bank_front" class='pictrue' @click='uploadpicBack'>
<image :src='bank_front'></image>
</view>
<view v-else class='pictrue acea-row row-center-wrapper row-column'
@click='uploadpicBack'>
<text class='iconfont icon-icon25201'></text>
<view>上传图片</view>
</view>
</view>
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">联系电话</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item rel">
<view class="acea-row row-middle">
<text class="item-name">验证码</text>
<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
@click="handleVerify">
{{ text }}
</button>
</view>
</view>
<view class="item" v-if="isShowCode">
<view class="acea-row row-middle">
<text class="item-name">验证码</text>
<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
@input="validateBtn" placeholder-class='placeholder' />
<view class="imageCode" @click="again">
<image :src="codeUrl" />
</view>
</view>
</view>
<view class="item no-border">
<checkbox-group @change='ChangeIsAgree'>
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
@ -333,9 +311,6 @@
<view class="setAgCountbtn">
<view class="border"></view>
<!-- <button class="setAgCountbtna" @click="refuse">
拒绝
</button> -->
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
@click="agree">
<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
@ -510,8 +485,8 @@
computed: configMap({
sys_intention_agree: ''
}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
onLoad(options) {
onLoad(options) {
if (this.isLogin) {
this.getClassfication();
this.getStoreType();
@ -530,10 +505,7 @@
} else this.getArea()
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
},
onShow() {
},
onReady() {},
methods: {
//获取交易信息
codelist() {
@ -541,12 +513,14 @@
this.codenote = res.data.list
})
},
//退出
logout() {
uni.switchTab({
url: '/pages/user/index'
})
},
//关闭弹窗
recuo() {
if (this.num > 0) {
@ -557,14 +531,7 @@
this.isshow = false
}
},
//拒绝
refuse() {
uni.switchTab({
url: '/pages/user/index'
})
},
countDown() {
let {
num
@ -584,13 +551,10 @@
}
this.countDown();
}, 1000);
},
//获取商户入驻申请协议
shoplist(val) {
agreeiness({
type: val
}).then(res => {
@ -598,11 +562,6 @@
})
},
//是否是农贸市场
// change(e) {
// this.isnum = (e === true ? 1 : 0)
// },
// 获取村
getVillage(e) {
const self = this;
@ -619,6 +578,7 @@
}
})
},
//获取镇
getStreet(e, street) {
const self = this;
@ -629,6 +589,7 @@
self.getVillage(street ? street : self.business[1][0].code)
})
},
//获取区
getArea(code = null, street = null) {
getArea({
@ -639,6 +600,7 @@
this.getStreet(this.code1, street)
})
},
//商圈数据变化
pickerColumnchange(e) {
if (e.detail.column === 0) {
@ -654,12 +616,14 @@
this.index2[2] = e.detail.value
}
},
getConfig() {
this.isType = false;
this.showProtocol = true;
// 获取配置
this.protocol = this.sys_intention_agree
},
/*获取发票说明*/
getAgreement() {
let that = this
@ -667,30 +631,36 @@
that.isType = true
getAgreementApi('sys_merchant_type').then(res => {
that.protocol = res.data.sys_merchant_type
})
},
// 获取历史提交数据详情
getGoodsDetails(id) {
getGoodsDetails(id).then(res => {
let arr = Object.keys(this.merchantData)
let resData = res.data
arr.map(item => {
this.merchantData.enterprise_name = resData.mer_name
this.merchantData.user_name = resData.name
this.merchantData.phone = resData.phone
this.merchantData.social_credit_code = resData.social_credit_code
this.merchantData.company_name = resData.company_name
this.merchantData.address = resData.address
this.merchantData.invitation_code = resData.invitation_code
this.merchantData.classification = resData.merchant_category_id
this.merchantData.mer_type = resData.mer_type_id
this.area_id = resData.area_id
this.street_id = resData.street_id
this.mer_storeType = resData.mer_storeType
this.village_id = resData.village_id
})
this.merchantData.enterprise_name = resData.mer_name
this.merchantData.user_name = resData.name
this.merchantData.phone = resData.phone
this.merchantData.social_credit_code = resData.social_credit_code
this.merchantData.company_name = resData.company_name
this.merchantData.address = resData.address
this.merchantData.invitation_code = resData.invitation_code
this.merchantData.classification = resData.merchant_category_id
this.merchantData.mer_type = resData.mer_type_id
this.area_id = resData.area_id
this.street_id = resData.street_id
this.mer_storeType = resData.mer_storeType
this.village_id = resData.village_id;
const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
this.$set(this.merchantData, 'bank_code', bankInfo.bank_code);
this.$set(this.merchantData, 'bank_username', bankInfo.bank);
this.$set(this.merchantData, 'bank_opening', bankInfo.bank_branch);
this.$set(this.merchantData, 'bank_card_username', bankInfo.name);
this.bank_front = bankInfo.bank_front[0] ? bankInfo.bank_front[0] : '';
this.nature_business = resData.is_company == 1 ? 1 : 2;
this.business_license = resData.images[0];
resData.images.shift();
this.pics = resData.images;
@ -706,6 +676,7 @@
uni.hideLoading();
})
},
//获取商户分类名称
getCategoryName(id, arr) {
for (let i = 0; i < arr.length; i++) {
@ -714,6 +685,7 @@
}
}
},
//获取店铺类型名称
getStoreTypeName(id, arr) {
for (let i = 0; i < arr.length; i++) {
@ -722,10 +694,12 @@
}
}
},
// 选择公司性质
natureBusinessChange(e) {
this.nature_business = this.companyTypeList[e.detail.value] == '个体户' ? 2 : 1;
},
bindPickerChange: function(e) {
// console.log(e.detail);
// this.index = e.target.value[1];
@ -737,19 +711,19 @@
// this.mer_classification = this.bindPickerChangeidx[idx]['cate_name']
this.validateBtn()
},
columnchange(e) {
// console.log(e.detail);
if (e.detail.column == 0) {
this.bindPickerChangeidx = this.array[e.detail.value].children;
}
},
bindPickerChange1: function(e) {
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 {
@ -759,7 +733,6 @@
},
bindPickerChange2: function(e) {
// console.log(e.detail.value)
this.index2 = e.detail.value
this.business_name =
`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}`
@ -787,33 +760,18 @@
console.log(res)
})
},
// 获取商户分类
getClassfication: function() {
merClassifly()
.then(res => {
this.array = res.data
})
.catch(res => {
this.$util.Tips({
title: res
});
merClassifly().then(res => {
this.array = res.data
}).catch(res => {
this.$util.Tips({
title: res
});
// getCategoryList()
// .then(res => {
// // console.log(res);
// res.data.list.forEach(item=>{
// item.category_name = item.cate_name;
// item.merchant_category_id = item.store_category_id;
// })
// this.array = res.data.list;
// this.bindPickerChangeidx = this.array[0].children;
// })
// .catch(res => {
// this.$util.Tips({
// title: res
// });
// });
});
},
// 获取店铺类型
getStoreType: function() {
getStoreTypeApi()
@ -960,6 +918,7 @@
}
});
},
getcaptcha() {
let that = this
getCaptcha().then(data => {
@ -969,6 +928,7 @@
})
that.isShowCode = true;
},
sendCode() {
if (this.disabled) return;
this.disabled = true;
@ -986,20 +946,16 @@
}
}, 1000);
},
onConfirm(val) {
this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
},
ChangeIsAgree: function(e) {
this.isAgree = !this.isAgree;
this.validateBtn();
},
//所属公司
//协议弹窗
showxy() {
this.isshow = true
},
//提交
agree() {
let that = this;

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

@ -27,8 +27,8 @@
<view class="table-title-cell">用户名称</view>
<view class="table-title-cell">用户ID</view>
<view class="table-title-cell">状态</view>
<view class="table-title-cell">采购金额</view>
<view class="table-title-cell">销售金额</view>
<view class="table-title-cell" style="width:32%;">采购金额</view>
<view class="table-title-cell" style="width:32%;">销售金额</view>
</view>
<scroll-view scroll-y id="scrollView" @scrolltolower="scrolltolower">
@ -38,8 +38,8 @@
<view class="table-con-cell">{{item.real_name || '-'}}</view>
<view class="table-con-cell">{{item.uid}}</view>
<view class="table-con-cell">{{item.status == 0?'未入驻':'已入驻'}}</view>
<view class="table-con-cell red">￥{{item.buy_amount}}</view>
<view class="table-con-cell green">￥{{item.sale_amount}}</view>
<view class="table-con-cell red" style="width:32%;">￥{{item.buy_amount}}</view>
<view class="table-con-cell green" style="width:32%;">￥{{item.sale_amount}}</view>
</view>
</block>
<view class='loadings' @click="getList">