Skip to content

M
mallapp
Commit 2a94633b authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 3d831121
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 132 deletions
components/cats/style1.vue
View file @ 2a94633b
......@@ -4,11 +4,10 @@
<u-grid-item
v-for="(c, i) in d"
:key="i"
@click="clickHandler(c.page_url)"
@click="clickHandler(c)"
>
<image
:src="getIconLink(c.IconPath)"
mode="widthFix"
style="width: 80rpx; height: 80rpx;"
/>
<text class="grid-text">{{ c.Name }}</text>
......@@ -26,10 +25,8 @@ export default {
};
},
methods: {
clickHandler(url) {
uni.navigateTo({
url: url,
});
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+item.Id });
},
},
};
......
components/cats/style10.vue
View file @ 2a94633b
......@@ -14,7 +14,6 @@
<div
class="adbox"
v-if="d[tid].advert_pic"
@click="clickHandler(d[tid].advert_url)"
>
<image
mode="aspectFit"
......@@ -23,13 +22,13 @@
/>
</div>
<div v-for="(c, i) in sd" :key="i">
<div class="sec-title">{{ c.Name }}</div>
<div @click="clickHandler(c)" class="sec-title">{{ c.Name }}</div>
<u-grid :column-num="3" :border="false">
<template v-if="c.ChildList && c.ChildList.length > 0">
<u-grid-item
v-for="(cc, ci) in c.ChildList"
:key="ci"
@click="clickHandler(c.page_url)"
>
<image
:src="c.IconPath"
......@@ -81,8 +80,11 @@ export default {
this.page = 1;
this.sd = this.d[this.tid].ChildList;
},
clickHandler(e) {
uni.navigateTo({ url: e });
clickHandler(item) {
let Id1=this.d[this.tid].Id;
let Id2=item.Id;
let CategoryIds=Id1+','+Id2;
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+CategoryIds });
}
},
};
......
components/cats/style11.vue
View file @ 2a94633b
......@@ -41,7 +41,7 @@
:enable-flex="true"
:style="{ height: '100%', padding: '0 0 0 10px' }"
>
<view class="good" v-for="(cx, ci) in g" :key="ci" @click="clickHandler(cx.page_url)">
<view class="good" v-for="(cx, ci) in g" :key="ci" @click="clickHandler(cx)">
<view class="good-img">
<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;" />
</view>
......@@ -141,8 +141,8 @@ export default {
this.g = [];
this.init();
},
clickHandler(e) {
uni.navigateTo({ url: e });
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
},
init() {
this.CategoryIdsList=[];
......
components/cats/style2.vue
View file @ 2a94633b
<template>
<view class="catsstyle2">
<view class="item" v-for="(x, index) in d" :key="index" @click="goUrl" :data-url='x.page_url'>
<view class="item" v-for="(x, index) in d" :key="index" @click="clickHandler(x)" :data-url='x.page_url'>
<view class="left">{{x.Name}}</view>
<view class="right">
<image :src="getIconLink(x.IconPath)" style="width:100%;height:100%" mode="aspectFit" />
......@@ -15,7 +15,10 @@ export default {
methods: {
goUrl(e){
uni.navigateTo({url:e.mp.currentTarget.dataset.url})
}
},
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+item.Id });
},
},
};
</script>
......
components/cats/style3.vue
View file @ 2a94633b
......@@ -30,7 +30,7 @@
>
<u-row gutter="20">
<u-col span="6" v-for="(cx, ci) in g" :key="ci">
<view class="good" @click="clickHandler(cx.page_url)">
<view class="good" @click="clickHandler(cx)">
<view class="good-img">
<image
mode="aspectFit"
......@@ -93,8 +93,8 @@ export default {
this.init();
this.active=i
},
clickHandler(url) {
uni.navigateTo({ url: url });
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
},
init() {
this.isover = false;
......
components/cats/style4.vue
View file @ 2a94633b
......@@ -33,7 +33,7 @@
class="good"
v-for="(cx, ci) in g"
:key="ci"
@click="clickHandler(cx.page_url)"
@click="clickHandler(cx)"
>
<div class="good-img">
<image
......@@ -115,8 +115,8 @@ export default {
this.g = [];
this.init();
},
clickHandler(url) {
uni.navigateTo({ url: url });
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
},
init() {
this.isover = false;
......
components/cats/style5.vue
View file @ 2a94633b
......@@ -15,7 +15,6 @@
<div
class="adbox"
v-if="d[tid].advert_pic"
@click="clickHandler(d[tid].advert_url)"
>
<image
mode="aspectFit"
......@@ -24,10 +23,10 @@
/>
</div>
<div
class="item"
class="item gg"
v-for="(x, index) in sd"
:key="index"
@click="clickHandler(x.page_url)"
@click="clickHandler(x)"
>
<div class="left">{{ x.Name }}</div>
<div class="right">
......@@ -71,8 +70,11 @@ export default {
this.page = 1;
this.sd = this.d[this.tid].ChildList;
},
clickHandler(url) {
uni.navigateTo({ url: url });
clickHandler(item) {
let Id1=this.d[this.tid].Id;
let Id2=item.Id;
let CategoryIds=Id1+','+Id2;
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+CategoryIds });
},
},
};
......
components/cats/style6.vue
View file @ 2a94633b
......@@ -26,7 +26,7 @@
<u-grid-item
v-for="(c, i) in sd"
:key="i"
@click="clickHandler(c.page_url)"
@click="clickHandler(c)"
>
<image
class="imgclass"
......@@ -70,8 +70,11 @@ export default {
this.page = 1;
this.sd = this.d[this.tid].ChildList;
},
clickHandler(url) {
uni.navigateTo({ url: url });
clickHandler(item) {
let Id1=this.d[this.tid].Id;
let Id2=item.Id;
let CategoryIds=Id1+','+Id2;
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+CategoryIds });
},
},
};
......
components/cats/style7.vue
View file @ 2a94633b
......@@ -42,7 +42,7 @@
>
<u-row gutter="10">
<u-col span="6" v-for="(cx, ci) in g" :key="ci">
<div class="good" @click="clickHandler(cx.page_url)">
<div class="good" @click="clickHandler(cx)">
<div class="good-img">
<image
mode="aspectFit"
......@@ -129,8 +129,8 @@ export default {
this.g = [];
this.init();
},
clickHandler(url) {
uni.navigateTo({ url: url });
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
},
computSecondHeight() {
const query = uni.createSelectorQuery().in(this);
......
components/cats/style8.vue
View file @ 2a94633b
......@@ -41,7 +41,7 @@
:enable-flex="true"
:style="{ height: '100%', padding: '0 0 0 10px' }"
>
<view class="good" v-for="(cx, ci) in g" :key="ci" @click="clickHandler(url)">
<view class="good" v-for="(cx, ci) in g" :key="ci" @click="clickHandler(cx)">
<view class="good-img">
<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;" />
</view>
......@@ -141,8 +141,8 @@ export default {
this.g = [];
this.init();
},
clickHandler(e) {
uni.navigateTo({ url: e });
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
},
init() {
this.CategoryIdsList=[];
......
components/cats/style9.vue
View file @ 2a94633b
......@@ -14,7 +14,6 @@
<view
class="adbox"
v-if="d[tid].advert_pic"
@click="clickHandler(d[tid].advert_url)"
>
<image
mode="aspectFit"
......@@ -23,13 +22,14 @@
/>
</view>
<view v-for="(x, index) in sd" :key="index">
<view class="sec-title">{{ x.Name }}</view>
<view @click="clickHandler(x)" class="sec-title">{{ x.Name }}
</view>
<template v-if="x.ChildList && x.ChildList.length > 0">
<view
class="item"
v-for="(cx, ci) in x.ChildList"
:key="ci"
@click="clickHandler"
:data-url="cx.page_url"
>
<view class="left">{{ c.Name }}</view>
......@@ -82,8 +82,11 @@ export default {
this.page = 1;
this.sd = this.d[this.tid].ChildList;
},
clickHandler(e) {
uni.navigateTo({ url: e });
clickHandler(item) {
let Id1=this.d[this.tid].Id;
let Id2=item.Id;
let CategoryIds=Id1+','+Id2;
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+CategoryIds });
},
},
};
......
components/goods/list.vue
View file @ 2a94633b
......@@ -2,20 +2,20 @@
<view class="u-good-list">
<u-row gutter="20">
<u-col span="6" v-for="(cx, ci) in g" :key="ci">
<view class="good" @click="clickHandler(cx.page_url)">
<view class="good" @click="clickHandler(cx)">
<view class="good-img">
<image
mode="aspectFill"
:src="cx.cover_pic"
:src="cx.CoverImage"
style="width: 100%; height: 100%;"
/>
</view>
<view class="good-name" v-if="setting.is_show_goods_name=='1'">{{ cx.name }}</view>
<view class="good-name" v-if="setting.is_show_goods_name=='1'">{{ cx.Name }}</view>
<view class="good-info">
<view class="price" :style="{ color: mainColor }">{{
cx.price_content
}}</view>
<view class="sell" v-if="setting.is_show_sales_num=='1'">{{ cx.sales }}</view>
<view class="price" :style="{ color: mainColor }">
￥{{cx.SellingPrice}}</view>
<!-- v-if="setting.is_show_sales_num=='1'" -->
<view class="sell">已售{{ cx.SalesNum }}</view>
<view v-if="setting.is_show_cart=='1'" class="cart" @click.stop="showSkuHandler(cx)">
<u-icon name="cart-o" size="40" :color="mainColor" />
</view>
......@@ -67,10 +67,9 @@ export default {
initConfig() {
this.setting = uni.getStorageSync("basedata").mall.setting
},
clickHandler(url) {
uni.navigateTo({
url: url,
});
clickHandler(item) {
console.log("GoodsId",item)
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
},
showSkuHandler(g) {
this.sku = g;
......
pages/goods/list.vue
View file @ 2a94633b
......@@ -3,33 +3,33 @@
<view class="sortbox">
<view
class="item"
@click="change(1, -1)"
:style="{ color: sortStatus == 1 ? mainColor : '#222' }"
@click="change(0)"
:style="{ color: msg.OrderBy == 0 ? mainColor : '#222' }"
>综合</view
>
<view
class="item"
@click="change(2, -1)"
:style="{ color: sortStatus == 2 ? mainColor : '#222' }"
@click="change(1)"
:style="{ color: msg.OrderBy == 1 ? mainColor : '#222' }"
>最新</view
>
<view
class="item"
:style="{ color: sortStatus == 3 ? mainColor : '#222' }"
:style="{ color: msg.OrderBy == 2 || msg.OrderBy==3 ? mainColor : '#222' }"
style="display: flex; justify-content: center;"
@click="change(3, sortStatus != 3 ? 1 : sortType == 1 ? 2 : 1)"
@click="change(2,1)"
>
<text>价格</text>
<u-icon
:name="sortShowType == 1 ? 'ascending' : 'descending'"
:name="msg.OrderBy == 2 ? 'descending' : 'ascending'"
size="36"
:color="sortStatus == 3 ? mainColor : '#222'"
:color="msg.OrderBy == 2 || msg.OrderBy==3 ? mainColor : '#222'"
></u-icon>
</view>
<view
class="item"
@click="change(4, -1)"
:style="{ color: sortStatus == 4 ? mainColor : '#222' }"
@click="change(4)"
:style="{ color: msg.OrderBy == 4 ? mainColor : '#222' }"
>销量</view
>
</view>
......@@ -108,18 +108,31 @@ export default {
old: {
scrollTop: 0,
},
coupon_id:0
coupon_id:0,
msg:{
pageIndex:1,
pageSize:14,
Name:'',
GoodsType:0,
CategoryIds:'',
OrderBy:0,
},
newsortType:1,
};
},
components:{
goodlist
},
onLoad(option) {
console.log("option",option)
this.mainColor = this.$uiConfig.mainColor;
this.catId = option.cat_id;
if(option.coupon_id!=undefined){
this.coupon_id = option.coupon_id //优惠券带过来的参数
}
if(option.CategoryIds){
this.msg.CategoryIds=option.CategoryIds;
}
},
mounted() {
this.init();
......@@ -135,54 +148,77 @@ export default {
});
},
change(sort, t) {
(this.sort = sort), (this.sortType = t), (this.page = 1);
if (sort == 3) {
this.sortShowType = t;
} else {
this.sortShowType = 1;
}
if(t){
if(this.msg.OrderBy==2){
this.msg.OrderBy=3;
}else{
this.msg.OrderBy=2;
}
}else{
this.msg.OrderBy=sort;
}
this.g = [];
this.init();
this.sortStatus = sort;
},
init() {
this.isover = false;
this.loading = true;
this.showLoading = this.page != 1;
this.request(
{
url: "",
data: {
r: "api/default/goods-list",
page: this.page,
cat_id: this.catId,
sort: this.sort,
sort_type: this.sortType,
keyword: "",
coupon_id: this.coupon_id,
},
},
(res) => {
this.showLoading = true;
this.g = this.g.concat(res.data.list);
this.page_count = res.data.pagination.page_count;
if (this.page_count == 1) {
this.isover = true;
this.status = "nomore";
} else {
this.status = "loadmore";
}
this.loading = false;
}
);
this.showLoading = this.msg.pageIndex != 1;
this.request2(
{
url: '/api/AppletGoods/GetAppletGoodsPageList',
data: this.msg
},
res => {
console.log("res",res);
this.isloading = false;
if(res.resultCode==1){
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.isover = true;
this.status = "nomore";
} else {
this.status = "loadmore";
}
}
uni.hideNavigationBarLoading();
}
);
// this.request(
// {
// url: "",
// data: {
// r: "api/default/goods-list",
// page: this.page,
// cat_id: this.catId,
// sort: this.sort,
// sort_type: this.sortType,
// keyword: "",
// coupon_id: this.coupon_id,
// },
// },
// (res) => {
// this.showLoading = true;
// this.g = this.g.concat(res.data.list);
// this.page_count = res.data.pagination.page_count;
// if (this.page_count == 1) {
// this.isover = true;
// this.status = "nomore";
// } else {
// this.status = "loadmore";
// }
// this.loading = false;
// }
// );
},
lower(e) {
if (this.page < this.page_count) {
if (!this.loading) {
if (this.msg.pageIndex < this.page_count) {
this.status = "loading";
this.page++;
this.msg.pageIndex++;
this.init();
}
} else {
this.isover = true;
this.status = "nomore";
......
pages/order/index/index.vue
View file @ 2a94633b
......@@ -2,7 +2,7 @@
<view class="orderindexStyle" :style="{ height: contentHeight }">
<u-tabs
:list="list"
:is-scroll="false"
name="Name"
:current="current"
@change="change"
:active-color="mainColor"
......@@ -184,14 +184,7 @@ export default {
return {
pageTitle: "我的订单",
current: 0,
list: [
{ name: "全部" },
{ name: "待付款" },
{ name: "待发货" },
{ name: "待评价" },
{ name: "已完成" },
{ name: "已取消" }
],
list: [],
mainColor: "",
contentHeight: 0,
page: 1,
......@@ -204,6 +197,17 @@ export default {
goodData: [],
showGoodList: false,
isover: false,
msg:{
pageIndex:1,
pageSize:15,
OrderId:0,
OrderType:0,
DeliveryMethod:0,
StartTime:'',
EndTime:'',
OrderStatus:0,
OrderNo:'',
},
};
},
created() {
......@@ -230,11 +234,33 @@ export default {
this.current = option.status;
this.loading = true;
this.init();
this.getOrderStatus();
},
methods: {
getOrderStatus() {
this.request2(
{
url: '/api/order/GetOrderStatusEnumList',
data: {}
},
res => {
uni.hideNavigationBarLoading();
if(res.resultCode==1){
this.isloading = false;
this.list = res.data;
let obj={
Name:'全部',
Id:0,
}
this.list.unshift(obj)
}
}
);
},
change(index) {
this.current = index;
this.page = 1;
this.msg.OrderStatus=this.list[index].Id;
this.msg.pageIndex = 1;
this.g = [];
this.loading = true;
this.init();
......@@ -242,29 +268,47 @@ export default {
init() {
this.isover = false;
let h = this.apiheader();
this.request(
{
url: "",
header: h,
data: {
r: "api/order/list",
status: this.current,
page: this.page,
},
},
(res) => {
this.loading = false;
this.g = this.g.concat(res.data.list);
this.page_count = res.data.pagination.page_count;
if (this.page_count == 1) {
this.isover = true;
}
}
);
this.request2(
{
url: '/api/AppletOrder/GetAppletGoodsMyOrderPageList',
data: this.msg
},
res => {
uni.hideNavigationBarLoading();
if(res.resultCode==1){
console.log("res",res)
this.loading = false;
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.page_count;
if (this.page_count == 1) {
this.isover = true;
}
}
}
);
// this.request(
// {
// url: "",
// header: h,
// data: {
// r: "api/order/list",
// status: this.current,
// page: this.page,
// },
// },
// (res) => {
// this.loading = false;
// 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++;
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.init();
} else {
this.isover = true;
......
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