合并代码
This commit is contained in:
zpc
commit
9c98886cc3
|
|
@ -1,11 +1,10 @@
|
|||
<template>
|
||||
<view>
|
||||
<view class="" style="width: 100%; height: 715.65rpx; background-color: #D8D8D8;">
|
||||
|
||||
</view>
|
||||
|
||||
<!-- 返回 -->
|
||||
<image src="/static/ic_back.png"
|
||||
<image src="/static/ic_back.png" @click="toBack()"
|
||||
style="width: 41.98rpx; height: 41.98rpx; position: fixed; left: 30rpx; top: 137rpx;" mode=""></image>
|
||||
|
||||
|
||||
|
|
@ -49,20 +48,15 @@
|
|||
<uni-popup ref="bayPop" type="bottom" style="width: 100%; height: 965.65rpx; background-color: #F7F7F7;">
|
||||
|
||||
|
||||
|
||||
|
||||
</uni-popup>
|
||||
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import uniPopup from '@/components/uni-popup/components/uni-popup/uni-popup.vue'
|
||||
export default {
|
||||
components: { uniPopup },
|
||||
data() {
|
||||
return {
|
||||
detailList: [1, 2, 3, 4, 5],
|
||||
|
|
@ -70,6 +64,10 @@
|
|||
},
|
||||
methods: {
|
||||
|
||||
toBack() {
|
||||
console.log("777777");
|
||||
uni.navigateBack();
|
||||
},
|
||||
|
||||
bayOpen() {
|
||||
this.$refs.bayPop.open();
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
unpackage/dist/dev/mp-weixin/pages/me/me.js
vendored
2
unpackage/dist/dev/mp-weixin/pages/me/me.js
vendored
|
|
@ -1,2 +1,2 @@
|
|||
"use strict";const e=require("../../page-popup.js"),n=require("../../common/vendor.js"),o=require("../../common/assets.js"),t=require("../../common/server/user.js"),i=require("../../common/system/router.js"),s=require("../../common/yds.js");if(!Array){(0,e.__unplugin_components_3)()}const a={__name:"me",setup(e){let a=n.ref(null);const r=n.ref([]);let u=n.ref(null);n.onShow((async()=>{s.yds.showLoading();const e=await t.getUserInfo();n.index.__f__("log","at pages/me/me.vue:70","res",e),u.value=e,c(),s.yds.hideLoading()}));const c=async()=>{const e=[{id:1,title:"消费记录"},{id:2,title:"我的收藏"},{id:3,title:"优惠券",onClick:e=>{i.navigateTo("/pages/other/coupon")}},{id:4,title:"收货地址管理",onClick:e=>{i.navigateTo("/pages/address/address-list")}},{id:5,title:"用户协议",onClick:e=>{s.yds.navigateToAgreement("user")}},{id:6,title:"隐私政策",onClick:e=>{s.yds.navigateToAgreement("privacy")}}];s.yds.userInfo.isAccountLogin()&&e.push({id:7,title:"退出登录",onClick:async e=>{const{confirm:n}=await a.value.showModal("退出登录","确定退出登录吗？");n&&(s.yds.userInfo.logout(),u.value=null,c(),i.navigateTo("/pages/me/account-login"))}},{id:8,title:"注销账号",onClick:e=>{i.navigateTo("/pages/me/account-deletion")}}),r.value=e};return(e,t)=>n.e({a:n.unref(u)},n.unref(u)?{b:n.unref(u).userIcon,c:n.t(n.unref(u).username),d:n.t(n.unref(u).days),e:n.o((e=>{n.unref(i.navigateTo)("/pages/me/account-info")}))}:{f:n.o((e=>{n.unref(i.navigateToAccountLogin)()}))},{g:n.o((e=>{n.unref(i.navigateTo)("/pages/mall/order-list")})),h:n.f(n.unref(r),((e,o,t)=>({a:n.t(e.title),b:e.id,c:n.o((n=>e.onClick?e.onClick(e):null),e.id)}))),i:o._imports_2,j:n.sr(a,"1e9a094d-0",{k:"_pagePopup"})})}};wx.createPage(a);
|
||||
"use strict";const e=require("../../page-popup.js"),o=require("../../common/vendor.js"),n=require("../../common/assets.js"),t=require("../../common/server/user.js"),a=require("../../common/system/router.js"),i=require("../../common/yds.js");if(!Array){(0,e.__unplugin_components_3)()}const s={__name:"me",setup(e){let s=o.ref(null);const r=o.ref([]);let l=o.ref(null);o.onShow((async()=>{i.yds.showLoading();const e=await t.getUserInfo();o.index.__f__("log","at pages/me/me.vue:70","res",e),l.value=e,u(),i.yds.hideLoading()}));const u=async()=>{const e=[{id:1,title:"消费记录",onClick:e=>{a.navigateTo("/pages/mall/order-list")}},{id:2,title:"我的收藏"},{id:3,title:"优惠券",onClick:e=>{a.navigateTo("/pages/other/coupon")}},{id:4,title:"收货地址管理",onClick:e=>{a.navigateTo("/pages/address/address-list")}},{id:5,title:"用户协议",onClick:e=>{i.yds.navigateToAgreement("user")}},{id:6,title:"隐私政策",onClick:e=>{i.yds.navigateToAgreement("privacy")}}];i.yds.userInfo.isAccountLogin()&&e.push({id:7,title:"退出登录",onClick:async e=>{const{confirm:o}=await s.value.showModal("退出登录","确定退出登录吗？");o&&(i.yds.userInfo.logout(),l.value=null,u(),a.navigateTo("/pages/me/account-login"))}},{id:8,title:"注销账号",onClick:e=>{a.navigateTo("/pages/me/account-deletion")}}),r.value=e};return(e,t)=>o.e({a:o.unref(l)},o.unref(l)?{b:o.unref(l).userIcon,c:o.t(o.unref(l).username),d:o.t(o.unref(l).days),e:o.o((e=>{o.unref(a.navigateTo)("/pages/me/account-info")}))}:{f:o.o((e=>{o.unref(a.navigateToAccountLogin)()}))},{g:o.o((e=>{o.unref(a.navigateTo)("/pages/mall/order-list?type=1")})),h:o.o((e=>{o.unref(a.navigateTo)("/pages/mall/order-list?type=2")})),i:o.o((e=>{o.unref(a.navigateTo)("/pages/mall/order-list?type=3")})),j:o.o((e=>{o.unref(a.navigateTo)("/pages/mall/order-list?type=4")})),k:o.f(o.unref(r),((e,n,t)=>({a:o.t(e.title),b:e.id,c:o.o((o=>e.onClick?e.onClick(e):null),e.id)}))),l:n._imports_2,m:o.sr(s,"1e9a094d-0",{k:"_pagePopup"})})}};wx.createPage(s);
|
||||
//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/me/me.js.map
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<view class="content"><view class="header-container"><view class="title">我的</view></view><view class="main-container"><view wx:if="{{a}}" class="user-info-section" bindtap="{{e}}"><view class="avatar"><image src="{{b}}" mode="aspectFill" style="width:80.15rpx;height:80.15rpx;border-radius:10rpx"></image></view><view class="user-id">{{c}}</view><view class="user-days">已陪你走过了{{d}}天</view></view><view wx:else class="user-info-section" bindtap="{{f}}"><view class="avatar"></view><view class="user-id">点击登录</view><view class="user-days"></view></view><view class="order-status-section"><view class="status-item" bindtap="{{g}}"><text class="status-count">0</text><text class="status-label">待发货</text></view><view class="status-item"><text class="status-count">0</text><text class="status-label">待收货</text></view><view class="status-item"><text class="status-count">0</text><text class="status-label">待评价</text></view><view class="status-item"><text class="status-count">0</text><text class="status-label">退款售后</text></view></view><view class="function-list-section"><view wx:for="{{h}}" wx:for-item="item" wx:key="b" class="function-item" bindtap="{{item.c}}"><text class="function-title">{{item.a}}</text><image src="{{i}}" class="arrow-icon"></image></view></view></view><page-popup class="r" u-r="_pagePopup" u-i="1e9a094d-0" bind:__l="__l"/></view>
|
||||
<view class="content"><view class="header-container"><view class="title">我的</view></view><view class="main-container"><view wx:if="{{a}}" class="user-info-section" bindtap="{{e}}"><view class="avatar"><image src="{{b}}" mode="aspectFill" style="width:80.15rpx;height:80.15rpx;border-radius:10rpx"></image></view><view class="user-id">{{c}}</view><view class="user-days">已陪你走过了{{d}}天</view></view><view wx:else class="user-info-section" bindtap="{{f}}"><view class="avatar"></view><view class="user-id">点击登录</view><view class="user-days"></view></view><view class="order-status-section"><view class="status-item" bindtap="{{g}}"><text class="status-count">0</text><text class="status-label">待发货</text></view><view class="status-item" bindtap="{{h}}"><text class="status-count">0</text><text class="status-label">待收货</text></view><view class="status-item" bindtap="{{i}}"><text class="status-count">0</text><text class="status-label">待评价</text></view><view class="status-item" bindtap="{{j}}"><text class="status-count">0</text><text class="status-label">退款售后</text></view></view><view class="function-list-section"><view wx:for="{{k}}" wx:for-item="item" wx:key="b" class="function-item" bindtap="{{item.c}}"><text class="function-title">{{item.a}}</text><image src="{{l}}" class="arrow-icon"></image></view></view></view><page-popup class="r" u-r="_pagePopup" u-i="1e9a094d-0" bind:__l="__l"/></view>
|
||||
Loading…
Reference in New Issue
Block a user