Skip to content

M
mallapp
Commit 6009139c authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

样式的修改

parent fadcb43a
Show whitespace changes
Inline Side-by-side
Showing with 709 additions and 681 deletions
pages/address/AddAddress.vue
View file @ 6009139c
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
export default { export default {
data(){ data(){
return{ return{
pageTitle:'收货地址',
contentHeight:0, contentHeight:0,
mainColor:'', mainColor:'',
msg:{ msg:{
...@@ -75,7 +76,9 @@ ...@@ -75,7 +76,9 @@
created(){ created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
uni.setNavigationBarTitle({
title: this.pageTitle,
});
}, },
onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数 onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
if(option.u!=undefined){ if(option.u!=undefined){
......
pages/address/address.vue
View file @ 6009139c
...@@ -70,6 +70,7 @@ import auth from "../../components/auth/index.vue"; ...@@ -70,6 +70,7 @@ import auth from "../../components/auth/index.vue";
export default { export default {
data() { data() {
return { return {
pageTitle:'收货地址',
loading: true, loading: true,
list: [], list: [],
showAuth: false, showAuth: false,
...@@ -88,8 +89,22 @@ export default { ...@@ -88,8 +89,22 @@ export default {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad() { onLoad() {
console.log(wx.getStorageSync("basedata"));
this.u = wx.getStorageSync("userinfo"); this.u = wx.getStorageSync("userinfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -190,9 +205,7 @@ export default { ...@@ -190,9 +205,7 @@ export default {
}); });
} }
}, },
mounted() {
}
}; };
</script> </script>
......
pages/cart/cart.vue
View file @ 6009139c
<template> <template>
<div class="cartStyle" v-if="!isloading"> <div class="cartStyle" v-if="!isloading" :style="{'height':contentHeight}">
<view <view style="
style="
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 15rpx; padding: 0 15rpx;
" ">
>
<Text class="grid-text">商品库存有限，请尽快下单哦</Text> <Text class="grid-text">商品库存有限，请尽快下单哦</Text>
<Text @click="edit" v-if="editType == false" class="grid-text_r" <Text @click="edit" v-if="editType == false" class="grid-text_r">编辑</Text>
>编辑</Text <Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
>
<Text @click="edit" v-if="editType == true" class="grid-text_r"
>完成</Text
>
</view> </view>
<view <view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>
style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;" <u-empty v-if="list.length == 0" text="购物车还是空的哦" mode="car"></u-empty>
></view>
<u-empty <view v-if="list.length > 0" style="
v-if="list.length == 0" height: calc(100vh - 60px);
text="购物车还是空的哦" width: calc(100vw);
mode="car" overflow: hidden;
></u-empty> padding-top: 10px;
">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
<view <view class="cartList" :style="{ 'margin-bottom': listbottom }" v-if="list.length > 0" v-for="(c, i) in list" :key="i">
class="cartList" <view style="padding: 0 12px 12px 12px; border-bottom: 1rpx solid #f5f5f5;width: 100%;">
:style="{ 'margin-bottom': listbottom }"
v-if="list.length > 0"
v-for="(c, i) in list"
:key="i"
>
<view
style="padding: 0 12px 12px 12px; border-bottom: 1rpx solid #f5f5f5;width: 100%;"
>
<u-checkbox-group @change="mch_SelectAll(c.checked,i)"> <u-checkbox-group @change="mch_SelectAll(c.checked,i)">
<u-checkbox v-model="c.checked" shape="circle" :active-color="mc" <u-checkbox v-model="c.checked" shape="circle" :active-color="mc">{{c.name}}</u-checkbox>
>{{c.name}}</u-checkbox
>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view <view class="cartList_item" v-for="(item, index) in c.goods_list" :key="index" :name="item.name">
class="cartList_item" <u-checkbox-group v-if='item.new_status==0 || editType==true' @change="clickcheckbox(item.checked, item.attrs.price, index,i)">
v-for="(item, index) in c.goods_list" <u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox>
:key="index"
:name="item.name"
>
<u-checkbox-group
v-if='item.new_status==0 || editType==true'
@change="clickcheckbox(item.checked, item.attrs.price, index,i)"
>
<u-checkbox
v-model="item.checked"
shape="circle"
:active-color="mc"
></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<Text v-if='item.new_status!=0 && editType==false' style='color: #a0a09d;width: 22px;'>失效</Text> <Text v-if='item.new_status!=0 && editType==false' style='color: #a0a09d;width: 22px;'>失效</Text>
<image <image :src="item.attrs.pic_url ? item.attrs.pic_url : item.goods.cover_pic" mode="aspectFill" style="
:src="item.attrs.pic_url ? item.attrs.pic_url : item.goods.cover_pic"
mode="aspectFill"
style="
width: 150rpx; width: 150rpx;
height: 150rpx; height: 150rpx;
margin-left: 30rpx; margin-left: 30rpx;
border-radius: 5px; border-radius: 5px;
" " />
/> <view style="
<view
style="
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
width: 460rpx; width: 460rpx;
height: 150rpx; height: 150rpx;
margin-left: 20rpx; margin-left: 20rpx;
" ">
> <Text style="
<Text
style="
font-size: 28rpx; font-size: 28rpx;
width: 460rpx; width: 460rpx;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
" ">{{ item.goods.name }}</Text>
>{{ item.goods.name }}</Text <view style="
>
<view
style="
width: 460rpx; width: 460rpx;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
" ">
>
<view v-for="(attr, inde2x) in item.attrs.attr" :key="inde2x"> <view v-for="(attr, inde2x) in item.attrs.attr" :key="inde2x">
<Text <Text style="color: #a0a09d; font-size: 24rpx; margin-right: 5rpx;">{{ attr.attr_group_name }}:{{ attr.attr_name }}</Text>
style="color: #a0a09d; font-size: 24rpx; margin-right: 5rpx;"
>{{ attr.attr_group_name }}:{{ attr.attr_name }}</Text
>
</view> </view>
</view> </view>
<view <view style="
style="
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
" ">
> <Text style="font-size: 30rpx;" :style="{ color: mc }">￥<Text style="40rpx">{{ item.attrs.price }}</Text></Text>
<Text style="font-size: 30rpx;" :style="{ color: mc }"
>￥<Text style="40rpx">{{ item.attrs.price }}</Text></Text
>
<!-- <u-number-box :value="item.num" :min="1" :max='100' :input-width="100" @change="valChange(i,index, item.num,item.attrs.price,$event)"></u-number-box> --> <!-- <u-number-box :value="item.num" :min="1" :max='100' :input-width="100" @change="valChange(i,index, item.num,item.attrs.price,$event)"></u-number-box> -->
<view class="item_input"> <view class="item_input">
<view <view class="item_input_l" :style="{
class="item_input_l"
:style="{
color: item.num == 1 ? '#E2E2E2' : '#9B9B9B', color: item.num == 1 ? '#E2E2E2' : '#9B9B9B',
}" }"
@click="reduce(i,index, item.attrs.price)" @click="reduce(i,index, item.attrs.price)">-</view>
>-</view <input type="number" class="item_input_c" :value="item.num" @blur='inputblur(i,index, item.num,item.attrs.price,$event)'
> @input='onKeyInput(i,index, item.num,item.attrs.price,$event)' />
<input type="number" class="item_input_c" <view class="item_input_r" style="color: #9b9b9b;" @click="plus(i,index, item.attrs.price)">+</view>
:value="item.num" </view>
@blur='inputblur(i,index, item.num,item.attrs.price,$event)'
@input='onKeyInput(i,index, item.num,item.attrs.price,$event)'/>
<view
class="item_input_r"
style="color: #9b9b9b;"
@click="plus(i,index, item.attrs.price)"
>+</view
>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
</view> </view>
<view class="box_bottom" :style="{ 'margin-bottom': bottommargin }">
<view class="box_bottom" >
<div style="margin-left: 30rpx;"> <div style="margin-left: 30rpx;">
<u-checkbox-group @change="SelectAll"> <u-checkbox-group @change="SelectAll">
<u-checkbox v-model="allchecked" shape="circle" active-color="red" <u-checkbox v-model="allchecked" shape="circle" :active-color="mc">全选</u-checkbox>
>全选</u-checkbox
>
</u-checkbox-group> </u-checkbox-group>
<Text <Text style="font-size: 30rpx;" :style="{ color: mc }" v-if="editType == false">￥{{ TotalPrice }}</Text>
style="font-size: 30rpx;"
:style="{ color: mc }"
v-if="editType == false"
>￥{{ TotalPrice }}</Text
>
</div> </div>
<div class="bottom_btn" v-if="!editType"> <div class="bottom_btn" v-if="!editType">
<u-button <u-button size="80" :ripple="true" shape="circle" @click="settlement" :custom-style="{
size="80"
:ripple="true"
shape="circle"
@click="settlement"
:custom-style="{
backgroundColor: mc, backgroundColor: mc,
height: '80rpx', height: '80rpx',
color: '#FFF', color: '#FFF',
fontSize: '14px', fontSize: '14px',
}" }">去结算({{ checkCount }})
>去结算({{ checkCount }})
</u-button> </u-button>
</div> </div>
<u-button <u-button v-if="editType" size="80" :ripple="true" shape="circle" @click="delete_btn" :custom-style="{
v-if="editType"
size="80"
:ripple="true"
shape="circle"
@click="delete_btn"
:custom-style="{
backgroundColor: secondary, backgroundColor: secondary,
height: '80rpx', height: '80rpx',
color: '#FFF', color: '#FFF',
fontSize: '14px', fontSize: '14px',
marginRight: '12px', marginRight: '12px',
}" }">删除
>删除
</u-button> </u-button>
</view> </view>
...@@ -193,8 +118,8 @@ ...@@ -193,8 +118,8 @@
</div> </div>
</template> </template>
<script> <script>
import tabbars from "@/components/tabbar/index"; import tabbars from "@/components/tabbar/index";
export default { export default {
data() { data() {
return { return {
isloading: true, isloading: true,
...@@ -224,46 +149,43 @@ export default { ...@@ -224,46 +149,43 @@ export default {
this.navHeight = this.$navHeight - 2; this.navHeight = this.$navHeight - 2;
this.mc = this.$uiConfig.mainColor; this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
this.cstyle = uni.getStorageSync("basedata") this.cstyle = uni.getStorageSync("basedata") ?
? uni.getStorageSync("basedata").cat_style uni.getStorageSync("basedata").cat_style : [];
: [];
if (this.cstyle.cat_style == "4") { if (this.cstyle.cat_style == "4") {
// this.searchStyle.p = {
// position: "fixed",
// top: this.navHeight,
// width: "100%",
// left: "0",
// };
} }
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let c = this.$uiConfig.is_bang ? 80 : 52; let c = this.$uiConfig.is_bang ? 80 : 52;
this.bottommargin = c - 2 + "px"; this.bottommargin = c - 2 + "px";
this.listbottom = c - 2 + 50 + "px"; this.listbottom = c + 44 + "px";
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c-42) + 'px';
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") let pages = wx.getStorageSync("basedata") ?
? wx.getStorageSync("basedata").bar_title wx.getStorageSync("basedata").bar_title : [];
: [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.init(); this.init();
}, },
methods: { methods: {
goHome() { goHome() {
uni.redirectTo({ url: "/pages/index/main" }); uni.redirectTo({
url: "/pages/index/main"
});
}, },
init() { init() {
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
let h = this.apiheader(); let h = this.apiheader();
this.request( this.request({
{
url: "", url: "",
header: h, header: h,
data: { data: {
...@@ -278,7 +200,7 @@ export default { ...@@ -278,7 +200,7 @@ export default {
let list = res.data.list; let list = res.data.list;
list.forEach((x) => { list.forEach((x) => {
x.checked = false; x.checked = false;
x.goods_list.forEach((j)=>{ x.goods_list.forEach((j) => {
j.checked = false; j.checked = false;
}) })
}); });
...@@ -290,17 +212,17 @@ export default { ...@@ -290,17 +212,17 @@ export default {
); );
}, },
clickcheckbox(checked, price, index,i) { clickcheckbox(checked, price, index, i) {
if (checked == true) { if (checked == true) {
this.checkCount += 1; this.checkCount += 1;
this.TotalPrice += price * this.list[i].goods_list[index].num; this.TotalPrice += price * this.list[i].goods_list[index].num;
let goods_list_all = true; //判断该商场是否全选 let goods_list_all = true; //判断该商场是否全选
this.list[i].goods_list.forEach((x) => { this.list[i].goods_list.forEach((x) => {
if(this.editType == false){//编辑的时候不判断 if (this.editType == false) { //编辑的时候不判断
if (x.checked == false&& x.new_status==0) { if (x.checked == false && x.new_status == 0) {
goods_list_all = false; goods_list_all = false;
} }
}else{ } else {
if (x.checked == false) { if (x.checked == false) {
goods_list_all = false; goods_list_all = false;
} }
...@@ -311,9 +233,9 @@ export default { ...@@ -311,9 +233,9 @@ export default {
this.list[i].checked = true; this.list[i].checked = true;
} }
let list_all = true; //判断所有商场是否全选 let list_all = true; //判断所有商场是否全选
this.list.forEach((x)=>{ this.list.forEach((x) => {
if(x.checked == false){ if (x.checked == false) {
list_all=false list_all = false
} }
}) })
if (list_all == true) { if (list_all == true) {
...@@ -340,7 +262,7 @@ export default { ...@@ -340,7 +262,7 @@ export default {
this.list[i].checked = false; this.list[i].checked = false;
} }
if (this.editType == true) { if (this.editType == true) {
this.cart_id_list.forEach((x,j) => { this.cart_id_list.forEach((x, j) => {
if (x.id == this.list[i].goods_list[index].id) { if (x.id == this.list[i].goods_list[index].id) {
this.cart_id_list.splice(j, 1); this.cart_id_list.splice(j, 1);
} }
...@@ -348,21 +270,21 @@ export default { ...@@ -348,21 +270,21 @@ export default {
} }
} }
}, },
mch_SelectAll(checked,i){ mch_SelectAll(checked, i) {
if(checked == true){ if (checked == true) {
let add_cartlist=[]; let add_cartlist = [];
let new_statusnum=0 let new_statusnum = 0
this.list[i].goods_list.forEach((x)=>{ this.list[i].goods_list.forEach((x) => {
if(x.new_status==0){ if (x.new_status == 0) {
this.TotalPrice +=x.attrs.price*x.num; this.TotalPrice += x.attrs.price * x.num;
x.checked = true; x.checked = true;
new_statusnum++ new_statusnum++
} }
//编辑时候的商城全选 //编辑时候的商城全选
if(this.editType ==true){ if (this.editType == true) {
if(this.cart_id_list.length>0){ if (this.cart_id_list.length > 0) {
this.cart_id_list.forEach((z) => { this.cart_id_list.forEach((z) => {
if (x.id != z.id) { if (x.id != z.id) {
let obj = { let obj = {
...@@ -372,7 +294,7 @@ export default { ...@@ -372,7 +294,7 @@ export default {
add_cartlist.push(obj); add_cartlist.push(obj);
} }
}); });
}else{ } else {
let obj = { let obj = {
mch_id: 0, mch_id: 0,
id: x.id, id: x.id,
...@@ -382,36 +304,36 @@ export default { ...@@ -382,36 +304,36 @@ export default {
} }
}) })
this.cart_id_list= this.cart_id_list.concat(add_cartlist) this.cart_id_list = this.cart_id_list.concat(add_cartlist)
let list_all = true; //判断所有商场是否全选 let list_all = true; //判断所有商场是否全选
this.list.forEach((x)=>{ this.list.forEach((x) => {
if(x.checked == false){ if (x.checked == false) {
list_all=false list_all = false
} }
}) })
if (list_all == true) { if (list_all == true) {
this.allchecked = true; this.allchecked = true;
} }
this.checkCount+=new_statusnum; this.checkCount += new_statusnum;
}else{ } else {
let new_statusnum=0 let new_statusnum = 0
this.list[i].goods_list.forEach((x)=>{ this.list[i].goods_list.forEach((x) => {
if(x.new_status==0){ if (x.new_status == 0) {
x.checked = false; x.checked = false;
this.TotalPrice -=x.attrs.price*x.num; this.TotalPrice -= x.attrs.price * x.num;
new_statusnum++ new_statusnum++
} }
//编辑时候的商城全选 //编辑时候的商城全选
this.cart_id_list.forEach((z,m) => { this.cart_id_list.forEach((z, m) => {
if (x.id == z.id) { if (x.id == z.id) {
this.cart_id_list.splice(m,1) this.cart_id_list.splice(m, 1)
} }
}); });
}) })
this.allchecked = false; this.allchecked = false;
this.checkCount-=new_statusnum; this.checkCount -= new_statusnum;
} }
}, },
SelectAll() { SelectAll() {
...@@ -422,11 +344,11 @@ export default { ...@@ -422,11 +344,11 @@ export default {
this.cart_id_list = []; this.cart_id_list = [];
list.forEach((x) => { list.forEach((x) => {
x.checked = true; x.checked = true;
x.goods_list.forEach((j)=>{ x.goods_list.forEach((j) => {
if(j.new_status==0){ if (j.new_status == 0) {
j.checked = true; j.checked = true;
this.checkCount++; this.checkCount++;
this.TotalPrice+=j.attrs.price*j.num this.TotalPrice += j.attrs.price * j.num
} }
//编辑的时候 //编辑的时候
...@@ -446,34 +368,34 @@ export default { ...@@ -446,34 +368,34 @@ export default {
this.cart_id_list = []; this.cart_id_list = [];
list.forEach((x) => { list.forEach((x) => {
x.checked = false; x.checked = false;
x.goods_list.forEach((j)=>{ x.goods_list.forEach((j) => {
j.checked = false; j.checked = false;
}) })
}); });
} }
}, },
inputblur(i,index,num,price,e){ inputblur(i, index, num, price, e) {
let value= Number(e.target.value) let value = Number(e.target.value)
if(value==0){ if (value == 0) {
this.list[i].goods_list[index].num=1; this.list[i].goods_list[index].num = 1;
this.TotalPrice += price * 1; this.TotalPrice += price * 1;
} }
}, },
onKeyInput(i,index,num,price,e){//输入的数量 onKeyInput(i, index, num, price, e) { //输入的数量
let value= Number(e.target.value) let value = Number(e.target.value)
this.list[i].goods_list[index].num = value; this.list[i].goods_list[index].num = value;
if(this.list[i].goods_list[index].checked == true){ if (this.list[i].goods_list[index].checked == true) {
if(value>num){ if (value > num) {
this.TotalPrice += price * (value -num); this.TotalPrice += price * (value - num);
}else if(value<num){ } else if (value < num) {
this.TotalPrice -= price * (num - value); this.TotalPrice -= price * (num - value);
} }
} }
}, },
reduce(i,index, price) { reduce(i, index, price) {
//减 //减
if (this.list[i].goods_list[index].num > 1) { if (this.list[i].goods_list[index].num > 1) {
this.list[i].goods_list[index].num -= 1; this.list[i].goods_list[index].num -= 1;
...@@ -482,9 +404,9 @@ export default { ...@@ -482,9 +404,9 @@ export default {
} }
} }
}, },
plus(i,index, price) { plus(i, index, price) {
//加 //加
this.list[i].goods_list[index].num +=1; this.list[i].goods_list[index].num += 1;
if (this.list[i].goods_list[index].checked == true) { if (this.list[i].goods_list[index].checked == true) {
this.TotalPrice += price * 1; this.TotalPrice += price * 1;
} }
...@@ -498,7 +420,7 @@ export default { ...@@ -498,7 +420,7 @@ export default {
let list = this.list; let list = this.list;
list.forEach((x) => { list.forEach((x) => {
x.checked = false; x.checked = false;
x.goods_list.forEach((j)=>{ x.goods_list.forEach((j) => {
j.checked = false j.checked = false
}) })
}); });
...@@ -510,8 +432,7 @@ export default { ...@@ -510,8 +432,7 @@ export default {
let h = this.apiheader(); let h = this.apiheader();
h["content-type"] = "application/x-www-form-urlencoded"; h["content-type"] = "application/x-www-form-urlencoded";
this.request( this.request({
{
url: "", url: "",
method: "POST", method: "POST",
header: h, header: h,
...@@ -561,8 +482,7 @@ export default { ...@@ -561,8 +482,7 @@ export default {
} }
}); });
uni.navigateTo({ uni.navigateTo({
url: url: "/pages/order-submit/order-submit?goods=" +
"/pages/order-submit/order-submit?goods=" +
encodeURIComponent(JSON.stringify(goods)) encodeURIComponent(JSON.stringify(goods))
}); });
} else { } else {
...@@ -575,43 +495,49 @@ export default { ...@@ -575,43 +495,49 @@ export default {
} }
}, },
}, },
}; };
</script> </script>
<style> <style>
.cartStyle { .cartStyle {
height: 100%; height: 100%;
position: relative; position: relative;
font-family: "oswald"; font-family: "oswald";
} }
.cartStyle .u-checkbox__label {
.cartStyle .u-checkbox__label {
margin-left: 12px; margin-left: 12px;
} }
.cartStyle .grid-text {
.cartStyle .grid-text {
font-size: 24rpx; font-size: 24rpx;
margin-top: 4rpx; margin-top: 4rpx;
color: #939393; color: #939393;
} }
.cartStyle .grid-text_r {
.cartStyle .grid-text_r {
margin-top: 4rpx; margin-top: 4rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.cartStyle .cartList {
.cartStyle .cartList {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow-y: hidden; overflow-y: hidden;
} }
.cartStyle .cartList .cartList_item {
.cartStyle .cartList .cartList_item {
width: 100%; width: 100%;
padding: 40rpx 30rpx; padding: 40rpx 30rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
border-bottom: 1rpx solid #f5f5f5; border-bottom: 1rpx solid #f5f5f5;
} }
.cartList .cartList_item .item_input {
.cartList .cartList_item .item_input {
width: 200rpx; width: 200rpx;
height: 60rpx; height: 60rpx;
background: #f7f7f7; background: #f7f7f7;
...@@ -619,26 +545,29 @@ export default { ...@@ -619,26 +545,29 @@ export default {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.cartList .item_input .item_input_l,
.item_input_r { .cartList .item_input .item_input_l,
.item_input_r {
width: 50rpx; width: 50rpx;
height: 60rpx; height: 60rpx;
font-size: 28rpx; font-size: 28rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.cartStyle .item_input .item_input_c {
.cartStyle .item_input .item_input_c {
text-align: center; text-align: center;
width: 50rpx; width: 50rpx;
height: 60rpx; height: 60rpx;
font-size: 20rpx; font-size: 20rpx;
} }
.cartStyle .box_bottom {
.cartStyle .box_bottom {
width: 100%; width: 100%;
height: 50px; height: 50px;
position: fixed; position: absolute;
background: #fff; background: #fff;
left: 0; left: 0;
bottom: 0; bottom: 0;
...@@ -648,15 +577,17 @@ export default { ...@@ -648,15 +577,17 @@ export default {
justify-content: space-between; justify-content: space-between;
border-top: 1rpx solid #f5f5f5; border-top: 1rpx solid #f5f5f5;
z-index: 999; z-index: 999;
} }
.cartStyle .bottom_btn {
.cartStyle .bottom_btn {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 250rpx; width: 250rpx;
height: 50px; height: 50px;
} }
.cartStyle .Deletestyle {
.cartStyle .Deletestyle {
margin-right: 40rpx; margin-right: 40rpx;
} }
</style> </style>
pages/favorite/favorite.vue
View file @ 6009139c
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
export default { export default {
data() { data() {
return { return {
pageTitle:'我的收藏',
loading: true, loading: true,
contentHeight:0, contentHeight:0,
showAuth:false, showAuth:false,
...@@ -84,6 +85,21 @@ ...@@ -84,6 +85,21 @@
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.init() this.init()
}, },
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad(){ onLoad(){
this.u = wx.getStorageSync("userinfo"); this.u = wx.getStorageSync("userinfo");
if (!this.u) { if (!this.u) {
...@@ -185,6 +201,7 @@ ...@@ -185,6 +201,7 @@
margin-bottom: 3px; margin-bottom: 3px;
font-size: 13px; font-size: 13px;
margin: 7px 10px; margin: 7px 10px;
height: 36px;
} }
.favoriteStyle .u-good-list .good .good-info { .favoriteStyle .u-good-list .good .good-info {
display: flex; display: flex;
......
pages/foot/index/index.vue
View file @ 6009139c
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</view> </view>
<view v-if="g.length > 0" <view v-if="g.length > 0"
style=" style="
height: calc(100vh - 40px); height: calc(100vh - 50px);
width: calc(100vw); width: calc(100vw);
overflow: hidden; overflow: hidden;
padding-top: 10px; padding-top: 10px;
...@@ -60,14 +60,15 @@ ...@@ -60,14 +60,15 @@
</view> </view>
</view> </view>
</scroll-view>
<u-divider <u-divider
contentPosition="center" contentPosition="center"
v-if="isover" v-if="isover"
:margin-top="20" :margin-top="20"
:margin-bottom="20" :margin-bottom="20"
>没有更多商品了</u-divider> bg-color='#f3f4f6'
>没有更多足迹了</u-divider>
</scroll-view>
</view> </view>
<!-- <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth> --> <!-- <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth> -->
<view class="loading" v-show="loading"> <view class="loading" v-show="loading">
...@@ -128,6 +129,7 @@ ...@@ -128,6 +129,7 @@
export default { export default {
data() { data() {
return { return {
pageTitle:"我的足迹",
isloading:true, isloading:true,
loading:false, loading:false,
loading2:false, loading2:false,
...@@ -165,6 +167,21 @@ ...@@ -165,6 +167,21 @@
this.fun_date(0) this.fun_date(0)
}, },
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad(){ onLoad(){
this.u = wx.getStorageSync("userinfo"); this.u = wx.getStorageSync("userinfo");
if (!this.u) { if (!this.u) {
......
pages/order/index/index.vue
View file @ 6009139c
...@@ -63,7 +63,9 @@ ...@@ -63,7 +63,9 @@
</view> </view>
</view> </view>
</template> </template>
<Text style='font-size: 32rpx;text-align: right;width: 100%;'>￥{{item.total_price}}</Text> <Text style='font-size: 32rpx;text-align: right;width: 100%;'>合计：￥{{item.total_price}}
<Text v-if='item.express_price!=0' style='font-size: 20rpx;color: #A0A09D;'>(含运费 ￥{{item.express_price}})</Text>
</Text>
<!-- TODO 样式结构修改--> <!-- TODO 样式结构修改-->
<view class="handle"> <view class="handle">
...@@ -77,7 +79,13 @@ ...@@ -77,7 +79,13 @@
</view> </view>
</view> </view>
</view> </view>
<u-divider
contentPosition="center"
v-if="isover"
:margin-top="20"
:margin-bottom="20"
bg-color='#f3f4f6'
>没有更多订单了</u-divider>
</scroll-view> </scroll-view>
...@@ -110,12 +118,13 @@ ...@@ -110,12 +118,13 @@
}, },
data() { data() {
return { return {
pageTitle:'我的订单',
current: 0, current: 0,
list: [{name: '全部'}, {name: '待付款'},{name: '待发货'},{name: '待收货'},{name: '待评价'},], list: [{name: '全部'}, {name: '待付款'},{name: '待发货'},{name: '待收货'},{name: '待评价'},],
mainColor: "", mainColor: "",
contentHeight:0, contentHeight:0,
page:1, page:1,
page_count:0, page_count:1,
g:[], g:[],
loading:false, loading:false,
showModal:false, showModal:false,
...@@ -123,6 +132,7 @@ ...@@ -123,6 +132,7 @@
index:0, index:0,
goodData:[], goodData:[],
showGoodList:false, showGoodList:false,
isover:false
}; };
}, },
created(){ created(){
...@@ -130,6 +140,21 @@ ...@@ -130,6 +140,21 @@
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数 onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
this.current = option.status; this.current = option.status;
this.loading = true; this.loading = true;
...@@ -144,9 +169,8 @@ ...@@ -144,9 +169,8 @@
this.init() this.init()
}, },
init(){ init(){
this.isover = false;
let h=this.apiheader() let h=this.apiheader()
this.request( this.request(
{ {
url: "", url: "",
...@@ -160,11 +184,25 @@ ...@@ -160,11 +184,25 @@
}, },
res => { res => {
this.loading = false; this.loading = false;
this.g = res.data.list; this.g = this.g.concat(res.data.list);
this.page_count = res.data.pagination.page_count;
if (this.page_count == 1) {
this.isover = true;
}
} }
); );
}, },
lower(e) {
if (this.page < this.page_count) {
this.page++;
this.init();
} else {
this.isover = true;
}
},
cancel(e,index){ cancel(e,index){
this.showModal=true; this.showModal=true;
this.index=index; this.index=index;
......
pages/user-center/user-center.vue
View file @ 6009139c
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
:name="item.name" @click="goUrl(item.link_url)"> :name="item.name" @click="goUrl(item.link_url)">
<image :src='item.icon_url' style="width: 66rpx;height: 60rpx;"></image> <image :src='item.icon_url' style="width: 66rpx;height: 60rpx;"></image>
<Text style='margin-top: 10rpx;'>{{item.name}}</Text> <Text style='margin-top: 10rpx;'>{{item.name}}</Text>
<!-- <view class='badge'>{{item.}}</view> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -157,7 +158,6 @@ ...@@ -157,7 +158,6 @@
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title ? wx.getStorageSync("basedata").bar_title
: []; : [];
...@@ -167,6 +167,9 @@ ...@@ -167,6 +167,9 @@
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.userinfo() this.userinfo()
this.getmeue() this.getmeue()
...@@ -324,6 +327,12 @@ ...@@ -324,6 +327,12 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-top: 20rpx; margin-top: 20rpx;
position: relative
}
.userStyle .badge{
position: absolute;
right: -10rpx;
top: -10rpx;
} }
.userStyle .menus{ .userStyle .menus{
width: 94%; width: 94%;
......
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