Skip to content

M
mallapp
Commit 51f0811e authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

修改样式

parent c4e1a309
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 23 deletions
components/goods/list.vue
View file @ 51f0811e
......@@ -9,6 +9,11 @@
:src="cx.cover_pic"
style="width: 100%; height: 100%;"
/>
<view class="shipping" v-if=" (cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0)">
{{cx.freeShippingName!=null && cx.freeShippingName !=''?cx.freeShippingName+':':''}}
{{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?'满'+cx.freeShippingFullMoneyPinkage+'元包邮':''}}
{{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?'满'+cx.freeShippingFullNumPinkage+'元包邮':''}}
</view>
</view>
<view class="good-name" v-if="setting.is_show_goods_name==1">{{ cx.name }}</view>
<view class="good-info">
......@@ -112,6 +117,33 @@ export default {
width: calc(50vw - 15px);
height: calc(50vw - 15px);
display: block;
position: relative;
}
.u-good-list .good .good-img .shipping{
width: 100%;
height: 30px;
font-size: 11px;
color: #FFFFFF;
padding: 0 10px;
background-image: linear-gradient(
to bottom ,
rgb(0, 0, 0, 0),
rgb(0, 0, 0, 1)
);
position: absolute;
left: 0;
bottom: 0;
line-height: 30px;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
line-clamp: 1;
-webkit-box-orient: vertical;
}
.u-good-list .good .good-name {
height: 37px;
......
components/goods/order-good-list.vue
View file @ 51f0811e
......@@ -26,6 +26,11 @@
<image :src="y.cover_pic" mode="aspectFill" class="image" />
<view class="goodinfo">
<view class="name">{{ y.name }}</view>
<view class="attr" style="margin-bottom: 5px;height: 20px;">
<span >{{ y.freeShippingDescription!=null ?y.freeShippingDescription:''}}</span>
<u-tag style='margin-left: 5px;' size="mini" text="满足" type="warning" v-if='y.freeShipping_Use==true'/>
<u-tag style='margin-left: 5px;' size="mini" text="不满足包邮" type="info" v-if='y.freeShipping_Use==false'/>
</view>
<view class="attr">已选择
<span v-for="(item,index) in y.attr_list" :key="index">{{ item.attr_group_name}}:{{ item.attr_name}}</span>
</view>
......
pages/cart/cart.vue
View file @ 51f0811e
......@@ -73,7 +73,7 @@
>
<Text
style="
font-size: 28rpx;
font-size: 24rpx;
width: 440rpx;
overflow: hidden;
white-space: nowrap;
......@@ -102,6 +102,29 @@
</Text>
</view>
<view
style="
width: 440rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>
<Text style="
color: #a0a09d;
font-size: 24rpx;
margin-right: 5rpx;
">
{{item.FreeShippingName !=null ?item.FreeShippingName+':':''}}
<text v-if="item.FreeShippingFullMoneyPinkage==0 && item.FreeShippingFullNumPinkage>0">{{item.FreeShippingFullNumPinkage}}件包邮</text>
<text v-if="item.FreeShippingFullMoneyPinkage>0 && item.FreeShippingFullNumPinkage==0">满{{item.FreeShippingFullMoneyPinkage}}元包邮</text>
</Text>
</view>
<view
style="
display: flex;
......
pages/goods/goods.vue
View file @ 51f0811e
......@@ -165,12 +165,17 @@
</view>
</view>
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'">
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'&& g.fullMoneyPinkage==0 && g.fullNumPinkage==0">
<view class="label">快递</view>
<view class="content">{{
g.express == "" ? "免运费" : "￥" + g.express
}}</view>
</view>
<view class="sku-box u-skeleton-rect" v-if="g.express>0 && g.freeShippingName!=null && g.freeShippingName !=''">
<view class="label" style="color: #000000;">{{g.freeShippingName}}:</view>
<view class="content" v-if="g.fullMoneyPinkage==0 && g.fullNumPinkage>0">{{g.fullNumPinkage}}件包邮</view>
<view class="content" v-if="g.fullMoneyPinkage>0 && g.fullNumPinkage==0">满{{g.fullMoneyPinkage}}元包邮</view>
</view>
<view
class="sku-box u-skeleton-rect"
style="margin-top: -10;"
......
pages/live/index.vue
View file @ 51f0811e
......@@ -23,8 +23,9 @@
<u-row gutter="20">
<u-col span="6" v-for="(cx, ci) in g" :key="ci" >
<view class="good" @click="clickHandler(cx)">
<view class="good-img" :style="{ 'background-image': 'url(' + (cx.cover_img ? cx.cover_img : '') + ')', backgroundSize: '100% 243px' }">
<!-- <view class="good-img" :style="{ 'background-image': 'url(' + (cx.cover_img ? cx.cover_img : '') + ')', backgroundSize: '100% 100%' }"> -->
<view class="good-img" :style="{ 'background-image': 'url(' + (cx.cover_img ? cx.cover_img : '') + ')', backgroundSize: 'cover' ,'background-repeat': 'no-repeat'}">
<!-- 播放按钮 -->
<view class="livebtn" v-if='cx.live_status==104 || cx.live_status==105|| cx.live_status==106 '></view>
<u-icon name="play-circle-o" v-if='cx.live_status==105' color="#fff" size="100" style='position: absolute;left: 50%;top:50%;margin-left: -50rpx;margin-top: -50rpx;'></u-icon>
......@@ -198,6 +199,7 @@ export default {
height: 243px;
display: block;
position: relative;
}
.liveStyle .u-good-list .good .good-name {
overflow: hidden;
......
pages/mySupplier/index/index.vue
View file @ 51f0811e
......@@ -90,7 +90,7 @@
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<text :style="{color:mainColor}">{{mySupplierC.SupplierCount!=null ?mySupplierC.SupplierCount:0}}</text>
<text style="color: #A5A3AB;margin-right: 5px;">元</text>
<text style="color: #A5A3AB;margin-right: 5px;"></text>
<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
</view>
</view>
......@@ -101,7 +101,7 @@
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<text :style="{color:mainColor}">{{mySupplierC.GoodsCount!=null ?mySupplierC.GoodsCount:0}}</text>
<text style="color: #A5A3AB;margin-right: 5px;">元</text>
<text style="color: #A5A3AB;margin-right: 5px;"></text>
<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
</view>
</view>
......@@ -112,7 +112,7 @@
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<text :style="{color:mainColor}">{{mySupplierC.TotalOrderIntroduction!=null ?mySupplierC.TotalOrderIntroduction:0}}</text>
<text style="color: #A5A3AB;margin-right: 5px;">人</text>
<text style="color: #A5A3AB;margin-right: 5px;">元</text>
<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
</view>
</view>
......
pages/mySupplier/myBill.vue
View file @ 51f0811e
......@@ -23,7 +23,7 @@
<view class="box_b" >
<view class="box_b_t">
<text>{{item.Periods}}</text>
<text :style="{color:item.BillState==1?'#FF4048':'#111111','font-size':'16px'}">{{item.BillState==2?'+':''}}{{item.Money}}元</text>
<text :style="{color:item.BillState==2?'#FF4048':'#111111','font-size':'16px'}">{{item.Money}}元</text>
</view>
<view class="box_b_b">
<text>{{item.SupplierName}}</text>
......
pages/mySupplier/supplierOrder.vue
View file @ 51f0811e
......@@ -221,10 +221,47 @@
dateconfirm(val){
if(this.datetype==1){
this.msg.StartTime = val.year +'-'+val.month +'-'+val.day
let StartTime = val.year +'-'+val.month +'-'+val.day;
let str =StartTime.replace(/-/g,'/');
let date = new Date(str).getTime()
let date2=0
if(this.msg.EndTime!=''){
let str2 = this.msg.EndTime.replace(/-/g,'/');
date2 = new Date(str2).getTime();
}
if(date2>date){
this.msg.StartTime = StartTime
}else{
this.msg.StartTime = StartTime
this.msg.EndTime = ''
}
}else if(this.datetype==2){
this.msg.EndTime = val.year +'-'+val.month +'-'+val.day
let EndTime = val.year +'-'+val.month +'-'+val.day;
let str =EndTime.replace(/-/g,'/');
let date = new Date(str).getTime()
let date2=0
if(this.msg.StartTime!=''){
let str2 = this.msg.StartTime.replace(/-/g,'/');
date2 = new Date(str2).getTime();
}
if(date2>date){
uni.showToast({
title: '不能小于开始时间',
icon: "none"
});
}else{
this.msg.EndTime = EndTime
}
}
},
......
pages/order-submit/order-submit.vue
View file @ 51f0811e
......@@ -51,7 +51,14 @@
<template v-else>
<view class="goodboxmore">
<view class="good-list">
<view style="white-space: nowrap"><image v-for="(y, yi) in x.goods_list" :key="yi" :src="y.cover_pic" mode="aspectFill" class="item" /></view>
<view style="white-space: nowrap;display: flex;flex-direction: row;">
<view v-for="(y, yi) in x.goods_list" :key="yi" class="item" style="position: relative;">
<image :src="y.cover_pic" mode="aspectFill" class="item" />
<view v-if='y.address_disabled' style="width: 100%;height: 20px;position: absolute;left: 0;bottom: 0;line-height: 20px;font-size: 10px;color: #ff9900;background: #fdf6ec;">
<text style="margin-left: 3px;">不在配送范围</text>
</view>
</view>
</view>
</view>
<view class="infos">
<view class="text">共{{ x.goods_list.length }}件</view>
......@@ -688,7 +695,7 @@ button[disabled]{
color: #999;
overflow: hidden;
text-overflow: ellipsis;
margin-bottom: 12px;
margin-bottom: 10px;
}
.ordersubmit .goodbox .goodinfo .price {
display: flex;
......
pages/share/cash/cash.vue
View file @ 51f0811e
......@@ -62,9 +62,13 @@
<View class='getapply' :style="{background:mainColor}" @click='getapply'>
<View class='getapply' :style="{background:mainColor}" v-if='prohibit==false' @click='getapply'>
<Text>提交申请</Text>
</View>
<View class='getapply' style="background:#999999" v-if='prohibit==true' >
<Text>提交申请</Text>
</View>
</view>
<template>
<u-popup v-model="show"
......@@ -146,7 +150,8 @@
AccountNumber:'',
BankName:'',
}
},
prohibit:false,
}
},
onLoad(option){
......@@ -282,24 +287,31 @@
that.msg.Fee = Number(that.msg.Fee);
that.msg.RemitMoney = that.msg.AppliedMoney - that.msg.Fee; //最终提现要减去 手续费
uni.showNavigationBarLoading();
uni.showLoading({
title:'加载中',
icon:'none'
})
that.prohibit = true;//禁止接口没回来时候的再次操作
that.request2(
{
url: '/api/AppletUser/SetUserDistrbutorWithdrawDeposit',
data: that.msg
},
(res) => {
uni.hideNavigationBarLoading()
uni.showToast({
title: res.message,
icon: "none"
});
that.prohibit = false
uni.hideLoading()
uni.showToast({
title: res.message,
icon: "none"
});
that.init()
uni.navigateTo({
url: '/pages/cash-detail/cash-detail'
});
}
},
(err)=>{
that.prohibit = false
}
);
}
})
......
plugin/api.js
View file @ 51f0811e
......@@ -60,7 +60,8 @@ export default {
uni.showToast({
title: res.data.message,
icon: "none",
});
});
typeof failed == "function" && failed(res.data);
}
else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment