mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

This commit is contained in:
weipengfei 2023-10-24 15:02:42 +08:00
parent 4133d9e71f
commit 8c12b43e4f
6 changed files with 3299 additions and 3277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
pages/index/index.vue
View File

@ -4,7 +4,8 @@
<view class="content-top">
<view class="content-tops">
<view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
<image :src="userInfoData.mer_info.mer_avatar" v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar" mode="aspectFill" @click="logout">
<image :src="userInfoData.mer_info.mer_avatar" v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar"
mode="aspectFill" @click="logout">
</image>
<image src="@/static/images/f.png" v-else mode="aspectFit" @click="logout"></image>
</view>
@ -74,7 +75,15 @@
常用工具
<view class=""></view>
</view>
<view class="tools-two" v-if="isgShow&&userInfoData.mer_info.setting_status==1">
<view class="tools-two" v-if="isgShow&&userInfoData.mer_info.type_code=='TypeSupplyChain'">
<view class="" v-for="(item,k) in typelistSupplyChain" :key='k' @click="navation(item)">
<view class="tools-two-img">
<image :src="item.image" mode=""></image>
</view>
<view class="tools-two-title"> {{item.name}}</view>
</view>
</view>
<view class="tools-two" v-else-if="userInfoData.mer_info.setting_status==1">
<view class="" v-for="(item,k) in typelist" :key='k' @click="navation(item)">
<view class="tools-two-img">
<image :src="item.image" mode=""></image>
@ -232,8 +241,7 @@
<view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:80rpx"
@click="recuo">
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:80rpx" @click="recuo">
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
</view>
<div class="title">{{detail.title}}</div>
@ -270,25 +278,24 @@
<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' />
<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.phone"
@input="validateBtn" placeholder-class='placeholder' />
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @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' />
<input type="text" placeholder="请输入开户行" v-model="merchantData.bank_opening" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
<view class="item">
@ -297,15 +304,13 @@
</view>
<view class="item-card">
<view class="item-carda" @click='uploadpic({type:1})'
v-if='merchantData.cardno_front.length==0'>
<view class="item-carda" @click='uploadpic({type:1})' v-if='merchantData.cardno_front.length==0'>
<image src="@/static/images/SFZZ.png" mode="aspectFit"></image>
</view>
<view class="item-carda" @click='DelPic({type:1})' v-else>
<image :src="merchantData.cardno_front" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='uploadpic({type:2})'
v-if='merchantData.cardno_back.length==0'>
<view class="item-cardb" @click='uploadpic({type:2})' v-if='merchantData.cardno_back.length==0'>
<image src="@/static/images/SFFF.png" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='DelPic({type:2})' v-else>
@ -319,15 +324,13 @@
<text class="item-name">银行卡反面:</text>
</view>
<view class="item-card">
<view class="item-carda" @click='uploadpic({type:3})'
v-if='merchantData.bank_front.length==0'>
<view class="item-carda" @click='uploadpic({type:3})' v-if='merchantData.bank_front.length==0'>
<image src="@/static/images/YHKZ.png" mode="aspectFit"></image>
</view>
<view class="item-carda" @click='DelPic({type:3})' v-else>
<image :src="merchantData.bank_front" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='uploadpic({type:4})'
v-if='merchantData.bank_back.length==0'>
<view class="item-cardb" @click='uploadpic({type:4})' v-if='merchantData.bank_back.length==0'>
<image src="@/static/images/YHKF.png" mode="aspectFit"></image>
</view>
@ -451,6 +454,39 @@ import {
image: require('@/static/images/index3.png')
}
],
typelistSupplyChain: [{
name: '商品管理',
type: 1,
image: require('@/static/images/index7.png')
}, {
name: '订单管理',
type: 2,
image: require('@/static/images/index1.png')
}, {
name: '提现管理',
type: 5,
image: require('@/static/images/index8.png')
}, {
name: '客服记录',
type: 6,
image: require('@/static/images/index6.png')
}, {
name: '订单核销',
type: 7,
image: require('@/static/images/index2.png')
}, {
name: '委托销售',
type: 9,
image: require('@/static/images/index6.png')
}, {
name: '委托订单',
type: 10,
image: require('@/static/images/index2.png')
}, {
name: '全部',
type: 8,
image: require('@/static/images/index3.png')
}],
refundInfo: {},
company: '',
@ -536,6 +572,10 @@ import {
this.$bus.$off('value-updated')
},
methods: {
// 初始化菜单
initTypeLiseMenu() {
},
//关闭弹窗
close() {
this.$refs.popup.close()
@ -988,7 +1028,6 @@ import {
})
break;
case 3:
uni.navigateTo({
url: '/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=' +
this.userInfoData.mer_info.category_id
@ -1003,7 +1042,6 @@ import {
case 5:
uni.navigateTo({
url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id
})
break;
case 6:
@ -1021,7 +1059,21 @@ import {
})
break;
case 8:
case 9:
uni.navigateTo({
url: `/pages/commissionedSales/index/index?mer_id=${this.userInfoData
.service
.mer_id}`
})
break;
case 10:
uni.navigateTo({
url: `/pages/users/order_list/relase?mer_id=${this.userInfoData
.service
.mer_id}&status=-1`
})
break;
default:
uni.navigateTo({
url: '/pages/moreProject/moreProject'
})

106
pages/moreProject/moreProject.vue
View File

@ -30,9 +30,8 @@
<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
</view>
<view class="content">
<view class="examine"
@click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFit"></image>
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
<image class="icon_img" src="@/static/images/index21.png" mode="aspectFit"></image>
<text class="text">在售管理</text>
</view>
<view class="examine"
@ -44,20 +43,19 @@
@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" src="@/static/images/index18.png" mode="aspectFit">
<text class="text">财务管理</text>
</view>
</view> -->
<view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" src="@/static/images/index1.png" mode="aspectFit">
<text class="text">订单管理</text>
</view> -->
</view>
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
<image class="icon_img" src="@/static/images/index9.png" mode="aspectFit">
</image>
<text class="text">入库管理</text>
</view>
<view class="examine"
@click="buyserset">
<view class="examine" @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
<text class="text">商户设置</text>
</view>
@ -72,8 +70,7 @@
</image>
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
</image>
<text class="text">订单核销</text>
@ -84,14 +81,12 @@
<text class="text">保证缴纳金</text>
</view>
<view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index13.png" mode="aspectFit">
</image>
<text class="text">委托销售</text>
</view>
<view class="examine"
@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
<view class="examine" @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
<image class="icon_img" src="@/static/images/index17.png" mode="aspectFit">
</image>
<text class="text">委托订单</text>
@ -141,13 +136,11 @@
<image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image>
<text class="text">供货采购</text>
</view>
<view class="examine"
@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<view class="examine" @click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
<text class="text">进货管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
</image>
<text class="text">扫码出库</text>
@ -164,14 +157,12 @@
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)">
<view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)">
<image class="icon_img" src="@/static/images/index6.png" mode="aspectFit">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
</image>
<text class="text">订单核销</text>
@ -182,14 +173,12 @@
</image>
<text class="text">订单管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)">
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)">
<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine"
@click="buyserset">
<view class="examine" @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image>
<text class="text">商户设置</text>
@ -200,26 +189,22 @@
<text class="text">保证缴纳金</text>
</view>
<view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index16.png" mode="aspectFit">
</image>
<text class="text">交易大厅</text>
</view>
<view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index13.png" mode="aspectFit">
</image>
<text class="text">委托销售</text>
</view>
<view class="examine"
@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
<view class="examine" @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
<image class="icon_img" src="@/static/images/index17.png" mode="aspectFit">
</image>
<text class="text">委托订单</text>
</view>
<view class="examine"
@click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
</image>
<text class="text">发布管理</text>
@ -266,8 +251,7 @@
<image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
<text class="text">进货管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
</image>
<text class="text">扫码出库</text>
@ -284,14 +268,12 @@
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)">
<view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)">
<image class="icon_img" src="@/static/images/index6.png" mode="aspectFit">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
</image>
<text class="text">订单核销</text>
@ -306,8 +288,7 @@
<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
</image>
</view>
<view class="examine"
@click="buyserset">
<view class="examine" @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image>
<text class="text">商户设置</text>
@ -351,14 +332,12 @@
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)">
<view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)">
<image class="icon_img" src="@/static/images/index6.png" mode="aspectFit">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
</image>
<text class="text">订单核销</text>
@ -369,14 +348,12 @@
</image>
<text class="text">订单管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)">
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)">
<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image>
<text class="text">商户设置</text>
@ -401,8 +378,7 @@
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
<view class="examine"
@click="buyserset">
<view class="examine" @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image>
<text class="text">商户设置</text>
@ -421,8 +397,7 @@
<view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount" style="width: 100%;height: 100% ;padding-top:120rpx ;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:60rpx"
@click="recuo">
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:60rpx" @click="recuo">
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
</view>
<div class="title">{{detail.title}}</div>
@ -460,9 +435,8 @@
<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' />
<input type="text" maxlength="30" placeholder="请输入开户行名称" v-model="merchantData.bank_username"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
@ -470,16 +444,16 @@
<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' />
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @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' />
<input type="text" placeholder="请输入开户行" v-model="merchantData.bank_opening" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
<view class="item">
@ -488,15 +462,13 @@
</view>
<view class="item-card">
<view class="item-carda" @click='uploadpic({type:1})'
v-if='merchantData.cardno_front.length==0'>
<view class="item-carda" @click='uploadpic({type:1})' v-if='merchantData.cardno_front.length==0'>
<image src="@/static/images/SFZZ.png" mode="aspectFit"></image>
</view>
<view class="item-carda" @click='DelPic({type:1})' v-else>
<image :src="merchantData.cardno_front" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='uploadpic({type:2})'
v-if='merchantData.cardno_back.length==0'>
<view class="item-cardb" @click='uploadpic({type:2})' v-if='merchantData.cardno_back.length==0'>
<image src="@/static/images/SFFF.png" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='DelPic({type:2})' v-else>
@ -510,15 +482,13 @@
<text class="item-name">银行卡反面:</text>
</view>
<view class="item-card">
<view class="item-carda" @click='uploadpic({type:3})'
v-if='merchantData.bank_front.length==0'>
<view class="item-carda" @click='uploadpic({type:3})' v-if='merchantData.bank_front.length==0'>
<image src="@/static/images/YHKZ.png" mode="aspectFit"></image>
</view>
<view class="item-carda" @click='DelPic({type:3})' v-else>
<image :src="merchantData.bank_front" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='uploadpic({type:4})'
v-if='merchantData.bank_back.length==0'>
<view class="item-cardb" @click='uploadpic({type:4})' v-if='merchantData.bank_back.length==0'>
<image src="@/static/images/YHKF.png" mode="aspectFit"></image>
</view>

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

@ -674,7 +674,7 @@
getCartList: function(isChange) {
let that = this;
getCartList({ product_type: 98 }).then(res => {
// console.log("购物车", res)
console.log("购物车", res)
this.type_id=res.data.list[0].type_id
res.data.list.forEach((item, index) => {
item.allCheck = true

4
pages/product/basicSet.vue
View File

@ -9,7 +9,7 @@
<block v-if="images[0].img">
<!-- <u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
@click="delImg(0)" mode="aspectFit"></u--image> -->
<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
<u--image :showLoading="true" :src="images[0].img" width="680rpx" height="210.53rpx" radius="4px"
@click="delImg(0)"></u--image>
</block>
<view v-else class="upload" @click="seleckImage(0)">
@ -56,7 +56,7 @@
<view class="street_bg">
<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
<block v-if="images[2].img">
<u--image :showLoading="true" :src="images[2].img" width="360px" height="210.53rpx" radius="4px"
<u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px"
@click="delImg(2)"></u--image>
</block>
<view v-else class="street_img flex_a_c" @click="seleckImage(2)">

2
pages/users/supply_procurement/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="conent">
<view class="con_kuo"
@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&credit_buy=0&product_type=98&cate_id=${id}`)">
@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
<view class="con_text">

BIN
static/images/index21.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB