maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:51874e8daba918d1a7b5901cf309b542e7a06200
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:6edc6205094214d73b6983a2b22a349a006599d6
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "51874e8daba918d1a7b5901cf309b542e7a06200" and "6edc6205094214d73b6983a2b22a349a006599d6" have entirely different histories.
51874e8dab ... 6edc620509

4 changed files with 13 additions and 30 deletions
Show Stats Expand all files Collapse all files

13
packages/jfShop/detail/index.vue
View File

@ -43,8 +43,7 @@
<text class="points-label">当前积分{{ userPoints }}</text>
</view>
<view v-if="userPoints < selectedGoodsInfo.points" class="insufficient-points">
<text v-if="!isLoggedIn" >暂未登录,请先登录</text>
<text v-else>积分不足，还差{{ selectedGoodsInfo.points - userPoints }}积分哦</text>
积分不足，还差{{ selectedGoodsInfo.points - userPoints }}积分哦
</view>
<button v-else class="exchange-btn" @click="showSpecPopup = true">立即兑换</button>
<!-- <button class="exchange-btn" @click="showSpecPopup = true">立即兑换</button> -->
@ -112,8 +111,7 @@ export default {
selectedSpecId: 1,
selectedSpec: '',
quantity: 1,
selectedGoodsInfo: {},
isLoggedIn: false
selectedGoodsInfo: {}
};
},
computed: {
@ -173,9 +171,6 @@ export default {
},
// 获取用户积分
getPointNum() {
if (!uni.getStorageSync("ctoken")) {
return 0;
}
request(apiArr2.getUserInfo, 'POST', {}, { silent: false }).then(res => {
this.userPoints = res.points;
});
@ -183,13 +178,9 @@ export default {
},
onshow() {
this.getPointNum();
// 更新登录状态
this.isLoggedIn = !!uni.getStorageSync("ctoken");
},
onLoad(options) {
this.getPointNum();
// 初始化登录状态
this.isLoggedIn = !!uni.getStorageSync("ctoken");
const orderInfo = JSON.parse(options.product);
const params = {
id: orderInfo.id

11
packages/jfShop/index/index.vue
View File

@ -38,9 +38,9 @@
<scroll-view scroll-y="true" @scrolltolower="loadMore" style="height: calc(100vh - 300rpx);">
<view class="product-list">
<view v-for="(product, index) in products" :key="index" class="product-item">
<image class="product-image" :src="product.commodity_pic" mode="aspectFill" @click="toDetail(product)"></image>
<view class="product-title" @click="toDetail(product)">{{ product.commodity_name }}</view>
<view class="product-info" @click="toDetail(product)">
<image class="product-image" :src="product.commodity_pic" mode="aspectFill"></image>
<view class="product-title">{{ product.commodity_name }}</view>
<view class="product-info">
<view class="product-points">{{ product.goods_info_list[0].points }} 积分</view>
<view class="product-sold">已兑换{{ product.exchange_count }}件</view>
</view>
@ -90,9 +90,6 @@ export default {
},
methods: {
getNum() {
if (!uni.getStorageSync("ctoken")) {
return 0;
}
request(apiArr2.getUserInfo, 'POST', {}, { silent: false }).then(res => {
this.pointsNum = res.points;
});
@ -156,7 +153,7 @@ export default {
}
},
toDetail(product) {
NavgateTo('/packages/jfShop/detail/index?product=' + JSON.stringify(product) + '&pointNum=' + this.pointsNum, { isLogin: false });
NavgateTo('/packages/jfShop/detail/index?product=' + JSON.stringify(product) + '&pointNum=' + this.pointsNum);
}
}
}

3
packages/workOrderDashboard/index/index.css
View File

@ -136,9 +136,6 @@ page {
.orderItem_row_label {
width: 200rpx;
}
.orderItem_row_status{
min-width: 90rpx;
}
.orderItem_row_state {
font-size: 28rpx;

8
packages/workOrderDashboard/index/index.vue
View File

@ -37,7 +37,7 @@
<view class="orderItem_row_con">{{ item.room.name }}</view>
</view>
<view class="orderItem_row_status" :class="['orderItem_row_state', statusType[item.status].color]">
<view :class="['orderItem_row_state', statusType[item.status].color]">
{{ statusType[item.status].desc }}
</view>
</view>
@ -183,9 +183,7 @@ export default {
const meun = menuButtonInfo();
this.top = meun.top;
this.localHeight = meun.height;
if (options.communityId) {
this.communityId = JSON.parse(options.communityId);
}
this.communityId = JSON.parse(options.communityId);
},
onShow() {
this.page_num = 1;
@ -195,7 +193,7 @@ export default {
},
onReachBottom() {
if (this.flag) {
this.getTabsList();
this.init();
}
},
}