mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/old/zmj' into old

Browse Source
This commit is contained in:
jia 2023-09-09 20:45:24 +08:00
commit 722d710af5
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
<template> <template>
<view :style="viewColor"> <view :style="viewColor">
<view class="head-menu">
<view class='iconfont icon-xiangzuo' @click="returns"></view>
</view>
<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false"> <view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false">
<view v-if="followDetail.status != 1" class="approval_status"> <view v-if="followDetail.status != 1" class="approval_status">
<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'"> <view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">
@ -255,6 +258,16 @@
}, },
mounted: function() {}, mounted: function() {},
methods: { methods: {
// 后退
returns() {
uni.navigateBack()
},
// 首页
goHome() {
uni.switchTab({
url: '/pages/index/index'
});
},
//分享 //分享
//#ifdef MP //#ifdef MP
plantShare(){ plantShare(){
@ -354,6 +367,9 @@
plantDetailApi(that.id).then(res => { plantDetailApi(that.id).then(res => {
that.loadData = false that.loadData = false
that.followDetail = res.data that.followDetail = res.data
that.followDetail.relevance=that.followDetail.relevance.filter(item=>{
return item.spu
})
uni.hideLoading() uni.hideLoading()
// #ifdef MP // #ifdef MP
that.plantShare(); that.plantShare();
@ -558,6 +574,12 @@
page{ page{
background: #ffffff; background: #ffffff;
} }
.head-menu{
height:50rpx;
padding-left: 20rpx;
line-height: 50rpx;
font-weight: bold;
}
.tab-cont{ .tab-cont{
background: #fff; background: #fff;
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;

2
pages/product/addGoods/secound.vue
View File

@ -249,8 +249,10 @@
video_link: this.addGoodsSecoundData.video_link video_link: this.addGoodsSecoundData.video_link
}; };
if(attrValue){
postData.attrValue = attrValue.filter(item => item != ''); postData.attrValue = attrValue.filter(item => item != '');
postData.attrValue[0].bar_code postData.attrValue[0].bar_code
}
// console.log(postData); // console.log(postData);
if (getStorage('addGoodsFormData').spec_type == 0) { if (getStorage('addGoodsFormData').spec_type == 0) {
// postData.attr = [getStorage('singleSpecification')]; // postData.attr = [getStorage('singleSpecification')];

5
pages/users/embody/embody.vue
View File

@ -447,6 +447,11 @@
console.log(res); console.log(res);
}).catch(err => { }).catch(err => {
Toast(err) Toast(err)
setTimeout(()=>{
uni.navigateBack({
delta: 1
})}, 1000)
}) })
}, },
async postCreate(price) { async postCreate(price) {