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-06 17:44:22 +08:00
parent f5a0cab1eb
commit 70697b98eb
15 changed files with 122 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
App.vue
View File

@ -396,9 +396,16 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: -40rpx; margin-top: -50rpx;
// box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3); // box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3);
} }
.custom_style-txt{
display: flex;
flex-direction: column;
align-items: center;
margin-top: 5rpx;
}
} }
.bg-color-red { .bg-color-red {

11
components/realselist/realselist.vue
View File

@ -9,7 +9,7 @@
</view> </view>
<view class="iconclose" @click="close"> <view class="iconclose" @click="close">
X <image src="@/static/images/wt_close.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<view class="main"> <view class="main">
@ -395,13 +395,18 @@
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
line-height: 44rpx; line-height: 44rpx;
border: 2rpx solid #fff;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
color: #fff;
position: absolute; position: absolute;
top: -150rpx; top: -150rpx;
right: 30rpx; right: 30rpx;
image {
width: 100%;
height: 100%;
}
} }
.search { .search {

13
components/shoppinglist/shoppinglist.vue
View File

@ -9,7 +9,7 @@
</view> </view>
<view class="iconclose" @click="close"> <view class="iconclose" @click="close">
X <image src="@/static/images/wt_close.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<view class="main"> <view class="main">
@ -352,8 +352,6 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.containers { .containers {
background: #ffffff; background: #ffffff;
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
@ -397,13 +395,18 @@
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
line-height: 44rpx; line-height: 44rpx;
border: 2rpx solid #fff;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
color: #fff;
position: absolute; position: absolute;
top: -150rpx; top: -150rpx;
right: 30rpx; right: 30rpx;
image {
width: 100%;
height: 100%;
}
} }
.search { .search {

1
components/subtractive/subtractive.vue
View File

@ -114,6 +114,7 @@
return; return;
} }
this.inputValue = newValue / scale; this.inputValue = newValue / scale;
this.$emit('increment',this.inputValue)
}, },
_getDecimalScale() { _getDecimalScale() {
let scale = 1; let scale = 1;

2
pages.json
View File

@ -1529,11 +1529,13 @@
"selectedColor": "#E93323", "selectedColor": "#E93323",
"borderStyle": "white", "borderStyle": "white",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [{ "list": [{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "static/tabbar_icon/a.png", "iconPath": "static/tabbar_icon/a.png",
"selectedIconPath": "static/tabbar_icon/a-a.png", "selectedIconPath": "static/tabbar_icon/a-a.png",
"text": "泸州" "text": "泸州"
}, },
{ {
"pagePath": "pages/gather/gather", "pagePath": "pages/gather/gather",

40
pages/commissionedSales/addDelegation/index.vue
View File

@ -1,12 +1,9 @@
<template> <template>
<!-- #ifdef APP || H5 --> <view class="content">
<view>
<!-- #endif -->
<form @submit="formSubmit" report-submit='true'> <form @submit="formSubmit" report-submit='true'>
<view class="release_content"> <view class="release_content">
<view class="release_item"> <view class="release_item">
<view class="release_item-one"> <view class="release_item-one">
<view class="item-one"> <view class="item-one">
@ -38,7 +35,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content_center-one" v-for="(item,i) in productList" :key="i"> <view class="content_center-one" v-for="(item,i) in productList" :key="i">
<view class="center-one"> <view class="center-one">
<view class="center-one-img"> <view class="center-one-img">
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
@ -60,22 +57,17 @@
</view> </view>
</view> </view>
<button class="release_btn button" form-type="submit">发布</button>
</view> </view>
</form> </form>
<button class="release_btn button" form-type="submit">提交</button>
<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar" <uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm" :startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
:showMonth="info.showMonth" @close="close" /> :showMonth="info.showMonth" @close="close" />
<!-- 提到的宝贝弹窗 --> <!-- 提到的宝贝弹窗 -->
<uni-popup ref="associated" type="bottom"> <uni-popup ref="associated" type="bottom">
<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated> <associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
@ -132,7 +124,7 @@
// 日历确定 // 日历确定
confirm(e) { confirm(e) {
let self = this let self = this
if (e.range.after && e.range.before) { if (e.range.after && e.range.before) {
let star = new Date(e.range.after).getTime() let star = new Date(e.range.after).getTime()
@ -140,8 +132,8 @@
let arr = stop - star let arr = stop - star
this.date = Math.floor(arr / (24 * 3600 * 1000)); this.date = Math.floor(arr / (24 * 3600 * 1000));
// console.log(days) // console.log(days)
if(this.date<0){ if (this.date < 0) {
this.date=this.date*-1 this.date = this.date * -1
} }
} }
}, },
@ -158,12 +150,16 @@
}, },
//获取商品信息 //获取商品信息
getProduct(data) { getProduct(data) {
console.log(data)
this.$refs.associated.close() this.$refs.associated.close()
}, },
//提交 //提交
formSubmit(e) { formSubmit(e) {
console.log(e) console.log(e)
this.$util.Tips({
title: res.message,
icon: 'success'
})
} }
} }
} }
@ -174,6 +170,10 @@
background: #F5F5F5; background: #F5F5F5;
} }
.content {
height: 100vh;
position: relative;
}
.release_content { .release_content {
@ -418,6 +418,10 @@
} }
.release_btn { .release_btn {
margin-top: 100rpx;
position: absolute;
bottom: 150rpx;
left: 50%;
margin-left: -347rpx;
} }
</style> </style>

4
pages/commissionedSales/delegation_details/index.vue
View File

@ -117,7 +117,7 @@
<view class="center-twoa"> <view class="center-twoa">
拒绝原因: 拒绝原因:
</view> </view>
<view class="center-twob"> <view class="center-twob" style="text-align: left;">
通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺 通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺
</view> </view>
</view> </view>
@ -272,7 +272,7 @@
.center-twob { .center-twob {
width: 360rpx; width: 360rpx;
text-align: right; text-align: right;
border: 1px solid;
word-wrap: break-word; word-wrap: break-word;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;

8
pages/commissionedSales/initiateDelegation/index.vue
View File

@ -317,6 +317,10 @@
// url: '/pages/commissionedSales/delegation_details/index' // url: '/pages/commissionedSales/delegation_details/index'
// }) // })
}, },
//获取分类数据
commislist(){
},
//选择 //选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
@ -808,7 +812,7 @@
.entrust_bg-content { .entrust_bg-content {
position: absolute; position: absolute;
top: 404rpx; top: 304rpx;
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
@ -854,7 +858,7 @@
.bg-content_textarea { .bg-content_textarea {
width: 624rpx; width: 624rpx;
height: 152rpx; height: 242rpx;
padding: 25rpx 18rpx; padding: 25rpx 18rpx;
background: #F5F5F5; background: #F5F5F5;

4
pages/commissionedSales/receivedCommission/index.vue
View File

@ -738,7 +738,7 @@
.entrust_bg-content { .entrust_bg-content {
position: absolute; position: absolute;
top: 404rpx; top: 304rpx;
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
@ -784,7 +784,7 @@
.bg-content_textarea { .bg-content_textarea {
width: 624rpx; width: 624rpx;
height: 152rpx; height: 242rpx;
padding: 25rpx 18rpx; padding: 25rpx 18rpx;
background: #F5F5F5; background: #F5F5F5;

5
pages/gather/gather.vue
View File

@ -74,6 +74,9 @@
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon"></view> <view class="custom_style_icon"></view>
<view class="custom_style-txt" style="color: #282828;">
发布
</view>
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
@ -357,7 +360,6 @@
}, },
confirm(e) { confirm(e) {
this.street = e.value[1].name this.street = e.value[1].name
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
}) })
@ -383,7 +385,6 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + this.$bus.$emit('value-updated', this.street + ',' +
street_id); street_id);
}) })
}).catch(err => { }).catch(err => {

19
pages/index/index.vue
View File

@ -42,10 +42,13 @@
<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" /> <u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
<!-- <view class="bg_color"></view> --> <!-- <view class="bg_color"></view> -->
<!-- <m-tabbar native> <!--<m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon"></view> <view class="custom_style_icon"></view>
<view class="custom_style-txt" style="color: #282828;">
发布
</view>
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
@ -197,13 +200,13 @@
// #endif // #endif
}, },
onTabItemTap(e) { onTabItemTap(e) {
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
}, },
onReachBottom() { onReachBottom() {
if (this.status == 'nomore') return; if (this.status == 'nomore') return;
@ -249,7 +252,7 @@
this.backColor = 'rgba(252, 252, 252, 1.0)' this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true this.isFshow = true
this.show = false this.show = false
this.$nextTick(()=>{ this.$nextTick(() => {
uni.setTabBarItem({ uni.setTabBarItem({
index: 0, index: 0,
text: '返回顶部', text: '返回顶部',

4
pages/moreProject/moreProject.vue
View File

@ -124,7 +124,7 @@
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
<view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image> </image>
@ -140,7 +140,7 @@
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image> </image>
<text class="text">发布管理</text> <text class="text">发布管理</text>
</view> </view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)"> <!-- <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"> <image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image> </image>

36
pages/plant_release/index.vue
View File

@ -140,11 +140,11 @@
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
</authorize> </authorize>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon" style="margin-top: -50rpx;"></view> <view class="custom_style_icon"></view>
<view class="" style="color: red;"> <view class="custom_style-txt" style="color: red;">
发布 发布
</view> </view>
</view> </view>
@ -680,6 +680,36 @@
page { page {
background: #F5F5F5; background: #F5F5F5;
} }
.custom_style {
color: #fff;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 24rpx;
&_icon {
background-image: url('@/static/tabbar_icon/d-a.png');
background-repeat: no-repeat;
background-size: cover;
font-size: 80rpx;
width: 100rpx;
height: 100rpx;
border-radius: 100%;
display: flex;
justify-content: center;
align-items: center;
margin-top: -50rpx;
// box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3);
}
.custom_style-txt{
display: flex;
flex-direction: column;
align-items: center;
margin-top: 5rpx;
}
}
.crop_btn { .crop_btn {
line-height: 90rpx; line-height: 90rpx;

14
pages/supply_chains/supply_chains.vue
View File

@ -132,11 +132,13 @@
<view class="locationa"> 位置权限使用说明 </view> <view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view> <view class="locationb"> 用于向你推荐最近门店 </view>
</view> </view>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon"></view> <view class="custom_style_icon"></view>
</view> <view class="custom_style-txt" style="color: #282828;">
发布
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
</view> </view>
@ -237,6 +239,7 @@
}, },
onLoad() { onLoad() {
this.list() this.list()
this.Area() this.Area()
@ -320,7 +323,9 @@
if (id) { if (id) {
spuInfo(id, this.where1).then(res => { spuInfo(id, this.where1).then(res => {
this.cateGoods.push(...res.data.list) this.cateGoods.push(...res.data.list)
}) })
} else { } else {
getProductHot(this.where.page, this.where.limit).then(res => { getProductHot(this.where.page, this.where.limit).then(res => {
this.cateGoods.push(...res.data.list) this.cateGoods.push(...res.data.list)
@ -390,7 +395,8 @@
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
this.cateGoods=[]
this.list(this.street_id)
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
@ -480,6 +486,8 @@
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
this.cateGoods=[]
this.list(this.street_id)
}, },
selfLocation() { selfLocation() {
if (uni.getStorageSync('loction') == true) { if (uni.getStorageSync('loction') == true) {

3
pages/user/index.vue
View File

@ -228,6 +228,9 @@
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon"></view> <view class="custom_style_icon"></view>
<view class="custom_style-txt" style="color: #282828;">
发布
</view>
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->