qianggou
/
uniapp
forked from zhongyuanhaiju/uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【修改】2023/4/1

This commit is contained in:
liqianjin 2023-04-01 18:06:29 +08:00
parent 5723718895
commit 8f97cd259e
4 changed files with 166 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/diy-components/diy-member-info.vue
View File

@ -99,7 +99,7 @@
</view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? fenxiaoInfo.diamond : '--' }}</view>
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? parseInt(fenxiaoInfo.diamond) : '--' }}</view>
<view class="title">钻石</view>
</view>
<!-- <view class="solid"></view>-->

37
components/goods-detail-view/goods-detail-view.vue
View File

@ -44,18 +44,31 @@
<slot name="entrance"></slot>
<!-- 配送 -->
<view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" @click="$refs.deliveryType.open()">
<view class="label">配送</view>
<block v-if="deliveryType">
<view class="box">
<block v-for="(item, index) in deliveryType" :key="index">
<text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ item.name }}</text>
</block>
</view>
<text class="iconfont icon-right"></text>
</block>
<block v-else><view class="box">商家未配置配送方式</view></block>
</view>
<!-- <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" @click="$refs.deliveryType.open()">-->
<!-- <view class="label">配送</view>-->
<!-- <block v-if="deliveryType">-->
<!-- <view class="box">-->
<!-- <block v-for="(item, index) in deliveryType" :key="index">-->
<!-- <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ item.name }}</text>-->
<!-- </block>-->
<!-- </view>-->
<!-- <text class="iconfont icon-right"></text>-->
<!-- </block>-->
<!-- <block v-else><view class="box">商家未配置配送方式</view></block>-->
<!-- </view>-->
<!--针对以上地区特殊时期发货延迟-->
<view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" @click="$refs.deliveryType.open()">
<!-- <view class="label">配送</view>-->
<!-- <block v-if="deliveryType">-->
<!-- <view class="box">-->
<!-- <block v-for="(item, index) in deliveryType" :key="index">-->
<!-- <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ item.name }}</text>-->
<!-- </block>-->
<!-- </view>-->
<!-- <text class="iconfont icon-right"></text>-->
<!-- </block>-->
<block><view class="box">新疆，青海，西藏需补差快递，其余地方快递免费</view></block>
</view>
<!-- 门店 -->
<view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && Object.keys(store).length" >

55
pages_rush/futures/order.vue
View File

