Skip to content

Commit 7a2c8c5

Browse files
gookinggooking
committed
version 2.0.0
1 parent bce409e commit 7a2c8c5

File tree

12 files changed

+570
-17
lines changed

12 files changed

+570
-17
lines changed

‎App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
goLogin: false,
99
subDomain: 'tz', // jdjf0115
1010
merchantId: 951, // 42151
11-
version: '1.2.0',
11+
version: '2.0.0',
1212
sysconfigkeys: 'mallName,shopMod,share_profile,recharge_amount_min,open_growth,shopping_cart_vop_open,needIdCheck',
1313
wxpayOpenAppId: 'wx9b04553fd8c7b9c3', // 微信开放平台的移动端应用appID
1414
openAlipayProvider: false, // 是否开通支付宝支付

‎manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name" : "天使童装",
33
"appid" : "__UNI__F2EA85C",
44
"description" : "天使童装",
5-
"versionName" : "1.1.0",
6-
"versionCode" : 110,
5+
"versionName" : "2.0.0",
6+
"versionCode" : 200,
77
"transformPx" : false,
88
"app-plus" : {
99
"optimization" : {

‎node_modules/apifm-uniapp/index.js‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pages.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,30 @@
312312
"style": {
313313
"navigationBarTitleText": "意见反馈"
314314
}
315+
},
316+
{
317+
"path" : "pages/my/info-menu",
318+
"style": {
319+
"navigationBarTitleText": "个人信息"
320+
}
321+
},
322+
{
323+
"path" : "pages/pay/pwd",
324+
"style": {
325+
"navigationBarTitleText": "修改交易密码"
326+
}
327+
},
328+
{
329+
"path" : "pages/pay/pwd-set",
330+
"style": {
331+
"navigationBarTitleText": "设置交易密码"
332+
}
333+
},
334+
{
335+
"path" : "pages/pay/pwd-reset",
336+
"style": {
337+
"navigationBarTitleText": "重置交易密码"
338+
}
315339
}
316340
],
317341
"subPackages": [

‎pages/asset/recharge.vue‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<template>
22
<view>
3-
<u-grid col="2" :border="true" @click="gridClick">
4-
<u-grid-item v-for="(item,index) in rechargeSendRules" :name="index" class="grid-item">
5-
<text class="grid-text"><text>¥</text>{{ item.confine }}</text>
6-
<u-badge v-if="item.send" type="error" :value="'赠送 ¥' + item.send"></u-badge>
3+
<u-grid col="2" border @click="gridClick">
4+
<u-grid-item v-for="(item,index) in rechargeSendRules" :name="index">
5+
<view class="grid-item">
6+
<text class="grid-text"><text>¥</text>{{ item.confine }}</text>
7+
<u-badge v-if="item.send" type="error" :value="'赠送 ¥' + item.send"></u-badge>
8+
</view>
79
</u-grid-item>
810
</u-grid>
911
<view class="submit-btn">
@@ -80,6 +82,9 @@
8082
.grid-item {
8183
height: 200rpx;
8284
position: relative;
85+
display: flex;
86+
flex-direction: column;
87+
justify-content: center;
8388
}
8489
8590
.grid-text {

‎pages/my/index.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,17 @@
109109
</u-cell-group>
110110
<u-gap height="5" bgColor="#EAEBEC"></u-gap>
111111

112+
<u-cell title="个人信息" isLink clickable url="/pages/my/info-menu"></u-cell>
112113
<u-cell title="关于我们" isLink clickable url="/pages/about/about?key=aboutus"></u-cell>
113114
<u-cell title="帮助中心" isLink clickable url="/pages/help/list"></u-cell>
114115
<u-cell title="意见反馈" isLink clickable url="/pages/my/feedback"></u-cell>
115116
<u-cell title="清除缓存" isLink clickable @click="clearStorage"></u-cell>
116117
<u-cell title="当前版本" :value="version"></u-cell>
118+
<!-- #ifndef MP-WEIXIN -->
117119
<view class="btn-block">
118120
<u-button type="error" text="退出" @click="loginout"></u-button>
119121
</view>
122+
<!-- #endif -->
120123
</view>
121124
<view v-else-if="needLogin">
122125
<u-empty mode="permission" text="请先登陆" marginTop="88rpx"></u-empty>

‎pages/my/info-menu.vue‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<template>
2+
<view>
3+
<u-cell v-if="userMobile" title="手机号码" :value="userMobile" />
4+
<u-cell wx:else title="绑定手机">
5+
<view slot="value" class="mobile-btn">
6+
<u-button type="success" size="mini" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立即绑定
7+
</u-button>
8+
</view>
9+
</u-cell>
10+
<u-cell title="收货地址" is-link url="/pages/address/index" />
11+
<u-cell v-if="apiUserInfoMap && apiUserInfoMap.base.pwdPay" title="交易密码" value="修改交易密码" is-link url="/pages/pay/pwd" />
12+
<u-cell wx:else title="交易密码" value="设置交易密码" is-link url="/pages/pay/pwd-set" />
13+
<u-cell title="我的收藏" is-link url="/pages/goods/fav" />
14+
<u-cell title="修改资料" is-link url="/pages/my/info" />
15+
16+
</view>
17+
</template>
18+
19+
<script>
20+
export default {
21+
data() {
22+
return {
23+
userMobile: undefined,
24+
apiUserInfoMap: undefined
25+
}
26+
},
27+
created() {
28+
29+
},
30+
mounted() {
31+
32+
},
33+
onReady() {
34+
35+
},
36+
onLoad(e) {
37+
this.userDetail()
38+
},
39+
onShow() {
40+
41+
},
42+
methods: {
43+
async userDetail() {
44+
const res = await this.$wxapi.userDetail(this.token)
45+
if (res.code == 0 && (res.data.base.nick || res.data.base.nickavatarUrl)) {
46+
this.userMobile = res.data.base.mobile
47+
this.apiUserInfoMap = res.data
48+
}
49+
},
50+
getPhoneNumber(e) {
51+
if (!e.detail.errMsg || e.detail.errMsg != "getPhoneNumber:ok") {
52+
// wx.showModal({
53+
// title: '提示',
54+
// content: e.detail.errMsg,
55+
// showCancel: false
56+
// })
57+
console.error(e)
58+
return;
59+
}
60+
this._getPhoneNumber(e)
61+
},
62+
async _getPhoneNumber(e) {
63+
const res = await this.$wxapi.bindMobileWxappV2(this.token, e.detail.code)
64+
if (res.code == 0) {
65+
uni.showToast({
66+
title: '绑定成功',
67+
icon: 'success',
68+
duration: 2000
69+
})
70+
this.$u.vuex('mobile', res.data)
71+
this.userDetail()
72+
} else {
73+
uni.showModal({
74+
title: '提示',
75+
content: res.msg,
76+
showCancel: false
77+
})
78+
}
79+
}
80+
}
81+
}
82+
</script>
83+
<style scoped lang="scss">
84+
85+
</style>

0 commit comments

Comments
 (0)