diff --git a/pages.json b/pages.json
index 2086123..17ad990 100644
--- a/pages.json
+++ b/pages.json
@@ -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"
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 23d5d63..52f9a64 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,9 +2,7 @@
-
-
+
@@ -28,7 +26,10 @@
placeholder-style="color: rgba(255,255,255,0.8);" />
登 录
-
+
+
+ 微信登录
+
用户注册
找回密码
@@ -81,6 +82,106 @@
showType(loginIndex){
this.tabIndex = loginIndex;
},
+ wxLogin(){
+ var that = this
+ uni.login({
+ provider: 'weixin',
+ success: function (loginRes) {
+ console.log(loginRes)
+ uni.showLoading({
+ title: '微信登录中...',
+ mask: true
+ })
+ that.$u.api.login({
+ code: loginRes.code
+ }).then(
+ res => {
+ if(res.data.token!==''&&res.data.token!==undefined&&res.data.token!==null){
+ console.log(res)
+ that.$u.vuex('vuex_token', res.data.token)
+ that.$u.api.getInfo().then(res => {
+ that.$u.vuex('vuex_user', res.data)
+ if(res.data.icon===""){
+ that.$u.vuex('vuex_user.icon', '/static/img/face.jpg')
+ }else{
+ that.$u.vuex('vuex_user.icon', that.vuex_host + 'public/' + res.data.icon)
+ }
+ debugger;
+ uni.switchTab({
+ url:'/pages/tabBar/home/home'
+ })
+ })
+ that.$u.api.getAddress({prePage:50}).then(res=>{
+ for(var i=0;i{
+ for(let key in res.data){
+ if(res.data[key].often==1){
+ uni.setStorageSync('selectInvoice', res.data[key])
+ }
+ }
+
+ })
+ }else{
+ uni.showModal({
+ title: '温馨提示',
+ content: '亲，您还没有微信注册哟，是否前往注册',
+ success(modelRes) {
+ //如果用户点击了确定按钮
+ if (modelRes.confirm) {
+ uni.navigateTo({
+ url: 'register'
+ });
+ } else if (res.cancel) {
+ //如果用户点击了取消按钮
+ console.log(3);
+ uni.showModal({
+ title: '温馨提示',
+ content: '您拒绝了请求,不能正常使用小程序',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
+ }
+ });
+ }
+ debugger;
+ uni.hideLoading()
+ }
+ ).catch(res=>{
+ uni.showModal({
+ title: '温馨提示',
+ content: '亲，您还没有微信注册哟，是否前往注册',
+ success(modelRes) {
+ //如果用户点击了确定按钮
+ if (modelRes.confirm) {
+ uni.navigateTo({
+ url: 'register'
+ });
+ } else if (res.cancel) {
+ //如果用户点击了取消按钮
+ console.log(3);
+ uni.showModal({
+ title: '温馨提示',
+ content: '您拒绝了请求,不能正常使用小程序',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
+ }
+ });
+
+ })
+ }
+ });
+
+ },
oauthLogin(provider) {
uni.showLoading();
//第三方登录
@@ -195,6 +296,21 @@
that.$u.vuex('vuex_user.icon', that.vuex_host + 'public/' + res.data.icon)
}
})
+ that.$u.api.getAddress({prePage:50}).then(res=>{
+ for(var i=0;i{
+ for(let key in res.data){
+ if(res.data[key].often==1){
+ uni.setStorageSync('selectInvoice', res.data[key])
+ }
+ }
+
+ })
}else{
uni.showToast({
title: res.data.msg,
@@ -275,4 +391,13 @@
}
}
}
+ .wechartRegister{
+ text-align: center;
+ color: #ffffff;
+ }
+ .wechartRegisterImg {
+ width: 100rpx;
+ height: 100rpx;
+ margin-top: 30rpx;
+ }
diff --git a/pages/login/register.vue b/pages/login/register.vue
index b909859..1c5447f 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -2,7 +2,7 @@
-
+
@@ -309,7 +309,7 @@
color: #ffffff;
}
#wxRegister{
- background-color: #f06c7a ;
+ background-color: #01a5e4 ;
height: max-content;
padding: 0;
border: none;
diff --git a/pages/login/resetpasswd.vue b/pages/login/resetpasswd.vue
index b4af67f..b4f4653 100644
--- a/pages/login/resetpasswd.vue
+++ b/pages/login/resetpasswd.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 833c824..eafb40d 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -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
{{row.username}}
-
+
@@ -36,18 +36,20 @@
￥{{row._price}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
@@ -544,6 +546,7 @@
display: flex;
justify-content: center;
align-items: flex-end;
+ margin-right: 10upx;
.input{
width: 60upx;
height: 60upx;
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 0207f25..b96e0fe 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -104,7 +104,7 @@
{{ product.title }}
{{ product.price }}
- {{ product.pay_num }}人已付款
+
@@ -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;
diff --git a/pages/user/order_list/orderDetail.vue b/pages/user/order_list/orderDetail.vue
index 4bba4b5..4568c44 100644
--- a/pages/user/order_list/orderDetail.vue
+++ b/pages/user/order_list/orderDetail.vue
@@ -35,6 +35,9 @@
订单编号:{{row.order_sn}}
下单时间:{{row.create_time}}
+
发票类型: 无 普票 专票
@@ -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;
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index d6be99f..1176ab7 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -65,7 +65,7 @@
共{{row.shop_db.length}}件商品合计￥{{row.totalmoney}}(含运费 ￥{{row.real_freight}})
-->
- 取消订单
+ 取消订单
上传付款凭证
diff --git a/pages/user/setting/setting.vue b/pages/user/setting/setting.vue
index fc13f53..656e90f 100644
--- a/pages/user/setting/setting.vue
+++ b/pages/user/setting/setting.vue
@@ -24,6 +24,10 @@
发票信息
+