类型改变
This commit is contained in:
parent
b92ef54b5f
commit
6a2a0778b4
|
@ -9,6 +9,11 @@
|
|||
// +----------------------------------------------------------------------
|
||||
import request from "@/utils/request.js";
|
||||
|
||||
/**
|
||||
* 获取商品详情
|
||||
*/
|
||||
export const shopTypeChange = (data) => request.post('intention/change', data)
|
||||
|
||||
/**
|
||||
* 获取商品详情
|
||||
*/
|
||||
|
@ -328,5 +333,4 @@ export function intention(data) {
|
|||
*/
|
||||
export function intentionbus(data) {
|
||||
return request.post(`intention/business`, data);
|
||||
}
|
||||
|
||||
}
|
10
pages.json
10
pages.json
|
@ -1459,8 +1459,14 @@
|
|||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
}, {
|
||||
"path": "shop_type_change/list",
|
||||
"style": {
|
||||
"navigationBarTitleText": "申请记录",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}, {
|
||||
"path": "addGood/addGood",
|
||||
"style": {
|
||||
"navigationBarTitleText": "商品设置",
|
||||
|
|
|
@ -617,6 +617,10 @@
|
|||
name: '收付明细',
|
||||
type: 22,
|
||||
image: require('@/static/images/index14.png')
|
||||
}, {
|
||||
name: '商户类型',
|
||||
type: 23,
|
||||
image: require('@/static/images/index14.png')
|
||||
},
|
||||
|
||||
|
||||
|
@ -695,6 +699,10 @@
|
|||
name: '收付明细',
|
||||
type: 22,
|
||||
image: require('@/static/images/index14.png')
|
||||
}, {
|
||||
name: '商户类型',
|
||||
type: 23,
|
||||
image: require('@/static/images/index14.png')
|
||||
},
|
||||
// {
|
||||
// name: '全部',
|
||||
|
@ -741,6 +749,10 @@
|
|||
name: '收付明细',
|
||||
type: 22,
|
||||
image: require('@/static/images/index14.png')
|
||||
}, {
|
||||
name: '商户类型',
|
||||
type: 23,
|
||||
image: require('@/static/images/index14.png')
|
||||
},
|
||||
{
|
||||
name: '扫码付款',
|
||||
|
@ -1528,6 +1540,14 @@
|
|||
url: '/pages/payment/payment_detail?mer_id=' + this.userInfoData.service.mer_id
|
||||
})
|
||||
break;
|
||||
|
||||
case 23:
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
else uni.navigateTo({
|
||||
url: '/pages/product/shop_type_change/index?mer_id=' + this.userInfoData
|
||||
.service.mer_id
|
||||
})
|
||||
break;
|
||||
case 17:
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
else uni.navigateTo({
|
||||
|
|
|
@ -44,7 +44,17 @@
|
|||
qrcode({
|
||||
mer_id: merid
|
||||
}).then(res => {
|
||||
this.img = res.data.url;
|
||||
if (!res.data.count || res.data.count == 0) {
|
||||
this.$util.Tips({
|
||||
title: "您还没有添加商品,请添加!"
|
||||
}, () => {
|
||||
uni.redirectTo({
|
||||
url: "/pages/product/addGood/addGood?mer_id=" + merid
|
||||
})
|
||||
})
|
||||
} else {
|
||||
this.img = res.data.url;
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
@ -112,12 +122,10 @@
|
|||
}
|
||||
|
||||
.v-qrcode {
|
||||
position: absolute;
|
||||
top: 400rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 650rpx;
|
||||
height: 650rpx;
|
||||
margin-top: 100rpx;
|
||||
margin: 100rpx auto 0;
|
||||
background-color: #fff;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
@ -131,16 +139,12 @@
|
|||
}
|
||||
|
||||
.v-btn {
|
||||
position: absolute;
|
||||
top: 1080rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 690rpx;
|
||||
height: 100rpx;
|
||||
margin: 0 auto;
|
||||
margin: 70rpx auto 0;
|
||||
|
||||
text {
|
||||
font-weight: 400;
|
||||
|
|
|
@ -10,17 +10,22 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="apply-record" @click="handleToRecord">
|
||||
<text>申请记录</text>
|
||||
<u-icon name="arrow-right" size="12" color="#fff" style="margin-top: 4rpx;" />
|
||||
</view>
|
||||
|
||||
<view class="shop-type-con">
|
||||
<view class="shop-type-con-title">点击选择变更的商户类型</view>
|
||||
<view class="pifa" @click="handleChoose(1)">
|
||||
<image v-if="selected == '' ||selected == 2"
|
||||
<image v-if="selected == '' || selected == 2"
|
||||
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b0811202403191613185951.webp" mode="">
|
||||
</image>
|
||||
<image v-if="selected == 1"
|
||||
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d7d97202403191611433157.webp" mode=""></image>
|
||||
</view>
|
||||
<view class="pifalingshou" @click="handleChoose(2)">
|
||||
<image v-if="selected == '' ||selected == 1"
|
||||
<image v-if="selected == '' || selected == 1"
|
||||
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39776202403191612456811.webp" mode="">
|
||||
</image>
|
||||
<image v-if="selected == 2"
|
||||
|
@ -35,28 +40,71 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
shopTypeChange
|
||||
} from "@/api/product.js";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
selected: ''
|
||||
selected: '',
|
||||
mer_id: ''
|
||||
}
|
||||
},
|
||||
|
||||
onLoad(opt) {
|
||||
if (opt.mer_id)
|
||||
this.mer_id = opt.mer_id;
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
handleToRecord() {
|
||||
uni.navigateTo({
|
||||
url: "/pages/product/shop_type_change/list",
|
||||
fail(err) {
|
||||
console.log(err);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
handleChoose(e) {
|
||||
this.selected = e;
|
||||
|
||||
},
|
||||
|
||||
handleJump() {
|
||||
if (!this.selected) return this.$util.Tips({
|
||||
title: "请选择一种类型"
|
||||
})
|
||||
uni.navigateTo({
|
||||
url: "/pages/product/shop_type_change/progress",
|
||||
fail(err) {
|
||||
console.log(err);
|
||||
|
||||
if (!this.mer_id) return this.$util.Tips({
|
||||
title: "申请商户不能为空!"
|
||||
})
|
||||
|
||||
shopTypeChange({
|
||||
type: 3,
|
||||
mer_id: this.mer_id
|
||||
}).then(res => {
|
||||
if (res.status == 200) {
|
||||
|
||||
this.$util.Tips({
|
||||
title: res.message
|
||||
}, () => {
|
||||
uni.navigateTo({
|
||||
url: "/pages/product/shop_type_change/progress",
|
||||
fail(err) {
|
||||
console.log(err);
|
||||
}
|
||||
})
|
||||
})
|
||||
} else {
|
||||
return this.$util.Tips({
|
||||
title: res.message
|
||||
})
|
||||
}
|
||||
}).catch((err) => {
|
||||
this.$util.Tips({
|
||||
title: err
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
|
@ -90,9 +138,26 @@
|
|||
}
|
||||
}
|
||||
|
||||
.apply-record {
|
||||
position: absolute;
|
||||
top: calc(128rpx + var(--status-bar-height));
|
||||
right: 0;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 154rpx;
|
||||
height: 50rpx;
|
||||
background: #A1A1A1;
|
||||
border-radius: 40rpx 0rpx 0rpx 40rpx;
|
||||
|
||||
text {
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
|
||||
.shop-type-con {
|
||||
|
||||
|
||||
.shop-type-con-title {
|
||||
margin-bottom: 74rpx;
|
||||
font-weight: 400;
|
||||
|
@ -110,7 +175,6 @@
|
|||
width: 690rpx;
|
||||
height: 178rpx;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.pifalingshou {
|
||||
|
|
|
@ -0,0 +1,137 @@
|
|||
<template>
|
||||
<view class="shopTypeList">
|
||||
<view class="shop_type-head">
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class="shop-type-navbar">
|
||||
<u-icon name="arrow-left" size="18" color="#fff" @click="handleBack" />
|
||||
<text class="shop-type-navbar-title">申请记录</text>
|
||||
<text></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="shop-type-list">
|
||||
<block v-for="item in 4">
|
||||
<view class="shop-type-list-item">
|
||||
<view class="shop-type-list-item-title" @click='hanldeTo'>
|
||||
<!-- #40AE36 审核通过 #F55726 审核未通过 #666666 审核中-->
|
||||
<view class="shop-type-list-item-title-status">审核通过</view>
|
||||
<view class="shop-type-list-item-title-detail">
|
||||
查看详情
|
||||
<u-icon name="arrow-right" size="13" color="#666"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="shop-type-list-item-con">
|
||||
<view class="shop-type-list-item-con-item">
|
||||
<view class="shop-type-list-item-con-key">变更商户:</view>
|
||||
<view class="shop-type-list-item-con-val">这是一段店铺名称</view>
|
||||
</view>
|
||||
<view class="shop-type-list-item-con-item">
|
||||
<view class="shop-type-list-item-con-key">变更类型:</view>
|
||||
<view class="shop-type-list-item-con-val">批发零售商户</view>
|
||||
</view>
|
||||
<view class="shop-type-list-item-con-item">
|
||||
<view class="shop-type-list-item-con-key">申请时间:</view>
|
||||
<view class="shop-type-list-item-con-val">2024-3-14 14:00</view>
|
||||
</view>
|
||||
<view class="shop-type-list-item-con-item">
|
||||
<view class="shop-type-list-item-con-key">审核人:</view>
|
||||
<view class="shop-type-list-item-con-val">2024-</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
methods: {
|
||||
hanldeTo() {
|
||||
uni.navigateTo({
|
||||
url: "/pages/product/shop_type_change/progress"
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
page {
|
||||
background-color: #F8F9FA;
|
||||
}
|
||||
|
||||
.shopTypeList {
|
||||
.shop_type-head {
|
||||
background-color: #40AE36;
|
||||
margin-bottom: 40rpx;
|
||||
|
||||
.shop-type-navbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 30rpx;
|
||||
height: 88rpx;
|
||||
|
||||
.shop-type-navbar-title {
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.shop-type-list {
|
||||
height: calc(100vh - 130rpx - var(--status-bar-height));
|
||||
overflow: auto;
|
||||
|
||||
.shop-type-list-item {
|
||||
margin: 0 30rpx 30rpx;
|
||||
padding: 0rpx 30rpx 30rpx 30rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 4rpx 6rpx 2rpx rgba(0, 0, 0, 0.16);
|
||||
border-radius: 20rpx;
|
||||
|
||||
.shop-type-list-item-title {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
height: 90rpx;
|
||||
padding: 0 10rpx;
|
||||
border-bottom: 2rpx solid #F8F9FA;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.shop-type-list-item-title-status {
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
.shop-type-list-item-title-detail {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
}
|
||||
}
|
||||
|
||||
.shop-type-list-item-con {
|
||||
.shop-type-list-item-con-item {
|
||||
display: flex;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.shop-type-list-item-con-key {
|
||||
min-width: 130rpx;
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.shop-type-list-item-con-val {
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
|
@ -124,7 +124,7 @@
|
|||
.shop_type {
|
||||
.shop_type-head {
|
||||
background-color: #40AE36;
|
||||
margin-bottom: 70rpx;
|
||||
margin-bottom: 40rpx;
|
||||
|
||||
.shop-type-navbar {
|
||||
display: flex;
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
<template>
|
||||
<view>
|
||||
|
||||
<view class="content-top">
|
||||
<view
|
||||
:style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
|
||||
class="store-home">
|
||||
|
||||
</view>
|
||||
<!-- 搜索 -->
|
||||
<!-- #ifdef MP || APP-PLUS -->
|
||||
|
@ -1081,7 +1079,7 @@
|
|||
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
|
||||
} else {
|
||||
this.tabs = this.tabs5
|
||||
this.type=7
|
||||
this.type = 7
|
||||
}
|
||||
this.tab(this.type)
|
||||
// #ifdef H5
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue