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

商城bug修复

Browse Source
This commit is contained in:
THK3121 2023-07-27 18:01:37 +08:00
parent 8e59fddcc5
commit 7837a9cd83
18 changed files with 307 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
node_modules node_modules
/dist /dist
.hbuilderx .hbuilderx
unpackage
# local env files # local env files
.env.local .env.local

4
components/orderGoods/index.vue
View File

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

2
components/zbpSwiper.vue
View File

@ -9,9 +9,11 @@
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{street}}</view> <view class="town_name">{{street}}</view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view> <view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
</navigator> </navigator>
</view> </view>
<!-- 搜索栏 --> <!-- 搜索栏 -->
<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb"> <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">

23
pages.json
View File

@ -1,6 +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": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
@ -166,7 +166,7 @@
"pages": [{ "pages": [{
"path": "gather/select_warehouse", "path": "gather/select_warehouse",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "入库管理",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, { }, {
@ -193,16 +193,16 @@
}, { }, {
"path": "supply_chain/supplier", "path": "supply_chain/supplier",
"style": { "style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#e93323" "navigationBarTitleText": "",
// "navigationStyle": "custom" "navigationBarBackgroundColor": "#e93323",
"navigationStyle": "custom"
} }
}, { }, {
"path": "supply_chain/merchant", "path": "supply_chain/merchant",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "商品",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
@ -673,7 +673,7 @@
}, { }, {
"path": "embody/embody", "path": "embody/embody",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "提现",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
@ -1064,12 +1064,16 @@
"path": "goods_search/index", "path": "goods_search/index",
"style": { "style": {
"navigationBarTitleText": "搜索商品" "navigationBarTitleText": "搜索商品"
} }
}, },
{ {
"path": "goods_search_con/index", "path": "goods_search_con/index",
"style": { "style": {
"navigationBarTitleText": "搜索商品" "navigationBarTitleText": "搜索商品",
"app-plus": {
"titleNView":false
}
} }
} }
] ]
@ -1245,10 +1249,11 @@
"path": "nvueSwiper/index", "path": "nvueSwiper/index",
//#endif //#endif
"style": { "style": {
"navigationBarTitleText": "社区短视频", "navigationBarTitleText": "社区视频",
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": { "app-plus": {
"titleNView": false, "titleNView": false,
"bounce": "none" "bounce": "none"
} }
} }

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

