diff --git a/App.vue b/App.vue
index e896560..7fd165e 100644
--- a/App.vue
+++ b/App.vue
@@ -20,8 +20,8 @@
})
setTimeout(() => {
- plus.navigator.closeSplashscreen();
- }, 5000);
+ plus.navigator.closeSplashscreen();
+ }, 2400);
},
onShow: function() {
console.log('App Show')
diff --git a/common/common.scss b/common/common.scss
index a165e26..6b5bd3e 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -4,6 +4,101 @@
height: 50rpx;
// background-color: #000000;
}
+.addCard{
+ font-size: 26rpx !important;
+ line-height: 34rpx;
+}
+.hotmaxW{
+
+ // height:300rpx !important;
+ padding:60rpx 60rpx !important;
+ transition: margin-right 2s .5s;
+ transform:scale(1.2);
+}
+.hotmaxW :hover {
+ transform:scale(1.2);
+ }
+.hotmaxmin{
+ padding:40rpx 40rpx !important;
+ transition: margin-right 2s .5s;
+ transform:scale(0.8);
+}
+.empty_item{
+
+ height: 500rpx;
+ padding: 20rpx 100rpx;
+ margin:50rpx auto;
+ color:#000;
+ font-size: 24rpx;
+ text-align: center;
+ .empty_item_img{
+ height: 180rpx;
+ width: 180rpx;
+ margin: 0 auto;
+ margin-bottom: 30rpx;
+ image{
+ height: 100%;
+ width: 100%;
+
+ }
+ }
+ button {
+ font-size: 24.33rpx;
+ font-weight: 500;
+ background-color: black;
+ color: white;
+ width: 160rpx;
+ height: 65.67rpx;
+ border-radius: 20rpx !important;
+ line-height: 65.67rpx;
+ border-radius: 0;
+ margin-top: 33.33rpx;
+ }
+ .uni-button{
+ border-radius: 20rpx !important;
+ }
+ }
+.one{
+ display: flex;
+ height:100rpx;
+ padding-top: 50rpx;
+ width: 100%;
+ top:0;
+ line-height: 100rpx;
+ z-index: 99;
+ background-color: #000;
+ position: fixed;
+ text-align: center;
+ padding-left:20rpx;
+ color:#fff;
+ image{
+ float: left;
+ padding-top: 30rpx;
+ padding-right:20rpx;
+ height: 40rpx;
+ width: 40rpx;
+ }
+ .one_text{
+ width: 60%;
+ text-align: center;
+ margin-left: 10%;
+ }
+
+ }
+ // .left image,
+ // .right image .imgallb{
+ // border-radius: 10rpx !important;
+ // }
+
+ .text_white{
+ color:#fff;
+ font-weight: bold;
+ margin-left: 5rpx;
+ }
+.uni-countdown__splitor{
+ color:#fff !important;
+}
+
.uni-bg-black{
background-color: #000000;
@@ -64,7 +159,7 @@
// 评价
.reviews_item{
padding: 34rpx 0;
- border-bottom: 0.1rpx solid #3b3b3b;
+ border-bottom: 0.1rpx solid #1b1b1b;
opacity: 0.7;
&:last-child{
border-bottom: none;
@@ -75,8 +170,8 @@
// justify-content: space-around;
.reviews_item_img{
- height: 100rpx;
- width: 100rpx;
+ height: 60rpx;
+ width: 60rpx;
// border-radius: 50%;
// margin-right: 2rpx;
@@ -146,6 +241,9 @@
font-size: 26.67rpx;
font-weight: 400;
margin-bottom: 34.67rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ overflow: hidden;
}
.reviews_item_image{
display: flex;
@@ -155,7 +253,7 @@
width: 233.33rpx;
height: 233.33rpx;
margin-left: 16.67rpx;
- // background-color: #999999;
+ background-color: #999999;
background-size: 100% !important;
image{
height: 100%;
@@ -167,7 +265,28 @@
}
}
}
-
+.order_popup_title{
+ position: relative;
+ font-size: 32rpx;
+ font-weight: bold;
+ border-bottom: 1px solid #E2E2E2;
+ display: flex;
+ color:#000;
+ align-items: center;
+ justify-content: center;
+ // padding-top: 44.67rpx;
+ padding-bottom: 20.67rpx;
+ text-align: center;
+ image{
+ width: 21.33rpx;
+ height: 21.33rpx;
+ position: absolute;
+ right: 26rpx;
+ }
+ }
+ .img_border{
+ border-radius: 10rpx;
+ }
// 谈判细节
.order_popup{
position: fixed;
@@ -290,7 +409,14 @@
left: 0;
}
.wishlist_body{
+ padding-top:60rpx;
+ // margin-top: 40rpx;
position: relative;
+ height: 100%;
+ width: 100%;
+ // padding-bottom: 50rpx;
+ background-color: #000;
+ color:#fff !important;
}
.wishlist{
@@ -393,7 +519,8 @@
.recommend{
padding: 0 26.67rpx;
padding-top: 54rpx;
-
+ // background-color: #;
+ color:white;
.recommend_title{
position: relative;
text-align: center;
@@ -413,27 +540,45 @@
}
.recommend_content{
display: flex;
+ // background-color: #f4f3f8 !important;
justify-content: space-between;
flex-wrap: wrap;
- font-size: 29.33rpx;
- font-weight: 400;
+ line-height: 34rpx;
+
+ font-size: 26.33rpx;
+ // font-weight: 400;
.recommend_content_item{
width: 340rpx;
- margin-bottom: 16.67rpx;
+ border-radius: 10rpx;
+ background-color: #1e1e1e;
+ border-radius: 10rpx;
+ margin-bottom: 24rpx;
+
+ padding-bottom:20rpx;
.recommend_content_name{
height: 80rpx;
line-height: 40rpx;
overflow: hidden;
- font-size: 25rpx;
+ font-size: 20rpx;
}
.recommend_content_item_image{
width: 100%;
height:340rpx ;
- background-color: #999999;
+ border-top-left-radius: 10rpx;
+ border-top-right-radius: 10rpx;
+ background-color: #141414;
margin-bottom: 11.33rpx;
+ image{
+ border-top-left-radius: 10rpx;
+ border-top-right-radius: 10rpx;
+ }
.recommend_content_item_image_name{
+ height: 80rpx;
+ // padding: 20rpx 20rpx;
+ background-color: #630102 !important;
+ line-height: 40rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@@ -446,6 +591,7 @@
.recommend_content_item_pric{
font-size: 32rpx;
// font-weight: bold;
+ // padding-left:20rpx;
margin-top: 6rpx;
}
}
@@ -599,13 +745,19 @@
margin-bottom: 56rpx;
}
.tips{
- color: #630201;
- font-size: 18.67rpx;
- font-weight: bold;
+ color: #fff;
+ font-size: 26rpx;
+ display: flex;
+ image{
+ height: 32rpx;
+ width: 32rpx;
+ margin: 0 10rpx;
+ }
+ // font-weight: bold;
}
.forgot{
- font-size: 22.67rpx;
- color: #666666;
+ font-size: 25.67rpx;
+ color: #fff;
margin-top: 29.33rpx;
text-align: right;
margin-bottom: 34.67rpx;
@@ -636,8 +788,8 @@
font-weight: bold;
.agreement_image{
- width: 24rpx;
- height: 24rpx;
+ width: 34rpx;
+ height: 34rpx;
margin-right: 13.33rpx;
padding-top: 4rpx;
}
diff --git a/common/scss/order.scss b/common/scss/order.scss
index cb7bcb1..e404333 100644
--- a/common/scss/order.scss
+++ b/common/scss/order.scss
@@ -1,6 +1,7 @@
.order_popup_commodity{
padding:0 26rpx;
-
+ bottom: 0;
+ z-index: 99;
}
@@ -97,6 +98,9 @@
}
.order_popup_commodity{
border-bottom: 14.67rpx solid #F6F5FA;
+ // background-color: #B22234;
+ // height: 100rpx;
+ // width: 100%;
}
.summary{
border-bottom: 14.67rpx solid #F6F5FA;
diff --git a/config.js b/config.js
index 685bee4..41cda38 100644
--- a/config.js
+++ b/config.js
@@ -1,5 +1,5 @@
- // var weburl='en.meixx.com';
- var weburl = 'lilbeattranapismits.dopeplus.com';
+ //var weburl='en.meixx.com';
+ var weburl = 'lilbeattranapismits.dopeplus.com';
export default {
apiUri: 'https://'+weburl+'/',
imgUri: 'http://'+weburl+'/',
diff --git a/manifest.json b/manifest.json
index 0846883..8d4c838 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,18 +10,18 @@
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
+ // "splashscreen" : {
+ // "alwaysShowBeforeRender" : false,
+ // "waiting" : false,
+ // "autoclose" : true,
+ // "delay" : 0
+ // },
"splashscreen" : {
"alwaysShowBeforeRender" : false,
+ "autoclose" : false,
"waiting" : false,
- "autoclose" : true,
"delay" : 0
},
- // "splashscreen" : {
- // "alwaysShowBeforeRender" : false,
- // "autoclose" : false,
- // "waiting" : false,
- // "delay" : 0
- // },
"safearea" : {
"bottom" : {
"offset" : "none"
diff --git a/pages.json b/pages.json
index fb4bfed..33c0ce4 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,17 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "uni-app",
+ "enablePullDownRefresh":true,
+ "app-plus":{
+ "titleNView":false
+ },
+ "navigationBarTextStyle":"white"
+ }
+ },
{
"path": "pages/index/first",
"style": {
@@ -14,17 +26,6 @@
}
}
},
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "uni-app",
- "enablePullDownRefresh":true,
- "app-plus":{
- "titleNView":false
- },
- "navigationBarTextStyle":"white"
- }
- },
{
"path": "pages/index/search",
"style": {
@@ -138,10 +139,8 @@
{
"path": "pages/login/index",
"style": {
- "navigationStyle":"custom",
- "enablePullDownRefresh": false
- // "navigationBarTitleText": " ",
- // "navigationBarBackgroundColor":"#000000"
+ "navigationStyle":"custom"
+ // "navigationBarTextStyle":"white"
}
},
{
diff --git a/pages/account/addAddress.vue b/pages/account/addAddress.vue
index c70595b..066835c 100644
--- a/pages/account/addAddress.vue
+++ b/pages/account/addAddress.vue
@@ -413,6 +413,9 @@
}
},
+ onShow() {
+ this.getCountry()
+ },
onLoad(e) {
if(e.type==1){
diff --git a/pages/account/address.vue b/pages/account/address.vue
index e13798d..adf981a 100644
--- a/pages/account/address.vue
+++ b/pages/account/address.vue
@@ -25,7 +25,16 @@
-
-
+
@@ -712,11 +712,14 @@
// this.getList()
},
},
- onShow() {
+ onShow(e) {
+ this.scrollChange(0)
this.getList()
},
onLoad(e) {
+ this.scrollChange(0)
this.scroll_active=e.scroll_active
+ this.scrollChange(e.index)
},
filters:{
goodsAttr(e){
diff --git a/pages/account/myReview.vue b/pages/account/myReview.vue
index f1ca78d..792b220 100644
--- a/pages/account/myReview.vue
+++ b/pages/account/myReview.vue
@@ -1,7 +1,7 @@
-
+
+
+
+
-
+ No comment!
+
+
@@ -39,52 +45,28 @@
page_index:1,
page_size:10,
- }
+ },
+ list:[]
}
},
methods:{
getList(){
let query ={
- _action:"getmycomments",
+ _action:'getmycomment',
page_index:1,
page_size:20,
}
console.log(query)
defaultRequest(query).then(res =>{
console.log(res)
- })
- const json_data={
- appcode:'DOPE+' ,//应用编码
- appchannel:'FXXXXHUAWEI' ,//应用发布渠道
- appver: '1.0.0',//应用版本
- appname:'cnic_buyer' ,//应用名称
- manufacturer:'HUAWEI',//设备生产商
- phonebrand:'HORNOR' ,//设备品牌
- phonetype:'X30' ,//设备型号
- phoneos:'ANDROID',// 设备系统
- _action:'getmycomments',//
- page_index:1,
- page_size:20,
+ if(res.error ==0){
- }
- let data = encryptDes(JSON.stringify(json_data),'6780f04cf2e211ec86a8005056c00008')
- uni.request({
- url:'https://en.meixx.com/mapi/api_v2011.php?appcode=DOPE+',
- // url:'https://lilbeattranapismits.dopeplus.com/mapi/api_v2011.php?appcode=DOPE+',
- data:{
- data:data
- },
- success: (res) => {
- console.log(res.data);
- // this.text = 'request success';
- let data2=decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008');
- console.log(data2)
- }
+ }
})
}
},
onLoad(e) {
- // this.query.goods_id=e.goods_id
+ this.query.goods_id=e.goods_id
this.getList()
},
// onShow() {
diff --git a/pages/account/pointsDetails.vue b/pages/account/pointsDetails.vue
index 90690e9..32a361d 100644
--- a/pages/account/pointsDetails.vue
+++ b/pages/account/pointsDetails.vue
@@ -1,6 +1,10 @@
-
+
+
+
@@ -10,6 +14,15 @@
{{ item.change_time }}
+
+
+
+
+ Full refund for the first order for new members~
+
+
+
+
@@ -28,6 +41,11 @@
back(){
uni.navigateBack()
},
+ goPage(){
+ uni.switchTab({
+ url:'../index/index'
+ })
+ },
getUserinfo(){
let data ={
_action:'getuseraccountlog',page_index:1,page_size:20
@@ -42,7 +60,7 @@
goto(){
uni.navigateTo({
- url:'../specialTitle/index?id='+'POINTSRULE'
+ url:'../specialTitle/index?id='+'POINTSRULE'+'&title='+'POINTS RULE'
})
}
},
@@ -84,4 +102,39 @@
}
}
+ .empty_item1{
+
+ height: 500rpx;
+ padding: 20rpx 100rpx;
+ margin:50rpx auto;
+ color:#000;
+ font-size: 24rpx;
+ text-align: center;
+ .empty_item_img{
+ height: 180rpx;
+ width: 180rpx;
+ margin: 0 auto;
+ margin-bottom: 30rpx;
+ image{
+ height: 100%;
+ width: 100%;
+
+ }
+ }
+ button {
+ font-size: 24.33rpx;
+ font-weight: 500;
+ background-color: black;
+ color: white;
+ width: 200rpx;
+ height: 65.67rpx;
+ border-radius: 20rpx !important;
+ line-height: 65.67rpx;
+ border-radius: 0;
+ margin-top: 33.33rpx;
+ }
+ .uni-button{
+ border-radius: 20rpx !important;
+ }
+ }
\ No newline at end of file
diff --git a/pages/account/settings.vue b/pages/account/settings.vue
index c6670ec..157b37b 100644
--- a/pages/account/settings.vue
+++ b/pages/account/settings.vue
@@ -35,7 +35,8 @@
export default {
data() {
return {
- appver:''
+ appver:'',
+
}
},
methods:{
@@ -93,12 +94,29 @@
url:'../order/paypalWebview?src='+urlStr2
})
}
+ },
+ getAppnum(){
+ let data = {
+ _action:'getnewversion'
+ }
+ defaultRequest2(data).then(res =>{
+ console.log(res)
+ if(res.error == 0){
+ let v = uni.getStorageSync('appdata')
+ console.log(v)
+ if(!res.data.ver_name){
+ this.appver = v.appver
+ }else{
+ this.appver = res.data.ver_name
+ }
+
+ }
+ })
}
},
onLoad() {
- let v = uni.getStorageSync('appdata')
- console.log(v)
- this.appver = v.appver
+ this.getAppnum()
+
}
}
diff --git a/pages/account/wishlist.vue b/pages/account/wishlist.vue
index 5b73bf7..337410c 100644
--- a/pages/account/wishlist.vue
+++ b/pages/account/wishlist.vue
@@ -1,7 +1,8 @@
-
+
@@ -12,10 +13,19 @@
US${{item.promote_price?item.promote_price:item.shop_price}}
-
+
+
+
+
+
+ Full refund for the first order for new members~
+
+
+
+
@@ -255,8 +265,9 @@
data() {
return {
isShow:false,
- popup_index:'',
+ popup_index:-1,
isCoupons:false,
+ popup_good:-1,
isPoints:false,
query:{
_action:'cartcheckout',
@@ -282,8 +293,8 @@
current:-1,
count:0,
Points:0,
- use:false,
- nouse:true,
+ use:true,
+ nouse:false,
bouns_id:'',
totalnum:0,
@@ -302,73 +313,73 @@
}
},
methods:{
+ place(){
+ if(!this.address){
+ uni.showToast({
+ icon:'none',
+ title:'please add address'
+ })
+ this.isShow = false
+ }
+ else if(this.total.amount!=0 && this.address){
+ this.isShow=true
+ }else{
+ this.isShow = false
+ this.submitorder()
+ setTimeout(() =>{
+ uni.showToast({
+ icon:'none',
+ title:'ok!'
+ })
+ },1000)
+ uni.navigateTo({
+ url:'../account/myOrders?index='+0
+ });
+
+
+ }
+ },
// 使用红包
useCoupons(index,item){
// this.current = index
- let total = this.total
- console.log(this.current)
+ let total = uni.getStorageSync('total')
+ ////console.log(this.current)
// this.bouns_id = item.bonus_id
- //console.log(total)
+ //////console.log(total)
if(this.current == index ){
this.bonus = item.type_money
- //console.log(this.bonus)
+ //////console.log(this.bonus)
this.total.bonus = item.type_money
let id = item.bonus_id
this.bouns_id = item.bonus_id
let data={_action:'cartselectbonus',bonus:id,consignee:this.address}
- console.log(data)
- defaultRequest3(data,'consignee').then(res=>{
- if(res.error==0){
-
- this.total=res.data.total
- console.log(this.total.bonus)
- uni.setStorageSync('Total',this.total)
- this.order=res.data.order
- console.log(this.use)
- //使用了余额
- // console.log(this.count,this.total.amount,this.Points)
- if(this.use){
-
- console.log(this.count > this.total.amount)
-
- if(this.count > this.total.amount){
- this.Points = this.total.amount
- this.total.amount = 0
-
- }else if (this.count < this.total.amount || this.count == this.total.amount){
- this.Points = this.count
- let a = (parseFloat(this.Points) + parseFloat(this.total.bonus)).toFixed(2)
- console.log(this.total.amount)
- this.total = uni.getStorageSync('total')
- let b = (this.total.amount - a ).toFixed(2)
- console.log(b)
- this.total.amount = b
- }
-
-
- }
-
-
+ ////console.log(data)
+ // defaultRequest3(data,'consignee').then(res=>{
+ // if(res.error==0){
- //不使用
- else{
- this.Points = 0
- //console.log(222)
- }
+ // this.total=res.data.total
+ // ////console.log(this.total.bonus)
+ // uni.setStorageSync('Total',this.total)
+ // this.order=res.data.order
+ // ////console.log(this.use)
+ // //使用了余额
+ // this.usemethod()
+ // // this.Thepoint()
-
- }
- })
+ // }
+ // })
+ this.total.amount = (parseFloat(total.amount) - parseFloat(this.bonus)).toFixed(2)
+ uni.setStorageSync('Total',this.total)
+ this.Thepoint()
}
else{
this.bonus = 0
- this.total = uni.getStorageSync('total')
- this.bouns_id = 0
- // this.Points = this.total.amount
- //console.log(this.total)
+ this.total = uni.getStorageSync('total')
+ this.Thepoint()
}
+ // this.isCoupons = false
},
gotoindex(){
uni.switchTab({
@@ -378,67 +389,39 @@
// 获取调用支付信息数据
getPayDate(id,will_get_integral){
let data
- //console.log(222)
+ //////console.log(222)
if(this.pay_index ==0){
data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'paypal'}
defaultRequest2(data).then(res=>{
- ////console.info(data,'支付')
- //console.log(res)
+ ////////console.info(data,'支付')
+ //////console.log(res)
if(res.error == 0){
- if(res.data.need_pay_amount==0)
- this.isShow = false
- {
- setTimeout(() =>{
- uni.showToast({
- icon:'none',
- title:'ok!'
+ // plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
+ // this.src = res.data.prepay_data.checkoutnow_url
+ uni.navigateTo({
+ url:'./paypalWebview?src='+res.data.prepay_data.checkoutnow_url
})
- },2000)
- uni.navigateTo({
- url:'../account/myOrders'
- })
- }
- // plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
- // this.src = res.data.prepay_data.checkoutnow_url
- uni.navigateTo({
- url:'./paypalWebview?src='+res.data.prepay_data.checkoutnow_url
- })
+
}
})
}else{
data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
defaultRequest2(data).then(res=>{
- //console.info(res,'支付宝')
+ //////console.info(res,'支付宝')
if(res.error==0){
//订单对象，从服务器获取
- if(res.data.need_pay_amount==0) {
- if(res.data.need_pay_amount==0)
- this.isShow = false
- {
- setTimeout(() =>{
- uni.showToast({
- icon:'none',
- title:'ok!'
- })
-
- },2000)
- uni.navigateTo({
- url:'../account/myOrders'
- })
- }
- }
uni.requestPayment({
provider: 'alipay',
orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
success: function (res) {
- ////console.log('success:' + JSON.stringify(res));
+ ////////console.log('success:' + JSON.stringify(res));
uni.redirectTo({
url: 'paySuccess?type=0&order_id='+id+'&will_get_integral='+will_get_integral
});
},
fail: function (err) {
- ////console.log('fail:' + JSON.stringify(err));
+ ////////console.log('fail:' + JSON.stringify(err));
uni.redirectTo({
url: 'paySuccess?type=1&order_id='+id+'&will_get_integral='+will_get_integral
});
@@ -452,14 +435,18 @@
},
Thepoint(){
//使用余额 使用红包
- ////console.log(this.total)
- if(this.use && this.current!=-1){
+ ////////console.log(this.total)
+ // if(this.bonus !=0){
+
+ // }
+ if(this.use && (this.current!=-1||this.bonus!==0)){
+ this.total.bonus = this.bonus
this.total = uni.getStorageSync('Total')
if(parseFloat(this.count) > this.total.amount){
let i = (parseFloat(this.count) - this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
// this.Points = (this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
this.Points = this.total.amount
- //console.log(this.Points)
+ //////console.log(this.Points)
this.total.amount = 0
}
@@ -467,16 +454,17 @@
let i = (this.total.amount -parseFloat(this.count)).toFixed(2)
// this.total.amount = i
this.Points = this.count
- this.total.amount = (this.total.amount - parseFloat(this.Points)).toFixed(2)
+ this.total.amount = (this.total.amount - parseFloat(this.Points)).toFixed(2)
}
}
//使用红包
- else if(!this.use&& this.current!=-1){
+ else if(!this.use&& this.current!==-1){
this.Points = 0
this.total = uni.getStorageSync('Total')
}
// 都不使用
else if(!this.use&& this.current==-1){
+ this.bonus = 0
this.total = uni.getStorageSync('total')
}
//使用余额
@@ -485,7 +473,7 @@
let i = (parseFloat(this.count) - this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
// this.Points = (this.total.amount - parseFloat(this.total.bonus)).toFixed(2)
this.Points = this.total.amount
- //console.log(this.Points)
+ //////console.log(this.Points)
this.total.amount = 0
}
@@ -496,7 +484,7 @@
this.total.amount = (this.total.amount - parseFloat(this.Points)).toFixed(2)
}
}
-
+ this.isPoints = false
},
// 选择支付方式
selectPay(index){
@@ -522,60 +510,117 @@
directshopping:0,
}
defaultRequest3(data,'consignee').then(res=>{
- //console.info(res)
- //console.log(data)
+ //////console.info(res)
+ //////console.log(data)
if(res.error==0){
this.getPayDate(res.data.order.order_id,res.data.will_get_integral)
}
})
},
+
// 变更配送方式
cartselectshipping(id){
let data={_action:'cartselectshipping',shipping_id:id,consignee:this.address}
defaultRequest3(data,'consignee').then(res=>{
- ////console.info(res)
+ ////console.info(data)
if(res.error==0){
this.tag = 1
this.total=res.data.total
+ //console.log(this.total)
+ this.totalnum = this.total.amount
+ console.log(typeof(this.totalnum))
+ uni.setStorageSync('total',(res.data.total))
+ let ss = uni.getStorageSync('total')
this.order=res.data.order
this.orderId=res.data.order.shipping_id
+ // this.usemethod()
+ this.Thepoint()
}
})
},
getList(){
defaultRequest3(this.query,'consignee').then(res=>{
- ////console.log(this.query)
- ////console.info(res)
+ ////////console.log(this.query)
+ //console.info(res)
if(res.error==0){
this.orderDate=res.data
this.address=res.data.consignee
this.goods_list=res.data.goods_list
+ this.total = res.data.total
+ //console.info(this.goods_list)
this.shipping_list=res.data.shipping_list
- // ////console.info(res.data.shipping_list,'1111')
+ this.orderId = this.shipping_list[0].shipping_id
+ //console.info(res.data)
+ ////console.log(this.shipping_list[0].shipping_id)
+ this.cartselectshipping(this.orderId)
if(res.data.bonus_list){
this.bonus_list=res.data.bonus_list
}
- this.total=res.data.total
- this.totalnum = this.total.amount
- uni.setStorageSync('total',(res.data.total))
- let ss = uni.getStorageSync('total')
- ////console.log(ss,'0000')
+ // this.total=res.data.total
+ // this.totalnum = this.total.amount
+ // uni.setStorageSync('total',(res.data.total))
+ // let ss = uni.getStorageSync('total')
+ ////console.log(res.data.total)
this.order=res.data.order
}
})
// 获取红包
let data={_action:'getuserbonus'}
+ var time = new Date();
+ // var today = time.getFullYear()
+ // var month
+ // if(time.getMonth() +1 <10){
+ // month = '0'+(time.getMonth() +1).toString()
+ // }
+ // var date = time.getDate()
+ // var timecurrent = today.toString() + month.toString() + date.toString()
+ var today = time.toLocaleString()
+ console.log(time.toLocaleString())
defaultRequest2(data).then(res=>{
- ////console.info(res)
+ ////////console.info(res)
if(res.error==0){
- this.list=res.data
- }
+ this.list=res.data
+ ////console.log(this.list[0].type_money)
+ // this.bonus = this.list[0].type_money
+ // console.log(this.total.amount)
+ let list = []
+ let list2= []
+ res.data.map( item =>{
+ let hb_time = new Date(Date.parse(item.use_end_date))
+ // console.log(new Date(Date.parse(item.use_end_date)))
+ item.use = hb_time > new Date(Date.parse(today))
+ // this.list = []
+ list.push(item)
+ this.list = list
+ if(parseFloat(item.min_goods_amount) new Date(Date.parse(today)))
+ })
+ this.bonus = list2[0].type_money
+ this.bonus_id = list2[0].bonus_id
+ let sum = (parseFloat(this.total.amount) - parseFloat(this.bonus).toFixed(2)).toFixed(2)
+ console.log(sum)
+ this.total.amount = sum
+ // uni.setStorageSync('Total',this.total)
+ uni.setStorageSync('totalsum',sum)
+
+ console.log(this.list)
+ }
})
//获取余额
defaultRequest2({
_action:'getusersummarydata'
}).then(res =>{
- ////console.log(res)
+ ////////console.log(res)
if(res.error ==0){
this.count = res.data.user_info.user_money
// this.count = 4.00
@@ -584,15 +629,18 @@
})
},
openMore(i){
- this.popup_index=i
+ this.popup_index = i
+ //console.log(this.popup_index)
if(i==1){
- this.isCoupons = true
+
if(!this.list){
uni.showToast({
icon:'none',
title:'No coupon available'
})
return
+ }else{
+ this.isCoupons = true
}
if(this.orderDate.allow_use_bonus==0){
uni.showToast({
@@ -601,15 +649,24 @@
})
return
}
- }else if(i==3){
- this.isPoints = true
- if(this.orderDate.allow_use_integral==0){
+ }
+ if(i==3){
+ if(this.count>0){
+ this.isPoints = true
+ }
+ else{
uni.showToast({
- icon:'none',
- title:'Points cannot be used for this product'
- })
- return
+ icon:'none',
+ title:'Points cannot be used for this product'
+ })
}
+ // if(this.orderDate.allow_use_integral==0){
+ // uni.showToast({
+ // icon:'none',
+ // title:'Points cannot be used for this product'
+ // })
+ // return
+ // }
}else{
if(!this.address){
uni.showToast({
@@ -623,33 +680,40 @@
title:'please select shipping method'
})
}
- else{
- this.isShow=true
- }
+ // else{
+ // this.isShow=true
+ // }
}
}
},
onLoad(e) {
-
+ // this.current = 0
this.query=JSON.parse(e.query)
- this.orderId = e.orderId
- this.order.shipping_id = e.orderId
+ // if(e.orderId){
+ // this.orderId = e.orderId
+ // this.order.shipping_id = e.orderId
+ // }
+ this.orderId = 11
+ this.order.shipping_id = 11
+ // this.bonus = item.type_money
+ // this.cartselectshipping(this.orderId)
if(this.orderId){
this.tag =1
}
- ////console.log(this.orderId,'///')
+ ////console.log(e.orderId)
this.getList()
+ this.cartselectshipping(11)
},
onShow(e) {
this.getList()
uni.$once('query' ,(query)=>{
- ////console.info(query)
+ ////////console.info(query)
if(query.type=='address'){
this.query.consignee=query.consignee
this.query.is_new=0
- ////console.log(this.query)
+ ////////console.log(this.query)
this.getList()
}
});
@@ -847,6 +911,8 @@
position: fixed;
bottom: 0;
left: 0;
+ // min-height: 200rpx;
+ // max-height: 600rpx;
background-color: white;
padding-left: 29.33rpx;
padding-right: 29.33rpx;
diff --git a/pages/order/details.vue b/pages/order/details.vue
index 7bc4da4..50b40bd 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -42,10 +42,10 @@
The timeout order will be closed automatically
-
+
@@ -119,11 +119,15 @@
Coupon
- -US${{goodsDate.discount}}
+ -US${{goodsDate.bonus}}
+
+
+ Points
+ -US${{goodsDate.surplus}}
Order total
- US${{goodsDate.total_fee}}
+ US${{goodsDate.order_amount}}
diff --git a/pages/productDetails/goodsReview.vue b/pages/productDetails/goodsReview.vue
index 324826d..e29427c 100644
--- a/pages/productDetails/goodsReview.vue
+++ b/pages/productDetails/goodsReview.vue
@@ -9,7 +9,7 @@
{{item.user_name}}
- Color:###
+
{{item.add_time | date}}
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index e389660..150e8dc 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -82,7 +82,7 @@
-
+
{{goodsDate.goods_name}}
-
-
+
+
+
+ US${{goodsDate.is_promote==0? goodsDate.shop_price :goodsDate.promote_price}}
+
+
+
+
+
+
- Variations
- {{colorNum}}color
+ Variations
+
+ {{ item.goods_attrs.length}}{{item.attr_name}}
+
+
-
-
-
-
-
+
+ -->
+
+
+
+
+ {{ item1.attr_value }}
-
-
+
+
@@ -137,10 +154,10 @@
- {{ item.shipping_name}}: US${{ item.free_money}}
+ {{ item.shipping_name}}: US${{ item.free_money}}
- free on orders US${{ item.shipping_fee}}
+ free on orders US${{ item.shipping_fee}}
Estimated to be deliverd on
{{ item.shipping_desc }}
@@ -237,7 +254,7 @@
{{goodsDate.comment_summary[0].commentcount==0?'0.0':'4.0'}}
-
+
No comment yet
@@ -249,7 +266,7 @@
{{item.user_name}}
-
+
@@ -261,7 +278,7 @@
-
+
@@ -330,7 +347,7 @@
-
+
{{goodsDate.goods_name}}
@@ -393,6 +410,7 @@
More
+ -THE END-
@@ -407,6 +425,7 @@
isvideo:false,
isSecurity:false,
sum:0,
+ bootom:0,
query:{
_action:'getgoodsdetail',
goods_id:''
@@ -426,6 +445,7 @@
user_info:{},
addressDate:{},
colorNum:0,
+ sizenum:0,
//选择规格的数组
goods_attr_list:[],
// 获取该分类的其他商品的请求参数
@@ -474,6 +494,8 @@
Size_list:'',
shop_price:0,
first:0,
+ noImgtype:[],
+ tag:0,
@@ -527,6 +549,10 @@
url:'./goodsReview?goods_id='+this.query.goods_id
})
},
+ onReachBottom(){
+ console.log(111)
+ this.bootom = 1
+ },
isVideo()
{
//console.log('//////')
@@ -633,17 +659,34 @@
},
// 点击预览图片
- clickImg(index) {
+ clickImg(index,e) {
- wx.previewImage({
- urls: this.info, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
- current: index, // 当前显示图片的http链接，默认是第一个
- indicator:'number',
- success: function(res) {},
- fail: function(res) {},
- complete: function(res) {},
- })
+ if(e){
+ let list = []
+ console.log(e)
+ e.map( item =>{
+ list.push(item.attr_img)
+ })
+ wx.previewImage({
+ urls: list, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+ current: index, // 当前显示图片的http链接，默认是第一个
+ indicator:'number',
+ success: function(res) {},
+ fail: function(res) {},
+ complete: function(res) {},
+ })
+ }
+ else{
+ wx.previewImage({
+ urls: this.info, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+ current: index, // 当前显示图片的http链接，默认是第一个
+ indicator:'number',
+ success: function(res) {},
+ fail: function(res) {},
+ complete: function(res) {},
+ })
+ }
},
// 其他商品详情
@@ -833,6 +876,11 @@
this.goodsDate.attr_list.map(item=>{
+
+ if(item.attr_name){
+ this.sizenum=item.goods_attrs.length
+ }
+
if(item.attr_name=="Color"){
this.colorNum=item.goods_attrs.length
console.log(this.colorNum)
@@ -848,6 +896,8 @@
}
else if(item.attr_name=="Size"){
Size_list = item.goods_attrs
+
+ console.log(this.sizenum)
Size_list.map( item =>{
this.Size_list +=item.attr_value + ' '
@@ -856,8 +906,20 @@
}
let data={name:item.attr_name,goods_attr_id:'',attr_id:item.attr_id,list:item.goods_attrs}
this.goods_attr_list.push(data)
-
+ console.log(this.goods_attr_list)
+ let list = []
+ this.goods_attr_list.map( item =>{
+ item.list.map(item1 =>{
+ if(!item1.attr_img){
+ this.tag = 1
+
+ }
+
+ })
+ })
+ // console.log(list)
+ // this.noImgtype = list
})
}
}else{
@@ -1167,6 +1229,31 @@
padding: 0 5rpx;
margin-bottom: 16.67rpx;
+ // &:nth-child(-n+2){
+ // margin-bottom: 16.67rpx;
+ // }
+ }
+ .select_size_item1{
+ // background-color: red;
+ width: 97.67rpx;
+ line-height: 30rpx;
+ // height: 60rpx;
+ // overflow: hidden;
+ display: flex;
+ text-align: center;
+ background-size: 100% !important;
+ background-repeat: no-repeat;
+ align-items: center;
+ justify-content: center;
+ border-radius: 12.67rpx;
+ // color: #666666;
+ color: #fff;
+ font-size: 24rpx;
+ margin-right: 18.67rpx;
+ // border: 1px solid #F8F8F8;
+ padding: 0 5rpx;
+ margin-bottom: 16.67rpx;
+
// &:nth-child(-n+2){
// margin-bottom: 16.67rpx;
// }
@@ -1197,7 +1284,7 @@
}
.spike1{
margin-top: 0;
- margin-bottom: 34rpx;
+ margin-bottom: 20rpx;
padding-bottom: 0;
border-bottom: none;
.addCard_scroll{
@@ -1218,7 +1305,7 @@
min-height: 400rpx;
.addCard_price{
font-size: 44rpx;
- font-weight: 500;
+ font-weight: bold;
margin-top: 17.33rpx;
margin-bottom: 51.33rpx;
}
@@ -1265,8 +1352,8 @@
}
}
.active_color{
- color: #B22234;;
- background-color: white;
+ color: #fff;;
+ background-color: #000;
border: 1px solid #000000;
}
}
@@ -1334,10 +1421,12 @@
}
.spike1_item{
width: 480rpx;
- background-color: #343434;
+ background-color: #1b1b1b;
+
padding: 27.33rpx 37.67rpx;
margin-right: 19.33rpx;
font-size: 20rpx;
+ border-radius: 10rpx;
// border:1rpx solid #ccc;
display: inline-block;
// color: #737373;
@@ -1353,8 +1442,8 @@
font-weight: 50;
}
.spike1_item_title{
- font-weight: bold;
-
+ // font-weight: bold;
+ font-size: 28rpx;
.text_black{
color: black;
display: inline-block;
@@ -1627,20 +1716,28 @@
}
}
}
+ .info_price{
+ font-size: 44rpx;
+ font-weight: bold;
+ margin-top: 40rpx !important;
+ }
.goods_info{
padding: 0 26.67rpx;
- padding-top: 60.67rpx;
- padding-bottom: 15.33rpx;
+ padding-top: 20.67rpx;
+ // padding-bottom: 15.33rpx;
// border-bottom: #F7F7F7 13.33rpx solid;
font-size: 30.67rpx;
font-weight: 400;
+
.goods_info_price{
display: flex;
align-items: center;
font-size: 44rpx;
+ font-weight: bold;
+ margin-top: 23rpx;
justify-content: space-between;
- margin-bottom: 45.33rpx;
+ // margin-bottom: 45.33rpx;
.info_price_right{
display: flex;
@@ -1657,13 +1754,13 @@
}
}
.evaluate{
- margin-top: 34.67rpx;
+ margin-top: 28rpx;
display: flex;
align-items: center;
font-size: 24rpx;
- padding-bottom: 33.33rpx;
+ // padding-bottom: 33.33rpx;
// border-bottom: 1px solid #E2E2E2;
- margin-bottom: 35.33rpx;
+ margin-bottom: 28rpx;
.evaluate_text{
font-weight: 500;
color: #B22234;
@@ -1672,7 +1769,7 @@
}
.variations{
font-size: 29.33rpx;
-
+ padding-top: 32rpx;
.variations_title{
display: flex;
align-items: center;
@@ -1748,7 +1845,7 @@
}
.transport{
padding: 0 26.67rpx;
- padding-top: 37.33rpx;
+ // padding-top: 17.33rpx;
// border-bottom: #F7F7F7 13.33rpx solid;
.title_Mtop{
@@ -1809,16 +1906,18 @@
padding-top: 36rpx;
.allReviews{
- background-color: #FFF;
+ background-color: #1b1b1b;
display: flex;
+ opacity: 0.8;
+ // background: rgba(0, 0, 0, 0.2);
align-items: center;
padding-left: 26.67rpx;
border-radius: 6.67rpx;
- font-size: 66.67rpx;
+ font-size: 45.67rpx;
font-weight: 800;
margin-top: 32.67rpx;
height: 118.67rpx;
- color:black;
+ color:#fff;
text{
display: inline-block;
margin-right: 42rpx;
@@ -2001,4 +2100,19 @@
}
}
}
+ .text_margin{
+ margin-right:10rpx;
+ font-size:24rpx;
+ }
+ .recommend_content_name,.recommend_content_item_pric{
+ padding-left: 20rpx;
+ }
+ .bootom_last{
+ height: 200rpx;
+ width: 100%;
+ color: #fff;
+ font-size: 25rpx;
+ line-height: 200rpx;
+ text-align: center;
+ }
\ No newline at end of file
diff --git a/pages/productDetails/review.vue b/pages/productDetails/review.vue
index 54df62f..1355c37 100644
--- a/pages/productDetails/review.vue
+++ b/pages/productDetails/review.vue
@@ -39,6 +39,7 @@
+
@@ -203,7 +203,7 @@
-
+ -THE END-
@@ -218,6 +218,7 @@
data() {
return {
isEmpty: false,
+ bootom:0,
isCahnge: false,
backButtonPress: 0,
// 购物车数据
@@ -276,6 +277,7 @@
},
orderId:0,
shop_price:0,
+ bootom:0,
}
},
onBackPress(options) {
@@ -297,6 +299,10 @@
url: '/pages/productDetails/index?goodid=' + id
})
},
+ onReachBottom(e){
+
+ this.bootom = 1
+ },
// 获取的其他商品
getCatList(type) {
defaultRequest4(this.catQuery).then(res => {
@@ -641,7 +647,7 @@
defaultRequest3(this.query,'consignee').then(res =>{
console.log(res)
if(res.error ==0){
- console.log(res.data.shipping_list[0].free_money)
+ console.log(res)
console.log(this.total.goods_price)
this.orderId = res.data.shipping_list[0].shipping_id
if(parseInt(res.data.shipping_list[0].free_money)> parseFloat(this.total.goods_price)){
@@ -850,19 +856,70 @@
}
-
-
diff --git a/pages/specialTitle/index2.vue b/pages/specialTitle/index2.vue
index 8e409b8..d1882bb 100644
--- a/pages/specialTitle/index2.vue
+++ b/pages/specialTitle/index2.vue
@@ -1,8 +1,11 @@
-
-
-
+
+
+ {{ title }}
+
+
@@ -181,10 +184,7 @@
}
}
.body{
- .one{
- height: 50rpx;
- width: 100%;
- background-color: #000;
- }
+ background-color: #000;
+
}
diff --git a/static/img/$.png b/static/img/$.png
new file mode 100644
index 0000000..e8b51c3
Binary files /dev/null and b/static/img/$.png differ
diff --git a/static/img/add_black.png b/static/img/add_black.png
new file mode 100644
index 0000000..0b0c369
Binary files /dev/null and b/static/img/add_black.png differ
diff --git a/static/img/add_gray.png b/static/img/add_gray.png
new file mode 100644
index 0000000..b6d4108
Binary files /dev/null and b/static/img/add_gray.png differ
diff --git a/static/img/add_white.png b/static/img/add_white.png
new file mode 100644
index 0000000..1ece700
Binary files /dev/null and b/static/img/add_white.png differ
diff --git a/static/img/att.png b/static/img/att.png
new file mode 100644
index 0000000..f36115a
Binary files /dev/null and b/static/img/att.png differ
diff --git a/static/img/bg.png b/static/img/bg.png
new file mode 100644
index 0000000..ef40fd6
Binary files /dev/null and b/static/img/bg.png differ
diff --git a/static/img/comment.png b/static/img/comment.png
new file mode 100644
index 0000000..c66896c
Binary files /dev/null and b/static/img/comment.png differ
diff --git a/static/img/dollo.png b/static/img/dollo.png
new file mode 100644
index 0000000..d4a623e
Binary files /dev/null and b/static/img/dollo.png differ
diff --git a/static/img/eye_open.png b/static/img/eye_open.png
new file mode 100644
index 0000000..1b5c267
Binary files /dev/null and b/static/img/eye_open.png differ
diff --git a/static/img/eye_w.png b/static/img/eye_w.png
new file mode 100644
index 0000000..32e57f2
Binary files /dev/null and b/static/img/eye_w.png differ
diff --git a/static/img/facebook2.png b/static/img/facebook2.png
new file mode 100644
index 0000000..026aca8
Binary files /dev/null and b/static/img/facebook2.png differ
diff --git a/static/img/foot.png b/static/img/foot.png
new file mode 100644
index 0000000..5bb3604
Binary files /dev/null and b/static/img/foot.png differ
diff --git a/static/img/foot_white.png b/static/img/foot_white.png
new file mode 100644
index 0000000..582a4da
Binary files /dev/null and b/static/img/foot_white.png differ
diff --git a/static/img/heart_white.png b/static/img/heart_white.png
new file mode 100644
index 0000000..c4982bf
Binary files /dev/null and b/static/img/heart_white.png differ
diff --git a/static/img/loginbg.png b/static/img/loginbg.png
new file mode 100644
index 0000000..18039f4
Binary files /dev/null and b/static/img/loginbg.png differ
diff --git a/static/img/map.png b/static/img/map.png
new file mode 100644
index 0000000..da793e8
Binary files /dev/null and b/static/img/map.png differ
diff --git a/static/img/select_red.png b/static/img/select_red.png
new file mode 100644
index 0000000..542a74a
Binary files /dev/null and b/static/img/select_red.png differ
diff --git a/static/img/userbg.png b/static/img/userbg.png
new file mode 100644
index 0000000..c2bdb6a
Binary files /dev/null and b/static/img/userbg.png differ
diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
index 7c9046d..75bd289 100644
--- a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
+++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
@@ -108,6 +108,7 @@
/* #endif */
position: relative;
flex: 1;
+ // height: 100px;
justify-content: center;
align-items: center;
}
@@ -132,15 +133,16 @@
}
.segmented-control__item--text {
- border-bottom-style: solid;
- border-bottom-width: 2px;
- padding: 6px 0;
+ border-bottom-style: solid !important;
+ border-bottom-width: 2px !important;
+ padding: 2px 0;
}
.segmented-control__text {
color: aliceblue !important;
- font-size: 14px;
- line-height: 20px;
+ font-size: 18px;
+ line-height: 24px;
+ margin-bottom:10px;
text-align: center;
}