经销商入驻应道也

This commit is contained in:
zmj 2024-05-21 16:07:37 +08:00
parent 8593b1a2dc
commit b5e261a764
9 changed files with 1693 additions and 22 deletions

View File

@ -15,9 +15,9 @@ let openPlantGrass = '-openPlantGrass-'
let httpSix, httpApi, httpTwo;
const env = 'dev'; // 开发
// const env = 'dev'; // 开发
// const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
const env = 'prew'; // 预上线
switch (env) {
case 'prod':
@ -29,7 +29,8 @@ switch (env) {
case 'prew':
httpApi = 'https://test.shop.lihaink.cn' //预发布环境
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
httpTwo = 'https://erp.lihaink.cn'
// httpTwo = 'https://erp.lihaink.cn'
httpTwo = 'http://192.168.1.13:8546'
wsApi = 'wss://test.shop.lihaink.cn'
break;
default:

View File

@ -55,6 +55,18 @@
"height": "1000px",
"background": "rgba(0,0,0,0.2)"
}
},
{
"id": "distr", //
"path": "pages/index/subnvue/distr", //
"type": "popup",
"style": {
"position": "absolute",
"dock": "right",
"width": "750rpx",
"height": "1000px",
"background": "rgba(0,0,0,0.2)"
}
}
]
@ -112,10 +124,10 @@
}
},
{
"path": "pages/bindSupplier/record",
"path": "pages/bindDistribution/index",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "申请记录"
"enablePullDownRefresh": true,
"navigationBarTitleText": "经销商入驻"
}
},
{
@ -184,6 +196,18 @@
"height": "1500rpx",
"background": "rgba(0,0,0,0.2)"
}
},
{
"id": "userDistr", //
"path": "pages/user/subnvue/userDistr", //
"type": "popup",
"style": {
"position": "absolute",
"dock": "right",
"width": "750rpx",
"height": "1500rpx",
"background": "rgba(0,0,0,0.2)"
}
}
]
}

File diff suppressed because it is too large Load Diff

View File

@ -81,7 +81,7 @@
<!-- #ifdef APP-PLUS -->
<view @click="getLocation"
style="width: 100%;padding: 20rpx;border: 1px solid #F3F3F3;;color:#999999;border-radius: 16rpx;">
{{formData.storeAddress||'点击获取当前位置'}}
{{formData.mer_address||'点击获取当前位置'}}
</view>
<!-- #endif -->
@ -320,14 +320,13 @@
"merchant_category_name": "",
"mer_type_id": 0,
"mer_storeType": "",
province_name: "",
city_name: "",
area_name: "",
mer_intention_id: "",
storeAddress: "",
mer_address: "",
"images": [],
is_merchant_type: 2,
// #ifdef APP
jg_register_id: uni.getStorageSync('jg_id')
// #endif
jg_register_id: uni.getStorageSync('jg_id') || ''
}
}
},
@ -357,7 +356,6 @@
this.showMerchantCategoryPicker = false
},
confirmType(e) {
console.log(e.value)
this.formData.type_id = e.value[0].id
this.formData.type_name = e.value[0].name
this.showStoreType = false
@ -398,7 +396,6 @@
that.formData.company_nickname = res.data.legal_person;
that.formData.social_credit_code = res.data.register_number;
that.formData.company_name = res.data.name;
console.log(this.formData)
} else {
that.$util.Tips({
title: "识别失败!"
@ -422,13 +419,13 @@
this.formData[key] = res.data[key]
}
this.formData.phone = res.data.service_phone
console.log(JSON.parse(res.data.data_json))
let obj = JSON.parse(res.data.data_json)
this.formData.images = [obj.images]
this.formData.company_nickname = obj.company_nickname
this.formData.company_name = obj.company_name
this.formData.address = obj.company_address
this.formData.social_credit_code = obj.social_credit_code
console.log(res.data)
})
this.step = 1
@ -446,8 +443,6 @@
title: '获取定位中',
mask: true
});
// uni.show
// #ifndef APP-PLUS
uni.getLocation({
type: 'wgs84 ',
@ -460,7 +455,6 @@
uni.hideLoading()
},
});
// #endif
// #ifdef APP-PLUS
uni.getLocation({
@ -469,7 +463,9 @@
success: (res) => {
this.formData.long = res.longitude
this.formData.lat = res.latitude
this.formData.storeAddress = res.address.city + res.address.district + res.address
this.formData.city_name = res.address.city
this.formData.area_name = res.address.district
this.formData.mer_address = res.address.city + res.address.district + res.address
.street + res.address.streetNum
uni.hideLoading()
},
@ -487,10 +483,10 @@
delete this.formData.data_json
}
this.formData.is_merchant_type = 2
console.log(this.formData)
applysApi({
...this.formData
}).then(ress => {
console.log('ress', ress)
this.getSuccessData()
}).catch(err => {
console.log(err)

View File

@ -32,6 +32,13 @@
我是供应商
</view>
</view>
<view class="li" style="margin-top: 50rpx;" @click="navSw('/pages/index/index',3)">
<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
height="200rpx" style="position: absolute;"></u-image>
<view class="btn">
我是经销商
</view>
</view>
</view>
</template>
@ -54,6 +61,8 @@
navSw(url, isNewStoreType) {
if (isNewStoreType == 1) uni.setStorageSync('newStore', true);
if (isNewStoreType == 2) uni.setStorageSync('newSupplier', true);
if (isNewStoreType == 3) uni.setStorageSync('newDistribution', true);
console.log(uni.getStorageSync('newSupplier'), uni.getStorageSync('newDistribution'))
uni.switchTab({
url: url
})
@ -71,7 +80,7 @@
.box {
width: 750rpx;
height: 100vh;
min-height: 100vh;
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1333d202402261025145680.webp);
background-repeat: no-repeat;
background-size: 100% auto;

View File

@ -654,6 +654,7 @@
this.isSupplierFn() /*获取供应商toke*/
this.openNewMerDiver() /*新商户入驻商户引导页*/
this.openNewSuppierDiver() /*新供应商入驻商户引导页*/
this.openNewDistrDiver() /*新经销商入驻商户引导页*/
if (that.appUpdate.openUpgrade == '1') {
that.alertAppUpdate();
}
@ -760,6 +761,21 @@
}
});
},
/* 新供应商入驻引导页*/
openNewDistrDiver() {
let isNewSupplire = Boolean(uni.getStorageSync('newDistribution'));
if (!isNewSupplire) return;
this.subNvue = uni.getSubNVueById('distr')
this.subNvue.show('slide-in-left', 300)
uni.$on('offSubnvue', () => {
this.subNvue.hide('slide-out-left')
if (uni.getStorageSync("newDistribution")) {
uni.switchTab({
url: '/pages/user/index'
})
}
});
},
loadCoupon() {
if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) {

View File

@ -0,0 +1,161 @@
<template>
<view class="">
<view class="jump" @click="jump">
<text class="font">跳过</text>
</view>
<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
</view>
<view class="tips-box" style="position: absolute;right: 20px;" :style="{top:screenHeight-215}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras">
<text style="font-size: 28rpx;line-height: 100rpx;color: white;"> 点击我的页面,进行经销商户入驻
</text>
</view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}" @click="next">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/96aba202405171618278261.png"
class="target-icon"></image>
<text class="target-text">我的</text>
</view>
<view :style="{left:screenWidth/4*3,top:screenHeight-130}">
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
</view>
<image src="/static/images/greenLine.png" class="greenLine"
:style="{left:screenWidth/4*3+15,top:screenHeight-120}" mode=""></image>
</view>
</template>
<script>
export default {
data() {
return {
screenHeight: 0,
screenWidth: 0,
isAct: false
}
},
methods: {
jump() {
uni.setStorageSync("newDistribution", false)
uni.$emit('offSubnvue');
},
next() {
uni.$emit('offSubnvue');
}
},
onShow() {
let that = this
let data = (uni.getWindowInfo())
this.screenHeight = data.screenHeight
this.screenWidth = data.screenWidth
},
onLoad() {
}
}
</script>
<style>
.jump {
position: absolute;
right: 30rpx;
top: 80rpx;
border: 1px solid white;
padding: 10rpx 20rpx;
border-radius: 30rpx;
}
.font {
font-size: 28rpx;
color: white;
lines: 1;
text-align: center;
}
.center {
transform: translateX(-50%);
}
.next-btn {
position: absolute;
width: 240rpx;
height: 76rpx;
border: 1px solid white;
border-radius: 38rpx;
background: rgba(255, 255, 255, 0.4);
}
.target {
width: 136rpx;
height: 136rpx;
background-color: white;
border-radius: 136rpx;
}
.target-icon {
width: 50rpx;
height: 50rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, -50%);
top: 68rpx;
}
.target-text {
font-size: 20rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, 0);
top: 100rpx;
}
.pointer {
position: absolute;
}
.tips-box {
width: 462rpx;
height: 178rpx;
position: absolute;
padding-top: 72rpx;
position: absolute;
}
.start {
width: 72rpx;
height: 72rpx;
position: absolute;
right: 0;
top: 20px;
}
.tips {
width: 462rpx;
height: 106rpx;
background-color: #5BE157;
border-radius: 20rpx;
}
.tras {
width: 462rpx;
transition-property: width;
transition-duration: 3s;
transition-delay: 0.1s;
transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
}
.act {
width: 462rpx;
}
.greenLine {
width: 35px;
height: 60px;
position: absolute;
}
</style>

