diff --git a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue index 982fb70..3aab9f1 100644 --- a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue +++ b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue @@ -11,7 +11,7 @@ {{ item.associate.name }} - ￥{{ item.associate.min_price }} + ￥{{ item.associate.sell_price }} diff --git a/pages/business/activity/list.vue b/pages/business/activity/list.vue index 350bd08..28cfea8 100644 --- a/pages/business/activity/list.vue +++ b/pages/business/activity/list.vue @@ -2,7 +2,7 @@ - + @@ -263,7 +263,7 @@ } .theme-1{ - background-color: #15716E; + background-color: #0E2F9E; } .theme-2{ background-color: #1789E4; @@ -280,7 +280,7 @@ border-bottom: 1rpx solid rgba(0, 0, 0, 0.1); } /deep/.u-scroll-box .u-tab-bar { - background-color: #15716E!important; + background-color: #0E2F9E!important; width: 80rpx!important; position: absolute; left: 0; @@ -288,7 +288,7 @@ } /deep/.special_tab .u-tabs .u-scroll-box .u-tab-bar { - background-color: #15716E!important; + background-color: #0E2F9E!important; width: 56rpx!important; position: absolute; height: 5rpx!important; diff --git a/pages/business/balance/balance.vue b/pages/business/balance/balance.vue index beb954f..5b1ff8f 100644 --- a/pages/business/balance/balance.vue +++ b/pages/business/balance/balance.vue @@ -35,7 +35,10 @@ +￥{{ item.balance }} - {{ item.balance }} + + [{{ item.state }}] + {{ item.balance }} + {{ item.note }} @@ -66,17 +69,46 @@ isPage: true, list: [] }], - balance: 0 + balance: 0, + show_count: 0 } }, computed: { getDay(){ return this.$shared.recordTime(new Date(), '-', 'date'); + }, + showStateColor(){ + return function(val){ + if(val == '提现中'){ + return '#999999' + }else if(val == '已到账'){ + return '#0D2E9A' + }else{ + return '#87aebf' + } + } } }, onLoad(){ this.getBalance(); }, + onShow(){ + this.show_count++; + if(this.show_count > 1){ + this.tab_list = [{ + name: '余额明细', + page: 1, + isPage: true, + list: [] + },{ + name: '提现明细', + page: 1, + isPage: true, + list: [] + }]; + this.getBalance(); + } + }, methods: { // 时间筛选 dateChange(event){ diff --git a/pages/business/withdrawal/withdrawal.vue b/pages/business/withdrawal/withdrawal.vue index 48e64f1..adb6b78 100644 --- a/pages/business/withdrawal/withdrawal.vue +++ b/pages/business/withdrawal/withdrawal.vue @@ -210,7 +210,7 @@ this.alipay_account = ''; } this.money = ''; - this.$msg('提现成功', {icon: 'success'}); + this.$msg('提现成功', {icon: 'success', duration: 2500}); this.getApplyInfo(); } uni.hideLoading(); diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue index 854925a..065a841 100644 --- a/pages/shop/goodsdetail.vue +++ b/pages/shop/goodsdetail.vue @@ -397,43 +397,60 @@ let goods_detail = this.goods_detail; let specs = this.goods_stock.specs; let stores = this.goods_stock.stores; + let par = {}; - let s_id_1 = 1; - let s_id_2 = 2; - for(let i in specs){ - if(specs[i].label_key == 'size'){ - s_id_1 = 1; + + if(this.$isRight(specs)){ + let s_id_1 = 1; + let s_id_2 = 2; + for(let i in specs){ + if(specs[i].label_key == 'size'){ + s_id_1 = 1; + } + if(specs[i].label_key == 'color'){ + s_id_2 = 2; + } } - if(specs[i].label_key == 'color'){ - s_id_2 = 2; + let spec_current_1 = specs[s_id_1].spec_current; + let spec_current_2 = specs[s_id_2].spec_current; + let id_1 = specs[s_id_1].list[spec_current_1].id; + let id_2 = specs[s_id_2].list[spec_current_2].id; + if(id_1 > id_2){ + let id_3 = id_2; + id_2 = id_1; + id_1 = id_3; + } + + par = { + attributes: { + color: specs[s_id_2].list[specs[s_id_2].spec_current].value, + com_id: goods_detail.id, + img: goods_detail.img, + size: specs[s_id_1].list[specs[s_id_1].spec_current].value, + sku: goods_detail.goods_no +'-'+ specs[s_id_1].list[specs[s_id_1].spec_current].value + }, + id: stores[id_1 +'-'+ id_2].id, + product_id: stores[id_1 +'-'+ id_2].id, + price: stores[id_1 +'-'+ id_2].price, + store_count: stores[id_1 +'-'+ id_2].store, + market_price: goods_detail.market_price, + name: goods_detail.name, + qty: this.goods_num + } + }else{ + par = { + attributes: { + com_id: goods_detail.id, + img: goods_detail.img + }, + id: goods_detail.id, + product_id: goods_detail.id, + price: goods_detail.sell_price, + store_count: goods_detail.store_nums, + market_price: goods_detail.market_price, + name: goods_detail.name, + qty: this.goods_num } - } - - let spec_current_1 = specs[s_id_1].spec_current; - let spec_current_2 = specs[s_id_2].spec_current; - let id_1 = specs[s_id_1].list[spec_current_1].id; - let id_2 = specs[s_id_2].list[spec_current_2].id; - if(id_1 > id_2){ - let id_3 = id_2; - id_2 = id_1; - id_1 = id_3; - } - - let par = { - attributes: { - color: specs[s_id_2].list[specs[s_id_2].spec_current].value, - com_id: goods_detail.id, - img: goods_detail.img, - size: specs[s_id_1].list[specs[s_id_1].spec_current].value, - sku: goods_detail.goods_no +'-'+ specs[s_id_1].list[specs[s_id_1].spec_current].value - }, - id: stores[id_1 +'-'+ id_2].id, - product_id: stores[id_1 +'-'+ id_2].id, - price: stores[id_1 +'-'+ id_2].price, - store_count: stores[id_1 +'-'+ id_2].store, - market_price: goods_detail.market_price, - name: goods_detail.name, - qty: this.goods_num } uni.showLoading({ diff --git a/pages/store/cart/cart.vue b/pages/store/cart/cart.vue index f9858a5..45e7c9e 100644 --- a/pages/store/cart/cart.vue +++ b/pages/store/cart/cart.vue @@ -4,7 +4,7 @@ - + {{ s_item.name }} @@ -18,7 +18,7 @@ - + @@ -28,7 +28,7 @@ {{g_item.name}} - {{g_item.qty}}件;{{g_item.color}};{{g_item.size}} + {{g_item.qty ? g_item.qty+'件;' : ''}}{{g_item.color ? g_item.color+';' : ''}}{{g_item.size ? g_item.size : ''}} ￥{{ g_item.price }} @@ -128,7 +128,8 @@ list.push({ name: data[i].name, full_minus: '', - goods: goods + goods: goods, + id: data[i].id }) } this.list = list; @@ -183,14 +184,33 @@ } }, // 滑动组件，按钮被点击 - onButton(event, parentIndex){ - console.log("event", event, parentIndex); + onButton(event, parentIndex, childIndex){ if(event.buttonIndex == 0){ + let __raw_id = this.list[parentIndex].goods[childIndex].__raw_id; uni.showModal({ title: '温馨提示', content: '确定移除该商品吗？', success: result => { - + if(result.confirm){ + this.$http.ajax({ + api: 'api/shopping/cart/'+ __raw_id, + method: 'DELETE', + header: { + Authorization: this.token + } + }).then(res => { + if(res.data.code == 200){ + this.$msg('删除成功', {icon: 'success'}).then(() => { + this.list[parentIndex].goods.splice(childIndex, 1); + if(this.list[parentIndex].goods.length <= 0){ + this.list.splice(parentIndex, 1); + } + }) + }else{ + this.$msg('删除失败', {icon: 'error'}); + } + }) + } } }) } diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue index d24c042..902f85f 100644 --- a/pages/user/my/center.vue +++ b/pages/user/my/center.vue @@ -37,7 +37,7 @@ - + diff --git a/pages/user/my/vipinfo.vue b/pages/user/my/vipinfo.vue index 106c0c0..98d86eb 100644 --- a/pages/user/my/vipinfo.vue +++ b/pages/user/my/vipinfo.vue @@ -14,7 +14,7 @@ - + @@ -74,7 +74,7 @@ - + + 温馨提示：身份证号出生日期不支持线上修改，如需修改请前往服务台办理。 @@ -140,14 +140,14 @@ info.name = detail.name; info.sex = detail.sex; info.birthday = detail.birthday; - info.native_place = detail.country; + // info.native_place = detail.country; if(detail.province && detail.city && detail.area){ let address = [detail.province, detail.city, detail.area]; info.address = address; } info.address_detail = detail.postal_address; - info.home_address = detail.home_address; + // info.home_address = detail.home_address; // todo 其他信息待补充... id_number身份证