Compare commits

..

No commits in common. "734e0223ed381bb26353706837b47b937ed1b99d" and "7107bee0ea10a53409a1dcab4dd8071627aedac8" have entirely different histories.

3 changed files with 9 additions and 12 deletions

View File

@ -8,7 +8,7 @@
</view> </view>
<!-- 顶部区域 --> <!-- 顶部区域 -->
<view class="box-xianze" v-for="(item,index) in dataList" :key="index"> <view class="box-xianze" v-for="(item,index) in dataList" :key="index">
<view class="" @click="choose(item)"> <view class="">
<view style="display: flex;align-items: center;margin-bottom: 5px;"> <view style="display: flex;align-items: center;margin-bottom: 5px;">
<view class="">{{item.name || '--'}}</view> <view class="">{{item.name || '--'}}</view>
<view style="margin: 0 10px;" v-if="item.sex==0"> 先生</view> <view style="margin: 0 10px;" v-if="item.sex==0"> 先生</view>
@ -97,6 +97,7 @@
if (item.ifDefault == 1) { if (item.ifDefault == 1) {
item.checked = true item.checked = true
} }
this.$set(item, 'checked', item.checked); //
}) })
console.log(res, this.dataList, 98); console.log(res, this.dataList, 98);
this.$forceUpdate() this.$forceUpdate()

View File

@ -9,8 +9,7 @@
<view class="f-box" v-for="(item,index) in integralGiftList" :key="index" @click="goDetails(item)"> <view class="f-box" v-for="(item,index) in integralGiftList" :key="index" @click="goDetails(item)">
<view class="f-top">{{item.storeName}}可用</view> <view class="f-top">{{item.storeName}}可用</view>
<view class="f-bs"> <view class="f-bs">
<image v-if="item.coverImage" :src="baseUrl+item.coverImage" mode="aspectFit" <image v-if="item.coverImage" :src="baseUrl+item.coverImage" mode="aspectFit" style="width: 60px; height: 60px; "></image>
style="width: 60px; height: 60px; "></image>
<image v-else src="../../static/logo.png" style="width: 60px; height: 60px; "></image> <image v-else src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
<view class="r-box"> <view class="r-box">
<view class=""> <view class="">
@ -19,9 +18,7 @@
<view class="q_">兑换券</view> <view class="q_">兑换券</view>
</view> </view>
<view class=""> <view class="">
<view class="an_"> <view class="an_">100积分</view>
{{item.exchangePoints}}积分
</view>
<u-line-progress :percentage="50" :showText="false" height="6" <u-line-progress :percentage="50" :showText="false" height="6"
activeColor="#FA6400"></u-line-progress> activeColor="#FA6400"></u-line-progress>
<view class="hui_">券已领70%</view> <view class="hui_">券已领70%</view>
@ -62,8 +59,8 @@
page: 1, page: 1,
pageSize: 30 pageSize: 30
}, },
integralGiftList: [], integralGiftList:[],
total: 0 total:0
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -109,7 +106,7 @@
if (res.code == 200) { if (res.code == 200) {
this.integralGiftList = res.data.records this.integralGiftList = res.data.records
this.total = res.data.total this.total = res.data.total
console.log(res, 100); console.log(res,100);
} }
}) })
}, },

View File

@ -132,7 +132,7 @@
allAmout: 0, allAmout: 0,
orderInfo: {}, orderInfo: {},
addrInfo: { addrInfo: {
name:'' address: ''
}, },
appltType: uni.getStorageSync("appltType"), appltType: uni.getStorageSync("appltType"),
shippingType: '', shippingType: '',
@ -168,14 +168,13 @@
}, },
onShow() { onShow() {
uni.$on('chooseAddr', (data) => { uni.$on('chooseAddr', (data) => {
this.addrInfo = data this.addrInfo = data
}) })
uni.$emit('unChooseAddr') uni.$emit('unChooseAddr')
// //
if (!this.addrInfo.name ) { if (!this.addrInfo) {
// //
this.getAddress() this.getAddress()
} }