ltlzx
/
cnic_buyer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

对接首页部分内容；优化支付成功页面；对接我的订单查看物流、确认收货；对接忘记密码功能；红包列表的领取、消息中心列表

master
ltlzx 4 years ago
parent
508c0e3ff2
commit
3f6c75472d
16 changed files with 512 additions and 392 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 105
      components/pay.vue
  2. 22
      pages/account/message.vue
  3. 18
      pages/account/myCoupons.vue
  4. 90
      pages/account/myOrders.vue
  5. 2
      pages/account/pointsDetails.vue
  6. 39
      pages/index/flashSale.vue
  7. 76
      pages/index/index.vue
  8. 33
      pages/index/pickUpCentre.vue
  9. 8
      pages/login/changePwd.vue
  10. 18
      pages/login/index.vue
  11. 14
      pages/order/confirmation.vue
  12. 141
      pages/order/details.vue
  13. 25
      pages/order/paySuccess.vue
  14. 32
      pages/productDetails/index.vue
  15. 7
      pages/shippingCart/index.vue
  16. BIN
      static/img/fail.png

105
components/pay.vue
View File

@ -1,105 +0,0 @@
<template>
<view >
<view class="mask" v-show="isPay" @click="isShow=false"></view>
<view class="order_popup" v-show="isPay">
<view class="order_popup_title">
<text>
Payment Method
</text>
<image src="../static/img/close1.png" mode="" @click="isPay=false"></image>
</view>
<view class="order_popup_pay" >
<view class="pay_item" @click="selectPay(0)">
<image src="../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==0"></image>
<image src="../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../static/img/pay_pal.png" mode=""></image>
<text>Pay Pal</text>
</view>
</view>
<view class="pay_item" @click="selectPay(1)">
<image src="../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==1"></image>
<image src="../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../static/img/card.png" mode=""></image>
<text>Credit/Debit Card</text>
</view>
</view>
<view class="pay_item" @click="selectPay(2)">
<image src="../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==2"></image>
<image src="../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../static/img/GPay.png" mode=""></image>
<text>Google Pay</text>
</view>
</view>
<view class="pay_item" @click="selectPay(3)">
<image src="../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==3"></image>
<image src="../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../static/img/APay.png" mode=""></image>
<text>Apple pay</text>
</view>
</view>
<!-- <navigator url="/pages/order/paySuccess"> -->
<button @click="getPayDate">PAY NOW</button>
<!-- </navigator> -->
</view>
</view>
</view>
</template>
<script>
import {defaultRequest2} from '../api/index.js'
export default {
props:{
payShow:false,
orderId:''
},
data() {
return {
pay_index:0
}
},
methods:{
// 选择支付方式
selectPay(index){
this.pay_index=index
},
// 获取调用支付信息数据
getPayDate(id){
let data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
defaultRequest2(data).then(res=>{
console.info(res)
if(res.error==0){
//订单对象，从服务器获取
if(res.data.need_pay_amount==0) return
uni.requestPayment({
provider: 'alipay',
orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
success: function (res) {
console.log('success:' + JSON.stringify(res));
uni.redirectTo({
url: 'paySuccess?order_id='+id
});
},
fail: function (err) {
console.log('fail:' + JSON.stringify(err));
uni.showToast({
title:'Payment failed',
icon:'none'
})
uni.navigateBack()
}
});
}
})
},
}
}
</script>
<style>
</style>

22
pages/account/message.vue
View File

@ -1,18 +1,16 @@
<template> <template>
<view> <view>
<view class="status_bar"></view> <uni-nav-bar left-icon="left" :statusBar="true" title="Message"
<uni-nav-bar left-icon="left" title="Message" color="#000000" rightIcon="info" @clickLeft="back" @clickRight="isDelete=!isDelete" :border="false"/> color="#000000" rightIcon="info" @clickLeft="back" @clickRight="isDelete=!isDelete" :border="false"/>
<view class="body"> <view class="body">
<view class="msg_item"> <view class="msg_item" v-for="(item,index) in list" :key="index">
<view class="msg_time">21/04/2022 14:42:31</view> <view class="msg_time">{{item.start_time}}~{{item.end_time}}</view>
<view class="msg_title">Message heading</view> <view class="msg_title">{{item.act_name}}</view>
<view class="msg_content"> <view class="msg_content">{{item.act_range}}</view>
estimated to be deliverd on estimated to be deliverd on estim <!-- <view class="msg_img"></view> -->
ated to be deliverd on estimated to be deliverd on
</view>
<view class="msg_img"></view>
</view> </view>
<view class="msg_item"> <!-- <view class="msg_item">
<view class="msg_time">21/04/2022 14:42:31</view> <view class="msg_time">21/04/2022 14:42:31</view>
<view class="msg_title">Message heading</view> <view class="msg_title">Message heading</view>
<view class="msg_content"> <view class="msg_content">
@ -28,7 +26,7 @@
ated to be deliverd on estimated to be deliverd on ated to be deliverd on estimated to be deliverd on
</view> </view>
<view class="msg_img"></view> <view class="msg_img"></view>
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>

