pull/1/head
liudan 1 year ago
parent 2278135919
commit 25b9307e88
  1. 6
      common/api.js
  2. 6
      components/TabBar/TabBar.vue
  3. 59
      pages.json
  4. 4
      pages/GoodsDetails/GoodsDetails.scss
  5. 6
      pages/GoodsDetails/GoodsDetails.vue
  6. 39
      pages/GoodsOn/GoodsOn.scss
  7. 32
      pages/GoodsOn/GoodsOn.vue
  8. 6
      pages/MyCoupon/MyCoupon.vue
  9. 3
      pages/MyOrderList/MyOrderList.scss
  10. 39
      pages/MyOrderList/MyOrderList.vue
  11. 22
      pages/fenxiao/fenxiao.vue
  12. 100
      pages/my/my.vue
  13. 266
      pages/qianggou/productDetails.vue
  14. 185
      pages/qianggou/productList.vue
  15. 195
      pages/qianggou/qianggou.vue
  16. 22
      pages/shoukuan/shoukuan.vue
  17. 380
      pages/warehouse/buy.vue
  18. BIN
      static/image/banner1.png
  19. BIN
      static/image/banner2.png
  20. BIN
      static/image/banner3.png
  21. 2
      uni.scss

@ -48,4 +48,10 @@ export const getUserFansList = (params, config = {custom: { auth: true }}) => ht
export const getUserProfitStatistic = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserProfitStatistic', params, config);
//收益列表
export const getUserProfitList = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserProfitList', params, config);
//抢购预告
export const getWarehouseList = (params, config = {custom: { auth: true }}) => http.post('/api/order/getWarehouseList', params, config);
//商品列表
export const getGoodsList = (params, config = {custom: { auth: true }}) => http.post('/api/order/getGoodsList', params, config);
//商品详情
export const getgoodsDetail = (params, config = {custom: { auth: true }}) => http.post('/api/order/goodsDetail', params, config);

@ -93,9 +93,9 @@
})
break;
case 1:
// uni.switchTab({
// url:'/pages/classify/classify'
// })
uni.switchTab({
url:'/pages/qianggou/qianggou'
})
break;
case 2:

