wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
version/0412
syt 10 months ago
parent 00012f2e07
commit da06719c6c
8 changed files with 85 additions and 43 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      pages/activity/presale.vue
  2. 27
      pages/goods/list.vue
  3. 2
      pages/index/index.vue
  4. 38
      pages/invite/index.vue
  5. 11
      pages/news/rules/rulesList.vue
  6. 4
      pages/news1/help.vue
  7. 24
      pages/order/detail.vue
  8. 7
      pages/order/index.vue

15
pages/activity/presale.vue
Unescape View File

@ -32,8 +32,10 @@
</view> </view>
</view> </view>
</view> </view>
<u-empty text="暂无信息" v-if="menuList.length == 0 || goodList.length==0" mode="list" style="margin-top: 160rpx;"> <view style="margin-top: 250rpx;" v-if="goodList.length==0">
</u-empty> <u-empty text="暂无信息" mode="list">
</u-empty>
</view>
</view> </view>
</template> </template>
@ -71,7 +73,7 @@
getListgoodData(categoryId) { getListgoodData(categoryId) {
let app = this; let app = this;
let pamars = { let pamars = {
category_id: categoryId, category_id: categoryId?categoryId:"",
} }
Api.presaleGoodsList(pamars) Api.presaleGoodsList(pamars)
.then(result => { .then(result => {
@ -107,7 +109,12 @@
app.timestamp = this.beginTime(result.data.info.p_time); app.timestamp = this.beginTime(result.data.info.p_time);
app.info = result.data.info app.info = result.data.info
app.menuList = result.data.category; app.menuList = result.data.category;
app.getListgoodData(result.data.category[0].category_id) if(result.data.category && result.data.category.length > 0) {
app.getListgoodData(result.data.category[0].category_id)
}else{
app.getListgoodData()
}
}) })
.finally(() => app.isLoading = false) .finally(() => app.isLoading = false)
}, },

27
pages/goods/list.vue
Unescape View File