@ -77,55 +77,69 @@
</view> </view>
</view> </view>
</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_top">
<image src="@/static/images/jiankong.png"></image> <view class="footer_bon" >
<text>订单监控</text> <view class="footer_top public-wrapper ">
</view> <text class="jk_img">
<view class="footer_bon" v-for="(item,index) in OrderList" :key="index"> <image src="@/static/images/jiankong.png" ></image>
<view class="" v-for="(val, key) in item.orderProduct"> </text>
<view class="bon_top" :key="key" @click="toDetail(item)"> <text>订单监控</text>
<view class="public_img"> </view>
<image class="public_img" :src="val.cart_info.product.image" mode=""></image>
</view> <view v-for="(item,index) in OrderList" :key="index">
<view>
<view class="text_top">
<view class="text">
{{ val.cart_info.product.store_name }} <view class="" v-for="(val, key) in item.orderProduct">
</view> <view class="bon_top" :key="key" @click="toDetail(item)">
<view class="monry"> <view class="public_img">
￥{{ val.total_price }} <image class="public_img" :src="val.cart_info.product.image" mode=""></image>
</view> </view>
</view> <view>
<view class="text_order"> <view class="text_top">
订单号: {{ item.order_sn }} <view class="text">
</view> {{ val.cart_info.product.store_name }}
</view> </view>
</view> <view class="monry">
<view class="bon_bon" :key="key" @click="toDetail(item)"> ￥{{ val.total_price }}
<view class="order"> </view>
采购数量 </view>
<view class="txt"> <view class="text_order">
{{ val.product_num }} 订单号: {{ item.order_sn }}
</view> </view>
</view> </view>
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;"> </view>
已售数量 <view class="bon_bon" :key="key" @click="toDetail(item)">
<view class="txt"> <view class="order">
{{ val.sales_volume }} 采购数量
</view> <view class="txt">
</view> {{ val.product_num }}
<view class="order"> </view>
库存数量 </view>
<view class="txt"> <view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
{{ val.product_num - val.sales_volume }} 已售数量
</view> <view class="txt">
</view> {{ val.sales_volume }}
</view> </view>
</view> </view>
</view> <view class="order">
</view> 库存数量
</view> <view class="txt">
{{ val.product_num - val.sales_volume }}
</view>
</view>
</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>
<!-- <view class="public-wrapper"> <!-- <view class="public-wrapper">
<navigator class="item" :url="`/pages/admin/order/monitor?merId=${mer_id}`" <navigator class="item" :url="`/pages/admin/order/monitor?merId=${mer_id}`"
@ -280,7 +294,13 @@
border-radius: 30rpx; border-radius: 30rpx;
color: #fff; color: #fff;
} }
.supervisory_img{
display: inline-block;
width: 500rpx;
height: 500rpx;
background-color: red;
overflow: hidden;
}
.iconfont { .iconfont {
display: inline-block; display: inline-block;
position: relative; position: relative;
@ -442,13 +462,22 @@
.footer_top { .footer_top {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 16px 0 16px 0; margin: 16px 0 16px 25rpx;
image { .jk_img{
width: 22px; width: 18px;
height: 22px; height: 18px;
margin-right: 5px; overflow: hidden;
} // border: 1px solid red;
border-radius: 40px;
image {
width: 22px;
height: 22px;
margin-right: 5px;
}
}
} }
.footer_bon { .footer_bon {

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

@ -2,11 +2,9 @@
<view :style="viewColor"> <view :style="viewColor">
<view class='productList'> <view class='productList'>
<view class='search acea-row row-between-wrapper'> <view class='search acea-row row-between-wrapper'>
<!--#ifdef H5-->
<view class="back" @click='set_where(1)'> <view class="back" @click='set_where(1)'>
<view class="iconfont icon-xiangzuo"></view> <view class="iconfont icon-xiangzuo"></view>
</view> </view>
<!--#endif-->
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text> <view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search" <input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
:value='where.keyword' @confirm="searchSubmit" @input="inputChange"></input> :value='where.keyword' @confirm="searchSubmit" @input="inputChange"></input>
@ -22,7 +20,7 @@
<view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">店铺</view> <view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">店铺</view>
</view> </view>
<block v-if="tabIndex==1"> <block v-if="tabIndex==1">
<view class='nav acea-row row-middle'> <view class='nav acea-row row-middle' >
<view class='item' @click="downStatus = !downStatus" <view class='item' @click="downStatus = !downStatus"
:class="{'t-color':downKey>0 && firstKey == 0}"> :class="{'t-color':downKey>0 && firstKey == 0}">
{{downMenu[downKey].title}} {{downMenu[downKey].title}}
@ -897,13 +895,14 @@
.productList .search { .productList .search {
width: 100%; width: 100%;
height: 86rpx; height: 170rpx;
padding: 0 20rpx; padding: 0 20rpx;
box-sizing: border-box; // box-sizing: border-box;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0rpx;
z-index: 9; padding-top: 60rpx;
z-index: 9;
background-color: var(--view-theme); background-color: var(--view-theme);
.icon-dingwei { .icon-dingwei {
@ -966,7 +965,7 @@
z-index: 9; z-index: 9;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 70rpx;
width: 100%; width: 100%;
margin-top: 86rpx; margin-top: 86rpx;
background-color: var(--view-theme); background-color: var(--view-theme);

1
pages/goods_details/index.vue
View File

@ -585,6 +585,7 @@
])), ])),
}, },
onLoad(options) { onLoad(options) {
console.log(options)
this.referer = options.referer this.referer = options.referer
if (options.product_type) { if (options.product_type) {
this.product_type = options.product_type this.product_type = options.product_type

2
pages/nongKe/supply_chain/merchant.vue
View File

@ -55,7 +55,7 @@
</view> </view>
<view class="scroll_item_bon"> <view class="scroll_item_bon">
<view class="reduce" @click.stop='subCart(item,index)'>-</view> <view class="reduce" @click.stop='subCart(item,index)'>-</view>
<input type="text" v-model="goods[index].cart_num" /> <input type="text" disabled="true" v-model="goods[index].cart_num" />
<view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(item,index)'>+</view> <view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(item,index)'>+</view>
<!-- <u-number-box <!-- <u-number-box
button-size="36" button-size="36"

8
pages/nongKe/supply_chain/shopping_trolley.vue
View File

@ -349,7 +349,7 @@
this.cartList.valid.forEach(el => { this.cartList.valid.forEach(el => {
el.list.forEach(goods => { el.list.forEach(goods => {
if (goods.check) { if (goods.check) {
type_id.push(goods.spu.spu_id) type_id.push(goods.product_id)
} }
}) })
}) })
@ -358,6 +358,8 @@
title: '请选择产品' title: '请选择产品'
}); });
} else { } else {
collectAll({ collectAll({
type_id: type_id, type_id: type_id,
type: 1 type: 1
@ -585,7 +587,7 @@
cart_num: goods.cart_num + 1 cart_num: goods.cart_num + 1
}).then(res => { }).then(res => {
goods.cart_num = Number(goods.cart_num) + 1 goods.cart_num = Number(goods.cart_num) + 1
that.cartTotalCount = Number(that.cartTotalCount) + 1; // that.cartTotalCount = Number(that.cartTotalCount) + 1;
if (goods.hasOwnProperty('productAttr') && goods.cart_num > goods.productAttr.stock) { if (goods.hasOwnProperty('productAttr') && goods.cart_num > goods.productAttr.stock) {
goods.cart_num = goods.productAttr.stock; goods.cart_num = goods.productAttr.stock;
goods.numAdd = true; goods.numAdd = true;
@ -651,7 +653,7 @@
goods.numSub = true; goods.numSub = true;
} }
goods.cart_num = Number(goods.cart_num) - 1 goods.cart_num = Number(goods.cart_num) - 1
this.cartTotalCount = Number(this.cartTotalCount) - 1; // this.cartTotalCount = Number(this.cartTotalCount) - 1;
this.cartAllCheck('goodsCheck') this.cartAllCheck('goodsCheck')
}).catch(error => { }).catch(error => {
this.$util.Tips({ this.$util.Tips({

23
pages/nongKe/supply_chain/supplier.vue
View File

@ -2,11 +2,9 @@
<view> <view>
<view class='productList' :style="viewColor"> <view class='productList' :style="viewColor">
<view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme"> <view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
<!--#ifdef H5-->
<view class="back" @click='backjJump()'> <view class="back" @click='backjJump()'>
<view class="iconfont icon-xiangzuo"></view> <view class="iconfont icon-xiangzuo"></view>
</view> </view>
<!--#endif-->
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text> <view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search" <input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
:value='sotreParam.keyword' @confirm="searchSubmit"></input> :value='sotreParam.keyword' @confirm="searchSubmit"></input>
@ -30,17 +28,20 @@
<view class="line" :class="{'font-line':firstKey == item.key}"> <view class="line" :class="{'font-line':firstKey == item.key}">
</view> </view>
</view> </view>
<view class="item" @click="bindRight"> <!-- <view class="item" @click="bindRight">
<view>筛选 <view>筛选
<!-- <text class="iconfont icon-shaixuan"></text> --> <text class="iconfont icon-shaixuan"></text>
</view> </view>
<view class="line"> <view class="line">
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
<!-- 店铺 --> <!-- 店铺 -->
<block> <block>
<view class="">
66666
</view>
<view class="store-wrapper"> <view class="store-wrapper">
<view class="store-item" v-for="(item,index) in storeList" :key="index"> <view class="store-item" v-for="(item,index) in storeList" :key="index">
<view class="head"> <view class="head">
@ -294,7 +295,8 @@
}; };
}, },
onLoad(options) { onLoad(options) {
console.log(options);
this.product_type = options.product_type ?? 0 this.product_type = options.product_type ?? 0
if (options.street_id != undefined) { if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id this.sotreParam.street_id = options.street_id
@ -623,13 +625,14 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.productList .search { .productList .search {
width: 100%; width: 100%;
height: 86rpx; height: 140rpx;
padding: 0 20rpx; padding: 0 20rpx;
box-sizing: border-box; padding-top:70rpx ;
// box-sizing: border-box;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
z-index: 9; z-index: 99;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
background-color: #fff; background-color: #fff;
@ -734,7 +737,7 @@
z-index: 9; z-index: 9;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 40rpx;
width: 100%; width: 100%;
margin-top: 86rpx; margin-top: 86rpx;
background-color: #fff; background-color: #fff;

5
pages/order_details/index.vue
View File

@ -3,7 +3,6 @@
<view class='order-details'> <view class='order-details'>
<!-- 给header上与data上加on为退款订单--> <!-- 给header上与data上加on为退款订单-->
<!--预售--> <!--预售-->
<button @click="orderInfo.status=2">按钮</button>
<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)">
<view class='header presell_header' <view class='header presell_header'
:style="{ 'background-image': `url(${imgUrl}/static/diy/presell_bg${keyColor}.jpg)`}" :style="{ 'background-image': `url(${imgUrl}/static/diy/presell_bg${keyColor}.jpg)`}"
@ -305,8 +304,8 @@
<view class='bnt b-color' @tap='confirmOrder'>确认收货</view> <view class='bnt b-color' @tap='confirmOrder'>确认收货</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"
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> --> v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
<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>

33
pages/order_details/stay.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<view :style="viewColor"> <view :style="viewColor">
<button @click="test">anniu</button>
<view class='order-details'> <view class='order-details'>
<!-- 给header上与data上加on为退款订单--> <!-- 给header上与data上加on为退款订单-->
<view v-if="orderInfo.orderList && orderInfo.orderList[0].activity_type != 2"> <view v-if="orderInfo.orderList && orderInfo.orderList[0].activity_type != 2">
@ -9,7 +8,9 @@
<image :src="imgUrl+'/static/order_1.gif'"></image> <image :src="imgUrl+'/static/order_1.gif'"></image>
</view> </view>
<view class='data' v-if="!this.be_overday"> <view class='data' v-if="!this.be_overday">
<view class='state'>请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</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-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>
@ -261,6 +262,7 @@
}, },
data() { data() {
return { return {
isSelfOrder:false, //个人中心订单,区别与供货采购订单,
order_id: '', order_id: '',
evaluate: 0, evaluate: 0,
cartInfo: [], //购物车产品 cartInfo: [], //购物车产品
@ -498,7 +500,13 @@
if (this.orderInfo.interest !== null) { if (this.orderInfo.interest !== null) {
this.moerTime(this.orderInfo.interest.start_time) this.moerTime(this.orderInfo.interest.start_time)
} }
console.log(that.orderInfo.interest);
else{
this.isSelfOrder=true
this.moerTime(this.orderInfo.create_time)
// console.log(this.orderInfo.create_time)
}
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
uni.hideLoading(); uni.hideLoading();
@ -547,6 +555,16 @@
}, },
//计算是否逾期 //计算是否逾期
moerTime(autoTime) { moerTime(autoTime) {
if(this.isSelfOrder){
let limitPayTime=60 //支付时间限制
let curData = new Date(autoTime);
curData.setSeconds(curData.getSeconds() + (60*limitPayTime));
this.be_overdue=curData.toLocaleString().slice(0, curData.toLocaleString().length - 3)
return
}
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;
@ -1183,8 +1201,9 @@
position: absolute; position: absolute;
right: 0px; right: 0px;
z-index: 1; z-index: 1;
width: 30px; width: 50rpx;
height: 30px; height: 50rpx;
top: 95rpx;
} }
} }
@ -1204,9 +1223,9 @@
} }
.shouhuobtn { .shouhuobtn {
margin: auto; margin-left: 50rpx;
line-height: 34px; line-height: 34px;
margin-top: 30px; margin-top: 50rpx;
width: 150px; width: 150px;
height: 34px; height: 34px;
color: white; color: white;

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

@ -48,12 +48,41 @@
<view class="content_list_video"> <view class="content_list_video">
<view class="content_list_video_title">商品视频</view> <view class="content_list_video_title">商品视频</view>
<view class="video_list"> <view class="video_list">
<view class="video_list_item photo" v-if="addGoodsSecoundData.video_link"> <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
<view class="jiao" @click="deleteImage()"> <view class="jiao" @click="deleteImage()">
<video :src="addGoodsSecoundData.video_link"></video> <!-- video标签在app端层级过高 -->
<!--#ifndef APP-PLUS-->
<video :src="addGoodsSecoundData.video_link"></video>
<!--#endif-->
<!--#ifdef APP-PLUS-->
<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img>
<!--#endif-->
<image src="../static/images/close.png" mode="widthFix"></image> <image src="../static/images/close.png" mode="widthFix"></image>
</view> </view>
<!--#ifndef APP-PLUS-->
<view style="position: absolute;">
<view class="videoHover" @click="videoshow">
</view>
<text class="video-text">点击可预览视频</text>
</view>
<!--#endif-->
<!--#ifdef APP-PLUS-->
<view class='preview_video'>
<view class="videoHover" @click="videoshow">
</view>
<text class="video-text">点击可预览视频</text>
</view>
<!--#endif-->
</view> </view>
<view class="photo" @click="uploadVideo" v-else> <view class="photo" @click="uploadVideo" v-else>
<view> <view>
<image src="../static/images/creamer.png" mode="widthFix"></image> <image src="../static/images/creamer.png" mode="widthFix"></image>
@ -63,7 +92,17 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="showVideo" class="video-count">
<!--#ifndef APP-PLUS-->
<video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
<!--#endif-->
<!--#ifdef APP-PLUS-->
<video id="myVideo" class="videoLink" autoplay loop
:src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
<!--#endif-->
</view>
<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
<view class="handle dobuButton"> <view class="handle dobuButton">
<view class="handle_button margin_right" @click="lastStep">上一步</view> <view class="handle_button margin_right" @click="lastStep">上一步</view>
<view class="handle_button" @click="submitCreatedGoods">提交</view> <view class="handle_button" @click="submitCreatedGoods">提交</view>
@ -109,6 +148,7 @@
}, },
data() { data() {
return { return {
showVideo:false,
disModel: false, disModel: false,
upload_max: 10, upload_max: 10,
uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`, uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
@ -144,6 +184,16 @@
} }
}, },
methods: { methods: {
videoshow() {
this.showVideo = true
this.videoContext = uni.createVideoContext('myVideo', this);
this.$nextTick(() => {
this.videoContext.play();
})
// this.video_link = this.formData.video_link;
// this.videoContext.requestFullScreen({ direction: 90 });
// this.videoContext.play(); this.videoplay = true;
},
initData() { initData() {
let editGoodsDetils = {}; let editGoodsDetils = {};
if (getStorage('goodsDis')) { if (getStorage('goodsDis')) {
@ -357,7 +407,32 @@
} }
} }
} }
.videoHover {
width: 180rpx;
height: 180rpx;
display: flex;
align-items: center;
justify-content: center;
position: absolute;
top: 0;
left: 0;
z-index: 10;
view {
width: 50rpx;
height: 50rpx;
background: #000000;
border-radius: 50rpx;
display: flex;
align-items: center;
justify-content: center;
.iconfont {
color: #ffffff;
font-size: 21rpx;
}
}
}
.photo { .photo {
border: 1px solid #dddddd; border: 1px solid #dddddd;
opacity: 1; opacity: 1;
@ -400,7 +475,10 @@
height: 150rpx; height: 150rpx;
} }
} }
.preview_video{
position: absolute;
}
.container_input { .container_input {
background: #fff; background: #fff;
padding: 0 20rpx; padding: 0 20rpx;
@ -519,7 +597,24 @@
.marginTop_none { .marginTop_none {
margin-top: 0; margin-top: 0;
} }
.video-count {
position: fixed;
width: 600rpx;
height: 500rpx;
top: 50%;
left: 50%;
margin-left: -300rpx;
margin-top: -250rpx;
z-index: 100;
display: flex;
align-items: center;
justify-content: center;
.videoLink {
width: 600rpx;
height: 500rpx;
}
}
// .writeBg { // .writeBg {
// background: #fff; // background: #fff;
// } // }

14
pages/short_video/appSwiper/index.nvue
View File

@ -20,7 +20,7 @@
】 】
--> -->
<!-- 头部导航 --> <!-- 头部导航 -->
<view v-if="!isUser" class="header"> <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==3?'#FC4E09':''}" >
<view class="items" @click.stop="navTap(2)"> <view class="items" @click.stop="navTap(2)">
<text class="tName" :class="currentNav==2?'on':''">关注</text> <text class="tName" :class="currentNav==2?'on':''">关注</text>
</view> </view>
@ -257,6 +257,7 @@
<view class="nice_box flex_a_c" @click.stop="giveStart(item)"> <view class="nice_box flex_a_c" @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>
</view> </view>
@ -1036,14 +1037,15 @@
/* #ifdef MP */ /* #ifdef MP */
padding-top: 200rpx; padding-top: 200rpx;
/* #endif */ /* #endif */
background-color: #000000; // background-color: #000000;
background-color: #F5F5F5;
.goods_item { .goods_item {
width: 342.11rpx; width: 342.11rpx;
height: 491.23rpx; height: 491.23rpx;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
background-color: #000; // background-color: #000;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-bottom: 10px; padding-bottom: 10px;
@ -1170,11 +1172,11 @@
position: fixed; position: fixed;
z-index: 9; z-index: 9;
width: 750rpx; width: 750rpx;
height: 86rpx; height: 186rpx;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
top: 70rpx; padding-top: 70rpx;
.items { .items {
margin: 0 30rpx; margin: 0 30rpx;
@ -1191,7 +1193,7 @@
} }
.container { .container {
background-color: #000000; background-color: #F5F5F5;
} }
.item { .item {

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

@ -13,7 +13,10 @@
--> -->
<!-- 头部导航 --> <!-- 头部导航 -->
<!-- 头部导航 --> <!-- 头部导航 -->
<view v-if="!isUser" class="header">
<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>
</view> </view>
@ -49,10 +52,10 @@
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;z-index: -1;'"></video> :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;z-index: -1;'"></video>
</view> </view>
<!-- 播放状态：pause 的时候就会暂停 --> <!-- 播放状态：pause 的时候就会暂停 -->
<view class="videoHover" @click="tapVideoHover(list.state,$event)" <!-- <view class="videoHover" @click="tapVideoHover(list.state,$event)"
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"> :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
<image v-if="list.state=='pause'" class="playState" src="../static/img/index/play.png"></image> <image v-if="list.state=='pause'" class="playState" src="../static/img/index/play.png"></image>
</view> </view> -->
<!--审核状态--> <!--审核状态-->
<view v-if="list.status==-1 || list.status==0 || list.status==-2" class="video-status"> <view v-if="list.status==-1 || list.status==0 || list.status==-2" class="video-status">
<view v-if="list.status == -1 || list.status == -2" class="status-title"> <view v-if="list.status == -1 || list.status == -2" class="status-title">
@ -1135,10 +1138,11 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.video-list { .video-list {
padding: 200rpx 28.07rpx 28.07rpx 28.07rpx; padding: 150rpx 28.07rpx 28.07rpx 28.07rpx;
/* #ifdef MP */ /* #ifdef MP */
padding-top: 200rpx; padding-top: 150rpx;
/* #endif */ /* #endif */
background-color: #F5F5F5;
.goods_item { .goods_item {
width: 342.11rpx; width: 342.11rpx;
@ -1237,13 +1241,13 @@
position: fixed; position: fixed;
z-index: 9; z-index: 9;
width: 750rpx; width: 750rpx;
height: 86rpx; height: 120rpx;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
top: 20rpx; padding-top: 20rpx;
/* #ifdef MP */ /* #ifdef MP */
top: 75rpx; padding-top: 75rpx;
/* #endif */ /* #endif */
.tool-bar { .tool-bar {
@ -1258,8 +1262,9 @@
.icon-xiangzuo { .icon-xiangzuo {
margin-right: 40rpx; margin-right: 40rpx;
margin-left: 20rpx; margin-left: 20rpx;
font-size: 26rpx; font-size: 30rpx;
color: #fff; color: #fff;
margin-top: 60rpx;
} }
} }
@ -1290,6 +1295,7 @@
.shortVideo, .shortVideo,
.container { .container {
background: linear-gradient(180deg, rgba(0, 0, 0, .8) 0%, #000000 100%); background: linear-gradient(180deg, rgba(0, 0, 0, .8) 0%, #000000 100%);
} }
.item { .item {
@ -1336,6 +1342,7 @@
flex: 1; flex: 1;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
// background-color: red;
} }
.playState { .playState {

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

@ -307,6 +307,14 @@
@click='goOrderDetails(item.order_id)'>查看物流</view> @click='goOrderDetails(item.order_id)'>查看物流</view>
<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view> <view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
</block> </block>
<!-- <block v-if="item.status == 2 && item.pay_type !== 8 ">
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>发布种草
</view>
</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">
<text class="iconfont icon-fabu"></text>
发布种草
</navigator>
<block v-if="item.status == 2 && item.pay_type !== 8 "> <block v-if="item.status == 2 && item.pay_type !== 8 ">
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价 <view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
</view> </view>
@ -405,6 +413,7 @@
}, },
data() { data() {
return { return {
flag:false,
loading: false, //是否加载中 loading: false, //是否加载中
loadend: false, //是否加载完毕 loadend: false, //是否加载完毕
loadTitle: '加载更多', //提示语 loadTitle: '加载更多', //提示语
@ -474,6 +483,8 @@
} }
}, },
onShow() { onShow() {
this.flag= (this.$route.query.product_type==0)
console.log(this.flag)
if (this.isLogin) { if (this.isLogin) {
this.page = 1; this.page = 1;
this.loadend = false; this.loadend = false;

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

@ -112,9 +112,10 @@
</view> </view>
<view v-if="item.status == 0" class='t-color'>待发货</view> <view v-if="item.status == 0" 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" 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>
<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> </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" :key="index"> <view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">

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

@ -44,14 +44,14 @@
<view class="settel"> <view class="settel">
<view class='settel-t'> <view class='settel-t'>
<view>商品总价：</view> <view>商品总价：</view>
<view class='conter'>￥ {{couponData.interest.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">
<view class='settel-t'> <view class='settel-t'>
<view>利息合计:</view> <view>利息合计:</view>
<view class="conter"> <view class="conter">
<view class='con_text'>￥ {{couponData.interest.interest}}</view> <view class='con_text'>￥ {{couponData.total_postage}}</view>
<view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8"> <view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">
已逾期{{this.be_overday}}天</view> 已逾期{{this.be_overday}}天</view>
</view> </view>
@ -62,8 +62,8 @@
<view class="footer_count"> <view class="footer_count">
<view> <view>
合计: 合计:
<text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text> <text class='conter' v-if="cartArr[4].payStatus == 1">￥0.00</text>
<text class='pColor' v-else>￥{{couponData.interest.total_amount}}</text> <text class='conter' v-else>￥{{couponData.pay_price}}</text>
</view> </view>
<!-- <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 "> <!-- <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 ">
可结算周期到期后再付款￥{{totalPrice}} 可结算周期到期后再付款￥{{totalPrice}}
@ -149,7 +149,6 @@
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.product_type = options.product_type }
console.log(this.product_type);
this.$nextTick(()=>{ this.$nextTick(()=>{
this.getOrderInfo() this.getOrderInfo()
this.getUserInfo() this.getUserInfo()
@ -161,9 +160,7 @@
let active = e; let active = e;
that.active = active; that.active = active;
that.animated = true; that.animated = true;
console.log(active);
that.payType = that.cartArr[active].value; that.payType = that.cartArr[active].value;
console.log(that.payType);
}, },
getUserInfo() { getUserInfo() {
getUserInfo().then(res => { getUserInfo().then(res => {
@ -173,6 +170,7 @@
}, },
getOrderInfo() { getOrderInfo() {
groupOrderDetail(this.order_id, this.product_type).then(res => { groupOrderDetail(this.order_id, this.product_type).then(res => {
this.couponData = res.data this.couponData = res.data
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.couponData.interest !== null){ if(this.couponData.interest !== null){
@ -208,7 +206,6 @@
orderPay(this.order_id, { orderPay(this.order_id, {
type: this.payType type: this.payType
}).then(res => { }).then(res => {
console.log(res);
setTimeout(() => { setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
@ -241,6 +238,10 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.center { .center {
.conter{
color: red;
font-weight: bold;
}
.wrapper .item .discount .placeholder { .wrapper .item .discount .placeholder {
color: #ccc; color: #ccc;
text-align: right; text-align: right;
@ -351,7 +352,6 @@
font-size: 26rpx; font-size: 26rpx;
color: #aaa; color: #aaa;
} }
.footer { .footer {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;