@ -163,6 +163,50 @@
"onReachBottomDistance":100
}
},
{
"path" : "pages/qianggou/qianggou",
"style" : {
"navigationBarTitleText": "抢购",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path" : "pages/qianggou/productList",
"style" : {
"navigationBarTitleText": "抢购",
"navigationBarBackgroundColor": "#FFFFFF",
"onReachBottomDistance":100
}
},
{
"path" : "pages/qianggou/productDetails",
"style" : {
"navigationBarTitleText": "商品详情",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path" : "pages/GoodsOn/GoodsOn",
"style" : {
"navigationBarTitleText": "商品收藏",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path" : "pages/MyOrderList/MyOrderList",
"style" : {
"navigationStyle":"custom"
}
},
{
"path" : "pages/warehouse/buy",
"style" : {
"navigationBarTitleText": "买方仓库",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
@ -243,13 +287,6 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
"path" : "pages/GoodsOn/GoodsOn",
"style" : {
"navigationBarTitleText": "商品关注",
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
"path" : "pages/ContentCollection/ContentCollection",
"style" : {
@ -264,12 +301,6 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
"path" : "pages/MyOrderList/MyOrderList",
"style" : {
"navigationStyle":"custom"
}
}
,{
"path" : "pages/OrderDetails/OrderDetails",
"style" : {
@ -509,7 +540,7 @@
{
"iconPath": "/static/tabBar/tab_03.png",
"selectedIconPath": "/static/tabBar/tab_04.png",
"pagePath": "pages/classify/classify",
"pagePath": "pages/qianggou/qianggou",
"text": ""
},

@ -687,13 +687,15 @@
}
/* 商品介绍 */
.products-introduction{
padding: 0 4% 100rpx;
// padding: 0 4% 100rpx;
.title{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 80rpx;
background: #fff;
margin-bottom:20rpx;
text{
font-size: 28rpx;
color: #212121;

@ -142,9 +142,11 @@
<!-- 商品介绍 -->
<view class="products-introduction" ref="products" style="text-align: center;" >
<view class="title">
<text>商品介绍</text>
<text>图文详情</text>
</view>
<view style="background: #ffffff;padding-top:10px;">
<image :src="swiperList[0].url" mode="heightFix"></image>
</view>
<image :src="swiperList[0].url" mode="heightFix"></image>
</view>
<!-- 底部 -->
<view class="page-footer">

@ -6,41 +6,10 @@
height: 100%;
background-color: #FFFFFF;
}
.goods-tab{
position: fixed;
left: 0;
top: 0;
/* #ifdef H5 */
top: 88rpx;
/* #endif */
z-index: 10;
display: flex;
align-items: center;
width: 100%;
height: 80rpx;
background-color: #FFFFFF;
.tab{
display: flex;
align-items: center;
justify-content: center;
width: 20%;
height: 100%;
text{
display: flex;
align-items: center;
height: 100%;
border-bottom: 4rpx solid transparent;
}
.action{
color: $base;
border-bottom: 4rpx solid $base;
}
}
}
.goods-list{
padding: 0 4%;
background-color: #FFFFFF;
margin-top: 100rpx;
padding-bottom: 80rpx;
.check{
display: flex;
@ -60,10 +29,10 @@
margin-bottom: 10rpx;
.thumb{
width: 40%;
height: 240rpx;
height: 200rpx;
image{
width: 240rpx;
height: 240rpx;
width: 200rpx;
height: 200rpx;
border-radius: 10rpx;
}
}

@ -1,41 +1,25 @@
<template>
<view class="page">
<view class="goods-tab">
<view class="tab">
<text class="action">默认</text>
</view>
<view class="tab">
<text>降价</text>
</view>
<view class="tab">
<text>促销</text>
</view>
<view class="tab">
<text>分类</text>
</view>
<view class="tab" @click="isEdit = !isEdit">
<text>{{isEdit?'完成':'编辑'}}</text>
</view>
</view>
<view class="goods-list">
<view class="list" v-for="(item,index) in 8" :key="index">
<view class="list" v-for="(item,index) in 1" :key="index">
<view class="check" :style="isEdit?'display: flex':'display: none'">
<text class="iconfont icon-check"></text>
</view>
<view class="thumb">
<image :src="'/static/img/goods_thumb_0'+(index+1)+'.png'" mode=""></image>
<image src="/static/image/x.png" mode=""></image>
</view>
<view class="item">
<view class="title">
<text class="two-omit">薇妮(Viney)时尚包包女包牛皮单肩包女休闲百搭斜挎包韩版小方包潮(枪色)</text>
<text class="two-omit">珠宝</text>
</view>
<view class="price-more">
<view class="price">188.00</view>
<view class="depreciate" :style="!isEdit?'display: flex':'display: none'">
<!-- <view class="depreciate" :style="!isEdit?'display: flex':'display: none'">
<text>比关注时降价300.00</text>
</view>
</view> -->
</view>
<view class="goods-btn">
<!-- <view class="goods-btn">
<view class="btn">
<text>看相似</text>
<text>降价通知</text>
@ -43,7 +27,7 @@
<view class="cart">
<text class="iconfont icon-cart"></text>
</view>
</view>
</view> -->
</view>
</view>
</view>

@ -16,7 +16,7 @@
</view>
</view>
<!-- 优惠券列表 -->
<view class="coupon-list">
<view class="coupon-list" v-if="list.length>0">
<view class="list" v-for="(item,index) in list" :key="index">
<view class="list-data" :class="{'coupon-lose':TabShow!=0}">
<view class="coupon-price">
@ -33,7 +33,7 @@
</view>
<view class="date-get">
<view class="title"><text>{{item.coupon.use_scope_text}}</text></view>
<view class="date"><text>{{item.coupon.get_start_time}}-{{item.coupon.get_end_time}}</text></view>
<view class="date"><text>{{item.coupon.use_start_time}}-{{item.coupon.use_end_time}}</text></view>
</view>
@ -46,7 +46,7 @@
</view>
</view>
<view class="empty">
<view class="empty" v-else>
<image src="../../static/image/not-order.png" mode="widthFix"></image>
<view class="emptyText">暂无数据</view>
</view>

@ -131,7 +131,8 @@
/* 订单列表 */
.order-list{
width: 100%;
margin-top: 220rpx;
margin-top: 250rpx;
text-align: center;
/* #ifdef APP-PLUS */
margin-top: calc(170rpx + var(--status-bar-height));
/* #endif */

@ -15,7 +15,7 @@
</view>
<!-- 订单tab -->
<view class="order-tab">
<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
<view class="tab" :class="{'action':OrderType==5}" @click="onOrderTab(0)">
<text>全部</text>
<text class="line"></text>
</view>
@ -38,42 +38,7 @@
</view>
<!-- 订单列表 -->
<view class="order-list">
<view class="list" v-for="(item,index) in 10" @click="onOrderList" :key="index">
<view class="title-status">
<view class="title">
<text>下单时间2020-12-12 18:56</text>
</view>
<view class="status">
<text>待付款</text>
<text class="iconfont icon-laji del"></text>
</view>
</view>
<view class="goods-list">
<view class="goods">
<view class="thumb">
<image :src="'/static/img/goods_thumb_0'+(index+1)+'.png'" mode=""></image>
</view>
<view class="item">
<view class="goods-name">
<text class="two-omit">薇妮(Viney)时尚包包女包牛皮单肩包女休闲百搭斜挎包韩版小方包潮(枪色)</text>
</view>
<view class="goods-price">
<text class="min"></text>
<text class="max">299</text>
<text class="min">.00</text>
</view>
</view>
</view>
</view>
<view class="status-btn">
<view class="btn">
<text>取消订单</text>
</view>
<view class="btn action" @click.stop="onEvaluate">
<text>评价</text>
</view>
</view>
</view>
暂无订单~
</view>
</view>
</template>

@ -3,7 +3,7 @@
<view class="fenxiaoInfo">
<view class="fxTop">
<text class="tixian">佣金</text>
<view class="fxIntro">
<view class="fxIntro" @click="show=true">
<text>分销说明</text>
<u-icon size="15" color="#c4b39b" name="more-circle"></u-icon>
</view>
@ -36,12 +36,17 @@
<u-cell icon="order" :iconStyle="{'color':'#9f751f'}" :titleStyle="{'color':'#9f751f'}" title="粉丝订单" :isLink="true" :rightIconStyle="{'color':'#9f751f'}"></u-cell>
</u-cell-group>
</view>
<u-popup :show="show" mode="bottom" @close="close" round="10">
<view style="padding:24rpx;max-height:calc(60vh);overflow: auto;">
<u-parse :content="content" style="margin-top:45px;"></u-parse>
</view>
</u-popup>
</view>
</template>
<script>
import {getUserCommissionStatistic} from '@/common/api.js'
import {privacyPolicy} from '@/common/api.js'
export default{
data(){
return{
@ -49,10 +54,20 @@ export default{
"total_commission_amount": "",
"today_commission_amount": "",
"seven_day_commission_amount": ""
}
},
show:false,
content:''
}
},
methods:{
close() {
this.show = false
},
getText(){
privacyPolicy({id:9}).then(res=>{
this.content = res.data.content
})
},
getInfo(){
getUserCommissionStatistic().then(res=>{
console.log(res,"nnn")
@ -81,6 +96,7 @@ export default{
},
mounted(){
this.getInfo()
this.getText()
}
}

@ -45,7 +45,7 @@
<!-- 订单信息 -->
<view class="order-info">
<view class="shopTop">
<view class="star">
<view class="star" @click="goCollection">
<u-icon name="star" color="#ffffff"></u-icon>
<text>商品收藏</text>
</view>
@ -57,7 +57,7 @@
<view class="list" @click="onSkipOrder(1)">
<view class="icon">
<image src="../../static/image/1.png" mode="heightFix"></image>
<text class="num">22</text>
<!-- <text class="num">22</text> -->
</view>
<view class="title">
<text>待付款</text>
@ -105,34 +105,6 @@
</div>
</view>
<!-- 关注区 -->
<!-- <view class="focus-area">
<view class="list" @click="onCollect('goods')">
<view class="num">
<text>28</text>
</view>
<view class="title">
<text>商品关注</text>
</view>
</view>
<view class="list" @click="onCollect('content')">
<view class="num">
<text>28</text>
</view>
<view class="title">
<text>喜欢的内容</text>
</view>
</view>
<view class="list" @click="onCollect('record')">
<view class="num">
<text>28</text>
</view>
<view class="title">
<text>浏览记录</text>
</view>
</view>
</view> -->
</view>
<!-- 买方 -->
@ -141,7 +113,7 @@
买方
</view>
<view class="infoContainer">
<view class="list" @click="onWallet('integral')">
<view class="list" @click="goBuyWareHouse()">
<view class="icon">
<image src="../../static/image/c1.png" mode="heightFix"></image>
</view>
@ -149,7 +121,7 @@
<text>我的仓库</text>
</view>
</view>
<view class="list" @click="onWallet('coupon')">
<view class="list" @click="goBuyWareHouse(0)">
<view class="icon">
<image src="../../static/image/c2.png" mode="heightFix"></image>
</view>
@ -157,7 +129,7 @@
<text>确认付款</text>
</view>
</view>
<view class="list" @click="onWallet('wallet')">
<view class="list" @click="goBuyWareHouse(1)">
<view class="icon">
<image src="../../static/image/c3.png" mode="heightFix"></image>
</view>
@ -165,7 +137,7 @@
<text>确认收货</text>
</view>
</view>
<view class="list">
<view class="list" @click="goBuyWareHouse(3)">
<view class="icon">
<image src="../../static/image/c4.png" mode="heightFix"></image>
</view>
@ -176,7 +148,7 @@
</view>
</view>
<!-- 卖方 -->
<view class="wallet-info">
<!-- <view class="wallet-info">
<view class="fangmian">
卖方
</view>
@ -214,7 +186,7 @@
</view>
</view>
</view>
</view>
</view> -->
<view class="card">
<u-cell-group :border="false">
<u-cell icon="map" :iconStyle="{'color':'#236030'}" @click="onAddress" :titleStyle="{'color':'#236030'}" title="我的地址" :isLink="true" :rightIconStyle="{'color':'#236030'}"></u-cell>
@ -327,16 +299,15 @@
break;
}
},
goCollection(){
uni.navigateTo({
url:'/pages/GoodsOn/GoodsOn'
})
},
/**
* 订单
*/
onSkipOrder(type){
if(type === 5){
uni.navigateTo({
url: '/pages/AfterSalesOrder/AfterSalesOrder',
})
return;
}
uni.navigateTo({
url: '/pages/MyOrderList/MyOrderList?type=' + type,
})
@ -373,21 +344,7 @@
break;
}
},
/**
* 我的服务点击
*/
onServer(type){
switch (type){
case 'feedback':
uni.navigateTo({
url: '/pages/Feedback/Feedback'
})
break;
case 'serve':
this.isHotline = true;
break;
}
},
/**
* 设置点击
*/
@ -397,29 +354,7 @@
})
},
/**
* 会员点击
*/
onMmeberVip(){
uni.navigateTo({
url: '/pages/MembersOpened/MembersOpened',
})
},
/**
* 跳转点击
* @param {String} type 跳转类型
*/
onSkip(type){
switch (type){
case 'goods':
uni.navigateTo({
url: '/pages/GoodsDetails/GoodsDetails',
animationType: 'zoom-fade-out',
animationDuration: 200
})
break;
}
},
jump(val){
if(val==1){
uni.navigateTo({
@ -435,6 +370,11 @@
})
}
},
goBuyWareHouse(val){
uni.navigateTo({
url:"/pages/warehouse/buy?type="+val
})
},
}
}

@ -0,0 +1,266 @@
<template>
<view class="page" @click="isMore = false">
<!-- banner标题 -->
<view class="banner-title">
<!-- banner -->
<view class="banner">
<swiper class="screen-swiper round-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000"
duration="500">
<swiper-item v-for="(item, index) in swiperList" :key="index">
<image :src="item.url" mode="aspectFill"></image>
</swiper-item>
</swiper>
</view>
<!-- 价格 -->
<view class="price-info">
<view class="price">
<text class="min"></text>
<text class="max">{{detailsObj.price}}</text>
</view>
<view class="person">
藏品归属人{{detailsObj.owner.nickname}}
</view>
</view>
</view>
<!-- 标题 -->
<view class="goods-title">
<text>{{detailsObj.name}}</text>
</view>
<!-- 商品介绍 -->
<view class="products-introduction" ref="products" style="text-align: center;" >
<view class="title">
<text>图文详情</text>
</view>
<view class="parseContent">
<u-parse :content="detailsObj.content"></u-parse>
</view>
</view>
<!-- 底部 -->
<view class="page-footer">
立即抢购
</view>
</view>
</template>
<script>
import {getgoodsDetail} from '@/common/api.js'
export default {
data() {
return {
swiperList: [],
detailsObj:{
content:"",
createtime:null,
goods_form:null,
goods_type:null,
id:null,
image:null,
name:null,
off_time:null,
on_time:null,
owner_id:null,
price:null,
status:null,
updatetime:null,
warehouse_id:null,
}
};
},
onLoad(params) {
this.getDetailsHandle(params.id)
},
methods: {
getDetailsHandle(id){
getgoodsDetail({id:id}).then(res=>{
console.log(res,"99")
this.swiperList.push({
url: res.data.image
})
this.detailsObj = Object.assign({},this.detailsObj,res.data)
})
}
}
};
</script>
<style scoped lang="scss">
.page {
// position: absolute;
width: 100%;
// height: 100%;
background: #f6f6f6;
overflow-x: hidden;
padding-bottom: 120rpx;
// overflow-y: auto;
}
/* banner 标题 */
.banner-title{
background-color: #FFFFFF;
padding-bottom: 20rpx;
}
/* banner */
.banner{
width: 100%;
height: 750rpx;
.screen-swiper{
width: 100%;
height: 100%;
}
}
/* 价格 */
.price-info{
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 4%;
margin-top:20rpx;
.price{
display: flex;
align-items: center;
.min{
color: $base;
font-size: 28rpx;
font-weight: bold;
}
.max{
color: $base;
font-size: 48rpx;
font-weight: bold;
}
}
.person{
font-size:24rpx;
color:#aaaaaa;
}
}
/* 标题 */
.goods-title{
padding: 20rpx 4%;
background-color: #fff;
margin-top:20rpx;
text{
font-size: 28rpx;
color: #212121;
}
}
/* 商品介绍 */
.products-introduction{
// padding: 0 4% 100rpx;
margin-top:20rpx;
.title{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 80rpx;
background: #fff;
margin-bottom:20rpx;
text{
font-size: 28rpx;
color: #212121;
margin: 0 20rpx;
}
}
.title:before{
content: "";
width: 100rpx;
height: 2rpx;
background-color: #c0c0c0;
}
.title:after{
content: "";
width: 100rpx;
height: 2rpx;
background-color: #c0c0c0;
}
.parseContent{
width: 100%;
background-color: #fff;
padding:50rpx 20rpx;
}
}
/* 底部 */
.page-footer{
position: fixed;
left: 0;
bottom: 10rpx;
display: flex;
align-items: center;
justify-content: center;
width: calc(100% - 48rpx);
height: 80rpx;
background-color: #9f751F;
margin:0 24rpx;
border-radius: 10rpx;
color:#fff;
.footer-fn{
display: flex;
align-items: center;
width: 40%;
height: 100%;
.list{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 50%;
height: 100%;
text{
font-size: 24rpx;
color: #555555;
}
.iconfont{
font-size: 42rpx;
color: #212121;
}
}
}
.footer-buy{
display: flex;
align-items: center;
justify-content: space-between;
width: 60%;
height: 100%;
.cart-add{
display: flex;
align-items: center;
justify-content: center;
width: 48%;
height: 70rpx;
background: #4d9a5e;
border-radius: 70rpx;
text{
font-size: 26rpx;
color: #FFFFFF;
}
}
.buy-at{
display: flex;
align-items: center;
justify-content: center;
width: 48%;
height: 70rpx;
background: #4d9a5e;
border-radius: 70rpx;
text{
font-size: 26rpx;
color: #FFFFFF;
}
}
}
}
</style>

@ -0,0 +1,185 @@
<template>
<view class="page">
<u-sticky bgColor="#fff">
<u-tabs
@click="getPage"
:activeStyle="{
color: '#9F751F',
fontWeight: 'bold',
background:'#eaeaea',
transform: 'scale(1.05)'
}"
:inactiveStyle="{
color: '#9F751F',
transform: 'scale(1)'
}"
:list="pagesList"></u-tabs>
</u-sticky>
<view class="refresh" @click="refrenshHandle">
刷新
</view>
<view class="recommend-info">
<view class="goods-list">
<view class="list" v-for="(item,index) in goodsList" @click="onSkip(item)" :key="index">
<view class="pictrue">
<image :src="item.image" mode="heightFix"></image>
</view>
<view class="title-tag">
{{item.name}}
</view>
<view class="price-info">
<view class="user-price">
<text class="min"></text>
<text class="max">{{item.price}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {getGoodsList} from '@/common/api.js'
export default {
data(){
return{
goodsList:[],
total:0,
pagesList: [],
page:1,
limit:10,
}
},
methods:{
refrenshHandle(){
uni.redirectTo({
url: '/pages/qianggou/productList?page='+this.page //
});
},
getGoodsList(){
this.pagesList=[]
getGoodsList({page:this.page,limit:10}).then(res=>{
this.goodsList = res.data.data;
this.total = res.data.total;
for(let i=0;i<Math.ceil(this.total/10);i++){
this.pagesList.push({
name:`${i+1}`
})
}
})
},
getPage(val){
this.page=val.index+1;
this.getGoodsList()
},
onSkip(item){
uni.navigateTo({
url:'/pages/qianggou/productDetails?id='+item.id
})
}
},
onReady() {
},
onLoad() {
this.getGoodsList()
},
onPageScroll(e){
},
onReachBottom(){
console.log(12333);
},
};
</script>
<style scoped lang="scss">
.page{
padding-bottom: 100rpx;
position: relative;
}
// 9F751F
.refresh{
color:rgb(77, 154, 94);
padding:20rpx;
text-align: right;
position: fixed;
top:90rpx;
right:0;
z-index:9999;
}
::v-deep .u-tabs{
margin-right:100rpx;
}
::v-deep .u-tabs__wrapper__nav__line{
display: none;
}
::v-deep .u-tabs__wrapper__nav__item__text{
font-size: 15px;
height: 100%;
color: #606266;
display: flex;
align-items: center;
padding: 0 10px;
}
.recommend-info{
width: 100%;
background-color: #f2f2f2;
margin-top:20rpx;
.goods-list{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
padding: 0 30rpx;
.list{
width: 49%;
height: 480rpx;
margin-bottom: 20rpx;
background-color: #FFFFFF;
border-radius: 10rpx;
overflow: hidden;
.pictrue{
display: flex;
justify-content: center;
width: 100%;
image{
height: 350rpx;
}
}
.title-tag{
padding: 20rpx;
}
.price-info{
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
padding: 0 20rpx;
.user-price{
display: flex;
align-items: center;
text{
color: $price-clor;
}
.min{
font-size: 24rpx;
}
.max{
font-size: 32rpx;
}
}
}
}
}
}
</style>

@ -0,0 +1,195 @@
<template>
<view class="qianggou">
<view class="banner">
<u-swiper :circular="true" :list="swiperList" :autoplay="true"></u-swiper>
</view>
<view class="notice">
<u-notice-bar :text="text1" :direction="'column'" @click="jump" :mode="'link'" bgColor="transparent" color="#4D9A5E"></u-notice-bar>
</view>
<view class="qgList">
<view class="qgItem" v-for="(item,index) in list" :key="index">
<image :src="baseUrl+item.image" class="bgPic" mode="aspectFill"></image>
<view class="qgInfo">
<view class="conpany">
<view class="line"></view>
<view class="text">
{{item.title}}
</view>
<view class="line"></view>
</view>
<view class="time" @click="goProductList(item)">
开放时间{{item.status!='normal'?'待开放':item.start+'-'+item.end}}
</view>
</view>
</view>
<view class="gobottom">
--我也是有底线的--
</view>
<u-toast ref="uToast"></u-toast>
</view>
<!-- tabbar -->
<TabBar :tabBarShow="1"></TabBar>
</view>
</template>
<script>
import {getWarehouseList} from '@/common/api.js'
import TabBar from '../../components/TabBar/TabBar.vue';
export default{
components:{
TabBar,
},
data(){
return{
swiperList:[
'/static/image/banner1.png',
'/static/image/banner2.png',
'/static/image/banner3.png'
],
text1:[
'用户隐私协议','用户注册协议','委托托管协议','用户须知','C2C个人支付风险提示'
],
list:[]
}
},
methods:{
jump(val){
console.log("7777",val)
let id=null;
switch (val){
case 0:
id=2;
break;
case 1:
id=1;
break;
case 2:
id=4;
break;
case 3:
id=3;
break;
case 4:
id=5;
break;
}
uni.navigateTo({
url:`/pages/my/richText?id=${id}`
})
},
getWarehouseList(){
getWarehouseList().then(res=>{
console.log(res,)
this.list = res.data;
})
},
goProductList(item){
if(item.status=="normal"){
if(item.is_allow_access==0){
this.$refs.uToast.show({
message:'未到抢购时间'
})
}else{
uni.navigateTo({
url:'/pages/qianggou/productList'
})
}
}else{
this.$refs.uToast.show({
message:item.title+'等待开放'
})
return;
}
}
},
onLoad(){
this.getWarehouseList()
},
onReady() {
uni.hideTabBar();
// #ifdef MP
uni.setNavigationBarTitle({
title: '首页',
})
uni.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: 'rgb(221, 190, 127)',
})
// #endif
},
}
</script>
<style lang="scss" scoped>
.qianggou{
padding:24rpx;
.banner{
height: 260rpx;
margin-bottom: 10rpx;
// margin: -200rpx auto 20rpx;
border-radius: 10rpx;
overflow: hidden;
.u-swiper{
background-color: #fff !important;
}
}
.qgList{
.qgItem{
height:286rpx;
width: 100%;
position: relative;
overflow: hidden;
margin-bottom:20rpx;
.bgPic{
width:100%;
}
.qgInfo{
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
height: 100%;
width: 100%;
text-align: center;
background: rgba(0,0,0,.6);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
z-index:99;
.conpany{
display: flex;
align-items: center;
color: rgb(193, 193, 193);;
.line{
height:4rpx;
width:100rpx;
background-color: rgb(193, 193, 193);;
}
.text{
font-size: 30rpx;
color: rgb(193, 193, 193);
margin:0 10rpx;
}
}
.time{
font-size: 38rpx;
color: #fff;
margin-top: 26px;
}
}
}
}
}
.gobottom{
color: rgba(165, 165, 165, 0.5);
font-size: 30rpx;
margin-top:20rpx;
text-align: center;
}
</style>

@ -104,18 +104,27 @@
{{activeIndex==1?'保存银行卡':activeIndex==2?'保存支付宝二维码':activeIndex==3?'保存微信二维码':''}}
</view>
<view style="color: #999;font-size: 30rpx;text-align: center;margin-top:30rpx;" @click="show=true">
请您仔细阅读并理解委托寄售服务协议
</view>
</view>
<u-popup :show="show" mode="bottom" @close="close" round="10" >
<view style="padding:24rpx;max-height:calc(60vh);overflow: auto;">
<u-parse :content="content" style="margin-top:45px;"></u-parse>
</view>
</u-popup>
<u-toast ref="uToast"></u-toast>
</view>
</template>
<script>
import {getToken} from '@/common/auth.js'
import {updateUserInfo,smsSend,getUserInfo,smsCheck} from '@/common/api.js'
import {updateUserInfo,smsSend,getUserInfo,smsCheck,privacyPolicy} from '@/common/api.js'
export default {
data() {
return {
show:false,
content:'',
activeIndex:1,
list4: [{
name: '银行卡',
@ -153,8 +162,17 @@
},
onLoad(option) {
this.getUserInfoHandle()
this.getText()
},
methods:{
close() {
this.show = false
},
getText(){
privacyPolicy({id:4}).then(res=>{
this.content = res.data.content
})
},
//
getUserInfoHandle(){
getUserInfo().then(res=>{

@ -0,0 +1,380 @@
<template>
<view class="page">
<view class="head-back">
<view class="back" @click="onBack">
<text></text>
</view>
<view class="title">
<text>我的订单</text>
</view>
<view class="more-icon">
<view class="icon-list">
<text class="iconfont icon-fadajing"></text>
</view>
</view>
</view>
<!-- 订单tab -->
<view class="order-tab">
<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
<text>全部</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
<text>待付款</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':OrderType==2}" @click="onOrderTab(2)">
<text>待发货</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':OrderType==3}" @click="onOrderTab(3)">
<text>待收货</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':OrderType==4}" @click="onOrderTab(4)">
<text>待评价</text>
<text class="line"></text>
</view>
</view>
<!-- 订单列表 -->
<view class="order-list">
<view class="list" v-for="(item,index) in 10" @click="onOrderList" :key="index">
<view class="title-status">
<view class="title">
<text>下单时间2020-12-12 18:56</text>
</view>
<view class="status">
<text>待付款</text>
<text class="iconfont icon-laji del"></text>
</view>
</view>
<view class="goods-list">
<view class="goods">
<view class="thumb">
<image :src="'/static/img/goods_thumb_0'+(index+1)+'.png'" mode=""></image>
</view>
<view class="item">
<view class="goods-name">
<text class="two-omit">薇妮(Viney)时尚包包女包牛皮单肩包女休闲百搭斜挎包韩版小方包潮(枪色)</text>
</view>
<view class="goods-price">
<text class="min"></text>
<text class="max">299</text>
<text class="min">.00</text>
</view>
</view>
</view>
</view>
<view class="status-btn">
<view class="btn">
<text>取消订单</text>
</view>
<view class="btn action" @click.stop="onEvaluate">
<text>评价</text>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
OrderType: 0,
};
},
onLoad(params) {
console.log(params,"000")
this.OrderType = params.type;
},
methods:{
/**
* 返回点击
*/
onBack(){
uni.navigateBack();
},
/**
* 订单tab点击
*/
onOrderTab(type){
this.OrderType = type;
// #ifdef H5
uni.redirectTo({
url: '/pages/MyOrderList/MyOrderList?type=' + type,
})
//#endif
},
/**
* 订单列表点击
*/
onOrderList(){
uni.navigateTo({
url: '/pages/OrderDetails/OrderDetails',
})
},
/**
* 评价点击
*/
onEvaluate(){
uni.navigateTo({
url: '/pages/MyEvaluatePush/MyEvaluatePush'
})
}
}
}
</script>
<style scoped lang="scss">
.page{
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: #f6f6f6;
}
/* 顶部返回 */
.head-back{
position: fixed;
left: 0;
top: 0;
z-index: 10;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100rpx;
background-color: #FFFFFF;
/* #ifdef APP-PLUS */
height: calc(50rpx + var(--status-bar-height));
padding-top: var(--status-bar-height);
/* #endif */
/* #ifdef MP */
height: 150rpx;
padding-top: 20rpx;
/* #endif */
.back{
position: absolute;
left: 0;
top: 0;
/* #ifdef APP-PLUS */
padding-top: var(--status-bar-height);
/* #endif */
/* #ifdef MP */
padding-top: 20rpx;
/* #endif */
display: flex;
align-items: center;
justify-content: center;
width: 100rpx;
height: 100%;
text{
width: 20rpx;
height: 20rpx;
border-left: 2rpx solid #555555;
border-bottom: 2rpx solid #555555;
transform: rotate(45deg);
}
}
.title{
display: flex;
align-items: center;
text{
font-size: 28rpx;
color: #222222;
}
}
.more-icon{
position: absolute;
right: 0;
top: 0;
/* #ifdef APP-PLUS */
right: 0rpx;
padding-top: var(--status-bar-height);
/* #endif */
/* #ifdef MP */
right: 220rpx;
padding-top: 20rpx;
/* #endif */
display: flex;
align-items: center;
height: 100%;
.icon-list{
display: flex;
align-items: center;
justify-content: center;
width: 80rpx;
height: 100%;
text{
font-size: 34rpx;
color: #222222;
}
}
}
}
/* 订单tab */
.order-tab{
position: fixed;
left: 0;
top: 100rpx;
/* #ifdef APP-PLUS */
top: calc(50rpx + var(--status-bar-height));
/* #endif */
z-index: 10;
display: flex;
align-items: center;
width: 100%;
height: 100rpx;
background-color: #FFFFFF;
.tab{
position: relative;
display: flex;
align-items: center;
justify-content: center;
width: 20%;
height: 80%;
text{
font-size: 26rpx;
color: #959595;
}
}
.action{
text{
color: #222222;
}
.line{
position: absolute;
left: 50%;
bottom: 0;
width: 60rpx;
height: 6rpx;
background: linear-gradient(to right,$base,#f6f6f6);
transform: translate(-50%,0);
}
}
}
/* 订单列表 */
.order-list{
width: 100%;
margin-top: 250rpx;
text-align: center;
/* #ifdef APP-PLUS */
margin-top: calc(170rpx + var(--status-bar-height));
/* #endif */
.list{
padding: 0 4%;
min-height: 400rpx;
background-color: #FFFFFF;
border-radius: 20rpx;
margin-bottom: 20rpx;
.title-status{
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 100rpx;
.title{
display: flex;
align-items: center;
text{
font-size: 26rpx;
font-weight: bold;
color: #222222;
}
}
.status{
display: flex;
align-items: center;
text{
font-size: 26rpx;
color: $base;
}
.del{
padding: 10rpx;
font-size: 34rpx;
color: #222222;
background-color: #f6f6f6;
border-radius: 100%;
margin-left: 20rpx;
}
}
}
.goods-list{
width: 100%;
.goods{
display: flex;
align-items: center;
width: 100%;
height: 200rpx;
.thumb{
display: flex;
align-items: center;
width: 30%;
height: 100%;
image{
width: 160rpx;
height: 160rpx;
border-radius: 10rpx;
}
}
.item{
display: flex;
align-items: center;
width: 70%;
height: 100%;
.goods-name{
width: 70%;
text{
font-size: 26rpx;
color: #555555;
}
}
.goods-price{
display: flex;
align-items: center;
justify-content: flex-end;
width: 30%;
text{
color: #222222;
}
.min{
font-size: 26rpx;
}
.max{
font-size: 34rpx;
}
}
}
}
}
.status-btn{
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
height: 100rpx;
.btn{
padding: 10rpx 30rpx;
border: 2rpx solid #EEEEEE;
border-radius: 100rpx;
margin-left: 20rpx;
text{
font-size: 26rpx;
color: #555555;
}
}
.action{
border: 2rpx solid $base;
text{
color: $base;
}
}
}
}
}
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

@ -19,7 +19,7 @@ $base: rgb(35, 96, 48); // 基础颜色
$assist-clor: #ff4e17; // 辅助颜色
$change-clor: rgb(35, 96, 48); // 渐变色
$floor-clor : #fafafa; // 底部颜色
$price-clor : #FF0000; // 价格颜色
$price-clor : #f0ad4e; // 价格颜色
$rgba-01 : rgba(233,59,61,0.1); // 基础色透明度0.1
$rgba-02 : rgba(233,59,61,0.2); // 基础色透明度0.2
$rgba-03 : rgba(233,59,61,0.3); // 基础色透明度0.3

Loading…
Cancel
Save