Browse Source

对接我的订单删除、订单详情、消息、红包列表、优化修改密码功能、

master
ltlzx 4 years ago
parent
commit
7885f117b4
  1. 2
      api/request.js
  2. 5
      pages/account/index.vue
  3. 15
      pages/account/message.vue
  4. 44
      pages/account/myOrders.vue
  5. 17
      pages/index/pickUpCentre.vue
  6. 6
      pages/login/verifyEmail.vue
  7. 67
      pages/order/details.vue
  8. 16
      pages/productDetails/index.vue

2
api/request.js

@ -59,6 +59,7 @@ const httpRequest = (params) => {
uni.request({
...httpOptions,
success: res => {
// console.info(res)
uni.hideLoading();
// 进行解密
res.data=JSON.parse(decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008'))
@ -79,6 +80,7 @@ const httpRequest = (params) => {
resolve(res.data);
},
fail: err => {
uni.hideLoading();
reject(err);
}

5
pages/account/index.vue

@ -143,7 +143,10 @@
},
onShow() {
this.user_info=uni.getStorageSync('user_info')
this.getUserInfo()
if(this.user_info){
this.getUserInfo()
}
}
}
</script>

15
pages/account/message.vue

@ -35,16 +35,29 @@
<script>
import {defaultRequest} from '../../api/index.js'
export default {
data() {
return {
list:[]
}
},
methods:{
getList(){
let data={_action:'getfavourableactivities'}
defaultRequest(data).then(res=>{
console.info(res)
if(res.error==0){
this.list=res.data
}
})
},
back(){
uni.navigateBack()
}
},
onLoad() {
this.getList()
}
}
</script>

44
pages/account/myOrders.vue

@ -9,7 +9,7 @@
<template v-if="isList==true && scroll_active==0">
<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
<!-- 待支付订单 -->
<view class="order" v-if="item.pay_status_code==0 && item.order_status_code==0">
<view class="order" v-if="item.pay_status_code==0 && item.order_status_code==0" @click="goDetails(3,item.order_id)">
<view class="order_title">
<text>Waiting for payment</text>
<view class="order_title_right">
@ -35,14 +35,14 @@
<text>Reward 10 points</text>
</view>
<view class="order_button">
<button class="cancel" @click="cancelorder(item.order_id)">CANCEL ORDER</button>
<button class="pay" @click="payNow(item.order_id)">PAY NOW</button>
<button class="cancel" @click.stop="openTips(item.order_id,0)">CANCEL ORDER</button>
<button class="pay" @click.stop="payNow(item.order_id)">PAY NOW</button>
</view>
</view>
</view>
<!-- 已取消订单 -->
<view class="order" v-if="item.order_status_code==2" @click="goDetails(1)">
<view class="order" v-if="item.order_status_code==2" @click="goDetails(1,item.order_id)">
<view class="order_title">
<text>cancelled</text>
<view class="order_title_right">
@ -64,7 +64,7 @@
</view>
<view class="good_price">total:US${{item.order_amount}}</view>
<view class="order_button">
<button class="cancel">DELETE ORDER</button>
<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
</view>
</view>
</view>
@ -348,9 +348,7 @@
</view>
</view>
<uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog type="error" cancelText="Close" confirmText="CancelOrder" title="Tips"
content="Are you sure you want to cancel this order? This order will be regarded as invalid after cancellation"
@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>
</view>
</template>
@ -375,14 +373,19 @@
cancelQuery:{
_action:'cancelorder',
order_id:''
}
},
// 0 1
tipsType:0,
tipsInfo:'',
tipsBut:''
}
},
methods:{
//
goDetails(index){
goDetails(index,id){
uni.navigateTo({
url:'../order/details?details_index='+index
url:'../order/details?details_index='+index+'&id='+id
})
},
//
@ -420,14 +423,27 @@
this.payQuery.order_id=id
this.isPay=true
},
//
cancelorder(id){
//
openTips(id,type){
this.tipsType=type
if(type==0){
this.tipsInfo='Are you sure you want to cancel this order? This order will be regarded as invalid after cancellation'
this.tipsBut='CancelOrder'
}else{
this.tipsInfo='Are you sure you want to delete this order?'
this.tipsBut='DeleteOrder'
}
this.cancelQuery.order_id=id
this.$refs.alertDialog.open()
},
//
//
dialogConfirm(){
if(this.tipsType==0){
this.cancelQuery._action='cancelorder'
}else{
this.cancelQuery._action='deleteorder'
}
defaultRequest2(this.cancelQuery).then(res=>{
console.info(res)
if(res.error==0){

17
pages/index/pickUpCentre.vue

@ -1,7 +1,7 @@
<template>
<view>
<view class="status_bar"></view>
<uni-nav-bar left-icon="left" title="Pick up centre" color="#000000" @clickLeft="back" @clickRight="goPage" :border="false">
<uni-nav-bar left-icon="left" title="Pick up centre" color="#000000" @clickLeft="back" :border="false">
<block slot="right">
<view class="head_coupons">
<image src="../../static/img/coupons.png" mode=""></image>
@ -31,16 +31,29 @@
</template>
<script>
import {defaultRequest} from '../../api/index.js'
export default {
data() {
return {
list:[]
}
},
methods:{
getList(){
let data={_action:'getbonuslist'}
defaultRequest(data).then(res=>{
console.info(res)
if(res.error==0){
this.list=res.data
}
})
},
back(){
uni.navigateBack()
},
},
onLoad() {
this.getList()
}
}
</script>

6
pages/login/verifyEmail.vue

@ -17,7 +17,7 @@
<view class="verify_popup_title">Send!</view>
<view class="verify_popup_msg">we send a new verification code to {{query.username}}</view>
<view class="verify_popup_btn">
<button>OKAY</button>
<button @click="isShow=false">OKAY</button>
</view>
</view>
</view>
@ -37,7 +37,7 @@
query:{
_action:'sendresetcode',
username:'',
password:'',
// password:'',
}
}
},
@ -73,7 +73,7 @@
console.info(e)
this.type=e.type
if(e.type!=0){
this.query.password=e.password
// this.query.password=e.password
this.query.username=e.email
}else{

67
pages/order/details.vue

@ -65,12 +65,12 @@
<view class="address_left">
<view class="address_title">
<image src="../../static/img/address.png" mode=""></image>
<view class="address_title_name">Nathanael</view>
<text>5838590290</text>
<view class="address_title_name">{{goodsDate.consignee}}</view>
<text>{{goodsDate.mobile}}</text>
</view>
<view class="address_content">
<text>B Oakdale Mall</text>
<view >Johnson City NEW YORKUnitedStates13790-1294</view>
<text>{{goodsDate.sign_building}}</text>
<view >{{goodsDate.address_detail}}</view>
</view>
</view>
<image src="../../static/img/right.png" class="address_more"></image>
@ -78,20 +78,22 @@
</view>
<view class="order_popup_commodity">
<view class="good_info" v-for="(item,index) in 3 " :key="index">
<view class="good_info" v-for="(item,index) in goods_list " :key="index">
<view class="good_info_left ">
<view class="good_info_image" v-for="(item,index) in 1" :key="index"></view>
<view class="good_info_image" >
<image :src="item.goods_thumb" mode=""></image>
</view>
<view class="left_info">
<view class="info_name">Adidas Yeezy Boost 350 V2 DazzlingBlue Black GY7164 Men's</view>
<view class="info_name">{{item.goods_name}}</view>
<view class="left_info_bottom">
<view class="info_lable">
<text>Multicolor;41</text>
<text>{{item.goods_attr |goodsAttr}}</text>
<image src="/static/img/bottom.png" mode=""></image>
</view>
<text>x1</text>
<text>x{{item.goods_number}}</text>
</view>
<view class="info_price">
<text>US$314.00</text>
<text>US${{item.subtotal}}</text>
<button v-if="details_index!=3 && details_index!=1">RREFUND</button>
</view>
</view>
@ -107,23 +109,23 @@
Subtotal
<text :class="details_index==4?'summary_item_text1':'summary_item_text'">Tax included</text>
</view>
<view class="summary_item_right">US$12.5</view>
<view class="summary_item_right">US${{goodsDate.goods_amount}}</view>
</view>
<view class="summary_item">
<view>Shipping</view>
<view class="summary_item_right">US$12.5</view>
<view class="summary_item_right">US${{goodsDate.shipping_fee}}</view>
</view>
<view class="summary_item">
<view>Coupon</view>
<view class="summary_item_right1">-US$12.5</view>
<view class="summary_item_right1">-US${{goodsDate.discount}}</view>
</view>
<view class="summary_item">
<view>Order total</view>
<view>US$12.5</view>
<view>US${{goodsDate.order_amount}}</view>
</view>
<view class="summary_tips" v-if="details_index==3">
<image src="../../static/img/gantan1.png" mode=""></image>
<text>Reward 10 points</text>
<text>Reward {{goodsDate.integral}} points</text>
</view>
</view>
@ -132,17 +134,17 @@
<view class="summary_item">
<view>Order id</view>
<view class="summary_item_right">
<text>2013461121212</text>
<text>{{goodsDate.order_sn}}</text>
<button>copy</button>
</view>
</view>
<view class="summary_item">
<view>Shipping</view>
<view class="summary_item_right">standard shipping</view>
<view class="summary_item_right">{{goodsDate.shipping_name}}</view>
</view>
<view class="summary_item">
<view>Coupon</view>
<view class="summary_item_right">21/04/2022 15:42:31</view>
<view>Order Time</view>
<view class="summary_item_right">{{goodsDate.formated_add_time}}</view>
</view>
<view class="summary_item" v-if="details_index!=3">
<view>Payment time</view>
@ -175,19 +177,42 @@
</template>
<script>
import {defaultRequest2} from '../../api/index.js'
export default {
data() {
return {
// 0 1 2 3 4
details_index:4
details_index:4,
query:{
_action:'getorder',
order_id:'',
order_sn:''
},
goodsDate:{},
goods_list:[]
}
},
methods:{
getDate(){
defaultRequest2(this.query).then(res=>{
console.info(res)
if(res.error==0){
this.goodsDate=res.data
this.goods_list=res.goods_list
}
})
}
},
onLoad(e){
console.info(e)
this.details_index=e.details_index
this.query.order_id=e.id
this.getDate()
},
filters:{
goodsAttr(e){
return e.replace(/\s\n/g,';');
}
}
}
</script>

16
pages/productDetails/index.vue

@ -400,10 +400,18 @@
defaultRequest2(this.cartQuery).then(res=>{
console.info(res)
if(res.error==0){
uni.showToast({
title:'Successfully added',
icon:'none'
})
if(res.data[0].success){
uni.showToast({
title:'Successfully added',
icon:'none'
})
}else{
uni.showToast({
title:res.data[0].message,
icon:'none'
})
}
}
})
},

Loading…
Cancel
Save