先货后款,样式修改

This commit is contained in:
THK3121 2023-07-15 17:27:06 +08:00
parent cc5ff53177
commit 5ce6dd0e9e
18 changed files with 401 additions and 268 deletions

View File

@ -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!=9 && evaluate !==2 && orderData.refund_status" @click.stop="refund(item)">申请退款</view> <view class="btn-item" v-if="item.is_reply == 0 && evaluate !==2 && item.is_refund < 1" @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>

View File

@ -3,7 +3,7 @@
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.0.18", "versionName" : "1.0.18",
"versionCode" : 141, "versionCode" : 142,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

View File

@ -83,41 +83,43 @@
<text>订单监控</text> <text>订单监控</text>
</view> </view>
<view class="footer_bon" v-for="(item,index) in OrderList" :key="index"> <view class="footer_bon" v-for="(item,index) in OrderList" :key="index">
<view class="bon_top" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)"> <view class="" v-for="(val, key) in item.orderProduct">
<view class="public_img"> <view class="bon_top" :key="key" @click="toDetail(item)">
<image class="public_img" :src="val.cart_info.product.image" mode=""></image> <view class="public_img">
</view> <image class="public_img" :src="val.cart_info.product.image" mode=""></image>
<view> </view>
<view class="text_top"> <view>
<view class="text"> <view class="text_top">
{{ val.cart_info.product.store_name }} <view class="text">
{{ val.cart_info.product.store_name }}
</view>
<view class="monry">
{{ val.total_price }}
</view>
</view> </view>
<view class="monry"> <view class="text_order">
{{ val.total_price }} 订单号: {{ item.order_sn }}
</view> </view>
</view> </view>
<view class="text_order">
订单号: {{ item.order_sn }}
</view>
</view> </view>
</view> <view class="bon_bon" :key="key" @click="toDetail(item)">
<view class="bon_bon" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)"> <view class="order">
<view class="order"> 采购数量
采购数量 <view class="txt">
<view class="txt"> {{ 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 }} </view>
</view> </view>
</view> <view class="order">
<view class="order"> 库存数量
库存数量 <view class="txt">
<view class="txt"> {{ val.product_num - val.sales_volume }}
{{ val.product_num - val.sales_volume }} </view>
</view> </view>
</view> </view>
</view> </view>
@ -434,7 +436,7 @@
} }
.public_footer { .public_footer {
width: 90%; width: 90vw;
margin: auto; margin: auto;
.footer_top { .footer_top {
@ -474,14 +476,14 @@
margin: 3px 0 3px 3px; margin: 3px 0 3px 3px;
.text { .text {
width: 180px; width: 140px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.monry { .monry {
margin-left: 20px; margin-left: 10px;
color: #F84221; color: #F84221;
} }
} }

View File

@ -11,41 +11,43 @@
</view> </view>
<view class="pubilc_footer"> <view class="pubilc_footer">
<view class="footer_bon" v-for="(item,index) in list" :key="index"> <view class="footer_bon" v-for="(item,index) in list" :key="index">
<view class="bon_top" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)"> <view class="" v-for="(val, key) in item.orderProduct">
<view class="public_img"> <view class="bon_top" :key="key" @click="toDetail(item)">
<image class="public_img" :src="val.cart_info.product.image" mode=""></image> <view class="public_img">
</view> <image class="public_img" :src="val.cart_info.product.image" mode=""></image>
<view> </view>
<view class="text_top"> <view>
<view class="text"> <view class="text_top">
{{ val.cart_info.product.store_name }} <view class="text">
{{ val.cart_info.product.store_name }}
</view>
<view class="monry">
{{ val.total_price }}
</view>
</view> </view>
<view class="monry"> <view class="text_order">
{{ val.total_price }} 订单号: {{ item.order_sn }}
</view> </view>
</view> </view>
<view class="text_order">
订单号: {{ item.order_sn }}
</view>
</view> </view>
</view> <view class="bon_bon" :key="key" @click="toDetail(item)">
<view class="bon_bon" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)"> <view class="order">
<view class="order"> 采购数量
采购数量 <view class="txt">
<view class="txt"> {{ 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 }} </view>
</view> </view>
</view> <view class="order">
<view class="order"> 库存数量
库存数量 <view class="txt">
<view class="txt"> {{ val.product_num - val.sales_volume }}
{{ val.product_num - val.sales_volume }} </view>
</view> </view>
</view> </view>
</view> </view>

View File

@ -148,10 +148,10 @@
<view style="height:120upx;"></view> <view style="height:120upx;"></view>
<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'"> <view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
<view class="more"></view> <view class="more"></view>
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(item.group_order_id,1)"> <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(order_id,1)">
同意 同意
</view> </view>
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(item.group_order_id,2)"> <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(order_id,2)">
拒绝 拒绝
</view> </view>
<view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0"> <view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0">
@ -191,7 +191,8 @@
setAdminOrderRemark, setAdminOrderRemark,
setOfflinePay, setOfflinePay,
setOrderRefund, setOrderRefund,
orderCancellation orderCancellation,
postconfirm
} from "@/api/admin"; } from "@/api/admin";
import { isMoney } from '@/utils/validate.js' import { isMoney } from '@/utils/validate.js'
import { HTTP_REQUEST_URL } from '@/config/app'; import { HTTP_REQUEST_URL } from '@/config/app';
@ -231,12 +232,12 @@
}, },
onLoad: function(option) { onLoad: function(option) {
let self = this let self = this
this.order_id = option.id self.order_id = option.id
this.mer_id = option.mer_id self.mer_id = option.mer_id
this.goname = option.goname self.goname = option.goname
this.getIndex(); self.getIndex();
// #ifdef H5 // #ifdef H5
this.$nextTick(function() { self.$nextTick(function() {
var clipboard = new ClipboardJS('.copy-data'); var clipboard = new ClipboardJS('.copy-data');
// var copybtn = document.getElementsByClassName("copy-data"); // var copybtn = document.getElementsByClassName("copy-data");
// var clipboard = new Clipboard(copybtn); // var clipboard = new Clipboard(copybtn);
@ -263,17 +264,16 @@
} }
if(number == 1){ if(number == 1){
this.$nextTick(()=>{ this.$nextTick(()=>{
this.where.status = 2; uni.navigateTo({
delete this.where.is_verify; url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}`
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.mer_id}`
}) })
} }
postconfirm(this.merId,data).then(res=>{ postconfirm(this.mer_id,data).then(res=>{
console.log(res);
}) })
}, },
more: function() { more: function() {

View File

@ -142,10 +142,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">{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}}) <span class="money">0.00</span> (邮费 ¥{{ item.pay_postage}})
</view> </view>
<view class="public-total" v-if="item.pay_type == 8 "> <view class="public-total" v-if="item.pay_type == 8 ">
1件商品结算周期到期后付款{{ item.pay_price }} {{item.total_num}}件商品结算周期到期后付款{{ item.pay_price }}
</view> </view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="more"> <view class="more">
@ -317,6 +317,7 @@
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list); that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
console.log(that.list);
}, },
err => { err => {
that.$util.Tips({ title: err }); that.$util.Tips({ title: err });

View File

@ -67,7 +67,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<button class="btn" @click="addshopcart">确定</button> <button class="btn" @click="addshopcart">确定</button>
</view> </view>
</u-popup> </u-popup>
</view> </view>
@ -270,36 +270,21 @@
}, },
// //
addCart(item, index) { addCart(item, index) {
this.goods[index].cart_num = this.goods[index].cart_num + 1
this.goods.numAdd = true
this.goodsLite = item
this.goodsindexL = index
},
subCart(item, index){
if( this.goods[index].cart_num == 0){
return
}else{
this.goods[index].cart_num = this.goods[index].cart_num - 1
this.goods.numAdd = true
this.goodsLite = item
this.goodsindexL = index
}
},
addshopcart() {
console.log(this.goodsLite);
console.log(this.goodsindexL);
let that = this let that = this
that.goods[index].cart_num = that.goods[index].cart_num + 1
that.goods.numAdd = true
that.goodsLite = item
that.goodsindexL = index
let q = { let q = {
is_new: 0, is_new: 0,
product_id: that.goodsLite.product_id, product_id: that.goodsLite.product_id,
cart_num: that.goods[that.goodsindexL].cart_num, cart_num: that.goods[that.goodsindexL].cart_num,
product_attr_unique: that.goodsLite.unique, product_attr_unique: that.goodsLite.unique,
// source: this.source, // source: this.source,
product_type: 98, product_type: 98,
spread_id: '' spread_id: ''
}; };
postCartAdd(q).then(res => { postCartAdd(q).then(res => {
this.show = false
that.$util.Tips({ that.$util.Tips({
title: "添加购物车成功", title: "添加购物车成功",
}); });
@ -310,6 +295,65 @@
title: res title: res
}); });
}); });
},
subCart(item, index) {
let that = this
if (that.goods[index].cart_num == 0) {
return
} else {
that.goods[index].cart_num = that.goods[index].cart_num - 1
that.goods.numAdd = true
that.goodsLite = item
that.goodsindexL = index
let q = {
is_new: 0,
product_id: that.goodsLite.product_id,
cart_num: that.goods[that.goodsindexL].cart_num,
product_attr_unique: that.goodsLite.unique,
// source: this.source,
product_type: 98,
spread_id: ''
};
postCartAdd(q).then(res => {
that.$util.Tips({
title: "添加购物车成功",
});
})
.catch(res => {
this.show = false
return that.$util.Tips({
title: res
});
});
}
},
addshopcart() {
console.log(this.goodsLite);
console.log(this.goodsindexL);
this.show = false
// let that = this
// let q = {
// is_new: 0,
// product_id: that.goodsLite.product_id,
// cart_num: that.goods[that.goodsindexL].cart_num,
// product_attr_unique: that.goodsLite.unique,
// // source: this.source,
// product_type: 98,
// spread_id: ''
// };
// postCartAdd(q).then(res => {
// this.show = false
// that.$util.Tips({
// title: "",
// });
// })
// .catch(res => {
// this.show = false
// return that.$util.Tips({
// title: res
// });
// });
} }
}, },
onReachBottom() { onReachBottom() {
@ -487,7 +531,7 @@
} }
.scroll-Y { .scroll-Y {
height: 50vh; height: 50vh;
width: 90%; width: 90%;
margin: auto; margin: auto;
@ -510,12 +554,15 @@
} }
.text { .text {
width: 300px; width: 200px;
height: 60px; height: 60px;
float: left; float: left;
view { view {
height: 30px; height: 30px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text { text {
color: #F84221; color: #F84221;
@ -552,19 +599,21 @@
color: #FFFFFF; color: #FFFFFF;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
} }
.on { .on {
background-color: #e3e3e3; background-color: #e3e3e3;
color: #dedede; color: #dedede;
} }
} }
} }
.btn{
width: 100%; .btn {
height: 50px; width: 100%;
background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); height: 50px;
border-radius: 24px 24px 24px 24px; background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
line-height: 50px; border-radius: 24px 24px 24px 24px;
color: white; line-height: 50px;
} color: white;
}
</style> </style>

