Browse Source

上传

master
前端-胡立永 4 months ago
parent
commit
af26ac5408
11 changed files with 53 additions and 77 deletions
  1. +1
    -0
      pages/index/cart.vue
  2. +11
    -6
      pages/index/center.vue
  3. +3
    -3
      pages_order/components/address/redactAddress.vue
  4. +27
    -63
      pages_order/mine/promotion.vue
  5. +7
    -1
      pages_order/order/orderDetail.vue
  6. BIN
      static/image/center/c1.png
  7. BIN
      static/image/center/c2.png
  8. BIN
      static/image/center/c3.png
  9. BIN
      static/image/center/icon1.png
  10. +2
    -2
      uni_modules/uv-cell/components/uv-cell/uv-cell.vue
  11. +2
    -2
      utils/position.js

+ 1
- 0
pages/index/cart.vue View File

@ -238,6 +238,7 @@
justify-content: center;
align-items: center;
overflow: hidden;
z-index: 999;
.icon{
position: relative;
width: 80rpx;


+ 11
- 6
pages/index/center.vue View File

@ -112,21 +112,26 @@
</view>
<view class="cell-bottom">
<uv-cell-group>
<uv-cell icon="share" title="我的邀请码"
<uv-cell icon="grid" title="我的邀请码"
@click="$utils.navigateTo('/pages_order/mine/promotion')"
:isLink="true" arrow-direction="right" />
<uv-cell icon="share" title="我的推荐" :isLink="true" arrow-direction="right"
<uv-cell icon="account" title="我的推荐" :isLink="true" arrow-direction="right"
@click="$utils.navigateTo('/pages_order/mine/recommend')" />
<uv-cell icon="share" title="联系客服"
<uv-cell icon="kefu-ermai" title="联系客服"
@click="$refs.customerServicePopup.open()"
:isLink="true" arrow-direction="right" />
<uv-cell icon="share" title="我的地址" :isLink="true" arrow-direction="right"
@click="$utils.navigateTo('/pages_order/mine/address')"/>
<uv-cell
title="我的地址"
icon="list-dot"
:isLink="true"
arrow-direction="right"
@click="$utils.navigateTo('/pages_order/mine/address')">
</uv-cell>
<uv-cell icon="share" title="退出登录" :isLink="true" arrow-direction="right"
<uv-cell icon="reload" title="退出登录" :isLink="true" arrow-direction="right"
@click="$store.commit('logout')"/>
</uv-cell-group>
</view>


+ 3
- 3
pages_order/components/address/redactAddress.vue View File

@ -114,11 +114,11 @@
//
selectAddr() {
Position.getLocation(res => {
Position.selectAddress(res.longitude, res.latitude, success => {
// Position.getLocation(res => {
Position.selectAddress(0, 0, success => {
this.setAddress(success)
})
})
// })
},
//


+ 27
- 63
pages_order/mine/promotion.vue View File

@ -19,16 +19,17 @@
style="width: 400rpx;"
:src="imagePath" mode="widthFix"></image>
</view> -->
<image :src="userInfo.headImage" mode="aspectFill"
class="headImage"></image>
<image style="width: 100%;" :src="imagePath" mode="widthFix"></image>
<!-- <view class="invitation-code">加油站: {{ title }}</view> -->
<canvas id="myCanvas" type="2d" canvas-id="firstCanvas1"></canvas>
</view>
<view class="btns">
<view class="btn"
@click="preservationImg(imagePath)">保存</view>
<!-- <view class="btn">立即邀请</view> -->
<view class="uni-color-btn"
@click="preservationImg(imagePath)">保存二维码</view>
</view>
</view>
</template>
@ -110,8 +111,14 @@
ctx.fillStyle = 'black'
ctx.font = '22px PingFangSC-regular';
let s = this.title || '加油站'
//
// let nickName = this.userInfo.nickName || ''
// ctx.fillText(nickName, canvas.width / Ratio - nickName.length * 11, 40);
// ctx.font = '18px PingFangSC-regular';
//
let s = this.title || ''
ctx.fillText(s, canvas.width / Ratio - s.length * 11, 50);
//
@ -202,67 +209,24 @@
background-color: $uni-color;
.promotion-card {
width: 90%;
margin: 100rpx auto 0rpx auto;
margin: 140rpx auto 0rpx auto;
box-shadow: 0rpx 0rpx 15rpx rgba(0, 0, 0, .2);
border-radius: 15rpx;
border-radius: 40rpx;
padding: 40rpx 30rpx;
box-sizing: border-box;
background-color: #fff;
.user-info {
display: flex;
align-items: center;
.image {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
margin-right: 10rpx;
}
.user-name {
font-size: 30rpx;
}
}
.invitation-code-img {
display: flex;
align-items: center;
justify-content: center;
margin: 100rpx 0rpx;
.image {
width: 30%;
border-radius: 50%;
}
}
.invitation-code {
text-align: center;
color: #818181;
font-size: 28rpx;
}
}
.btns {
position: fixed;
left: 0;
bottom: 0;
width: 100%;
height: 120rpx;
display: flex;
background: #fff;
font-size: 28rpx;
color: $uni-color;
.btn {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
&:nth-child(2) {
background: orange;
}
position: relative;
padding-top: 100rpx;
.headImage{
position: absolute;
height: 180rpx;
width: 180rpx;
border-radius: 50%;
top: -80rpx;
left: 50%;
transform: translate(-50%);
border: 10rpx solid #fff;
box-shadow: 0 0 10rpx 10rpx #00000013;
}
}
}


+ 7
- 1
pages_order/order/orderDetail.vue View File

@ -179,19 +179,25 @@
{{msgShop.projectExplain}}
</view> -->
<view class="btns">
<view @click="clickService" class="btn">
<view @click="$refs.customerServicePopup.open()" class="btn">
联系客服
</view>
</view>
</view>
</view>
<customerServicePopup ref="customerServicePopup"/>
</view>
</template>
<script>
import customerServicePopup from '@/components/config/customerServicePopup.vue'
import { mapState } from 'vuex'
export default {
components : {
customerServicePopup
},
computed : {
},
data() {


BIN
static/image/center/c1.png View File

Before After
Width: 88  |  Height: 88  |  Size: 1.5 KiB

BIN
static/image/center/c2.png View File

Before After
Width: 88  |  Height: 88  |  Size: 1.3 KiB

BIN
static/image/center/c3.png View File

Before After
Width: 88  |  Height: 88  |  Size: 1.6 KiB

BIN
static/image/center/icon1.png View File

Before After
Width: 101  |  Height: 111  |  Size: 7.1 KiB

+ 2
- 2
uni_modules/uv-cell/components/uv-cell/uv-cell.vue View File

@ -9,7 +9,7 @@
<view class="uv-cell__body__content">
<view class="uv-cell__left-icon-wrap">
<slot name="icon">
<uv-icon v-if="icon" :name="icon" :custom-style="iconStyle" :size="size === 'large' ? 22 : 18"></uv-icon>
<uv-icon v-if="icon" :name="icon" :custom-style="iconStyle" :size="size === 'large' ? 44 : 36"></uv-icon>
</slot>
</view>
<view class="uv-cell__title">
@ -32,7 +32,7 @@
:class="[`uv-cell__right-icon-wrap--${arrowDirection}`]">
<slot name="right-icon">
<uv-icon v-if="isLink" :name="rightIcon" :custom-style="rightIconStyle" :color="disabled ? '#c8c9cc' : 'info'"
:size="size === 'large' ? 18 : 16"></uv-icon>
:size="size === 'large' ? 36 : 32"></uv-icon>
</slot>
</view>
</view>


+ 2
- 2
utils/position.js View File

@ -144,8 +144,8 @@ function getUserAddressByIp(key) { //根据IP获取当前用户位置
//打开地图让用户选择位置
function selectAddress(longitude, latitude, successCallback) {
uni.chooseLocation({
longitude, //经度
latitude, //纬度
// longitude, //经度
// latitude, //纬度
success: function(res) {
successCallback && successCallback(res)
}


Loading…
Cancel
Save