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

1.我的-我的订单：个人订单待评价状态下缺少发布种草、申请退款、去评价、批量退款按钮bug修改

Browse Source 
2.首页搜索商品结果展示切换为列表行展示后第一个商品显示不全bug修改
3.修改用户订单-待收货 确认收货改成取件码
This commit is contained in:
jia 2023-08-11 16:40:29 +08:00
parent 29c0fa7add
commit 0d8a2d87fc
16 changed files with 361 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/trading-floor.js
View File

@ -23,7 +23,7 @@ export function getCommunityList(data) {
* *
*/ */
export function getCommunityshow(data) { export function getCommunityshow(data) {
console.log(data)
return request.get('community/show/'+data,{}, { return request.get('community/show/'+data,{}, {
noAuth: true noAuth: true
}); });
@ -34,7 +34,7 @@ export function getCommunityshow(data) {
* *
*/ */
export function getCommunitygetOrderList(data) { export function getCommunitygetOrderList(data) {
return request.get('community/getOrderList', data, { return request.get('community/product/lst', data, {
noAuth: true noAuth: true
}); });
} }

5
components/orderGoods/index.vue
View File

@ -25,7 +25,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> <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>
<view class="right-btn-box event_box" > <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&&evaluate>=0 && evaluate != 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>=0 && evaluate != 1&& 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 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> <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>
@ -73,7 +74,7 @@
<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 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_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate<2&&evaluate>=0&& evaluate != 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>=0&& evaluate != 1&& 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' 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 class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
</view> </view>

12
components/release/release.vue
View File

@ -63,14 +63,16 @@
}, },
methods: { methods: {
navigtion(item) { navigtion(item) {
if (item.title1 = '发布调货商品') {
uni.navigateTo({ if (item.title1 =='发布调货商品') {
url: '/pages/trading_hall/adddiscounts/index'
})
} else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/trading_hall/transfer_goods/index' url: '/pages/trading_hall/transfer_goods/index'
}) })
} else {
uni.navigateTo({
url: '/pages/trading_hall/adddiscounts/index'
})
} }
}, },
close() { close() {

188
components/shoppinglist/shoppinglist.vue
View File

@ -16,11 +16,11 @@
<scroll-view scroll-y="true"> <scroll-view scroll-y="true">
<block> <block>
<view v-if="bought.length" @touchmove="onTouchmove" id="goods"> <view v-if="bought.length" @touchmove="onTouchmove" id="goods">
<view class="picTxt acea-row" v-for="(item, index) in bought" :key="index"> <view class="picTxt acea-row" v-for="(item, i) in bought" :key="i">
<view class="checkbox"> <view class="checkbox">
<text @click.stop="goodsCheck(item,index)" v-if="item.check" <text @click.stop="goodsCheck(item)" v-if="item.check"
class="iconfont icon-xuanzhong1"></text> class="iconfont icon-xuanzhong1"></text>
<text @click.stop="goodsCheck(item,index)" v-else <text @click.stop="goodsCheck(item)" v-else
:class="checkedArr.length >=5 ? 'disabled': ''" :class="checkedArr.length >=5 ? 'disabled': ''"
class="iconfont icon-weixuanzhong"></text> class="iconfont icon-weixuanzhong"></text>
</view> </view>
@ -30,9 +30,17 @@
<view class='text'> <view class='text'>
<view class='line2 name'>{{item.store_name}}</view> <view class='line2 name'>{{item.store_name}}</view>
<view class="">
<view class=""> <view class="picTxt_one">
采购价格:100 库存:100 <view class="uni-form-item uni-column" v-if="item.attrValue.length>0">
<picker class="slecte" @change="bindPickerChange($event,item.attrValue)"
:value="index" :range="item.attrValue" :range-key="'sku'">
<view class="uni-input">{{item.attrValue[index].sku}}</view>
</picker>
</view>
<view class="" style="margin-top: 10rpx;">
库存:{{item.stock}}
</view> </view>
</view> </view>
@ -47,18 +55,9 @@
</view> </view>
<view class="price_num"> <view class="price_num">
<span>出售数量</span> <span>出售数量</span>
<subtractive <subtractive style="margin-top: -10rpx;margin-left: 30rpx;" class="step" :min="1"
:max="100" :value="peicenumber" :isMax="true" :isMin="true" index="11"
style="margin-top: -10rpx;margin-left: 30rpx;" @eventChange="numberChange"></subtractive>
class="step"
:min="1"
:max="100"
:value="peicenumber"
:isMax="true"
:isMin="true"
:index="11"
@eventChange="numberChange"
></subtractive>
</view> </view>
</view> </view>
@ -80,11 +79,10 @@
<script> <script>
import Loading from '@/components/Loading/index.vue'; import Loading from '@/components/Loading/index.vue';
import subtractive from '@/components/subtractive/subtractive.vue'; import subtractive from '@/components/subtractive/subtractive.vue';
import { import {
boughtLstApi, getCommunitygetOrderList
collectLstApi, } from "@/api/trading-floor";
browseLstApi
} from "@/api/community";
import { import {
mapGetters mapGetters
} from "vuex"; } from "vuex";
@ -114,7 +112,7 @@
limit: 10, limit: 10,
keyword: '', keyword: '',
}, },
peicenumber:0, peicenumber: 0,
wherec: { wherec: {
page: 1, page: 1,
limit: 10, limit: 10,
@ -128,16 +126,39 @@
searchVal: "", searchVal: "",
checked: [], checked: [],
list: [], list: [],
collect: [],
bought: [], bought: [],
browse: [],
checkedArr: [], checkedArr: [],
// picker下拉数据源
storageCustomList: [{
CustGoodsCode: "TEST001",
CustGoodsName: "测试货主001",
IfBoxId: 0,
IfProductId: 0,
}, {
CustGoodsCode: "TEST002",
CustGoodsName: "测试货主002",
IfBoxId: 0,
IfProductId: 0,
}, {
CustGoodsCode: "TEST003",
CustGoodsName: "测试货主003",
IfBoxId: 0,
IfProductId: 0,
}],
index: 0,
pickerData: '请选择'
}; };
}, },
watch: { watch: {
checkedObj: { checkedObj: {
handler(n) { handler(n) {
// this.checkedArr = n
this.checkedArr = n
}, },
deep: true deep: true
} }
@ -145,15 +166,24 @@
mounted() { mounted() {
this.checkedArr = this.checkedObj this.checkedArr = this.checkedObj
this.getBounht(); this.getBounht();
this.getCollect();
this.getBrowse();
}, },
methods: { methods: {
// picker修改事件
bindPickerChange: function(e, storage) {
console.log(e)
console.log(storage)
// this.index = e.target.value
this.pickerData = storage[this.index] // 这里就是选中的对象
},
// 点击关闭按钮 // 点击关闭按钮
close() { close() {
this.$emit('close'); this.$emit('close');
}, },
numberChange(data){ numberChange(data) {
this.peicenumber = data.number; this.peicenumber = data.number;
}, },
tabs(index) { tabs(index) {
@ -174,28 +204,8 @@
}).exec(); }).exec();
// 模拟触底刷新 // 模拟触底刷新
}, },
onTouchmove1(e) {
if (this.loadendc) return;
if (this.loadingc) return;
const query = uni.createSelectorQuery().in(this);
query.select('#collect').boundingClientRect(data => {
if (data.bottom < 1500 && data.top < 0) {
this.getCollect();
}
}).exec();
// 模拟触底刷新
},
onTouchmove2(e) {
if (this.loadends) return;
if (this.loadings) return;
const query = uni.createSelectorQuery().in(this);
query.select('#browse').boundingClientRect(data => {
if (data.bottom < 1500 && data.top < 0) {
this.getBrowse();
}
}).exec();
// 模拟触底刷新
},
setValue: function(event) { setValue: function(event) {
this.$set(this.whereb, 'keyword', event.detail.value); this.$set(this.whereb, 'keyword', event.detail.value);
@ -208,8 +218,10 @@
var that = this; var that = this;
if (that.loadingb || that.loadedb) return; if (that.loadingb || that.loadedb) return;
that.loadingb = true; that.loadingb = true;
boughtLstApi(that.whereb).then(
getCommunitygetOrderList(that.whereb).then(
res => { res => {
that.loadingb = false; that.loadingb = false;
that.loadedb = res.data.list.length < that.whereb.limit; that.loadedb = res.data.list.length < that.whereb.limit;
that.bought.push.apply(that.bought, res.data.list); that.bought.push.apply(that.bought, res.data.list);
@ -223,51 +235,15 @@
} }
); );
}, },
getCollect() {
var that = this;
if (that.loadingc || that.loadedc) return;
that.loadingc = true;
collectLstApi(that.wherec).then(
res => {
that.loadingc = false;
that.loadedc = res.data.list.length < that.wherec.limit;
that.collect.push.apply(that.collect, res.data.list);
that.wherec.page = that.wherec.page + 1;
that.getInitchecked(that.collect);
},
error => {
that.$util.Tips({
title: error.msg
})
}
);
},
getBrowse() {
var that = this;
if (that.loadings || that.loadeds) return;
that.loadings = true;
browseLstApi(that.wheres).then(
res => {
that.loadings = false;
that.loadeds = res.data.list.length < that.wheres.limit;
that.browse.push.apply(that.browse, res.data.list);
that.wheres.page = that.wheres.page + 1;
that.getInitchecked(that.browse);
},
error => {
that.$util.Tips({
title: error.msg
})
}
);
},
/*获取初始化选中的数据*/ /*获取初始化选中的数据*/
getInitchecked(arr) { getInitchecked(arr) {
let that = this; let that = this;
arr.forEach((item, index) => { arr.forEach((item, index) => {
that.$set(item, 'check', false); that.$set(item, 'check', false);
that.checkedArr.forEach((val, i) => { that.checkedArr.forEach((val, i) => {
if ((item.spu_id == (val.spu && val.spu.spu_id)) || (item.spu_id == val.spu_id)) { if (item.product_id == val.product_id ) {
that.$set(item, 'check', true); that.$set(item, 'check', true);
} }
}) })
@ -281,19 +257,22 @@
}) })
}, },
/*点击选中与否*/ /*点击选中与否*/
goodsCheck(item, index) { goodsCheck(item) {
this.$set(item, 'check', !item.check); this.$set(item, 'check', !item.check);
console.log(item, 'check', !item.check)
if (item.check) { if (item.check) {
this.checkedArr.push(item) this.checkedArr.push(item)
} else { } else {
this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item
.spu_id == ( .spu_id == (
itemn.spu && itemn.spu.spu_id)))), 1) itemn.spu && itemn.spu.spu_id)))), 1)
} }
}, },
/*确定提交*/ /*确定提交*/
submit() { submit() {
this.$emit('getProduct', this.checkedArr); this.$emit('getProduct', this.checkedArr);
console.log(this.checkedArr)
}, },
} }
} }
@ -407,6 +386,28 @@
margin-bottom: 10rpx; margin-bottom: 10rpx;
border-top: 2rpx solid #E7E6E4; border-top: 2rpx solid #E7E6E4;
.picTxt_one {
display: flex;
margin-top: 20rpx;
.slecte {
margin-right: 30rpx;
width: 140rpx;
height: 60rpx;
line-height: 50rpx;
text-align: center;
font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #CCCCCC;
white-space: nowrap;
overflow: hidden;
border: 1px solid #CCCCCC;
}
}
.picTxt_price { .picTxt_price {
display: flex; display: flex;
margin-top: 37rpx; margin-top: 37rpx;
@ -425,7 +426,8 @@
margin-left: 30rpx; margin-left: 30rpx;
} }
} }
.price_num{
.price_num {
display: flex; display: flex;

2
pages.json
View File

@ -488,7 +488,7 @@
{ {
"path": "order_list/indexCopy", "path": "order_list/indexCopy",
"style": { "style": {
"navigationBarTitleText": "我的订单" "navigationBarTitleText": "采购订单"
} }
}, },
{ {

7
pages/columnGoods/goods_search_con/index.vue
View File

@ -411,7 +411,7 @@
} }
} }
}); });
this.mTop = this.hide_mer_status == 0 ? '238rpx' : '170rpx' this.mTop = this.hide_mer_status == 0 ? '308rpx' : '170rpx'
}, },
computed: { computed: {
shopTab: function() { shopTab: function() {
@ -1039,6 +1039,7 @@
.productList .list { .productList .list {
padding: 0 20rpx; padding: 0 20rpx;
} }
.productList .list.on { .productList .list.on {
@ -1074,6 +1075,7 @@
position: relative; position: relative;
width: 100%; width: 100%;
height: 345rpx; height: 345rpx;
} }
.productList .list .item .pictrue.on { .productList .list .item .pictrue.on {
@ -1416,7 +1418,8 @@
} }
.store-wrapper { .store-wrapper {
margin-top: 240rpx; margin-top: 310rpx;
border-top: 1px solid #F6F6F6; border-top: 1px solid #F6F6F6;
.star-box { .star-box {

8
pages/order_details/stay.vue
View File

@ -358,9 +358,13 @@
yue_pay_status: 0 yue_pay_status: 0
}, },
mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])), mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
onLoad: function(options) { onLoad: function() {
this.credit_buy = options.credit_buy this.credit_buy = options.credit_buy
if (options.product_type) this.product_type = options.product_type console.log(options.product_type)
if (options.product_type) {
this.product_type = options.product_type
}
if (options.order_id) { if (options.order_id) {
this.$set(this, 'order_id', options.order_id); this.$set(this, 'order_id', options.order_id);
} }

4
pages/plantGrass/plant_release/index.vue
View File

@ -2,7 +2,8 @@
<view :style="viewColor"> <view :style="viewColor">
<form @submit="formSubmit" report-submit='true'> <form @submit="formSubmit" report-submit='true'>
<view class="release_content"> <view class="release_content">
<view v-if="community_app_switch.length == 1" class="release_tab acea-row"> <!-- v-if="community_app_switch.length == 1" -->
<view class="release_tab acea-row">
<view class="tab_item" v-for="(item, index) in tabList" :key="item.value" :class="{on:tabActive == item.value}" @click="changeTab(item)"> <view class="tab_item" v-for="(item, index) in tabList" :key="item.value" :class="{on:tabActive == item.value}" @click="changeTab(item)">
<text class="iconfont" :class="item.icon"></text>{{item.name}} <text class="iconfont" :class="item.icon"></text>{{item.name}}
</view> </view>
@ -467,6 +468,7 @@
}); });
} }
}else{ }else{
if (value.image.length == 0) return that.$util.Tips({ if (value.image.length == 0) return that.$util.Tips({
title: '请添加话题图片' title: '请添加话题图片'
}); });

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

@ -100,7 +100,7 @@
<view class="select"> <view class="select">
<view class="select_count" @click="addprice"> <view class="select_count" @click="addprice">
<text v-if="!isshow" class="text1">点击输入价格</text> <text v-if="!isshow" class="text1">点击输入价格</text>
<view v-else @click.stop="deleteTopic"> <view v-else >
<input type="number" value="" v-model="price" placeholder="请输入价格" <input type="number" value="" v-model="price" placeholder="请输入价格"
style="text-align: right;font-size: 28rpx;" /> style="text-align: right;font-size: 28rpx;" />
</view> </view>
@ -158,7 +158,7 @@
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import avatar from "@/components/yq-avatar/yq-avatar.vue"; import avatar from "@/components/yq-avatar/yq-avatar.vue";
import associated from '@/components/shoppinglist/shoppinglist.vue'; import associated from '@/components/shoppinglist/shoppinglist.vue';
import participateTopic from '@/components/participateTopic.vue';
import { import {
TOKENNAME, TOKENNAME,
HTTP_REQUEST_URL HTTP_REQUEST_URL
@ -182,7 +182,7 @@
components: { components: {
avatar, avatar,
associated, associated,
participateTopic,
authorize, authorize,
easyLoadimage, easyLoadimage,
mTabbar mTabbar
@ -294,7 +294,7 @@
methods: { methods: {
list(){ list(){
getCommunitygetOrderList().then(res=>{ getCommunitygetOrderList().then(res=>{
console.log(res) console.log(res.data)
}) })
}, },
onLoadFun() { onLoadFun() {
@ -331,7 +331,7 @@
}, },
/*点击输入价格*/ /*点击输入价格*/
addprice() { addprice() {
this.isshow = !this.isshow this.isshow = true
}, },
/*切换tab*/ /*切换tab*/
changeTab(item) { changeTab(item) {
@ -496,7 +496,7 @@
close() { close() {
this.$refs.associated.close(); this.$refs.associated.close();
this.$refs.participateTopic.close();
}, },
/*查看视频*/ /*查看视频*/
videoshow() { videoshow() {

59
pages/trading_hall/product_details/index.vue
View File

@ -5,7 +5,7 @@
<view class="content_symbol"> <view class="content_symbol">
<image src="@/static/images/f.png" mode="aspectFit"></image> <image src="@/static/images/f.png" mode="aspectFit"></image>
</view> </view>
<view class="content_title"> <view class="content_title" v-if="listobj.author">
<view class="title_one"> <view class="title_one">
{{listobj.author.nickname}} {{listobj.author.nickname}}
</view> </view>
@ -30,12 +30,7 @@
<view class=""> <view class="">
<image :src="item" mode=""></image> <image :src="item" mode=""></image>
</view> </view>
<!-- <view class="">
<image src="../../annex/static/vipBg.png" mode=""></image>
</view>
<view class="">
<image src="../../annex/static/vipBg.png" mode=""></image>
</view> -->
</view> </view>
@ -71,18 +66,25 @@
</view> </view>
<view class="content_enter">
<view class="content_bootm"> <view class="content_enter-one">
类型
</view>
<view class="content_enter-two">
调货
</view>
</view>
<view class="content_bootm" v-if="listobj.relevance.length>0">
<view class="content_bootm_txt"> <view class="content_bootm_txt">
查看TA提到的宝贝(2) 查看TA提到的宝贝({{listobj.relevance.length}})
</view> </view>
<view class="content_bootm_one" v-for="(item,i) in listobj.resale" :key='i'> <view class="content_bootm_one" v-for="(items,i) in listobj.relevance" :key='i'>
<view class="bootm_oneimg"> <view class="bootm_oneimg">
<image src="@/static/images/bg2.png" mode=""></image> <image :src="items.spu.image" mode=""></image>
</view> </view>
<view class=""> <view class="">
良品铺子肉松饼1000g/箱 面包糕... {{items.spu.store_name}}
</view> </view>
</view> </view>
<!-- <view class="content_bootm_one"> <!-- <view class="content_bootm_one">
@ -130,7 +132,6 @@
onLoad(e) { onLoad(e) {
if (e) { if (e) {
this.detail = JSON.parse(decodeURIComponent(e.key)); this.detail = JSON.parse(decodeURIComponent(e.key));
this.shopdetil(this.detail.id) this.shopdetil(this.detail.id)
} }
@ -220,7 +221,7 @@
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
margin-top: 21rpx; margin-top: 21rpx;
margin-bottom:21rpx; margin-bottom: 21rpx;
} }
.top-two_img { .top-two_img {
@ -280,7 +281,7 @@
.one_text_c { .one_text_c {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-top: 12rpx; margin-top: 12rpx;
@ -293,13 +294,37 @@
} }
} }
.content_enter {
height: 89rpx;
line-height: 89rpx;
background: #FFFFFF;
opacity: 1;
margin-top: 28rpx;
display: flex;
justify-content: space-between;
padding: 0 20rpx;
.content_enter-one {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400;
color: #333333;
}
.content_enter-two {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400;
color: #F84221;
}
}
.content_bootm { .content_bootm {
margin-bottom: 150rpx; margin-bottom: 150rpx;
.content_bootm_txt { .content_bootm_txt {
margin-top: 42rpx; margin-top: 42rpx;
padding-left: 28rpx; padding-left: 28rpx;
} }

9
pages/trading_hall/transfer_goods/index.vue
View File

@ -100,7 +100,7 @@
<view class="select"> <view class="select">
<view class="select_count" @click="addprice"> <view class="select_count" @click="addprice">
<text v-if="!isshow" class="text1">点击输入价格</text> <text v-if="!isshow" class="text1">点击输入价格</text>
<view v-else @click.stop="deleteTopic"> <view v-else >
<input type="number" value="" v-model="price" placeholder="请输入价格" <input type="number" value="" v-model="price" placeholder="请输入价格"
style="text-align: right;font-size: 28rpx;" /> style="text-align: right;font-size: 28rpx;" />
</view> </view>
@ -154,7 +154,7 @@
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import avatar from "@/components/yq-avatar/yq-avatar.vue"; import avatar from "@/components/yq-avatar/yq-avatar.vue";
import associated from '@/components/shoppinglist/shoppinglist.vue'; import associated from '@/components/shoppinglist/shoppinglist.vue';
import participateTopic from '@/components/participateTopic.vue';
import { import {
TOKENNAME, TOKENNAME,
HTTP_REQUEST_URL HTTP_REQUEST_URL
@ -178,7 +178,6 @@
components: { components: {
avatar, avatar,
associated, associated,
participateTopic,
authorize, authorize,
easyLoadimage, easyLoadimage,
mTabbar mTabbar
@ -321,7 +320,7 @@
}, },
/*点击输入价格*/ /*点击输入价格*/
addprice() { addprice() {
this.isshow = !this.isshow this.isshow = true
}, },
/*切换tab*/ /*切换tab*/
changeTab(item) { changeTab(item) {
@ -486,7 +485,7 @@
close() { close() {
this.$refs.associated.close(); this.$refs.associated.close();
this.$refs.participateTopic.close();
}, },
/*查看视频*/ /*查看视频*/
videoshow() { videoshow() {

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

@ -258,13 +258,13 @@
<view class='bnt cancelBnt' <view class='bnt cancelBnt'
v-if="item.delivery_type == 1 || item.delivery_type == 2" v-if="item.delivery_type == 1 || item.delivery_type == 2"
@click='goOrderDetails(item.order_id)'>查看物流</view> @click='goOrderDetails(item.order_id)'>查看物流</view>
<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view> <view class='bnt b-color' @tap='confirmOrder(item,index)'>取件码</view>
</block> </block>
<block v-if="item.status == 2"> <block v-if="item.status == 2">
<!-- <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"> <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> <text class="iconfont icon-fabu"></text>
发布种草 发布种草
</navigator> --> </navigator>
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价 <view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
</view> </view>
</block> </block>
@ -760,40 +760,40 @@
}, },
// 确认收货 // 确认收货
confirmOrder: function(item, index) { confirmOrder: function(item, index) {
uni.showModal({
title: '取件码',
content: item.logistics_code,
success: function(res) {
if (res.confirm) {
// console.log('用户点击确定');
} else if (res.cancel) {
// console.log('用户点击取消');
}
}
})
// let that = this;
// uni.showModal({
// title: '确认收货',
// content: '为保障权益，请收到货确认无误后，再确认收货',
// success: function(res) {
// if (res.confirm) {
// orderTake(item.order_id).then(res => {
// return that.$util.Tips({
// title: '操作成功',
// icon: 'success'
// }, function() {
let that = this; // that.orderList.splice(index, 1);
uni.showModal({ // that.getOrderData();
title: '确认收货', // });
content: '为保障权益，请收到货确认无误后，再确认收货', // }).catch(err => {
success: function(res) { // return that.$util.Tips({
if (res.confirm) { // title: err
orderTake(item.order_id).then(res => { // });
return that.$util.Tips({ // })
title: '操作成功', // }
icon: 'success' // }
}, function() { // })
uni.showModal({
title: '取件码',
content: item.logistics_code,
success: function(res) {
if (res.confirm) {
// console.log('用户点击确定');
} else if (res.cancel) {
// console.log('用户点击取消');
}
}
})
that.orderList.splice(index, 1);
that.getOrderData();
});
}).catch(err => {
return that.$util.Tips({
title: err
});
})
}
}
})
}, },
/*申请开票*/ /*申请开票*/
applyInvoice(order_id) { applyInvoice(order_id) {

4
pages/users/order_list/indexCopy.vue
View File

@ -6,7 +6,7 @@
<view class='picTxt acea-row row-between-wrapper'> <view class='picTxt acea-row row-between-wrapper'>
<view class='text'> <view class='text'>
<view class='name'>订单信息</view> <view class='name'>采购订单信息</view>
<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view> <view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view>
</view> </view>
<view class='pictrue'> <view class='pictrue'>
@ -651,7 +651,7 @@
groupOrderList({ groupOrderList({
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type:98
}).then(res => { }).then(res => {
that.isReady = true; that.isReady = true;
let list = res.data.list || []; let list = res.data.list || [];

81
pages/users/releaseOrdermanagement/index.vue
View File

@ -5,7 +5,7 @@
<!--选项卡滑动切换--> <!--选项卡滑动切换-->
<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick"></cxNavTitle> <cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick"></cxNavTitle>
</view> </view>
<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
<view class="content-content"> <view class="content-content">
<view class="content-onea" v-if='this.tabTitle=="tabTwo"'> <view class="content-onea" v-if='this.tabTitle=="tabTwo"'>
@ -26,6 +26,55 @@
</view> </view>
</view> </view>
</view> </view>
<view class="" v-else-if="this.tabTitle=='tabFive'">
<view class="content-one">
<view class="content-one-img">
<image src="@/static/images/bg2.png" mode="aspectFit"></image>
</view>
<view class="content-one-txt">
<view class="one-txt-a">
超级无敌一级棒乌龙山马龙尖茶...
</view>
<view class="one-txt-b">
<view class="txt-b-a">
￥ 100.00
</view>
<view class="txt-b-b">
结算价:￥100.00
</view>
</view>
<view class="">
类型:调货
</view>
</view>
</view>
<!-- <view class="content-one">
<view class="content-one-img">
<image src="@/static/images/bg2.png" mode="aspectFit"></image>
</view>
<view class="content-one-txt">
<view class="one-txt-a">
超级无敌一级棒乌龙山马龙尖茶...
</view>
<view class="one-txt-b">
<view class="txt-b-a">
￥ 100.00
</view>
<view class="txt-b-b">
结算价:￥100.00
</view>
</view>
<view class="">
类型:调货
</view>
</view>
</view> -->
</view>
<view class="content-one" v-else> <view class="content-one" v-else>
<view class="content-one-img"> <view class="content-one-img">
<image src="@/static/images/bg2.png" mode="aspectFit"></image> <image src="@/static/images/bg2.png" mode="aspectFit"></image>
@ -42,6 +91,8 @@
类型:调货 类型:调货
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if='this.tabTitle=="tabOne"'> <view class="content-two_one" v-if='this.tabTitle=="tabOne"'>
@ -88,19 +139,31 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="orderList.length == 0 && this.where.page > 1">
<emptyPage title="暂无订单~"></emptyPage>
</view>
</view> </view>
</template> </template>
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue';
export default { export default {
components: { components: {
cxNavTitle cxNavTitle,
emptyPage
}, },
data() { data() {
return { return {
activeItem: "tabOne", activeItem: "tabOne",
tabTitle: "", tabTitle: "",
orderList: [],
where: {
page: 1,
limit: 10
},
tabs: [{ tabs: [{
name: "tabOne", name: "tabOne",
label: '在售', label: '在售',
@ -136,7 +199,17 @@
}, },
// 已售出 编辑 // 已售出 编辑
soldEdit() { soldEdit() {
console.log('111111')
let data = {
type: 2,
id: 260
}
uni.navigateTo({
url: '/pages/trading_hall/product_details/index?key=' + encodeURIComponent(JSON.stringify(
data))
})
}, },
//待审核 删除 //待审核 删除
pendingDeletion() { pendingDeletion() {
@ -206,7 +279,7 @@
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
@ -257,7 +330,7 @@
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }

82
pages/users/trading_hall/index.vue
View File

@ -36,7 +36,8 @@
</view> </view>
<view class="list"> <view class="list">
<view class="item" v-for='(item,index) in datatlist' :key='index' @click="shopping(item.community_id)"> <view class="item" v-for='(item,index) in datatlist' :key='index' @click="shopping(item.community_id)">
<image class="shopimg" :src="item.image" mode="aspectFit"></image>
<image class="shopimg" :src="item.image[0]" mode="aspectFit"></image>
<view class="item_text"> <view class="item_text">
<span v-if='item.is_type==3'>调货</span> <span v-if='item.is_type==3'>调货</span>
<span v-else>委托销售</span> <span v-else>委托销售</span>
@ -62,7 +63,16 @@
</view> </view>
<release :isShow='visible' :bottom='true' @close="closeMadle" @cancel="cancel" @confirm="confirm"></release> <release :isShow='visible' :bottom='true' @close="closeMadle" @cancel="cancel" @confirm="confirm"></release>
<u-loadmore :status="status" /> <view
v-if="datatlist.length == 0||datatlist.length == 0 && where.page > 1 || datatlist.length == 0 && where1.page > 1||datatlist.length == 0 && where2.page > 1 ">
<emptyPage title="暂无商品信息"></emptyPage>
</view>
<u-loadmore :status="status"
v-if="datatlist.length == 0 && where.page > 1 || datatlist.length == 0 && where1.page > 1||datatlist.length == 0 && where2.page > 1 " />
</view> </view>
</template> </template>
@ -76,9 +86,11 @@
methods methods
} from '../../../uni_modules/uview-ui/libs/mixin/mixin' } from '../../../uni_modules/uview-ui/libs/mixin/mixin'
import release from '@/components/release/release.vue'; import release from '@/components/release/release.vue';
import emptyPage from '@/components/emptyPage.vue';
export default { export default {
components: { components: {
release release,
emptyPage
}, },
data() { data() {
return { return {
@ -95,6 +107,12 @@
limit: 10, limit: 10,
keyword: '' keyword: ''
},
where2: {
page: 1,
limit: 10,
keyword: ''
}, },
visible: false, visible: false,
num: 0, num: 0,
@ -111,7 +129,7 @@
text: '打折专区' text: '打折专区'
} }
], ],
datatlist:[], datatlist: [],
recomname: '', recomname: '',
} }
}, },
@ -130,14 +148,15 @@
this.getlist() this.getlist()
}, },
shopping(pid) { shopping(pid) {
let data={ let data = {
type:1, type: 1,
id:pid id: pid
} }
console.log(data)
uni.navigateTo({ uni.navigateTo({
url: '/pages/trading_hall/product_details/index?key=' + encodeURIComponent(JSON.stringify(data)) url: '/pages/trading_hall/product_details/index?key=' + encodeURIComponent(JSON.stringify(
data))
}) })
}, },
open() { open() {
@ -147,23 +166,43 @@
getlist(index) { getlist(index) {
console.log(this.num) console.log(this.num)
if (this.num == 0) { if (this.num == 0) {
getCommunitygetOrderList(this.where).then(res => { this.where = {
page: 1,
limit: 10,
is_type: 3,
keyword: '',
if (res.status == 200) { },
// this.datatlist = res.data.listcons getCommunitygetOrderList(this.where).then(res => {
console.log(res.data)
}
}) if (res.status == 200) {
// this.datatlist = res.data.listcons
// console.log(res.data)
this.datatlist = []
}
})
} else if (this.num == 1) { } else if (this.num == 1) {
getCommunityList(this.where).then(res => { this.where1 = {
if (res.status == 200) { page:1,
this.datatlist = res.data.list limit:10,
} keyword:'',
},
getCommunityList(this.where).then(res => {
if (res.status == 200) {
this.datatlist = res.data.list
}
}) })
} else { } else {
this.where2 = {
page: 1,
limit: 10,
keyword: '',
},
this.datatlist = []
} }
@ -252,7 +291,8 @@
} }
.recom { .recom {
width: 137rpx; width: 200rpx;
margin-right: 39rpx;
height: 60rpx; height: 60rpx;
text-align: center; text-align: center;
border-radius: 30px; border-radius: 30px;

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

@ -8,7 +8,7 @@
<view class='item' v-for="(item,index) in addressList" :key="index"> <view class='item' v-for="(item,index) in addressList" :key="index">
<view class='address' @click='goOrder(item.address_id)'> <view class='address' @click='goOrder(item.address_id)'>
<view class='consignee'>收货人：{{item.real_name}}<text class='phone'>{{item.phone}}</text></view> <view class='consignee'>收货人：{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
<view>收货地址：{{item.province || ''}}{{item.city || ''}}{{item.district || ''}}{{item.street || ''}}{{item.detail || ''}}</view> <view>收货地址：{{item.province || ''}}{{item.city || ''}}{{item.district || ''}}{{item.street || ''}}{{item.brigade|| ''}}{{item.detail || ''}}</view>
</view> </view>
<view class='operation acea-row row-between-wrapper'> <view class='operation acea-row row-between-wrapper'>
<!-- #ifndef MP --> <!-- #ifndef MP -->