完善会员开通信息
@@ -22,11 +22,12 @@ const goods = id => {
|
||||
}
|
||||
|
||||
// 店铺列表
|
||||
const shops = (categoryId) => {
|
||||
const shops = (categoryId,page) => {
|
||||
return request({
|
||||
url: 'mall/shops',
|
||||
data: {
|
||||
category_id: categoryId
|
||||
category_id: categoryId,
|
||||
page:page
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -39,12 +40,13 @@ const shopsDetail = (shopId) => {
|
||||
}
|
||||
|
||||
// 店铺商品
|
||||
const shopsGoods = (shop_id, category_id) => {
|
||||
const shopsGoods = (shop_id, category_id,page) => {
|
||||
return request({
|
||||
url: 'mall/goods',
|
||||
data: {
|
||||
shop_id,
|
||||
category_id
|
||||
category_id,
|
||||
page,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
"enablePullDownRefresh": true,
|
||||
"app-plus": {
|
||||
"titleNView": {
|
||||
"backgroundColor": "#FFFFFF",
|
||||
"backgroundColor": "#fff",
|
||||
"buttons": [{
|
||||
"float": "right",
|
||||
"text": "\ue603",
|
||||
@@ -80,7 +80,6 @@
|
||||
"navigationBarTextStyle": "white"
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path": "pages/store/goods",
|
||||
"name": "StoreGoods",
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
coins: "",
|
||||
platform: ['dtpay'],
|
||||
oepnType: '',
|
||||
canpay:true,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -27,7 +28,6 @@
|
||||
this.price = Number(this.$Route.query.price).toFixed(2)
|
||||
this.coins = this.$Route.query.coins
|
||||
if (this.$Route.query.oepnType === 'order') {
|
||||
console.log('order....');
|
||||
this.oepnType = this.$Route.query.oepnType
|
||||
}
|
||||
},
|
||||
@@ -61,9 +61,9 @@
|
||||
},
|
||||
getDTPAY() {
|
||||
console.log('dt 支付。。。')
|
||||
if(this.canpay){
|
||||
this.canpay = false
|
||||
dtPAY(this.payNo).then(res => {
|
||||
console.log(res);
|
||||
// this.callPay(res, payType)
|
||||
if (res.state === 'warning') {
|
||||
uni.showModal({
|
||||
title: '当前DT积分不足',
|
||||
@@ -80,6 +80,7 @@
|
||||
} else {
|
||||
uni.navigateBack();
|
||||
}
|
||||
this.canpay = true
|
||||
}
|
||||
})
|
||||
} else {
|
||||
@@ -95,6 +96,7 @@
|
||||
this.$Router.back();
|
||||
eventBus.$emit('paySuccess', this.payNo);
|
||||
}
|
||||
this.canpay = true
|
||||
}
|
||||
})
|
||||
} else {
|
||||
@@ -116,6 +118,7 @@
|
||||
} else {
|
||||
uni.navigateBack();
|
||||
}
|
||||
this.canpay = true
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -127,8 +130,10 @@
|
||||
icon: "none",
|
||||
mask: true,
|
||||
})
|
||||
this.canpay = true
|
||||
})
|
||||
|
||||
}
|
||||
},
|
||||
getALPAY(payType) {
|
||||
alPAY(this.payNo).then(res => {
|
||||
|
||||
@@ -65,11 +65,9 @@
|
||||
total : 0,
|
||||
freight : 0,
|
||||
address : "",
|
||||
remark : ""
|
||||
remark : "",
|
||||
canApply :true
|
||||
};
|
||||
},
|
||||
computed:{
|
||||
|
||||
},
|
||||
onShow(){
|
||||
if(JSON.stringify(this.$store.getters.getAddress) !== '{}') this.address = this.$store.getters.getAddress
|
||||
@@ -114,6 +112,8 @@
|
||||
})
|
||||
return
|
||||
}
|
||||
if(this.canApply){
|
||||
this.canApply = false;
|
||||
verify({
|
||||
goods_sku_id: this.$Route.query.skuId,
|
||||
qty : this.qty,
|
||||
@@ -130,7 +130,15 @@
|
||||
coins : res.coins,
|
||||
}
|
||||
})
|
||||
this.canApply = true
|
||||
}).catch(err=>{
|
||||
this.canApply = true
|
||||
})
|
||||
}else{
|
||||
this.canApply = true
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -302,10 +302,7 @@
|
||||
background-color: $text-price;
|
||||
display: inline-block;
|
||||
}
|
||||
// .card-title{
|
||||
// font-weight: normal;
|
||||
// font-size: 28rpx!important;
|
||||
// }
|
||||
|
||||
.card-box {
|
||||
// &-item{
|
||||
// background: #fff !important;
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
</scroll-view>
|
||||
</view>
|
||||
<view class="right">
|
||||
<scroll-view scroll-y="true" class="scroll-view-right">
|
||||
<scroll-view scroll-y="true" class="scroll-view-right" @scrolltolower='lower'>
|
||||
<block v-if="goods.length > 0">
|
||||
<view class="goods-item" v-for="(item,index) in goods" :key="index"
|
||||
@click="onGoods(item.goods_id)">
|
||||
@@ -39,7 +39,7 @@
|
||||
<view class="price">{{item.price.price_min || '0'}}
|
||||
<view class="price-type">
|
||||
<text> DT积分</text>
|
||||
<text class="kucun"> 库存量:1222</text>
|
||||
<text class="kucun"> 库存量:{{item.stock}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -70,12 +70,14 @@
|
||||
category_id : '',
|
||||
classify : [],
|
||||
goods : [],
|
||||
pages : {}
|
||||
has_more:true,
|
||||
page:1,
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.ShopId = this.$Route.query.ShopId
|
||||
shopsDetail(this.ShopId).then(res => {
|
||||
console.log(res);
|
||||
this.classify = [{
|
||||
category_id: '',
|
||||
name: '全部商品',
|
||||
@@ -90,14 +92,19 @@
|
||||
})
|
||||
})
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.has_more = true;
|
||||
this.page = 1;
|
||||
this.getGoods()
|
||||
},
|
||||
methods: {
|
||||
getGoods() {
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
})
|
||||
shopsGoods(this.ShopId, this.category_id).then(res => {
|
||||
this.goods = res.data
|
||||
this.pages = res.page
|
||||
shopsGoods(this.ShopId, this.category_id,this.page).then(res => {
|
||||
this.goods = this.goods.concat(res.data);
|
||||
this.has_more = res.page.has_more;
|
||||
uni.hideLoading()
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
@@ -106,9 +113,19 @@
|
||||
})
|
||||
})
|
||||
},
|
||||
lower(){
|
||||
if(this.has_more){
|
||||
this.page = this.page + 1;
|
||||
this.has_more = true;
|
||||
this.getGoods()
|
||||
}
|
||||
},
|
||||
selectClassify(id) {
|
||||
if (id === this.category_id) return;
|
||||
this.category_id = id;
|
||||
this.page = 1;
|
||||
this.goods =[];
|
||||
this.has_more = true;
|
||||
this.getGoods()
|
||||
},
|
||||
search() {
|
||||
|
||||
@@ -15,17 +15,15 @@
|
||||
<view>店铺评分:<span>5.0</span></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="shopInfo-title-right" >在售{{item.goods_count}}件<uni-icons class="icons" type="right" size="14" color="grey" /></view>
|
||||
<view class="shopInfo-title-right">在售{{item.goods_count}}件
|
||||
<uni-icons class="icons" type="right" size="14" color="grey" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<block v-else>
|
||||
<view class="vertical pages-empty">
|
||||
<u-empty
|
||||
icon="http://cdn.uviewui.com/uview/empty/list.png"
|
||||
textColor="#999"
|
||||
text="暂无相关店铺"
|
||||
>
|
||||
<u-empty icon="http://cdn.uviewui.com/uview/empty/list.png" textColor="#999" text="暂无相关店铺">
|
||||
</u-empty>
|
||||
</view>
|
||||
</block>
|
||||
@@ -39,29 +37,42 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
shopsArr : [],
|
||||
classify : [],
|
||||
shopsPage: {},
|
||||
shopsArr: [],
|
||||
classify: [],
|
||||
// shopsPage: {},
|
||||
page: 1,
|
||||
has_more: true,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getShops()
|
||||
},
|
||||
onReachBottom() {
|
||||
if (this.has_more) {
|
||||
this.page = this.page + 1;
|
||||
this.getShops();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getShops() {
|
||||
shops(this.categoryId).then(res => {
|
||||
shops(this.categoryId, this.page).then(res => {
|
||||
console.log(res)
|
||||
this.shopsArr = res.shops.data
|
||||
this.shopsPage= res.shops.page
|
||||
if (this.page == 1) {
|
||||
this.shopsArr = [];
|
||||
this.classify = [{
|
||||
name: "全部",
|
||||
category_id: ""
|
||||
}].concat(res.categories)
|
||||
}
|
||||
this.shopsArr = this.shopsArr.concat(res.shops.data);
|
||||
this.has_more = res.shops.page.has_more;
|
||||
uni.stopPullDownRefresh()
|
||||
})
|
||||
},
|
||||
onTabs(e) {
|
||||
this.categoryId = e.category_id
|
||||
this.page = 1;
|
||||
this.has_more = true;
|
||||
this.getShops()
|
||||
},
|
||||
toShop(id) {
|
||||
@@ -74,26 +85,33 @@
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.getShops()
|
||||
this.category_id = '';
|
||||
this.page = 1;
|
||||
this.has_more = true;
|
||||
this.getShops();
|
||||
},
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.pages-empty{
|
||||
.pages-empty {
|
||||
height: 70vh;
|
||||
}
|
||||
|
||||
.content {
|
||||
background: $window-color;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
// 筛选
|
||||
.classify-tabs {
|
||||
background: white;
|
||||
}
|
||||
.shop-List{
|
||||
|
||||
.shop-List {
|
||||
padding: $padding;
|
||||
|
||||
.shopInfo {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@@ -104,9 +122,11 @@
|
||||
background-color: #fff;
|
||||
border-radius: $radius;
|
||||
margin-top: 20rpx;
|
||||
&:first-child{
|
||||
|
||||
&:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.shopInfo-title-left {
|
||||
width: 60%;
|
||||
display: flex;
|
||||
@@ -118,6 +138,7 @@
|
||||
padding-left: 90rpx;
|
||||
min-height: 90rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.shop-logo {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
@@ -127,6 +148,7 @@
|
||||
border-radius: 10rpx;
|
||||
border: solid 1rpx #f9f9f9;
|
||||
}
|
||||
|
||||
.shop-title {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -137,10 +159,12 @@
|
||||
margin-left: $margin;
|
||||
color: #999;
|
||||
width: 100%;
|
||||
|
||||
span {
|
||||
color: $text-price;
|
||||
padding-left: 4rpx;
|
||||
}
|
||||
|
||||
.shop-titl {
|
||||
font-size: 32rpx;
|
||||
color: #333;
|
||||
@@ -153,12 +177,14 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.shopInfo-title-right {
|
||||
width: 40%;
|
||||
text-align: right;
|
||||
font-size: 26rpx;
|
||||
color: gray;
|
||||
.icons{
|
||||
|
||||
.icons {
|
||||
vertical-align: bottom;
|
||||
margin-top: 2rpx;
|
||||
}
|
||||
|
||||
@@ -80,19 +80,19 @@
|
||||
<uni-icons class="forward" type="forward" color="#999" />
|
||||
</view>
|
||||
<view class="btns-box-item" @click="onBtn('Invitation', {})">
|
||||
<image class="icon" src="@/static/user/userIcon_03.png" mode="widthFix" />
|
||||
<image class="icon" src="@/static/user/userIcon_07.png" mode="widthFix" />
|
||||
分享邀请
|
||||
<uni-icons class="forward" type="forward" color="#999" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="btns-box">
|
||||
<view class="btns-box-item" @click="onBtn('Feedback', {})">
|
||||
<image class="icon" src="@/static/user/userIcon_03.png" mode="widthFix" />
|
||||
<image class="icon" src="@/static/user/userIcon_06.png" mode="widthFix" />
|
||||
意见反馈
|
||||
<uni-icons class="forward" type="forward" color="#999" />
|
||||
</view>
|
||||
<view class="btns-box-item" @click="updateApp">
|
||||
<image class="icon" src="@/static/user/userIcon_03.png" mode="widthFix" />
|
||||
<image class="icon" src="@/static/user/userIcon_08.png" mode="widthFix" />
|
||||
版本更新
|
||||
<uni-icons class="forward" type="forward" color="#999" />
|
||||
</view>
|
||||
@@ -352,7 +352,7 @@
|
||||
|
||||
.user-content {
|
||||
padding-left: 158rpx;
|
||||
height: 140rpx;
|
||||
height: 160rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
@@ -373,7 +373,7 @@
|
||||
}
|
||||
|
||||
.name {
|
||||
line-height: 40rpx;
|
||||
line-height: 50rpx;
|
||||
font-weight: bold;
|
||||
font-size: $title-size + 8;
|
||||
@extend .nowrap;
|
||||
|
||||
BIN
static/user/userIcon_06.png
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
static/user/userIcon_07.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
static/user/userIcon_08.png
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
16820
unpackage/dist/dev/app-plus/app-service.js
vendored
20169
unpackage/dist/dev/app-plus/app-view.js
vendored
2
unpackage/dist/dev/app-plus/manifest.json
vendored
BIN
unpackage/dist/dev/app-plus/static/user/userIcon_06.png
vendored
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
unpackage/dist/dev/app-plus/static/user/userIcon_07.png
vendored
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
unpackage/dist/dev/app-plus/static/user/userIcon_08.png
vendored
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |