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-22 14:51:20 +08:00
parent 34667a8355
commit 59562f0bd5
12 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/product.js
View File

@ -308,16 +308,10 @@ export function business(data) {
noAuth: true
});
}
/*
商品 -- 获取交易申请记录
*/
export function intention(data) {
return request.get(`intention/lst`, data);
}
/*
商品 -- 同意提交申请
*/
export function intentionbus(data) {
return request.post(`intention/settlement`, data);
return request.post(`intention/business`, data);
}

39
pages/moreProject/moreProject.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="gather">
<block v-if="isShow&&userInfoData.mer_info.mer_name">
<view class="" v-if="userInfoData.mer_info.business_status==2">
<view class="" v-if="userInfoData.mer_info.setting_status==1">
<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
<view class="special_work com" v-if="true">
<view class="title">市级供应链</view>
@ -54,7 +54,7 @@
</image>
<text class="text">订单核销</text>
</view>
<!-- <view class="examine"
<view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image>
@ -65,7 +65,8 @@
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image>
<text class="text">委托订单</text>
</view> -->
</view>
<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
<image class="icon_img"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
@ -92,11 +93,9 @@
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
<!-- <view class="examine"
<view class="examine"
@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text>
</view>
@ -104,7 +103,7 @@
@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text>
</view> -->
</view>
<view class="examine"
@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
@ -153,7 +152,7 @@
<text class="text">商户设置</text>
</view>
<!-- <view class="examine"
<view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image>
@ -176,7 +175,7 @@
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image>
<text class="text">发布管理</text>
</view> -->
</view>
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
@ -323,8 +322,7 @@
<view class="title">我的店铺</view>
<view class="content ">
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<view class="examine" @click="buyserset">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image>
<text class="text">商户设置</text>
@ -453,9 +451,8 @@
//同意
agree() {
intentionbus({
status: 1
"status": 1
}).then((res) => {
if (res.status == 200) {
this.$util.Tips({
title: res.message,
@ -465,6 +462,7 @@
this.isFshow = false
}
}).catch((err) => {
this.isFshow = false
this.$util.Tips({
title: err,
icon: 'error',
@ -487,7 +485,6 @@
this.num = 0
this.isFshow = false
}
},
countDown() {
@ -503,7 +500,7 @@
// this.launchApp()
return
}
if (this.isFshow == false && this.num > 0) {
this.num = 15
return
@ -512,6 +509,12 @@
}, 1000);
},
//商户设置
buyserset() {
uni.navigateTo({
url: `/pages/product/basicSet?mer_id=` + this.mer_id
})
},
//获取协议内容
list() {
@ -522,7 +525,9 @@
})
},
navigator(url, t) {
// uni.navigateTo({
// url: url
// })
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
this.isFshow = true
this.countDown()

34
pages/nongKe/cloud_entrepot/index.vue
View File

@ -35,7 +35,9 @@
</view>
<view class="" style="display: flex;align-items: center;">
<view style="display: flex;align-items: center;z-index: 999999;">
<u--image :showLoading="true" src="/static/images/LHYC/DWB.png" width="50.82rpx"
<u--image :showLoading="true" v-if="cloudList.length>0"
src="/static/images/LHYC/DWB.png" width="50.82rpx" height="50.82rpx"></u--image>
<u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
height="50.82rpx"></u--image>
<view class="town_name" :style="{color:cloudList.length>0?'':'black'}"
@click="showpick">{{street}}</view>
@ -43,9 +45,8 @@
<view class="head_r" @click="showPop=true">
<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
width="50.82rpx" height="50.82rpx"></u--image>
<u--image v-else :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
height="50.82rpx"></u--image>
<text :style="{color:cloudList.length>0?'':'black'}">全部</text>
</view>
</view>
@ -93,7 +94,7 @@
<view class='head_r' @click="showPop=true">
<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
height="50.82rpx"></u--image>
<text class="">全部</text>
<text class="" style="height: 5px;"></text>
<view class="flags">
</view>
@ -483,13 +484,7 @@
this.Area()
let that = this
setTimeout(() => {
uni.createSelectorQuery()
.in(this)
.select('.flags')
.boundingClientRect(rect => {
that.headtop = rect.top
})
.exec();
uni.createSelectorQuery()
.in(this)
.select('.flags')
@ -502,7 +497,8 @@
.select('.cart')
.boundingClientRect(rect => {
// console.log(this.cartTagInfo, 6666)
this.cartTagInfo = rect
that.cartTagInfo = rect
console.log(rect)
})
.exec();
// console.log(that.headtop)
@ -571,6 +567,15 @@
}
})
.exec();
uni.createSelectorQuery()
.in(this)
.select('.cart')
.boundingClientRect(rect => {
// console.log(this.cartTagInfo, 6666)
that.cartTagInfo = rect
// console.log(rect)
})
.exec();
},
onPullDownRefresh() {
this.getCloundShop()
@ -824,9 +829,10 @@
spread_id: "",
}
let that = this
uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
that.trnList[i].left = this.cartTagInfo.left - data1.left;
that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
that.trnList[i].left = that.cartTagInfo.left - data1.left;
that.trnList[i].bottom = that.cartTagInfo.top - data1.top;
let timer = setTimeout(() => {
that.trnList[i].left = 0

4
pages/nongKe/food/index.vue
View File

@ -11,7 +11,7 @@
<view class="back" @click='backjJump()' style="margin-right:17rpx ;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
<view style="font-size: 40rpx;">
<!-- {{titName}} -->
当地美食
</view>
@ -24,7 +24,7 @@
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
</view>
</view>

4
pages/nongKe/specialty/index.vue
View File

@ -11,7 +11,7 @@
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
<view style="font-size: 40rpx;">
<!-- {{titName}} -->
名优特产
</view>
@ -27,7 +27,7 @@
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
</view>
</view>

2
pages/nongKe/supply_chain/supplier.vue
View File

@ -14,7 +14,7 @@
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view class="" style="font-size: 40rpx;font-weight: 700;">
<view class="" style="font-size: 40rpx;">
供销综合云市场
</view>
<view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"

2
pages/nongKe/supply_chain/supplierA.vue
View File

@ -15,7 +15,7 @@
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
<view class="" style="font-size: 40rpx;">
{{titName}}
</view>
</view>

4
pages/nongKe/tourism/index.vue
View File

@ -11,7 +11,7 @@
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
<view style="font-size: 40rpx;">
<!-- {{titName}} -->
特色文旅
</view>
@ -27,7 +27,7 @@
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
</view>
</view>

12
pages/product/list/index.vue
View File

@ -47,12 +47,12 @@
<swiper-item :class="{ active: 1 == swiperCur }">
<view class="slide-navigator">
<!-- 隐藏暂时不需要 -->
<!-- <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
<navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_freight.png">
</image>
<text class="text">运费模板</text>
</navigator> -->
</navigator>
<navigator class="item"
:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
hover-class='none'>
@ -60,12 +60,12 @@
src="../static/images/product_specification.png"></image>
<text class="text">规格模板</text>
</navigator>
<!-- <navigator class="item"
<navigator class="item"
:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
hover-class='none'>
<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
<text class="text">商品导入</text>
</navigator> -->
</navigator>
</view>
</swiper-item>
</block>
@ -124,9 +124,9 @@
</view>
<view class="operation acea-row row-between-wrapper">
<view class="acea-row row-middle">
<!-- <view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
线上入库
</view> -->
</view>
<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
线下入库
</view>

BIN
static/images/LHYC/DWB1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
static/images/LHYC/K.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
static/images/LHYC/QB1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB