25 changed files with 705 additions and 317 deletions
Unified View
Diff Options
-
+5 -0api/model/index.js
-
+0 -16api/model/info.js
-
+5 -4components/config/configPopup.vue
-
+27 -29components/couponPopup/couponPopup.vue
-
+1 -1components/product/productItem.vue
-
+3 -1components/user/productList.vue
-
+2 -2mixins/list.js
-
+4 -4mixins/order.js
-
+3 -6pages.json
-
+21 -4pages/index/category.vue
-
+13 -8pages/index/center.vue
-
+27 -40pages/index/index.vue
-
+10 -9pages_order/home/introduce.vue
-
+2 -2pages_order/home/notice.vue
-
+90 -52pages_order/mine/memberCenter.vue
-
+25 -21pages_order/mine/partner.vue
-
+1 -1pages_order/mine/recruit.vue
-
+43 -46pages_order/mine/runningWater.vue
-
+319 -0pages_order/mine/updateUser.vue
-
+12 -10pages_order/mine/withdraw.vue
-
+82 -51pages_order/order/createOrder.vue
-
+1 -1pages_order/order/orderDetail.vue
-
+2 -2pages_order/product/productDetail.vue
-
+4 -4uni_modules/uv-empty/components/uv-empty/props.js
-
+3 -3uni_modules/uv-radio/components/uv-radio/props.js
+ 5
- 0
api/model/index.js
View File
+ 0
- 16
api/model/info.js
View File
+ 5
- 4
components/config/configPopup.vue
View File
+ 27
- 29
components/couponPopup/couponPopup.vue
View File
+ 1
- 1
components/product/productItem.vue
View File
+ 3
- 1
components/user/productList.vue
View File
+ 2
- 2
mixins/list.js
View File
+ 4
- 4
mixins/order.js
View File
+ 3
- 6
pages.json
View File
+ 21
- 4
pages/index/category.vue
View File
+ 13
- 8
pages/index/center.vue
View File
+ 27
- 40
pages/index/index.vue
View File
+ 10
- 9
pages_order/home/introduce.vue
View File
+ 2
- 2
pages_order/home/notice.vue
View File
+ 90
- 52
pages_order/mine/memberCenter.vue
View File
+ 25
- 21
pages_order/mine/partner.vue
View File
+ 1
- 1
pages_order/mine/recruit.vue
View File
+ 43
- 46
pages_order/mine/runningWater.vue
View File
+ 319
- 0
pages_order/mine/updateUser.vue
View File
| @ -0,0 +1,319 @@ | |||||
| <template> | |||||
| <view class="login"> | |||||
| <view class="bg1"></view> | |||||
| <view class="title"> | |||||
| 定制自己的形象 | |||||
| </view> | |||||
| <view | |||||
| v-if="back" | |||||
| @click="$utils.navigateBack" | |||||
| style="position: absolute;top: 120rpx;left: 20rpx;"> | |||||
| <uv-icon | |||||
| size="30rpx" | |||||
| color="#000" | |||||
| name="arrow-left"></uv-icon> | |||||
| </view> | |||||
| <button class="chooseAvatar" | |||||
| open-type="chooseAvatar" | |||||
| @chooseavatar="onChooseAvatar"> | |||||
| <image :src="form.headImage" | |||||
| mode="aspectFill"></image> | |||||
| </button> | |||||
| <input type="nickname" | |||||
| placeholder="给自己起一个响亮的名字" | |||||
| class="nickname" id="nickName" | |||||
| v-model="form.nickName" /> | |||||
| <!-- <view class="sexSelect"> | |||||
| <view | |||||
| @click="sexClick(item)" | |||||
| v-for="(item, index) in sexList" | |||||
| :key="index" | |||||
| :style="{color : form.sex == item.value ? item.actColor : '#333'}"> | |||||
| <uv-icon | |||||
| size="30rpx" | |||||
| :color="form.sex == item.value ? item.actColor : '#333'" | |||||
| :name="item.icon"></uv-icon> | |||||
| {{ item.value }} | |||||
| </view> | |||||
| </view> --> | |||||
| <!-- <view class="address" | |||||
| @click="$refs.datetimePicker.open()"> | |||||
| 您出生于{{ $dayjs(form.yearDate).format("YYYY") }}年 | |||||
| </view> | |||||
| <view class="address" | |||||
| @click="$refs.picker.open()"> | |||||
| {{ form.address || '请选择居住地址'}} | |||||
| </view> --> | |||||
| <uv-datetime-picker | |||||
| ref="datetimePicker" | |||||
| v-model="form.yearDate" | |||||
| mode="year" | |||||
| :minDate="minDate" | |||||
| :maxDate="maxDate"> | |||||
| </uv-datetime-picker> | |||||
| <uv-picker ref="picker" | |||||
| :columns="columns" | |||||
| keyName="name" | |||||
| @confirm="confirmAddress"></uv-picker> | |||||
| <view class="btn" @click="submit"> | |||||
| 确认 | |||||
| </view> | |||||
| </view> | |||||
| </template> | |||||
| <script> | |||||
| import { mapState } from 'vuex' | |||||
| export default { | |||||
| data() { | |||||
| return { | |||||
| form: { | |||||
| headImage: '', | |||||
| nickName: '', | |||||
| sex : '男', | |||||
| yearDate : this.$dayjs().add(-18, 'y').valueOf(),//默认满18岁 | |||||
| address : '', | |||||
| }, | |||||
| maxDate : this.$dayjs().valueOf(), | |||||
| minDate : this.$dayjs().add(-100, 'y').valueOf(), | |||||
| sex : { | |||||
| 男 : { | |||||
| name : 'man', | |||||
| color : '#5baaff', | |||||
| }, | |||||
| 女 : { | |||||
| name : 'woman', | |||||
| color : '#ff50b3', | |||||
| }, | |||||
| }, | |||||
| sexList : [ | |||||
| { | |||||
| value : '男', | |||||
| icon : 'man', | |||||
| actColor : '#5baaff', | |||||
| }, | |||||
| { | |||||
| value : '女', | |||||
| icon : 'woman', | |||||
| actColor : '#ff50b3', | |||||
| }, | |||||
| ], | |||||
| columns : [], | |||||
| back : '', | |||||
| }; | |||||
| }, | |||||
| computed: { | |||||
| ...mapState(['cityList', 'userInfo']), | |||||
| }, | |||||
| onLoad({back}) { | |||||
| this.back = back | |||||
| // this.$nextTick(() => { | |||||
| // this.form.headImage = this.userInfo.headImage || this.form.headImage | |||||
| // this.form.nickName = this.userInfo.nickName || this.form.nickName | |||||
| // this.form.sex = this.userInfo.sex || this.form.sex | |||||
| // this.form.yearDate = this.userInfo.yearDate || this.form.yearDate | |||||
| // this.form.address = this.userInfo.address || this.form.address | |||||
| // }) | |||||
| }, | |||||
| onShow() { | |||||
| this.getCityList() | |||||
| this.getUserInfo() | |||||
| }, | |||||
| computed: {}, | |||||
| methods: { | |||||
| onChooseAvatar(res) { | |||||
| let self = this | |||||
| self.$Oss.ossUpload(res.target.avatarUrl) | |||||
| .then(url => { | |||||
| self.form.headImage = url | |||||
| }) | |||||
| }, | |||||
| sexClick(item){ | |||||
| this.form.sex = item.value | |||||
| }, | |||||
| confirmAddress(e){ | |||||
| this.form.address = e.value[0].name | |||||
| }, | |||||
| // 获取城市 | |||||
| getCityList(){ | |||||
| this.$api('getCityList', res => { | |||||
| if(res.code == 200){ | |||||
| this.columns = [ | |||||
| res.result | |||||
| ] | |||||
| } | |||||
| }) | |||||
| }, | |||||
| getUserInfo(){ | |||||
| this.$api('getInfo', res => { | |||||
| if(res.code == 200){ | |||||
| this.form.headImage = res.result.headImage || this.form.headImage | |||||
| this.form.nickName = res.result.nickName || this.form.nickName | |||||
| this.form.sex = res.result.sex || this.form.sex | |||||
| this.form.yearDate = res.result.yearDate && | |||||
| this.$dayjs(res.result.yearDate + '-01-01').valueOf() || this.form.yearDate | |||||
| this.form.address = res.result.address || this.form.address | |||||
| } | |||||
| }) | |||||
| }, | |||||
| submit() { | |||||
| let self = this | |||||
| uni.createSelectorQuery().in(this) | |||||
| .select("#nickName") | |||||
| .fields({ | |||||
| properties: ["value"], | |||||
| }) | |||||
| .exec((res) => { | |||||
| const nickName = res?.[0]?.value | |||||
| self.form.nickName = nickName | |||||
| if (self.$utils.verificationAll(self.form, { | |||||
| headImage: '请选择头像', | |||||
| nickName: '请填写昵称', | |||||
| // address: '请选择居住地址', | |||||
| })) { | |||||
| return | |||||
| } | |||||
| let data = { | |||||
| ...self.form, | |||||
| // yearDate : this.$dayjs(self.form.yearDate).format("YYYY") | |||||
| } | |||||
| self.$api('updateInfo', data, res => { | |||||
| if (res.code == 200) { | |||||
| uni.reLaunch({ | |||||
| url:'/pages/index/index' | |||||
| }) | |||||
| } | |||||
| }) | |||||
| }) | |||||
| }, | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style lang="scss" scoped> | |||||
| .login { | |||||
| display: flex; | |||||
| flex-direction: column; | |||||
| justify-content: center; | |||||
| align-items: center; | |||||
| height: 100vh; | |||||
| background-color: #fff; | |||||
| overflow: hidden; | |||||
| .bg1{ | |||||
| width: 700rpx; | |||||
| height: 700rpx; | |||||
| border-radius: 50%; | |||||
| background-color: #ffc0b333; | |||||
| position: absolute; | |||||
| right: -300rpx; | |||||
| top: -300rpx; | |||||
| } | |||||
| .title { | |||||
| line-height: 45rpx; | |||||
| font-weight: 900; | |||||
| padding-bottom: 100rpx; | |||||
| font-size: 40rpx; | |||||
| } | |||||
| .chooseAvatar { | |||||
| width: 100%; | |||||
| padding: 0 !important; | |||||
| margin: 0 !important; | |||||
| border: none; | |||||
| background-color: #fff !important; | |||||
| width: 220rpx; | |||||
| height: 220rpx; | |||||
| border-radius: 50%; | |||||
| image{ | |||||
| width: 200rpx; | |||||
| height: 200rpx; | |||||
| border-radius: 50%; | |||||
| box-shadow: 0 0 10rpx 10rpx #00000012; | |||||
| margin: 10rpx; | |||||
| } | |||||
| } | |||||
| .chooseAvatar::after{ | |||||
| border: none; | |||||
| padding: 0 !important; | |||||
| margin: 0 !important; | |||||
| } | |||||
| .nickname{ | |||||
| background-color: #f7f7f7; | |||||
| width: 600rpx; | |||||
| height: 80rpx; | |||||
| text-align: center; | |||||
| border-radius: 40rpx; | |||||
| margin-top: 30rpx; | |||||
| } | |||||
| .sexSelect{ | |||||
| background-color: #f7f7f7; | |||||
| width: 600rpx; | |||||
| height: 80rpx; | |||||
| text-align: center; | |||||
| border-radius: 40rpx; | |||||
| margin-top: 30rpx; | |||||
| display: flex; | |||||
| align-items: center; | |||||
| font-size: 26rpx; | |||||
| line-height: 80rpx; | |||||
| overflow: hidden; | |||||
| &>view{ | |||||
| flex: 1; | |||||
| display: flex; | |||||
| justify-content: center; | |||||
| align-content: center; | |||||
| height: 100%; | |||||
| } | |||||
| &>view:nth-child(1){ | |||||
| border-right: 1px solid #000; | |||||
| } | |||||
| } | |||||
| .address{ | |||||
| background-color: #f7f7f7; | |||||
| width: 600rpx; | |||||
| height: 80rpx; | |||||
| text-align: center; | |||||
| border-radius: 40rpx; | |||||
| margin-top: 30rpx; | |||||
| line-height: 80rpx; | |||||
| color: #555; | |||||
| } | |||||
| .btn { | |||||
| // background: $uni-linear-gradient-btn-color; | |||||
| background: $uni-color; | |||||
| color: #fff; | |||||
| width: 80%; | |||||
| padding: 20rpx 0; | |||||
| text-align: center; | |||||
| border-radius: 15rpx; | |||||
| margin-top: 10vh; | |||||
| } | |||||
| } | |||||
| </style> | |||||