修改:部分页面的空图片修改为读取远程,本地不在存储该图片
This commit is contained in:
parent
4cc4ae1c35
commit
2dcd6012d0
|
|
@ -31,7 +31,7 @@
|
||||||
退款
|
退款
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="where.status == 6" class="list">
|
<view v-if="where.status == 6" class="list">
|
||||||
|
|
@ -122,7 +122,7 @@
|
||||||
<text class="cancelled">1件退款中</text>
|
<text class="cancelled">1件退款中</text>
|
||||||
</view> -->
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="public-total">
|
<view class="public-total">
|
||||||
共{{ item.total_num }}件商品,
|
共{{ item.total_num }}件商品,
|
||||||
|
|
@ -147,7 +147,7 @@
|
||||||
</view>
|
</view>
|
||||||
<Loading :loaded="loaded" :loading="loading"></Loading>
|
<Loading :loaded="loaded" :loading="loading"></Loading>
|
||||||
<view v-if="!loading && list.length <= 0" class="nothing">
|
<view v-if="!loading && list.length <= 0" class="nothing">
|
||||||
<image src="/static/images/no_thing.png" mode="widthFix"></image>
|
<image :src="no_thing" mode="widthFix"></image>
|
||||||
<view class="nothing_text">暂无订单~</view>
|
<view class="nothing_text">暂无订单~</view>
|
||||||
</view>
|
</view>
|
||||||
<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
|
<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
|
||||||
|
|
@ -212,7 +212,8 @@
|
||||||
refundInfo: {},
|
refundInfo: {},
|
||||||
orderInfo: {},
|
orderInfo: {},
|
||||||
status: "",
|
status: "",
|
||||||
merId: ''
|
merId: '',
|
||||||
|
no_thing: '',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
|
@ -232,7 +233,10 @@
|
||||||
this.current = "";
|
this.current = "";
|
||||||
this.merId = option.merId;
|
this.merId = option.merId;
|
||||||
this.getIndex();
|
this.getIndex();
|
||||||
},
|
},
|
||||||
|
onReady() {
|
||||||
|
this.no_thing = `${HTTP_REQUEST_URL}/static/images/mer/no_thing.png`;
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.loaded = false;
|
this.loaded = false;
|
||||||
|
|
@ -374,7 +378,7 @@
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:`/pages/admin/delivery/index?id=${item.order_id}&merId=${that.merId}`
|
url:`/pages/admin/delivery/index?id=${item.order_id}&merId=${that.merId}`
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async savePrice(opt) {
|
async savePrice(opt) {
|
||||||
let that = this,
|
let that = this,
|
||||||
|
|
@ -411,7 +415,7 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if(!remark){
|
if(!remark){
|
||||||
return this.$util.Tips({
|
return this.$util.Tips({
|
||||||
title:'请输入备注'
|
title:'请输入备注'
|
||||||
|
|
@ -478,7 +482,7 @@
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.pos-order-list .nav .item.on {
|
.pos-order-list .nav .item.on {
|
||||||
color: #2291f8;
|
color: #2291f8;
|
||||||
}
|
}
|
||||||
|
|
@ -629,8 +633,8 @@
|
||||||
margin-left: 26rpx;
|
margin-left: 26rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.pos-order-goods .cancelled{
|
.pos-order-goods .cancelled{
|
||||||
color: #FF9600;
|
color: #FF9600;
|
||||||
}
|
}
|
||||||
.pos-order-goods .goods .uncancell{
|
.pos-order-goods .goods .uncancell{
|
||||||
color: #999999;
|
color: #999999;
|
||||||
|
|
@ -679,7 +683,7 @@
|
||||||
.num{
|
.num{
|
||||||
color: #999999;
|
color: #999999;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
.refund-num{
|
.refund-num{
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
|
|
@ -715,7 +719,7 @@
|
||||||
}
|
}
|
||||||
.nothing {
|
.nothing {
|
||||||
margin-top: 200rpx;
|
margin-top: 200rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.nothing_text{
|
.nothing_text{
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
|
|
@ -740,27 +744,27 @@
|
||||||
}
|
}
|
||||||
.search {
|
.search {
|
||||||
padding: 17rpx 30rpx;
|
padding: 17rpx 30rpx;
|
||||||
|
|
||||||
.search-content {
|
.search-content {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
padding: 0 30rpx;
|
padding: 0 30rpx;
|
||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
background-color: #F5F5F5;
|
background-color: #F5F5F5;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.iconfont {
|
.iconfont {
|
||||||
margin-right: 10rpx;
|
margin-right: 10rpx;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-placeholder {
|
.input-placeholder {
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input {
|
.input {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,62 +19,62 @@
|
||||||
<view v-if="bought.length" @touchmove="onTouchmove" id="goods">
|
<view v-if="bought.length" @touchmove="onTouchmove" id="goods">
|
||||||
<view class="picTxt acea-row" v-for="(item, index) in bought" :key="index">
|
<view class="picTxt acea-row" v-for="(item, index) in bought" :key="index">
|
||||||
<view class="checkbox">
|
<view class="checkbox">
|
||||||
<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>
|
<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>
|
||||||
<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
|
<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
|
||||||
</view>
|
</view>
|
||||||
<view class='pictrue'>
|
<view class='pictrue'>
|
||||||
<image :src='item.image'></image>
|
<image :src='item.image'></image>
|
||||||
</view>
|
</view>
|
||||||
<view class='text'>
|
<view class='text'>
|
||||||
<view class='line2 name'>{{item.store_name}}</view>
|
<view class='line2 name'>{{item.store_name}}</view>
|
||||||
<view class='money'>¥<text>{{item.price}}</text></view>
|
<view class='money'>¥<text>{{item.price}}</text></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-else class="empty">
|
<view v-else class="empty">
|
||||||
<image src="/static/images/no_thing.png"></image>
|
<image :src="no_thing"></image>
|
||||||
<text>暂无内容哦~</text>
|
<text>暂无内容哦~</text>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
<block v-if="isActive == 1">
|
<block v-if="isActive == 1">
|
||||||
<view v-if="collect.length" id="collect" @touchmove="onTouchmove1">
|
<view v-if="collect.length" id="collect" @touchmove="onTouchmove1">
|
||||||
<view class="picTxt acea-row" v-for="(item, index) in collect" :key="index">
|
<view class="picTxt acea-row" v-for="(item, index) in collect" :key="index">
|
||||||
<view class="checkbox">
|
<view class="checkbox">
|
||||||
<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>
|
<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>
|
||||||
<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
|
|
||||||
</view>
|
|
||||||
<view class='pictrue'>
|
|
||||||
<image :src='item.image'></image>
|
|
||||||
</view>
|
|
||||||
<view class='text'>
|
|
||||||
<view class='line2 name'>{{item.store_name}}</view>
|
|
||||||
<view class='money'>¥<text>{{item.price}}</text></view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view v-else class="empty">
|
|
||||||
<image src="/static/images/no_thing.png"></image>
|
|
||||||
<text>暂无内容哦~</text>
|
|
||||||
</view>
|
|
||||||
</block>
|
|
||||||
<block v-if="isActive == 2">
|
|
||||||
<view v-if="browse.length" id="browse" @touchmove="onTouchmove2">
|
|
||||||
<view class="picTxt acea-row" v-for="(item, index) in browse" :key="index">
|
|
||||||
<view class="checkbox">
|
|
||||||
<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>
|
|
||||||
<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
|
<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
|
||||||
</view>
|
</view>
|
||||||
<view class='pictrue'>
|
<view class='pictrue'>
|
||||||
<image :src='item.image'></image>
|
<image :src='item.image'></image>
|
||||||
</view>
|
</view>
|
||||||
<view class='text'>
|
<view class='text'>
|
||||||
<view class='line2 name'>{{item.store_name}}</view>
|
<view class='line2 name'>{{item.store_name}}</view>
|
||||||
<view class='money'>¥<text>{{item.price}}</text></view>
|
<view class='money'>¥<text>{{item.price}}</text></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-else class="empty">
|
<view v-else class="empty">
|
||||||
<image src="/static/images/no_thing.png"></image>
|
<image :src="no_thing"></image>
|
||||||
|
<text>暂无内容哦~</text>
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
|
<block v-if="isActive == 2">
|
||||||
|
<view v-if="browse.length" id="browse" @touchmove="onTouchmove2">
|
||||||
|
<view class="picTxt acea-row" v-for="(item, index) in browse" :key="index">
|
||||||
|
<view class="checkbox">
|
||||||
|
<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>
|
||||||
|
<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
|
||||||
|
</view>
|
||||||
|
<view class='pictrue'>
|
||||||
|
<image :src='item.image'></image>
|
||||||
|
</view>
|
||||||
|
<view class='text'>
|
||||||
|
<view class='line2 name'>{{item.store_name}}</view>
|
||||||
|
<view class='money'>¥<text>{{item.price}}</text></view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view v-else class="empty">
|
||||||
|
<image :src="no_thing"></image>
|
||||||
<text>暂无内容哦~</text>
|
<text>暂无内容哦~</text>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
|
|
@ -82,7 +82,7 @@
|
||||||
<view class="foot_bar">
|
<view class="foot_bar">
|
||||||
<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
|
<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -102,6 +102,7 @@
|
||||||
components: { Loading },
|
components: { Loading },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
no_thing: '',
|
||||||
isActive: 0,
|
isActive: 0,
|
||||||
loadedb: false,
|
loadedb: false,
|
||||||
loadingb: false,
|
loadingb: false,
|
||||||
|
|
@ -143,13 +144,16 @@
|
||||||
// deep: true
|
// deep: true
|
||||||
// }
|
// }
|
||||||
},
|
},
|
||||||
|
onReady() {
|
||||||
|
this.no_thing = `${HTTP_REQUEST_URL}/static/images/mer/no_thing.png`;
|
||||||
|
},
|
||||||
mounted(){
|
mounted(){
|
||||||
this.checkedArr = this.checkedObj
|
this.checkedArr = this.checkedObj
|
||||||
this.getBounht();
|
this.getBounht();
|
||||||
this.getCollect();
|
this.getCollect();
|
||||||
this.getBrowse();
|
this.getBrowse();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 点击关闭按钮
|
// 点击关闭按钮
|
||||||
close() {
|
close() {
|
||||||
this.$emit('close');
|
this.$emit('close');
|
||||||
|
|
@ -168,7 +172,7 @@
|
||||||
const query = uni.createSelectorQuery().in(this);
|
const query = uni.createSelectorQuery().in(this);
|
||||||
query.select('#goods').boundingClientRect(data => {
|
query.select('#goods').boundingClientRect(data => {
|
||||||
if(data.bottom < 1500 && data.top < 0) {
|
if(data.bottom < 1500 && data.top < 0) {
|
||||||
this.getBounht();
|
this.getBounht();
|
||||||
}
|
}
|
||||||
}).exec();
|
}).exec();
|
||||||
// 模拟触底刷新
|
// 模拟触底刷新
|
||||||
|
|
@ -179,7 +183,7 @@
|
||||||
const query = uni.createSelectorQuery().in(this);
|
const query = uni.createSelectorQuery().in(this);
|
||||||
query.select('#collect').boundingClientRect(data => {
|
query.select('#collect').boundingClientRect(data => {
|
||||||
if(data.bottom < 1500 && data.top < 0) {
|
if(data.bottom < 1500 && data.top < 0) {
|
||||||
this.getCollect();
|
this.getCollect();
|
||||||
}
|
}
|
||||||
}).exec();
|
}).exec();
|
||||||
// 模拟触底刷新
|
// 模拟触底刷新
|
||||||
|
|
@ -190,7 +194,7 @@
|
||||||
const query = uni.createSelectorQuery().in(this);
|
const query = uni.createSelectorQuery().in(this);
|
||||||
query.select('#browse').boundingClientRect(data => {
|
query.select('#browse').boundingClientRect(data => {
|
||||||
if(data.bottom < 1500 && data.top < 0) {
|
if(data.bottom < 1500 && data.top < 0) {
|
||||||
this.getBrowse();
|
this.getBrowse();
|
||||||
}
|
}
|
||||||
}).exec();
|
}).exec();
|
||||||
// 模拟触底刷新
|
// 模拟触底刷新
|
||||||
|
|
@ -272,7 +276,7 @@
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
/*获取初始化选中的数据*/
|
/*获取初始化选中的数据*/
|
||||||
getInitchecked(arr){
|
getInitchecked(arr){
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
@ -281,7 +285,7 @@
|
||||||
that.checkedArr.forEach((val, i) =>{
|
that.checkedArr.forEach((val, i) =>{
|
||||||
if((item.spu_id == (val.spu&&val.spu.spu_id)) || (item.spu_id == val.spu_id)){
|
if((item.spu_id == (val.spu&&val.spu.spu_id)) || (item.spu_id == val.spu_id)){
|
||||||
that.$set(item, 'check', true);
|
that.$set(item, 'check', true);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
@ -296,12 +300,12 @@
|
||||||
}else{
|
}else{
|
||||||
this.$set(item, 'check', false);
|
this.$set(item, 'check', false);
|
||||||
let idx = this.checkedArr.findIndex(itemn => (itemn.spu_id == item.spu_id))
|
let idx = this.checkedArr.findIndex(itemn => (itemn.spu_id == item.spu_id))
|
||||||
this.checkedArr.splice(idx, 1)
|
this.checkedArr.splice(idx, 1)
|
||||||
}
|
}
|
||||||
this.disabled = this.checkedArr.length > 4
|
this.disabled = this.checkedArr.length > 4
|
||||||
},
|
},
|
||||||
/*确定提交*/
|
/*确定提交*/
|
||||||
submit(){
|
submit(){
|
||||||
this.$emit('getProduct',this.checkedArr);
|
this.$emit('getProduct',this.checkedArr);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
@ -340,7 +344,7 @@
|
||||||
left: 10rpx;
|
left: 10rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.search{
|
.search{
|
||||||
margin-top: 44rpx;
|
margin-top: 44rpx;
|
||||||
|
|
@ -418,7 +422,7 @@
|
||||||
margin-left: 30rpx;
|
margin-left: 30rpx;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #282828;
|
color: #282828;
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 160rpx;
|
height: 160rpx;
|
||||||
.name{
|
.name{
|
||||||
color: #282828;
|
color: #282828;
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="goods.length == 0 && !loading" class="empty">
|
<view v-if="goods.length == 0 && !loading" class="empty">
|
||||||
<image src="/static/images/no_thing.png"></image>
|
<image :src="no_thing"></image>
|
||||||
<text>暂无内容哦~</text>
|
<text>暂无内容哦~</text>
|
||||||
</view>
|
</view>
|
||||||
<view class='loadingicon acea-row row-center-wrapper'>
|
<view class='loadingicon acea-row row-center-wrapper'>
|
||||||
|
|
@ -91,7 +91,8 @@
|
||||||
limit: 30
|
limit: 30
|
||||||
},
|
},
|
||||||
tab: 0,
|
tab: 0,
|
||||||
current_uid: ''
|
current_uid: '',
|
||||||
|
no_thing: '',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {},
|
created() {},
|
||||||
|
|
@ -115,7 +116,9 @@
|
||||||
if(options.spread) spread(options.spread, this.isLogin)
|
if(options.spread) spread(options.spread, this.isLogin)
|
||||||
},
|
},
|
||||||
onShow() {},
|
onShow() {},
|
||||||
onReady() {},
|
onReady() {
|
||||||
|
this.no_thing = `${HTTP_REQUEST_URL}/static/images/mer/no_thing.png`;
|
||||||
|
},
|
||||||
mounted: function() {},
|
mounted: function() {},
|
||||||
methods: {
|
methods: {
|
||||||
// 授权回调
|
// 授权回调
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@
|
||||||
</block>
|
</block>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="followList.length == 0 && !focusLoading && isLogin" class="empty">
|
<view v-if="followList.length == 0 && !focusLoading && isLogin" class="empty">
|
||||||
<image src="/static/images/no_thing.png"></image>
|
<image :src="no_thing"></image>
|
||||||
<text>暂无内容~</text>
|
<text>暂无内容~</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="!isLogin" class="empty no_login">
|
<view v-if="!isLogin" class="empty no_login">
|
||||||
|
|
@ -133,19 +133,19 @@
|
||||||
<text class="iconfont icon-jiazai loading"></text>{{!cateGoods[item.category_id] ? 0 : cateGoods[item.category_id].goodsLoading}}
|
<text class="iconfont icon-jiazai loading"></text>{{!cateGoods[item.category_id] ? 0 : cateGoods[item.category_id].goodsLoading}}
|
||||||
</view>
|
</view>
|
||||||
<view v-if="cateGoods[item.category_id] && cateGoods[item.category_id].goods.length == 0 && !cateGoods[item.category_id].goodsLoading" class="empty">
|
<view v-if="cateGoods[item.category_id] && cateGoods[item.category_id].goods.length == 0 && !cateGoods[item.category_id].goodsLoading" class="empty">
|
||||||
<image src="/static/images/no_thing.png"></image>
|
<image :src="no_thing"></image>
|
||||||
<text>{{item.category_id == -1 ? '暂无视频' : '暂无文章'}}~</text>
|
<text>{{item.category_id == -1 ? '暂无视频' : '暂无文章'}}~</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
</block>
|
</block>
|
||||||
</swiper>
|
</swiper>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<!-- 他提到的宝贝弹窗 -->
|
<!-- 他提到的宝贝弹窗 -->
|
||||||
<mentioned ref="mentioned" :isHome="true" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
|
<mentioned ref="mentioned" :isHome="true" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
|
||||||
|
|
@ -184,6 +184,7 @@
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
no_thing: '',
|
||||||
domain: HTTP_REQUEST_URL,
|
domain: HTTP_REQUEST_URL,
|
||||||
// #ifdef MP
|
// #ifdef MP
|
||||||
menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
|
menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
|
||||||
|
|
@ -276,6 +277,9 @@
|
||||||
...mapGetters(['isLogin', 'uid', 'viewColor']),
|
...mapGetters(['isLogin', 'uid', 'viewColor']),
|
||||||
...configMap({community_reply_status: 0,community_app_switch: [],community_status: 0,navigation: {}})
|
...configMap({community_reply_status: 0,community_app_switch: [],community_status: 0,navigation: {}})
|
||||||
},
|
},
|
||||||
|
onReady() {
|
||||||
|
this.no_thing = `${HTTP_REQUEST_URL}/static/images/mer/no_thing.png`;
|
||||||
|
},
|
||||||
watch: {},
|
watch: {},
|
||||||
onLoad: function(options) {
|
onLoad: function(options) {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
@ -418,7 +422,7 @@
|
||||||
let data = [{cate_name: "推荐",category_id: 0,children: []}]
|
let data = [{cate_name: "推荐",category_id: 0,children: []}]
|
||||||
if(this.community_app_switch.length == 2 || this.community_app_switch[0]==2){
|
if(this.community_app_switch.length == 2 || this.community_app_switch[0]==2){
|
||||||
data = [{cate_name: "推荐",category_id: 0,children: []},{cate_name: "视频",category_id: -1,children: []}]
|
data = [{cate_name: "推荐",category_id: 0,children: []},{cate_name: "视频",category_id: -1,children: []}]
|
||||||
}
|
}
|
||||||
this.menuList = Array.from(new Set([...data,...res.data]));
|
this.menuList = Array.from(new Set([...data,...res.data]));
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
@ -457,7 +461,7 @@
|
||||||
},
|
},
|
||||||
scrollLeft: function(e){
|
scrollLeft: function(e){
|
||||||
uni.$emit('scroll');
|
uni.$emit('scroll');
|
||||||
this.scrollTop = e.detail.scrollTop
|
this.scrollTop = e.detail.scrollTop
|
||||||
this.navShow = e.detail.scrollTop >= this.storeHeight - 200;
|
this.navShow = e.detail.scrollTop >= this.storeHeight - 200;
|
||||||
if(this.navShow){
|
if(this.navShow){
|
||||||
this.$set(this, 'swiperHeight', this.windowHeight-50);
|
this.$set(this, 'swiperHeight', this.windowHeight-50);
|
||||||
|
|
@ -636,7 +640,7 @@
|
||||||
this.showTab = false;
|
this.showTab = false;
|
||||||
uni.hideTabBar()
|
uni.hideTabBar()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
goVideo(item) {
|
goVideo(item) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
@ -1203,4 +1207,4 @@ page{
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-else class="nothing">
|
<view v-else class="nothing">
|
||||||
<image src="/static/images/no_thing.png" mode="widthFix"></image>
|
<image :src="no_thing" mode="widthFix"></image>
|
||||||
<view class="nothing_text">暂无订单~</view>
|
<view class="nothing_text">暂无订单~</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -94,12 +94,14 @@
|
||||||
isScroll:true,
|
isScroll:true,
|
||||||
page:1,
|
page:1,
|
||||||
limit:15,
|
limit:15,
|
||||||
|
no_thing: '',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
onReady(){
|
onReady(){
|
||||||
|
this.no_thing = `${HTTP_REQUEST_URL}/static/images/mer/no_thing.png`;
|
||||||
},
|
},
|
||||||
mounted: function() {
|
mounted: function() {
|
||||||
},
|
},
|
||||||
|
|
@ -109,7 +111,7 @@
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:`/pages/store/home/index?id=${item.merchant.mer_id}`
|
url:`/pages/store/home/index?id=${item.merchant.mer_id}`
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
goPage(id){
|
goPage(id){
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
@ -166,7 +168,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onReachBottom() {
|
onReachBottom() {
|
||||||
|
|
@ -204,7 +206,7 @@
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-top: 12rpx;
|
margin-top: 12rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|
||||||
.title{
|
.title{
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
@ -266,9 +268,9 @@
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-size: 20rpx;
|
font-size: 20rpx;
|
||||||
padding: 0 8rpx;
|
padding: 0 8rpx;
|
||||||
line-height: 30rpx;
|
line-height: 30rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.btn-box{
|
.btn-box{
|
||||||
|
|
@ -311,7 +313,7 @@
|
||||||
}
|
}
|
||||||
.nothing {
|
.nothing {
|
||||||
margin-top: 200rpx;
|
margin-top: 200rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.nothing_text{
|
.nothing_text{
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
Loading…
Reference in New Issue