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:
THK3121 2023-08-04 08:57:20 +08:00
parent 7837a9cd83
commit da13b53bbd
21 changed files with 10392 additions and 8819 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/user.js
View File

@ -708,3 +708,7 @@ export function hasServiceApi(id) {
export function getBankInfo() { export function getBankInfo() {
return request.get(`user/extract/history_bank`) return request.get(`user/extract/history_bank`)
} }
// 商户账单管理
export function getBillDetil() {
return request.get(`mer/financial_record`)
}

2
config/app.js
View File

@ -22,7 +22,7 @@ if (process.env.NODE_ENV === "development") {
// httpApiThree = 'baseUrlTest' // h5跨域配置 // httpApiThree = 'baseUrlTest' // h5跨域配置
// #endif // #endif
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {
// httpApi = 'https://shop.lihaink.cn' // 生产 httpApi = 'https://shop.lihaink.cn' // 生产
httpApi = "https://crmeb-test.shop.lihaink.cn" httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产

11
pages.json
View File

@ -1,5 +1,6 @@
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
@ -484,6 +485,12 @@
"navigationBarTitleText": "我的订单" "navigationBarTitleText": "我的订单"
} }
}, },
{
"path": "order_list/indexCopy",
"style": {
"navigationBarTitleText": "我的订单"
}
},
{ {
"path": "order_list/order", "path": "order_list/order",
"style": { "style": {
@ -1072,7 +1079,7 @@
"style": { "style": {
"navigationBarTitleText": "搜索商品", "navigationBarTitleText": "搜索商品",
"app-plus": { "app-plus": {
"titleNView":false "titleNView": false
} }
} }
} }

79
pages/admin/order/index.vue
View File

@ -2,30 +2,36 @@
<view> <view>
<view class="order-index" ref="container"> <view class="order-index" ref="container">
<view class="header acea-row"> <view class="header acea-row">
<navigator class="item" :url="`/pages/admin/orderList/index?types=1&merId=${mer_id}`" hover-class="none"> <navigator class="item" :url="`/pages/admin/orderList/index?types=1&merId=${mer_id}`"
hover-class="none">
<view class="num">{{ census.unpaid }}</view> <view class="num">{{ census.unpaid }}</view>
<view>待付款</view> <view>待付款</view>
</navigator> </navigator>
<navigator class="item" :url="`/pages/admin/orderList/index?types=2&merId=${mer_id}`" hover-class="none"> <navigator class="item" :url="`/pages/admin/orderList/index?types=2&merId=${mer_id}`"
hover-class="none">
<view class="num">{{ census.unshipped }}</view> <view class="num">{{ census.unshipped }}</view>
<view>待发货</view> <view>待发货</view>
</navigator> </navigator>
<navigator class="item" :url="`/pages/admin/orderList/index?types=3&merId=${mer_id}`" hover-class="none"> <navigator class="item" :url="`/pages/admin/orderList/index?types=3&merId=${mer_id}`"
hover-class="none">
<view class="num">{{ census.untake }}</view> <view class="num">{{ census.untake }}</view>
<view>待收货</view> <view>待收货</view>
</navigator> </navigator>
<navigator class="item" :url="`/pages/admin/orderList/index?types=4&merId=${mer_id}`" hover-class="none"> <navigator class="item" :url="`/pages/admin/orderList/index?types=4&merId=${mer_id}`"
hover-class="none">
<view class="num">{{ census.unevaluate }}</view> <view class="num">{{ census.unevaluate }}</view>
<view>待评价</view> <view>待评价</view>
</navigator> </navigator>
<navigator class="item" :url="`/pages/admin/orderList/index?types=6&merId=${mer_id}`" hover-class="none"> <navigator class="item" :url="`/pages/admin/orderList/index?types=6&merId=${mer_id}`"
hover-class="none">
<view class="num">{{ census.refund }}</view> <view class="num">{{ census.refund }}</view>
<view>退款</view> <view>退款</view>
</navigator> </navigator>
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class="title"> <view class="title">
<span class="iconfont icon-shujutongji"></span>数据统计 <image src="@/static/images/sjtj.png" mode="widthFix" style="width:40rpx;translate: 0 10rpx;">
</image>数据统计
</view> </view>
<view class="list acea-row" v-if="orderData"> <view class="list acea-row" v-if="orderData">
<navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=today&merId=${mer_id}`" <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=today&merId=${mer_id}`"
@ -33,7 +39,8 @@
<view class="num">{{ orderData.today.payPrice }}</view> <view class="num">{{ orderData.today.payPrice }}</view>
<view>今日成交额</view> <view>今日成交额</view>
</navigator> </navigator>
<navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=yesterday&merId=${mer_id}`" <navigator class="item"
:url="`/pages/admin/statistics/index?type=price&time=yesterday&merId=${mer_id}`"
hover-class="none"> hover-class="none">
<view class="num">{{ orderData.yesterday.payPrice }}</view> <view class="num">{{ orderData.yesterday.payPrice }}</view>
<view>昨日成交额</view> <view>昨日成交额</view>
@ -48,7 +55,8 @@
<view class="num">{{ orderData.today.orderNum}}</view> <view class="num">{{ orderData.today.orderNum}}</view>
<view>今日订单数</view> <view>今日订单数</view>
</navigator> </navigator>
<navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=yesterday&merId=${mer_id}`" <navigator class="item"
:url="`/pages/admin/statistics/index?type=order&time=yesterday&merId=${mer_id}`"
hover-class="none"> hover-class="none">
<view class="num">{{ orderData.yesterday.orderNum }}</view> <view class="num">{{ orderData.yesterday.orderNum }}</view>
<view>昨日订单数</view> <view>昨日订单数</view>
@ -62,7 +70,8 @@
</view> </view>
<view class="public-wrapper"> <view class="public-wrapper">
<view class="title"> <view class="title">
<span class="iconfont icon-xiangxishuju"></span>详细数据 <image src="@/static/images/xxsj.png" mode="widthFix" style="width:40rpx;translate: 0 10rpx;">
</image>详细数据
</view> </view>
<view class="nav acea-row row-between-wrapper"> <view class="nav acea-row row-between-wrapper">
<view class="data">日期</view> <view class="data">日期</view>
@ -79,18 +88,14 @@
</view> </view>
<view class="public_footer" v-if="this.type_id == 12"> <view class="public_footer" v-if="this.type_id == 12">
<view class="footer_bon" > <view class="footer_bon">
<view class="footer_top public-wrapper "> <view class="footer_top public-wrapper ">
<text class="jk_img"> <image src="@/static/images/ddjk.png" mode="widthFix" style="width:40rpx;"></image>订单监控
<image src="@/static/images/jiankong.png" ></image>
</text>
<text>订单监控</text>
</view> </view>
<view v-for="(item,index) in OrderList" :key="index"> <view v-for="(item,index) in OrderList" :key="index">
<view class="" v-for="(val, key) in item.orderProduct"> <view class="" v-for="(val, key) in item.orderProduct">
<view class="bon_top" :key="key" @click="toDetail(item)"> <view class="bon_top" :key="key" @click="toDetail(item)">
<view class="public_img"> <view class="public_img">
@ -117,7 +122,8 @@
{{ val.product_num }} {{ val.product_num }}
</view> </view>
</view> </view>
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;"> <view class="order"
style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
已售数量 已售数量
<view class="txt"> <view class="txt">
{{ val.sales_volume }} {{ val.sales_volume }}
@ -135,9 +141,6 @@
</view> </view>
</view> </view>
</view> </view>
<button v-if="this.type_id == 12" class="footer-bnt" @click="navigator()">查看更多 ></button> <button v-if="this.type_id == 12" class="footer-bnt" @click="navigator()">查看更多 ></button>
@ -153,7 +156,13 @@
</template> </template>
<script> <script>
import { getStatisticsInfo, getStatisticsMonth, orderStatistics, orderPrice, purchaseOrder } from "@/api/admin"; import {
getStatisticsInfo,
getStatisticsMonth,
orderStatistics,
orderPrice,
purchaseOrder
} from "@/api/admin";
import Loading from '@/components/Loading/index.vue' import Loading from '@/components/Loading/index.vue'
export default { export default {
name: 'adminOrder', name: 'adminOrder',
@ -227,7 +236,9 @@
}, },
getOrderStatistics: function(mer_id) { getOrderStatistics: function(mer_id) {
let that = this; let that = this;
const data = { product_type: this.where.product_type } const data = {
product_type: this.where.product_type
}
console.log('data', data); console.log('data', data);
orderStatistics(mer_id, data).then( orderStatistics(mer_id, data).then(
res => { res => {
@ -294,13 +305,15 @@
border-radius: 30rpx; border-radius: 30rpx;
color: #fff; color: #fff;
} }
.supervisory_img{
display: inline-block; .supervisory_img {
width: 500rpx; display: inline-block;
height: 500rpx; width: 500rpx;
background-color: red; height: 500rpx;
overflow: hidden; background-color: red;
} overflow: hidden;
}
.iconfont { .iconfont {
display: inline-block; display: inline-block;
position: relative; position: relative;
@ -328,7 +341,7 @@ overflow: hidden;
/*订单首页*/ /*订单首页*/
.order-index .header { .order-index .header {
background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/beijing2.png"); background: url("@/static/images/beijin.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
height: 280upx; height: 280upx;
@ -464,19 +477,20 @@ overflow: hidden;
align-items: center; align-items: center;
margin: 16px 0 16px 25rpx; margin: 16px 0 16px 25rpx;
.jk_img{ .jk_img {
width: 18px; width: 18px;
height: 18px; height: 18px;
overflow: hidden; overflow: hidden;
// border: 1px solid red; // border: 1px solid red;
border-radius: 40px; border-radius: 40px;
image { image {
width: 22px; width: 22px;
height: 22px; height: 22px;
margin-right: 5px; margin-right: 5px;
} }
} }
} }
@ -516,7 +530,8 @@ overflow: hidden;
color: #F84221; color: #F84221;
} }
} }
.text_order{
.text_order {
width: 200px; width: 200px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;

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

@ -45,7 +45,8 @@
退款单号：{{ item.refund_order_sn }} 退款单号：{{ item.refund_order_sn }}
<text class="time">申请时间：{{ item.create_time }}</text> <text class="time">申请时间：{{ item.create_time }}</text>
</view> </view>
<view class="pos-order-goods" v-for="(val, key) in item.refundProduct" :key="key" @click="toRefundDetail(item)"> <view class="pos-order-goods" v-for="(val, key) in item.refundProduct" :key="key"
@click="toRefundDetail(item)">
<view class="goods acea-row row-between-wrapper"> <view class="goods acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
<view class="pictrue"> <view class="pictrue">
@ -80,9 +81,11 @@
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view class="bnt" @click="refundModify(item, 1)">订单备注</view> <view class="bnt" @click="refundModify(item, 1)">订单备注</view>
<navigator class="bnt bnt_color" v-if="item.status == 0" <navigator class="bnt bnt_color" v-if="item.status == 0"
:url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款</navigator> :url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款
</navigator>
<navigator class="bnt" v-if="item.status == 2" <navigator class="bnt" v-if="item.status == 2"
:url="'/pages/users/goods_logistics/index?refundId='+item.refund_order_id+'&merId='+merId">查看物流 :url="'/pages/users/goods_logistics/index?refundId='+item.refund_order_id+'&merId='+merId">
查看物流
</navigator> </navigator>
<view class="bnt bnt_color" v-if="item.status == 2" @tap='confirmOrder(item)'>确认收货</view> <view class="bnt bnt_color" v-if="item.status == 2" @tap='confirmOrder(item)'>确认收货</view>
</view> </view>
@ -100,7 +103,8 @@
<text class="order-status" <text class="order-status"
v-if="item.refunding != 0 && where.status != 1">{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}</text> v-if="item.refunding != 0 && where.status != 1">{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}</text>
</view> </view>
<view class="pos-order-goods" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)"> <view class="pos-order-goods" v-for="(val, key) in item.orderProduct" :key="key"
@click="toDetail(item)">
<view class="goods"> <view class="goods">
<view class="acea-row row-between-wrapper"> <view class="acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
@ -135,9 +139,10 @@
<span v-if="where.status <= 1">应</span> <span v-if="where.status <= 1">应</span>
<span v-else>已</span> <span v-else>已</span>
支付 支付
<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}}) <span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费
¥{{ item.pay_postage}})
</view> </view>
<view class="public-total" v-else > <view class="public-total" v-else>
先货后款 先货后款
<span v-if="where.status <= 1">应</span> <span v-if="where.status <= 1">应</span>
<span v-else>已</span> <span v-else>已</span>
@ -151,19 +156,24 @@
<view class="more"> <view class="more">
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view class="bnt" v-if="item.pay_type == 8 && item.status == 12" @click="tongyi(item.group_order_id,1)"> <view class="bnt" v-if="item.pay_type == 8 && item.status == 12"
@click="tongyi(item.group_order_id,1)">
同意 同意
</view> </view>
<view class="bnt" v-if="item.pay_type == 8 && item.status == 12 " @click="tongyi(item.group_order_id,2)"> <view class="bnt" v-if="item.pay_type == 8 && item.status == 12 "
@click="tongyi(item.group_order_id,2)">
拒绝 拒绝
</view> </view>
<view class="bnt" @click="modify(item, 0)" v-if="item.pay_type !=8 && item.paid !=1 "> <view class="bnt" @click="modify(item, 0)"
v-if="item.pay_type !=8 && item.paid !=1 &&!(item.status ==2 && item.pau_type==8) ">
一键改价 一键改价
</view> </view>
<view class="bnt" @click="modify(item, 1)">订单备注</view> <view class="bnt" @click="modify(item, 1)">订单备注</view>
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0" @click="toPostage(item)">去发货 <view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0"
@click="toPostage(item)">去发货
</view> </view>
<view class="bnt bnt_color" v-if="(where.status == 2 && item.order_type == 1) || where.is_verify == 1" <view class="bnt bnt_color"
v-if="(where.status == 2 && item.order_type == 1) || where.is_verify == 1"
@click="toDetail(item)">去核销</view> @click="toDetail(item)">去核销</view>
</view> </view>
</view> </view>
@ -217,7 +227,9 @@
} from "@/api/admin"; } from "@/api/admin";
import Loading from '@/components/Loading/index' import Loading from '@/components/Loading/index'
import PriceChange from '@/components/PriceChange/index' import PriceChange from '@/components/PriceChange/index'
import { isMoney } from '@/utils/validate.js' import {
isMoney
} from '@/utils/validate.js'
export default { export default {
name: "AdminOrderList", name: "AdminOrderList",
components: { components: {
@ -267,23 +279,23 @@
}, },
methods: { methods: {
//同意先货后款订单 //同意先货后款订单
tongyi(id,number){ tongyi(id, number) {
let data={ let data = {
id:id, id: id,
type:number type: number
} }
if(number == 1){ if (number == 1) {
this.$nextTick(()=>{ this.$nextTick(() => {
this.where.status = 2; this.where.status = 2;
delete this.where.is_verify; delete this.where.is_verify;
this.init(); this.init();
}) })
}else if(number == 2){ } else if (number == 2) {
uni.navigateTo({ uni.navigateTo({
url:`/pages/admin/orderList/index?types=1&merId=${this.merId}` url: `/pages/admin/orderList/index?types=1&merId=${this.merId}`
}) })
} }
postconfirm(this.merId,data).then(res=>{ postconfirm(this.merId, data).then(res => {
console.log(res); console.log(res);
}) })
}, },
@ -308,7 +320,9 @@
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
}, },
err => { err => {
that.$util.Tips({ title: err }); that.$util.Tips({
title: err
});
} }
); );
} else { } else {
@ -323,7 +337,9 @@
// console.log(that.list); // console.log(that.list);
}, },
err => { err => {
that.$util.Tips({ title: err }); that.$util.Tips({
title: err
});
} }
); );
} }
@ -370,7 +386,9 @@
title: '请输入备注' title: '请输入备注'
}) })
} }
setRefundMark(that.merId, that.refundInfo.refund_order_id, { mer_mark: that.refundInfo.mer_mark }).then( setRefundMark(that.merId, that.refundInfo.refund_order_id, {
mer_mark: that.refundInfo.mer_mark
}).then(
res => { res => {
that.refundMark = false; that.refundMark = false;
this.$util.Tips({ this.$util.Tips({
@ -448,7 +466,9 @@
let id = that.orderInfo.order_id; let id = that.orderInfo.order_id;
if (that.status == 0) { if (that.status == 0) {
if (!isMoney(opt.orderInfo.pay_postage || opt.orderInfo.total_price)) { if (!isMoney(opt.orderInfo.pay_postage || opt.orderInfo.total_price)) {
return that.$util.Tips({ title: '请输入正确的金额' }); return that.$util.Tips({
title: '请输入正确的金额'
});
} }
data.pay_price = price; data.pay_price = price;
setAdminOrderPrice(this.merId, id, parmas).then( setAdminOrderPrice(this.merId, id, parmas).then(
@ -474,7 +494,9 @@
title: '请输入备注' title: '请输入备注'
}) })
} }
setAdminOrderRemark(this.merId, id, { remark: remark }).then( setAdminOrderRemark(this.merId, id, {
remark: remark
}).then(
res => { res => {
that.change = false; that.change = false;
this.$util.Tips({ this.$util.Tips({
@ -485,7 +507,9 @@
}, },
err => { err => {
that.change = false; that.change = false;
that.$util.Tips({ title: err }); that.$util.Tips({
title: err
});
} }
); );
} }

31
pages/gather/gather.vue
View File

@ -8,7 +8,8 @@
<view class="special_work com" v-if="true"> <view class="special_work com" v-if="true">
<view class="title">市级供应链</view> <view class="title">市级供应链</view>
<view class="content"> <view class="content">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)"> <view class="examine"
@click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
<text class="text">在售管理</text> <text class="text">在售管理</text>
</view> </view>
@ -39,8 +40,8 @@
<text class="text">提现管理</text> <text class="text">提现管理</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)"> <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
<image class="icon_img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" <image class="icon_img"
mode="aspectFill"> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
</image> </image>
<text class="text">视频教学</text> <text class="text">视频教学</text>
</view> </view>
@ -69,7 +70,8 @@
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text> <text class="text">供货采购</text>
</view> </view>
<view class="examine" @click="navigator('/pages/users/order_list/index?status=-1&product_type=98')"> <view class="examine"
@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text> <text class="text">进货管理</text>
</view> </view>
@ -102,7 +104,8 @@
</image> </image>
<text class="text">订单核销</text> <text class="text">订单核销</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)"> <view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image> </image>
<text class="text">订单管理</text> <text class="text">订单管理</text>
@ -112,22 +115,26 @@
</image> </image>
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)"> <view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image> </image>
<text class="text">交易大厅</text> <text class="text">交易大厅</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> <view class="examine"
@click="navigator(`/pages/product/basicSet?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>
</view> </view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image> </image>
<text class="text">发布管理</text> <text class="text">发布管理</text>
@ -188,7 +195,8 @@
</image> </image>
<text class="text">订单核销</text> <text class="text">订单核销</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)"> <view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image> </image>
<text class="text">订单管理</text> <text class="text">订单管理</text>
@ -198,7 +206,8 @@
</image> </image>
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>

71
pages/index/index.vue
View File

@ -7,13 +7,15 @@
<view class="tabs_wrapper"> <view class="tabs_wrapper">
<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"></u-tabs> <u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"></u-tabs>
</view> </view>
<view class="">
</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)">
<view style="height: 294.74rpx;"> <view style="height: 294.74rpx;">
<u--image :src="item.image[0]" width="342.11rpx" height="294.74rpx" :showLoading="true" lazyLoad fade <u--image :src="item.image[0]" width="342.11rpx" height="294.74rpx" :showLoading="true"
duration="450"> lazyLoad fade duration="450">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#f5f5f5"></u-loading-icon> <u-loading-icon color="#f5f5f5"></u-loading-icon>
</template> </template>
@ -23,12 +25,13 @@
<view class="title">{{item.title}}</view> <view class="title">{{item.title}}</view>
<view class="goods_info flex_a_c"> <view class="goods_info flex_a_c">
<view class="l_info flex_a_c"> <view class="l_info flex_a_c">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill" <image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
class="g_img"></image> mode="aspectFill" class="g_img"></image>
<view class="g_name">{{item.author && item.author.nickname}}</view> <view class="g_name">{{item.author && item.author.nickname}}</view>
</view> </view>
<view class="nice_box" @click.stop="giveStart(item)"> <view class="nice_box" @click.stop="giveStart(item)">
<text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text> <text class="iconfont"
:class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
<text class="collect">{{item.count_start}}</text> <text class="collect">{{item.count_start}}</text>
</view> </view>
</view> </view>
@ -60,12 +63,29 @@
import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
import zbpSwiper from '@/components/zbpSwiper' import zbpSwiper from '@/components/zbpSwiper'
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'; import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
import { getSlideAPI } from '@/api/lihai.js' import {
import { graphicLstApi, getTopicList, graphicStartApi } from '@/api/community.js' getSlideAPI
import { getIndexData, getDiy } from '@/api/api.js' } from '@/api/lihai.js'
import { getGeocoder, merClassifly } from '@/api/store.js'; import {
import { getArea, getStreet } from '@/api/article.js'; graphicLstApi,
import { Toast } from '@/libs/uniApi' getTopicList,
graphicStartApi
} from '@/api/community.js'
import {
getIndexData,
getDiy
} from '@/api/api.js'
import {
getGeocoder,
merClassifly
} from '@/api/store.js';
import {
getArea,
getStreet
} from '@/api/article.js';
import {
Toast
} from '@/libs/uniApi'
export default { export default {
components: { components: {
mTabbar, mTabbar,
@ -110,13 +130,13 @@
this.Area() this.Area()
this.setPermissions() this.setPermissions()
// this.openTongZhi() // this.openTongZhi()
uni.$on('connectstatusChange',(connectstatus) =>{ uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = '' var connectstr = ''
if (connectstatus == true) { if (connectstatus == true) {
connectstr ='已连接' connectstr = '已连接'
this.getRegistrationID() this.getRegistrationID()
}else{ } else {
connectstr ='未连接' connectstr = '未连接'
} }
this.connectstatus = connectStr this.connectstatus = connectStr
}) })
@ -205,7 +225,8 @@
if (item.index == 1) { if (item.index == 1) {
uni.navigateTo({ uni.navigateTo({
// #ifdef MP || H5 // #ifdef MP || H5
url: '/pages/short_video/nvueSwiper/index?id=' + this.cateGoods[0].community_id url: '/pages/short_video/nvueSwiper/index?id=' + this.cateGoods[0]
.community_id
// #endif // #endif
// #ifdef APP // #ifdef APP
url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}` url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
@ -216,7 +237,9 @@
}, },
/*获取分类列表*/ /*获取分类列表*/
async getCateList() { async getCateList() {
const { data } = await getTopicList() const {
data
} = await getTopicList()
this.tabsData.list = [{ this.tabsData.list = [{
cate_name: "推荐", cate_name: "推荐",
category_id: 0 category_id: 0
@ -244,7 +267,10 @@
let latitude, longitude; let latitude, longitude;
latitude = res.latitude.toString(); latitude = res.latitude.toString();
longitude = res.longitude.toString(); longitude = res.longitude.toString();
getGeocoder({ lat: latitude, long: longitude }).then(res => { getGeocoder({
lat: latitude,
long: longitude
}).then(res => {
that.$store.commit('setLocation', res.data) that.$store.commit('setLocation', res.data)
that.street = res.data.address_component.street that.street = res.data.address_component.street
}).catch(err => { }).catch(err => {
@ -273,10 +299,12 @@
var main = plus.android.runtimeMainActivity(); var main = plus.android.runtimeMainActivity();
var pkName = main.getPackageName(); var pkName = main.getPackageName();
var uid = main.getApplicationInfo().plusGetAttribute("uid"); var uid = main.getApplicationInfo().plusGetAttribute("uid");
var NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat"); var NotificationManagerCompat = plus.android.importClass(
"android.support.v4.app.NotificationManagerCompat");
//android.support.v4升级为androidx //android.support.v4升级为androidx
if (NotificationManagerCompat == null) { if (NotificationManagerCompat == null) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat"); NotificationManagerCompat = plus.android.importClass(
"androidx.core.app.NotificationManagerCompat");
} }
var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled(); var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();
// 未开通‘允许通知’权限，则弹窗提醒开通，并点击确认后，跳转到系统设置页面进行设置 // 未开通‘允许通知’权限，则弹窗提醒开通，并点击确认后，跳转到系统设置页面进行设置
@ -300,7 +328,8 @@
intent.putExtra("app_uid", uid); intent.putExtra("app_uid", uid);
} else { //(<21)其他--跳转到该应用管理的详情页 } else { //(<21)其他--跳转到该应用管理的详情页
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
var uri = Uri.fromParts("package", mainActivity.getPackageName(), null); var uri = Uri.fromParts("package", mainActivity.getPackageName(),
null);
intent.setData(uri); intent.setData(uri);
} }
// 跳转到该应用的系统通知设置页 // 跳转到该应用的系统通知设置页

114
pages/order_details/stay.vue
View File

@ -10,7 +10,7 @@
<view class='data' v-if="!this.be_overday"> <view class='data' v-if="!this.be_overday">
<view class='state' v-if='isSelfOrder'>请在{{this.be_overdue}}前完成支付!</view> <view class='state' v-if='isSelfOrder'>请在{{this.be_overdue}}前完成支付!</view>
<!-- <view class='state' v-if='isSelfOrder' >请在{{this.be_overdue}}{{this.be_overhours}}前完成支付!</view> --> <!-- <view class='state' v-if='isSelfOrder' >请在{{this.be_overdue}}{{this.be_overhours}}前完成支付!</view> -->
<view class='state' v-else >请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</view> <view class='state' v-else>请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</view>
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view> <view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
</view> </view>
@ -43,8 +43,7 @@
</view> </view>
<!--预售（代付款）--> <!--预售（代付款）-->
<view v-else class="presell_bg_header"> <view v-else class="presell_bg_header">
<view class='header presell_header' <view class='header presell_header'>
>
<view class="presell_payment" v-if="orderInfo.orderList"><text <view class="presell_payment" v-if="orderInfo.orderList"><text
class="iconfont icon-shijian1"></text>{{orderInfo.orderList[0].orderProduct[0].cart_info.productPresell.presell_type==1?'待支付':'待付定金'}} class="iconfont icon-shijian1"></text>{{orderInfo.orderList[0].orderProduct[0].cart_info.productPresell.presell_type==1?'待支付':'待付定金'}}
</view> </view>
@ -68,13 +67,15 @@
class="iconfont icon-xiangyou"></text> class="iconfont icon-xiangyou"></text>
</view> </view>
<view class="goods-box"> <view class="goods-box">
<view v-for="(goods,j) in item.orderProduct" :key="goods.order_product_id" @click="goProduct(goods)"> <view v-for="(goods,j) in item.orderProduct" :key="goods.order_product_id"
@click="goProduct(goods)">
<view v-if="item.activity_type === 2"> <view v-if="item.activity_type === 2">
<view class="item"> <view class="item">
<image :src="goods.cart_info.product.image"></image> <image :src="goods.cart_info.product.image"></image>
<view class="info-box"> <view class="info-box">
<view class="name line1"><text <view class="name line1"><text
class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}</view> class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}
</view>
<view class="msg">{{goods.cart_info.productAttr.sku}}</view> <view class="msg">{{goods.cart_info.productAttr.sku}}</view>
<view class="event_ship event_color">发货时间： <view class="event_ship event_color">发货时间：
<!--全款预售--> <!--全款预售-->
@ -95,12 +96,15 @@
<view class="event_progress" v-if="goods.cart_info.productPresell.presell_type !=1"> <view class="event_progress" v-if="goods.cart_info.productPresell.presell_type !=1">
<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">￥{{ item.pay_price }}</text></view> <view class="progress_price">商品定金 <text
<view class="progress_pay">定金需付款<text class="align_right gColor">￥{{ item.pay_price }}</text></view> class="align_right">￥{{ item.pay_price }}</text></view>
<view class="progress_pay">定金需付款<text
class="align_right gColor">￥{{ item.pay_price }}</text></view>
</view> </view>
<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">￥{{ item.presellOrder.pay_price }}</text> <view class="progress_price">商品尾款 <text
class="align_right">￥{{ item.presellOrder.pay_price }}</text>
</view> </view>
<view class="progress_pay">尾款需付款<text <view class="progress_pay">尾款需付款<text
class="align_right gColor">￥{{ item.presellOrder.pay_price }}</text></view> class="align_right gColor">￥{{ item.presellOrder.pay_price }}</text></view>
@ -155,20 +159,23 @@
<view>支付方式：</view> <view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view> <view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view> <view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付 <view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">
微信支付
</view> </view>
<view class='conter' v-if="orderInfo.pay_type==8 ">先货后款</view> <view class='conter' v-if="orderInfo.pay_type==8 ">先货后款</view>
</view> </view>
</view> </view>
<view v-if="orderInfo.orderList && orderInfo.orderList[0].is_virtual == 1 && orderInfo.orderList[0].order_extend" <view
v-if="orderInfo.orderList && orderInfo.orderList[0].is_virtual == 1 && orderInfo.orderList[0].order_extend"
class='wrapper'> class='wrapper'>
<view v-for="(item,index) in orderInfo.orderList[0].order_extend" :key="index" v-if="item" <view v-for="(item,index) in orderInfo.orderList[0].order_extend" :key="index" v-if="item"
class='item acea-row row-between'> class='item acea-row row-between'>
<view>{{index}}：</view> <view>{{index}}：</view>
<view v-if="!Array.isArray(item)" class='conter'>{{item}}</view> <view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
<view v-else class='conter virtual_image'> <view v-else class='conter virtual_image'>
<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic" @click="getPhotoClickIdx(item,i)"> <image v-for="(pic,i) in item" :key="i" class="picture" :src="pic"
@click="getPhotoClickIdx(item,i)">
</image> </image>
</view> </view>
</view> </view>
@ -188,11 +195,13 @@
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
<view>实付款：</view> <view>实付款：</view>
<view class='conter' style="color: black;" v-if="this.pay_type == 8 && orderInfo.interest !== null">先货后款 实付: ￥<text style="color: #E93323;"> <view class='conter' style="color: black;" v-if="this.pay_type == 8 && orderInfo.interest !== null">
先货后款 实付: ￥<text style="color: #E93323;">
0.00 0.00
</text></view> </text></view>
<view class='conter' style="color: black;" v-else>￥{{orderInfo.pay_price}}</view> <view class='conter' style="color: black;" v-else>￥{{orderInfo.pay_price}}</view>
<view class="conters" style="color: black;" v-if="this.pay_type == 8 && orderInfo.interest !== null"> <view class="conters" style="color: black;"
v-if="this.pay_type == 8 && orderInfo.interest !== null">
结算周期到期后付款 ￥{{orderInfo.interest.total_amount}} 结算周期到期后付款 ￥{{orderInfo.interest.total_amount}}
<image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image> <image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image>
</view> </view>
@ -243,16 +252,34 @@
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
let app = getApp(); let app = getApp();
import { HTTP_REQUEST_URL } from '@/config/app'; import {
import { goShopDetail } from '@/libs/order.js' HTTP_REQUEST_URL
import { groupOrderDetail, orderAgain, orderTake, orderDel, unOrderCancel } from '@/api/order.js'; } from '@/config/app';
import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js'; import {
import { getUserInfo } from '@/api/user.js'; goShopDetail
} from '@/libs/order.js'
import {
groupOrderDetail,
orderAgain,
orderTake,
orderDel,
unOrderCancel
} from '@/api/order.js';
import {
openOrderRefundSubscribe
} from '@/utils/SubscribeMessage.js';
import {
getUserInfo
} from '@/api/user.js';
import payment from '@/components/payment'; import payment from '@/components/payment';
import orderGoods from "@/components/orderGoods"; import orderGoods from "@/components/orderGoods";
import ClipboardJS from "@/plugin/clipboard/clipboard.js"; import ClipboardJS from "@/plugin/clipboard/clipboard.js";
import { configMap } from "@/utils"; import {
import { mapGetters } from "vuex"; configMap
} from "@/utils";
import {
mapGetters
} from "vuex";
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
export default { export default {
components: { components: {
@ -262,7 +289,7 @@
}, },
data() { data() {
return { return {
isSelfOrder:false, //个人中心订单,区别与供货采购订单, isSelfOrder: false, //个人中心订单,区别与供货采购订单,
order_id: '', order_id: '',
evaluate: 0, evaluate: 0,
cartInfo: [], //购物车产品 cartInfo: [], //购物车产品
@ -313,7 +340,7 @@
product_type: 0, product_type: 0,
be_overdue: '', //逾期时间 be_overdue: '', //逾期时间
be_overhours: '', //逾期小时 be_overhours: '', //逾期小时
be_overday:false, be_overday: false,
}; };
}, },
@ -325,7 +352,11 @@
this.payMode[2].payStatus = n this.payMode[2].payStatus = n
} }
}, },
computed: configMap({ hide_mer_status: 0, alipay_open: 0, yue_pay_status: 0 }, computed: configMap({
hide_mer_status: 0,
alipay_open: 0,
yue_pay_status: 0
},
mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])), mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
onLoad: function(options) { onLoad: function(options) {
this.credit_buy = options.credit_buy this.credit_buy = options.credit_buy
@ -360,7 +391,7 @@
}, },
mounted: function() {}, mounted: function() {},
methods: { methods: {
test(){ test() {
console.log(this.orderInfo.orderList) console.log(this.orderInfo.orderList)
}, },
//周期弹窗 //周期弹窗
@ -387,7 +418,8 @@
}, },
// 商品详情 // 商品详情
goProduct(goods) { goProduct(goods) {
goods.activity_id = goods.cart_info && goods.cart_info.activeSku && goods.cart_info.activeSku.product_group_id goods.activity_id = goods.cart_info && goods.cart_info.activeSku && goods.cart_info.activeSku
.product_group_id
goShopDetail(goods, '').then(res => { goShopDetail(goods, '').then(res => {
uni.navigateTo({ uni.navigateTo({
url: `/pages/goods_details/index?id=${goods.product_id}` url: `/pages/goods_details/index?id=${goods.product_id}`
@ -431,7 +463,8 @@
*/ */
pay_open: function() { pay_open: function() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/payment/payment?order_id=' + this.order_id + '&product_type=' + this.product_type url: '/pages/users/payment/payment?order_id=' + this.order_id + '&product_type=' + this
.product_type
}); });
// this.pay_close = true; // this.pay_close = true;
// this.pay_order_id = this.orderInfo.group_order_id.toString(); // this.pay_order_id = this.orderInfo.group_order_id.toString();
@ -499,10 +532,8 @@
this.pay_type = this.orderInfo.pay_type this.pay_type = this.orderInfo.pay_type
if (this.orderInfo.interest !== null) { if (this.orderInfo.interest !== null) {
this.moerTime(this.orderInfo.interest.start_time) this.moerTime(this.orderInfo.interest.start_time)
} } else {
this.isSelfOrder = true
else{
this.isSelfOrder=true
this.moerTime(this.orderInfo.create_time) this.moerTime(this.orderInfo.create_time)
// console.log(this.orderInfo.create_time) // console.log(this.orderInfo.create_time)
} }
@ -556,12 +587,14 @@
//计算是否逾期 //计算是否逾期
moerTime(autoTime) { moerTime(autoTime) {
if(this.isSelfOrder){ if (this.isSelfOrder) {
let limitPayTime=60 //支付时间限制 let limitPayTime = 60 //支付时间限制
let curData = new Date(autoTime); let curData = new Date(autoTime);
curData.setSeconds(curData.getSeconds() + (60*limitPayTime)); curData.setSeconds(curData.getSeconds() + (60 * limitPayTime));
this.be_overdue=curData.toLocaleString().slice(0, curData.toLocaleString().length - 3) this.be_overdue = curData.getFullYear() + '-' + (curData.getMonth() + 1) + '-' + curData.getDate() +
' ' +
curData.getHours() + ':' +
(curData.getMinutes() > 10 ? curData.getMinutes() : "0" + curData.getMinutes())
return return
} }
@ -693,7 +726,8 @@
color: #fff; color: #fff;
margin-bottom: 7rpx; margin-bottom: 7rpx;
} }
.btn_cancel{
.btn_cancel {
margin-right: 200rpx; margin-right: 200rpx;
margin-top: 20rpx; margin-top: 20rpx;
width: 83px; width: 83px;
@ -704,7 +738,8 @@
border: 1px solid #AABDD6; border: 1px solid #AABDD6;
color: #282828; color: #282828;
font-size: 12px; font-size: 12px;
} }
.presell_header .presell_payment { .presell_header .presell_payment {
color: #fff; color: #fff;
font-size: 30rpx; font-size: 30rpx;
@ -1193,7 +1228,8 @@
top: 29vh; top: 29vh;
left: 60px; left: 60px;
width: 70%; width: 70%;
image{
image {
width: 100%; width: 100%;
} }
@ -1223,7 +1259,7 @@
} }
.shouhuobtn { .shouhuobtn {
margin-left: 50rpx; margin-left: 50rpx;
line-height: 34px; line-height: 34px;
margin-top: 50rpx; margin-top: 50rpx;
width: 150px; width: 150px;

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

@ -320,6 +320,8 @@
uni.chooseVideo({ uni.chooseVideo({
sourceType: ['camera', 'album'], sourceType: ['camera', 'album'],
success: res => { success: res => {
console.log(res)
if (Math.ceil(res.size / 1024) < this.upload_max * 1024) { if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
uni.uploadFile({ uni.uploadFile({
url: this.uploadUrl, //仅为示例，非真实的接口地址 url: this.uploadUrl, //仅为示例，非真实的接口地址
@ -351,9 +353,11 @@
} }
}, },
fail: err => { fail: err => {
uni.showModal({ // 取消上传也会出现弹框
content: JSON.stringify(err) // uni.showModal({
}); // content: JSON.stringify(err)
// });
console.log(err)
} }
}); });
}, },

24
pages/short_video/nvueSwiper/index.nvue
View File

@ -15,7 +15,7 @@
<!-- 头部导航 --> <!-- 头部导航 -->
<view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==3?'#FC4E09':''}" > <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==3?'#FC4E09':''}">
<view class="tool-bar"> <view class="tool-bar">
<view class='iconfont icon-xiangzuo' @tap='goBack'></view> <view class='iconfont icon-xiangzuo' @tap='goBack'></view>
@ -34,7 +34,18 @@
:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false"> :vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
<swiper-item v-for="(list,index) in dataList"> <swiper-item v-for="(list,index) in dataList">
<view v-if="max > index"> <view v-if="max > index">
<!-- <view style="width: 100px;height: 100px;background-color: red;">
5666
</view> -->
<view> <view>
<!-- 这种视频背景模糊的效果怎么做呢 -->
<!-- <!--
1.v-if：用于控制视频在节点的渲染数 1.v-if：用于控制视频在节点的渲染数
2.muted的默认值是 false，代表默认是禁音视频的 2.muted的默认值是 false，代表默认是禁音视频的
@ -49,7 +60,12 @@
:show-center-play-btn="false" :enable-progress-gesture="false" :src="list.video_link" :show-center-play-btn="false" :enable-progress-gesture="false" :src="list.video_link"
@ended="ended" @play="play(index)" @click="tapVideoHover(list.state,$event)" @ended="ended" @play="play(index)" @click="tapVideoHover(list.state,$event)"
@waiting="waiting(index)" @waiting="waiting(index)"
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;z-index: -1;'"></video> style="width: 100vw; height: 100vh;z-index: -1;transform: scale(4)">
</video>
</view> </view>
<!-- 播放状态：pause 的时候就会暂停 --> <!-- 播放状态：pause 的时候就会暂停 -->
<!-- <view class="videoHover" @click="tapVideoHover(list.state,$event)" <!-- <view class="videoHover" @click="tapVideoHover(list.state,$event)"
@ -1868,4 +1884,8 @@
color: #999; color: #999;
} }
} }
.videoa {
background-color: red;
}
</style> </style>

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

@ -51,7 +51,7 @@
</view> </view>
<view class='tip mt25'> <view class='tip mt25'>
当前可提现金额: <text 当前可提现金额: <text
class="price">￥{{userInfo.brokerage_price}},</text>冻结佣金：￥{{userInfo.lock_brokerage}} class="price">￥{{extract_money}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
</view> </view>
<view class='tip'> <view class='tip'>
说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
@ -92,7 +92,7 @@
<view class='tip mt25'> <view class='tip mt25'>
当前可提现金额: <text 当前可提现金额: <text
class="price">￥{{userInfo.brokerage_price}},</text>冻结佣金：￥{{userInfo.lock_brokerage}} class="price">￥{{extract_money}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
</view> </view>
<view class='tip'> <view class='tip'>
说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
@ -100,7 +100,7 @@
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
</view> </view>
<view v-else class="auto_arrival"> <view v-else class="auto_arrival">
<view class='tip'>当前可提现金额: <text class="price">￥{{userInfo.brokerage_price}}</text> <view class='tip'>当前可提现金额: <text class="price">￥{{extract_money}}</text>
</view> </view>
<view class='input'><input placeholder-class='placeholder1' name="extract_price" <view class='input'><input placeholder-class='placeholder1' name="extract_price"
type='digit' :placeholder="placeholderValue" @focus="placeholderValue = ''" type='digit' :placeholder="placeholderValue" @focus="placeholderValue = ''"
@ -141,7 +141,7 @@
</view> </view>
<view class='tip mb25'> <view class='tip mb25'>
当前可提现金额: <text 当前可提现金额: <text
class="price">￥{{userInfo.brokerage_price}},</text>冻结佣金：￥{{userInfo.lock_brokerage}} class="price">￥{{extract_money}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
</view> </view>
<view class='tip' v-if="userInfo.broken_day>0"> <view class='tip' v-if="userInfo.broken_day>0">
说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
@ -166,7 +166,8 @@
getAdminApplyAPI, getAdminApplyAPI,
getLisApplyAPI, getLisApplyAPI,
getAccountApplyAPI, getAccountApplyAPI,
postAccountApplyAPI postAccountApplyAPI,
} from '@/api/user.js' } from '@/api/user.js'
import { import {
extractCash, extractCash,
@ -192,6 +193,7 @@
}, },
data() { data() {
return { return {
extract_money:"",
mode: { mode: {
bank_address: "", bank_address: "",
bank_code: "", bank_code: "",
@ -276,6 +278,8 @@
this.mode.bank_code = res.data.financial_bank_code this.mode.bank_code = res.data.financial_bank_code
this.mode.bank_name = res.data.financial_bank_bank this.mode.bank_name = res.data.financial_bank_bank
this.mode.bank_address = res.data.financial_bank_branch this.mode.bank_address = res.data.financial_bank_branch
this.extract_money=res.data.extract_money
console.log(this.extract_money)
} catch (err) { } catch (err) {
//TODO handle the exception //TODO handle the exception
Toast(err) Toast(err)

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

@ -56,14 +56,14 @@
</view> </view>
<view class="totalfooter"> <view class="totalfooter">
<view class='bnt b-color' v-if="item.orderProduct[indexs]" <view class='bnt b-color' v-if="item.orderProduct[indexs]"
@click="importshop(item.order_id,item.orderProduct[index].product_id,item.orderProduct[index].cart_info.productAttr.product_sku)"> @click="importshop(item.order_id,item.orderProduct[indexs].product_id,item.orderProduct[indexs].product_sku)">
立即导入</view> 立即导入</view>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
</view> </view>
<view class='totalPrice'> <view class='totalPrice'>s
共{{item.orderProduct.length}}件商品，总金额 共{{item.orderProduct.length}}件商品，总金额
<text class='money'>￥{{item.pay_price}}</text> <text class='money'>￥{{item.pay_price}}</text>
</view> </view>
@ -162,6 +162,7 @@
this.data.order_id = order_id this.data.order_id = order_id
this.data.order_product_id = product_id this.data.order_product_id = product_id
this.data.order_unique = unique this.data.order_unique = unique
console.log(this.data)
this.show = true this.show = true
postImport(this.mer_id, this.data).then(res => { postImport(this.mer_id, this.data).then(res => {
console.log(res); console.log(res);

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

@ -68,7 +68,8 @@
</view> </view>
<view class="progress_step"> <view class="progress_step">
<text class="name">尾款</text> <text class="name">尾款</text>
<text class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text> <text
class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
</view> </view>
<view class="progress_pay"> <view class="progress_pay">
{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款 {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
@ -118,7 +119,8 @@
<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 v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)" <view
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)">
{{item.order.isTake==0 ? deliveryName :'到店核销'}} {{item.order.isTake==0 ? deliveryName :'到店核销'}}
<text class='iconfont icon-jiantou'></text> <text class='iconfont icon-jiantou'></text>
@ -177,8 +179,9 @@
</view> </view>
<view class='item acea-row row-between-wrapper' v-if="textareaStatus"> <view class='item acea-row row-between-wrapper' v-if="textareaStatus">
<view style="width: 100px;">备注信息</view> <view style="width: 100px;">备注信息</view>
<input v-if="coupon.status===false" placeholder-class='placeholder' @input='bindHideKeyboard' value="" <input v-if="coupon.status===false" placeholder-class='placeholder'
name="mark" placeholder='选填备注信息' v-model="msgObj[item.mer_id]"></input> @input='bindHideKeyboard' value="" name="mark" placeholder='选填备注信息'
v-model="msgObj[item.mer_id]"></input>
</view> </view>
<view class="total"> <view class="total">
共{{item.order.total_num}}件 小计 共{{item.order.total_num}}件 小计
@ -199,36 +202,40 @@
<view v-if="item.key == 'mobile'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'mobile'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="item.value" placeholder="请填写手机号" placeholder-class='placeholder' /> <input type="text" v-model="item.value" placeholder="请填写手机号"
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'email'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'email'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="item.value" placeholder="请填写邮箱" placeholder-class='placeholder' /> <input type="text" v-model="item.value" placeholder="请填写邮箱"
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'idCard'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'idCard'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="item.value" placeholder="请填写身份证号" placeholder-class='placeholder' /> <input type="text" v-model="item.value" placeholder="请填写身份证号"
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'text' || item.key == 'number'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'text' || item.key == 'number'"
class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input v-if="item.key == 'text'" type="text" v-model="item.value" :placeholder="'请填写'+item.title" <input v-if="item.key == 'text'" type="text" v-model="item.value"
placeholder-class='placeholder' /> :placeholder="'请填写'+item.title" placeholder-class='placeholder' />
<input v-if="item.key == 'number'" type="number" v-model="item.value" :placeholder="'请填写'+item.title" <input v-if="item.key == 'number'" type="number" v-model="item.value"
placeholder-class='placeholder' /> :placeholder="'请填写'+item.title" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'date'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'date'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<picker mode="date" :value="item.value" start="1970-01-01" @change="bindDateChange"> <picker mode="date" :value="item.value" start="1970-01-01" @change="bindDateChange">
<input type="text" @click="getTime(index)" disabled v-model="item.value" placeholder="请选择日期" <input type="text" @click="getTime(index)" disabled v-model="item.value"
placeholder-class='placeholder' /> placeholder="请选择日期" placeholder-class='placeholder' />
</picker> </picker>
</view> </view>
</view> </view>
@ -236,16 +243,16 @@
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<picker mode="time" :value="item.value" start="1970-01-01" @change="bindDateChange"> <picker mode="time" :value="item.value" start="1970-01-01" @change="bindDateChange">
<input type="text" @click="getTime(index)" disabled v-model="item.value" placeholder="请选择时间" <input type="text" @click="getTime(index)" disabled v-model="item.value"
placeholder-class='placeholder' /> placeholder="请选择时间" placeholder-class='placeholder' />
</picker> </picker>
</view> </view>
</view> </view>
<view v-if="item.key == 'image'" class='item'> <view v-if="item.key == 'image'" class='item'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class="upload"> <view class="upload">
<view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn" :data-index="indexn" <view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn"
@click="getPhotoClickIdx"> :data-index="indexn" @click="getPhotoClickIdx">
<image :src="itemn"></image> <image :src="itemn"></image>
<text class="iconfont icon-guanbi4" @click.stop="DelPic(item,indexn)"></text> <text class="iconfont icon-guanbi4" @click.stop="DelPic(item,indexn)"></text>
</view> </view>
@ -274,13 +281,15 @@
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view><text class="item-require">*</text>收货人姓名</view> <view><text class="item-require">*</text>收货人姓名</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名" placeholder-class='placeholder' /> <input type="text" v-model="post.real_name" placeholder="请填写收货人姓名"
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view><text class="item-require">*</text>收货人电话</view> <view><text class="item-require">*</text>收货人电话</view>
<view class='discount'> <view class='discount'>
<input type="number" v-model="post.phone" placeholder="请填写收货人电话" placeholder-class='placeholder' /> <input type="number" v-model="post.phone" placeholder="请填写收货人电话"
placeholder-class='placeholder' />
</view> </view>
</view> </view>
</form> </form>
@ -337,7 +346,8 @@
<view>店铺优惠金额：</view> <view>店铺优惠金额：</view>
<view class='money'>-￥{{coupon_price}}</view> <view class='money'>-￥{{coupon_price}}</view>
</view> </view>
<view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0"> <view class='item acea-row row-between-wrapper'
v-if="open_integral && userInfo.integral>0 && order_type == 0">
<view>积分抵扣：</view> <view>积分抵扣：</view>
<view class='money'> <view class='money'>
<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text> <text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
@ -390,8 +400,8 @@
</view> </view>
<block v-if="coupon.status"> <block v-if="coupon.status">
<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'" <couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'"
@ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon" :openType='openType' @ChangCoupons="ChangCoupons" @ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon" :openType='openType'
:coupon_amount='coupon_amount' :coupon_number='coupon_number'> @ChangCoupons="ChangCoupons" :coupon_amount='coupon_amount' :coupon_number='coupon_number'>
</couponListWindow> </couponListWindow>
</block> </block>
<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address' <addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address'
@ -399,8 +409,8 @@
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing> <addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<block v-if="isShowBox"> <block v-if="isShowBox">
<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj" :radioList="radioList" <checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
@close="boxClose" @confirmBtn="getData"> :radioList="radioList" @close="boxClose" @confirmBtn="getData">
</checkDelivery> </checkDelivery>
</block> </block>
<!--优惠明细弹窗--> <!--优惠明细弹窗-->
@ -645,7 +655,7 @@
product_type: '', product_type: '',
interest_rate: '', //利率 interest_rate: '', //利率
settle_cycle: '', // 周期 settle_cycle: '', // 周期
type_id:'',//店铺类型 type_id: '', //店铺类型
}; };
}, },
computed: { computed: {
@ -663,7 +673,7 @@
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {
this.type_id=options.type_id this.type_id = options.type_id
this.product_type = options.product_type this.product_type = options.product_type
this.seckillId = options.seckillId this.seckillId = options.seckillId
// #ifdef H5 // #ifdef H5
@ -1071,7 +1081,7 @@
that.cartArr[4].title = that.cartArr[4].title =
`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%` `结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
console.log(res.data.order[0]); console.log(res.data.order[0]);
if (res.data.order[0].credit_buy == 1 && this.type_id == 12 ){ if (res.data.order[0].credit_buy == 1 && this.type_id == 12) {
this.cartArr[4].payStatus = 1 this.cartArr[4].payStatus = 1
} else { } else {
this.cartArr[4].payStatus = 0 this.cartArr[4].payStatus = 0
@ -1202,8 +1212,12 @@
orderId = res.data.result.order_id, orderId = res.data.result.order_id,
callback_key = res.data.result.pay_key, callback_key = res.data.result.pay_key,
jsConfig = res.data.result.config, jsConfig = res.data.result.config,
goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +'&product_type=' + that.product_type, // 暂不跳转
goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&product_type=' + that.product_type; goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
'&product_type=' + that.product_type,
goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
'&credit_buy=1&product_type=' + that.product_type;
that.orderPay = true; that.orderPay = true;
uni.hideLoading(); uni.hideLoading();
switch (status) { switch (status) {
@ -1229,10 +1243,10 @@
break; break;
case 'alipay': case 'alipay':
case "alipayQr": case "alipayQr":
uni.navigateTo({ // uni.navigateTo({
url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' + // url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
jsConfig // jsConfig
}) // })
return; return;
break; break;
// #ifndef MP // #ifndef MP
@ -1269,8 +1283,10 @@
provider: 'wxpay', provider: 'wxpay',
orderInfo: jsConfig, orderInfo: jsConfig,
success: (e) => { success: (e) => {
// 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId + let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=支付成功'+'&product_type=' + that.product_type; '&msg=支付成功' + '&product_type=' + that.product_type;
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
@ -1280,8 +1296,9 @@
}); });
}, },
fail: (e) => { fail: (e) => {
// 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId + let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付'+'&product_type=' + that.product_type; '&msg=取消支付' + '&product_type=' + that.product_type;
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付', title: '取消支付',
}, { }, {
@ -1290,8 +1307,9 @@
}); });
}, },
complete: () => { complete: () => {
// 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId + let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付'+'&product_type=' + that.product_type; '&msg=取消支付' + '&product_type=' + that.product_type;
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付', title: '取消支付',
}, { }, {
@ -1326,8 +1344,10 @@
}); });
}, },
fail: function(e) { fail: function(e) {
// 暂不跳转
let pages = '/pages/order_pay_status/index?order_id=' + let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'+'&product_type=' + that.product_type orderId + '&msg=取消支付' + '&product_type=' + that
.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
@ -1355,6 +1375,7 @@
let eUrl = encodeURIComponent(url) let eUrl = encodeURIComponent(url)
let jsurl = jsConfig.mweb_url || jsConfig.h5_url let jsurl = jsConfig.mweb_url || jsConfig.h5_url
let locations = `${jsurl}&redirect_url=${eUrl}` let locations = `${jsurl}&redirect_url=${eUrl}`
// 暂不跳转
setTimeout(() => { setTimeout(() => {
location.href = locations; location.href = locations;
}, 100); }, 100);
@ -1375,8 +1396,10 @@
}); });
}, },
fail: (e) => { fail: (e) => {
// 暂不跳转
let pages = '/pages/order_pay_status/index?order_id=' + let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=支付失败'+'&product_type=' + that.product_type orderId + '&msg=支付失败' + '&product_type=' + that
.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '支付失败' title: '支付失败'
}, { }, {
@ -1386,8 +1409,11 @@
}, },
complete: () => { complete: () => {
uni.hideLoading(); uni.hideLoading();
// 暂不跳转
let pages = '/pages/order_pay_status/index?order_id=' + let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'+'&product_type=' + that.product_type orderId + '&msg=取消支付' + '&product_type=' + that
.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
@ -1399,8 +1425,10 @@
break; break;
// #endif // #endif
default: default:
// 暂不跳转
let pages = '/pages/order_pay_status/index?order_id=' + let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'+'&product_type=' + that.product_type orderId + '&msg=取消支付' + '&product_type=' + that.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
@ -1583,6 +1611,15 @@
.Tips({ .Tips({
title: '余额不足！' title: '余额不足！'
}); });
// 先货后款暂不可用
// if (this.payType == 'creditBuy') {
// uni.navigateTo({
// ur
// })
// return
// }
uni.showLoading({ uni.showLoading({
title: '订单支付中', title: '订单支付中',
mask: true mask: true
@ -1595,8 +1632,6 @@
// #ifndef MP // #ifndef MP
that.payment(data); that.payment(data);
// #endif // #endif
}, },
// 打开配送方式弹窗 // 打开配送方式弹窗
openShowBox(item, index) { openShowBox(item, index) {

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

@ -1,4 +1,9 @@
<template> <template>
<!--
个人中心,区别于供货采购个人中心
-->
<view :style="viewColor"> <view :style="viewColor">
<view class='my-order'> <view class='my-order'>
<view class='header'> <view class='header'>
@ -89,7 +94,8 @@
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text> class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
<view class="event_ship event_color">发货时间： <view class="event_ship event_color">发货时间：
<!--全款预售--> <!--全款预售-->
<text v-if="goods.cart_info.productPresell.presell_type === 1"> <text
v-if="goods.cart_info.productPresell.presell_type === 1">
{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内 {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
</text> </text>
<!--定金预售--> <!--定金预售-->
@ -102,8 +108,9 @@
</view> </view>
<view>x{{goods.product_num}}</view> <view>x{{goods.product_num}}</view>
</view> </view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8"> <view class="money" style="margin-left: 117px;"
<view class='totalPrice' style="margin-right: 50rpx;" >先货后款 实付款: v-if="item.pay_type == 8">
<view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款:
<text class='money p-color'>￥0.00</text> <text class='money p-color'>￥0.00</text>
</view> </view>
</view> </view>
@ -111,9 +118,11 @@
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}} 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
</view> </view>
</view> </view>
<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price"> <view v-if="goods.cart_info.productPresell.presell_type === 2"
class="event_price">
定金待支付 <text class="t-color">￥{{ order.pay_price }}</text> 定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
尾款待支付 <text class="t-color">￥{{ order.presellOrder.pay_price }}</text> 尾款待支付 <text
class="t-color">￥{{ order.presellOrder.pay_price }}</text>
</view> </view>
</view> </view>
</block> </block>
@ -162,10 +171,14 @@
<text class='money p-color'>￥0.00</text> <text class='money p-color'>￥0.00</text>
</view> </view>
<view class="totalPrice" style="margin-right: 15px;" v-if="item.pay_type == 8"> <view class="totalPrice" style="margin-right: 15px;" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}} 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{ item.interest.total_amount}}
<!-- <button @click="test(item)">按钮</button> -->
</view> </view>
<view class='bottom acea-row row-right row-middle' v-if="item.pay_type == 3 || item.pay_type == 1"> <view class='bottom acea-row row-right row-middle'
<view class='bnt cancelBnt' @click.stop='cancelOrder(index,item.group_order_id)'>取消订单</view> v-if="item.pay_type == 3 || item.pay_type == 1">
<view class='bnt cancelBnt' @click.stop='cancelOrder(index,item.group_order_id)'>
取消订单</view>
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'> <view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
立即付款</view> 立即付款</view>
</view> </view>
@ -187,9 +200,12 @@
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<view v-if="item.status == 0" class='t-color'> <view v-if="item.status == 0" class='t-color'>
<text v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text> <text
<text v-else>待发货</text> v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
<!-- <text v-else>待发货</text> -->
</view> </view>
<view v-if="item.status == 0 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.status == 0 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.status == 1" class='t-color'>待收货</view> <view v-if="item.status == 1" class='t-color'>待收货</view>
<view v-if="item.status == 2 && item.pay_type !== 8" class='t-color'>待评价</view> <view v-if="item.status == 2 && item.pay_type !== 8" class='t-color'>待评价</view>
<view v-if="item.status == 3" class='t-color'>已完成</view> <view v-if="item.status == 3" class='t-color'>已完成</view>
@ -198,8 +214,8 @@
</view> </view>
<view v-if="item.activity_type === 2"> <view v-if="item.activity_type === 2">
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" <view class='item-info acea-row row-between row-top'
:key="index"> v-for="(goods,index) in item.orderProduct" :key="index">
<view class='pictrue'> <view class='pictrue'>
<image <image
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'> :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
@ -208,7 +224,8 @@
<view class='text acea-row row-between'> <view class='text acea-row row-between'>
<view class='name '> <view class='name '>
<view class='name' :class="item.status === 0 ? 'line1' : 'line2'"> <view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text> <text
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
<view v-if="item.status == 0" class="event_ship event_color">发货时间： <view v-if="item.status == 0" class="event_ship event_color">发货时间：
<!--全款预售--> <!--全款预售-->
<text <text
@ -225,7 +242,8 @@
<view class='money'> <view class='money'>
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view> <view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
<view>x{{goods.product_num}}</view> <view>x{{goods.product_num}}</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 0"> <view class="money" style="margin-left: 117px;"
v-if="item.pay_type == 0">
<view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款: <view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款:
<text class='money p-color'>￥0.00</text> <text class='money p-color'>￥0.00</text>
</view> </view>
@ -238,8 +256,8 @@
</view> </view>
</view> </view>
<view v-else> <view v-else>
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" <view class='item-info acea-row row-between row-top'
:key="index"> v-for="(goods,index) in item.orderProduct" :key="index">
<view class='pictrue'> <view class='pictrue'>
<image <image
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'> :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
@ -261,7 +279,8 @@
<view v-if="goods.cart_info.productAssistAttr"> <view v-if="goods.cart_info.productAssistAttr">
￥{{goods.cart_info.productAssistAttr.assist_price}}</view> ￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
<view>x{{goods.product_num}}</view> <view>x{{goods.product_num}}</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8"> <view class="money" style="margin-left: 117px;"
v-if="item.pay_type == 8">
<view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款: <view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款:
<text class='money p-color'>￥0.00</text> <text class='money p-color'>￥0.00</text>
</view> </view>
@ -287,7 +306,7 @@
<text class='money p-color'>￥{{item.presell_price}}</text> <text class='money p-color'>￥{{item.presell_price}}</text>
</view> </view>
<view class="money" v-if="item.pay_type == 8 "> <view class="money" v-if="item.pay_type == 8 ">
<view class='totalPrice' style="margin-right: 50rpx;" >先货后款 实付款: <view class='totalPrice' style="margin-right: 50rpx;">先货后款 实付款:
<text class='money p-color'>￥0.00</text> <text class='money p-color'>￥0.00</text>
</view> </view>
</view> </view>
@ -303,7 +322,8 @@
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view> <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block> </block>
<block v-if="item.status == 1"> <block v-if="item.status == 1">
<view class='bnt cancelBnt' v-if="item.delivery_type == 1 || item.delivery_type == 2" <view class='bnt cancelBnt'
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>
@ -311,7 +331,9 @@
<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> -->
<navigator v-if=" flag&&item.status == 2 && item.pay_type !== 8" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none"> <navigator v-if=" flag&&item.status == 2 && item.pay_type !== 8"
: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>
@ -413,7 +435,7 @@
}, },
data() { data() {
return { return {
flag:false, flag: false,
loading: false, //是否加载中 loading: false, //是否加载中
loadend: false, //是否加载完毕 loadend: false, //是否加载完毕
loadTitle: '加载更多', //提示语 loadTitle: '加载更多', //提示语
@ -483,7 +505,7 @@
} }
}, },
onShow() { onShow() {
this.flag= (this.$route.query.product_type==0) this.flag = (this.$route.query.product_type == 0)
console.log(this.flag) console.log(this.flag)
if (this.isLogin) { if (this.isLogin) {
this.page = 1; this.page = 1;
@ -504,7 +526,8 @@
//去结算 //去结算
pay_open: function(order_id) { pay_open: function(order_id) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/order_details/stay?order_id=' + order_id + '&product_type=' + this.product_type url: '/pages/order_details/stay?order_id=' + order_id + '&product_type=' + this
.product_type
}) })
}, },
// 去商铺 // 去商铺
@ -569,6 +592,7 @@
orderData({ orderData({
product_type: this.product_type product_type: this.product_type
}).then(res => { }).then(res => {
console.log(res)
that.$set(that, 'orderData', res.data); that.$set(that, 'orderData', res.data);
}) })
}, },
@ -604,7 +628,8 @@
goPay: function(pay_price, order_id) { goPay: function(pay_price, order_id) {
console.log(order_id); console.log(order_id);
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/payment/payment?order_id=' + order_id + '&product_type=' + this.product_type url: '/pages/users/payment/payment?order_id=' + order_id + '&product_type=' + this
.product_type
}); });
// this.$set(this, 'pay_close', true); // this.$set(this, 'pay_close', true);
// this.order_id = order_id; // this.order_id = order_id;
@ -648,7 +673,8 @@
uni.hideLoading(); uni.hideLoading();
if (self.orderStatus == 0) { if (self.orderStatus == 0) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/order_details/stay?order_id=' + order_id + '&product_type=' + product_type url: '/pages/order_details/stay?order_id=' + order_id + '&product_type=' +
product_type
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
@ -861,6 +887,10 @@
if (data) this.getInvoiceData(data); if (data) this.getInvoiceData(data);
this.$set(this.invoice, 'invoice', false); this.$set(this.invoice, 'invoice', false);
}, },
//
test(a) {
console.log(a)
},
// 开票回调 // 开票回调
getInvoiceData(data) { getInvoiceData(data) {
let that = this let that = this
@ -1018,6 +1048,7 @@
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
margin-top: 6rpx; margin-top: 6rpx;
.totalPrice { .totalPrice {
font-size: 26rpx; font-size: 26rpx;
color: #282828; color: #282828;
@ -1201,8 +1232,9 @@
.warp { .warp {
margin: auto; margin: auto;
image{
} image {}
.guanbi { .guanbi {
position: absolute; position: absolute;
right: 0px; right: 0px;
@ -1251,7 +1283,8 @@
color: #999999; color: #999999;
} }
} }
.line2{
.line2 {
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
} }
</style> </style>

1298
pages/users/order_list/indexCopy.vue Normal file
View File

File diff suppressed because it is too large Load Diff

3
pages/users/order_list/search.vue
View File

@ -110,7 +110,8 @@
<view class="store-name">{{item.merchant.mer_name}}</view> <view class="store-name">{{item.merchant.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<view v-if="item.status == 0" class='t-color'>待发货</view> <view v-if="item.status == 0 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.status == 0 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.status == 1" class='t-color'>待收货</view> <view v-if="item.status == 1" class='t-color'>待收货</view>
<view v-if="item.status == 2 &&item.pay_type !==8" class='t-color'>待评价</view> <view v-if="item.status == 2 &&item.pay_type !==8" class='t-color'>待评价</view>
<view v-if="item.status == 3" class='t-color'>已完成</view> <view v-if="item.status == 3" class='t-color'>已完成</view>

103
pages/users/payment/payment.vue
View File

@ -47,7 +47,7 @@
<view class='conter'>￥ {{couponData.total_price}}</view> <view class='conter'>￥ {{couponData.total_price}}</view>
</view> </view>
</view> </view>
<view class="settel" v-if="this.be_overdue == 0 || this.be_overdue < 0"> <view class="settel" v-if="(this.be_overdue == 0 || this.be_overdue < 0) &&couponData.total_postage>0">
<view class='settel-t'> <view class='settel-t'>
<view>利息合计:</view> <view>利息合计:</view>
<view class="conter"> <view class="conter">
@ -140,16 +140,18 @@
], ],
order_id: '', order_id: '',
product_type: 0, product_type: 0,
mer_id:'', mer_id: '',
be_overdue:'',//逾期时间 be_overdue: '', //逾期时间
be_overday:'',//逾期天数 be_overday: '', //逾期天数
}; };
}, },
onLoad(options) { onLoad(options) {
this.payType='weixin' this.payType = 'weixin'
this.order_id = options.order_id this.order_id = options.order_id
if (options.product_type) { this.product_type = options.product_type } if (options.product_type) {
this.$nextTick(()=>{ this.product_type = options.product_type
}
this.$nextTick(() => {
this.getOrderInfo() this.getOrderInfo()
this.getUserInfo() this.getUserInfo()
}) })
@ -170,10 +172,10 @@
}, },
getOrderInfo() { getOrderInfo() {
groupOrderDetail(this.order_id, this.product_type).then(res => { groupOrderDetail(this.order_id, this.product_type).then(res => {
console.log(res)
this.couponData = res.data this.couponData = res.data
this.$nextTick(()=>{ this.$nextTick(() => {
if(this.couponData.interest !== null){ if (this.couponData.interest !== null) {
this.moerTime(this.couponData.interest.start_time) this.moerTime(this.couponData.interest.start_time)
} }
}) })
@ -183,11 +185,15 @@
if (this.couponData.pay_type == 8) { if (this.couponData.pay_type == 8) {
postsettle( postsettle(
this.mer_id, { this.mer_id, {
id:this.order_id, id: this.order_id,
pay_type: this.payType pay_type: this.payType
} }
).then(res => { ).then(res => {
if(res.message == 'success'){ if (res.data.paid === false) {
//拉起微信支付
}
if (res.message == 'success') {
uni.showToast({ uni.showToast({
title: '付款成功' title: '付款成功'
}) })
@ -197,7 +203,7 @@
}) })
}, 1000) }, 1000)
} }
}).catch(err=>{ }).catch(err => {
uni.showToast({ uni.showToast({
title: err.message title: err.message
}) })
@ -206,11 +212,56 @@
orderPay(this.order_id, { orderPay(this.order_id, {
type: this.payType type: this.payType
}).then(res => { }).then(res => {
setTimeout(() => { let jsConfig = res.data.result.config
if (res.data.status === 'weixinApp') {
//拉起微信支付
// #ifdef APP-PLUS
let mp_pay_name = ''
if (uni.requestOrderPayment) {
mp_pay_name = 'requestOrderPayment'
} else {
mp_pay_name = 'requestPayment'
}
uni[mp_pay_name]({
provider: 'wxpay',
orderInfo: jsConfig,
success: (e) => {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
}, 1000)
},
fail: (e) => {
// 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付' + '&product_type=' + that.product_type;
return that.$util.Tips({
title: '取消支付',
}, {
tab: 4,
url: url
});
},
complete: () => {
// 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付' + '&product_type=' + that.product_type;
return that.$util.Tips({
title: '取消支付',
}, {
tab: 4,
url: url
});
},
});
// #endif
}
// setTimeout(() => {
// uni.navigateBack({
// delta: 1
// })
// }, 1000)
uni.showToast({ uni.showToast({
title: res.message title: res.message
}) })
@ -219,16 +270,16 @@
}, },
//计算是否逾期 //计算是否逾期
moerTime(autoTime){ moerTime(autoTime) {
var date1 = (Date.parse(new Date()))/1000; var date1 = (Date.parse(new Date())) / 1000;
var date2 = (Date.parse(new Date(autoTime)))/1000; var date2 = (Date.parse(new Date(autoTime))) / 1000;
var date3 = (date2- date1)*1000; var date3 = (date2 - date1) * 1000;
this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000)); this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
if(this.be_overdue == 0 || this.be_overdue < 0 ){ if (this.be_overdue == 0 || this.be_overdue < 0) {
var date1 = (Date.parse(new Date()))/1000; var date1 = (Date.parse(new Date())) / 1000;
var date2 = (Date.parse(new Date(autoTime)))/1000; var date2 = (Date.parse(new Date(autoTime))) / 1000;
var date3 = (date1- date2)*1000; var date3 = (date1 - date2) * 1000;
this.be_overday =Math.floor(date3 / (24 * 3600 * 1000)); this.be_overday = Math.floor(date3 / (24 * 3600 * 1000));
} }
} }
@ -238,10 +289,11 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.center { .center {
.conter{ .conter {
color: red; color: red;
font-weight: bold; font-weight: bold;
} }
.wrapper .item .discount .placeholder { .wrapper .item .discount .placeholder {
color: #ccc; color: #ccc;
text-align: right; text-align: right;
@ -352,6 +404,7 @@
font-size: 26rpx; font-size: 26rpx;
color: #aaa; color: #aaa;
} }
.footer { .footer {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B