View File

@ -569,7 +569,7 @@
}) })
if (selectValue.length > 0) { if (selectValue.length > 0) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=${this.type_id}` url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=12`
}); });
} else { } else {
return this.$util.Tips({ return this.$util.Tips({

View File

@ -313,8 +313,7 @@
</block> </block>
<block v-if="orderInfo.status == 3"> <block v-if="orderInfo.status == 3">
<view class='bnt cancel' @click="delOrder">删除订单</view> <view class='bnt cancel' @click="delOrder">删除订单</view>
<view class="bnt cancel" @click="allRefund" <view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0">批量退款</view>
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
<view class='bnt b-color' @click="goOrderConfirm" <view class='bnt b-color' @click="goOrderConfirm"
v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10"> v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
再次购买</view> 再次购买</view>

View File

@ -13,7 +13,7 @@
<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>
<view class='data' v-else> <view class='data' v-else>
<view class='state'>已逾期{{this.be_overdue}}{{this.be_overhours}},请尽快前往完成支付!</view> <view class='state'>已逾期{{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>
@ -195,8 +195,8 @@
<image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image> <image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image>
</view> </view>
<view class="conters" v-if="this.pay_type == 8 && orderInfo.interest !== null"> <view class="conters" v-if="this.pay_type == 8 && orderInfo.interest !== null">
结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}} 结算周期:{{orderInfo.interest.settle_cycle}}
日利率:{{orderInfo.orderList[0].merchant.interest_rate}}% 日利率:{{orderInfo.interest.rate}}%
</view> </view>
</view> </view>
@ -216,10 +216,14 @@
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image> <image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
<image src="@/static/images/yuqi.png" mode="widthFix"></image> <image src="@/static/images/yuqi.png" mode="widthFix"></image>
</view> </view>
<view class="textp"> <view class="textp" v-if="!this.be_overday">
<span>下单时实付0确认收货后将开始计算结算周期结算周期内按照订单金额付款如未在结算周期内付款平台将在{{this.be_overdue}}天后计息</span> <span>下单时实付0确认收货后将开始计算结算周期结算周期内按照订单金额付款如未在结算周期内付款平台将在{{this.be_overdue}}天后计息</span>
<button class="shouhuobtn" @click="close">知道了</button> <button class="shouhuobtn" @click="close">知道了</button>
</view> </view>
<view class="textp" v-else>
<span>下单时实付0确认收货后将开始计算结算周期结算周期内按照订单金额付款现已逾期{{this.be_overdue}},请及时完成支付</span>
<button class="shouhuobtn" @click="close">知道了</button>
</view>
</view> </view>
</u-popup> </u-popup>
</view> </view>
@ -1153,7 +1157,7 @@
.warp { .warp {
position: absolute; position: absolute;
top: 30vh; top: 29vh;
left: 60px; left: 60px;
width: 70%; width: 70%;
image{ image{

View File

@ -135,15 +135,14 @@
this.order_type = options.order_type; this.order_type = options.order_type;
this.status = options.status || 0; this.status = options.status || 0;
this.msg = options.msg || ''; this.msg = options.msg || '';
if(options.product_type){
this.product_type=options.product_type this.product_type=options.product_type
}
if (this.isLogin) { if (this.isLogin) {
this.refreshData(); this.refreshData();
} else { } else {
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true this.isShowAuth = true
} }
console.log(options);
}, },
methods: { methods: {
refreshData(){ refreshData(){
@ -204,14 +203,15 @@
* 去订单详情页面 * 去订单详情页面
*/ */
goOrderDetails: function(e) { goOrderDetails: function(e) {
console.log(this.product_type);
let that = this; let that = this;
if (this.product_type == 98) { if (this.product_type == 98) {
uni.redirectTo({ uni.navigateTo({
url: `/pages/users/order_list/index?status=1&product_type=${this.product_type}` url: `/pages/users/order_list/index?status=1&product_type=${this.product_type}`
}) })
} else { } else {
uni.redirectTo({ uni.navigateTo({
url: '/pages/users/order_list/index?status=1' url: '/pages/users/order_list/index?status=1&product_type=0'
}) })
} }

View File

@ -122,15 +122,18 @@
<h4 v-if="this.on_line==1">线下入库</h4> <h4 v-if="this.on_line==1">线下入库</h4>
<h4 v-else>线上入库</h4> <h4 v-else>线上入库</h4>
<view class="guige"> <view class="guige">
<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange"> <scroll-view scroll-y="true" class="scroll_y">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1" <view>
@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku"> <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
</u-radio> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
</u-radio-group> @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
</u-radio>
</u-radio-group>
</view>
</scroll-view>
</view> </view>
<view class="shuru" v-if="this.on_line == 1"> <view class="shuru" v-if="this.on_line == 1">
数量: <input type="number" v-model="data.number" placeholder="请输入" > 数量: <input type="number" v-model="data.number" placeholder="请输入">
</view> </view>
<view class="btn"> <view class="btn">
<button class="btn_l" @click="close()">取消</button> <button class="btn_l" @click="close()">取消</button>
@ -239,14 +242,19 @@
this.checkboxList1 = rowId this.checkboxList1 = rowId
console.log(this.on_line); console.log(this.on_line);
if (this.checkboxList1.length == 1 && action == 0) { if (this.checkboxList1.length == 1 && action == 0) {
// this.show = true
navigateTo(1, '/pages/users/online_warehousing/index', { navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id, mer_id: this.mer_id,
product_id: this.data.product_id, product_id: this.data.product_id,
unique: this.data.unique, unique: this.data.unique,
}); });
} else if (this.checkboxList1.length == 1 && action == 1) {
this.show = true
this.data.product_id = this.checkboxList1[0].product_id
this.data.unique = this.checkboxList1[0].unique
console.log(this.data);
} else { } else {
this.show = true this.show = true
console.log(this.data);
} }
if (action == 2) { if (action == 2) {
uni.navigateTo({ uni.navigateTo({
@ -283,12 +291,20 @@
} }
if (this.on_line == 0) { if (this.on_line == 0) {
console.log('12'); console.log('12');
navigateTo(1, '/pages/users/online_warehousing/index', { if (!this.data.product_id) {
mer_id: this.mer_id, this.show = false
product_id: this.data.product_id, this.$util.Tips({
unique: this.data.unique, title: '请选择规格'
})
} else {
navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id,
product_id: this.data.product_id,
unique: this.data.unique,
});
}
});
} }
}, },
@ -336,10 +352,10 @@
productLstApi(mer_id, that.where).then( productLstApi(mer_id, that.where).then(
res => { res => {
that.loading = false; that.loading = false;
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.productList.push.apply(that.productList, res.data.list); that.productList.push.apply(that.productList, res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
}, },
error => { error => {
that.$util.Tips({ that.$util.Tips({
@ -747,6 +763,10 @@
.guige { .guige {
margin: 10px 0 10px 20px; margin: 10px 0 10px 20px;
.scroll_y {
max-height: 150px;
}
} }
.guiges { .guiges {

View File

@ -5,7 +5,7 @@
<view class="search"> <view class="search">
<view class="search-content acea-row row-middle"> <view class="search-content acea-row row-middle">
<text class="iconfont icon-sousuo"></text> <text class="iconfont icon-sousuo"></text>
<input v-model="where.keyword" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input" <input v-model="where.store_name" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
@confirm="handleSearch" /> @confirm="handleSearch" />
</view> </view>
</view> </view>
@ -20,7 +20,7 @@
<view class='list' v-else> <view class='list' v-else>
<block> <block>
<view class='item' v-for="(item,index) in shopList" :key="index"> <view class='item' v-for="(item,index) in shopList" :key="index">
<view v-for="(items,index) in item.orderProduct" :key="index"> <view >
<view class='title acea-row row-between-wrapper'> <view class='title acea-row row-between-wrapper'>
<view class="acea-row row-middle left-wrapper"> <view class="acea-row row-middle left-wrapper">
{{item.merchant.mer_name}} {{item.merchant.mer_name}}
@ -29,18 +29,30 @@
<view> <view>
<view> <view>
<block> <block>
<view class='item-info acea-row row-between row-top'> <view class="_order">
订单号: {{item.order_sn}}
</view>
<view class='item-info acea-row row-between row-top' v-for="(items,indexs) in item.orderProduct" :key="indexs">
<view class='pictrue'> <view class='pictrue'>
<image :src="item.orderProduct[index].cart_info.product.image"> <image :src="items.cart_info.product.image">
</image> </image>
</view> </view>
<view class='text acea-row row-between'> <view class='text'>
<view class='name line2'> <view class='_left'>
{{items.cart_info.product.store_name}} {{items.cart_info.product.store_name}}
<view class="">
{{items.cart_info.productAttr.sku}}
</view>
</view> </view>
<view class='name line2'>{{items.cart_info.product.price}}</view> <view class="_right">
<view class='name line2'>x {{items.product_num}}</view> <view class='name'>{{items.cart_info.productAttr.price}}</view>
<view class='name'>x {{items.product_num}}</view>
</view>
<!-- <view class="totalfooter">
<view class='bnt b-color' v-if="items.is_imported == 0 && item.orderProduct.length > 1"
@click="importshop(items.order_id,items.product_id,items.product_sku)">
立即导入</view>
</view> -->
</view> </view>
</view> </view>
</block> </block>
@ -48,14 +60,16 @@
</view> </view>
<view class='totalPrice'> <view class='totalPrice'>
共1件商品总金额 共1件商品总金额
<text class='money'>{{items.product_price}}</text> <text class='money'>{{item.pay_price}}</text>
</view>
<view class="totalfooter">
<view class='bnt b-color' v-if="item.orderProduct[index]"
@click="importshop(item.order_id,item.orderProduct[index].product_id,item.orderProduct[index].cart_info.productAttr.product_sku)">
立即导入</view>
</view>
<view>
{{item.orderProduct[0].is_imported}}
</view> </view>
<view class="totalfooter">
<view class='bnt b-color' v-if="items.is_imported == 0"
@click="importshop(items.order_id,items.product_id,items.product_sku)">
立即导入</view>
</view>
</view> </view>
</view> </view>
</block> </block>
@ -65,7 +79,7 @@
<view class="popen"> <view class="popen">
<h4>{{title}}</h4> <h4>{{title}}</h4>
<view class="shuru"> <view class="shuru">
点击确定商品管理 点击确定返回商品管理
</view> </view>
<view class="btn"> <view class="btn">
<button class="btn_l" @click="closeasd()">取消</button> <button class="btn_l" @click="closeasd()">取消</button>
@ -100,7 +114,7 @@
limit: 10, limit: 10,
status: 20, status: 20,
product_type: 98, product_type: 98,
keyword: '', store_name: '',
}, },
data: { data: {
product_id: '', product_id: '',
@ -123,10 +137,15 @@
}, },
methods: { methods: {
handleSearch() { handleSearch() {
this.loaded = false; let that = this
this.where.page = 1; that.loaded = false;
this.shopList = []; that.where.page = 1;
this.getList(); that.shopList = [];
getOrderList(that.where, that.mer_id).then(res => {
console.log(res);
that.shopList = res.data.list
console.log(that.shopList);
})
}, },
getList: function() { getList: function() {
if (this.loading || this.loaded) return; if (this.loading || this.loaded) return;
@ -152,9 +171,9 @@
}, },
close() { close() {
this.show = false this.show = false
}, },
closeasd:function(){ closeasd: function() {
this.show = false this.show = false
getOrderList(this.where, this.mer_id).then(res => { getOrderList(this.where, this.mer_id).then(res => {
console.log(res); console.log(res);
@ -235,7 +254,8 @@
height: 84rpx; height: 84rpx;
padding: 0 30rpx; padding: 0 30rpx;
border-bottom: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC;
font-size: 28rpx; font-size: 32rpx;
font-weight: 700;
color: #282828; color: #282828;
.left-wrapper { .left-wrapper {
@ -284,11 +304,21 @@
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
margin-top: 6rpx; margin-top: 6rpx;
position: relative; display: flex;
justify-content: space-between;
._left {
width: 300rpx;
color: #282828;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.name { .name {
width: 320rpx; width: 100rpx;
color: #282828; color: #282828;
} }
.money { .money {
@ -296,10 +326,8 @@
float: right; float: right;
} }
} }
} }
.event_name { .event_name {
@ -318,26 +346,33 @@
margin-top: 10rpx; margin-top: 10rpx;
} }
._order {
font-size: 28rpx;
margin: 5px 0 0 15px;
}
.totalPrice { .totalPrice {
font-size: 26rpx; font-size: 26rpx;
color: #282828; color: #282828;
text-align: right; text-align: right;
margin: 27rpx 0 0 30rpx; margin: 27rpx 0 0 30rpx;
padding: 0 30rpx 30rpx 0; padding: 0 30rpx 30rpx 0;
.money { .money {
font-size: 34rpx; font-size: 34rpx;
font-weight: bold; font-weight: bold;
color: rgb(233, 51, 35); color: rgb(233, 51, 35);
} }
} }
.totalfooter{
.totalfooter {
width: 100%; width: 100%;
height: 50px; height: 50px;
position: relative; position: relative;
border-top: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC;
.bnt { .bnt {
position: absolute; position: absolute;
right: 10px; right: 10px;
@ -346,15 +381,16 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 50rpx; border-radius: 50rpx;
font-size: 27rpx; font-size: 27rpx;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
color: white; color: white;
margin-left: 70%; margin-left: 70%;
margin-top: 5px; margin-top: 5px;
} }
} }
.bottom { .bottom {
height: 107rpx; height: 107rpx;
padding: 0 30rpx; padding: 0 30rpx;

View File

@ -1071,7 +1071,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,10 +1202,8 @@
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 goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +'&product_type=' + that.product_type,
.product_type, goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&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) {
@ -1272,7 +1270,7 @@
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=支付成功'; '&msg=支付成功'+'&product_type=' + that.product_type;
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
@ -1283,7 +1281,7 @@
}, },
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=取消支付'; '&msg=取消支付'+'&product_type=' + that.product_type;
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付', title: '取消支付',
}, { }, {
@ -1293,7 +1291,7 @@
}, },
complete: () => { complete: () => {
let url = '/pages/order_pay_status/index?order_id=' + orderId + let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付'; '&msg=取消支付'+'&product_type=' + that.product_type;
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付', title: '取消支付',
}, { }, {
@ -1329,7 +1327,7 @@
}, },
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=取消支付' orderId + '&msg=取消支付'+'&product_type=' + that.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
@ -1353,7 +1351,7 @@
case 'h5': case 'h5':
let host = window.location.protocol + "//" + window.location.host; let host = window.location.protocol + "//" + window.location.host;
let url = let url =
`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}` `${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}`
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}`
@ -1378,7 +1376,7 @@
}, },
fail: (e) => { fail: (e) => {
let pages = '/pages/order_pay_status/index?order_id=' + let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=支付失败' orderId + '&msg=支付失败'+'&product_type=' + that.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '支付失败' title: '支付失败'
}, { }, {
@ -1389,7 +1387,7 @@
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=取消支付' orderId + '&msg=取消支付'+'&product_type=' + that.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
@ -1402,7 +1400,7 @@
// #endif // #endif
default: default:
let pages = '/pages/order_pay_status/index?order_id=' + let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付' orderId + '&msg=取消支付'+'&product_type=' + that.product_type
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {

View File

@ -66,8 +66,11 @@
<view class="acea-row row-middle left-wrapper"> <view class="acea-row row-middle left-wrapper">
{{item.group_order_sn}} {{item.group_order_sn}}
</view> </view>
<view class='t-color'> <view class='t-color' v-if="item.pay_type == 3 || item.pay_type == 1">
{{item.pay_type == 3 ? "待付款" : "去结算" }} 待付款
</view>
<view class='t-color' v-if="item.pay_type == 8">
待结算
</view> </view>
</view> </view>
<view v-for="(order,j) in item.orderList" :key="order.order_id+j"> <view v-for="(order,j) in item.orderList" :key="order.order_id+j">
@ -127,41 +130,42 @@
<view class='name line2'>{{goods.cart_info.product.store_name}} <view class='name line2'>{{goods.cart_info.product.store_name}}
</view> </view>
<view class="name line2">{{goods.cart_info.productAttr.sku}}
</view>
<view class='money' v-if="item.pay_type == 8"> <view class='money' v-if="item.pay_type == 8">
<view v-if="goods.cart_info.activeSku"> <view>
{{goods.cart_info.activeSku.active_price}}</view> {{goods.cart_info.productAttr.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> <view>
先货后款 实付:0.00 先货后款 实付:0.00
</view> </view>
</view> </view>
<view class="totalPrice" v-if="item.pay_type == 8"> <view class="totalPrice" v-if="item.pay_type == 8">
{{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-else class='money'> <view v-else class='money'>
<view>{{goods.cart_info.productAttr.price}}</view> <view>{{goods.cart_info.productAttr.price}}</view>
<view>x{{goods.product_num}}</view> <view>x{{goods.product_num}}</view>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
</view> </view>
<view class='totalPrice' v-if="item.pay_type !== 8"> <view class='totalPrice' style="margin-right: 15px;" v-if="item.pay_type !== 8">
{{item.total_num || 0}}件商品总金额 {{item.total_num || 0}}件商品总金额
<text class='money p-color'>{{item.pay_price}}</text> <text class='money p-color'>{{item.pay_price}}</text>
</view> </view>
<!-- <view class='totalPrice' v-else>先货后款 实付款: <view class='totalPrice' style="margin-right: 15px;" v-else>先货后款 实付款:
<text class='money p-color'>0.00</text> <text class='money p-color'>0.00</text>
</view> </view>
<view class="totalPrice" 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}}
</view> --> </view>
<view class='bottom acea-row row-right row-middle' v-if=" item.pay_type == 3 "> <view class='bottom acea-row row-right row-middle' 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>
@ -246,6 +250,9 @@
<view class='name line2'> <view class='name line2'>
<text>{{goods.cart_info.product.store_name}}</text> <text>{{goods.cart_info.product.store_name}}</text>
</view> </view>
<view class='name line2'>
<text>{{goods.cart_info.productAttr.sku}}</text>
</view>
<view style="margin-top: 10rpx;" class="t-color"> <view style="margin-top: 10rpx;" class="t-color">
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}} {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
</view> </view>
@ -267,33 +274,27 @@
<view v-if="goods.cart_info.activeSku"> <view v-if="goods.cart_info.activeSku">
{{goods.cart_info.activeSku.active_price}}</view> {{goods.cart_info.activeSku.active_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>
先货后款 实付:0.00
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
{{item.total_num || 0}}件商品结算周期到期后付款{{goods.cart_info.productAttr.price || item.interest.total_amount}}
</view>
</view> </view>
<view class='money' v-else> <view class='money' v-else>
<view>{{goods.cart_info.productAttr.price}}</view> <view>{{goods.cart_info.productAttr.price}}</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>
先货后款 实付:0.00
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
{{item.total_num || 0}}件商品结算周期到期后付款{{goods.cart_info.productAttr.price || item.interest.total_amount}}
</view>
</view>
</view> </view>
</view> </view>
<view class='totalPrice' v-if="item.activity_type == 2">{{item.orderNum || 0}}件商品总金额 <view class='totalPrice' v-if="item.activity_type == 2">
{{item.orderNum || 0}}件商品总金额
<text class='money p-color'>{{item.presell_price}}</text> <text class='money p-color'>{{item.presell_price}}</text>
</view> </view>
<view class="money" style="margin-left: 206px;" v-if="item.pay_type == 8 ">
<view>
先货后款 实付:0.00
</view>
</view>
</view>
<view class="totalPrice" style="margin-right: 18px;" v-if="item.pay_type == 8">
{{item.total_num || 0}}件商品结算周期到期后付款{{item.total_price || item.interest.total_amount}}
</view>
</view> </view>
<view class='bottom acea-row row-right row-middle'> <view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@ -377,7 +378,7 @@
orderPay, orderPay,
groupOrderList, groupOrderList,
orderTake, orderTake,
applyInvoiceApi applyInvoiceApi,
} from '@/api/order.js'; } from '@/api/order.js';
import { import {
getUserInfo getUserInfo
@ -868,7 +869,8 @@
}, },
close() { close() {
this.show = false this.show = false
} },
}, },
onReachBottom: function() { onReachBottom: function() {
this.getOrderList(); this.getOrderList();
@ -910,6 +912,8 @@
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.my-order .header .picTxt .pictrue { .my-order .header .picTxt .pictrue {
@ -1011,7 +1015,7 @@
font-size: 26rpx; font-size: 26rpx;
color: #282828; color: #282828;
text-align: right; text-align: right;
padding-left: 20px; padding-left: 28px;
} }
} }
@ -1057,7 +1061,7 @@
color: #282828; color: #282828;
text-align: right; text-align: right;
margin: 27rpx 0 0 -30rpx; margin: 27rpx 0 0 -30rpx;
padding: -1px 30rpx 30rpx 0; padding: -1px 20rpx 30rpx 0;
} }
.my-order .list .item .totalPrice .money { .my-order .list .item .totalPrice .money {
@ -1240,4 +1244,7 @@
color: #999999; color: #999999;
} }
} }
.line2{
-webkit-line-clamp: 1;
}
</style> </style>

View File

@ -43,7 +43,7 @@
</view> </view>
<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.interest.total_price}}</view>
</view> </view>
</view> </view>
@ -146,6 +146,7 @@
}; };
}, },
onLoad(options) { onLoad(options) {
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); console.log(this.product_type);
@ -160,10 +161,8 @@
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;
if (that.payType == 'weixin') {
that.payType = that.from
}
console.log(that.payType); console.log(that.payType);
}, },
getUserInfo() { getUserInfo() {
@ -200,7 +199,6 @@
}) })
}, 1000) }, 1000)
} }
console.log(res);
}).catch(err=>{ }).catch(err=>{
uni.showToast({ uni.showToast({
title: err.message title: err.message

View File

@ -1,6 +1,6 @@
<template> <template>
<view class="conent"> <view class="conent">
<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=0`)"> <view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
<image class="con_img" src="@/static/images/bg1.png" mode=""></image> <image class="con_img" src="@/static/images/bg1.png" mode=""></image>
<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image> <image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
<view class="con_text"> <view class="con_text">

View File

@ -11,11 +11,26 @@
</view> </view>
</view> </view>
<view class="recom"> <view class="recom">
<view class="recom_bnt"> <view class="recom_bnt">
<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)"> <rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)">
{{this.recomname}} {{this.recomname}}
</rudon-rowMenuDotDotDot> </rudon-rowMenuDotDotDot>
</view> </view>
</view>
</view>
<view class="type_switch">
<view class="recom_mend">
推荐
</view>
</view>
<view class="type_switch">
<view class="recom_mend">
调货
</view>
</view>
<view class="type_switch">
<view class="recom_mend">
打折专区
</view> </view>
</view> </view>
<view class="list"> <view class="list">
@ -28,29 +43,14 @@
啊沙发上 啊沙发上
</view> </view>
<view class="item_name"> <view class="item_name">
<image src="../user_grade/images/suozi.png" mode="widthFix"></image> <image class="avater" src="../user_grade/images/suozi.png" mode="widthFix"></image>
<view class="item_name_text"> <view class="item_name_text">
啊沙发上 啊沙发上
</view> </view>
</view> </view>
</view> </view>
<view class="item">
<image class="shopimg" src="@/static/images/2-002.png" mode="widthFix"></image>
<view class="item_text">
<span>调货</span> 夹岸数范德萨范德萨衣服上的
</view>
<view class="item_prices">
啊沙发上
</view>
<view class="item_name">
<image src="../user_grade/images/suozi.png" mode="widthFix"></image>
<view class="item_name_text">
啊沙发上
</view>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -80,7 +80,7 @@
text: '打折专区' text: '打折专区'
} }
], ],
recomname:'', recomname: '',
} }
}, },
methods: { methods: {
@ -89,7 +89,7 @@
// //
if (action === '') { if (action === '') {
this.recomname = this.options[0].text this.recomname = this.options[0].text
}else{ } else {
this.recomname = this.options[action].text this.recomname = this.options[action].text
} }
}, },
@ -101,13 +101,10 @@
.header { .header {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: flex-start;
align-items: center; align-items: center;
.top-header { .top-header {
// position: fixed;
// top: 0;
// left: 0;
z-index: 9999; z-index: 9999;
width: 80%; width: 80%;
background-color: #fff; background-color: #fff;
@ -150,28 +147,34 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.recom_bnt{
.recom_bnt {}
}
} }
} }
.list{
.list {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-around; justify-content: flex-start;
align-items: center; align-items: center;
.item{ flex-wrap: wrap;
width: 40%;
.shopimg{ .item {
width: 45%;
margin: 9px;
.shopimg {
width: 100%; width: 100%;
} }
.item_text{
.item_text {
width: 100%; width: 100%;
padding: 15px 10px 15px 10px; padding: 15px 10px 15px 10px;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
span{
span {
height: 20px; height: 20px;
padding: 3px; padding: 3px;
margin: 2px; margin: 2px;
@ -180,12 +183,26 @@
color: white; color: white;
} }
} }
.item_prices{
.item_prices {
font-size: 18px; font-size: 18px;
color:#F84221; color: #F84221;
padding-left: 15px; padding-left: 15px;
border-bottom: 1px solid #707070; border-bottom: 1px solid #707070;
} }
.item_name {
width: 100%;
height: 50px;
display: flex;
align-items: center;
.avater {
margin: 5px;
width: 40px;
height: 40px;
}
}
} }
} }
</style> </style>