18
pages/account/myCoupons.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<view> <view>
<view class="status_bar"></view> <uni-nav-bar left-icon="left" :statusBar="true" title="My Coupons" color="#000000" rightIcon="info" @clickLeft="back" @clickRight="goPage" :border="false"/>
<uni-nav-bar left-icon="left" title="My Coupons" color="#000000" rightIcon="info" @clickLeft="back" @clickRight="goPage" :border="false"/>
<view class="body"> <view class="body">
<view class="coupons_item" v-for="(item,index) in 3 " :key="index"> <view class="coupons_item" v-for="(item,index) in 3 " :key="index">
<view class="coupons_item_left"> <view class="coupons_item_left">
@ -24,6 +22,7 @@
</template> </template>
<script> <script>
import {defaultRequest2} from '../../api/index.js'
export default { export default {
data() { data() {
return { return {
@ -31,15 +30,26 @@
} }
}, },
methods:{ methods:{
getList(){
let data={_action:'getbonusinfo',bonus_id:0}
defaultRequest2(data).then(res=>{
console.info(res)
if(res.error==0){
this.list=res.data
}
})
},
back(){ back(){
uni.navigateBack() uni.navigateBack()
}, },
goPage(){ goPage(){
console.info(111)
uni.navigateTo({ uni.navigateTo({
url:"/pages/index/pickUpCentre" url:"/pages/index/pickUpCentre"
}) })
} }
},
onShow() {
this.getList()
} }
} }
</script> </script>

90
pages/account/myOrders.vue
View File

