Commit 545b9f01 by zhangzhen

细节优化

parent 4611865f
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<LoginPop ref="loginPop" />
</view> </view>
</template> </template>
...@@ -87,9 +88,10 @@ ...@@ -87,9 +88,10 @@
import {couponChecked,getStoreListByCouponCode,getCouponByCode} from "@/api/coupon.js"; import {couponChecked,getStoreListByCouponCode,getCouponByCode} from "@/api/coupon.js";
import moment from "@/common/moment_zh_cn.js"; import moment from "@/common/moment_zh_cn.js";
import StoreList from "@/components/storeList/couponStoreList" import StoreList from "@/components/storeList/couponStoreList"
import LoginPop from "@/components/login/login"
export default { export default {
components: { components: {
LoginPop,
StoreList StoreList
}, },
data() { data() {
...@@ -116,7 +118,8 @@ ...@@ -116,7 +118,8 @@
eventChannel:null, eventChannel:null,
orderPage:false, orderPage:false,
popStoreList:[], popStoreList:[],
qrCode:'' qrCode:'',
loginStatus: uni.getStorageSync('loginStatus') == 'login'? true: false
}; };
}, },
filters:{ filters:{
...@@ -139,9 +142,17 @@ ...@@ -139,9 +142,17 @@
this.storeId = '' this.storeId = ''
} }
}) })
if(!this.loginStatus){
this.$refs.loginPop.open();
}
}, },
methods:{ methods:{
onConfirm(){ onConfirm(){
if(!this.loginStatus){
this.$refs.loginPop.open();
return
}
let that = this; let that = this;
if(!this.code){ if(!this.code){
uni.showToast({ uni.showToast({
......
...@@ -12,7 +12,11 @@ ...@@ -12,7 +12,11 @@
</view> </view>
</view> </view>
<view class="flex-col margin-left user-info-box"> <view class="flex-col margin-left user-info-box">
<text class="text-title text-lg text-bold text-xxl">{{userInfo.nickName||"凑角用户"}}</text> <text v-if="loginStatus" class="text-title text-lg text-bold text-xl">{{userInfo.nickName || '凑角会员_'+userName}}</text>
<view v-else class="flex-row-center">
<text class="text-title text-lg text-bold text-xl">凑角用户</text>
<button v-if="!loginStatus" class="cu-btn round bg-pink sm margin-left-sm" @tap.stop="onNavToLogin">请授权</button>
</view>
<view class="flex-row" style="margin-top: 10rpx;"> <view class="flex-row" style="margin-top: 10rpx;">
<view v-if="userInfo.consumerMember&&userInfo.consumerMember.isRecharge" class="relative" @tap.stop="onNavToVip"> <view v-if="userInfo.consumerMember&&userInfo.consumerMember.isRecharge" class="relative" @tap.stop="onNavToVip">
<image class="img-icon" :src="assetsPath+'/tag_icon_1.png'" mode="widthFix"></image> <image class="img-icon" :src="assetsPath+'/tag_icon_1.png'" mode="widthFix"></image>
...@@ -35,10 +39,10 @@ ...@@ -35,10 +39,10 @@
</view> </view>
<view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="tip-date"> <view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="tip-date">
<text>权益 <text class="text-bold">{{userInfo.consumerMember.expirationDate}}</text> 到期</text> <text>权益 <text class="text-bold">{{userInfo.consumerMember.expirationDate}}</text> 到期</text>
<text class="text-blue" @tap.stop="onOpenEquityMembers">{{list && list.length?list[0].requiredAmount+'元':''}}续费</text> <!-- <text class="text-blue" @tap.stop="onOpenEquityMembers">{{list && list.length?list[0].requiredAmount+'元':''}}续费</text> -->
</view> </view>
</view> </view>
<view class="nav-right" @tap.stop="onNavToSetUserInfo"> <view v-if="loginStatus" class="nav-right" @tap.stop="onNavToSetUserInfo">
<image class="img" :src="assetsPath+'/setting.png'" mode="scaleToFill"></image> <image class="img" :src="assetsPath+'/setting.png'" mode="scaleToFill"></image>
<text class="text-gray">修改资料</text> <text class="text-gray">修改资料</text>
</view> </view>
...@@ -470,8 +474,16 @@ ...@@ -470,8 +474,16 @@
}, },
onLoad() { onLoad() {
uni.hideTabBar(); uni.hideTabBar();
if(!this.loginStatus){
this.$refs.loginPop.open();
}
}, },
methods: { methods: {
onNavToLogin(){
if(!this.loginStatus){
this.$refs.loginPop.open();
}
},
onGetSysConfig() { onGetSysConfig() {
let sysConfigList = uni.getStorageSync('sysConfig') let sysConfigList = uni.getStorageSync('sysConfig')
if (!sysConfigList) { if (!sysConfigList) {
...@@ -511,7 +523,9 @@ ...@@ -511,7 +523,9 @@
this.consumerMemberStatus = true; this.consumerMemberStatus = true;
this.onGetEquityMembersList() this.onGetEquityMembersList()
} }
this.userName = this.userInfo.phone.slice(-4); if(this.userInfo && this.userInfo.phone){
this.userName = this.userInfo.phone.slice(-4);
}
uni.setStorageSync('userInfo', this.userInfo) uni.setStorageSync('userInfo', this.userInfo)
this.onGetOrderInfo(); this.onGetOrderInfo();
} }
...@@ -555,9 +569,11 @@ ...@@ -555,9 +569,11 @@
} }
}, },
onNavToSetUserInfo() { onNavToSetUserInfo() {
if(this.loginStatus){
uni.navigateTo({ uni.navigateTo({
url: "/pages/setUserInfo/index" url: "/pages/setUserInfo/index"
}) })
}
}, },
onHandle(val) { onHandle(val) {
if (val == 1) { if (val == 1) {
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<view class="part-2"> <view class="part-2">
<image class="img-bg" :src="assetsPath+'/vip/qy_bg_1.png'" mode="widthFix"></image> <image class="img-bg" :src="assetsPath+'/vip/qy_bg_1.png'" mode="widthFix"></image>
<view v-if="consumerMemberStatus" class="absolute"> <!-- <view v-if="consumerMemberStatus" class="absolute">
<view class="flex-5"> <view class="flex-5">
<view class="flex-row"> <view class="flex-row">
<text class="text-1">次卡</text> <text class="text-1">次卡</text>
...@@ -97,17 +97,13 @@ ...@@ -97,17 +97,13 @@
</view> </view>
<view class="flex-3"> <view class="flex-3">
<view class="flex-col"> <view class="flex-col">
<!-- <text class="text-1"></text> -->
<text class="text-2">暂未上线</text> <text class="text-2">暂未上线</text>
<text class="text-2">敬请期待</text> <text class="text-2">敬请期待</text>
</view> </view>
<!-- <view class="cu-btn-box" @tap="onSubmit">
<button class="cu-btn bg-pink">立即购买</button>
</view> -->
</view> </view>
</view> </view> -->
<view v-else class="absolute"> <view class="absolute">
<view class="flex-5"> <view class="flex-5">
<view class="flex-row"> <view class="flex-row">
<text class="text-1">权益</text> <text class="text-1">权益</text>
...@@ -116,7 +112,7 @@ ...@@ -116,7 +112,7 @@
<text class="text-3">有效期:领取后1年内有效</text> <text class="text-3">有效期:领取后1年内有效</text>
</view> </view>
<view class="flex-3"> <view class="flex-3">
<view class="flex-row"> <!-- <view class="flex-row">
<text class="text-1"></text> <text class="text-1"></text>
<text <text
class="text-2">{{equityAmountList.length? equityAmountList[0]:'99'}}.</text> class="text-2">{{equityAmountList.length? equityAmountList[0]:'99'}}.</text>
...@@ -125,6 +121,11 @@ ...@@ -125,6 +121,11 @@
</view> </view>
<view class="cu-btn-box" @tap="onSubmit"> <view class="cu-btn-box" @tap="onSubmit">
<button class="cu-btn bg-pink"> {{consumerMemberStatus? '权益续期':'立即开通'}}</button> <button class="cu-btn bg-pink"> {{consumerMemberStatus? '权益续期':'立即开通'}}</button>
</view> -->
<view class="flex-col">
<text class="text-2">暂未上线</text>
<text class="text-2">敬请期待</text>
</view> </view>
</view> </view>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment