productDev/dingyuannongji.git

			@@ -20,7 +20,7 @@
			<image src="/static/icon/ic_option@2x.png" mode="widthFix"></image>
			</view>
			<view class="user-right-item" @click="jumpNotice">
			<view class="user-right-item-tips" v-if="objNum && objNum.unRead === 1"></view>
			<view class="user-right-item-tips" v-if="objNum && objNum.unRead === 0"></view>
			<image src="/static/icon/ic_notice@2x.png" mode="widthFix"></image>
			</view>
			</view>
			@@ -53,24 +53,24 @@
			</view>
			<view class="func-list">
			<view class="func-list-item" @click="jumpOrder(1)">
			<view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders}}</view>
			<view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders > 99 ? '99+' : orderNum.waitPayOrders}}</view>
			<image src="/static/icon/mine_ic_daifukuan@2x.png" mode="widthFix"></image>
			<text>待支付</text>
			</view>
			<view class="func-list-item" @click="jumpOrder(2)">
			<view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders}}</view>
			<view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders > 99 ? '99+' : orderNum.waitOrders}}</view>
			<image src="/static/icon/mine_ic_daifahuo@2x.png" mode="widthFix"></image>
			<text>待发货/自提</text>
			</view>
			<view class="func-list-item" @click="jumpOrder(3)">
			<view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders}}</view>
			<view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders > 99 ? '99+' : orderNum.waitReceivedOrders}}</view>
			<image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
			<text>待收货</text>
			</view>
			</view>
			</view>
			<view class="guanggao" @click="jumpShare()">
			<image src="/static/images/share@2x.png" mode="widthFix"></image>
			<image :src="share" mode="widthFix"></image>
			</view>
			<view class="gn">
			<view class="gn-item" @click="jump()">
			@@ -78,6 +78,7 @@
			<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
			</view>
			<view class="gn-item">
			<button open-type="contact">客服</button>
			<text>在线客服</text>
			<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
			</view>
			@@ -87,28 +88,49 @@
			</view>
			</view>
			</view>
			<Login ref="login" />
			</view>
			</template>

			<script>
			import { mapState } from 'vuex'
			import Login from '@/components/login/login.vue'
			export default {
			components: { Login },
			computed: {
			...mapState(['navHeight', 'statusbarHeight', 'openid', 'userInfo','recshopid','recuserid'])
			},
			data() {
			return {
			objNum: null,
			orderNum: null
			orderNum: null,
			share: ''
			};
			},
			async onLoad() {
			await this.$onLaunched;
			this.getMyInfo()
			this.ordersStatistics()
			if (uni.getStorageSync('backgroundImage')) {
			this.share = uni.getStorageSync('backgroundImage').centerInviteBg
			}
			// 退出/注销清除数据
			uni.$on('loginOut', () => {
			this.objNum = null
			this.orderNum = null
			})
			},
			async onShow() {
			await this.$onLaunched;
			if (this.userInfo) {
			this.getMyInfo()
			this.ordersStatistics()
			}
			},
			methods: {
			jumpTo(type) {
			if (!this.userInfo) {
			this.$refs.login.open()
			return
			}
			if (type === 1) {
			uni.navigateTo({
			url: '/pages/shopping-cart/shopping-cart'
			@@ -151,19 +173,33 @@
			},
			// 授权手机号
			getphonenumber(e) {
			this.$u.api.wxPhone({
			code: e.detail.code,
			shopId:this.recshopid,
			recId:this.recuserid,
			openid: this.openid
			}).then(res => {
			if (res.code === 200) {
			this.$store.commit('setUserInfo', res.data.member)
			this.$store.commit('setToken', res.data.token)
			this.$store.commit('setRecShopId','')
			this.$store.commit('setRecUserId','')
			}
			})
			var that = this;
			if (e.detail.errMsg === 'getPhoneNumber:ok') {
			uni.login({
			provider: 'weixin',
			success: async function (loginRes) {
			let { code } = loginRes;
			let res = await that.$u.api.wxLogin({ code })
			if (res.code === 200) {
			that.$u.api.wxPhone({
			code: e.detail.code,
			shopId:that.recshopid,
			recId:that.recuserid,
			openid: res.data.openid
			}).then(res => {
			if (res.code === 200) {
			that.getMyInfo()
			that.ordersStatistics()
			that.$store.commit('setUserInfo', res.data.member)
			that.$store.commit('setToken', res.data.token)
			that.$store.commit('setRecShopId','')
			that.$store.commit('setRecUserId','')
			}
			})
			}
			}
			});
			}
			},
			// 获取收藏等数量
			getMyInfo() {
			@@ -185,6 +221,10 @@
			},
			// 跳转订单列表
			jumpOrder(status) {
			if (!this.userInfo) {
			this.$refs.login.open()
			return
			}
			uni.navigateTo({
			url: '/pagesA/pages/order/order?userType=0&status=' + status
			})
			@@ -242,8 +282,18 @@
			align-items: center;
			justify-content: space-between;
			border-bottom: 1rpx solid #E5E5E5;
			position: relative;
			&:last-child {
			border: none !important;
			}
			button {
			position: absolute;
			top: 0;
			left: 0;
			width: 100%;
			height: 100%;
			opacity: 0;
			z-index: 99;
			}
			text {
			font-weight: 400;
			@@ -301,11 +351,11 @@
			.func-list-item-num {
			position: absolute;
			top: 0;
			right: 0;
			height: 32rpx;
			line-height: 32rpx;
			padding: 0 8rpx;
			box-sizing: border-box;
			right: -10rpx;
			width: 40rpx;
			height: 40rpx;
			line-height: 40rpx;
			text-align: center;
			border-radius: 50%;
			background-color: #E4001D;
			font-weight: 400;