diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue
index eece033..77405f4 100644
--- a/components/goods-sku-popup/index.vue
+++ b/components/goods-sku-popup/index.vue
@@ -19,7 +19,7 @@
¥
{{ priceCom }}
-
+ {{ stockText }}：{{ stockCom }}
已选：{{ selectArr.join(' ') }}
@@ -45,7 +45,7 @@
数量
-
@@ -1015,6 +1015,7 @@
maxStock = max;
}
}
+ console.log("getMaxStock",maxStock)
return maxStock;
},
numChange(e) {
@@ -1041,6 +1042,7 @@
if (max > maxStock) {
max = maxStock;
}
+ console.log("maxBuyNumCom",maxStock,that.maxBuyNum)
return max;
},
// 是否是多规格
diff --git a/components/goods-sku-popup/number-box/index.vue b/components/goods-sku-popup/number-box/index.vue
index 6e5133f..8dff824 100644
--- a/components/goods-sku-popup/number-box/index.vue
+++ b/components/goods-sku-popup/number-box/index.vue
@@ -157,7 +157,7 @@ export default {
// 设置disabled为false，disabledInput为true即可
disabledInput: {
type: Boolean,
- default: false
+ default: true
},
// 输入框于键盘之间的距离
cursorSpacing: {
diff --git a/pages.json b/pages.json
index b452e03..0944e26 100644
--- a/pages.json
+++ b/pages.json
@@ -405,13 +405,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path": "caigou/notice",
- "style": {
- "navigationBarTitleText": "权益中心",
- "enablePullDownRefresh": false
- }
- },
{
"path": "caigou/notice1",
"style": {
diff --git a/pages/activity/intimate.vue b/pages/activity/intimate.vue
index 5ae2eba..7176738 100644
--- a/pages/activity/intimate.vue
+++ b/pages/activity/intimate.vue
@@ -126,10 +126,10 @@
a.server_price = Number(a.server_price);
a.line_price = Number(a.line_price)
})
- this.list1 = data.list
- this.total = data.total
- this.isShow = data.total == 0 ? true : false
}
+ this.list1 = data.list
+ this.total = data.total
+ this.isShow = data.total == 0 ? true : false
}
},
openPage(index, a) {
diff --git a/pages/activity/newGoods.vue b/pages/activity/newGoods.vue
index f2acdf4..2a9a92f 100644
--- a/pages/activity/newGoods.vue
+++ b/pages/activity/newGoods.vue
@@ -63,7 +63,8 @@
background: 'url(' + img + ') center top no-repeat',
backgroundSize: '100% auto',
- },
+ },
+ page: 1,
backgroundImg: '',
list: [],
content: '',
@@ -95,7 +96,7 @@
getBrandList() {
const app = this;
let pamars = {
- page: 1,
+ page: app.page,
is_brand: '',
is_new: 1,
categoryId: '',
@@ -104,7 +105,8 @@
}
Api.brandList(pamars)
.then(result => {
- app.list = result.data.data
+ app.list = result.data.data
+ app.total = result.data.total
})
.finally(() => app.isLoading = false)
},
diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index e2f70e2..0e82e46 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -270,7 +270,7 @@
z-index: 2;
text {
- font-size: 52rpx;
+ font-size: 40rpx;
}
}
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index a142158..3ec7539 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -50,18 +50,18 @@
-
+
Plus
分销
- PRO会员
+ 会员
开通Plus
分销会员预计再省30元
- 立即开通
+ {{(userInfo.user_type==20 || userInfo.user_type == 30)?'立即续费':'立即开通'}}
@@ -1002,7 +1002,7 @@
return;
}
uni.navigateTo({
- url: '/pages/member/index'
+ url: '/pages/member/index?type='+(this.userInfo.user_type != 30?'hy':'fx')
})
},
toFuwu() {
@@ -1384,6 +1384,7 @@
width: 142rpx;
font-size: 28rpx;
font-weight: 500;
+ text-align: center;
color: #966542;
margin-left: 18rpx;
padding-right: 24rpx;
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index ee5438e..8029387 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -746,6 +746,9 @@
-webkit-line-clamp: 2;
height: 90rpx;
line-height: 45rpx;
+ text{
+ display: block;
+ }
}
.shenBox {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 54aabe8..fe99a94 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -117,7 +117,7 @@
查看更多
-
+
@@ -853,7 +853,7 @@
} else {
this.seckillCutDownTime = 0
}
- if (result.data.goodsList && result.data.goodsList.data.length > 0) {
+ if (result.data.goodsList && result.data.goodsList.data && result.data.goodsList.data.length > 0) {
seckillList = result.data.goodsList.data;
for (var i = 0; i < seckillList.length; i++) {
seckillList[i].original_price = Number(seckillList[i].original_price)
@@ -950,6 +950,9 @@
// url: '/pages/goods/detail?goodsId=' + this.bannerList[index].redirect_url
// })
// } else {
+ if(!this.bannerList[index].redirect_url){
+ return ;
+ }
uni.navigateTo({
url: '/pages/activity/newsshop?activeid=' + this.bannerList[index].redirect_url + '&type=1'
})
diff --git a/pages/invite/index.vue b/pages/invite/index.vue
index e61e56b..37a9b52 100644
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@@ -318,7 +318,7 @@
})
} else if (index == 2) {
uni.navigateTo({
- url: "/pages/news/user/withdrawal?balance=" + this.userInfo.pay_money
+ url: "/pages/news/user/withdrawal?balance=" + this.userInfo.balance
})
} else if (index == 3) {
this.InviteUserPoster();
@@ -335,7 +335,7 @@
diff --git a/pages/news/consult/about.vue b/pages/news/consult/about.vue
index 74884fd..753a802 100644
--- a/pages/news/consult/about.vue
+++ b/pages/news/consult/about.vue
@@ -38,7 +38,7 @@
userInfo: {}
}
},
- onLoad() {
+ onShow() {
this.cityInfo = uni.getStorageSync("cityInfo");
this.userInfo = uni.getStorageSync("userInfo");
},
diff --git a/pages/news/consult/storeEdit.vue b/pages/news/consult/storeEdit.vue
index 93d3158..213aaad 100644
--- a/pages/news/consult/storeEdit.vue
+++ b/pages/news/consult/storeEdit.vue
@@ -148,6 +148,7 @@ export default {
url: res.data.logo_image
}]
this.image_id = res.data.group_share_img_id
+ this.logo_image_id = res.data.logo_image_id
}
})
.finally()
diff --git a/pages/news/recycling/confirm.vue b/pages/news/recycling/confirm.vue
index 5c54e07..cdfb4eb 100644
--- a/pages/news/recycling/confirm.vue
+++ b/pages/news/recycling/confirm.vue
@@ -44,7 +44,7 @@
{{info.server_name}}
- ¥{{info.line_price}}
+ ¥{{info.server_price}}
x1
@@ -196,7 +196,7 @@
methods: {
tabMItem(a, i) {
this.couponIndex = i
- this.coupon_id = (a ? a.coupon_id : "")
+ this.coupon_id = (a ? a.user_coupon_id : "")
this.isShow = false;
this.getServerCheckOrder(1)
},
diff --git a/pages/news/recycling/orderList.vue b/pages/news/recycling/orderList.vue
index 3a2da2e..1b3cd31 100644
--- a/pages/news/recycling/orderList.vue
+++ b/pages/news/recycling/orderList.vue
@@ -237,11 +237,11 @@ export default {
/**
* 获取列表
*/
- async getList() {
+ async getList(type) {
let {status, message, data} = await newFunApi.serverOrderInfoStatus({});
if(status == 200){
this.classList = data.list
- this.getOrderList();
+ this.getOrderList(type);
}
},
/**
diff --git a/pages/news/user/withdrawal.vue b/pages/news/user/withdrawal.vue
index cf1f946..fd960aa 100644
--- a/pages/news/user/withdrawal.vue
+++ b/pages/news/user/withdrawal.vue
@@ -140,7 +140,8 @@
duty_no: '',
source: 1
},
- balance: ''
+ balance: '',
+ isClick: true
};
},
onLoad(op) {
@@ -168,6 +169,14 @@
})
return
}
+ if (that.obj.money == 0) {
+ uni.showToast({
+ title: '提现金额不能为0',
+ icon: 'none',
+ duration: 2000
+ })
+ return
+ }
if (!that.obj.bank_name) {
uni.showToast({
title: '请输入开户行姓名',
@@ -230,29 +239,35 @@
getCode() {
// 获取验证码
const that = this
+ if(that.isClick == false){
+ return ;
+ }
if (!that.validatePhoneNumber(that.obj.bank_phone)) {
uni.showToast({
+ icon: "none",
title: '请输入正确的手机号'
})
return
}
- that.showCountDown = !that.showCountDown
- that.countDownFun = setInterval(() => {
- if (that.countdown >= 1) {
- that.countdown = that.countdown - 1
- } else {
- that.showCountDown = false
- that.countdown = 60
- clearInterval(that.countDownFun)
- }
-
- }, 1000)
+ that.isClick = false
+
CaptchaApi.sendSmsCaptcha({
- form: {
- mobile: that.obj.bank_phone
- }
+ mobile: that.obj.bank_phone
}).then(res => {
if (res.status == 200) {
+ that.showCountDown = !that.showCountDown
+ that.countDownFun = setInterval(() => {
+ if (that.countdown >= 1) {
+ that.countdown = that.countdown - 1
+ that.isClick = false
+ } else {
+ that.showCountDown = false
+ that.countdown = 60
+ clearInterval(that.countDownFun)
+ that.isClick = true
+ }
+
+ }, 1000)
uni.showToast({
title: res.message
})
diff --git a/pages/news1/feedback.vue b/pages/news1/feedback.vue
index e1ffe98..0287bf7 100644
--- a/pages/news1/feedback.vue
+++ b/pages/news1/feedback.vue
@@ -316,7 +316,9 @@ export default {
.then(res => {
that.$toast(res.message)
that.shop_id = ''
- that.form = that.$options.data().form
+ that.form = that.$options.data().form
+ that.image_id = ""
+ that.finishImageList = []
})
.catch(reject)
})
@@ -327,7 +329,9 @@ export default {
*/
onOrderTab(type) {
this.OrderType = type;
- this.pageNum = 1
+ this.pageNum = 1
+ this.image_id = ""
+ this.finishImageList = []
this.feedBackList = []
if (type != 0) {
this.getFeedBack(type)
diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue
index e07e459..8b8a1ea 100644
--- a/pages/news1/wallet.vue
+++ b/pages/news1/wallet.vue
@@ -29,7 +29,7 @@
- ¥ {{infor.balance?Number(infor.balance):infor.balance}}
+ ¥ {{infor.withdrawal_money?Number(infor.withdrawal_money):infor.withdrawal_money}}
@@ -42,7 +42,7 @@
不可提现
- ¥ {{infor.expend_money?Number(infor.expend_money):infor.expend_money}}
+ ¥ {{infor.freeze_money?Number(infor.freeze_money):infor.freeze_money}}
@@ -242,7 +242,7 @@
cashOut() {
// 立即提现
uni.navigateTo({
- url: '/pages/news/user/withdrawal?balance=' + this.infor.pay_money
+ url: '/pages/news/user/withdrawal?balance=' + this.infor.withdrawal_money
})
},
cashOutList() {
diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue
index 7a0f447..9ce9306 100644
--- a/pages/news3/shopOrder.vue
+++ b/pages/news3/shopOrder.vue
@@ -686,7 +686,7 @@
.priceName {
margin-left: 40upx;
-
+ flex: 1;
.title {
display: -webkit-box;
-webkit-line-clamp: 2;
diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue
index 04c9f2c..224789b 100644
--- a/pages/news3/shopOrderDetails.vue
+++ b/pages/news3/shopOrderDetails.vue
@@ -285,7 +285,10 @@
},
onLoad(option) {
this.order_id = JSON.parse(option.item).order_id
- this.getOrderDetail(this.order_id)
+
+ },
+ onShow() {
+ this.getOrderDetail(this.order_id)
},
methods: {
// 获取当前订单信息
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 9a96af7..2f4ae4a 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -440,7 +440,7 @@
onShareAppMessage(res) {
return {
title: this.Store.storeInfo.store_name,
- path: "/pages/order/detail?orderId=" + this.orderId, //这是打开后的跳转路径
+ path: "/pages/index/index", //这是打开后的跳转路径
imageUrl: this.Store.storeInfo.image_url,
success: function(res) {
// 转发成功之后的回调
@@ -537,6 +537,7 @@
}
app.order = result.data.order
app.isLoading = false
+ app.menushow = false
})
// 相应全局事件订阅: 刷新上级页面数据
canReset && uni.$emit('syncRefresh', true, true)
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 44686c0..62b64c6 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -21,7 +21,7 @@
@change="onChangeTab" /> -->
-
+
{
- if (ind == index) {
- item.menushow = item.menushow == false ? true : false
- } else {
- item.menushow = false;
- }
+ this.list.forEach((item, ind) => {
+ item.menushow = !item.menushow;
});
},
toggleImage() {
@@ -307,7 +306,7 @@
});
if (status == 200) {
uni.hideLoading();
- this.list = this.list.concat(data.list.data)
+ this.list = this.arrayUnique(this.list.concat(data.list.data),'order_id')
this.total = data.list.total
}
},
@@ -320,7 +319,8 @@
// 切换标签项
onChangeTab(item, index) {
const app = this
- app.list = []
+ app.list = []
+ app.pageNum = 1
// 设置当前选中的标签
app.current = index
if (index == 6) {
@@ -345,8 +345,10 @@
.then(result => {
// 显示成功信息
app.$toast(result.message)
- // 刷新订单列表
- app.onRefreshList()
+ // 刷新订单列表
+ app.list = []
+ app.pageNum = 1
+ app.getOrderList()
})
}
}
@@ -367,7 +369,9 @@
// 显示成功信息
app.$toast(result.message)
// 刷新订单列表
- app.onRefreshList()
+ app.list = []
+ app.pageNum = 1
+ app.getOrderList()
})
}
}
@@ -393,7 +397,9 @@
// 显示成功信息
app.$success(result.message)
// 刷新订单列表
- app.onRefreshList()
+ app.list = []
+ app.pageNum = 1
+ app.getOrderList()
})
}
}
@@ -440,7 +446,16 @@
containsLetterMix(str, mix) {
return new RegExp(mix.split('').join('\\w*')).test(str)
},
- //
+ //数组对象去重
+ arrayUnique(arr, name) {
+ var hash = {};
+ return arr.reduce(function (item, next) {
+ hash[next[name]]
+ ? ""
+ : (hash[next[name]] = true && item.push(next));
+ return item;
+ }, []);
+ },
// 点击去物流
onLogistics(orderId, item) {
if (item.delivery) {
diff --git a/pages/search/index.vue b/pages/search/index.vue
index 54cbe17..5ac5dbb 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -140,7 +140,7 @@
}).then(res => {
if (res.data.length == 0) {
this.page = 1;
- this.$toast('暂无其他搜索发现')
+ // this.$toast('暂无其他搜索发现')
} else {
this.page++;
this.searchFindList = res.data;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f5a3809..9d35fd9 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -6,7 +6,7 @@
+ @click="goJump('/pages/news1/setting')">
diff --git a/pages/user/vip/goods.vue b/pages/user/vip/goods.vue
index 8e974f2..a1e2b9b 100644
--- a/pages/user/vip/goods.vue
+++ b/pages/user/vip/goods.vue
@@ -174,11 +174,12 @@
}, []);
},
tabItem(index, item) {
+ console.log(index)
this.tabIndex = index;
this.page = 1;
this.list = [];
this.$refs.uWaterfall1.clear();
- this.category_id = index==-1?'':item.category_id
+ this.category_id = (index==-1? this.categoryList[this.tabIndex1].category_id:item.category_id)
this.getBrandList(this.category_id)
},
tabItem1(item, index) {