Skip to content

M
mallapp
Commit 39e09bc7 authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 681c7330 f77050b6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3580 additions and 902 deletions
components/cats/style1.vue
View file @ 39e09bc7
...@@ -4,11 +4,10 @@ ...@@ -4,11 +4,10 @@
<u-grid-item <u-grid-item
v-for="(c, i) in d" v-for="(c, i) in d"
:key="i" :key="i"
@click="clickHandler(c.page_url)" @click="clickHandler(c)"
> >
<image <image
:src="getIconLink(c.IconPath)" :src="getIconLink(c.IconPath)"
mode="widthFix"
style="width: 80rpx; height: 80rpx;" style="width: 80rpx; height: 80rpx;"
/> />
<text class="grid-text">{{ c.Name }}</text> <text class="grid-text">{{ c.Name }}</text>
...@@ -26,10 +25,8 @@ export default { ...@@ -26,10 +25,8 @@ export default {
}; };
}, },
methods: { methods: {
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+item.Id });
url: url,
});
}, },
}, },
}; };
......
components/cats/style10.vue
View file @ 39e09bc7
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<div <div
class="adbox" class="adbox"
v-if="d[tid].advert_pic" v-if="d[tid].advert_pic"
@click="clickHandler(d[tid].advert_url)"
> >
<image <image
mode="aspectFit" mode="aspectFit"
...@@ -23,13 +22,13 @@ ...@@ -23,13 +22,13 @@
/> />
</div> </div>
<div v-for="(c, i) in sd" :key="i"> <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"> <u-grid :column-num="3" :border="false">
<template v-if="c.ChildList && c.ChildList.length > 0"> <template v-if="c.ChildList && c.ChildList.length > 0">
<u-grid-item <u-grid-item
v-for="(cc, ci) in c.ChildList" v-for="(cc, ci) in c.ChildList"
:key="ci" :key="ci"
@click="clickHandler(c.page_url)"
> >
<image <image
:src="c.IconPath" :src="c.IconPath"
...@@ -81,8 +80,11 @@ export default { ...@@ -81,8 +80,11 @@ export default {
this.page = 1; this.page = 1;
this.sd = this.d[this.tid].ChildList; this.sd = this.d[this.tid].ChildList;
}, },
clickHandler(e) { clickHandler(item) {
uni.navigateTo({ url: e }); 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 @ 39e09bc7
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
:enable-flex="true" :enable-flex="true"
:style="{ height: '100%', padding: '0 0 0 10px' }" :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"> <view class="good-img">
<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;" /> <image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;" />
</view> </view>
...@@ -141,8 +141,8 @@ export default { ...@@ -141,8 +141,8 @@ export default {
this.g = []; this.g = [];
this.init(); this.init();
}, },
clickHandler(e) { clickHandler(item) {
uni.navigateTo({ url: e }); uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
}, },
init() { init() {
this.CategoryIdsList=[]; this.CategoryIdsList=[];
......
components/cats/style2.vue
View file @ 39e09bc7
<template> <template>
<view class="catsstyle2"> <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="left">{{x.Name}}</view>
<view class="right"> <view class="right">
<image :src="getIconLink(x.IconPath)" style="width:100%;height:100%" mode="aspectFit" /> <image :src="getIconLink(x.IconPath)" style="width:100%;height:100%" mode="aspectFit" />
...@@ -15,7 +15,10 @@ export default { ...@@ -15,7 +15,10 @@ export default {
methods: { methods: {
goUrl(e){ goUrl(e){
uni.navigateTo({url:e.mp.currentTarget.dataset.url}) uni.navigateTo({url:e.mp.currentTarget.dataset.url})
} },
clickHandler(item) {
uni.navigateTo({ url: '/pages/goods/list?CategoryIds='+item.Id });
},
}, },
}; };
</script> </script>
......
components/cats/style3.vue
View file @ 39e09bc7
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
> >
<u-row gutter="20"> <u-row gutter="20">
<u-col span="6" v-for="(cx, ci) in g" :key="ci"> <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"> <view class="good-img">
<image <image
mode="aspectFit" mode="aspectFit"
...@@ -93,8 +93,8 @@ export default { ...@@ -93,8 +93,8 @@ export default {
this.init(); this.init();
this.active=i this.active=i
}, },
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ url: url }); uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
}, },
init() { init() {
this.isover = false; this.isover = false;
......
components/cats/style4.vue
View file @ 39e09bc7
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
class="good" class="good"
v-for="(cx, ci) in g" v-for="(cx, ci) in g"
:key="ci" :key="ci"
@click="clickHandler(cx.page_url)" @click="clickHandler(cx)"
> >
<div class="good-img"> <div class="good-img">
<image <image
...@@ -115,8 +115,8 @@ export default { ...@@ -115,8 +115,8 @@ export default {
this.g = []; this.g = [];
this.init(); this.init();
}, },
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ url: url }); uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
}, },
init() { init() {
this.isover = false; this.isover = false;
......
components/cats/style5.vue
View file @ 39e09bc7
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<div <div
class="adbox" class="adbox"
v-if="d[tid].advert_pic" v-if="d[tid].advert_pic"
@click="clickHandler(d[tid].advert_url)"
> >
<image <image
mode="aspectFit" mode="aspectFit"
...@@ -24,10 +23,10 @@ ...@@ -24,10 +23,10 @@
/> />
</div> </div>
<div <div
class="item" class="item gg"
v-for="(x, index) in sd" v-for="(x, index) in sd"
:key="index" :key="index"
@click="clickHandler(x.page_url)" @click="clickHandler(x)"
> >
<div class="left">{{ x.Name }}</div> <div class="left">{{ x.Name }}</div>
<div class="right"> <div class="right">
...@@ -71,8 +70,11 @@ export default { ...@@ -71,8 +70,11 @@ export default {
this.page = 1; this.page = 1;
this.sd = this.d[this.tid].ChildList; this.sd = this.d[this.tid].ChildList;
}, },
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ url: url }); 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 @ 39e09bc7
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<u-grid-item <u-grid-item
v-for="(c, i) in sd" v-for="(c, i) in sd"
:key="i" :key="i"
@click="clickHandler(c.page_url)" @click="clickHandler(c)"
> >
<image <image
class="imgclass" class="imgclass"
...@@ -70,8 +70,11 @@ export default { ...@@ -70,8 +70,11 @@ export default {
this.page = 1; this.page = 1;
this.sd = this.d[this.tid].ChildList; this.sd = this.d[this.tid].ChildList;
}, },
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ url: url }); 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 @ 39e09bc7
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
> >
<u-row gutter="10"> <u-row gutter="10">
<u-col span="6" v-for="(cx, ci) in g" :key="ci"> <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"> <div class="good-img">
<image <image
mode="aspectFit" mode="aspectFit"
...@@ -129,8 +129,8 @@ export default { ...@@ -129,8 +129,8 @@ export default {
this.g = []; this.g = [];
this.init(); this.init();
}, },
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ url: url }); uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
}, },
computSecondHeight() { computSecondHeight() {
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
......
components/cats/style8.vue
View file @ 39e09bc7
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
:enable-flex="true" :enable-flex="true"
:style="{ height: '100%', padding: '0 0 0 10px' }" :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"> <view class="good-img">
<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;" /> <image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;" />
</view> </view>
...@@ -141,8 +141,8 @@ export default { ...@@ -141,8 +141,8 @@ export default {
this.g = []; this.g = [];
this.init(); this.init();
}, },
clickHandler(e) { clickHandler(item) {
uni.navigateTo({ url: e }); uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
}, },
init() { init() {
this.CategoryIdsList=[]; this.CategoryIdsList=[];
......
components/cats/style9.vue
View file @ 39e09bc7
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<view <view
class="adbox" class="adbox"
v-if="d[tid].advert_pic" v-if="d[tid].advert_pic"
@click="clickHandler(d[tid].advert_url)"
> >
<image <image
mode="aspectFit" mode="aspectFit"
...@@ -23,13 +22,14 @@ ...@@ -23,13 +22,14 @@
/> />
</view> </view>
<view v-for="(x, index) in sd" :key="index"> <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"> <template v-if="x.ChildList && x.ChildList.length > 0">
<view <view
class="item" class="item"
v-for="(cx, ci) in x.ChildList" v-for="(cx, ci) in x.ChildList"
:key="ci" :key="ci"
@click="clickHandler"
:data-url="cx.page_url" :data-url="cx.page_url"
> >
<view class="left">{{ c.Name }}</view> <view class="left">{{ c.Name }}</view>
...@@ -82,8 +82,11 @@ export default { ...@@ -82,8 +82,11 @@ export default {
this.page = 1; this.page = 1;
this.sd = this.d[this.tid].ChildList; this.sd = this.d[this.tid].ChildList;
}, },
clickHandler(e) { clickHandler(item) {
uni.navigateTo({ url: e }); 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/goodsku.vue
View file @ 39e09bc7
This diff is collapsed.
components/goods/list.vue
View file @ 39e09bc7
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
<view class="u-good-list"> <view class="u-good-list">
<u-row gutter="20"> <u-row gutter="20">
<u-col span="6" v-for="(cx, ci) in g" :key="ci"> <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"> <view class="good-img">
<image <image
mode="aspectFill" mode="aspectFill"
:src="cx.cover_pic" :src="cx.CoverImage"
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
/> />
</view> </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="good-info">
<view class="price" :style="{ color: mainColor }">{{ <view class="price" :style="{ color: mainColor }">
cx.price_content ￥{{cx.SellingPrice}}</view>
}}</view> <!-- v-if="setting.is_show_sales_num=='1'" -->
<view class="sell" v-if="setting.is_show_sales_num=='1'">{{ cx.sales }}</view> <view class="sell">已售{{ cx.SalesNum }}</view>
<view v-if="setting.is_show_cart=='1'" class="cart" @click.stop="showSkuHandler(cx)"> <view v-if="setting.is_show_cart=='1'" class="cart" @click.stop="showSkuHandler(cx)">
<u-icon name="cart-o" size="40" :color="mainColor" /> <u-icon name="cart-o" size="40" :color="mainColor" />
</view> </view>
...@@ -67,10 +67,9 @@ export default { ...@@ -67,10 +67,9 @@ export default {
initConfig() { initConfig() {
this.setting = uni.getStorageSync("basedata").mall.setting this.setting = uni.getStorageSync("basedata").mall.setting
}, },
clickHandler(url) { clickHandler(item) {
uni.navigateTo({ console.log("GoodsId",item)
url: url, uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
});
}, },
showSkuHandler(g) { showSkuHandler(g) {
this.sku = g; this.sku = g;
......
components/goods/order-good-list.vue
View file @ 39e09bc7
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<view class="title-box"> <view class="title-box">
<view class="title">商品清单</view> <view class="title">商品清单</view>
<view class="tips">共6件</view> <view class="tips">共{{list.length}}件</view>
</view> </view>
<view class="goodbox update-goodbox" v-for="(y, i) in list" :key="i"> <view class="goodbox update-goodbox" v-for="(y, i) in list" :key="i">
<image :src="y.cover_pic" mode="aspectFill" class="image" /> <image :src="y.cover_pic" mode="aspectFill" class="image" />
......
components/goods/style1.vue
View file @ 39e09bc7
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
<div class="good-price-info"> <div class="good-price-info">
<span class="price" :style="{ color: mainColor }">{{ <span class="price" :style="{ color: mainColor }">{{
goodsInfo.showGoodsPrice ? item.price : "" goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</span> }}</span>
<span class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <span class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon
......
components/goods/style2.vue
View file @ 39e09bc7
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</view> </view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{'color':mainColor}">{{
goodsInfo.showGoodsPrice ? item.price : "" goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view> }}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn"> <view class="buy" v-if="goodsInfo.showBuyBtn">
<u-icon <u-icon
......
components/goods/style3.vue
View file @ 39e09bc7
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
<div class="good-price-info"> <div class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{'color':mainColor}">{{
goodsInfo.showGoodsPrice ? item.price : "" goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view> }}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon
......
components/goods/style4.vue
View file @ 39e09bc7
...@@ -109,18 +109,18 @@ export default { ...@@ -109,18 +109,18 @@ export default {
this.showSku=true this.showSku=true
}, },
//格式化价格添加.00 //格式化价格添加.00
getPrice(value){ // getPrice(value){
var html,_val; // var html,_val;
value =Number(value).toFixed(2); // value =Number(value).toFixed(2);
if(value==0){ // if(value==0){
value=0; // value=0;
return html = "￥0"; // return html = "￥0";
}else if(value.split('.')[1].substring(1)==0){ // }else if(value.split('.')[1].substring(1)==0){
value = Number(value).toFixed(2); // value = Number(value).toFixed(2);
} // }
_val = value.split('.'); // _val = value.split('.');
return html = '￥'+_val[0]+'.'+_val[1]; // return html = '￥'+_val[0]+'.'+_val[1];
} // }
}, },
}; };
</script> </script>
......
components/goods/style5.vue
View file @ 39e09bc7
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
</view> </view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{'color':mainColor}">{{
goodsInfo.showGoodsPrice ? item.price : "" goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view> }}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn"> <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon <u-icon
name="cart-o" name="cart-o"
size="40" size="40"
...@@ -78,17 +78,22 @@ ...@@ -78,17 +78,22 @@
</view> </view>
</view> </view>
</view> </view>
<view style="color:rgba(0,0,0,0);font-size:12px;">0</view> <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku'
export default { export default {
components:{
goodSku
},
props: ["goodList", "goodsInfo"], props: ["goodList", "goodsInfo"],
data() { data() {
return { return {
mainColor: "", mainColor: "",
activeKey: 0, activeKey: 0,
showSku:false,
sku:{}
}; };
}, },
created() { created() {
...@@ -98,6 +103,10 @@ export default { ...@@ -98,6 +103,10 @@ export default {
openGood(e) { openGood(e) {
console.log(e); console.log(e);
}, },
showSkuHandler(g){
this.sku=g
this.showSku=true
},
}, },
}; };
</script> </script>
......
components/goods/style6.vue
View file @ 39e09bc7
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
}}</view> }}</view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{'color':mainColor}">{{ <view class="price" :style="{'color':mainColor}">{{
goodsInfo.showGoodsPrice ? item.price : "" goodsInfo.showGoodsPrice ? getPrice(item.price) : ""
}}</view> }}</view>
<view class="buy" v-if="goodsInfo.showBuyBtn"> <view class="buy" v-if="goodsInfo.showBuyBtn">
<u-icon <u-icon
......
components/userorder/after-sale.vue 0 → 100644
View file @ 39e09bc7
<template>
<u-popup
mode="bottom"
border-radius="20"
:popup="false"
v-model="show"
:maskCloseAble="true"
length="auto"
:safeAreaInsetBottom="true"
@close="popupClose"
:z-index="9999"
close-icon="cross"
:closeable="true"
>
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
class="afterSale"
>
<view class="title-box">
<view class="title">商品清单</view>
<view class="tips">共{{ list.length }}件</view>
</view>
<view class="goodbox update-goodbox" v-for="(y, i) in list" :key="i">
<image :src="y.goods_info.pic_url" mode="aspectFill" class="image" />
<view class="goodinfo">
<view class="name">{{ y.goods_info.name }}</view>
<view class="attr">
<text>已选择 </text>
<text
v-for="(x, xi) in y.goods_info.attr_list"
:key="xi"
style="margin:0 5px;"
>
{{ x.attr_group_name }}：{{ x.attr_name }}
</text>
</view>
<view class="price">
<view class="left" :style="{ color: mc }">
<text class="small">￥</text>
<text>{{ y.total_original_price.split(".")[0] }}</text>
<text class="small"
>.{{ y.total_original_price.split(".")[1] || "00" }}</text
>
</view>
<view class="right">x{{ y.num }}</view>
</view>
<view style="display: flex; flex-direction: row-reverse;margin-top:10px;">
<u-button
shape="circle"
size="medium"
:custom-style="customStyle"
@click="goService(y.id)"
v-if="y.refund_status==0"
>申请售后</u-button
>
<text v-if="y.refund_status!=0" style="font-size:28rpx;color:gray;">
已申请售后（{{y.refund.status_text}}）
</text>
</view>
</view>
</view>
</scroll-view>
</u-popup>
</template>
<script>
export default {
props: ["list"],
data() {
return {
show: true,
mc: "",
customStyle: {
marginLeft: "20px",
padding: "0 30rpx",
},
};
},
mounted() {
this.mc = this.$uiConfig.mainColor;
},
methods: {
popupClose() {
this.$emit("close");
},
goService(id){
uni.navigateTo({
url: '/pages/order/after-sale/index?id='+id
});
}
},
};
</script>
<style>
.afterSale {
height: 50vh;
padding-bottom: 50px;
text-align: left !important;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
overflow-y: auto;
position: relative;
padding: 69px 10px 0 10px;
}
.afterSale .title-box {
display: flex;
align-items: center;
position: fixed;
top: 0;
left: 0;
right: 0;
background: #fff;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
overflow: hidden;
z-index: 2;
}
.afterSale .title-box .title {
font-size: 22px;
color: #000;
padding: 20px;
background: #fff;
flex: 1;
}
.afterSale .title-box .tips {
font-size: 13px;
color: #777;
flex: 1;
text-align: right;
padding-right: 12px;
}
.afterSale .goodbox.update-goodbox {
width: calc(100% - 20px);
padding-bottom: 10px;
border-bottom: 1px solid #f5f5f5;
margin-bottom: 10px;
}
.afterSale .goodbox.update-goodbox:last-child {
border: none;
}
.afterSale .goodbox {
margin-bottom: 20px;
display: flex;
}
.afterSale .goodbox .image {
width: 200rpx;
height: 200rpx;
border-radius: 5px;
margin-right: 10px;
}
.afterSale .goodbox .goodinfo {
width: 1px;
flex: 1;
}
.afterSale .goodbox .goodinfo .name {
height: 16px;
font-size: 14px;
color: #232323;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-bottom: 5px;
}
.afterSale .goodbox .goodinfo .attr {
height: 14px;
font-size: 12px;
color: #999;
overflow: hidden;
text-overflow: ellipsis;
margin-bottom: 5px;
}
.afterSale .goodbox .goodinfo .price {
display: flex;
align-items: center;
}
.afterSale .goodbox .goodinfo .price .left {
font-size: 20px;
font-family: "oswald";
width: 1px;
flex: 1;
}
.afterSale .goodbox .goodinfo .price .left .small {
font-size: 13px;
}
.afterSale .goodbox .goodinfo .price .right {
color: #444;
font-size: 13px;
}
</style>
node_modules/uview-ui/components/u-steps/u-steps.vue
View file @ 39e09bc7
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<view class="u-steps"> <view class="u-steps">
<view class="u-steps-item" v-for="(item,index) in list" :key="index"> <view class="u-steps-item" v-for="(item,index) in list" :key="index">
<view class="u-steps-item-num" v-if="mode == 'number' && current < index">{{index+1}}</view> <view class="u-steps-item-num" v-if="mode == 'number' && current < index">{{index+1}}</view>
<view class="u-steps-item-dot" v-if="mode == 'dot'" :style="{backgroundColor: index <= current ? innerActiveColor : unActiveColor}"></view> <view class="u-steps-item-dot" v-if="mode == 'dot'" :style="{backgroundColor: index <= current ? innerActiveColor : unActiveColor}">
<u-icon v-if="index <= current" name="success" size="28" :color="dotColor"></u-icon>
</view>
<u-icon size="22" class="u-steps-item-checked" :style="{backgroundColor: index <= current ? innerActiveColor : unActiveColor}" <u-icon size="22" class="u-steps-item-checked" :style="{backgroundColor: index <= current ? innerActiveColor : unActiveColor}"
v-if="mode == 'number' && current >= index" name="checkmark"></u-icon> v-if="mode == 'number' && current >= index" name="checkmark"></u-icon>
<text :style="{color: index <= current ? innerActiveColor : unActiveColor}">{{item.name}}</text> <text :style="{color: index <= current ? innerActiveColor : unActiveColor}">{{item.name}}</text>
...@@ -57,6 +59,10 @@ ...@@ -57,6 +59,10 @@
type: String, type: String,
default: '' default: ''
}, },
dotColor: {
type: String,
default: '#FFF'
},
// 未激活的颜色 // 未激活的颜色
unActiveColor: { unActiveColor: {
type: String, type: String,
...@@ -119,11 +125,12 @@ ...@@ -119,11 +125,12 @@
} }
.u-steps-item-dot { .u-steps-item-dot {
width: 20rpx; width: 36rpx;
height: 20rpx; height: 36rpx;
display: flex; display: flex;
border-radius: 50%; border-radius: 50%;
margin: 14rpx auto; margin: 10rpx auto;
padding:0 4rpx;
} }
.u-steps-item-checked { .u-steps-item-checked {
......
node_modules/uview-ui/components/u-upload/u-upload.vue
View file @ 39e09bc7
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
height: width + 'rpx' height: width + 'rpx'
}"> }">
<view v-if="deletable" class="u-delete-icon" @tap.stop="deleteItem(index)"> <view v-if="deletable" class="u-delete-icon" @tap.stop="deleteItem(index)">
<u-icon class="u-icon" name="close" size="20" color="#ffffff"></u-icon> <u-icon class="u-icon" name="cross" size="20" color="#ffffff"></u-icon>
</view> </view>
<u-line-progress v-if="showProgress && item.progress > 0 && !item.error" :show-percent="false" height="16" class="u-progress" :percent="item.progress"></u-line-progress> <u-line-progress v-if="showProgress && item.progress > 0 && !item.error" :show-percent="false" height="16" class="u-progress" :percent="item.progress"></u-line-progress>
<view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view> <view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
......
pages.json
View file @ 39e09bc7
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
"easycom": { "easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
}, },
"pages": [ "pages": [{
"path": "pages/order/after-sale/refunds-list"
},
{ {
"path": "pages/user-center/user-center" "path": "pages/user-center/user-center"
}, },
...@@ -12,16 +13,34 @@ ...@@ -12,16 +13,34 @@
}, },
{ {
"path": "pages/cart/cart" "path": "pages/cart/cart"
},{ },
{
"path": "pages/order/index/index" "path": "pages/order/index/index"
}, },
{ {
"path" : "pages/balance/balance" "path": "pages/order/order-detail",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/balance/balance"
}, },
{ {
"path": "pages/index/index" "path": "pages/index/index"
}, },
{
"path": "pages/order/after-sale/refunds-detail"
},
{
"path": "pages/order/after-sale/refunds"
},
{
"path": "pages/order/after-sale/index"
},
{ {
"path": "pages/order-submit/order-submit" "path": "pages/order-submit/order-submit"
}, },
...@@ -65,43 +84,33 @@ ...@@ -65,43 +84,33 @@
}, },
{ {
"path": "pages/balance/recharge" "path": "pages/balance/recharge"
} }, {
,{ "path": "pages/card/index/index"
"path" : "pages/card/index/index"
} }, {
,{ "path": "pages/coupon/list/list"
"path" : "pages/coupon/list/list" }, {
} "path": "pages/coupon/details/details"
,{ }, {
"path" : "pages/coupon/details/details" "path": "pages/coupon/index/index"
},{ }, {
"path" : "pages/coupon/index/index" "path": "pages/user-center/integral-detail/integral-detail"
}
,{
"path" : "pages/user-center/integral-detail/integral-detail"
} }
,{ , {
"path" : "pages/share/index/index" "path": "pages/share/index/index"
} }, {
,{ "path": "pages/share/add/add"
"path" : "pages/share/add/add" }, {
} "path": "pages/share/cash/cash"
,{ }, {
"path" : "pages/share/cash/cash" "path": "pages/share/money/money"
} }, {
,{ "path": "pages/share/cash-detail/cash-detail"
"path" : "pages/share/money/money" }, {
} "path": "pages/share/level/level"
,{ }, {
"path" : "pages/share/cash-detail/cash-detail" "path": "pages/share/qrcode/qrcode"
}
,{
"path" : "pages/share/level/level"
}
,{
"path" : "pages/share/qrcode/qrcode"
} }
], ],
"globalStyle": { "globalStyle": {
......
pages/goods/goods.vue
View file @ 39e09bc7
...@@ -230,7 +230,8 @@ export default { ...@@ -230,7 +230,8 @@ export default {
currentSku: {}, currentSku: {},
isExsitGoods: true, isExsitGoods: true,
pageTitle: "商品详情", pageTitle: "商品详情",
setting:{} setting:{},
prevPage:""
}; };
}, },
components: { components: {
...@@ -298,7 +299,7 @@ export default { ...@@ -298,7 +299,7 @@ export default {
}); });
console.log(this.skuimage); console.log(this.skuimage);
var richtext = this.g.detail; var richtext = this.g.detail;
richtext = richtext.replace(/<img/g, '<img style="max-width:100%"'); richtext = richtext.replace(/<img/g, '<img style="max-width:100%;height:auto !important;"');
this.detailContent = richtext; this.detailContent = richtext;
this.loading = false; this.loading = false;
this.initComments(); this.initComments();
......
pages/goods/list.vue
View file @ 39e09bc7
...@@ -3,33 +3,33 @@ ...@@ -3,33 +3,33 @@
<view class="sortbox"> <view class="sortbox">
<view <view
class="item" class="item"
@click="change(1, -1)" @click="change(0)"
:style="{ color: sortStatus == 1 ? mainColor : '#222' }" :style="{ color: msg.OrderBy == 0 ? mainColor : '#222' }"
>综合</view >综合</view
> >
<view <view
class="item" class="item"
@click="change(2, -1)" @click="change(1)"
:style="{ color: sortStatus == 2 ? mainColor : '#222' }" :style="{ color: msg.OrderBy == 1 ? mainColor : '#222' }"
>最新</view >最新</view
> >
<view <view
class="item" class="item"
:style="{ color: sortStatus == 3 ? mainColor : '#222' }" :style="{ color: msg.OrderBy == 2 || msg.OrderBy==3 ? mainColor : '#222' }"
style="display: flex; justify-content: center;" style="display: flex; justify-content: center;"
@click="change(3, sortStatus != 3 ? 1 : sortType == 1 ? 2 : 1)" @click="change(2,1)"
> >
<text>价格</text> <text>价格</text>
<u-icon <u-icon
:name="sortShowType == 1 ? 'ascending' : 'descending'" :name="msg.OrderBy == 2 ? 'descending' : 'ascending'"
size="36" size="36"
:color="sortStatus == 3 ? mainColor : '#222'" :color="msg.OrderBy == 2 || msg.OrderBy==3 ? mainColor : '#222'"
></u-icon> ></u-icon>
</view> </view>
<view <view
class="item" class="item"
@click="change(4, -1)" @click="change(4)"
:style="{ color: sortStatus == 4 ? mainColor : '#222' }" :style="{ color: msg.OrderBy == 4 ? mainColor : '#222' }"
>销量</view >销量</view
> >
</view> </view>
...@@ -108,18 +108,31 @@ export default { ...@@ -108,18 +108,31 @@ export default {
old: { old: {
scrollTop: 0, scrollTop: 0,
}, },
coupon_id:0 coupon_id:0,
msg:{
pageIndex:1,
pageSize:14,
Name:'',
GoodsType:0,
CategoryIds:'',
OrderBy:0,
},
newsortType:1,
}; };
}, },
components:{ components:{
goodlist goodlist
}, },
onLoad(option) { onLoad(option) {
console.log("option",option)
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.catId = option.cat_id; this.catId = option.cat_id;
if(option.coupon_id!=undefined){ if(option.coupon_id!=undefined){
this.coupon_id = option.coupon_id //优惠券带过来的参数 this.coupon_id = option.coupon_id //优惠券带过来的参数
} }
if(option.CategoryIds){
this.msg.CategoryIds=option.CategoryIds;
}
}, },
mounted() { mounted() {
this.init(); this.init();
...@@ -135,54 +148,77 @@ export default { ...@@ -135,54 +148,77 @@ export default {
}); });
}, },
change(sort, t) { change(sort, t) {
(this.sort = sort), (this.sortType = t), (this.page = 1);
if (sort == 3) { if(t){
this.sortShowType = t; if(this.msg.OrderBy==2){
} else { this.msg.OrderBy=3;
this.sortShowType = 1; }else{
this.msg.OrderBy=2;
}
}else{
this.msg.OrderBy=sort;
} }
this.g = []; this.g = [];
this.init(); this.init();
this.sortStatus = sort;
}, },
init() { init() {
this.isover = false; this.isover = false;
this.loading = true; this.loading = true;
this.showLoading = this.page != 1; this.showLoading = this.msg.pageIndex != 1;
this.request( this.request2(
{ {
url: "", url: '/api/AppletGoods/GetAppletGoodsPageList',
data: { data: this.msg
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 => {
(res) => { console.log("res",res);
this.showLoading = true; this.isloading = false;
this.g = this.g.concat(res.data.list); if(res.resultCode==1){
this.page_count = res.data.pagination.page_count; this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) { if (this.page_count == 1) {
this.isover = true; this.isover = true;
this.status = "nomore"; this.status = "nomore";
} else { } else {
this.status = "loadmore"; this.status = "loadmore";
} }
this.loading = false; }
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) { lower(e) {
if (this.page < this.page_count) { if (this.msg.pageIndex < this.page_count) {
if (!this.loading) {
this.status = "loading"; this.status = "loading";
this.page++; this.msg.pageIndex++;
this.init(); this.init();
}
} else { } else {
this.isover = true; this.isover = true;
this.status = "nomore"; this.status = "nomore";
......
pages/order/after-sale/index.vue 0 → 100644
View file @ 39e09bc7
<template>
<view class="applyrefund" v-if="!loading">
<view class="head">
<view class="goods">
<image :src="good.goods_info.pic_url" mode="aspectFill" class="image" />
<view class="good-info">
<view class="name-box">
<view class="name">{{ good.goods_info.name }}</view>
</view>
<view class="price">
<text>单价：</text>
<text style="color: #222; margin-right: 30rpx;">{{
good.unit_price
}}</text>
<text>购买数量：</text>
<text style="color: #222;">{{ good.num }}</text>
</view>
</view>
</view>
</view>
<view class="apply">
<view class="item" @click="refundsHandler">
<image
src="@/static/images/icon/tui.png"
mode="aspectFill"
class="image"
/>
<view class="name">退货</view>
<view class="tips">退回收到的商品</view>
<view class="arrow">
<u-icon name="arrow" size="32" color="#333"></u-icon>
</view>
</view>
<view class="item">
<image
src="@/static/images/icon/huan.png"
mode="aspectFill"
class="image"
/>
<view class="name">换货</view>
<view class="tips">更换收到的商品</view>
<view class="arrow">
<u-icon name="arrow" size="32" color="#333"></u-icon>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
id: 0,
chosenId: 0,
good: {},
loading: false,
};
},
onLoad(option) {
console.log("jump in");
uni.showNavigationBarLoading();
this.id = option.id || 98180;
console.log(this.id)
this.chosenId = option.chosenId;
uni.setNavigationBarTitle({
title: "选择售后类型",
});
this.init();
},
methods: {
init() {
let h = this.apiheader();
this.request(
{
url: "",
header: h,
data: {
r: "api/order/apply-refund",
id: this.id,
},
},
(res) => {
this.good = res.data.detail;
this.loading = false;
uni.hideNavigationBarLoading();
}
);
},
refundsHandler() {
uni.navigateTo({
url: "/pages/order/after-sale/refunds?id=" + this.id,
});
},
},
};
</script>
<style>
.applyrefund {
height: 100vh;
background: #f5f5f5;
}
.applyrefund .goods {
display: flex;
padding: 20px;
margin-bottom: 20px;
background: #fff;
}
.applyrefund .goods .image {
width: 160rpx;
height: 160rpx;
border-radius: 10rpx;
margin-right: 40rpx;
}
.applyrefund .goods .good-info {
display: flex;
flex: 1;
flex-direction: column;
}
.applyrefund .goods .good-info .name-box {
flex: 1;
height: 1rpx;
color: gray;
font-size: 26rpx;
}
.applyrefund .goods .good-info .name-box .name {
height: 70rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
line-clamp: 2;
-webkit-box-orient: vertical;
line-height: 1.5;
}
.applyrefund .goods .good-info .price {
height: 32rpx;
color: gray;
font-size: 26rpx;
}
.applyrefund .apply {
margin: 0 20rpx;
padding: 0 30rpx;
background: #fff;
border-radius: 20rpx;
}
.applyrefund .apply .item {
padding: 40rpx 0;
border-bottom: 2rpx solid #eee;
display: flex;
align-items: center;
}
.applyrefund .apply .item .image {
width: 50rpx;
height: 50rpx;
margin-right: 30rpx;
}
.applyrefund .apply .item .name {
font-size: 34rpx;
font-weight: 600;
color: #000;
flex: 1;
width: 1rpx;
}
.applyrefund .apply .item .tips {
font-size: 26rpx;
flex: 1;
width: 1rpx;
color: gray;
text-align: right;
}
.applyrefund .apply .item .arrow {
width: 32rpx;
height: 32rpx;
margin-left: 24rpx;
}
</style>
pages/order/after-sale/refunds-detail.vue 0 → 100644
View file @ 39e09bc7
This diff is collapsed.
pages/order/after-sale/refunds-list.vue 0 → 100644
View file @ 39e09bc7
<template>
<view
class="orderindexStyle"
:style="{
height: contentHeight,
}"
v-if="!loading"
>
<view
style="height: calc(100vh - 50px); background: #fff;"
v-if="g.length == 0"
>
<u-empty text="暂无相关记录" mode="order"></u-empty>
</view>
<view
v-if="g.length > 0"
style="
width: calc(100vw);
overflow: hidden;
padding-bottom: 20px;
"
>
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }"
>
<view class="orderList">
<view
class="listBox"
@click="redirectToDetail(item.id)"
v-for="(item, index) in g"
:key="index"
>
<view class="listBox_t">
<Text
style="
font-family: microsoft yahei;
font-size: 13px;
color: #777;
flex: 1;
width: 1rpx;
"
>单号：{{ item.order_no }}</Text
>
<view class="viewtype">
<image
class="img"
v-if="item.type == 1"
src="/static/images/icon/tui.png"
mode="aspectFill"
/>
<image
class="img"
v-if="item.type == 2"
src="/static/images/icon/huan.png"
mode="aspectFill"
/>
<text>{{ item.type == 1 ? "退货" : "换货" }}</text>
</view>
</view>
<view class="listBox_c">
<template v-if="item.detail.length == 1">
<view
v-for="(cx, ci) in item.detail"
:key="ci"
class="box_bottom"
>
<image
:src="cx.goods_info.pic_url"
style="width: 140rpx; height: 140rpx; border-radius: 8rpx;"
mode="aspectFill"
/>
<view
style="
width: 1rpx;
flex: 1;
display: flex;
flex-direction: column;
margin-left: 30rpx;
height: 140rpx;
"
>
<view style="height: 1rpx; flex: 1;">
<view class="topic_cont_text">{{
cx.goods_info.name
}}</view>
</view>
<view>
<text style="font-size: 24rpx; color: gray;"
>申请数量：</text
>
<text style="font-size: 26rpx; color: #000;">{{
cx.goods_info.num
}}</text>
</view>
</view>
</view>
<view class="progress">
<view class="status-text">{{ item.status_text=='已退款'?'已完成':item.status_text }}</view>
<view class="status-tips">
<text v-if="item.status == 1"
>请您耐心等待商家审核</text
>
</view>
<view class="status-arrow">
<u-icon name="arrow" size="32" color="#ccc"></u-icon>
</view>
</view>
</template>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</template>
<script>
import goodList from "@/components/goods/order-good-list2";
export default {
components: {
goodList,
},
data() {
return {
mainColor: "",
contentHeight: 0,
page: 1,
page_count: 1,
g: [],
loading: true,
showModal: false,
item: "",
index: 0,
goodData: [],
showGoodList: false,
isover: false,
customStyle: {
marginLeft: "20px",
padding: "0 30rpx",
},
themCustomStyle: {
marginLeft: "20px",
padding: "0 30rpx",
},
};
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor;
this.themCustomStyle.color = this.mainColor;
this.themCustomStyle.borderColor = this.mainColor;
},
mounted() {
uni.setNavigationBarTitle({
title: "退还/售后",
});
},
onLoad(option) {
this.loading = true;
},
onShow(){
this.page=1
this.g=[]
this.loading = true;
this.init();
},
methods: {
redirectToDetail(id) {
uni.navigateTo({
url: "/pages/order/after-sale/refunds-detail?id=" + id,
});
},
init() {
this.isover = false;
let h = this.apiheader();
this.request(
{
url: "",
header: h,
data: {
r: "api/order/list",
status: 5,
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++;
this.init();
} else {
this.isover = true;
}
},
},
};
</script>
<style>
.orderindexStyle {
width: 100%;
height: 100%;
background: #f3f4f6;
}
.orderindexStyle .orderList {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.orderList .listBox {
/* width: 94%; */
background: #fff;
border-radius: 10px;
display: flex;
flex-direction: column;
align-items: center;
padding: 20px;
width: 100%;
margin-top: 30rpx;
}
.orderList .listBox .listBox_t {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 28rpx;
margin-bottom: 20px;
color: #000;
}
.orderList .listBox .listBox_c {
width: 100%;
display: block;
/* flex-direction: column;
align-items: center; */
}
.orderList .listBox .box_bottom {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
/* margin-bottom: 20px; */
}
.orderList .handle {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-end;
margin-top: 10rpx;
}
.orderList .handle_item {
padding: 0 24rpx;
border: 1px solid #c8c9cc;
margin-left: 20rpx;
height: 50rpx;
border-radius: 25rpx;
line-height: 50rpx;
}
.orderindexStyle .loading {
width: 200rpx;
height: 200rpx;
background: #000000;
opacity: 0.7;
border-radius: 10rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
position: fixed;
left: 50%;
top: 30%;
margin-left: -100rpx;
z-index: 999;
}
.listBox_c .goodboxmore {
margin-bottom: 20px;
display: flex;
width: 100%;
align-items: center;
}
.listBox_c .goodboxmore .good-list {
display: flex;
flex: 1;
overflow-x: auto;
}
.listBox_c .goodboxmore .good-list .item {
width: 70px;
height: 70px;
border-radius: 5px;
margin-right: 10px;
}
.listBox_c .goodboxmore .infos {
margin-left: 15px;
}
.listBox_c .goodboxmore .infos .text {
text-align: center;
font-size: 12px;
margin-top: 5px;
}
.listBox_c .left {
flex: 1;
color: #232323;
font-size: 16px;
flex: 1;
font-family: "oswald";
}
.listBox_c .small {
font-size: 13px;
}
.listBox_c .topic_cont_text {
font-size: 30rpx;
max-height: 90rpx;
overflow: hidden;
word-break: break-all; /* break-all(允许在单词内换行。) */
text-overflow: ellipsis; /* 超出部分省略号 */
display: -webkit-box; /** 对象作为伸缩盒子模型显示 **/
-webkit-box-orient: vertical; /** 设置或检索伸缩盒对象的子元素的排列方式 **/
-webkit-line-clamp: 2; /** 显示的行数 **/
}
.listBox .viewtype {
color: #000;
display: flex;
align-items: center;
font-size: 14px;
font-weight: 600;
}
.listBox .viewtype .img {
width: 32rpx;
height: 32rpx;
margin-right: 10rpx;
}
.listBox_c .progress {
padding: 20rpx;
background: #f5f5f5;
display: flex;
margin-top: 40rpx;
align-items: center;
}
.listBox_c .progress .status-text {
font-size: 28rpx;
color: #444;
margin-right: 40rpx;
font-weight: 500;
}
.listBox_c .progress .status-tips {
font-size: 12px;
color: gray;
width: 1rpx;
flex: 1;
}
.listBox_c .progress .status-arrow {
width: 32rpx;
height: 32rpx;
margin-left: 40rpx;
}
</style>
pages/order/after-sale/refunds.vue 0 → 100644
View file @ 39e09bc7
This diff is collapsed.
pages/order/index/index.vue
View file @ 39e09bc7
This diff is collapsed.
pages/order/order-detail.vue
View file @ 39e09bc7
This diff is collapsed.
pages/user-center/user-center.vue
View file @ 39e09bc7
...@@ -35,38 +35,20 @@ ...@@ -35,38 +35,20 @@
<view class="account_bar" v-if="meueData.user_center.is_account_status == 1"> <view class="account_bar" v-if="meueData.user_center.is_account_status == 1">
<view class="account_bar_item" v-for="(item,index) in meueData.user_center.account" @click="goUrl(item.link_url)" :key="index"> <view class="account_bar_item" v-for="(item,index) in meueData.user_center.account" @click="goUrl(item.link_url)" :key="index">
<Text :style="{ color: secondary }">0</Text> <!-- 优惠券 -->
<Text :style="{ color: secondary }" v-if="item.link_url=='/pages/coupon/index/index'">{{user_info.coupon}}</Text>
<!-- 积分 -->
<Text :style="{ color: secondary }" v-if="item.link_url=='/pages/user-center/integral-detail/integral-detail'">{{user_info.integral}}</Text>
<!-- 余额 -->
<Text :style="{ color: secondary }" v-if="item.link_url=='/pages/balance/balance'">{{user_info.balance}}</Text>
<!-- 卡券 -->
<Text :style="{ color: secondary }" v-if="item.link_url=='/pages/card/index/index'">{{user_info.card}}</Text>
<view class="footprint_item_bottom"> <view class="footprint_item_bottom">
<image :src="item.icon_url" style="width: 26rpx;height: 26rpx;"></image> <image :src="item.icon_url" style="width: 26rpx;height: 26rpx;"></image>
<Text style="margin-left: 10rpx;">{{ item.name }}</Text> <Text style="margin-left: 10rpx;">{{ item.name }}</Text>
</view> </view>
</view> </view>
<view style="width: 1px;height: 60rpx;background: #f5f5f5;" v-if="meueData.user_center.account_bar.integral.status == 1"></view> <view style="width: 1px;height: 60rpx;background: #f5f5f5;" v-if="meueData.user_center.account_bar.integral.status == 1"></view>
<!-- <view class="account_bar_item" v-if="meueData.user_center.account_bar.balance.status == 1" @click="goUrl('/pages/balance/balance')">
<Text :style="{ color: secondary }">{{ user_info.balance }}</Text>
<view class="footprint_item_bottom">
<image :src="meueData.user_center.account_bar.balance.icon" style="width: 26rpx;height: 26rpx;"></image>
<Text style="margin-left: 10rpx;">{{ meueData.user_center.account_bar.balance.text }}</Text>
</view>
</view>
<view style="width: 1px;height: 60rpx;background: #f5f5f5;" v-if="meueData.user_center.account_bar.balance.status == 1"></view>
<view class="account_bar_item" v-if="meueData.user_center.account_bar.coupon.status == 1">
<Text :style="{ color: secondary }">{{ user_info.coupon }}</Text>
<view class="footprint_item_bottom">
<image :src="meueData.user_center.account_bar.coupon.icon" style="width: 26rpx;height: 26rpx;"></image>
<Text style="margin-left: 10rpx;">{{ meueData.user_center.account_bar.coupon.text }}</Text>
</view>
</view>
<view style="width: 1px;height: 60rpx;background: #f5f5f5;" v-if="meueData.user_center.account_bar.coupon.status == 1"></view>
<view class="account_bar_item" v-if="meueData.user_center.account_bar.card.status == 1">
<Text :style="{ color: secondary }">{{ user_info.card }}</Text>
<view class="footprint_item_bottom">
<image :src="meueData.user_center.account_bar.card.icon" style="width: 26rpx;height: 26rpx;"></image>
<Text style="margin-left: 10rpx;">{{ meueData.user_center.account_bar.card.text }}</Text>
</view>
</view> -->
</view> </view>
<view class="order_bar" v-if="meueData.user_center.is_order_bar_status == 1"> <view class="order_bar" v-if="meueData.user_center.is_order_bar_status == 1">
...@@ -75,7 +57,16 @@ ...@@ -75,7 +57,16 @@
<view class="order_bar_item" v-for="(item, index) in meueData.user_center.order_bar" :key="index" :name="item.name" @click="goUrl(item.link_url)"> <view class="order_bar_item" v-for="(item, index) in meueData.user_center.order_bar" :key="index" :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 v-if="item.num > 0" class="badge" :style="{ background: mainColor }">{{ item.num }}</view> <!-- 待付款 -->
<view v-if="item.link_url =='/pages/order/index/index?status=1'&&user_info.MyOrder.NonPayment>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.NonPayment }}</view>
<!-- 待发货 -->
<view v-if="item.link_url =='/pages/order/index/index?status=2'&&user_info.MyOrder.WaitSendGoods>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.WaitSendGoods}}</view>
<!-- 待收货 -->
<view v-if="item.link_url =='/pages/order/index/index?status=3'&&user_info.MyOrder.WaitReceiving>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.WaitReceiving }}</view>
<!-- 待评价 -->
<view v-if="item.link_url =='/pages/order/index/index?status=4'&&user_info.MyOrder.WaitCommentNum>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.WaitCommentNum }}</view>
<!-- 售后 -->
<view v-if="item.link_url =='/pages/order/index/index?status=5'&&user_info.MyOrder.AfterSaleNum>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.AfterSaleNum }}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -102,6 +93,7 @@ ...@@ -102,6 +93,7 @@
</view> </view>
</view> </view>
<!-- <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth> --> <!-- <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth> -->
<tabbars></tabbars> <tabbars></tabbars>
</view> </view>
</template> </template>
...@@ -169,7 +161,7 @@ export default { ...@@ -169,7 +161,7 @@ export default {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '用户中心' title: '用户中心'
}); });
this.userinfo(); //this.userinfo();
this.getmeue(); this.getmeue();
}, },
methods: { methods: {
...@@ -202,7 +194,7 @@ export default { ...@@ -202,7 +194,7 @@ export default {
uni.hideNavigationBarLoading(); uni.hideNavigationBarLoading();
//this.isloading = false; //this.isloading = false;
this.meueData = res.data.config; this.meueData = res.data.config;
// this.user_info = res.data.user_center; this.user_info = res.data.user_info;
} }
); );
}, },
...@@ -289,6 +281,7 @@ export default { ...@@ -289,6 +281,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-right:1px solid #d1d1d1; border-right:1px solid #d1d1d1;
width:25%;
} }
.userStyle .account_bar_item:last-child{ .userStyle .account_bar_item:last-child{
border-right:0; border-right:0;
......
plugin/api.js
View file @ 39e09bc7
...@@ -14,16 +14,15 @@ export default { ...@@ -14,16 +14,15 @@ export default {
data: param.data, data: param.data,
success: res => { success: res => {
if (res.data.code != 0 && res.data.msg != "商品未上架") { if (res.data.code != 0 && res.data.msg != "商品未上架") {
wx.showModal({ // wx.showModal({
content: '网络开小差了，刷新页面重新加载吧', // content: '网络开小差了，刷新页面重新加载吧',
showCancel: false // showCancel: false
}) // })
console.group("发生了异常情况"); console.group("发生了异常情况");
console.error(res.data.msg); console.error(res.data.msg);
console.groupEnd(); console.groupEnd();
} else {
typeof success == "function" && success(res.data);
} }
typeof success == "function" && success(res.data);
}, },
fail: (e) => { fail: (e) => {
console.log("网络请求fail:" + JSON.stringify(e)); console.log("网络请求fail:" + JSON.stringify(e));
...@@ -44,9 +43,10 @@ export default { ...@@ -44,9 +43,10 @@ export default {
'content-type': "application/json" 'content-type': "application/json"
}, },
data: { data: {
"MallBaseId": 0, MallBaseId: 1,
"TenantId": 0, TenantId: 1,
"OpenId": this.GetOpenId(), OpenId: this.GetOpenId().OpenId,
UserId: this.GetOpenId().UserId,
MiniAppId: this.GetMiniAppId(), MiniAppId: this.GetMiniAppId(),
msg: param.data msg: param.data
}, },
...@@ -78,7 +78,11 @@ export default { ...@@ -78,7 +78,11 @@ export default {
} }
//获取OpenId //获取OpenId
Vue.prototype.GetOpenId = function() { Vue.prototype.GetOpenId = function() {
return 'ow_7I5ZQKhAB66yvOTGI35Xk-Kmg' var obj = {
OpenId: 'ow_7I5ZQKhAB66yvOTGI35Xk-Kmg',
UserId: 19992
}
return obj
} }
//公用判断图片地址 判断是否包含http //公用判断图片地址 判断是否包含http
Vue.prototype.getIconLink = function(url) { Vue.prototype.getIconLink = function(url) {
...@@ -92,6 +96,11 @@ export default { ...@@ -92,6 +96,11 @@ export default {
return str; return str;
} }
} }
//价格返回.00
Vue.prototype.getPrice = function(val) {
val = Number(val).toFixed(2);
return val
}
Vue.prototype.apiheader = function() { Vue.prototype.apiheader = function() {
return { return {
......
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