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-11 20:20:10 +08:00
parent 398fa9e769
commit 1e46d5a299
7 changed files with 1242 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +74,8 @@
已拒绝
</view>
<view class="contentgn">
<!-- <view class="contentgn_a" click="deleteOrder(item)">
删除
</view>
<span></span> -->
<!--
-->
<view class="contentgn_b" @click="detail(item)">
详情
</view>

236
pages/plantGrass/plant_detail/index.vue
View File

@ -9,7 +9,8 @@
<view v-if="followDetail.status != 1" class="approval_status">
<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">
<view class="status_title">
<text class="iconfont" :class="(followDetail.status == -1 || followDetail.status == -2) ? 'icon-tishi' : 'icon-shijian'"></text>
<text class="iconfont"
:class="(followDetail.status == -1 || followDetail.status == -2) ? 'icon-tishi' : 'icon-shijian'"></text>
<text v-if="followDetail.status == -1" class="title">审核未通过</text>
<text v-if="followDetail.status == -2" class="title">已下架</text>
<text v-if="followDetail.status == 0" class="title">正在审核</text>
@ -27,19 +28,24 @@
<view class="list_count">
<view v-if="followDetail.author" class="title">
<view class="author">
<navigator hover-class="none" :url="'/pages/plantGrass/plant_user/index?id='+followDetail.uid">
<image class="picture" :src="followDetail.author.avatar || '/static/images/f.png'" mode="aspectFit"></image>
<navigator hover-class="none"
:url="'/pages/plantGrass/plant_user/index?id='+followDetail.uid">
<image class="picture" :src="followDetail.author.avatar || '/static/images/f.png'"
mode="aspectFit"></image>
</navigator>
<view class="name acea-row">
<text>{{followDetail.author.nickname}}</text>
<image v-if="followDetail.author.member" class="level_icon" :src="followDetail.author.member.brokerage_icon" alt="">
<image v-if="followDetail.author.member" class="level_icon"
:src="followDetail.author.member.brokerage_icon" alt="">
</view>
</view>
<view class="author">
<view class="manageCount" v-if="followDetail.is_author">
<view class="follow_btn" @click.stop="showManage=!showManage">管理</view>
<view class="manage" v-show="showManage">
<navigator hover-class="none" :url="'/pages/plantGrass/plant_release/index?id='+id+'&type=1'" class="items">
<navigator hover-class="none"
:url="'/pages/plantGrass/plant_release/index?id='+id+'&type=1'"
class="items">
<text class="iconfont icon-bianji"></text>
<text>编辑</text>
</navigator>
@ -50,14 +56,18 @@
</view>
</view>
<view v-else @click.stop="followAuthor">
<view v-if="!followDetail.is_fans" class="follow_btn focus"><text class="iconfont icon-jiahao2"></text>关注</view>
<view v-if="!followDetail.is_fans" class="follow_btn focus"><text
class="iconfont icon-jiahao2"></text>关注</view>
<view v-else class="follow_btn focused">已关注</view>
</view>
<!-- #ifdef MP -->
<button v-if="followDetail.status == 1" class="time iconfont icon-fenxiang2" open-type="share" hover-class='none'></button>
<button v-if="followDetail.status == 1" class="time iconfont icon-fenxiang2"
open-type="share" hover-class='none'></button>
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<button v-if="followDetail.status == 1" @click="appShare('WXSceneSession',followDetail.community_id)" class="time iconfont icon-fenxiang2" hover-class='none'></button>
<button v-if="followDetail.status == 1"
@click="appShare('WXSceneSession',followDetail.community_id)"
class="time iconfont icon-fenxiang2" hover-class='none'></button>
<!-- #endif -->
</view>
</view>
@ -65,11 +75,14 @@
<productConSwiper :imgUrls="followDetail.image"></productConSwiper>
</view>
<view class="pro_describle">
<view class="mentioned" v-if="followDetail.relevance.length" @click="openMore(followDetail)">
<view class="mentioned" v-if="followDetail.relevance.length"
@click="openMore(followDetail)">
<text class="title">查看TA提到的宝贝({{followDetail.relevance.length}})</text>
<view class="product_more">
<view class="item">
<image v-if="indexn<=3" v-for="(itemn, indexn) in followDetail.relevance" :key="indexn" :src="(itemn.spu&&itemn.spu.image) || itemn.image" class="more_image"></image>
<image v-if="indexn<=3" v-for="(itemn, indexn) in followDetail.relevance"
:key="indexn" :src="(itemn.spu&&itemn.spu.image) || itemn.image"
class="more_image"></image>
</view>
<text class="iconfont icon-gengduo3"></text>
</view>
@ -79,9 +92,11 @@
{{followDetail.content}}
</text>
</view>
<navigator v-if="followDetail.topic" hover-class="none" class="product_cate" :url="'/pages/plantGrass/plant_search_list/index?id='+followDetail.topic.topic_id">
<navigator v-if="followDetail.topic" hover-class="none" class="product_cate"
:url="'/pages/plantGrass/plant_search_list/index?id='+followDetail.topic.topic_id">
<view>
<text class="icon">#</text><text class="text">{{followDetail.topic.topic_name}}</text>
<text class="icon">#</text><text
class="text">{{followDetail.topic.topic_name}}</text>
</view>
</navigator>
<view class="create_time">{{followDetail.create_time}}</view>
@ -93,7 +108,8 @@
<block v-if="commList.length > 0">
<view class="common_list" v-for="(item, index) in commList" :key="index">
<view v-if="item.author" @click.stop="toReply(item,index)" class="commen_one">
<image :src="item.author.avatar ? item.author.avatar : '/static/images/f.png'" class="image"></image>
<image :src="item.author.avatar ? item.author.avatar : '/static/images/f.png'"
class="image"></image>
</view>
<view class="info_count">
<view class="info">
@ -103,7 +119,8 @@
<view class="time">{{item.create_time}}</view>
</view>
<view class="like" @click.stop="starComment(item)">
<view class="iconfont" :class="item.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></view>
<view class="iconfont"
:class="item.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></view>
{{item.count_start}}
</view>
</view>
@ -111,16 +128,22 @@
<view v-for="(itemn,indexn) in item.children" :key="indexn" class="reply_list">
<view class="item">
<view class="item_count">
<image v-if="itemn.author" class="image" :src="itemn.author.avatar ? itemn.author.avatar : '/static/images/f.png'" @click.stop="toReply(itemn,index)"></image>
<view v-if="itemn.author" class="name_two">{{itemn.author.nickname}}</view>
<image v-if="itemn.author" class="image"
:src="itemn.author.avatar ? itemn.author.avatar : '/static/images/f.png'"
@click.stop="toReply(itemn,index)"></image>
<view v-if="itemn.author" class="name_two">{{itemn.author.nickname}}
</view>
<view class="desc_two" @click.stop="toReply(itemn,index)">
<text class="reply_user" v-if="itemn.reply">回复 @{{itemn.reply.nickname}} </text>
<text class="reply_user" v-if="itemn.reply">回复
@{{itemn.reply.nickname}} </text>
{{itemn.content}}
</view>
<view class="time_two">{{itemn.create_time}}</view>
</view>
<view class="like_two" @click.stop="starComment(itemn)">
<view class="iconfont":class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></view>
<view class="iconfont"
:class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'">
</view>
{{itemn.count_start}}
</view>
</view>
@ -139,7 +162,9 @@
<view v-if="followDetail.status == 1" class="release_bar acea-row">
<view class="input_count" :class="{input_reply:content}">
<form @submit="submitComment">
<input type="text" :placeholder="placeholder" placeholder-style="color: #999999; font-size: 26rpx;" v-model="content" :focus="focus" @confirm.stop="submitComment()" cursorSpacing={20}>
<input type="text" :placeholder="placeholder"
placeholder-style="color: #999999; font-size: 26rpx;" v-model="content"
:focus="focus" @confirm.stop="submitComment()" cursorSpacing={20}>
</form>
</view>
<view v-if="content">
@ -147,7 +172,8 @@
</view>
<view v-else class="input_bar acea-row">
<view class="item acea-row" @click.stop="likeToggle(followDetail.relevance_id)">
<text class="iconfont" :class="followDetail.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
<text class="iconfont"
:class="followDetail.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
<text>{{followDetail.count_start}}</text>
</view>
<view class="item acea-row">
@ -163,11 +189,13 @@
<view class="count">
<image src="../static/images/no_content.png"></image>
<text>内容不存在，可能被删除了哦~</text>
<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'" url="/pages/plant_grass/index">返回首页</navigator>
<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'"
url="/pages/plant_grass/index">返回首页</navigator>
</view>
</view>
<!-- 他提到的宝贝弹窗 -->
<mentioned ref="mentioned" v-if="followDetail" @close="close" :list="followDetail.relevance" :uid="followDetail.uid"></mentioned>
<mentioned ref="mentioned" v-if="followDetail" @close="close" :list="followDetail.relevance"
:uid="followDetail.uid"></mentioned>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<!-- 绑定手机号 -->
<uni-popup ref="bindmobile" type="bottom">
@ -187,17 +215,35 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
import { HTTP_REQUEST_URL } from '@/config/app.js';
import { getUserInfo } from '@/api/user.js';
import {plantDetailApi, replyLstApi, replyCreateApi, starCommentApi, deletePlantApi, followAuthorApi, graphicStartApi} from "@/api/community";
import { mapGetters } from "vuex";
import {
HTTP_REQUEST_URL
} from '@/config/app.js';
import {
getUserInfo
} from '@/api/user.js';
import {
plantDetailApi,
replyLstApi,
replyCreateApi,
starCommentApi,
deletePlantApi,
followAuthorApi,
graphicStartApi
} from "@/api/community";
import {
mapGetters
} from "vuex";
import shareScence from "@/libs/spread";
import authorize from '@/components/Authorize';
import productConSwiper from '@/components/plantConSwiper';
import mentioned from '@/components/mentioned.vue';
import bindmobile from '@/components/bindmobile.vue';
import { openPlantGrass } from "@/config/app.js";
import { configMap } from '@/utils';
import {
openPlantGrass
} from "@/config/app.js";
import {
configMap
} from '@/utils';
const app = getApp();
export default {
components: {
@ -238,7 +284,9 @@
}
},
created() {},
computed: configMap({community_reply_status:0},mapGetters(['isLogin', 'uid', 'viewColor'])),
computed: configMap({
community_reply_status: 0
}, mapGetters(['isLogin', 'uid', 'viewColor'])),
watch: {},
onLoad: function(options) {
let that = this
@ -422,7 +470,10 @@
createReply() {
let that = this;
let reply_id = that.reply_id ? that.reply_id : 0
replyCreateApi(that.id,{content: that.content,reply_id: reply_id}).then(res => {
replyCreateApi(that.id, {
content: that.content,
reply_id: reply_id
}).then(res => {
if (res.status === 200 && res.data.status == 1) {
if (that.isChild) {
if (that.commList[that.index]['children']) {
@ -469,7 +520,9 @@
this.isShowAuth = true
} else {
let status = item.relevance_id ? 0 : 1
starCommentApi(item.reply_id,{status: status}).then(res => {
starCommentApi(item.reply_id, {
status: status
}).then(res => {
if (res.status === 200) {
if (item.relevance_id) {
item.count_start--;
@ -501,10 +554,13 @@
this.isShowAuth = true
} else {
let status = id ? 0 : 1
graphicStartApi(this.followDetail.community_id,{status: status}).then(res => {
graphicStartApi(this.followDetail.community_id, {
status: status
}).then(res => {
if (id) {
this.followDetail.count_start--;
this.followDetail.count_start = this.followDetail.count_start == 0 ? 0 : this.followDetail.count_start
this.followDetail.count_start = this.followDetail.count_start == 0 ? 0 : this
.followDetail.count_start
this.followDetail.relevance_id = false
} else {
this.followDetail.count_start++;
@ -520,7 +576,9 @@
this.isShowAuth = true
} else {
let status = this.followDetail.is_fans == 0 ? 1 : 0
followAuthorApi(this.followDetail.uid,{status:status}).then(res => {
followAuthorApi(this.followDetail.uid, {
status: status
}).then(res => {
if (res.status === 200) {
this.followDetail.is_fans = this.followDetail.is_fans == 0 ? 1 : 0
}
@ -576,47 +634,60 @@
page {
background: #ffffff;
}
.head-menu {
height: 50rpx;
padding-left: 20rpx;
line-height: 50rpx;
font-weight: bold;
}
.tab-cont {
background: #fff;
border-radius: 16rpx 16rpx 0 0;
}
.approval_status {
padding: 20rpx;
.status_count {
padding: 26rpx 30rpx 20rpx;
border-radius: 10rpx;
.title {
margin-left: 10rpx;
font-size: 28rpx;
font-weight: bold;
}
&.status0 {
background: #FDF3F2;
.title {
color: #E93323;
}
}
&.status1 {
background: #FFF4EB;
.title {
color: #FC8327;
}
}
.iconfont {
font-size: 30rpx;
}
.icon-shijian {
color: #FC8327;
}
.icon-tishi {
color: #E93323;
}
.status_info {
font-size: 22rpx;
color: #666666;
@ -624,22 +695,28 @@ page{
}
}
}
.follow_count {
padding: 20rpx;
border-bottom: 1px solid #F5F5F5;
.title {
display: flex;
align-items: center;
justify-content: space-between;
}
.author {
display: flex;
align-items: center;
.picture, uni-image{
.picture,
uni-image {
width: 78rpx;
height: 78rpx;
border-radius: 100%;
}
.name {
margin-left: 20rpx;
color: #333333;
@ -647,6 +724,7 @@ page{
font-weight: bold;
align-items: center;
}
.follow_btn {
margin-right: 24rpx;
width: 112rpx;
@ -658,20 +736,24 @@ page{
border-radius: 33rpx;
color: #282828;
border: 1px solid #282828;
&.focus {
color: var(--view-theme);
border: 1px solid var(--view-theme);
.iconfont {
font-size: 15rpx;
margin-right: 5rpx;
}
}
&.focused {
background: #EEEEEE;
border: 1px solid #EEEEEE;
color: #999999;
}
}
.level_icon {
width: 34rpx;
height: 32rpx;
@ -679,16 +761,20 @@ page{
border: none;
}
}
.time {
color: #282828;
font-size: 46rpx;
}
.product {
margin-top: 20rpx;
border-radius: 16rpx;
}
.manageCount {
position: relative;
.manage {
width: 210rpx;
background: #ffffff;
@ -699,6 +785,7 @@ page{
left: -20rpx;
z-index: 10;
border-radius: 16rpx;
&::before {
content: "";
display: inline-block;
@ -711,6 +798,7 @@ page{
left: 30rpx;
box-shadow: -1rpx -1rpx 1rpx rgba(0, 0, 0, 0.05);
}
.items {
border-bottom: 1px solid #EEEEEE;
color: #282828;
@ -718,9 +806,11 @@ page{
padding: 20rpx 0;
display: flex;
align-items: center;
&:last-child {
border-bottom: none;
}
.iconfont {
margin: 0 16rpx 0;
}
@ -728,6 +818,7 @@ page{
}
}
}
.pro_describle {
.create_time {
color: #CCCCCC;
@ -735,21 +826,25 @@ page{
margin-left: 10rpx;
margin-top: 5rpx;
}
.mentioned {
padding: 20rpx 0;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #F5F5F5;
.title {
color: #666666;
font-size: 26rpx;
}
}
.product_more {
max-width: 360rpx;
display: flex;
align-items: center;
.more_image {
width: 58rpx;
height: 58rpx;
@ -757,14 +852,17 @@ page{
border: 1px solid #BBBBBB;
margin-right: 12rpx;
}
.iconfont {
color: #CCCCCC;
margin-left: 10rpx;
}
}
.product_info {
line-height: 45rpx;
margin: 20rpx 0;
.text {
font-size: 28rpx;
color: #282828;
@ -772,6 +870,7 @@ page{
text-justify: newspaper;
word-break: break-all;
}
.unfold_btn {
margin-left: 30rpx;
font-size: 30rpx;
@ -779,9 +878,11 @@ page{
font-weight: bold;
}
}
.product_cate {
margin: 20rpx 0;
display: inline-block;
>view {
display: flex;
align-items: center;
@ -791,9 +892,11 @@ page{
line-height: 56rpx;
height: 56rpx;
color: var(--view-theme);
.text {
font-size: 28rpx;
}
.icon {
font-size: 35rpx;
font-weight: bold;
@ -805,11 +908,13 @@ page{
.main_count {
padding: 30rpx 20rpx;
.list {
width: 710rpx;
height: 280rpx;
margin-bottom: 30rpx;
position: relative;
.picture {
width: 710rpx;
height: 280rpx;
@ -817,16 +922,19 @@ page{
}
}
}
.commend_list {
margin-top: 30rpx;
padding: 0 20rpx;
position: relative;
padding-bottom: 120rpx;
.commen_count {
font-size: 26rpx;
color: #282828;
margin: 30rpx 0;
}
.common_list {
position: relative;
padding-left: 94rpx;
@ -835,43 +943,57 @@ page{
position: absolute;
top: 0;
left: 0;
.image,uni-image{
.image,
uni-image {
width: 74rpx;
height: 74rpx;
border-radius: 100%;
}
}
.info_count {
margin-bottom: 20rpx;
}
.info {
position: relative;
padding-right: 90rpx;
}
.name,.name_two{
.name,
.name_two {
color: #999999;
font-size: 26rpx;
}
.desc,.desc_two{
.desc,
.desc_two {
color: #282828;
font-size: 28rpx;
margin-top: 10rpx;
display: inline-block;
}
.desc_two {
font-size: 26rpx;
.reply_user {
font-size: 24rpx;
color: #4A8AC9;
margin: 0 6rpx;
}
}
.time,.time_two{
.time,
.time_two {
color: #BBBBBB;
font-size: 22rpx;
margin-top: 15rpx;
}
.like,.like_two{
.like,
.like_two {
color: #999999;
font-size: 26rpx;
text-align: center;
@ -879,20 +1001,26 @@ page{
top: 0;
right: 0;
width: 75rpx;
.icon-yidianzan {
color: var(--view-theme);
}
}
.reply_list {
margin-top: 20rpx;
.item {
padding-right: 140rpx;
position: relative;
}
.item_count {
position: relative;
padding-left: 56rpx;
.image,un-image{
.image,
un-image {
width: 36rpx;
height: 36rpx;
border-radius: 100%;
@ -904,26 +1032,33 @@ page{
}
}
}
.no_content,.main{
.no_content,
.main {
min-height: 100vh;
background: #fff;
position: relative;
.count {
position: absolute;
text-align: center;
width: 100%;
top: 50%;
margin-top: -300rpx;
image,uni-image{
image,
uni-image {
width: 424rpx;
height: 305rpx;
}
text {
display: block;
color: #999999;
font-size: 26rpx;
}
}
.btn {
width: 440rpx;
text-align: center;
@ -935,6 +1070,7 @@ page{
font-size: 32rpx;
}
}
.release_bar {
align-items: center;
width: 100%;
@ -946,33 +1082,41 @@ page{
z-index: 10;
border-top: 1px solid #F5F5F5;
justify-content: space-between;
.input_count {
width: 530rpx;
background: #F7F7F7;
border-radius: 30rpx;
padding: 12rpx 30rpx;
input {
font-size: 26rpx;
}
}
.input_bar {
align-items: center;
color: #282828;
font-size: 26rpx;
.iconfont {
font-size: 40rpx;
margin-right: 6rpx;
}
.icon-shoucang1 {
color: var(--view-theme);
}
.item {
align-items: center;
&:first-child {
margin-right: 25rpx;
}
}
}
.send {
font-size: 26rpx;
color: #ffffff;
@ -982,14 +1126,18 @@ page{
text-align: center;
}
}
.empty {
margin: 130rpx 0 150rpx;
text-align: center;
image,uni-image{
image,
uni-image {
display: inline-block;
width: 414rpx;
height: 305rpx;
}
text {
display: block;
color: #999999;

4
pages/product/addGoods/index.vue
View File

@ -169,7 +169,7 @@
</checkbox-group>
</view>
<view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
<!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
<view class="popup_group_item_label">是否包邮</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
@ -177,7 +177,7 @@
style="transform:scale(0.8)" @change="deliveryFreeChange" disabled="true"/>
</view>
</view>
</view>
</view> -->
<view class="popup_group_item"
v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"

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

File diff suppressed because one or more lines are too long

2
pages/supply_chains/supply_chains.vue
View File

@ -539,7 +539,7 @@
this.street_id = e.value[1].code
this.town = e.value[1].name
this.productList=[]
this.list(this.street_id)
this.list(true,this.street_id)
},
selfLocation() {
if (uni.getStorageSync('loction') == true) {

6
pages/trading_hall/adddiscounts/index.vue
View File

@ -373,14 +373,8 @@
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
this.merId = res.data.service.mer_id
})
},
// 是否包邮选择
deliveryFreeChange(val) {