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

部分bug修复

Browse Source
This commit is contained in:
THK3121 2023-07-19 10:06:51 +08:00
parent 5ce6dd0e9e
commit 00f73db305
9 changed files with 168 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/orderGoods/index.vue
View File

@ -24,8 +24,8 @@
<!--定金预售-->
<text v-if="item.cart_info.productPresell.presell_type === 2">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
</view>
<view class="right-btn-box event_box">
<view class="btn-item" v-if="item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
<view class="right-btn-box event_box" >
<view class="btn-item" v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate!=2" @click.stop="refund(item)">申请退款</view>
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.is_refund==0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
@ -70,10 +70,10 @@
</view>
</view>
</view>
<view class="right-btn-box">
<view class="right-btn-box" >
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
<view class="btn-item" v-if="item.is_reply == 0 && evaluate !==2 && item.is_refund < 1" @click.stop="refund(item)">申请退款</view>
<view class="btn-item" v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate!=2" @click.stop="refund(item)">申请退款</view>
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
</view>

15
pages/admin/orderList/index.vue
View File

@ -135,14 +135,14 @@
<span v-if="where.status <= 1">应</span>
<span v-else>已</span>
支付
<span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
</view>
<view class="public-total" v-else >
先货后款
<span v-if="where.status <= 1">应</span>
<span v-else>已</span>
支付
<span class="money">￥0.00</span> (邮费 ¥{{ item.pay_postage}})
<span class="money" style="margin-right: 30rpx;">￥0.00</span> (邮费 ¥{{ item.pay_postage}})
</view>
<view class="public-total" v-if="item.pay_type == 8 ">
共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }}
@ -157,9 +157,9 @@
<view class="bnt" v-if="item.pay_type == 8 && item.status == 12 " @click="tongyi(item.group_order_id,2)">
拒绝
</view>
<view class="bnt" @click="modify(item, 0)" v-if="where.status == 1 && item.activity_type != 2">
一键改价
</view>
<view class="bnt" @click="modify(item, 0)" v-if="item.pay_type !=8 && item.paid !=1 ">
一键改价
</view>
<view class="bnt" @click="modify(item, 1)">订单备注</view>
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0" @click="toPostage(item)">去发货
</view>
@ -303,6 +303,7 @@
res => {
that.loading = false;
that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1;
},
@ -317,7 +318,9 @@
that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1;
console.log(that.list);
console.log(that.list)
// console.log(that.list);
},
err => {
that.$util.Tips({ title: err });

6
pages/columnGoods/goods_search/index.vue
View File

@ -158,9 +158,9 @@
} else {
this.$set(this, 'searchValue', event);
}
this.$nextTick(() => {
this.focus = true
})
// this.$nextTick(() => {
// this.focus = true
// })
this.searchBut()
},
setValue: function(event) {

84
pages/news_details/index.vue
View File

@ -33,7 +33,7 @@
<button class="bnt bg-color" open-type="share" hover-class='none'>和好友一起分享</button>
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<button class="bnt bg-color" open-type="share" hover-class='none' @click="listenerActionSheet" >和好友一起分享</button>
<button class="bnt bg-color" open-type="share" hover-class='none' @click="uniShare" >分享</button>
<!-- #endif -->
</view>
<shareInfo @setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></shareInfo>
@ -57,12 +57,22 @@
} from '@/api/api.js';
import shareInfo from '@/components/shareInfo';
import home from '@/components/home';
import UniShare from 'uni_modules/uni-share/js_sdk/uni-share.js';
const uniShare = new UniShare();
export default {
components: {
shareInfo,
home,
"jyf-parser": parser,
},
onBackPress({from}) {
if(from=='backbutton'){
this.$nextTick(function(){
uniShare.hide()
})
return uniShare.isShow;
}
},
data() {
return {
id: 0,
@ -96,6 +106,78 @@
this.getArticleOne();
},
methods: {
// 分享
uniShare() {
uniShare.show({
content: { //公共的分享参数配置 类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
type: 0,
href: 'https://uniapp.dcloud.io/',
title: '标题',
summary: '描述',
imageUrl: 'https://img-cdn-aliyun.dcloud.net.cn/stream/icon/__UNI__HelloUniApp.png'
},
menus: [{
"img": "/static/app-plus/sharemenu/wechatfriend.png",
"text": "微信好友",
"share": { //当前项的分享参数配置。可覆盖公共的配置如下：分享到微信小程序，配置了type=5
"provider": "weixin",
"scene": "WXSceneSession"
}
},
{
"img": "/static/app-plus/sharemenu/wechatmoments.png",
"text": "微信朋友圈",
"share": {
"provider": "weixin",
"scene": "WXSceneTimeline"
}
},
{
"img": "/static/app-plus/sharemenu/mp_weixin.png",
"text": "微信小程序",
"share": {
provider: "weixin",
scene: "WXSceneSession",
type: 5,
miniProgram: {
id: '123',
path: '/pages/list/detail',
webUrl: '/#/pages/list/detail',
type: 0
},
}
},
{
"img": "/static/app-plus/sharemenu/weibo.png",
"text": "微博",
"share": {
"provider": "sinaweibo"
}
},
{
"img": "/static/app-plus/sharemenu/qq.png",
"text": "QQ",
"share": {
"provider": "qq"
}
},
{
"img": "/static/app-plus/sharemenu/copyurl.png",
"text": "复制",
"share": "copyurl"
},
{
"img": "/static/app-plus/sharemenu/more.png",
"text": "更多",
"share": "shareSystem"
}
],
cancelText: "取消分享",
}, e => { //callback
console.log(uniShare.isShow);
console.log(e);
})
},
getArticleOne: function() {
let that = this;
getArticleDetails(that.id).then(res => {

4
pages/order_details/index.vue
View File

@ -3,6 +3,7 @@
<view class='order-details'>
<!-- 给header上与data上加on为退款订单-->
<!--预售-->
<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)">
<view class='header presell_header'
:style="{ 'background-image': `url(${imgUrl}/static/diy/presell_bg${keyColor}.jpg)`}"
@ -142,6 +143,7 @@
:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
</block>
</block>
<div v-if="orderInfo.merchant && orderInfo.merchant.services_type == 1" class="goodCall" @click="call">
<text class="iconfont icon-kefu"></text><text style="font-size: 28rpx;">联系客服</text>
</div>
@ -186,6 +188,7 @@
<view class="conter remark">{{ orderInfo.remark }}</view>
</view>
</view>
<view class='wrapper'>
<view class='item acea-row row-between'>
<view>订单编号：</view>
@ -1588,6 +1591,7 @@
.guanbi {
position: absolute;
right: 0px;
top:120rpx;
z-index: 1;
width: 30px;
height: 30px;

20
pages/plant_release/index.vue
View File

@ -35,7 +35,7 @@
</view>
<text class="video-text">点击可预览视频</text>
<view class="close_btn" @click="formData.video_link = ''"><text
<view class="close_btn" @click="delVideo"><text
class="iconfont icon-guanbi4"></text></view>
</view>
<view v-else class="pictrue acea-row row-center-wrapper row-column add" @click="uploadVideo">
@ -253,6 +253,7 @@
this.productList=[]
this.topicName={}
},
methods: {
onLoadFun() {
this.isShowAuth = false;
@ -442,6 +443,10 @@
let that = this
that.formData.image.splice(index, 1);
},
/*删除视频*/
delVideo(){
this.formData.video_link='';
},
/*添加宝贝*/
addProduct() {
this.$refs.associated.open();
@ -530,7 +535,7 @@
setTimeout(function() {
if (that.tabActive == 2) {
uni.redirectTo({
uni.navigateTo({
//#ifdef APP
url: '/pages/short_video/appSwiper/index?id=' + res.data.community_id + '&user=1&uid=' +
that.uid
@ -541,8 +546,9 @@
//#endif
});
} else {
uni.redirectTo({
url: '/pages/plantGrass/plant_detail/index?id=' + res.data.community_id + '&type=' + that.tabActive
uni.navigateTo({
url: '/pages/plantGrass/plant_detail/index?id=' + res.data.community_id + '&type=' + that
.tabActive
})
}
/**
@ -573,7 +579,7 @@
setStorage('addPlant', '');
setTimeout(function() {
if (that.tabActive == 2) {
uni.redirectTo({
uni.navigateTo({
//#ifdef APP
url: '/pages/short_video/appSwiper/index?id=' + res.data.community_id + '&user=1&uid=' +
that.uid
@ -584,7 +590,7 @@
//#endif
});
} else {
uni.redirectTo({
uni.navigateTo({
url: '/pages/plantGrass/plant_detail/index?id=' + res.data.community_id + '&type=' + that
.tabActive
})
@ -719,7 +725,7 @@
display: flex;
align-items: center;
justify-content: center;
z-index: 0;
z-index: 999;
.iconfont {
color: #ffffff;

26
pages/users/gather_list/index.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="list">
<view class="list">
<view class="head">
<view class="head_conent">
<view class="tatil">
@ -8,8 +8,9 @@
<h3>提现次数</h3>
</view>
<view class="sum">
<u-count-to :startVal="0" :endVal="sum"></u-count-to>
<u-count-to :startVal="0" :endVal="sumTofixed" :decimals="2"></u-count-to>
<h3>提现总额</h3>
</view>
</view>
</view>
@ -66,7 +67,11 @@
UserApplylist:[]
}
},
computed: {},
computed: {
sumTofixed(){
return this.returnFloat(this.sum)
}
},
watch: {
},
@ -79,6 +84,21 @@
// })
},
methods: {
/**数字强制转为两位小数*/
returnFloat(value){
var value=Math.round(parseFloat(value)*100)/100;
var xsd=value.toString().split(".");
if(xsd.length==1){
value=value.toString()+".00";
return value;
}
if(xsd.length>1){
if(xsd[1].length<2){
value=value.toString()+"0";
}
return value;
}
},
tixian() {
uni.navigateBack({
delta: 1

18
pages/users/online_warehousing/index.vue
View File

@ -54,22 +54,24 @@
立即导入</view>
</view> -->
</view>
</view>
<view class="totalfooter">
<view class='bnt b-color' v-if="item.orderProduct[indexs]"
@click="importshop(item.order_id,item.orderProduct[index].product_id,item.orderProduct[index].cart_info.productAttr.product_sku)">
立即导入</view>
</view>
</view>
</block>
</view>
</view>
<view class='totalPrice'>
共1件商品，总金额
共{{item.orderProduct.length}}件商品，总金额
<text class='money'>￥{{item.pay_price}}</text>
</view>
<view class="totalfooter">
<!-- <view class="totalfooter">
<view class='bnt b-color' v-if="item.orderProduct[index]"
@click="importshop(item.order_id,item.orderProduct[index].product_id,item.orderProduct[index].cart_info.productAttr.product_sku)">
立即导入</view>
</view>
<view>
{{item.orderProduct[0].is_imported}}
</view>
</view> -->
</view>
</view>
</block>
@ -87,7 +89,7 @@
</view>
</view>
</u-popup>
<Loading :loaded="loaded" :loading="loading"></Loading>
<!-- <Loading :loaded="loaded" :loading="loading"></Loading> -->
</view>
</template>

42
pages/users/order_list/index.vue
View File

@ -103,9 +103,9 @@
<view>x{{goods.product_num}}</view>
</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
<view>
先货后款 实付:￥0.00
</view>
<view class='totalPrice' style="margin-right: 50rpx;" >先货后款 实付款:
<text class='money p-color'>￥0.00</text>
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
@ -138,7 +138,7 @@
<view>x{{goods.product_num}}</view>
<!-- <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
<view>
先货后款 实付:￥0.00
先货后款,实付:￥0.00
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
@ -154,11 +154,11 @@
</block>
</view>
</view>
<view class='totalPrice' style="margin-right: 15px;" v-if="item.pay_type !== 8">
<view class='totalPrice' style="margin-right: 20px;" v-if="item.pay_type !== 8">
共{{item.total_num || 0}}件商品，总金额
<text class='money p-color'>￥{{item.pay_price}}</text>
</view>
<view class='totalPrice' style="margin-right: 15px;" v-else>先货后款 实付款:
<view class='totalPrice' style="margin-right: 20px;" v-else>先货后款 实付款:
<text class='money p-color'>￥0.00</text>
</view>
<view class="totalPrice" style="margin-right: 15px;" v-if="item.pay_type == 8">
@ -226,9 +226,9 @@
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
<view>x{{goods.product_num}}</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 0">
<view>
先货后款 实付:￥0.00
</view>
<view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款:
<text class='money p-color'>￥0.00</text>
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
@ -262,9 +262,9 @@
￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
<view>x{{goods.product_num}}</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
<view>
先货后款 实付:￥0.00
</view>
<view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款:
<text class='money p-color'>￥0.00</text>
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
@ -286,10 +286,10 @@
共{{item.orderNum || 0}}件商品，总金额
<text class='money p-color'>￥{{item.presell_price}}</text>
</view>
<view class="money" style="margin-left: 206px;" v-if="item.pay_type == 8 ">
<view>
先货后款 实付:￥0.00
</view>
<view class="money" v-if="item.pay_type == 8 ">
<view class='totalPrice' style="margin-right: 50rpx;" >先货后款 实付款:
<text class='money p-color'>￥0.00</text>
</view>
</view>
</view>
<view class="totalPrice" style="margin-right: 18px;" v-if="item.pay_type == 8">
@ -319,12 +319,7 @@
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
查看详情</view>
<navigator v-if="community_status == 1 && !item.community_id"
:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt'
hover-class="none">
<text class="iconfont icon-fabu"></text>
发布种草
</navigator>
<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
</block>
</view>
@ -747,7 +742,8 @@
limit: that.limit,
product_type: that.product_type,
}).then(res => {
console.log(res);
// res.data.list[0].status=2
console.log(res);
let list = res.data.list || [];
let loadend = list.length < that.limit;
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that