View File

@ -180,7 +180,8 @@
<view v-if="item.isShow" class="item ">
<view @click="authTo(item.url)" class="item-count">
<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
<image v-else :src="item.pic" class="targets" :class="'targets'+item.group_data_id">
<image v-else :src="item.pic" class="targets"
:class="'targets'+ (item.name=='供应入驻'?'1335':item.name=='经销入驻'?'1440':'') ">
</image>
<text>{{item.name}}</text>
</view>
@ -491,6 +492,7 @@
this.isSupplierFn()
// #ifdef APP-PLUS
this.openDiver()
this.openDistrDiver()
setTimeout(() => {
const query = uni.createSelectorQuery().in(this);
query
@ -563,6 +565,26 @@
.exec();
}, 800)
},
/*新经销商入驻引导页*/
openDistrDiver() {
let isNewSupplier = Boolean(uni.getStorageSync('newDistribution'));
if (!isNewSupplier) return;
let that = this
this.subNvue = uni.getSubNVueById('userDistr')
uni.$on('offnewSupplierSubnvue', () => {
this.subNvue.hide('slide-out-right');
})
setTimeout(() => {
that.subNvue.show('slide-in-left', 300)
const query = uni.createSelectorQuery().in(this);
query
.select('.targets1440')
.boundingClientRect((data) => {
uni.$emit('openSupplierSubnvue', (data))
})
.exec();
}, 800)
},
authTo(url) {
if (this.isLogin) {

View File

@ -0,0 +1,166 @@
<template>
<view class="">
<view class="jump" @click="next">
<text class="font">跳过</text>
</view>
<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">我知道了</text>
</view>
<view class="target" :style="{left:left-20,top:top-13.5}" @click="next">
<image src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/6202d269b6163b9ec7a4383559fc67a8.png"
class="target-icon"></image>
<text class="target-text">经销入驻</text>
</view>
<view :style="{left:left-20+'px',top:top-70+'px'}" class="trans1">
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
</view>
<view class="tips-box" :style="{left:left-200,top:top-170}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isAct}">
<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面,进行经销商入驻</text>
</view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
<image src="/static/images/greenLine.png" class="greenLine" :style="{left:left-3.5,top:top-70}" mode="">
</image>
</view>
</template>
<script>
export default {
data() {
return {
screenHeight: 0,
screenWidth: 0,
isAct: false,
left: 0,
top: 0,
}
},
methods: {
next() {
uni.$emit('offnewSupplierSubnvue');
uni.setStorageSync("newDistribution", false)
}
},
onLoad() {
let that = this
uni.$on('openSupplierSubnvue', (data) => {
this.left = data.left
this.top = data.top
})
const res = uni.getSystemInfo({
success: (res => {
this.screenHeight = res.screenHeight
this.screenWidth = res.screenWidth
})
});
}
}
</script>
<style>
.jump {
position: absolute;
right: 30rpx;
top: 80rpx;
border: 1px solid white;
padding: 10rpx 20rpx;
border-radius: 30rpx;
}
.font {
font-size: 28rpx;
color: white;
lines: 1;
text-align: center;
}
.center {
transform: translateX(-50%);
}
.next-btn {
position: absolute;
width: 240rpx;
height: 76rpx;
border: 1px solid white;
border-radius: 38rpx;
background: rgba(255, 255, 255, 0.4);
}
.target {
width: 136rpx;
height: 136rpx;
background-color: white;
border-radius: 136rpx;
}
.target-icon {
width: 50rpx;
height: 50rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, -50%);
top: 68rpx;
}
.target-text {
font-size: 20rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, 0);
top: 100rpx;
}
.pointer {
position: absolute;
}
.tips-box {
width: 462rpx;
height: 178rpx;
position: absolute;
padding-top: 72rpx;
position: absolute;
}
.start {
width: 72rpx;
height: 72rpx;
position: absolute;
right: 0;
top: 20px;
}
.tips {
width: 462rpx;
height: 106rpx;
background-color: #5BE157;
border-radius: 20rpx;
}
.tras {
width: 462rpx;
transition-property: width;
transition-duration: 3s;
transition-delay: 0.1s;
transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
}
.act {
width: 462rpx;
}
.greenLine {
width: 35px;
height: 60px;
position: absolute;
}
</style>