@ -9,7 +9,7 @@
</view>
</view>
<!--选项卡-->
<view v-if="false" class="tabs">
<view v-if="true" class="tabs">
<view
v-for="(item,index) in tabs" :key="index"
:class="['tabs-item',{'tabs-item-active': (item.status === tabs_active)}]"
@ -19,13 +19,13 @@
</view>
</view>
<!--订单列表-->
<mescroll-uni ref="mescroll" @getData="getList" top="70">
<mescroll-uni ref="mescroll" @getData="getList" top="170">
<block slot="list">
<view class="list" v-if="list.length > 0">
<view class="list-block" v-for="(item,index) in list" :key="index">
<view class="block-top">
<view class="left">订单号：{{ item.order_no }}</view>
<view class="right">{{ status_text[item.status] }}</view>
<view class="right">{{statusText(item)}}</view>
</view>
<view class="block-content">
<view class="left">
@ -91,7 +91,28 @@ export default {
mixins: [],
onLoad(option) {
// 获取需要显示的订单类型
this.tabs_active = option.status || 'all';
if(option.status == 'release'){
this.tabs_active = '待付款订单';
this.tabs = [
{title: '待付款订单', status: '待付款订单'},
{title: '商城已完成', status: '商城已完成'},
]
}
if(option.status == 'all'){
this.tabs_active = '采购未付款';
this.tabs = [
{title: '采购未付款', status: '采购未付款'},
{title: '成功完成订单', status: '成功完成订单'},
]
}
if(option.status == 'stock'){
this.tabs_active = '库存订单';
this.tabs = [
{title: '库存订单', status: '库存订单'},
{title: '提货订单', status: '提货订单'},
{title: '审核出售', status: '审核出售'},
]
}
// 获取页面标题
let pageTitle = this.page_titles[this.tabs_active];
uni.setNavigationBarTitle({
@ -112,6 +133,32 @@ export default {
}
},
methods: {
statusText(item){
switch (item.status){
case 1:
return '库存'
case 2:
if (item.release_time <= (new Date().getTime() / 1000) ){
return '正在销售'
}
if (item.release_time > (new Date().getTime() / 1000) ){
return '审核中'
}
break
case 3:
return '已完成'
case 4:
return '提货中'
case 5:
return '已提货'
case 6:
return '待付款'
case 7:
return '正在销售'
case 8:
return '已拆单'
}
},
// 订单搜索
search(){
this.$refs.mescroll.refresh();

91
pages_rush/futures/seckill.vue
View File

@ -11,6 +11,10 @@
<text class="count-down-time">{{ i }}</text>分
<text class="count-down-time">{{ s }}</text>秒
</view>
<view class="tip" @click="openPopup()">
<view class="title">商品全部实物销售</view>
<view class="content">本区域销售的商品均为商家已经生产并承诺全额补货</view>
</view>
</view>
<!--商品列表-->
<mescroll-uni ref="mescroll" @getData="getList" top="240">
@ -56,6 +60,18 @@
<!--加载动画-->
<loading-cover ref="loadingCover"></loading-cover>
</view>
<view @touchmove.prevent>
<uni-popup ref="registerPopup" type="center" :maskClick="false">
<view class="conten-box">
<view class="close"><text class="iconfont icon-close" @click="toClose"></text></view>
<view class="title">{{ regisiterAgreement.title }}</view>
<view class="con">
<scroll-view scroll-y="true" class="con"><rich-text :nodes="regisiterAgreement.content"></rich-text></scroll-view>
</view>
</view>
</uni-popup>
</view>
</template>
<script>
@ -80,17 +96,36 @@ export default {
i: '00',
s: '00',
interval: '',
regisiterAgreement: {
// 注册协议
title: '',
content: ''
},
};
},
components: {},
mixins: [],
onLoad(option) {},
onLoad(option) {
this.getRegisiterAggrement();},
onReady(){
// 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
},
onShow() {},
methods: {
/**
* 获取注册协议
*/
getRegisiterAggrement() {
this.$api.sendRequest({
url: '/futures/api/futures/aggrement',
success: res => {
if (res.code >= 0) {
this.regisiterAgreement = res.data;
}
}
});
},
// 获取商品列表
getList(mescroll) {
this.$api.sendRequest({
@ -142,7 +177,19 @@ export default {
this.i = parseInt(result.i);
this.s = parseInt(result.s);
}, 1000)
}
},
/**
* 展示注册协议
*/
openPopup() {
this.$refs.registerPopup.open();
},
/**
* 点击关闭协议
*/
toClose() {
this.$refs.registerPopup.close();
},
},
onBackPress(options) {
if (options.from === 'navigateBack') return false;
@ -196,6 +243,30 @@ export default {
padding: 0 10rpx;
}
}
.tip{
position: absolute;
top: 214rpx;
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
transform: scale(0.85);
z-index: 500;
.title{
width: 520rpx;
font-weight: 900;
font-size: 60rpx;
color: #f4de38;
border-bottom: solid 2rpx;
border-top: solid 2rpx;
line-height: 82rpx;
text-align: center;
}
.content{
font-size: 20rpx;
color: #f4de38;
}
}
}
.goods-list{
margin: 0 30rpx;
@ -372,4 +443,20 @@ export default {
}
}
}
.conten-box {
padding: 0 30rpx 30rpx;
.title {
text-align: center;
margin-top: 50rpx;
margin-bottom: 10rpx;
}
.close {
position: absolute;
right: 30rpx;
top: 10rpx;
}
.con {
height: 500rpx;
}
}
</style>