@ -29,7 +29,7 @@
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="good_price">total:US${{item.order_amount}}</view> <view class="good_price">total:US${{item.total_fee_o}}</view>
<view class="good_points"> <view class="good_points">
<image src="/static/img/gantan1.png" mode=""></image> <image src="/static/img/gantan1.png" mode=""></image>
<text>Reward 10 points</text> <text>Reward 10 points</text>
@ -62,7 +62,7 @@
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="good_price">total:US${{item.order_amount}}</view> <view class="good_price">total:US${{item.total_fee_o}}</view>
<view class="order_button"> <view class="order_button">
<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button> <button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
</view> </view>
@ -90,7 +90,7 @@
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="good_price">total:US${{item.order_amount}}</view> <view class="good_price">total:US${{item.total_fee_o}}</view>
</view> </view>
</view> </view>
@ -121,74 +121,73 @@
</view> </view>
</view> </view>
</view> </view>
<view class="good_price">total:US${{item.order_amount}}</view> <view class="good_price">total:US${{item.total_fee_o}}</view>
<view class="order_button"> <view class="order_button">
<navigator :url="'/pages/order/logisticsDetails?id='+item.order_id" style="margin-right:20rpx ;"> <button class="cancel" @click.stop="goLogistics(item.order_id)">LOGISTICS</button>
<button class="cancel">LOGISTICS</button> <button class="pay" @click.stop="openTips(item.order_id,2)">CONFIRM RECEIPT</button>
</navigator>
<button class="pay">CONFIRM RECEIPT</button>
</view> </view>
</view> </view>
</view> </view>
<!-- 已完成订单 -->
<view class="order " v-if="item.pay_status_code==2 && item.shipping_status_code==2" @click="goDetails(2,item.order_id)">
</view>
<navigator url="/pages/order/details?details_index=2">
<view class="order">
<view class="order_title"> <view class="order_title">
<text>Completed</text> <text>Completed</text>
<view class="order_title_right"> <view class="order_title_right">
<text>order#20245512141212</text> <text>order#{{item.order_sn}}</text>
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="order_content"> <view class="order_content">
<view class="good_info"> <view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
<view class="good_info_left"> <view class="good_info_left">
<view class="good_info_image" v-for="(item,index) in 4" :key="index"></view> <view class="good_info_image" >
<image :src="item1.goods_img" mode=""></image>
</view>
</view> </view>
<view class="good_info_right"> <view class="good_info_right">
<text>4 ltems</text> <text>{{item.order_goods.length}} ltems</text>
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="good_price">total:US$12.5</view> <view class="good_price">total:US${{item.total_fee_o}}</view>
<view class="order_button"> <view class="order_button">
<button class="cancel">DELETE ORDER</button> <button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
<button class="pay">COMMENT</button> <button class="pay">COMMENT</button>
</view> </view>
</view> </view>
</view> </view>
</navigator>
<view class="order"> <!-- 退换货订单 -->
<view class="order" v-if="item.order_status_code==4" @click="goDetails(2,item.order_id)">
<view class="order_title"> <view class="order_title">
<text>Return and exchange</text> <text>Return and exchange</text>
<view class="order_title_right"> <view class="order_title_right">
<text>order#20245512141212</text> <text>order#{{item.order_sn}}</text>
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="order_content"> <view class="order_content">
<view class="good_info"> <view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
<view class="good_info_left"> <view class="good_info_left">
<view class="good_info_image" v-for="(item,index) in 4" :key="index"></view> <view class="good_info_image" >
<image :src="item1.goods_img" mode=""></image>
</view>
</view> </view>
<view class="good_info_right"> <view class="good_info_right">
<text>4 ltems</text> <text>{{item.order_goods.length}} ltems</text>
<image src="../../static/img/right.png" mode=""></image> <image src="../../static/img/right.png" mode=""></image>
</view> </view>
</view> </view>
<view class="good_price">total:US$12.5</view> <view class="good_price">total:US${{item.total_fee_o}}</view>
<view class="order_button"> <view class="order_button">
<button class="pay">CANCEL RETURN</button> <button class="pay">CANCEL RETURN</button>
</view> </view>
</view> </view>
</view> </view>
</view>
</template> </template>
<template v-if="isList==true && scroll_active==2"> <template v-if="isList==true && scroll_active==2">
<navigator url="/pages/order/details?details_index=0"> <navigator url="/pages/order/details?details_index=0">
@ -308,7 +307,9 @@
</view> </view>
</template> </template>
</view> </view>
<view class="mask" v-show="isPay" @click="isShow=false"></view>
<!-- 支付 -->
<view class="mask" v-show="isPay" @click="isPay=false"></view>
<view class="order_popup" v-show="isPay"> <view class="order_popup" v-show="isPay">
<view class="order_popup_title"> <view class="order_popup_title">
<text> <text>
@ -349,14 +350,15 @@
<text>Apple pay</text> <text>Apple pay</text>
</view> </view>
</view> </view>
<!-- <navigator url="/pages/order/paySuccess"> -->
<button @click="getPayDate">PAY NOW</button> <button @click="getPayDate">PAY NOW</button>
<!-- </navigator> -->
</view> </view>
</view> </view>
<!-- 删除、取消弹框 -->
<uni-popup ref="alertDialog" type="dialog"> <uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog type="error" cancelText="Close" :confirmText="tipsBut" title="Tips" :content="tipsInfo" @confirm="dialogConfirm" ></uni-popup-dialog> <uni-popup-dialog type="error" cancelText="Close" :confirmText="tipsBut" title="Tips" :content="tipsInfo" @confirm="dialogConfirm" ></uni-popup-dialog>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
@ -381,14 +383,19 @@
_action:'cancelorder', _action:'cancelorder',
order_id:'' order_id:''
}, },
// 弹出提示框的状态 0：取消订单 1、删除订单 // 弹出提示框的状态 0：取消订单 1、删除订单 2、确认收货
tipsType:0, tipsType:0,
tipsInfo:'', tipsInfo:'',
tipsBut:'' tipsBut:''
} }
}, },
methods:{ methods:{
// 查看物流
goLogistics(id){
uni.navigateTo({
url:'../order/logisticsDetails?order_id='+id
})
},
// 订单详情 // 订单详情
goDetails(index,id){ goDetails(index,id){
uni.navigateTo({ uni.navigateTo({
@ -436,9 +443,15 @@
if(type==0){ if(type==0){
this.tipsInfo='Are you sure you want to cancel this order? This order will be regarded as invalid after cancellation' this.tipsInfo='Are you sure you want to cancel this order? This order will be regarded as invalid after cancellation'
this.tipsBut='CancelOrder' this.tipsBut='CancelOrder'
}else{ this.cancelQuery._action='cancelorder'
}else if(type==1){
this.tipsInfo='Are you sure you want to delete this order?' this.tipsInfo='Are you sure you want to delete this order?'
this.tipsBut='DeleteOrder' this.tipsBut='DeleteOrder'
this.cancelQuery._action='deleteorder'
}else if(type==2){
this.tipsInfo='Are you sure you have received the products?'
this.tipsBut='Confirm'
this.cancelQuery._action='affirmorder'
} }
this.cancelQuery.order_id=id this.cancelQuery.order_id=id
this.$refs.alertDialog.open() this.$refs.alertDialog.open()
@ -446,11 +459,6 @@
}, },
// 提示框点击确操作 取消订单、删除订单 // 提示框点击确操作 取消订单、删除订单
dialogConfirm(){ dialogConfirm(){
if(this.tipsType==0){
this.cancelQuery._action='cancelorder'
}else{
this.cancelQuery._action='deleteorder'
}
defaultRequest2(this.cancelQuery).then(res=>{ defaultRequest2(this.cancelQuery).then(res=>{
console.info(res) console.info(res)
if(res.error==0){ if(res.error==0){

2
pages/account/pointsDetails.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<uni-nav-bar left-icon="left" title="Points Details" color="#000000" rightIcon="info" @clickLeft="back" :border="false" :statusBar="true" :fixed="true" /> <uni-nav-bar left-icon="left" title="Points Details" color="#000000" rightIcon="info" @clickLeft="back" :border="false" :statusBar="true" />
<view class="points"> <view class="points">
<view class="points_item" v-for="(item,index) in 10" :key="index"> <view class="points_item" v-for="(item,index) in 10" :key="index">
<view class="points_item_title"> <view class="points_item_title">

39
pages/index/flashSale.vue
View File

@ -1,6 +1,8 @@
<template> <template>
<view> <view>
<uni-nav-bar left-icon="left" title="Flash Sale" color="#000000" rightIcon="info" @clickLeft="back" @clickRight="isDelete=!isDelete" :border="false"/> <uni-nav-bar left-icon="left" :statusBar="true" title="Flash Sale"
color="#000000" rightIcon="info" @clickLeft="back" @clickRight="isDelete=!isDelete" :border="false"/>
<view class="body"> <view class="body">
<view class="countDown"> <view class="countDown">
<text>Ends in</text> <text>Ends in</text>
@ -13,13 +15,15 @@
<view class="tips1">The quantity of special price commodities is limited and will be sold out</view> <view class="tips1">The quantity of special price commodities is limited and will be sold out</view>
<view class="recommend"> <view class="recommend">
<view class="recommend_content"> <view class="recommend_content">
<view class="recommend_content_item" v-for="(item,index) in 2 " :key="index"> <view class="recommend_content_item" v-for="(item,index) in list " :key="index">
<view class="recommend_content_item_image"></view> <view class="recommend_content_item_image">
<text>Adidas Yeezy Boost 350 DazzlingBlue Black</text> <image :src="item.goods_img" mode=""></image>
</view>
<view class="recommend_content_item_name">{{item.name}}</view>
<view class="recommend_item_operation"> <view class="recommend_item_operation">
<view> <view>
<view class="recommend_content_item_pric">US$314.00</view> <view class="recommend_content_item_pric">US${{item.promote_price?item.promote_price:item.shop_price}}</view>
<view class="recommend_content_item_pric1">US$314.00</view> <view class="recommend_content_item_pric1">US${{item.shop_price}}</view>
</view> </view>
<image src="../../static/img/add.png" mode=""></image> <image src="../../static/img/add.png" mode=""></image>
</view> </view>
@ -32,16 +36,29 @@
</template> </template>
<script> <script>
import {defaultRequest} from '../../api/index.js'
export default { export default {
data() { data() {
return { return {
list:[]
} }
}, },
methods:{ methods:{
getList(){
let data ={_action:'getseckillgoods',gid:'213'}
defaultRequest(data).then(res=>{
console.info(res)
if(res.error==0){
this.list=res.data
}
})
},
back(){ back(){
uni.navigateBack() uni.navigateBack()
} }
},
onLoad() {
this.getList()
} }
} }
</script> </script>
@ -81,6 +98,14 @@
} }
} }
} }
.recommend_content_item_name{
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2; /* 限制在一个块元素显示的文本的行数 */
-webkit-box-orient: vertical; /* 垂直排列 */
word-break: break-all; /* 内容自动换行 */
}
.countDown{ .countDown{
display: flex; display: flex;
align-items: center; align-items: center;

76
pages/index/index.vue
View File

@ -1,10 +1,9 @@
<template> <template>
<view class="body"> <view class="body" >
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<view class="navigation page_padding"> <view class="navigation page_padding" >
<view class="status_bar"></view> <view class="status_bar"></view>
<view class="navigation_title" :class="isScrollShow?'isScrollShow':'' "> <view class="navigation_title" :class="isScrollShow?'isScrollShow':'' ">
<template v-if="!isScrollShow "> <template v-if="!isScrollShow ">
@ -36,37 +35,32 @@
</view> </view>
</view> </view>
<view v-for="(item,index) in indexDate.zones" :key="item.zone_id">
<!-- 轮播图 --> <!-- 轮播图 -->
<view class="uni-margin-wrap page_padding"> <view class="uni-margin-wrap page_padding" v-if="item.zone_code=='BANNER2' && item.zone_status=='NORMAL'">
<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" > <swiper class="swiper" circular :indicator-dots="true" :autoplay="true" >
<swiper-item> <swiper-item v-for="(item1,index1) in item.blocks" :key="item1.block_id">
<view class="swiper-item uni-bg-red">A</view> <view class="swiper-item " v-if="item1.block_status=='NORMAL'">
</swiper-item> <image :src="item1.block_pic" mode=""></image>
<swiper-item> </view>
<view class="swiper-item uni-bg-green">B</view>
</swiper-item>
<swiper-item>
<view class="swiper-item uni-bg-blue">C</view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
</view>
<!-- 宫格 --> <!-- 宫格 -->
<uni-swiper-dot :info="2" :current="current" field="content" mode="default" class="page_padding"> <uni-swiper-dot :info="info" :current="current" field="content" mode="default" class="page_padding">
<swiper class="grid_swiper" @change="gridSwiper"> <swiper class="grid_swiper" @change="gridSwiper">
<swiper-item> <swiper-item v-for="(item,index) in info" :key="item.zone_id">
<view class="grid_content"> <view class="grid_content">
<view class="grid_item" v-for="(item, index) in 8" :key="index"> <view class="grid_item" v-for="(item1, index1) in item.blocks" :key="item1.zone_id">
<view class="grid_item_img"></view> <template v-if="item1.block_status=='NORMAL'">
<text>Dresses</text> <view class="grid_item_img">
<image :src="item1.block_pic" mode=""></image>
</view> </view>
</view> <text>{{item.block_title}}</text>
</swiper-item> </template>
<swiper-item>
<view class="grid_content">
<view class="grid_item" v-for="(item, index) in 8" :key="index">
<view class="grid_item_img"></view>
<text>Dresses</text>
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
@ -202,9 +196,11 @@
</custom-waterfalls-flow> </custom-waterfalls-flow>
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
import {defaultRequest} from '../../api/index.js'
export default { export default {
data() { data() {
return { return {
@ -217,13 +213,32 @@
list: [ list: [
{ image: 'https://via.placeholder.com/200x500.png/ff0000', title: 'Adidas Yeezy Boost 350 DazzlingBlue Black', desc: 'US$314.00' }, { image: 'https://via.placeholder.com/200x500.png/ff0000', title: 'Adidas Yeezy Boost 350 DazzlingBlue Black', desc: 'US$314.00' },
{ image: 'https://via.placeholder.com/200x200.png/2878ff', title: 'Adidas Yeezy Boost 350 DazzlingBlue Black', desc: 'US$314.00' } { image: 'https://via.placeholder.com/200x200.png/2878ff', title: 'Adidas Yeezy Boost 350 DazzlingBlue Black', desc: 'US$314.00' }
] ],
indexDate:{},
info:[]
} }
}, },
onLoad() { onLoad() {
this.getIndex()
}, },
methods: { methods: {
// 获取首页数据配置
getIndex(){
let data={_action:'getpagedata',pagecode:'HOME'}
defaultRequest(data).then(res=>{
console.info(res)
if(res.error==0){
this.indexDate=res.data
res.data.zones.map(item=>{
if(item.zone_code=='ICON'){
item.content=''
this.info.push(item)
}
})
console.info(this.info)
}
})
},
goPage(){ goPage(){
uni.navigateTo({ uni.navigateTo({
url: '/pages/productDetails/index', url: '/pages/productDetails/index',
@ -371,6 +386,10 @@
line-height: 373.33rpx; line-height: 373.33rpx;
text-align: center; text-align: center;
color: white; color: white;
image{
width: 100%;
height: 100%;
}
} }
.uni-bg-red{ .uni-bg-red{
background-color: red; background-color: red;
@ -409,6 +428,11 @@
height: 97.33rpx; height: 97.33rpx;
margin-bottom: 6.67rpx; margin-bottom: 6.67rpx;
background-color: #8F9094; background-color: #8F9094;
image{
width: 100%;
height: 100%;
}
} }
} }
.grid_item:nth-child(n+4){ .grid_item:nth-child(n+4){

33
pages/index/pickUpCentre.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<view> <view>
<view class="status_bar"></view> <uni-nav-bar left-icon="left" :statusBar="true" title="Pick up centre" color="#000000" @clickLeft="back" :border="false">
<uni-nav-bar left-icon="left" title="Pick up centre" color="#000000" @clickLeft="back" :border="false">
<block slot="right"> <block slot="right">
<view class="head_coupons"> <view class="head_coupons">
<image src="../../static/img/coupons.png" mode=""></image> <image src="../../static/img/coupons.png" mode=""></image>
@ -10,20 +9,21 @@
</block> </block>
</uni-nav-bar> </uni-nav-bar>
<view class="body"> <view class="body">
<view class="coupons_item" v-for="(item,index) in 3 " :key="index">
<view class="coupons_item" v-for="(item,index) in list " :key="index">
<view class="coupons_item_left"> <view class="coupons_item_left">
<view class="item_left_prcie">$20.00</view> <view class="item_left_prcie">${{item.type_money}}</view>
<text class="item_left_span">Min.spend</text> <text class="item_left_span">Min.spend</text>
<view>$200.00</view> <view>${{item.min_goods_amount}}</view>
</view> </view>
<view class="coupons_item_right"> <view class="coupons_item_right">
<view class="coupons_right_info"> <view class="coupons_right_info">
<view class="coupons_right_info_title">All-purpose</view> <view class="coupons_right_info_title">{{item.type_name}}</view>
<text>The tide zone is available</text> <text>The tide zone is available</text>
<view class="coupons_right_info_time">2022.09.23 10:37 - 2022.12.23 10:37</view> <view class="coupons_right_info_time">{{item.send_start_date}} - {{item.send_end_date}}</view>
</view> </view>
<button>Receive</button> <button v-if="item.is_obtained==0" @click="obtainbonus(item.type_id)">Receive</button>
<image src="../../static/img/coupons_bg.png" mode="" class="coupons_item_right_bg"></image> <image src="../../static/img/coupons_bg.png" mode="" class="coupons_item_right_bg" v-if="item.is_obtained==1"></image>
</view> </view>
</view> </view>
</view> </view>
@ -31,7 +31,7 @@
</template> </template>
<script> <script>
import {defaultRequest} from '../../api/index.js' import {defaultRequest,defaultRequest2} from '../../api/index.js'
export default { export default {
data() { data() {
return { return {
@ -39,6 +39,19 @@
} }
}, },
methods:{ methods:{
obtainbonus(id){
let data={_action:'obtainbonus',type_id:id}
defaultRequest2(data).then(res=>{
console.info(res)
if(res.error==0){
uni.showToast({
icon:'none',
title:res.message
})
}
this.getList()
})
},
getList(){ getList(){
let data={_action:'getbonuslist'} let data={_action:'getbonuslist'}
defaultRequest(data).then(res=>{ defaultRequest(data).then(res=>{

8
pages/login/changePwd.vue
View File

@ -21,6 +21,7 @@
resetcode:'' resetcode:''
}, },
isLogin:true, isLogin:true,
user_info:{}
} }
}, },
methods:{ methods:{
@ -32,6 +33,12 @@
title:res.message, title:res.message,
icon:'none' icon:'none'
}) })
setTimeout(function() {
uni.navigateBack({
delta:2
})
},2000)
} }
}) })
}, },
@ -48,6 +55,7 @@
console.info(e) console.info(e)
this.query.username=e.username this.query.username=e.username
this.query.resetcode=e.resetcode this.query.resetcode=e.resetcode
this.user_info=uni.getStorageSync('user_info')
} }
} }
</script> </script>

18
pages/login/index.vue
View File

@ -7,9 +7,7 @@
<input type="text" class="login_input" placeholder="eamil address" v-model="loginDate.username" @input="verificationLogin"> <input type="text" class="login_input" placeholder="eamil address" v-model="loginDate.username" @input="verificationLogin">
<input type="text" class="login_input" placeholder="password" v-model="loginDate.password" @input="verificationLogin"> <input type="text" class="login_input" placeholder="password" v-model="loginDate.password" @input="verificationLogin">
<view class="tips" v-show="loginErr">{{errMsg}}</view> <view class="tips" v-show="loginErr">{{errMsg}}</view>
<navigator url="/pages/login/verifyEmail" > <view class="forgot" @click="forgotPwd">Forgot your Password?</view>
<view class="forgot">Forgot your Password?</view>
</navigator>
<button class="login_submit" :disabled="isLogin" @click="login()">SIGN IN</button> <button class="login_submit" :disabled="isLogin" @click="login()">SIGN IN</button>
<view class="agreement"> <view class="agreement">
<image src="../../static/img/select2.png" mode="" class="agreement_image" @click="loginSelect=!loginSelect,loginErr=false" v-show="!loginSelect"></image> <image src="../../static/img/select2.png" mode="" class="agreement_image" @click="loginSelect=!loginSelect,loginErr=false" v-show="!loginSelect"></image>
@ -83,11 +81,22 @@
query:{ query:{
_action:'sendmessagesforvalidation', _action:'sendmessagesforvalidation',
username:'', username:'',
password:''
} }
} }
}, },
methods:{ methods:{
forgotPwd(){
if(this.loginDate.username==''){
uni.showToast({
title:'Please fill in the user email first',
icon:'none',
})
return
}
uni.navigateTo({
url:'./verifyEmail?email='+this.loginDate.username
})
},
onClickItem(e) { onClickItem(e) {
if (this.current != e.currentIndex) { if (this.current != e.currentIndex) {
this.current = e.currentIndex; this.current = e.currentIndex;
@ -120,7 +129,6 @@
if(res.data){ if(res.data){
this.$refs.alertDialog.open() this.$refs.alertDialog.open()
this.query.username=this.loginDate.username this.query.username=this.loginDate.username
this.query.password=this.loginDate.password
}else{ }else{
this.loginErr=true this.loginErr=true
this.errMsg=res.message this.errMsg=res.message

14
pages/order/confirmation.vue
View File

@ -198,11 +198,7 @@
<script> <script>
import {defaultRequest2,defaultRequest3} from '../../api/index.js' import {defaultRequest2,defaultRequest3} from '../../api/index.js'
import pay from '@/components/pay.vue'
export default { export default {
components:{
pay
},
data() { data() {
return { return {
isShow:false, isShow:false,
@ -242,16 +238,14 @@
success: function (res) { success: function (res) {
console.log('success:' + JSON.stringify(res)); console.log('success:' + JSON.stringify(res));
uni.redirectTo({ uni.redirectTo({
url: 'paySuccess?order_id='+id+'&will_get_integral='+will_get_integral url: 'paySuccess?type=0&order_id='+id+'&will_get_integral='+will_get_integral
}); });
}, },
fail: function (err) { fail: function (err) {
console.log('fail:' + JSON.stringify(err)); console.log('fail:' + JSON.stringify(err));
uni.showToast({ uni.redirectTo({
title:'Payment failed', url: 'paySuccess?type=1&order_id='+id+'&will_get_integral='+will_get_integral
icon:'none' });
})
uni.navigateBack()
} }
}); });
} }

141
pages/order/details.vue
View File

@ -47,8 +47,9 @@
<view>T-minus payment</view> <view>T-minus payment</view>
</view> </view>
</view> </view>
<navigator url="/pages/order/logisticsDetails" class="cancelled transit" v-if="details_index==4">
<view class="cancelled_left"> <view class="cancelled transit" @click="goLogistics" v-if="details_index==4">
<view class="cancelled_left" >
<image src="../../static/img/transit.png" mode=""></image> <image src="../../static/img/transit.png" mode=""></image>
<view class="cancelled_left_info"> <view class="cancelled_left_info">
<view class="shipped_right_text">【New York】Has arrived statesHas arrived states</view> <view class="shipped_right_text">【New York】Has arrived statesHas arrived states</view>
@ -58,7 +59,8 @@
<view class="cancelled_right"> <view class="cancelled_right">
<image src="../../static/img/right2.png" mode=""></image> <image src="../../static/img/right2.png" mode=""></image>
</view> </view>
</navigator> </view>
</view> </view>
<view class="address"> <view class="address">
@ -125,7 +127,7 @@
</view> </view>
<view class="summary_tips" v-if="details_index==3"> <view class="summary_tips" v-if="details_index==3">
<image src="../../static/img/gantan1.png" mode=""></image> <image src="../../static/img/gantan1.png" mode=""></image>
<text>Reward {{goodsDate.integral}} points</text> <text>Reward 10 points</text>
</view> </view>
</view> </view>
@ -148,35 +150,82 @@
</view> </view>
<view class="summary_item" v-if="details_index!=3 && goodsDate.formated_pay_time"> <view class="summary_item" v-if="details_index!=3 && goodsDate.formated_pay_time">
<view>Payment time</view> <view>Payment time</view>
<view class="summary_item_right">{{goodsDate.pay_time}}</view> <view class="summary_item_right">{{goodsDate.formated_pay_time}}</view>
</view> </view>
<template v-if="details_index==2"> <view class="summary_item" v-if="details_index==4">
<view class="summary_item">
<view>Delivery time</view> <view>Delivery time</view>
<view class="summary_item_right">{{goodsDate.shipping_time}}</view> <view class="summary_item_right">{{goodsDate.formated_shipping_time}}</view>
</view> </view>
<view class="summary_item"> <!-- 完成时间 -->
<view class="summary_item" v-if="details_index==2">
<view>Completion time</view> <view>Completion time</view>
<view class="summary_item_right">{{goodsDate.confirm_time}}</view> <view class="summary_item_right"></view>
</view> </view>
</template> <!-- 取消时间 -->
<view class="summary_item" v-if="details_index==1"> <view class="summary_item" v-if="details_index==1">
<view>Cancel time</view> <view>Cancel time</view>
<view class="summary_item_right">{{goodsDate.pay_time}}</view> <view class="summary_item_right"></view>
</view> </view>
</view> </view>
<view class="details_footer" v-if="details_index!=0"> <view class="details_footer" v-if="details_index!=0">
<button class="white" v-if="details_index==2 || details_index==4">LOGISTICS</button> <button class="white" v-if="details_index==2 || details_index==4" @click="goLogistics">LOGISTICS</button>
<button class="white" v-if="details_index==1 || details_index==2">DELETE ORDER</button> <button class="white" v-if="details_index==1 || details_index==2">DELETE ORDER</button>
<button class="black" v-if="details_index==2">COMMENT</button> <button class="black" v-if="details_index==2">COMMENT</button>
<button class="white" v-if="details_index==3 ">CANCEL ORDER</button> <button class="white" v-if="details_index==3 ">CANCEL ORDER</button>
<button class="black" v-if="details_index==3">PAY NOW</button> <button class="black" v-if="details_index==3" @click="isPay=true">PAY NOW</button>
<button class="black" v-if="details_index==4">CONFIRM RECEIPT</button> <button class="black" v-if="details_index==4">CONFIRM RECEIPT</button>
</view> </view>
<!-- 支付 -->
<view class="mask" v-show="isPay" @click="isPay=false"></view>
<view class="order_popup" v-show="isPay">
<view class="order_popup_title">
<text>
Payment Method
</text>
<image src="../../static/img/close1.png" mode="" @click="isPay=false"></image>
</view>
<view class="order_popup_pay" >
<view class="pay_item" @click="selectPay(0)">
<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==0"></image>
<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../../static/img/pay_pal.png" mode=""></image>
<text>Pay Pal</text>
</view>
</view>
<view class="pay_item" @click="selectPay(1)">
<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==1"></image>
<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../../static/img/card.png" mode=""></image>
<text>Credit/Debit Card</text>
</view>
</view>
<view class="pay_item" @click="selectPay(2)">
<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==2"></image>
<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../../static/img/GPay.png" mode=""></image>
<text>Google Pay</text>
</view>
</view>
<view class="pay_item" @click="selectPay(3)">
<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==3"></image>
<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
<view class="pay_item_right">
<image src="../../static/img/APay.png" mode=""></image>
<text>Apple pay</text>
</view>
</view>
<button @click="getPayDate">PAY NOW</button>
</view>
</view>
</view> </view>
</template> </template>
@ -193,16 +242,77 @@
order_sn:'' order_sn:''
}, },
goodsDate:{}, goodsDate:{},
goods_list:[] goods_list:[],
isPay:false,
payQuery:{
_action:'payorder',
order_id:'',
order_type:'GOODSBUY',
payment_method:'alipay.native'
},
pay_index:0,
logisticsinfo:{}
} }
}, },
methods:{ methods:{
goLogistics(){
uni.navigateTo({
url:'./logisticsDetails?order_id='+this.goodsDate.order_id
})
},
// 选择支付方式
selectPay(index){
this.pay_index=index
},
// 获取调用支付信息数据
getPayDate(){
defaultRequest2(this.payQuery).then(res=>{
console.info(res)
if(res.error==0){
//订单对象，从服务器获取
if(res.data.need_pay_amount==0) return
uni.requestPayment({
provider: 'alipay',
orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
success: function (res) {
console.log('success:' + JSON.stringify(res));
uni.redirectTo({
url: 'paySuccess?order_id='+this.payQuery.order_id
});
},
fail: function (err) {
console.log('fail:' + JSON.stringify(err));
uni.showToast({
title:'Payment failed',
icon:'none'
})
}
});
}
})
},
payNow(id){
this.payQuery.order_id=id
this.isPay=true
},
getDate(){ getDate(){
defaultRequest2(this.query).then(res=>{ defaultRequest2(this.query).then(res=>{
console.info(res) console.info(res)
if(res.error==0){ if(res.error==0){
this.goodsDate=res.data this.goodsDate=res.data
this.goods_list=res.goods_list this.goods_list=res.goods_list
if(this.details_index==4){
this.getLogistics()
}
}
})
},
getLogistics(){
let data ={_action:'getlogisticsinfo',order_id:this.goodsDate.order_id,order_sn:''}
defaultRequest2(data).then(res=>{
console.info(res)
if(res.error==0){
this.logisticsinfo=res.data[0]
} }
}) })
} }
@ -211,6 +321,7 @@
console.info(e) console.info(e)
this.details_index=e.details_index this.details_index=e.details_index
this.query.order_id=e.id this.query.order_id=e.id
this.getDate() this.getDate()
}, },
filters:{ filters:{

25
pages/order/paySuccess.vue
View File

@ -1,11 +1,12 @@
<template> <template>
<view> <view>
<view class="success"> <view class="success">
<image src="../../static/img/success.png" mode=""></image> <image src="../../static/img/success.png" mode="" v-if="type==0"></image>
<text class="success_title">Payment is successful</text> <image src="../../static/img/fail.png" mode="" v-else></image>
<view> <text class="success_title">{{type==0?'Payment is successful':'Payment failed'}}</text>
<view >
This order will be rewarded with This order will be rewarded with
<text class="success_span">{{will_get_integral}} points</text> <text class="success_span">{{will_get_integral || 0}} points</text>
after receipt. after receipt.
</view> </view>
<view class="success_button"> <view class="success_button">
@ -29,9 +30,12 @@
</template> </template>
<script> <script>
import {defaultRequest4} from '../../api/index.js'
export default { export default {
data() { data() {
return { return {
// 是否支付成功 0成功 1失败
type:0,
id:'', id:'',
will_get_integral:0, will_get_integral:0,
// 获取该分类的其他商品的请求参数 // 获取该分类的其他商品的请求参数
@ -69,8 +73,14 @@
}) })
}, },
goPage(){ goPage(){
let details_index
if(this.type==0){
details_index=0
}else{
details_index=3
}
uni.redirectTo({ uni.redirectTo({
url: './details?details_index=0&'+'id='+this.id url: './details?details_index='+details_index+'&'+'id='+this.id
}); });
}, },
goCategory(){ goCategory(){
@ -80,8 +90,9 @@
} }
}, },
onLoad(e) { onLoad(e) {
this.id=e.id this.id=e.order_id
this.will_get_integral=e.will_get_integral this.will_get_integral=e.will_get_integral || 0
this.type=e.type
this.getCatList(0) this.getCatList(0)
}, },
// 上拉加载 // 上拉加载

32
pages/productDetails/index.vue
View File

@ -393,8 +393,18 @@
}else{ }else{
let goods_attr_id='' let goods_attr_id=''
this.goods_attr_list.map(item=>{ this.goods_attr_list.map(item=>{
if(item.goods_attr_id!=''){
goods_attr_id+=item.goods_attr_id+',' goods_attr_id+=item.goods_attr_id+','
}
}) })
if(goods_attr_id==''){
uni.showToast({
title:'Please select the product specification',
icon:'none'
})
return
}
this.cartQuery.goods_attr_id=goods_attr_id.substring(0,goods_attr_id.lastIndexOf(',')); this.cartQuery.goods_attr_id=goods_attr_id.substring(0,goods_attr_id.lastIndexOf(','));
} }
defaultRequest2(this.cartQuery).then(res=>{ defaultRequest2(this.cartQuery).then(res=>{
@ -463,21 +473,20 @@
}else{ }else{
// 判断是否有新的规格加入 // 判断是否有新的规格加入
let isNew=false let isNew=false
// for(i in this.goods_attr_list){ for(let i in this.goods_attr_list){
// let item=this.goods_attr_list[i] let item=this.goods_attr_list[i]
// if(item.attr_id==attr_id){
// this.goods_attr_list[i].goods_attr_id=goods_attr_id
// }
// }
this.goods_attr_list.map(item=>{
if(item.attr_id==attr_id){ if(item.attr_id==attr_id){
item.goods_attr_id=goods_attr_id if(item.goods_attr_id==goods_attr_id){
this.goods_attr_list[i].goods_attr_id=''
}else{
this.goods_attr_list[i].goods_attr_id=goods_attr_id
}
isNew=false isNew=false
return break
}else{ }else{
isNew=true isNew=true
} }
}) }
if(isNew){ if(isNew){
this.goods_attr_list.splice(index,0,data) this.goods_attr_list.splice(index,0,data)
} }
@ -539,11 +548,12 @@
this.info.push(item.img_url) this.info.push(item.img_url)
}) })
if(this.goodsDate.attr_list){ if(this.goodsDate.attr_list){
let data={goods_attr_id:''}
this.goodsDate.attr_list.map(item=>{ this.goodsDate.attr_list.map(item=>{
if(item.attr_name=="Color"){ if(item.attr_name=="Color"){
this.colorNum=item.goods_attrs.length this.colorNum=item.goods_attrs.length
} }
let data={goods_attr_id:'',attr_id:item.attr_id}
this.goods_attr_list.push(data) this.goods_attr_list.push(data)
}) })
}else{ }else{

7
pages/shippingCart/index.vue
View File

@ -81,7 +81,7 @@
<view class="recommend"> <view class="recommend">
<view class="recommend_title">RECOMMEND</view> <view class="recommend_title">RECOMMEND</view>
<view class="recommend_content"> <view class="recommend_content">
<view class="recommend_content_item" v-for="(item,index) in catList " :key="index"> <view class="recommend_content_item" v-for="(item,index) in catList " :key="index" @click="goDetails(item.id)">
<view class="recommend_content_item_image"> <view class="recommend_content_item_image">
<image :src="item.thumb" mode=""></image> <image :src="item.thumb" mode=""></image>
</view> </view>
@ -135,6 +135,11 @@
} }
}, },
methods:{ methods:{
goDetails(id){
uni.navigateTo({
url:'/pages/productDetails/index?goods_id='+id
})
},
// 获取的其他商品 // 获取的其他商品
getCatList(type){ getCatList(type){
defaultRequest4(this.catQuery).then(res=>{ defaultRequest4(this.catQuery).then(res=>{

BIN
static/img/fail.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

Write Preview
Loading…
Cancel
Save