@ -177,7 +177,9 @@
</template> </template>
</u-waterfall> </u-waterfall>
</view> </view>
<u-empty text="暂无数据显示哦～" v-if="list.data.length==0 && total == 0" mode="list"></u-empty> <view style="margin-top: 250rpx;">
<u-empty text="暂无数据显示哦～" v-if="list.data.length==0 && total == 0" mode="list"></u-empty>
</view>
</view> </view>
</mescroll-body> </mescroll-body>
</view> </view>
@ -205,7 +207,7 @@
return { return {
total: 1, total: 1,
searchText: '', searchText: '',
banrdType: [], banrdType: [],
keyName1: '', keyName1: '',
isBanrdActive: '', isBanrdActive: '',
isActive: '', isActive: '',
@ -226,7 +228,10 @@
size: pageSize size: pageSize
}, },
// 数量要大于4条才显示无更多数据 // 数量要大于4条才显示无更多数据
noMoreSize: 4, // noMoreSize: 4,
empty: {
use : false ,
}
}, },
tabbar: [] tabbar: []
} }
@ -236,7 +241,7 @@
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
console.log(options) console.log("options",options)
// 记录options // 记录options
this.options = options this.options = options
this.searchText = options.search this.searchText = options.search
@ -277,7 +282,8 @@
this.isBanrdActive = item.category_id; this.isBanrdActive = item.category_id;
this.keyName1 = item.name this.keyName1 = item.name
} }
} }
if (type == 2) { if (type == 2) {
if (item.category_id == this.isActive) { if (item.category_id == this.isActive) {
this.isActive = ''; this.isActive = '';
@ -303,7 +309,8 @@
.then(list => { .then(list => {
const curPageLen = list.data.length const curPageLen = list.data.length
const totalSize = list.data.total const totalSize = list.data.total
app.mescroll.endBySize(curPageLen, totalSize) app.mescroll.endBySize(curPageLen, totalSize)
console.log("upCallback",app.upOption)
}) })
.catch(() => app.mescroll.endErr()) .catch(() => app.mescroll.endErr())
}, },
@ -395,7 +402,13 @@
/** /**
* 商品搜索 * 商品搜索
*/ */
handleSearch() { handleSearch() {
this.isBanrdActive = '';
this.keyName1 = '';
this.isActive = '';
this.keyName2 = '';
this.banrdType = [];
this.goodsType = [];
const searchPageUrl = 'pages/search/index?category_id=' + this.options.categoryId const searchPageUrl = 'pages/search/index?category_id=' + this.options.categoryId
// 判断来源页面 // 判断来源页面
let pages = getCurrentPages() let pages = getCurrentPages()

2
pages/index/index.vue
Unescape View File

@ -294,7 +294,7 @@
<view v-show="current==1"> <view v-show="current==1">
<view class="secondSection"> <view class="secondSection">
<image class="shopImage" :src="cityInfo.imageList?cityInfo.imageList[0]:''"></image> <image class="shopImage" :src="cityInfo.imageList?cityInfo.imageList[0]:''"></image>
<view class="content"> <view class="content" v-if="cityInfo.shop_name">
<view class="topcontent"> <view class="topcontent">
<view class="shopTitle"> <view class="shopTitle">
<text class="title">{{cityInfo.shop_name}}</text> <text class="title">{{cityInfo.shop_name}}</text>

38
pages/invite/index.vue
Unescape View File

@ -69,11 +69,11 @@
</view> </view>
<!-- --> <!-- -->
<view class="invite-popup" v-if="isPopup"> <view class="invite-popup" v-if="isPopup">
<view class="popup" @click="download()"> <view class="popup">
<image class="bg" :src="qrcode"></image> <image class="bg" show-menu-by-longpress :src="qrcode"></image>
<view class="tips">保存海报图</view> <view class="tips">
<view class="close"> <view class="cancle" @click="download(1)">取消</view>
<view class="sure" @click="download(2)">保存到相册</view>
</view> </view>
</view> </view>
</view> </view>
@ -159,12 +159,16 @@
} = await newFunApi.InviteUserPoster({}); } = await newFunApi.InviteUserPoster({});
if (status == 200) { if (status == 200) {
console.log(data) console.log(data)
this.isPopup = true;
this.qrcode = data.imageUrl this.qrcode = data.imageUrl
} }
}, },
download() { download(type) {
const app = this const app = this
app.isPopup = false; app.isPopup = false;
if(type == 1){
return ;
}
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}) })
@ -252,7 +256,6 @@
url: "/pages/news/user/withdrawal?balance=" + this.userInfo.pay_money url: "/pages/news/user/withdrawal?balance=" + this.userInfo.pay_money
}) })
} else if (index == 3) { } else if (index == 3) {
this.isPopup = true;
this.InviteUserPoster(); this.InviteUserPoster();
} else if (index == 4) { } else if (index == 4) {
uni.navigateTo({ uni.navigateTo({
@ -307,19 +310,32 @@
} }
.tips { .tips {
width: 600rpx; width: 672rpx;
height: 80rpx; height: 80rpx;
position: absolute; position: absolute;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
line-height: 80rpx; line-height: 80rpx;
border-radius: 10rpx;
color: #212121; color: #212121;
left: 50%; left: 50%;
margin-left: -300rpx; margin-left: -336rpx;
bottom: -120rpx; bottom: -120rpx;
z-index: 2; z-index: 2;
background-color: #FFFFFF; display: flex;
align-items: center;
justify-content: space-between;
.cancle{
flex: 1;
background-color: #FFFFFF;
margin-right: 30rpx;
border-radius: 10rpx;
}
.sure{
border-radius: 10rpx;
flex: 1;
color: #FFFFFF;
background-color: #FF4A49;
}
} }
.close { .close {

11
pages/news/rules/rulesList.vue
Unescape View File

@ -4,12 +4,11 @@
<u-navbar is-back="false" :title="title"></u-navbar> <u-navbar is-back="false" :title="title"></u-navbar>
</view> </view>
<view class="content"> <view class="content">
<view v-for="(item,index) in list" :key="index" class="item"> <view v-for="(item,index) in list" :key="index" class="item">
<view class="title" @click="goRules(item)"> <view class="title" @click="goRules(item)">
{{item.title}} {{item.title}}
</view> </view>
<u-line v-if="item.title" />
<u-line />
</view> </view>
</view> </view>

4
pages/news1/help.vue
Unescape View File

@ -50,9 +50,9 @@
this.getHelpList() this.getHelpList()
}, },
methods: { methods: {
goListPage(item) { goListPage(index) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(item)) url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(index))
}) })
}, },
getHelpList() { getHelpList() {

24
pages/order/detail.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<view class="detail"> <view class="detail">
<view> <view>
<u-navbar title="订单详情" back-icon-color="#fff" :border-bottom="false" title-color="#333" <u-navbar title="订单详情" back-icon-color="#333" :border-bottom="false" title-color="#333"
:background="background"></u-navbar> :background="background"></u-navbar>
</view> </view>
<view class="send"> <view class="send">
@ -225,9 +225,11 @@
</view> </view>
<view class="sp"> <view class="sp">
</view> </view>
<view class="callShop" @click="callStore(order.storeInfo.phone)"> <!-- / @click="callStore(order.storeInfo.phone)" -->
<view class="callShop">
<image src="/static/order/share.png" mode=""></image> <image src="/static/order/share.png" mode=""></image>
<button open-type="contact"></button>
联系商家 联系商家
</view> </view>
</view> </view>
@ -1175,7 +1177,8 @@
border: 2rpx solid #ECECEC; border: 2rpx solid #ECECEC;
} }
.callShop { .callShop {
position: relative;
image { image {
width: 26rpx; width: 26rpx;
height: 26rpx; height: 26rpx;
@ -1184,11 +1187,18 @@
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC,
PingFang SC;
font-weight: 400; font-weight: 400;
color: #1E1E1E; color: #1E1E1E;
line-height: 34rpx; line-height: 34rpx;
button{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
z-index: 2;
opacity: 0;
}
} }
} }
} }

7
pages/order/index.vue
Unescape View File

@ -8,13 +8,13 @@
</view> </view>
<!-- tab栏 --> <!-- tab栏 -->
<view class="container"> <view class="container">
<view class="classify-list"> <scroll-view scroll-x class="classify-list">
<view class="list" v-for="(item,index) in tabs" :class="{'action':current==index}" <view class="list" v-for="(item,index) in tabs" :class="{'action':current==index}"
@click="onChangeTab(item,index)" :key="index"> @click="onChangeTab(item,index)" :key="index">
<text>{{item.name}}</text> <text>{{item.name}}</text>
<text class="line" v-show="current==index"></text> <text class="line" v-show="current==index"></text>
</view> </view>
</view> </scroll-view>
</view> </view>
<!-- <u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current" <!-- <u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2" bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
@ -497,9 +497,6 @@
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
overflow-x: auto;
overflow-y: hidden;
.list { .list {
position: relative; position: relative;
display: inline-block; display: inline-block;

Write Preview
Loading…
Cancel
Save