Skip to content

肖康 / H5_2.0

Go to a project
Commit 767e997a by LJM
Options

css

parent 05b68135
Expand all
Inline Side-by-side
Showing with 214 additions and 77 deletions
assets/css/mine/activity.scss
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
margin-bottom: 16rpx; margin-bottom: 16rpx;
width: 95%;
} }
.p2 { .p2 {
font-size: 22rpx; font-size: 22rpx;
...@@ -85,6 +86,7 @@ ...@@ -85,6 +86,7 @@
margin-left: 10rpx; margin-left: 10rpx;
font-size: 60rpx; font-size: 60rpx;
color: #ffffff; color: #ffffff;
font-family: Impact;
} }
} }
.p2 { .p2 {
...@@ -117,15 +119,23 @@ ...@@ -117,15 +119,23 @@
color: #1969f9; color: #1969f9;
} }
} }
.type-1 { .type {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
width: 82rpx; width: 82rpx;
height: 68rpx; height: 68rpx;
background: url('https://img.ichunt.com/images/ichunt/202305/19/f8fb5d9934fd1227ba807378939a5565.png') no-repeat center; background: url('https://img.ichunt.com/images/ichunt/202305/22/0aaf37437c984408376b330da3dbf323.png') no-repeat center;
background-size: cover; background-size: cover;
z-index: 99; z-index: 99;
.tt {
margin-left: 22rpx;
margin-top: 6rpx;
text-align: center;
transform: rotate(45deg);
color: #fff;
font-size: 22rpx;
}
} }
&.disabled { &.disabled {
.left { .left {
...@@ -136,3 +146,15 @@ ...@@ -136,3 +146,15 @@
} }
} }
} }
.no-data {
image {
width: 356rpx;
height: 356rpx;
}
.tt {
margin-top: 32rpx;
font-size: 28rpx;
color: #292b33;
}
}
assets/css/mine/company.scss
...@@ -173,6 +173,10 @@ ...@@ -173,6 +173,10 @@
height: 32rpx; height: 32rpx;
background: url('https://img.ichunt.com/images/ichunt/202305/19/53c6f67275c83a0f9ccaa565c018cfcd.png') no-repeat center; background: url('https://img.ichunt.com/images/ichunt/202305/19/53c6f67275c83a0f9ccaa565c018cfcd.png') no-repeat center;
background-size: cover; background-size: cover;
&.active {
background: url('https://img.ichunt.com/images/ichunt/202305/19/e6d61a2c75f0185a207904679ec70273.png') no-repeat center;
background-size: cover;
}
} }
.tt { .tt {
max-width: 80%; max-width: 80%;
......
assets/css/mine/shoporder.scss
...@@ -161,7 +161,6 @@ ...@@ -161,7 +161,6 @@
margin-right: 0; margin-right: 0;
} }
} }
.btn0 { .btn0 {
background: #f98119; background: #f98119;
border-radius: 6rpx; border-radius: 6rpx;
......
assets/css/mine/user.scss
...@@ -151,24 +151,59 @@ ...@@ -151,24 +151,59 @@
font-weight: bold; font-weight: bold;
} }
.right-bar { .right-bar {
.btn1 { .btn {
width: 142rpx; width: 120rpx;
height: 48rpx; height: 48rpx;
margin-right: 24rpx;
&:last-child {
margin-right: 0;
}
}
.btn0 {
background: #f98119;
border-radius: 6rpx;
font-size: 22rpx;
color: #fff;
}
.btn1 {
border-radius: 6rpx;
border: 1px solid #1969f9;
font-size: 22rpx;
color: #1969f9;
}
.btn2 {
border-radius: 6rpx;
border: 1px solid #1969f9;
font-size: 22rpx;
color: #1969f9;
}
.btn3 {
background: #ffffff; background: #ffffff;
border-radius: 6rpx; border-radius: 6rpx;
opacity: 0.54; opacity: 0.54;
border: 1px solid #c6c7cc; border: 1px solid #c6c7cc;
margin-right: 24rpx;
font-size: 22rpx; font-size: 22rpx;
color: #484b59; color: #484b59;
} }
.btn2 { .btn4 {
width: 142rpx; background: #1969f9;
height: 48rpx;
background: #f98119;
border-radius: 6rpx; border-radius: 6rpx;
font-size: 22rpx; font-size: 22rpx;
color: #ffffff; color: #fff;
}
.btn5 {
background: #ffffff;
border-radius: 6rpx;
opacity: 0.54;
border: 1px solid #c6c7cc;
font-size: 22rpx;
color: #484b59;
}
.btn6 {
background: #1969f9;
border-radius: 6rpx;
font-size: 22rpx;
color: #fff;
} }
} }
} }
......
pages/mine/activity.vue
...@@ -4,36 +4,65 @@ ...@@ -4,36 +4,65 @@
<view class="tab row verCenter avarage"> <view class="tab row verCenter avarage">
<view class="box row verCenter" @click="tab(index)" v-for="(item, index) in text_arr" :key="index" :class="{ curr: index == curr }">{{ item }}</view> <view class="box row verCenter" @click="tab(index)" v-for="(item, index) in text_arr" :key="index" :class="{ curr: index == curr }">{{ item }}</view>
</view> </view>
<view class="list" v-if="curr == 0"> <!-- 活动中心 -->
<view class="box" v-for="(item, index) in 10" :key="index"> <template v-if="curr == 0">
<view class="pic"><image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/20/ffa1060a38803d5b436b33259fe142d0.jpg"></image></view> <view class="list" v-if="activity_list.length > 0">
<view class="box" v-for="(item, index) in activity_list" :key="index">
<view class="pic"><image mode="aspectFill" :src="item.image_h5"></image></view>
<view class="text"> <view class="text">
<view class="p1">新人注册享288大礼包，首单再送200元京东卡</view> <view class="p1">{{ item.web_description }}</view>
<view class="p2">2023-03-16 18:23:17</view> <view class="p2">{{ item.create_time }}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="coupon-list" v-else-if="curr == 1"> <view class="no-data column rowCenter verCenter" v-else>
<view class="box row verCenter" v-for="(item, index) in 100" :key="index"> <image src="../../static/nodate.png"></image>
<text class="tt">暂无活动</text>
</view>
</template>
<!-- 领券中心 -->
<template v-else-if="curr == 1">
<view class="coupon-list" v-if="coupon_list.length > 0">
<view class="box row verCenter" v-for="(item, index) in coupon_list" :key="item.coupon_id">
<view class="left column rowCenter verCenter"> <view class="left column rowCenter verCenter">
<view class="p1"> <view class="p1">
<template v-if="item.coupon_type == 1">
<text class="t1">￥</text> <text class="t1">￥</text>
<text class="t2">10</text> <text class="t2">{{ Number(item.sale_amount).toFixed(2) }}</text>
</template>
<template v-else-if="item.coupon_type == 2">
<text class="t2">{{ (Number(item.sale_amount) * 10).toFixed(2) }}</text>
<text class="t1">折</text>
</template>
</view> </view>
<view class="p2">满￥200可用</view> <view class="p2">{{ item.require_desc }}</view>
</view> </view>
<view class="right"> <view class="right">
<view class="p1"> <view class="p1">
<template v-if="item.coupon_goods_range == 1">
<text class="t1">适用于</text> <text class="t1">适用于</text>
<text class="t2">全站</text> <text class="t2">{{ item.coupon_mall_type == 1 ? '全站' : item.coupon_mall_type == 2 ? '全部自营' : '全部联营' }}</text>
<text class="t1">商品</text> <text class="t1">商品</text>
</template>
<template v-else>
<text class="t1">适用于</text>
<text class="t2">{{ item.selected_supplier ? '供应商' + item.selected_supplier : '' }}{{ item.selected_brand ? '制造商' + item.selected_brand : '' }}</text>
<text class="t1">所有商品</text>
</template>
</view>
<view class="p2">{{ item.start_time }} - {{ item.end_time }}</view>
<navigator class="p3 row rowCenter verCenter" v-if="item.status == -1" url="/" hover-class="none">立即使用</navigator>
</view> </view>
<view class="p2">2023.02.27-2023.04.01</view> <view class="type">
<view class="p3 row rowCenter verCenter">立即领取</view> <view class="tt">{{ item.coupon_mall_type == 1 ? '全站' : item.coupon_mall_type == 2 ? '自营' : '联营' }}</view>
</view> </view>
<text class="type-1"></text>
</view> </view>
</view> </view>
<view class="no-data column rowCenter verCenter" v-else>
<image src="../../static/nodate.png"></image>
<text class="tt">暂无优惠券</text>
</view>
</template>
</view> </view>
</template> </template>
...@@ -48,13 +77,34 @@ export default { ...@@ -48,13 +77,34 @@ export default {
data() { data() {
return { return {
curr: 0, curr: 0,
text_arr: ['活动中心', '领券中心'] text_arr: ['活动中心', '领券中心'],
activity_list: [],
coupon_list: []
}; };
}, },
onShow() {}, onShow() {
this.getData();
},
methods: { methods: {
tab(index) { tab(index) {
this.curr = index; this.curr = index;
this.getData();
},
getData() {
this.request(Api_Url + '/Activity/Cube/getActivityCenterData', 'GET', {}, true, true).then(res => {
if (res.err_code === 0) {
if (this.curr == 0) {
this.activity_list = res.data.activity_list;
}
if (this.curr == 1) {
this.coupon_list = res.data.coupon_list;
}
} else if (res.err_code === 11012) {
uni.navigateTo({
url: '/login'
});
}
});
} }
} }
}; };
......
pages/mine/company.vue
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
brandList: [], brandList: [],
brand_name: '', brand_name: '',
brand_text: '', brand_text: '',
brand_id: [],
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的idsss filter_id: [], //过滤处理的idsss
formParams: { formParams: {
...@@ -140,8 +141,11 @@ export default { ...@@ -140,8 +141,11 @@ export default {
* @param {Object} event * @param {Object} event
*/ */
handleInput: debounce(function(event) { handleInput: debounce(function(event) {
this.getBrandList(); if (this.brand_name) {
}, 800), this.filter_id = [];
}
this.getBrandList(true);
}, 500),
/** /**
* @param {Object} arr * @param {Object} arr
* @param {Object} target * @param {Object} target
...@@ -173,11 +177,23 @@ export default { ...@@ -173,11 +177,23 @@ export default {
/** /**
* 获取品牌 * 获取品牌
*/ */
getBrandList() { getBrandList(type) {
this.request(Api_Url + '/public/getBrandList', 'POST', { brand_name: this.brand_name }, true, true).then(res => { this.request(Api_Url + '/public/getBrandList', 'POST', { brand_name: this.brand_name }, true, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.brandList = res.data; this.brandList = res.data;
this.filter_list = createArray(res.data.length, false); this.filter_list = createArray(res.data.length, false);
if (!type) {
this.filter_id = this.brand_id;
}
var id = this.brand_id;
var result = [];
this.brandList.forEach(function(item, index) {
if (id.indexOf(item.brand_id) !== -1) {
result.push(index);
}
});
result.forEach(i => (this.filter_list[i] = true));
} }
}); });
}, },
...@@ -201,7 +217,12 @@ export default { ...@@ -201,7 +217,12 @@ export default {
var brand_name = res.data.company_info.brand_list.map(function(brand) { var brand_name = res.data.company_info.brand_list.map(function(brand) {
return brand.brand_name; return brand.brand_name;
}); });
var brand_id = res.data.company_info.brand_list.map(function(brand) {
return brand.brand_id;
});
this.brand_text = brand_name.join(','); this.brand_text = brand_name.join(',');
this.brand_id = brand_id;
} else { } else {
this.brand_text = ''; this.brand_text = '';
} }
......
pages/mine/coupon.vue
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<view class="p1"> <view class="p1">
<template v-if="item.coupon_type == 1"> <template v-if="item.coupon_type == 1">
<text class="t1">￥</text> <text class="t1">￥</text>
<text class="t2">{{ item.sale_amount.toFixed(2) }}</text> <text class="t2">{{ Number(item.sale_amount).toFixed(2) }}</text>
</template> </template>
<template v-else-if="item.coupon_type == 2"> <template v-else-if="item.coupon_type == 2">
<text class="t2">{{ (item.sale_amount * 10).toFixed(2) }}</text> <text class="t2">{{ (Number(item.sale_amount) * 10).toFixed(2) }}</text>
<text class="t1">折</text> <text class="t1">折</text>
</template> </template>
</view> </view>
......
pages/mine/forget.vue
...@@ -88,7 +88,9 @@ export default { ...@@ -88,7 +88,9 @@ export default {
} }
}; };
}, },
onLoad() {}, onLoad(options) {
this.formParams.account = options.account;
},
methods: { methods: {
bindPickerChange: function(e) { bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value); console.log('picker发送选择改变，携带值为', e.detail.value);
......
pages/mine/inquery.vue
...@@ -15,7 +15,10 @@ ...@@ -15,7 +15,10 @@
<view class="box column" v-for="(item, index) in list" :key="index"> <view class="box column" v-for="(item, index) in list" :key="index">
<view class="row bothSide verCenter"> <view class="row bothSide verCenter">
<view class="p1">{{ item.model }}</view> <view class="p1">{{ item.model }}</view>
<view class="p2">{{ item.status_name }}</view> <!-- 已答复 -->
<view class="p2" v-if="item.status == 1" style="color:#919399;">{{ item.status_name }}</view>
<!-- 待处理 -->
<view class="p2" v-else>{{ item.status_name }}</view>
</view> </view>
<text class="time">询价时间：{{ item.create_time }}</text> <text class="time">询价时间：{{ item.create_time }}</text>
</view> </view>
...@@ -38,7 +41,7 @@ export default { ...@@ -38,7 +41,7 @@ export default {
data() { data() {
return { return {
curr: 0, curr: 0,
text_arr: ['全部', '待处理', '已答复'], text_arr: [],
list: [], list: [],
count: [], count: [],
searchParams: { searchParams: {
...@@ -70,6 +73,7 @@ export default { ...@@ -70,6 +73,7 @@ export default {
this.count[0] = res.data[-1]; this.count[0] = res.data[-1];
this.count[1] = res.data[1]; this.count[1] = res.data[1];
this.count[2] = res.data[-2]; this.count[2] = res.data[-2];
this.text_arr = ['全部', '待处理', '已答复'];
} }
}); });
this.request(Api_Url + '/help/help/feedback_list', 'POST', this.searchParams, true, true).then(res => { this.request(Api_Url + '/help/help/feedback_list', 'POST', this.searchParams, true, true).then(res => {
......
pages/mine/invoice.vue
...@@ -4,22 +4,23 @@ ...@@ -4,22 +4,23 @@
<view class="tip row verCenter"> <view class="tip row verCenter">
<text class="iconfont icon-ts"></text> <text class="iconfont icon-ts"></text>
<text class="t1">已创建</text> <text class="t1">已创建</text>
<text class="t2">2</text> <text class="t2">{{ list.length }}</text>
<text class="t1">个发票信息，最多</text> <text class="t1">个发票信息，最多</text>
<text class="t2">20</text> <text class="t2">20</text>
<text class="t1">个有效发票信息</text> <text class="t1">个有效发票信息</text>
</view> </view>
<view class="list"> <view class="list" v-if="list.length > 0">
<view class="box"> <view class="box" v-for="(item, index) in list" :key="index">
<view class="p1 row verCenter"> <view class="p1 row verCenter">
<text class="t1">深圳市猎芯科技有限公司</text> <text class="t1">{{ item.tax_title }}</text>
<text class="label row rowCenter verCenter">专票</text> <text class="label row rowCenter verCenter" v-if="item.inv_type == 3">专用</text>
<text class="label row rowCenter verCenter" v-else>普通</text>
</view> </view>
<view class="p2 row verCenter"> <view class="p2 row verCenter">
<text class="t1">蔡先生</text> <text class="t1">{{ item.consignee }}</text>
<text class="t2">13800138000</text> <text class="t2">{{ item.consignee_phone }}</text>
</view> </view>
<view class="p3">广东省深圳市龙岗区坂田清丽路1号宝能科技园南区12栋11楼</view> <view class="p3">{{ item.consignee_province_val }}{{ item.consignee_city_val }}{{ item.consignee_district_val }}{{ item.consignee_address }}</view>
<view class="operate row bothSide verCenter"> <view class="operate row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<view class="default"></view> <view class="default"></view>
...@@ -37,35 +38,8 @@ ...@@ -37,35 +38,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="box">
<view class="p1 row verCenter">
<text class="t1">深圳市猎芯科技有限公司</text>
<text class="label-t row rowCenter verCenter">普票</text>
</view>
<view class="p2 row verCenter">
<text class="t1">蔡先生</text>
<text class="t2">13800138000</text>
</view>
<view class="p3">广东省深圳市龙岗区坂田清丽路1号宝能科技园南区12栋11楼</view>
<view class="operate row bothSide verCenter default-curr">
<view class="row verCenter">
<view class="default"></view>
<text class="default-text">默认发票</text>
</view>
<view class="row verCenter">
<navigator class="edit row verCenter" url="/user/invoiceEdit" hover-class="none">
<text class="iconfont icon-bjt"></text>
<text class="tt">编辑</text>
</navigator>
<view class="delete row verCenter">
<text class="iconfont icon-del"></text>
<text class="tt">删除</text>
</view> </view>
</view> <view class="no-data column rowCenter verCenter" v-else>
</view>
</view>
</view>
<view class="no-data column rowCenter verCenter">
<image src="../../static/nodate.png"></image> <image src="../../static/nodate.png"></image>
<text class="tt">暂无发票信息</text> <text class="tt">暂无发票信息</text>
</view> </view>
...@@ -87,10 +61,26 @@ export default { ...@@ -87,10 +61,26 @@ export default {
navElement navElement
}, },
data() { data() {
return {}; return {
list: []
};
},
onShow() {
this.getData();
}, },
onLoad() {}, methods: {
methods: {} getData() {
this.request(Api_Url + '/invoice/lists', 'POST', {}, true, true).then(res => {
if (res.err_code === 0) {
this.list = res.data.list;
} else if (res.err_code == 11012) {
uni.navigateTo({
url: '/login?referer=/user/reciveaddress'
});
}
});
}
}
}; };
</script> </script>
......
pages/mine/setting.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="page-setting"> <view class="page-setting">
<navElement title="账户设置"></navElement> <navElement title="账户设置"></navElement>
<view class="list" v-if="userInfo.user_info"> <view class="list" v-if="userInfo.user_info">
<navigator class="box row bothSide verCenter" url="/forget" hover-class="none"> <navigator class="box row bothSide verCenter" :url="'/forget?account=' + userInfo.user_info.mobile" hover-class="none">
<view class="text"> <view class="text">
<text class="t1">手机号</text> <text class="t1">手机号</text>
<text class="t2">{{ userInfo.user_info.mobile }}</text> <text class="t2">{{ userInfo.user_info.mobile }}</text>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</view> </view>
<view class="label-box row"> <view class="label-box row">
<text class="t1">主营品牌：</text> <text class="t1">主营品牌：</text>
<text class="t2" style="color: #1969F9;">--</text> <text class="t2" style="color: #1969F9;">{{ brand_name }}</text>
</view> </view>
<view class="label-box row"> <view class="label-box row">
<text class="t1">公司简介：</text> <text class="t1">公司简介：</text>
...@@ -94,7 +94,8 @@ export default { ...@@ -94,7 +94,8 @@ export default {
}, },
data() { data() {
return { return {
userInfo: {} userInfo: {},
brand_name: ''
}; };
}, },
onShow() { onShow() {
...@@ -105,6 +106,15 @@ export default { ...@@ -105,6 +106,15 @@ export default {
this.request(Api_Url + '/user/getUserType', 'POST', {}, true, true).then(res => { this.request(Api_Url + '/user/getUserType', 'POST', {}, true, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.userInfo = res.data; this.userInfo = res.data;
//品牌
if (res.data.company_info.brand_list.length > 0) {
var brand_name = res.data.company_info.brand_list.map(function(brand) {
return brand.brand_name;
});
this.brand_name = brand_name.join(',');
} else {
this.brand_name = '';
}
} else if (res.err_code === 11012) { } else if (res.err_code === 11012) {
uni.navigateTo({ uni.navigateTo({
url: '/login' url: '/login'
......
router/index.js
...@@ -166,7 +166,7 @@ const router = new Router({ ...@@ -166,7 +166,7 @@ const router = new Router({
aliasPath: '/activity/zqsx', aliasPath: '/activity/zqsx',
meta: { meta: {
title: '账期服务', title: '账期服务',
auth: true auth: false
} }
}, },
{ {
......
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 sign in to comment