Skip to content

肖康 / H5_2.0

Go to a project
Commit ad3e943c by 肖康
Options

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0 

# Conflicts:
#	pages.json
#	router/index.js
parents e45b8445 4af951b8
Inline Side-by-side
Showing with 186 additions and 233 deletions
assets/css/mine/userCoupon.scss
......@@ -65,6 +65,7 @@
margin-left: 10rpx;
font-size: 60rpx;
color: #ffffff;
font-family: Impact;
}
}
.p2 {
......@@ -97,15 +98,23 @@
color: #1969f9;
}
}
.type-1 {
.type {
position: absolute;
right: 0;
top: 0;
width: 82rpx;
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;
z-index: 99;
.tt {
margin-left: 22rpx;
margin-top: 6rpx;
text-align: center;
transform: rotate(45deg);
color: #fff;
font-size: 22rpx;
}
}
&.disabled {
.left {
......
pages.json
......@@ -54,18 +54,18 @@
}
},
{
"path": "pages/confirm/confirmSuccess",
"style": {
"navigationBarTitleText": "提交订单成功"
}
},
{
"path": "pages/confirm/pay",
"style": {
"navigationBarTitleText": "猎芯收银台"
}
},
{
"path": "pages/confirm/confirmSuccess",
"style": {
"navigationBarTitleText": "提交订单成功"
}
},
{
"path": "pages/mine/login",
"style": {
"navigationBarTitleText": "登录"
......@@ -90,7 +90,7 @@
}
},
{
"path": "pages/mine/userOrder",
"path": "pages/mine/shoporder",
"style": {
"navigationBarTitleText": "订单列表"
}
......
pages/mine/feedback.vue
......@@ -4,17 +4,14 @@
<view class="content">
<view class="t1">问题类型</view>
<view class="type row">
<view class="box curr row rowCenter verCenter">购物流程</view>
<view class="box row rowCenter verCenter">物流问题</view>
<view class="box row rowCenter verCenter">售后服务</view>
<view class="box row rowCenter verCenter">其它</view>
<view class="box row rowCenter verCenter" v-for="(item, index) in arr" :key="index" :class="{ curr: index == curr }" @click="tab(index)">{{ item }}</view>
</view>
<view class="suggest column">
<text class="t2">请留下您宝贵的建议：</text>
<textarea></textarea>
<textarea v-model="formParams.content"></textarea>
</view>
</view>
<view class="btn"><view class="btn1 row rowCenter verCenter">提交</view></view>
<view class="btn"><view class="btn1 row rowCenter verCenter" @click="submit()">提交</view></view>
</view>
</template>
......@@ -26,10 +23,59 @@ export default {
navElement
},
data() {
return {};
return {
curr: -1,
arr: ['购物流程', '物流问题', '售后服务', '其它'],
formParams: {
type: '',
content: '',
source: window.location.href
}
};
},
onShow() {},
methods: {}
methods: {
tab(index) {
this.curr = index;
this.formParams.type = index + 1;
},
submit() {
if (!this.formParams.type) {
uni.showToast({
title: '请选择问题类型',
icon: 'none'
});
return false;
}
if (!this.formParams.content) {
uni.showToast({
title: '请填写你的宝贵意见',
icon: 'none'
});
return false;
}
this.request(Api_Url + '/help/help/feedback', 'POST', this.formParams, true, true).then(res => {
if (res.err_code === 0) {
uni.showToast({
title: '谢谢您的反馈',
icon: 'success'
});
setTimeout(() => {
uni.navigateBack({
delta: 1
});
}, 2000);
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
}
}
};
</script>
......
pages/mine/inquery.vue
......@@ -8,26 +8,19 @@
<view class="tab row avarage verCenter">
<view class="box row rowCenter verCenter" @click="tab(index)" :class="{ curr: index == curr }" :key="index" v-for="(item, index) in text_arr">
<text class="t2">{{ item }}</text>
<text class="t3">（0）</text>
<text class="t3">（{{ count[index] }}）</text>
</view>
</view>
<view class="list">
<view class="box column">
<view class="list" v-if="list.length > 0">
<view class="box column" v-for="(item, index) in list" :key="index">
<view class="row bothSide verCenter">
<view class="p1">STM1568843M</view>
<view class="p2">待处理</view>
<view class="p1">{{ item.model }}</view>
<view class="p2">{{ item.status_name }}</view>
</view>
<text class="time">询价时间：2021.09.26 17:34:50</text>
</view>
<view class="box column">
<view class="row bothSide verCenter">
<view class="p1">STM1568843M</view>
<view class="p3">已答复</view>
</view>
<text class="time">询价时间：2021.09.26 17:34:50</text>
<text class="time">询价时间：{{ item.create_time }}</text>
</view>
</view>
<view class="no-data column rowCenter verCenter">
<view class="no-data column rowCenter verCenter" v-else>
<image src="../../static/nodate.png"></image>
<text class="tt">暂无询价记录信息</text>
</view>
......@@ -36,6 +29,7 @@
<script>
import { Api_Url } from '@/util/api.js';
import { getCookie } from '@/util/util.js';
import navElement from '@/components/nav.vue';
export default {
components: {
......@@ -44,13 +38,45 @@ export default {
data() {
return {
curr: 0,
text_arr: ['全部', '待处理', '已答复']
text_arr: ['全部', '待处理', '已答复'],
list: [],
count: [],
searchParams: {
status: '',
page: 1,
limit: 1000,
user_id: getCookie('Yo4teW_uid')
}
};
},
onShow() {},
onShow() {
this.getData();
},
methods: {
tab(index) {
this.curr = index;
if (index == 0) {
this.searchParams.status = '';
} else if (index == 1) {
this.searchParams.status = 0;
} else if (index == 2) {
this.searchParams.status = 1;
}
this.getData();
},
getData() {
this.request(Api_Url + '/ucoupon/count', 'POST', {}, true, true).then(res => {
if (res.err_code === 0) {
this.count[0] = res.data[-1];
this.count[1] = res.data[1];
this.count[2] = res.data[-2];
}
});
this.request(Api_Url + '/help/help/feedback_list', 'POST', this.searchParams, true, true).then(res => {
if (res.err_code === 0) {
this.list = res.data.list;
}
});
}
}
};
......
pages/mine/user.vue
......@@ -13,7 +13,7 @@
</view>
<view class="company"><image src="https://img.ichunt.com/images/ichunt/202305/19/8645c77def093657ad5ae66b4af6cad4.png"></image></view>
<view class="user-center">
<navigator class="box column rowCenter verCenter" url="/userOrder" hover-class="none">
<navigator class="box column rowCenter verCenter" url="/user/shoporder" hover-class="none">
<image src="../../static/order.png"></image>
<text class="tt">我的订单</text>
<text class="tip"></text>
......
pages/mine/userCoupon.vue
......@@ -2,56 +2,52 @@
<view class="page-userCoupon">
<navElement title="我的优惠券">
<template slot="title-bar">
<navigator class="go-coupon" url="/user" hover-class="none">去领券</navigator>
<navigator class="go-coupon" url="/user/activity" hover-class="none">去领券</navigator>
</template>
</navElement>
<view class="tab row avarage verCenter">
<view class="box row rowCenter verCenter" @click="tab(index)" :class="{ curr: index == curr }" :key="index" v-for="(item, index) in text_arr">
<text class="t2">{{ item }}</text>
<text class="t3">（0）</text>
<text class="t3">（{{ count[index] }}）</text>
</view>
</view>
<template v-if="curr == 0">
<view class="list">
<view class="box row verCenter" v-for="(item, index) in 100" :key="index">
<view class="left column rowCenter verCenter">
<view class="p1">
<view class="list" v-if="list.length > 0">
<view class="box row verCenter" v-for="(item, index) in list" :key="index">
<view class="left column rowCenter verCenter">
<view class="p1">
<template v-if="item.coupon_type == 1">
<text class="t1">￥</text>
<text class="t2">10</text>
</view>
<view class="p2">满￥200可用</view>
<text class="t2">{{ item.sale_amount.toFixed(2) }}</text>
</template>
<template v-else-if="item.coupon_type == 2">
<text class="t2">{{ (item.sale_amount * 10).toFixed(2) }}</text>
<text class="t1">折</text>
</template>
</view>
<view class="right">
<view class="p1">
<view class="p2">{{ item.require_desc }}</view>
</view>
<view class="right">
<view class="p1">
<template v-if="item.coupon_goods_range == 1">
<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>
</view>
<view class="p2">2023.02.27-2023.04.01</view>
<view class="p3 row rowCenter verCenter">立即使用</view>
</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>
<text class="type-1"></text>
<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>
</template>
<template v-if="curr == 1">
<view class="list">
<view class="box row verCenter disabled" v-for="(item, index) in 100" :key="index">
<view class="left column rowCenter verCenter">
<view class="p1">
<text class="t1">￥</text>
<text class="t2">10</text>
</view>
<view class="p2">满￥200可用</view>
</view>
<view class="right">
<view class="p1"><text class="t1">新人优惠券</text></view>
<view class="p2">2023.02.27-2023.04.01</view>
</view>
<view class="type">
<view class="tt">{{ item.coupon_mall_type == 1 ? '全站' : item.coupon_mall_type == 2 ? '自营' : '联营' }}</view>
</view>
</view>
</template>
<template v-if="curr == 2">
</view>
<template v-else>
<view class="no-data column rowCenter verCenter">
<image src="../../static/nodate.png"></image>
<text class="tt">暂无优惠券信息</text>
......@@ -71,13 +67,42 @@ export default {
data() {
return {
curr: 0,
text_arr: ['未使用', '已使用', '已过期']
text_arr: ['未使用', '已使用', '已过期'],
list: [],
count: [],
searchParams: {
status: -1
}
};
},
onLoad() {},
onShow() {
this.getData();
},
methods: {
tab(index) {
this.curr = index;
if (index == 0) {
this.searchParams.status = -1;
} else if (index == 1) {
this.searchParams.status = 1;
} else if (index == 2) {
this.searchParams.status = -2;
}
this.getData();
},
getData() {
this.request(Api_Url + '/ucoupon/count', 'POST', {}, true, true).then(res => {
if (res.err_code === 0) {
this.count[0] = res.data[-1];
this.count[1] = res.data[1];
this.count[2] = res.data[-2];
}
});
this.request(Api_Url + '/ucoupon/lists', 'POST', this.searchParams, true, true).then(res => {
if (res.err_code === 0) {
this.list = res.data;
}
});
}
}
};
......
pages/mine/userOrder.vue deleted 100644 → 0
<template>
<view class="page-userOrder">
<drag-button-follow follow="left,right" className="drag-button" class="drag-button" :url="kfurl"></drag-button-follow>
<view class="top">
<view class="head row bothSide verCenter">
<view class="left row verCenter">
<text class="iconfont icon-arrleft" v-back></text>
<view class="search-box row verCenter">
<text class="iconfont icon-search"></text>
<input type="text" placeholder="请输入订单号/型号" class="uni-input" />
</view>
</view>
<text class="filter" @click="open()">筛选</text>
</view>
<view class="tab row avarage verCenter">
<view class="box row rowCenter verCenter"><text class="t1">全部</text></view>
<view class="box row rowCenter verCenter curr">
<text class="t2">待付款</text>
<text class="t3">（0）</text>
</view>
<view class="box row rowCenter verCenter">
<text class="t2">待收货</text>
<text class="t3">（80）</text>
</view>
<view class="box row rowCenter verCenter">
<text class="t2">已完结订单</text>
<text class="t3">（0）</text>
</view>
</view>
</view>
<view class="list">
<view class="no-data column rowCenter verCenter">
<image src="../../static/nodate.png"></image>
<text class="tt">暂无相关订单信息</text>
</view>
<view class="box" v-for="(item, index) in 100" :key="index">
<view class="p1 row bothSide verCenter">
<view class="row verCenter">
<text class="t1">订单号：</text>
<text class="t2">12022071810404SZ</text>
<text class="t3">2023.04.24 11:40</text>
</view>
<text class="color2">待审核</text>
</view>
<view class="p2 row bothSide verCenter">
<view class="row verCenter">
<text class="t1">附加费：</text>
<text class="t2" style="margin-right: 24rpx;">¥3580.23</text>
<text class="t1">运费：</text>
<text class="t2">￥10.00</text>
</view>
<view class="right-bar">
<text class="bar-t1">共</text>
<text class="bar-t2">4</text>
<text class="bar-t1">件商品</text>
<text class="iconfont icon-jt"></text>
</view>
</view>
<view class="p3 row bothSide verCenter">
<view class="row verCenter">
<text class="t1">总金额：</text>
<text class="price">¥3580.23</text>
</view>
<view class="right-bar row"><view class="btn0 row rowCenter verCenter">取消订单</view></view>
</view>
</view>
</view>
<!-- 筛选 -->
<uni-popup ref="popup" type="bottom">
<view class="layer-box">
<view class="title row verCenter">
<view class="left"></view>
<view class="center row rowCenter verCenter">筛选</view>
<view class="right row"><text class="iconfont icon-xxx" @click="close()"></text></view>
</view>
<view class="filter-item">
<view class="h2">下单时间</view>
<view class="time-filter row bothSide verCenter">
<view class="time row bothSide verCenter">
<picker mode="date" :value="date" @change="bindDateChange">
<view class="uni-input">{{ date }}</view>
</picker>
<text class="iconfont icon-juxing2"></text>
</view>
<text class="line">-</text>
<view class="time row bothSide verCenter">
<picker mode="date" :value="date" @change="bindDateChange">
<view class="uni-input">{{ date }}</view>
</picker>
<text class="iconfont icon-juxing2"></text>
</view>
</view>
<view class="h2">币种</view>
<view class="tab row">
<view class="box curr row rowCenter verCenter">全部</view>
<view class="box row rowCenter verCenter">人民币</view>
<view class="box row rowCenter verCenter">美元</view>
</view>
</view>
<view class="btn row bothSide verCenter">
<view class="btn0 row rowCenter verCenter">重置</view>
<view class="btn1 row rowCenter verCenter">筛选</view>
</view>
</view>
</uni-popup>
</view>
</template>
<script>
import { Api_Url } from '@/util/api.js';
export default {
data() {
const currentDate = this.getDate({
format: true
});
return {
date: currentDate
};
},
onLoad() {},
methods: {
getDate(type) {
const date = new Date();
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
if (type === 'start') {
year = year - 60;
} else if (type === 'end') {
year = year + 2;
}
month = month > 9 ? month : '0' + month;
day = day > 9 ? day : '0' + day;
return `${year}-${month}-${day}`;
},
open() {
this.$refs.popup.open('bottom');
},
close() {
this.$refs.popup.close();
},
bindDateChange: function(e) {
this.date = e.detail.value;
}
}
};
</script>
<style lang="scss">
@import '@/assets/css/mine/userOrder.scss';
</style>
router/index.js
......@@ -80,13 +80,6 @@ const router = new Router({
}
},
{
path: '/pages/confirm/confirmSuccess',
aliasPath: '/order/success',
meta: {
title: '提交订单成功'
}
},
{
path: '/pages/confirm/pay',
aliasPath: '/pay/online',
meta: {
......@@ -94,6 +87,13 @@ const router = new Router({
}
},
{
path: '/pages/confirm/confirmSuccess',
aliasPath: '/order/success',
meta: {
title: '提交订单成功'
}
},
{
path: '/pages/mine/login',
aliasPath: '/login',
meta: {
......@@ -123,8 +123,8 @@ const router = new Router({
}
},
{
path: '/pages/mine/userOrder',
aliasPath: '/userOrder',
path: '/pages/mine/shoporder',
aliasPath: '/user/shoporder',
meta: {
title: '订单列表',
auth: 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 sign in to comment