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-08-23 11:51:55 +08:00
parent c42cf88d26
commit 89f6beb337
31 changed files with 2163 additions and 1105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/sale.js Normal file
View File

@ -0,0 +1,10 @@
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import request from "@/utils/request.js";

159
components/orderGoods/index.vue
View File

@ -10,26 +10,41 @@
<view class='item presell_item'> <view class='item presell_item'>
<view class="acea-row row-between-wrapper"> <view class="acea-row row-between-wrapper">
<view class='pictrue' @click="jumpCon(item)"> <view class='pictrue' @click="jumpCon(item)">
<image :src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image' ></image> <image
:src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image'>
</image>
</view> </view>
<view class='text'> <view class='text'>
<view class='acea-row row-between-wrapper'> <view class='acea-row row-between-wrapper'>
<view class='name line1' style="width: 360rpx;"><text class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}</view> <view class='name line1' style="width: 360rpx;"><text
<view class='num'><text class="p-color">￥{{item.cart_info.productPresellAttr.presell_price}}</text><br/>x {{item.product_num}}</view> class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}
</view> </view>
<view class='attr line1' v-if="item.cart_info.productAttr.sku" style="margin-top: 0;">{{item.cart_info.productAttr.sku}}</view> <view class='num'><text
<view v-if="evaluate === 0 || evaluate === 10 || evaluate === 11" class="event_ship event_color">发货时间： class="p-color">￥{{item.cart_info.productPresellAttr.presell_price}}</text><br />x
{{item.product_num}}</view>
</view>
<view class='attr line1' v-if="item.cart_info.productAttr.sku" style="margin-top: 0;">
{{item.cart_info.productAttr.sku}}</view>
<view v-if="evaluate === 0 || evaluate === 10 || evaluate === 11"
class="event_ship event_color">发货时间：
<!--全款预售--> <!--全款预售-->
<text v-if="item.cart_info.productPresell.presell_type === 1">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text> <text
v-if="item.cart_info.productPresell.presell_type === 1">{{ 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> <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>=0 && evaluate != 1&& evaluate == 2" @click.stop="refund(item)">申请退款</view> <view class="btn-item"
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view> v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate>=0 && evaluate != 1&& evaluate == 2"
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view> @click.stop="refund(item)">申请退款</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 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 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>
</view> </view>
@ -38,44 +53,68 @@
<view v-if="orderData.status >= 10" class="event_progress"> <view v-if="orderData.status >= 10" class="event_progress">
<view class="progress_list"> <view class="progress_list">
<view class="progress_name">阶段一： 买家已付款</view> <view class="progress_name">阶段一： 买家已付款</view>
<view class="progress_price">商品定金 <text class="align_right">￥{{ orderData.pay_price }}</text></view> <view class="progress_price">商品定金 <text
<view class="progress_pay">定金实付款<text class="align_right t-color">￥{{ orderData.pay_price }}</text></view> class="align_right">￥{{ orderData.pay_price }}</text></view>
<view class="progress_pay">定金实付款<text
class="align_right t-color">￥{{ orderData.pay_price }}</text></view>
</view> </view>
<view class="progress_list"> <view class="progress_list">
<view class="progress_name">阶段二： <view class="progress_name">阶段二：
<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text> <text
<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text> v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text>
<text v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text> <text
v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text>
<text
v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text>
</view> </view>
<view class="progress_price">商品尾款 <text class="align_right">￥{{ orderData.presellOrder.pay_price }}</text></view> <view class="progress_price">商品尾款 <text
<view class="progress_pay">尾款需付款<text class="align_right t-color">￥{{ orderData.presellOrder.pay_price }}</text></view> class="align_right">￥{{ orderData.presellOrder.pay_price }}</text></view>
<view class="progress_pay">尾款需付款<text
class="align_right t-color">￥{{ orderData.presellOrder.pay_price }}</text></view>
</view> </view>
</view> </view>
</view> </view>
<view v-else class='item'> <view v-else class='item'>
<view class="acea-row row-between-wrapper"> <view class="acea-row row-between-wrapper">
<view class='pictrue' @click="jumpCon(item)"> <view class='pictrue' @click="jumpCon(item)">
<image :src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image' ></image> <image
:src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image'>
</image>
</view> </view>
<view class='text'> <view class='text'>
<view class='acea-row row-between-wrapper'> <view class='acea-row row-between-wrapper'>
<view class='name line1'><text v-if="item.product_type != 0 && item.product_type != 10" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>{{item.cart_info.product.store_name}}</view> <view class='name line1'><text v-if="item.product_type != 0 && item.product_type != 10"
:class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>{{item.cart_info.product.store_name}}
</view>
<view class='num'>x {{item.product_num}}</view> <view class='num'>x {{item.product_num}}</view>
</view> </view>
<view class='attr line1' v-if="item.cart_info.productAttr.sku">{{item.cart_info.productAttr.sku}}</view> <view class='attr line1' v-if="item.cart_info.productAttr.sku">
<view class='money p-color' v-if="item.cart_info.product_type ==3">￥{{item.cart_info.productAssistAttr.assist_price}}</view> {{item.cart_info.productAttr.sku}}</view>
<view class='money p-color' v-else-if="item.cart_info.product_type ==4">￥{{item.cart_info.activeSku.active_price}}</view> <view class='money p-color' v-if="item.cart_info.product_type ==3">
￥{{item.cart_info.productAssistAttr.assist_price}}</view>
<view class='money p-color' v-else-if="item.cart_info.product_type ==4">
￥{{item.cart_info.activeSku.active_price}}</view>
<view class='money acea-row row-middle' v-else> <view class='money acea-row row-middle' v-else>
<text>￥{{item.cart_info.productAttr.price}}</text> <text>￥{{item.cart_info.productAttr.price}}</text>
<image v-if="item.cart_info.productAttr.show_svip_price" class="svip-img" src="/static/images/svip.png"></image> <image v-if="item.cart_info.productAttr.show_svip_price" class="svip-img"
src="/static/images/svip.png"></image>
</view> </view>
</view> </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
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view> {{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>=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 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>
<view class="btn-item"
v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&& evaluate != 1&&evaluate !=4&& evaluate!=3 || evaluate==2 ||activityType==98"
@click.stop="refund(item)">申请退款</view>
<view class='btn-item'
v-if='item.is_reply==0 && evaluate!=2&& evaluate!=3 && 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>
</view> </view>
@ -94,10 +133,18 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js'; import {
import { goShopDetail } from '@/libs/order.js' openOrderRefundSubscribe
import { initiateAssistApi } from '@/api/activity.js'; } from '@/utils/SubscribeMessage.js';
import { mapGetters } from "vuex"; import {
goShopDetail
} from '@/libs/order.js'
import {
initiateAssistApi
} from '@/api/activity.js';
import {
mapGetters
} from "vuex";
export default { export default {
props: { props: {
evaluate: { evaluate: {
@ -161,14 +208,17 @@
if (that.orderData.status === 10) { if (that.orderData.status === 10) {
if (new Date() < new Date(that.orderData.presellOrder.final_start_time)) { if (new Date() < new Date(that.orderData.presellOrder.final_start_time)) {
that.isTimePay = false; //未开始 that.isTimePay = false; //未开始
}else if((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <= new Date(that.orderData.presellOrder.final_start_time)) ){ } else if ((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <=
new Date(that.orderData.presellOrder.final_start_time))) {
that.isTimePay = true; //立即支付 that.isTimePay = true; //立即支付
} }
} }
}, },
jumpCon: function(item) { jumpCon: function(item) {
if(item.product_type == 4)item.activity_id = item.cart_info && item.cart_info.activeSku.product_group_id if (item.product_type == 4) item.activity_id = item.cart_info && item.cart_info.activeSku
if(item.product_type == 3)item.activity_id = item.cart_info && item.cart_info.productAssistAttr.product_assist_id .product_group_id
if (item.product_type == 3) item.activity_id = item.cart_info && item.cart_info.productAssistAttr
.product_assist_id
goShopDetail(item).then(res => { goShopDetail(item).then(res => {
initiateAssistApi(item.activity_id).then(res => { initiateAssistApi(item.activity_id).then(res => {
let id = res.data.product_assist_set_id; let id = res.data.product_assist_set_id;
@ -191,11 +241,15 @@
uni.hideLoading(); uni.hideLoading();
if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) { if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) {
uni.navigateTo({ uni.navigateTo({
url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' +
'&ids=' + item.order_product_id + '&refund_type=1&order_type=' + this
.orderData.order_type
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id url: '/pages/users/refund/select?order_id=' + this.orderId +
'&type=1&order_type=' + this.orderData.order_type + '&ids=' + item
.order_product_id
}) })
} }
}).catch(() => { }).catch(() => {
@ -205,11 +259,13 @@
// #ifdef H5 || APP-PLUS // #ifdef H5 || APP-PLUS
if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) { if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) {
uni.navigateTo({ uni.navigateTo({
url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' + item
.order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' + this
.orderData.order_type + '&ids=' + item.order_product_id
}) })
} }
// #endif // #endif
@ -222,21 +278,26 @@
.orderGoods { .orderGoods {
background-color: #fff; background-color: #fff;
} }
.p-color { .p-color {
color: var(--view-priceColor); color: var(--view-priceColor);
} }
.t-color { .t-color {
color: var(--view-theme); color: var(--view-theme);
} }
.svip-img { .svip-img {
width: 65rpx; width: 65rpx;
height: 28rpx; height: 28rpx;
margin: 4rpx 0 0 4rpx; margin: 4rpx 0 0 4rpx;
} }
.title { .title {
height: 86rpx; height: 86rpx;
position: relative; position: relative;
padding: 0 30rpx; padding: 0 30rpx;
&::after { &::after {
content: ""; content: "";
width: 750rpx; width: 750rpx;
@ -245,25 +306,31 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.item-status { .item-status {
color: #999999; color: #999999;
font-size: 30rpx; font-size: 30rpx;
&.status0 { &.status0 {
color: #2291F8; color: #2291F8;
} }
} }
.item-date { .item-date {
color: #666666; color: #666666;
font-size: 28rpx; font-size: 28rpx;
} }
} }
.right-btn-box { .right-btn-box {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
&.event_box { &.event_box {
position: static; position: static;
} }
.btn-item { .btn-item {
display: flex; display: flex;
align-items: center; align-items: center;
@ -275,10 +342,12 @@
border-radius: 23rpx; border-radius: 23rpx;
font-size: 24rpx; font-size: 24rpx;
color: #282828; color: #282828;
&.on { &.on {
background: rgba(220, 220, 220, 1); background: rgba(220, 220, 220, 1);
border-color: rgba(220, 220, 220, 1); border-color: rgba(220, 220, 220, 1);
} }
&.err { &.err {
background: rgba(247, 247, 247, 1); background: rgba(247, 247, 247, 1);
border-color: rgba(247, 247, 247, 1); border-color: rgba(247, 247, 247, 1);
@ -286,19 +355,24 @@
} }
} }
} }
.event_bg { .event_bg {
background: #FF7F00; background: #FF7F00;
} }
.event_color { .event_color {
color: #FF7F00; color: #FF7F00;
} }
.presell_item { .presell_item {
height: auto; height: auto;
padding-bottom: 15rpx; padding-bottom: 15rpx;
} }
.event_progress { .event_progress {
margin-top: 20rpx; margin-top: 20rpx;
background: #fff; background: #fff;
.progress_name { .progress_name {
padding-left: 30rpx; padding-left: 30rpx;
height: 60rpx; height: 60rpx;
@ -307,6 +381,7 @@
font-weight: bold; font-weight: bold;
position: relative; position: relative;
color: var(--view-theme); color: var(--view-theme);
&::before { &::before {
content: ""; content: "";
display: inline-block; display: inline-block;
@ -318,15 +393,18 @@
left: 0; left: 0;
} }
} }
.align_right { .align_right {
float: right; float: right;
font-weight: bold; font-weight: bold;
} }
.progress_price { .progress_price {
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
color: #999999; color: #999999;
font-size: 22rpx; font-size: 22rpx;
} }
.progress_pay { .progress_pay {
padding: 25rpx 30rpx; padding: 25rpx 30rpx;
background: var(--view-minorColor); background: var(--view-minorColor);
@ -334,6 +412,7 @@
color: #282828; color: #282828;
} }
} }
.event_name { .event_name {
display: inline-block; display: inline-block;
margin-right: 9rpx; margin-right: 9rpx;
@ -344,10 +423,12 @@
text-align: center; text-align: center;
border-radius: 6rpx; border-radius: 6rpx;
} }
.event_ship { .event_ship {
font-size: 20rpx; font-size: 20rpx;
margin-top: 10rpx; margin-top: 10rpx;
} }
.goodWrapper.item1 { .goodWrapper.item1 {
&::after { &::after {
content: ""; content: "";

621
components/realselist/realselist.vue Normal file
View File

@ -0,0 +1,621 @@
<template>
<view class="containers" :style="viewColor">
<view class="header">
<view class="search">
<text class="iconfont icon-xiazai5"></text>
<input type="text" placeholder="请输入商品名称" v-model="searchVal" @input="setValue" confirm-type="search"
@confirm="searchBut()" placeholder-class='placeholder'>
</view>
<view class="iconclose" @click="close">
X
</view>
</view>
<view class="main">
<scroll-view scroll-y="true" @touchmove.stop>
<block>
<view v-if="bought.length" @touchmove="onTouchmove" id="goods" class="goods">
<view class="picTxt acea-row" v-for="(item, i) in bought" :key="i">
<view class="checkbox">
<text @click.stop="goodsCheck(item)" v-if="item.check"
class="iconfont icon-xuanzhong1"></text>
<text @click.stop="goodsCheck(item)" v-else
:class="checkedArr.length >=5 ? 'disabled': ''"
class="iconfont icon-weixuanzhong"></text>
</view>
<view class='pictrue'>
<image :src='item.image'></image>
</view>
<view class='text'>
<view class='line2 name'>{{item.store_name}}</view>
<view class="picTxt_one" v-if="item.attrValue.length>0">
<picker class="slecte" v-if="item.attrValue.length>1"
@change="bindPickerChange($event,item.attrValue,i)" :value="index"
:range="item.attrValue" :range-key="'sku'">
<view class="uni-input">{{item.attrValue[index].sku}}</view>
</picker>
<view class="" style="margin-top: 10rpx;">
库存:{{item.attrValue[index].stock}}
</view>
</view>
</view>
<view class="picTxt_price">
<view class="price">
<span>委托价格</span>
<input type="text" :value="item.price" placeholder="输入出售价格"
@input="producrprice($event,i,item)" adjust-position=""
placeholder-style="color: #CCCCCC;" />
</view>
<view class="price_num">
<span>委托数量</span>
<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
</subtractive>
<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
@eventChange="numberChange($event,i)"></subtractive>
</view>
</view>
</view>
</view>
<view v-else class="empty">
<image src="/static/images/no_thing.png"></image>
<text>暂无内容哦~</text>
</view>
</block>
</scroll-view>
<view class="foot_bar">
<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
</view>
</view>
</view>
</template>
<script>
import Loading from '@/components/Loading/index.vue';
import subtractive from '@/components/subtractive/subtractive.vue';
import {
getCommunitygetOrderList
} from "@/api/trading-floor";
import {
mapGetters
} from "vuex";
export default {
props: {
checkedObj: {
type: Array,
default: []
}
},
computed: mapGetters(['viewColor']),
components: {
Loading,
subtractive
},
data() {
return {
isActive: 0,
loadedb: false,
loadingb: false,
loadedc: false,
loadingc: false,
loadeds: false,
loadings: false,
whereb: {
page: 1,
limit: 10,
keyword: '',
},
peicenumber: 0,
searchVal: "",
checked: [],
list: [],
bought: [],
checkedArr: [],
aryys: [],
// 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: '请选择',
itstock: '',
};
},
watch: {
checkedObj: {
handler(n) {
this.checkedArr = n
},
deep: true
}
},
mounted() {
this.checkedArr = this.checkedObj
this.aryys = this.checkedObj
this.getBounht();
},
methods: {
//价格
producrprice(e, i, item) {
this.bought[i].price = e.detail.value
this.$set(item, 'check', false);
for (let i in this.checkedArr) {
if (this.checkedArr[i].product_id == item.product_id) {
this.checkedArr.splice(i, 1)
}
}
},
incrementTotal(e, i, item) {
this.$set(item, 'check', false);
for (let i in this.checkedArr) {
if (this.checkedArr[i].product_id == item.product_id) {
this.checkedArr.splice(i, 1)
}
}
},
// picker修改事件
bindPickerChange: function(e, storage, num) {
this.bought[num].attrValue[this.index].sku = storage[e.detail.value].sku
this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
this.bought[num].product_attr_unique = storage[e.detail.value].unique
this.pickerData = storage[this.index] // 这里就是选中的对象
if (this.bought[num].attrValue[this.index].stock == 0) {
this.$util.Tips({
title: '库存不足'
});
}
},
// 点击关闭按钮
close() {
this.$emit('close');
},
numberChange(data, i) {
this.peicenumber = data.number;
this.bought[i].number = data.number
},
tabs(index) {
this.isActive = index
this.$set(this.whereb, 'keyword', '');
this.searchVal = ''
this.searchBut()
},
onTouchmove(e) {
if (this.loadendb) return;
if (this.loadingb) return;
const query = uni.createSelectorQuery().in(this);
query.select('#goods').boundingClientRect(data => {
if (data.bottom < 1500 && data.top < 0) {
this.getBounht();
}
}).exec();
// 模拟触底刷新
},
setValue: function(event) {
this.$set(this.whereb, 'keyword', event.detail.value);
if (!event.detail.value) {
this.whereb.page = 1
this.loadedb = false
this.getBounht()
}
},
searchBut() {
this.bought = []
this.whereb.page = 1
this.loadedb = false
this.getBounht()
},
getBounht() {
var that = this;
// console.log('1111111', that.loadingb, that.loadedb)
if (that.loadingb || that.loadedb) return;
that.loadingb = true;
getCommunitygetOrderList(that.whereb).then(
res => {
that.loadingb = false;
that.loadedb = res.data.list.length < that.whereb.limit;
that.bought.push.apply(that.bought, res.data.list);
that.whereb.page = that.whereb.page + 1;
that.getInitchecked(that.bought);
},
error => {
that.$util.Tips({
title: error.msg
})
}
);
},
/*获取初始化选中的数据*/
getInitchecked(arr) {
let that = this;
arr.forEach((item, index) => {
that.$set(item, 'check', false);
that.checkedArr.forEach((val, i) => {
if (item.product_id == val.product_id) {
that.$set(item, 'check', true);
that.$set(item, 'number', val.number);
that.$set(item, 'price', val.price);
}
})
})
},
/*已选中的商品打钩*/
getCheckedGoods() {
this.checked = []
this.checkedArr.forEach((item, index) => {
this.checkedArr.push(item)
})
},
/*点击选中与否*/
goodsCheck(item) {
this.$set(item, 'check', !item.check);
if (item.check) {
if (this.peicenumber == 0) {
item.number = 1
}
if (!item.product_attr_unique) {
item.product_attr_unique = item.attrValue[0].unique
}
this.checkedArr.push(item)
this.arrayUnique(this.checkedArr, 'product_id')
} else {
this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
}
},
//去重
arrayUnique(arr, name) {
let hash = {}
const result = arr.reduce((acc, cru, index) => {
if (!hash[cru[name]]) {
hash[cru[name]] = {
index: acc.length
}
acc.push(cru)
} else {
console.log(acc, hash[cru[name]])
acc.splice(hash[cru[name]]['index'], 1, cru)
}
return acc;
}, [])
this.checkedArr = result
},
/*确定提交*/
submit() {
this.$emit('getProduct', this.checkedArr);
},
}
}
</script>
<style lang="scss" scoped>
.containers {
background: #ffffff;
border-radius: 16rpx 16rpx 0 0;
padding: 40rpx 0;
position: relative;
.header {
position: relative;
padding: 0 30rpx;
.title {
width: 100%;
text-align: center;
text {
position: relative;
margin: 0 50rpx;
color: #999999;
font-size: 30rpx;
&.on {
color: #333333;
font-weight: bold;
font-size: 34rpx;
&::after {
content: "";
display: inline-block;
width: 40rpx;
height: 5rpx;
background: var(--view-theme);
position: absolute;
bottom: -10rpx;
left: 10rpx;
}
}
}
}
.iconclose {
width: 44rpx;
height: 44rpx;
line-height: 44rpx;
border: 2rpx solid #fff;
border-radius: 50%;
text-align: center;
color: #fff;
position: absolute;
top: -150rpx;
right: 30rpx;
}
.search {
margin-top: 44rpx;
background: #F5F5F5;
border-radius: 30rpx;
padding: 12rpx 30rpx 12rpx 66rpx;
position: relative;
.iconfont {
font-size: 24rpx;
color: #939393;
position: absolute;
top: 20rpx;
left: 30rpx;
}
.placeholder {
color: #999999;
font-size: 26rpx;
}
}
.sub_title {
color: #282828;
font-size: 26rpx;
margin-top: 30rpx;
}
.iconfont {
color: #8A8A8A;
font-size: 28rpx;
position: absolute;
top: 0;
right: 30rpx;
}
}
scroll-view {
height: 650rpx;
}
.main {
height: 650rpx;
margin: 40rpx 0 80rpx;
padding: 0 30rpx;
}
}
.picTxt {
width: 100%;
padding: 25rpx 0;
position: relative;
align-items: center;
justify-content: space-between;
border-top: 2rpx solid #E7E6E4;
.picTxt_one {
white-space: nowrap;
overflow: hidden;
}
.picTxt_one {
display: flex;
margin-top: 20rpx;
.slecte {
margin-right: 30rpx;
width: 280rpx;
height: 60rpx;
line-height: 60rpx;
text-align: center;
font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #959595;
background-color: #E7E6E4;
border-radius: 10rpx 10rpx 10rpx 10rpx;
white-space: nowrap;
overflow: hidden;
}
}
.picTxt_price {
display: flex;
margin-top: 37rpx;
height: 70rpx;
line-height: 70rpx;
.price {
display: flex;
margin-right: 15rpx;
input {
width: 210rpx;
text-align: center;
height: 70rpx;
background: #F5F5F5;
border-radius: 7rpx 7rpx 7rpx 7rpx;
font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
margin-left: 20rpx;
}
}
.price_num {
display: flex;
}
}
.checkbox {
margin-right: 30rpx;
.iconfont {
font-size: 38rpx;
color: #CCCCCC;
}
.icon-xuanzhong1 {
color: var(--view-theme);
}
.disabled {
pointer-events: none;
cursor: default;
opacity: 0.3;
}
}
.pictrue {
width: 160rpx;
height: 160rpx;
image {
width: 100%;
height: 100%;
border-radius: 8rpx;
}
}
.text {
width: 430rpx;
margin-left: 30rpx;
font-size: 28rpx;
color: #282828;
position: relative;
height: 160rpx;
.name {
color: #282828;
font-size: 28rpx;
}
.money {
position: absolute;
bottom: 0;
left: 0;
color: var(--view-priceColor);
font-size: 22rpx;
font-weight: bold;
text {
font-size: 26rpx;
}
}
}
}
.foot_bar {
width: 100%;
position: fixed;
// bottom: 54px;
left: 0;
padding: 20rpx 0;
z-index: 5;
.confirm_btn {
width: 710rpx;
height: 86rpx;
line-height: 86rpx;
color: #ffffff;
text-align: center;
font-size: 32rpx;
background: var(--view-theme);
border-radius: 43rpx;
margin: 0 auto;
}
}
.empty {
margin: 130rpx 0 150rpx;
text-align: center;
image,
uni-image {
display: inline-block;
width: 414rpx;
height: 305rpx;
}
text {
display: block;
color: #999999;
font-size: 26rpx;
}
}
</style>

72
components/shoppinglist/shoppinglist.vue
View File

@ -67,7 +67,8 @@
<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step" <subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true" :min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
:isMin="true" index="11" @eventChange="numberChange($event,i)" ></subtractive> :isMin="true" index="11" @increment="incrementTotal($event,i,item)"
@eventChange="numberChange($event,i)"></subtractive>
</view> </view>
</view> </view>
</view> </view>
@ -130,7 +131,7 @@
bought: [], bought: [],
checkedArr: [], checkedArr: [],
aryys: [],
// picker下拉数据源 // picker下拉数据源
storageCustomList: [{ storageCustomList: [{
CustGoodsCode: "TEST001", CustGoodsCode: "TEST001",
@ -165,14 +166,35 @@
}, },
mounted() { mounted() {
this.checkedArr = this.checkedObj this.checkedArr = this.checkedObj
this.aryys = this.checkedObj
this.getBounht(); this.getBounht();
}, },
methods: { methods: {
//价格 //价格
producrprice(e, i, item) { producrprice(e, i, item) {
this.bought[i].price = e.detail.value this.bought[i].price = e.detail.value
this.$set(item, 'check', false); this.$set(item, 'check', false);
for (let i in this.checkedArr) {
if (this.checkedArr[i].product_id == item.product_id) {
this.checkedArr.splice(i, 1)
}
}
},
incrementTotal(e, i, item) {
this.$set(item, 'check', false);
for (let i in this.checkedArr) {
if (this.checkedArr[i].product_id == item.product_id) {
this.checkedArr.splice(i, 1)
}
}
}, },
// picker修改事件 // picker修改事件
bindPickerChange: function(e, storage, num) { bindPickerChange: function(e, storage, num) {
@ -220,15 +242,22 @@
setValue: function(event) { setValue: function(event) {
this.$set(this.whereb, 'keyword', event.detail.value); this.$set(this.whereb, 'keyword', event.detail.value);
if (!event.detail.value) {
this.whereb.page = 1
this.loadedb = false
this.getBounht()
}
}, },
searchBut() { searchBut() {
this.whereb.page = this.wherec.page = this.wheres.page =
this.bought = [] this.bought = []
this.isActive == 0 ? this.getBounht() : '' this.whereb.page = 1
this.loadedb = false
this.getBounht()
}, },
getBounht() { getBounht() {
var that = this; var that = this;
// console.log('1111111', that.loadingb, that.loadedb)
if (that.loadingb || that.loadedb) return; if (that.loadingb || that.loadedb) return;
that.loadingb = true; that.loadingb = true;
@ -268,7 +297,9 @@
getCheckedGoods() { getCheckedGoods() {
this.checked = [] this.checked = []
this.checkedArr.forEach((item, index) => { this.checkedArr.forEach((item, index) => {
this.check.push(item) this.checkedArr.push(item)
}) })
}, },
/*点击选中与否*/ /*点击选中与否*/
@ -278,18 +309,37 @@
if (this.peicenumber == 0) { if (this.peicenumber == 0) {
item.number = 1 item.number = 1
} }
if (!item.product_attr_unique) { if (!item.product_attr_unique) {
item.product_attr_unique = item.attrValue[0].unique item.product_attr_unique = item.attrValue[0].unique
} }
this.checkedArr.push(item) this.checkedArr.push(item)
this.arrayUnique(this.checkedArr, 'product_id')
} else { } else {
this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
.spu_id == (
itemn.spu && itemn.spu.spu_id)))), 1)
} }
},
//去重
arrayUnique(arr, name) {
let hash = {}
const result = arr.reduce((acc, cru, index) => {
if (!hash[cru[name]]) {
hash[cru[name]] = {
index: acc.length
}
acc.push(cru)
} else {
console.log(acc, hash[cru[name]])
acc.splice(hash[cru[name]]['index'], 1, cru)
}
return acc;
}, [])
this.checkedArr = result
}, },
/*确定提交*/ /*确定提交*/
submit() { submit() {

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;

10
pages.json
View File

@ -705,12 +705,20 @@
"root": "pages/releaseManagement", "root": "pages/releaseManagement",
"name": "releaseManagement", "name": "releaseManagement",
"pages": [{ "pages": [{
"path": "/index", "path": "index",
"style": { "style": {
"navigationBarTitleText": "发布管理", "navigationBarTitleText": "发布管理",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path": "details/index",
"style": {
"navigationBarTitleText": "发起委托",
"enablePullDownRefresh": false
}
}] }]
}, },
{ {

5
pages/admin/orderDetail/index.vue
View File

@ -164,10 +164,11 @@
<view class="bnt cancel" v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0" @click="offlinePay"> <view class="bnt cancel" v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0" @click="offlinePay">
确认付款 确认付款
</view> </view>
<view class="bnt delivery" @click="toPostagequ(orderInfo)">
<view class="bnt delivery" @click="toPostagequ(orderInfo)" v-if="orderInfo.status == 0&&orderInfo.activity_type==0">
收件码 收件码
</view> </view>
<navigator class="bnt delivery" v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0" :url="'/pages/admin/delivery/index?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator> <navigator class="bnt delivery" v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0&&orderInfo.activity_type==98" :url="'/pages/admin/delivery/index?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator>
<view class="bnt delivery" v-if="orderInfo.paid == 1 && (orderInfo.status == 0 || orderInfo.status == 9) && orderInfo.order_type == 1" @click="goCancellation">去核销</view> <view class="bnt delivery" v-if="orderInfo.paid == 1 && (orderInfo.status == 0 || orderInfo.status == 9) && orderInfo.order_type == 1" @click="goCancellation">去核销</view>
</view> </view>
<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice" <PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"

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

@ -18,7 +18,11 @@
<view class="item-one"> <view class="item-one">
委托周期 委托周期
</view> </view>
<e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select> <view class="" @click="calendar">
<input type="number" v-model="date" />
</view>
<!-- <e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select> -->
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}}) <view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})
@ -34,42 +38,21 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content_center-one"> <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="../../annex/static/left.png" mode=""></image> <image :src="item.image" mode=""></image>
</view> </view>
<view class="center-one-txt"> <view class="center-one-txt">
<view class="one-txta"> <view class="one-txta">
良品铺子肉松饼1000g/箱 面... {{item.store_name}}
</view> </view>
<view class="one-txtb"> <view class="one-txtb">
<view class=""> <view class="">
委托价:¥<span>34.90</span> 委托价:¥<span>{{item.price}}</span>
</view> </view>
<view class=""> <view class="">
数量:100个 数量:{{item.number}}
</view>
</view>
</view>
</view>
</view>
<view class="content_center-one">
<view class="center-one">
<view class="center-one-img">
<image src="../../annex/static/left.png" mode=""></image>
</view>
<view class="center-one-txt">
<view class="one-txta">
良品铺子肉松饼1000g/箱 面...
</view>
<view class="one-txtb">
<view class="">
委托价:¥<span>34.90</span>
</view>
<view class="">
数量:100个
</view> </view>
</view> </view>
</view> </view>
@ -81,7 +64,9 @@
</view> </view>
</form> </form>
<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
:showMonth="info.showMonth" @close="close" />
<!-- 提到的宝贝弹窗 --> <!-- 提到的宝贝弹窗 -->
@ -91,17 +76,15 @@
</view> </view>
</template> </template>
<script> <script>
import associated from '@/components/associated.vue'; import associated from '@/components/realselist/realselist.vue';
import eselect from '@/components/e-select/e-select.vue'; import eselect from '@/components/e-select/e-select.vue';
// import {} from '@/api/sale.js'
export default { export default {
components: { components: {
associated, associated,
eselect eselect
}, },
@ -109,7 +92,6 @@
return { return {
value1: 1, value1: 1,
value2: "", value2: "",
options1: [{ options1: [{
text: "Shenzhen1", text: "Shenzhen1",
value: 1 value: 1
@ -123,9 +105,17 @@
text: "Shenzhen3", text: "Shenzhen3",
value: 3 value: 3
}], }],
date: 1,
productList: [], productList: [],
info: {
startDate: '',
endDate: '',
lunar: false,
range: true,
insert: false,
selected: [],
showMonth: false
},
}; };
}, },
computed: { computed: {
@ -140,6 +130,40 @@
methods: { methods: {
// 日历确定
confirm(e) {
let self = this
if (e.range.after && e.range.before) {
let star = new Date(e.range.after).getTime()
let stop = new Date(e.range.before).getTime()
let arr = stop - star
this.date = Math.floor(arr / (24 * 3600 * 1000));
// console.log(days)
if(this.date<0){
this.date=this.date*-1
}
}
},
calendar() {
this.$refs.calendar.open()
},
//关闭商品弹窗
close() {
this.$refs.associated.close()
},
//打开商品弹窗
addProduct() {
this.$refs.associated.open()
},
//获取商品信息
getProduct(data) {
console.log(data)
},
//提交
formSubmit(e) {
console.log(e)
}
} }
} }
</script> </script>
@ -157,7 +181,7 @@
.content_center-one { .content_center-one {
display: flex; display: flex;
padding: 0 28rpx;
.center-one { .center-one {
margin-top: 32rpx; margin-top: 32rpx;
@ -391,6 +415,7 @@
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
} }
.release_btn { .release_btn {
margin-top: 100rpx; margin-top: 100rpx;
} }

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

@ -1,6 +1,17 @@
<template> <template>
<view class="content"> <view class="content">
<view class="content_top"> <view class="content_top">
<view class="content_top-one">
<image src="@/static/images/dong.gif" mode="aspectFill"></image>
</view>
<view class="content_top-two">
<view class="top-two-one">
待评价
</view>
<view class="top-two-two">
2020-07-07 14:14:14
</view>
</view>
</view> </view>
<view class="content_center"> <view class="content_center">
<view class="content_center-one"> <view class="content_center-one">
@ -78,6 +89,14 @@
通滩镇镇街店铺 通滩镇镇街店铺
</view> </view>
</view> </view>
<view class="center-two">
<view class="center-twoa">
结算利息:
</view>
<view class="center-twob">
通滩镇镇街店铺
</view>
</view>
<view class="center-two"> <view class="center-two">
<view class="center-twoa"> <view class="center-twoa">
状态: 状态:
@ -99,7 +118,7 @@
拒绝原因: 拒绝原因:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺
</view> </view>
</view> </view>
</view> </view>
@ -133,16 +152,50 @@
</template> </template>
<script> <script>
import {} from '@/api/sale.js'
</script> </script>
<style lang="scss"> <style lang="scss">
.content { .content {
position: relative; position: relative;
} }
.content_top { .content_top {
height: 151rpx; height: 151rpx;
background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%); background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
display: flex;
padding-top: 21rpx;
.content_top-one {
width: 107rpx;
height: 107rpx;
margin-left: 28rpx;
image {
width: 100%;
height: 100%;
}
}
.content_top-two {
margin-left: 25rpx;
.top-two-one {
font-size: 35rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
margin-top: 10rpx;
}
.top-two-two {
font-size: 28rpx;
font-family: SF Pro Display-Light, SF Pro Display;
font-weight: 300;
color: #FFFFFF;
margin-top: 10rpx;
}
}
} }
@ -217,6 +270,10 @@
} }
.center-twob { .center-twob {
width: 360rpx;
text-align: right;
border: 1px solid;
word-wrap: break-word;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 400; font-weight: 400;
@ -277,6 +334,4 @@
position: fixed; position: fixed;
bottom: 100rpx; bottom: 100rpx;
} }
</style> </style>

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

@ -35,7 +35,7 @@
处理 处理
</view> </view>
<span></span> <span></span>
<view class="contentgn_b"> <view class="contentgn_b" @click="detail">
详情 详情
</view> </view>
</view> </view>
@ -90,7 +90,15 @@
</view> </view>
</view> </view>
</view> </view>
<view class="adddelegation" @click="addDelegation">
<view class="adddelegation-one">
<image src="@/static/images/delegation.png" mode=""></image>
</view>
<view class="adddelegation-two">
新增委托
</view>
</view>
<view v-if="orderList.length == 0 && this.where.page > 1"> <view v-if="orderList.length == 0 && this.where.page > 1">
<emptyPage title="暂无订单~"></emptyPage> <emptyPage title="暂无订单~"></emptyPage>
</view> </view>
@ -235,6 +243,7 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
@ -296,7 +305,7 @@
onLoad() { onLoad() {
this.tabTitle = this.tabs[0].name this.tabTitle = this.tabs[0].name
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
console.log(this.tabs[0]) // console.log(this.tabs[0])
}, },
mounted() { mounted() {
@ -308,26 +317,36 @@
// url: '/pages/commissionedSales/delegation_details/index' // url: '/pages/commissionedSales/delegation_details/index'
// }) // })
}, },
//选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
}, },
//新增委托
addDelegation(){
uni.navigateTo({
url:'/pages/commissionedSales/addDelegation/index'
})
},
//管理弹窗 //管理弹窗
close() { close() {
console.log('1111111')
this.$refs.bindmobile.close() this.$refs.bindmobile.close()
this.$refs.bindmobile1.close() this.$refs.bindmobile1.close()
this.$refs.bindmobile2.close() this.$refs.bindmobile2.close()
this.$refs.bindmobile3.close() this.$refs.bindmobile3.close()
}, },
//详情
detail() {
uni.navigateTo({
url: '/pages/commissionedSales/delegation_details/index'
})
},
// 待处理 // 待处理
soldEdit() { soldEdit() {
this.$refs.bindmobile.open() this.$refs.bindmobile.open()
}, },
//已接受 //已接受
accepted() { accepted() {
@ -359,10 +378,56 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content {
height: 100vh;
position: relative;
}
.content_top { .content_top {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.adddelegation {
width: 694rpx;
height: 95rpx;
background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
border-radius: 47rpx 47rpx 47rpx 47rpx;
opacity: 1;
display: flex;
position: fixed;
position: absolute;
bottom: 84rpx;
left: 50%;
margin-left: -347rpx;
.adddelegation-one {
width: 50rpx;
margin-right: 30rpx;
height: 50rpx;
margin-left: 242rpx;
margin-top: 21rpx;
image {
width: 50rpx;
height: 50rpx;
}
}
.adddelegation-two {
font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
margin-top: 25rpx;
}
}
.content_top { .content_top {
@ -558,12 +623,11 @@
} }
span { span {
width: 0px; width: 1px;
height: 30rpx; height: 30rpx;
opacity: 1; opacity: 1;
margin-top: 8rpx;
margin-top: 10rpx; background-color: #cccccc;
border: 2rpx solid #CCCCCC;
} }

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

@ -22,14 +22,10 @@
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==1"> <view class="content-two_one" v-if="item.type==1">
<view class="content-two-edita" @click="soldEdit"> <view class="content-two-edita" @click="soldEdit">
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a"> <view class="contentgn_a">
处理 处理
@ -235,6 +231,7 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
@ -362,13 +359,9 @@
.content_top { .content_top {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.content_top { .content_top {
width: 100%; width: 100%;
} }
.content-content { .content-content {
margin-top: 21rpx; margin-top: 21rpx;
@ -579,10 +572,8 @@
} }
.entrust { .entrust {
.entrust_close { .entrust_close {
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
@ -818,7 +809,5 @@
} }
} }
} }
</style> </style>

17
pages/gather/gather.vue
View File

@ -127,7 +127,8 @@
</image> </image>
<text class="text">交易大厅</text> <text class="text">交易大厅</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)"> <view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image> </image>
<text class="text">委托销售</text> <text class="text">委托销售</text>
@ -150,7 +151,8 @@
<!-- <gatherBusiness :userInfoData="userInfoData" /> --> <!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view> </view>
</view> </view>
<view class="business com" v-if="userInfoData.mer_info.type_id === 11">
<view class="business com" v-if="userInfoData.mer_info.type_id!=null&&userInfoData.mer_info.type_id === 11">
<view class="business com" v-if="true"> <view class="business com" v-if="true">
<view class="special_work com"> <view class="special_work com">
<view class="title">里海云仓</view> <view class="title">里海云仓</view>
@ -220,6 +222,9 @@
</view> </view>
</view> </view>
</view> </view>
</block> </block>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
@ -228,11 +233,16 @@
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
<view class="" v-if='jurisdiction==false&&isShow==false'>
<emptyPage title="暂无信息"></emptyPage>
</view>
</view> </view>
</template> </template>
<script> <script>
import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
import emptyPage from '@/components/emptyPage.vue';
import zbpSwiper from '@/components/zbpSwiper' import zbpSwiper from '@/components/zbpSwiper'
import { import {
mapState, mapState,
@ -259,7 +269,8 @@
export default { export default {
components: { components: {
mTabbar, mTabbar,
zbpSwiper zbpSwiper,
emptyPage
}, },
data() { data() {
return { return {

1
pages/index/index.vue
View File

@ -10,6 +10,7 @@
<view class=""> <view class="">
</view> </view>
<view class="goods"> <view class="goods">
<block v-for="(item,index) in cateGoods" :key="index"> <block v-for="(item,index) in cateGoods" :key="index">
<view class="goods_item" @click="gogogo(item)"> <view class="goods_item" @click="gogogo(item)">

4
pages/nongKe/supply_chain/purchase_control.vue
View File

@ -253,8 +253,8 @@
<view class="bnt cancelBnt" v-if="item.order_type===1" @click="location(item.order_id)"> <view class="bnt cancelBnt" v-if="item.order_type===1" @click="location(item.order_id)">
<text class="iconfont icon-weizhi"></text>查看位置 <text class="iconfont icon-weizhi"></text>查看位置
</view> </view>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' <!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> @click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.status == 0 || item.status == 9 || item.status == -1"> <block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view> <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block> </block>

39
pages/order_details/index.vue
View File

@ -133,13 +133,15 @@
</view> </view>
<block v-if="cartInfo.length>0"> <block v-if="cartInfo.length>0">
<orderGoods :orderData='orderInfo' :evaluate='orderInfo.status' <orderGoods :orderData='orderInfo' :evaluate='orderInfo.order_status'
:activityType='orderInfo.activity_type' :orderId="order_id" :cartInfo="cartInfo" :jump="true"> :activityType='orderInfo.activity_type' :orderId="order_id" :cartInfo="cartInfo" :jump="true">
</orderGoods> </orderGoods>
<block <block
v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0" v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
v-for="(item,index) in orderInfo.takeOrderList" :key="index"> v-for="(item,index) in orderInfo.takeOrderList" :key="index">
<orderGoods :orderData='item' :evaluate='item.status' :activityType='item.activity_type' <orderGoods :orderData='item' :evaluate='item.status' :activityType='item.activity_type'
:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods> :orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
</block> </block>
@ -277,7 +279,7 @@
<view class="content-clip"></view> <view class="content-clip"></view>
<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false"> <view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> --> <!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> <!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)" <view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
class=" acea-row row-right row-middle"> class=" acea-row row-right row-middle">
<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'> <view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
@ -303,8 +305,9 @@
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel' <navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流 hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator> </navigator>
<!-- <view class='bnt b-color' @tap='confirmOrder(orderInfo)'>取件码</view> --> <view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==98">确认收货
<view class='bnt b-color' @tap='confirmOrder(orderInfo)'>已收货</view> </view>
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-else>取件码</view>
</block> </block>
<block v-if="orderInfo.status == 2"> <block v-if="orderInfo.status == 2">
<view class="bnt cancel" @click="allRefund" <view class="bnt cancel" @click="allRefund"
@ -821,6 +824,7 @@
}); });
getOrderDetail(that.order_id).then(res => { getOrderDetail(that.order_id).then(res => {
uni.hideLoading(); uni.hideLoading();
that.$set(that, 'orderInfo', res.data); that.$set(that, 'orderInfo', res.data);
that.orderInfo.take = res.data.take; that.orderInfo.take = res.data.take;
that.$set(that, 'cartInfo', res.data.orderProduct); that.$set(that, 'cartInfo', res.data.orderProduct);
@ -915,17 +919,7 @@
}, },
queding() { queding() {
// uni.showModal({ if (orderInfo.activity_type == 98) {
// title: '取件码',
// content: item.logistics_code,
// success: function(res) {
// if (res.confirm) {
// // console.log('用户点击确定');
// } else if (res.cancel) {
// // console.log('用户点击取消');
// }
// }
// })
let that = this; let that = this;
orderTake(that.order_id).then(res => { orderTake(that.order_id).then(res => {
this.receivingshow = false this.receivingshow = false
@ -942,6 +936,21 @@
title: err title: err
}); });
}) })
} else {
uni.showModal({
title: '取件码',
content: item.logistics_code,
success: function(res) {
if (res.confirm) {
// console.log('用户点击确定');
} else if (res.cancel) {
// console.log('用户点击取消');
}
}
})
}
}, },
/** /**
* *

6
pages/order_details/stay.vue
View File

@ -125,7 +125,9 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<div class="goodCall" @click="goGoodCall(item)"> <div class="goodCall" @click="goGoodCall(item)">
<span class="iconfont icon-kefu"></span><span style="font-size: 28rpx;">联系客服</span> <span class="iconfont icon-kefu"></span><span style="font-size: 28rpx;">联系客服</span>
@ -358,8 +360,8 @@
yue_pay_status: 0 yue_pay_status: 0
}, },
mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])), mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
onLoad: function() { onLoad: function(options) {
console.log('11111111')
this.credit_buy = options.credit_buy this.credit_buy = options.credit_buy
console.log(options.product_type) console.log(options.product_type)
if (options.product_type) { if (options.product_type) {

4
pages/order_pay_status/index.vue
View File

@ -224,7 +224,7 @@
if (this.product_type == 98) { if (this.product_type == 98) {
if(val==1){ if(val==1){
uni.navigateTo({ uni.navigateTo({
url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}` url: `/pages/users/order_list/indexCopy?status=2&product_type=${this.product_type}`
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({
@ -235,7 +235,7 @@
} else { } else {
if(val==1){ if(val==1){
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/order_list/index?status=1&product_type=0' url: '/pages/users/order_list/index?status=2&product_type=0'
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({

1
pages/plant_release/index.vue
View File

@ -725,7 +725,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 999;
.iconfont { .iconfont {
color: #ffffff; color: #ffffff;

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

@ -3,8 +3,9 @@
<view class="order-index" ref="container"> <view class="order-index" ref="container">
<view class="header"> <view class="header">
<div class="header_count"> <div class="header_count">
<swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4" indicator-active-color="#E93323" <swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4"
previous-margin="0" next-margin="0" :current="swiperCur" @change="swiperChange"> indicator-active-color="#E93323" previous-margin="0" next-margin="0" :current="swiperCur"
@change="swiperChange">
<block> <block>
<swiper-item :class="{ active: 0 == swiperCur }"> <swiper-item :class="{ active: 0 == swiperCur }">
<view class="slide-navigator"> <view class="slide-navigator">
@ -13,25 +14,29 @@
</image> </image>
<text class="text">添加商品</text> <text class="text">添加商品</text>
</view> </view>
<navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`" <navigator class="item"
:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_sales.png"> <image mode='widthFix' class="image" src="../static/images/product_sales.png">
</image> </image>
<text class="text">在售商品</text> <text class="text">在售商品</text>
</navigator> </navigator>
<navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`" <navigator class="item"
:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_out.png"> <image mode='widthFix' class="image" src="../static/images/product_out.png">
</image> </image>
<text class="text">售罄商品</text> <text class="text">售罄商品</text>
</navigator> </navigator>
<navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`" <navigator class="item"
:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_recycle.png"> <image mode='widthFix' class="image" src="../static/images/product_recycle.png">
</image> </image>
<text class="text">回收站</text> <text class="text">回收站</text>
</navigator> </navigator>
<navigator class="item" :url="`/pages/product/storeClassification/index?mer_id=${mer_id}`" <navigator class="item"
:url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_cate.png"> <image mode='widthFix' class="image" src="../static/images/product_cate.png">
</image> </image>
@ -41,15 +46,18 @@
</swiper-item> </swiper-item>
<swiper-item :class="{ active: 1 == swiperCur }"> <swiper-item :class="{ active: 1 == swiperCur }">
<view class="slide-navigator"> <view class="slide-navigator">
<navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`" <navigator class="item"
:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_freight.png"> <image mode='widthFix' class="image" src="../static/images/product_freight.png">
</image> </image>
<text class="text">运费模板</text> <text class="text">运费模板</text>
</navigator> </navigator>
<navigator class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`" <navigator class="item"
:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_specification.png"></image> <image mode='widthFix' class="image"
src="../static/images/product_specification.png"></image>
<text class="text">规格模板</text> <text class="text">规格模板</text>
</navigator> </navigator>
<navigator class="item" <navigator class="item"
@ -91,21 +99,25 @@
<!-- 插件无需手动引入，直接使用即可 --> <!-- 插件无需手动引入，直接使用即可 -->
<!-- 里面···可以改为任意东西，图片也可以 --> <!-- 里面···可以改为任意东西，图片也可以 -->
<!-- 参数$event不可修改，否则取不到点击事件详情 --> <!-- 参数$event不可修改，否则取不到点击事件详情 -->
<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event, item.attrValue)"> <rudon-rowMenuDotDotDot :localdata="options"
@change="menuAction($event, item.attrValue)">
. . . . . .
</rudon-rowMenuDotDotDot> </rudon-rowMenuDotDotDot>
</view> </view>
</view> </view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view v-if="item.is_show == 1 && item.status == 1" class="bnt" @tap.stop="handleShelves(item,0)">下架 <view v-if="item.is_show == 1 && item.status == 1" class="bnt"
@tap.stop="handleShelves(item,0)">下架
</view> </view>
<view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架 <view v-if="item.is_show == 0 && item.status == 1" class="bnt"
@tap.stop="handleShelves(item),1">上架
</view> </view>
<view @click="editGoods(item)" class="bnt">编辑</view> <view @click="editGoods(item)" class="bnt">编辑</view>
<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除 <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
</view> </view>
<view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)"> <view class="bnt bnt_recommend" v-if="item.is_show == 1"
@tap.stop="handleRecommend(item)">
{{item.is_good ? '取消推荐' : '店铺推荐'}} {{item.is_good ? '取消推荐' : '店铺推荐'}}
</view> </view>
</view> </view>
@ -126,7 +138,8 @@
<view> <view>
<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange"> <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1" <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku"> @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique"
v-if="item.sku">
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
@ -141,6 +154,8 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<u-loadmore :status="status" v-if="productList.length>0" />
</view> </view>
</template> </template>
@ -179,6 +194,7 @@
}, },
data() { data() {
return { return {
status: 'loadmore',
current: "", current: "",
where: { where: {
page: 1, page: 1,
@ -207,7 +223,7 @@
//线下 //线下
show: false, show: false,
//单选示例 //单选示例
checkboxValue1: [], checkboxValue1: '',
// 基本案列数据 // 基本案列数据
checkboxList1: [], checkboxList1: [],
data: { data: {
@ -223,12 +239,20 @@
this.getList(this.mer_id); this.getList(this.mer_id);
}, },
onPullDownRefresh() { onPullDownRefresh() {
// this.where.page = 1 this.where.page = 1
this.productList=[]
this.loading = false this.loading = false
this.loaded = false this.loaded = false
this.getList(this.mer_id); this.getList(this.mer_id);
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onReachBottom() {
// console.log(this.status, '222222222')
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.getList(this.mer_id);
},
onHide() { onHide() {
this.show = false this.show = false
}, },
@ -268,6 +292,7 @@
}, },
//导入 //导入
creat() { creat() {
if (this.on_line == 1) { if (this.on_line == 1) {
if (this.data.number < 1) { if (this.data.number < 1) {
this.show = false this.show = false
@ -281,6 +306,7 @@
this.$util.Tips({ this.$util.Tips({
title: res.message title: res.message
}) })
this.productList = []
this.getList(this.mer_id); this.getList(this.mer_id);
}).catch(err => { }).catch(err => {
this.show = false this.show = false
@ -316,7 +342,7 @@
}, },
radioChange(n) { radioChange(n) {
this.data.product_id = n.product_id this.data.product_id = n.product_id
console.log(this.data); // console.log(this.data);
}, },
// 跳转添加商品界面 // 跳转添加商品界面
jumpAddGoods() { jumpAddGoods() {
@ -347,15 +373,16 @@
} }
}, },
getList: function(mer_id) { getList: function(mer_id) {
var that = this; var that = this;
if (that.loading || that.loaded) return; // if (that.loading || that.loaded) return;
that.loading = true; that.loading = true;
productLstApi(mer_id, that.where).then( productLstApi(mer_id, that.where).then(
res => { res => {
that.loading = false; that.loading = false;
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.productList.push.apply(that.productList, res.data.list); that.productList.push(...res.data.list);
that.where.page = that.where.page + 1; if (res.data.list.length < that.where.limit) that.status = 'nomore'
}, },
error => { error => {
@ -467,9 +494,7 @@
this.current = index this.current = index
}, },
}, },
onReachBottom() {
this.getList(this.mer_id)
}
} }
</script> </script>

97
pages/releaseManagement/index.vue
View File

@ -5,15 +5,41 @@
<!--选项卡滑动切换--> <!--选项卡滑动切换-->
<cxNavTitle :tabs="tabs" :activeItem="activeItem" :show="false" @tabClick="tabClick"></cxNavTitle> <cxNavTitle :tabs="tabs" :activeItem="activeItem" :show="false" @tabClick="tabClick"></cxNavTitle>
</view> </view>
<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 --> <!-- 审核通过 打折有拒绝、同意功能 ，调货不需要功能 -->
<view class="content-content"> <view class="content-content">
<view class="" v-for="(item,i) in orderList" :key='i' <view class="" v-for="(item,i) in orderList" :key='i'
style=" border-radius: 14rpx 14rpx 14rpx 14rpx;margin-bottom: 23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;"> style=" border-radius: 14rpx 14rpx 14rpx 14rpx;margin-bottom: 23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
<view :class="tabTitle=='tabTwo'?'content-onea':'content-one'">
<view @click="detail(item)"
:class="tabTitle=='tabTwo'?'content-onea':'content-one'&&(tabTitle=='tabFive'&&item.resale_type==1)?'content-onea':'content-one'">
<view class="content-one-img"> <view class="content-one-img">
<image :src="item.image" mode="aspectFit"></image>
<image :src="item.image.indexOf(',')>-1?item.image.split(',')[0]:item.image" mode="aspectFit">
</image>
</view> </view>
<view class="content-one-txt"> <view class="content-one-txt" v-if="tabTitle=='tabFive'">
<view class="one-txt-a">
{{item.title}}
</view>
<view class="one-txt-b" style="margin-top: 5px;">
<view class="txt-b-a">
￥ {{item.discount_price}}
</view>
<view class="txt-b-b"
style="font-size: 28rpx;font-family: SF Pro Display-Regular, SF Pro Display;font-weight: 400;color: #999999;">
结算价:￥{{item.discount_price}}
</view>
</view>
<view class="txt-b-b" style="margin-top: 5px;" v-if="item.resale_type==1">
类型:调货
</view>
<view class="txt-b-b" style="margin-top: 5px;" v-else>
类型:打折
</view>
</view>
<view class="content-one-txt" v-else>
<view class="one-txt-a"> <view class="one-txt-a">
{{item.title}} {{item.title}}
</view> </view>
@ -28,6 +54,9 @@
类型:打折 类型:打折
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if='tabTitle=="tabOne"'> <view class="content-two_one" v-if='tabTitle=="tabOne"'>
@ -63,7 +92,8 @@
</view> </view>
</view> </view>
<view class="content-two-five" v-if='tabTitle=="tabFive"'> <view class="content-two-five" v-if='tabTitle=="tabFive"&&item.resale_type==2'>
<view class="" v-if="item.mer_status==0">
<view class="content-two-delete" @click="passDelete(item)"> <view class="content-two-delete" @click="passDelete(item)">
拒绝 拒绝
</view> </view>
@ -72,6 +102,17 @@
同意 同意
</view> </view>
</view> </view>
<view class="" v-else>
<view :class="item.mer_status==1?'content-two-deletea':'content-two-delete'"
@click="passDelete(item)" v-if="item.mer_status==1">
拒绝
</view>
<view class="content-two-agree" @click="passagree(item)" v-else>
同意
</view>
</view>
</view>
</view> </view>
@ -89,9 +130,7 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {
from
} from 'form-data';
import { import {
getResaleid, getResaleid,
getResalecheck, getResalecheck,
@ -145,8 +184,10 @@
onLoad(num) { onLoad(num) {
this.tabTitle = this.tabs[0].name this.tabTitle = this.tabs[0].name
if (num.key == '2') { if (num.key == '2') {
this.activeItem = 'tabThree' this.activeItem = 'tabThree',
this.where.status = 3
} }
this.orderList = []
this.list() this.list()
}, },
methods: { methods: {
@ -189,6 +230,7 @@
title: res.message, title: res.message,
icon: 'success' icon: 'success'
}) })
this.orderList = []
this.list() this.list()
this.tabTitle = 'tabThree' this.tabTitle = 'tabThree'
}) })
@ -209,12 +251,12 @@
}, },
// 审核未通过 删除 // 审核未通过 删除
auditDelete(item) { auditDelete(item) {
getResaledelete(item.community_id).then(res => { getResaledelete(item.community_id).then(res => {
this.$util.Tips({ this.$util.Tips({
title: res.message, title: res.message,
icon: 'success' icon: 'success'
}) })
this.orderList = []
this.list() this.list()
this.tabTitle = 'tabFour' this.tabTitle = 'tabFour'
}) })
@ -243,10 +285,18 @@
title: res.message, title: res.message,
icon: 'success' icon: 'success'
}) })
this.orderList = []
this.list() this.list()
this.tabTitle = 'tabFive' this.tabTitle = 'tabFive'
}) })
}, },
//详情
detail(item) {
uni.navigateTo({
url: '/pages/releaseManagement/details/index?key=' + item.community_id
})
},
//审核通过 同意 //审核通过 同意
passagree(item) { passagree(item) {
getResalecheck(item.community_id, { getResalecheck(item.community_id, {
@ -256,6 +306,7 @@
title: res.message, title: res.message,
icon: 'success' icon: 'success'
}) })
this.orderList = []
this.list() this.list()
this.tabTitle = 'tabFive' this.tabTitle = 'tabFive'
}) })
@ -269,30 +320,22 @@
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.content_top { .content_top {
width: 100%; width: 100%;
} }
.content-content { .content-content {
margin-top: 21rpx; margin-top: 21rpx;
margin-left: 28rpx; margin-left: 28rpx;
margin-right: 28rpx; margin-right: 28rpx;
padding-top: 28rpx; padding-top: 28rpx;
opacity: 1; opacity: 1;
position: relative; position: relative;
.content-onea { .content-onea {
display: flex; display: flex;
padding-bottom: 23rpx; padding-bottom: 23rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
.content-one-img { .content-one-img {
@ -300,8 +343,6 @@
height: 148rpx; height: 148rpx;
margin-right: 28rpx; margin-right: 28rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -510,6 +551,22 @@
bottom: 23rpx; bottom: 23rpx;
} }
.content-two-deletea {
width: 168rpx;
height: 60rpx;
line-height: 60rpx;
text-align: center;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #999999;
border: 2rpx solid #999999;
position: absolute;
right: 28rpx;
bottom: 23rpx;
border-radius: 32rpx 32rpx 32rpx 32rpx;
}
.content-two-delete { .content-two-delete {
width: 168rpx; width: 168rpx;
height: 60rpx; height: 60rpx;

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

@ -645,6 +645,9 @@
if (!value.content) return that.$util.Tips({ if (!value.content) return that.$util.Tips({
title: '请添加商品描述' title: '请添加商品描述'
}); });
if (!value.product_info[0].deliver_method ) return that.$util.Tips({
title: '请选择配送方式'
});
if (that.tabActive == 2 && !value.video_link) { if (that.tabActive == 2 && !value.video_link) {
return that.$util.Tips({ return that.$util.Tips({
title: '请添加话题视频' title: '请添加话题视频'
@ -671,10 +674,10 @@
is_type: 3, is_type: 3,
product_info: [] product_info: []
} }
uni.navigateTo({
uni.redirectTo({
url: '/pages/releaseManagement/index?key=' + 2 url: '/pages/releaseManagement/index?key=' + 2
}) })
} else { } else {
that.$util.Tips({ that.$util.Tips({
title: res.messge, title: res.messge,
@ -702,7 +705,7 @@
is_type: 3, is_type: 3,
product_info: [] product_info: []
} }
uni.navigateTo({ uni.redirectTo({
url: '/pages/releaseManagement/index?key=' + 2 url: '/pages/releaseManagement/index?key=' + 2
}) })

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

@ -27,9 +27,9 @@
<view class="top-two_content"> <view class="top-two_content">
<textarea :value="listobj.content" placeholder="" style="height: auto;" /> <textarea :value="listobj.content" placeholder="" style="height: auto;" />
</view> </view>
<view class="top-two_img" v-for="(item,index) in listobj.image"> <view class="top-two_img">
<view class=""> <view class="" v-for="(item,index) in listobj.image">
<image :src="item" mode=""></image> <image :src="item" mode=""></image>
</view> </view>
@ -250,20 +250,24 @@
.top-two_img { .top-two_img {
display: flex; display: flex;
justify-content: space-between;
view { view {
width: 217rpx; width: 217rpx;
height: 217rpx; height: 217rpx;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
} margin-right: 15rpx;
image { image {
width: 217rpx; width: 100%;
height: 217rpx; height: 100%;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
} }
} }
}
} }
} }
@ -355,6 +359,7 @@
.content_bootm_one { .content_bootm_one {
height: 112rpx; height: 112rpx;
line-height: 112rpx;
padding-right: 28rpx; padding-right: 28rpx;
background: #FFFFFF; background: #FFFFFF;
display: flex; display: flex;

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

@ -603,15 +603,16 @@
}, },
/*获取选中的宝贝*/ /*获取选中的宝贝*/
getProduct(data) { getProduct(data) {
if(this.type== 'edit'){
this.formData.product_info=[]
}
this.productList = [] this.productList = []
this.price = 0; this.price = 0;
console.log(data)
if (data.length > 0) { if (data.length > 0) {
this.productList = data; this.productList = data;
for (let i in data) { for (let i in data) {
this.price = Number(this.price) + (Number(data[i].number) * Number(data[i].price)) this.price = Number(this.price) + (Number(data[i].number) * Number(data[i].price))
this.formData.product_info.push({ this.formData.product_info.push({
product_attr_unique: data[i].product_attr_unique, product_attr_unique: data[i].product_attr_unique,
@ -638,7 +639,6 @@
let that = this, let that = this,
value = that.formData; value = that.formData;
if (value.image.length == 0) return that.$util.Tips({ if (value.image.length == 0) return that.$util.Tips({
title: '请添加图文图片' title: '请添加图文图片'
}); });
@ -648,6 +648,11 @@
if (!value.content) return that.$util.Tips({ if (!value.content) return that.$util.Tips({
title: '请添加商品描述' title: '请添加商品描述'
}); });
// console.log( this.delivery_way.length>0 )
if (!value.product_info[0].deliver_method && this.delivery_way.length==0 ) return that.$util.Tips({
title: '请选择配送方式'
});
if (that.tabActive == 2 && !value.video_link) { if (that.tabActive == 2 && !value.video_link) {
return that.$util.Tips({ return that.$util.Tips({
title: '请添加话题视频' title: '请添加话题视频'
@ -658,6 +663,7 @@
mask: true mask: true
}) })
that.type == 'edit' ? getresaleEdit(that.id, value).then(res => { that.type == 'edit' ? getresaleEdit(that.id, value).then(res => {
if (res.status == '200') { if (res.status == '200') {
uni.hideLoading() uni.hideLoading()
@ -674,7 +680,7 @@
is_type: 3, is_type: 3,
product_info: [] product_info: []
} }
uni.navigateTo({ uni.redirectTo({
url: '/pages/releaseManagement/index?key=' + 2 url: '/pages/releaseManagement/index?key=' + 2
}) })
@ -705,7 +711,7 @@
is_type: 3, is_type: 3,
product_info: [] product_info: []
} }
uni.navigateTo({ uni.redirectTo({
url: '/pages/releaseManagement/index?key=' + 2 url: '/pages/releaseManagement/index?key=' + 2
}) })

14
pages/user/index.vue
View File

@ -287,19 +287,19 @@
{ {
icon: 'icon-daifahuo1', icon: 'icon-daifahuo1',
title: '待发货', title: '待发货',
url: '/pages/users/order_list/index?status=1', url: '/pages/users/order_list/index?status=2',
num: 0 num: 0
}, },
{ {
icon: 'icon-daishouhuo1', icon: 'icon-daishouhuo1',
title: '待收货', title: '待收货',
url: '/pages/users/order_list/index?status=2', url: '/pages/users/order_list/index?status=3',
num: 0 num: 0
}, },
{ {
icon: 'icon-daipingjia1', icon: 'icon-daipingjia1',
title: '待评价', title: '待评价',
url: '/pages/users/order_list/index?status=3', url: '/pages/users/order_list/index?status=4',
num: 0 num: 0
}, },
{ {
@ -420,7 +420,10 @@
// 菜单显示 // 菜单显示
filterMenus: function(item) { filterMenus: function(item) {
let that = this; let that = this;
if (item.url == '/pages/users/user_money/index') item.isShow = that.balance_func_status == 1 if (item.url == '/pages/users/user_money/index') {
// item.isShow = that.balance_func_status == 1
item.isShow = true
}
else if (item.url == '/pages/users/user_spread_user/index') { else if (item.url == '/pages/users/user_spread_user/index') {
if (that.extension_status == 0) { if (that.extension_status == 0) {
item.isShow = false item.isShow = false
@ -436,6 +439,8 @@
else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1 else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1
else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1 else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1
else item.isShow = true else item.isShow = true
}, },
showMenu(menu) { showMenu(menu) {
return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance'] return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance']
@ -556,6 +561,7 @@
that.filterMenus(item) that.filterMenus(item)
that.personalMenu.push(item) that.personalMenu.push(item)
}) })
that.imgUrls = res.data.banner that.imgUrls = res.data.banner
}); });
}, },

3
pages/users/order_confirm/index.vue
View File

@ -121,6 +121,7 @@
<view class="boxs"> <view class="boxs">
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>配送方式</view> <view>配送方式</view>
<view <view
v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)" v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
class='discount' @tap="openShowBox(item,index)"> class='discount' @tap="openShowBox(item,index)">
@ -1151,7 +1152,7 @@
let that = this; let that = this;
let active = e; let active = e;
that.active = active; that.active = active;
console.log(this.active); // console.log(this.active);
that.animated = true; that.animated = true;
that.payType = that.cartArr[active].value; that.payType = that.cartArr[active].value;
if (that.payType == 'weixin') { if (that.payType == 'weixin') {

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

@ -250,8 +250,8 @@
</view> </view>
</view> </view>
<view class='bottom acea-row row-right row-middle'> <view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' <!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> @click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.status == 0 || item.status == 9 || item.status == -1"> <block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view> <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block> </block>
@ -488,7 +488,9 @@
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function(options) { onLoad: function(options) {
if (options.status) this.orderStatus = options.status; if (options.status) this.orderStatus = options.status;
}, },
/** /**
* 获取订单统计数据 * 获取订单统计数据

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

@ -251,8 +251,8 @@
</view> </view>
</view> </view>
<view class='bottom acea-row row-right row-middle'> <view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' <!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> @click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.status == 0 || item.status == 9 || item.status == -1"> <block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view> <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block> </block>
@ -260,7 +260,10 @@
<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)'v-if='item.activity_type=98'>
确认收货
</view>
<view class='bnt b-color' v-else @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">
@ -562,6 +565,8 @@
* 去订单详情 * 去订单详情
*/ */
goOrderDetails: function(order_id) { goOrderDetails: function(order_id) {
let self = this let self = this
if (!order_id) return that.$util.Tips({ if (!order_id) return that.$util.Tips({
title: '缺少订单号无法查看订单详情' title: '缺少订单号无法查看订单详情'
@ -570,6 +575,7 @@
uni.showLoading({ uni.showLoading({
title: '正在加载', title: '正在加载',
}) })
console.log(self.orderStatus)
openOrderSubscribe().then(() => { openOrderSubscribe().then(() => {
uni.hideLoading(); uni.hideLoading();
if (self.orderStatus == 0) { if (self.orderStatus == 0) {

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

@ -247,8 +247,8 @@
</view> </view>
</view> </view>
<view class='bottom acea-row row-right row-middle'> <view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' <!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> @click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.status == 0 || item.status == 9 || item.status == -1"> <block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view> <view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view> <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>

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

@ -74,9 +74,9 @@
<view class="empty_wrapper" v-if="emptyShow"> <view class="empty_wrapper" v-if="emptyShow">
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty> <u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
</view> </view>
<u-loadmore :status="status" v-if="datatlist.length>0"/> <u-loadmore :status="status" v-if="datatlist.length>=where.limit" />
</view> </view>
</template> </template>
@ -134,14 +134,17 @@
onReachBottom() { onReachBottom() {
if (this.status == 'nomore') return; if (this.status == 'nomore') return;
this.status = 'loading'; this.status = 'loading';
this.emptyShow = false
this.where.page = ++this.where.page; this.where.page = ++this.where.page;
this.getlist(this.num) this.getlist(this.num)
}, },
methods: { methods: {
//选择 打折 调货 //选择 打折 调货
btntap(index) { btntap(index) {
this.datatlist = []
this.num = index this.num = index
this.getlist() this.getlist()
}, },
@ -167,17 +170,24 @@
handleSearch() { handleSearch() {
if (this.num == 0) { if (this.num == 0) {
this.where.resale_type = '' this.where.resale_type = ''
this.emptyShow = false
this.datatlist = []
} else if (this.num == 1) { } else if (this.num == 1) {
this.where.resale_type = 1 this.where.resale_type = 1
this.emptyShow = false
this.datatlist = []
} else { } else {
this.where.resale_type = 2 this.where.resale_type = 2
this.emptyShow = false
this.datatlist = []
} }
getCommunityList(this.where).then(res => { getCommunityList(this.where).then(res => {
if (res.status == 200) { if (res.status == 200) {
this.datatlist.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore' if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true if (this.where.page == 1 && res.data.list.length == 0) this.emptyShow = true
this.datatlist.push(...res.data.list)
} }
}) })
@ -187,19 +197,25 @@
getlist(index) { getlist(index) {
if (this.num == 0) { if (this.num == 0) {
this.where.resale_type = '' this.where.resale_type = ''
this.datatlist=[] this.emptyShow = false
} else if (this.num == 1) { } else if (this.num == 1) {
this.where.resale_type = 1 this.where.resale_type = 1
this.datatlist=[] this.emptyShow = false
} else { } else {
this.where.resale_type = 2 this.where.resale_type = 2
this.datatlist=[] this.emptyShow = false
} }
getCommunityList(this.where).then(res => { getCommunityList(this.where).then(res => {
if (res.status == 200) { if (res.status == 200) {
if (res.data.list.length < this.where.limit) {
this.status = 'nomore'
}
if (this.where.page == 1 && res.data.list.length <= 0) {
this.emptyShow = true
}
this.datatlist.push(...res.data.list) this.datatlist.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
} }
}) })
@ -220,10 +236,14 @@
this.visible = false this.visible = false
}, },
menuAction(action, rowId) { menuAction(action, rowId) {
// console.log(action);
// 忽略初始化时的传入的空操作 // 忽略初始化时的传入的空操作
if (action) {
this.num = action this.num = action
this.getlist(action) this.getlist(action)
}
if (action === '') { if (action === '') {
this.recomname = this.options[0].text this.recomname = this.options[0].text
} else { } else {

BIN
static/images/delegation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 704 B

BIN
static/images/dong.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB