zcdsj
/
shuinishop
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

address

This commit is contained in:
shijing 2021-11-17 15:27:08 +08:00
parent 12931ae7d5
commit c6c34c30c6
12 changed files with 256 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages.json
View File

@ -104,7 +104,7 @@
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录",
"navigationBarBackgroundColor":"#f06c7a",
"navigationBarBackgroundColor":"#01a5e4",
"navigationBarTextStyle":"white",
"app-plus": {
"bounce": "none" ,//关闭窗口回弹效果
@ -116,7 +116,7 @@
"path": "pages/login/register",
"style": {
"navigationBarTitleText": "注册账号",
"navigationBarBackgroundColor":"#f06c7a",
"navigationBarBackgroundColor":"#01a5e4",
"navigationBarTextStyle":"white",
"app-plus": {
"bounce": "none" ,//关闭窗口回弹效果
@ -128,7 +128,7 @@
"path": "pages/login/resetpasswd",
"style": {
"navigationBarTitleText": "重置密码",
"navigationBarBackgroundColor":"#f06c7a",
"navigationBarBackgroundColor":"#01a5e4",
"navigationBarTextStyle":"white",
"app-plus": {
"bounce": "none" ,//关闭窗口回弹效果
@ -185,7 +185,7 @@
"style" : {
"enablePullDownRefresh": true,
"navigationBarTitleText": "消息列表",
"navigationBarBackgroundColor":"#f06c7a",
"navigationBarBackgroundColor":"#01a5e4",
"navigationBarTextStyle":"white"
}
}
@ -205,7 +205,7 @@
"path" : "pages/user/coupon/coupon",
"style" : {
"navigationBarTitleText": "优惠券",
"navigationBarBackgroundColor":"#f06c7a",
"navigationBarBackgroundColor":"#01a5e4",
"navigationBarTextStyle":"white",
"app-plus":{
"bounce":"none"
@ -216,7 +216,7 @@
"path" : "pages/user/keep/keep",
"style" : {
"navigationBarTitleText": "我的收藏",
"navigationBarBackgroundColor":"#f06c7a",
"navigationBarBackgroundColor":"#01a5e4",
"navigationBarTextStyle":"white",
"app-plus":{
"bounce":"none"

133
pages/login/login.vue
View File

File diff suppressed because one or more lines are too long

4
pages/login/register.vue
View File

File diff suppressed because one or more lines are too long

2
pages/login/resetpasswd.vue
View File

File diff suppressed because one or more lines are too long

84
pages/order/confirmation.vue
View File

@ -152,7 +152,7 @@
int: 1200, //抵扣积分
deduction: 0, //抵扣价格
recinfo:{
// id:0,
id:null
},
if_invoice:2,
freights:{},
@ -185,26 +185,20 @@
//console.log(this.freights)
this.calFreight() //计算运费
this.sumPrice = this.goodsPrice - this.deduction + parseFloat(this.freight);
}
} catch (e) {
// error
}
},
onShow() {
// uni.getStorage({
// key: 'buylist',
// success: (ret) => {
// }
// });
var that = this;
uni.getStorage({
key: 'selectAddress',
success: (e) => {
this.recinfo = e.data;
// uni.removeStorage({
// key: 'selectAddress'
// })
debugger;
console.log(this.recinfo)
}
})
uni.getStorage({
@ -258,24 +252,52 @@
});
},
toPay() {
//商品列表
// let paymentOrder = [];
// let goodsid = [];
// let len = this.buylist.length;
// for (let i = 0; i < len; i++) {
// paymentOrder.push(this.buylist[i]);
// goodsid.push(this.buylist[i].id);
// }
// if (paymentOrder.length == 0) {
// uni.showToast({
// title: '订单信息有误，请重新购买',
// icon: 'none'
// });
// return;
// }
let that = this;
if(!this.recinfo.id){
debugger;
uni.showToast({
title: '请选择收货地址',
icon: 'none'
});
return;
}else{
let time = false;
that.$u.api.getAddress({prePage:50}).then(res=>{
for(let key in res.data){
if(res.data[key].id==that.recinfo.id){
time = true;
} else{
}
}
if(time){}else{
uni.showToast({
title: '请选择有效的收货地址',
icon: 'none'
});
that.recinfo = {};
return;
}
})
}
if(this.if_invoice==1 || this.if_invoice==2){
if(this.invoiceinfo.id){
let time1 = false;
that.$u.api.getInvoice({prePage:50}).then(res=>{
for(let key in res.data){
if(res.data[key].id==that.invoiceinfo.id){
time1 = true;
} else{
}
}
if(time){}else{
uni.showToast({
title: '请选择有效的发票地址',
icon: 'none'
});
that.invoiceinfo = {};
return;
}
})
}else{
uni.showToast({
title:'请选择发票信息',
@ -291,13 +313,7 @@
});
return;
}
if(this.recinfo.id==0){
uni.showToast({
title: '请选择收货地址',
icon: 'none'
});
return;
}
let goods = []
for(let i=0;i<this.buylist.length;i++){
goods.push({

5
pages/tabBar/cart/cart.vue
View File

@ -19,7 +19,7 @@
<view style=" width: 100%; padding: 20rpx 0 20rpx 150rpx;">
{{row.username}}
</view>
<view style=" display: flex;">
<view style="display: flex;width:100%">
<!-- checkbox -->
<view class="checkbox-box" @tap="selected(index)">
<view class="checkbox">
@ -36,6 +36,7 @@
<!-- <view class="spec">{{row.spec}}</view> -->
<view class="price-number">
<view class="price">￥{{row._price}}</view>
<!-- <view style="display: flex;flex-shrink:0"> -->
<view class="number">
<view class="sub" @tap.stop="sub(index)">
<view class="icon jian"></view>
@ -48,6 +49,7 @@
</view>
</view>
<icon type="cancel" size="26" @tap.stop="deleteGood(row.id, index)"/>
<!-- </view> -->
</view>
</view>
</view>
@ -544,6 +546,7 @@
display: flex;
justify-content: center;
align-items: flex-end;
margin-right: 10upx;
.input{
width: 60upx;
height: 60upx;

7
pages/tabBar/home/home.vue
View File

@ -104,7 +104,7 @@
<view class="name">{{ product.title }}</view>
<view class="info">
<view class="price">{{ product.price }}</view>
<view class="slogan">{{ product.pay_num }}人已付款</view>
<!-- <view class="slogan">{{ product.pay_num }}人已付款</view> -->
</view>
</view>
</view>
@ -803,6 +803,8 @@ page{position: relative;background-color: #fff;}
border-radius: 20upx;
background-color: #fff;
margin: 0 0 15upx 0;
position: relative;
padding-bottom: 50upx;
box-shadow: 0upx 5upx 25upx rgba(0, 0, 0, 0.1);
image {
width: 100%;
@ -825,7 +827,8 @@ page{position: relative;background-color: #fff;}
align-items: flex-end;
width: 92%;
padding: 10upx 4% 10upx 4%;
position: absolute;
bottom: 0;
.price {
color: #e65339;
font-size: 30upx;

34
pages/user/order_list/orderDetail.vue
View File

@ -35,6 +35,9 @@
<view class="block">
<view class="marginBottom20"><view class="grayColor">订单编号:</view>{{row.order_sn}}</view>
<view><view class="grayColor">下单时间:</view>{{row.create_time}}</view>
<!-- <view v-if="hasLogs"><view class="grayColor">物流信息:</view>{{logistics}}</view>
<view v-if="row.shipping_status==1&&!hasLogs" class="viewLogistics" @click="viewLogistic">查看物流信息</view>
-->
</view>
<view class="block">
<view :class="[row.if_invoice!==0?'marginBottom20':'']"><view class="grayColor">发票类型:</view> <text v-if="row.if_invoice==0">无</text> <text v-else-if="row.if_invoice==1">普票</text> <text v-else>专票</text></view>
@ -71,7 +74,9 @@
name: 'file',
url: '',
filepath: [],
rpath:[]
rpath:[],
logistics:'lalalala',
hasLogs:false,
};
},
onLoad(e) {
@ -110,6 +115,22 @@
}, 300);
}, 700)
},
//查看物流信息
viewLogistic(){
var that = this;
that.hasLogs = true;
/* that.$u.api(that.row.id).then(res=>{
if(res.data){
that.hasLogs = true;
uni.showToast({
title: '查询成功',
icon:'none'
});
}else{}
}) */
},
cancelOrder(){
var that = this;
uni.showModal({
@ -232,7 +253,16 @@
width: 100%;
font-size: 34upx;
}
.viewLogistics{
height: 50upx;
padding: 0 20upx;
border-radius: 30upx;
font-size: 26upx;
display: inline-block;
line-height: 50upx;
color: #0055ff;
border: 1upx solid #0055ff;
}
.content {
.nominal {
color: gray;

2
pages/user/order_list/order_list.vue
View File

@ -65,7 +65,7 @@
<view class="number">共{{row.shop_db.length}}件商品</view><view class="sum">合计￥<view class="price">{{row.totalmoney}}</view></view><view class="nominal">(含运费 ￥{{row.real_freight}})</view>
</view> -->
<view class="btns">
<view class="default" @tap="cancelOrder(row.id, index)" v-if="row.pay_status!=0&&row.shipping_status==0">取消订单</view>
<view class="default" @tap="cancelOrder(row.id, index)" v-if="row.shipping_status==0">取消订单</view>
<view class="pay" @tap="toUppay(row)" v-if="row.pay_status==0||row.pay_status==2">上传付款凭证</view></block>
<!-- <block v-if="row.type=='back'"><view class="default" @tap="remindDeliver(row)">提醒发货</view></block> -->
<!-- <view class="default" @tap="showLogistics(row)">查看物流</view> -->

13
pages/user/setting/setting.vue
View File

@ -24,6 +24,10 @@
<view class="title">发票信息</view>
<view class="right"><view class="tis"></view><view class="icon xiangyou"></view></view>
</view>
<!-- <view class="row" @click="unBindWeixin()">
<view class="title">微信解绑</view>
<view class="right"><view class="tis"></view><view class="icon xiangyou"></view></view>
</view> -->
</view>
<!-- <view class="list">
<view class="row">
@ -97,9 +101,9 @@
url:'/pages/user/invoice/invoice'
})
},
logout(){
unBindWeixin(){
var that = this
/* that.$u.api.logout().then(res=>{
that.$u.api.logout().then(res=>{
if(res.code==0){
that.$u.vuex('vuex_user', {nickname: '游客', icon:'/static/img/face.jpg'})
that.$u.vuex('vuex_token', '')
@ -107,7 +111,10 @@
url:'/pages/login/login'
})
}
}) */
})
},
logout(){
var that = this
that.$u.vuex('vuex_user', {nickname: '游客', icon:'/static/img/face.jpg'})
that.$u.vuex('vuex_token', '')
uni.reLaunch({

7
static/css/login.scss
View File

@ -1,5 +1,5 @@
page {
background: linear-gradient(to bottom, #f06c7a 0%, #f06c7a 100%);
background: linear-gradient(to bottom, #01a5e4 0%, #01a5e4 100%);
height: 100%;
}
.icon {
@ -18,6 +18,9 @@ page {
image {
width: 100%;
border-radius: 100%;
padding: 10rpx;
// box-sizing: border-box;
background: #ffffff;
}
}
}
@ -45,7 +48,7 @@ page {
}
.btn {
color: #f06c7a;
color: #01a5e4;
width: 100%;
height: 90upx;
display: flex;

BIN
static/img/cycLogoImg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB