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

完成商城入驻以及生产协功能修改

Browse Source
This commit is contained in:
jia 2023-09-23 20:55:14 +08:00
parent 5b0b4b570e
commit 1ec92593ce
6 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

@ -164,6 +164,7 @@
// console.log("jpush连接", connectEnable) // console.log("jpush连接", connectEnable)
}) })
// 设置别名 // 设置别名
// jpushModule.setAlias({ // jpushModule.setAlias({
// 'alias': uni.getStorageSync('userId'), // 'alias': uni.getStorageSync('userId'),

13
api/store.js
View File

@ -577,20 +577,9 @@ export function vicinityStoreApi(data) {
/* /*
商家入驻 -- 获取商户入驻申请协议内容 商家入驻 -- 获取商户入驻申请协议内容
*/ */
export function agreeiness() { export function agreeiness(data) {
return request.get(`business/agree`, data, { noAuth: true }); return request.get(`business/agree`, data, { noAuth: true });
} }
//测试
export function dotest() {
return request.get(`dotest`,{}, { noAuth: true });
}
/*
生产 -- 商户保证金信息接口
*/
export function merchant() {
return request.get(`store/merchant/margin`, data, { noAuth: true });
}

9
api/user.js
View File

@ -8,6 +8,8 @@
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import request from "@/utils/request.js"; import request from "@/utils/request.js";
import request1 from "@/utils/requestb.js";
import Cache from '@/utils/cache' import Cache from '@/utils/cache'
/** /**
* 获取版本信息 * 获取版本信息
@ -721,3 +723,10 @@ export function getBillDetil() {
return request.get(`mer/financial_record`) return request.get(`mer/financial_record`)
} }
//获取商户入驻所签署公司
export function merstreet(data) {
return request1.get(`company/street_company`, data);
}

30
pages/moreProject/moreProject.vue
View File

@ -383,8 +383,6 @@
</view> </view>
</view> </view>
</view> </view>
<view class="" v-else> <view class="" v-else>
@ -416,7 +414,7 @@
<emptyPage title="暂无信息"></emptyPage> <emptyPage title="暂无信息"></emptyPage>
</view> </view>
<view class="settlementAgreement" v-if="isFshow"> <view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount"> <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>
<div class="title">{{detail.title}}</div> <div class="title">{{detail.title}}</div>
@ -651,9 +649,9 @@
}, },
//缴纳保证金 //缴纳保证金
paydecimal() { paydecimal() {
if (this.merchant_Data.is_margin == 2) { if (this.merchant_Data.is_margin != 1) {
that.$util.Tips({ this.$util.Tips({
title: '用户已提交' title: '暂时无需缴纳保证金'
}); });
} else { } else {
@ -903,8 +901,6 @@
}, },
navigator(url, t) { navigator(url, t) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
this.isFshow = true this.isFshow = true
this.countDown() this.countDown()
@ -1196,7 +1192,7 @@
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
border-radius: 12rpx;
-webkit-border-radius: 12rpx; -webkit-border-radius: 12rpx;
padding: 52rpx; padding: 52rpx;
-webkit-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%);
@ -1241,7 +1237,7 @@
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 756rpx; height: 1050rpx;
overflow-y: scroll; overflow-y: scroll;
} }
@ -1254,12 +1250,7 @@
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
/*#ifdef H5*/ height: 1050rpx;
height: 600rpx;
/*#endif*/
/*#ifdef APP-PLUS*/
height: 530rpx;
/*#endif*/
overflow-y: scroll; overflow-y: scroll;
@ -1272,7 +1263,7 @@
.setAgCountbtna { .setAgCountbtna {
margin-top: 40rpx; margin-top: 40rpx;
width: 150rpx; width: 200rpx;
height: 74rpx; height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
@ -1290,13 +1281,12 @@
margin-top: 40rpx; margin-top: 40rpx;
padding-left: 20rpx; padding-left: 20rpx;
padding-right: 20rpx; padding-right: 20rpx;
height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
background: #cecece; background: #cecece;
border-radius: 46rpx 46rpx; border-radius: 46rpx 46rpx;
opacity: 1; opacity: 1;
font-size: 25rpx; font-size: 25rpx;
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
@ -1306,7 +1296,7 @@
.setAgCountbtnc { .setAgCountbtnc {
margin-top: 40rpx; margin-top: 40rpx;
width: 150rpx; width: 200rpx;
height: 74rpx; height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;

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

@ -126,8 +126,8 @@
<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>
<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name" @input="validateBtn" <input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item"> <view class="item">
@ -192,7 +192,8 @@
</view> </view>
</view> </view>
<view class="settlementAgreement" v-if="isshow"> <view class="settlementAgreement" v-if="isshow">
<view class="setAgCount"> <view class="setAgCount" style="width: 100%;height: 100%;">
<view style="margin-bottom: 30rpx;">所属公司:{{company?company:"暂无公司信息"}}</view>
<i class="icon iconfont icon-cha" @click="recuo"></i> <i class="icon iconfont icon-cha" @click="recuo"></i>
<div class="title">{{detail.title}}</div> <div class="title">{{detail.title}}</div>
@ -205,8 +206,7 @@
拒绝 拒绝
</button> </button>
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="formSubmit">
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="isshow=false">
<text v-if="num>0">请仔细阅读协议{{num}}S</text> <text v-if="num>0">请仔细阅读协议{{num}}S</text>
<text v-else>同意</text> <text v-else>同意</text>
@ -254,7 +254,8 @@
} from '@/api/store.js'; } from '@/api/store.js';
import { import {
getCaptcha, getCaptcha,
getAgreementApi getAgreementApi,
merstreet
} from "@/api/user"; } from "@/api/user";
import { import {
getStreet, getStreet,
@ -282,6 +283,7 @@
}, },
data() { data() {
return { return {
company: '',
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
cartId: '', //购物车id cartId: '', //购物车id
pinkId: 0, //拼团id pinkId: 0, //拼团id
@ -344,7 +346,7 @@
}, },
mer_i_id: null, // 商户申请id mer_i_id: null, // 商户申请id
isType: false, isType: false,
num: 15, num: 10,
detail: {} detail: {}
}; };
}, },
@ -375,16 +377,18 @@
this.getArea() this.getArea()
this.shoplist() this.shoplist()
}, },
onShow() {}, onShow() {
},
onReady() {}, onReady() {},
methods: { methods: {
//关闭弹窗 //关闭弹窗
recuo() { recuo() {
if (this.num > 0) { if (this.num > 0) {
this.num = 15 this.num = 10
this.isshow = false this.isshow = false
} else { } else {
this.num = 15 this.num = 10
this.isshow = false this.isshow = false
} }
}, },
@ -410,7 +414,7 @@
return return
} }
if (this.isshow == false && this.num > 0) { if (this.isshow == false && this.num > 0) {
this.num = 15 this.num = 10
return return
} }
this.countDown(); this.countDown();
@ -421,8 +425,9 @@
//获取商户入驻申请协议 //获取商户入驻申请协议
shoplist() { shoplist() {
agreeiness({type:'mer_services_agree'}).then(res => { agreeiness({
// console.log(res) type: 'mer_services_agree'
}).then(res => {
this.detail = res.data this.detail = res.data
}) })
}, },
@ -553,12 +558,19 @@
}, },
bindPickerChange2: function(e) { bindPickerChange2: function(e) {
// console.log(e.detail)
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.area_id = this.business[0][this.index2[0]].code this.area_id = this.business[0][this.index2[0]].code
this.street_id = this.business[1][this.index2[1]].code this.street_id = this.business[1][this.index2[1]].code
this.village_id = this.business[2][this.index2[2]].id
merstreet({
street_code: this.street_id
}).then((res) => {
this.company=res.data.title
})
}, },
// 获取商户分类 // 获取商户分类
getClassfication: function() { getClassfication: function() {
@ -719,15 +731,18 @@
this.isAgree = !this.isAgree; this.isAgree = !this.isAgree;
this.validateBtn(); this.validateBtn();
}, },
//所属公司
//协议弹窗 //协议弹窗
showxy() { showxy() {
this.isshow = true this.isshow = true
}, },
formSubmit: function(e) { formSubmit: function(e) {
console.log(this.mer_storeType)
if (this.num == 0||this.mer_storeType=='镇级供应链') {
if (this.num == 0) {
let that = this; let that = this;
if (that.validateForm() && that.validate) { if (that.validateForm() && that.validate) {
@ -760,6 +775,7 @@
}, 1000) }, 1000)
} }
}).catch(res => { }).catch(res => {
this.isshow = false
that.validate = true; that.validate = true;
that.$util.Tips({ that.$util.Tips({
title: res title: res
@ -1239,8 +1255,7 @@
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
border-radius: 12rpx;
-webkit-border-radius: 12rpx;
padding: 52rpx; padding: 52rpx;
-webkit-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%);
@ -1296,14 +1311,7 @@
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 1000rpx;
/*#ifdef H5*/
height: 600rpx;
/*#endif*/
/*#ifdef APP-PLUS*/
height: 530rpx;
/*#endif*/
overflow-y: scroll; overflow-y: scroll;
@ -1315,7 +1323,7 @@
.setAgCountbtna { .setAgCountbtna {
margin-top: 40rpx; margin-top: 40rpx;
width: 150rpx; width: 200rpx;
height: 74rpx; height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
@ -1349,7 +1357,7 @@
.setAgCountbtnc { .setAgCountbtnc {
margin-top: 40rpx; margin-top: 40rpx;
width: 150rpx; width: 200rpx;
height: 74rpx; height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;

4
pages/user/index.vue
View File

@ -196,10 +196,14 @@
<view v-if="copyright.status !== -1" class="copy-right"> <view v-if="copyright.status !== -1" class="copy-right">
<image class="img-copyright" :src="copyright.image" mode="widthFix"></image> <image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
<view class="text">{{copyright.Copyright}}</view> <view class="text">{{copyright.Copyright}}</view>
<view class="">备案号:蜀ICP备2022030133号-2A</view>
<view class="">增值电信营业许可证号:川B2-20221250</view>
</view> </view>
<view v-else class="copy-right"> <view v-else class="copy-right">
<view class="iconfont icon-crmeb"></view> <view class="iconfont icon-crmeb"></view>
<view class="text">众邦科技提供技术支持</view> <view class="text">众邦科技提供技术支持</view>
</view> </view>
<view style="height: 50rpx;"></view> <view style="height: 50rpx;"></view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"