hmy_farmer-main.git

			@@ -16,25 +16,45 @@
			<!-- v-if="currentInfo&&(currentInfo.id)" -->
			<view class="flex user-info">
			<!-- 头像 -->

			<image class="user-icon" v-if="
			currentInfo.customerDTO&&currentInfo.customerDTO.cover
			\|\|currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
			(currentInfo.customerDTO&&currentInfo.customerDTO.cover)
			\|\|(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
			\|\|(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
			\|\| currentInfo.picture
			" :src="
			currentInfo.customerDTO&&currentInfo.customerDTO.cover
			\|\|currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
			(currentInfo.customerDTO&&currentInfo.customerDTO.cover)
			\|\|(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
			\|\|(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
			\|\| currentInfo.picture
			" mode="scaleToFill"></image>



			<image class="user-icon" v-else
			src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
			mode="scaleToFill"></image>

			<view class="name" v-if="currentInfo.id">
			<view class="t1">
			{{
			<!-- {{
			(!!currentInfo.partnerDTO ? (currentInfo.partnerDTO.name) : "") \|\| (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") \|\| (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") \|\| currentInfo.nickName \|\| currentInfo.loginName \|\| '-'
			}}
			}} -->
			<span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
			{{ currentInfo.partnerDTO.name }}
			</span>
			<span v-else-if="currentInfo.supplierDTO && currentInfo.supplierDTO.name">
			{{ currentInfo.supplierDTO.name }}
			</span>
			<span v-else-if="currentInfo.customerDTO && currentInfo.customerDTO.name">
			{{ currentInfo.customerDTO.name }}
			</span>
			<span v-else-if="currentInfo.nickName">
			{{ currentInfo.nickName }}
			</span>
			<span v-else-if="currentInfo.loginName">
			{{ currentInfo.loginName }}
			</span>
			<span v-else>-</span>
			<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
			({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
			<span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
			@@ -45,7 +65,7 @@
			v-if="currentInfo&&currentInfo.customerDTO&&currentInfo.customerDTO.userGrowthRecord">
			<view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'" class="v1">
			<image class="member-icon"
			src="../../static/images/customer/coupon/member/icon-member-1.png"></image>
			src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/73/732e40e1c473494bb9fb5cc639d9aa45icon-member-1.png"></image>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#7CC662" type="right" size="18"></uni-icons>

			@@ -53,7 +73,7 @@
			<view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'"
			class="v2">
			<image class="member-icon v2"
			src="../../static/images/customer/coupon/member/icon-member-2.png"></image>
			src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/10/10af6861ae834bd3bb1b28a3c57b7dd1icon-member-2.png"></image>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#7498E0" type="right" size="18"></uni-icons>

			@@ -61,13 +81,13 @@
			<view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'"
			class="v3">
			<image class="member-icon v3"
			src="../../static/images/customer/coupon/member/icon-member-3.png"></image>
			src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c7/c70ca53f4dad4722a4e3a101dd6e23e9icon-member-3.png"></image>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#C47810" type="right" size="18"></uni-icons>
			</view>
			<view v-else class="v4">
			<image class="member-icon v4"
			src="../../static/images/customer/coupon/member/icon-member-4.png"></image>
			src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ad/ad380ae0ee7043a699a83cfceab0d7b2icon-member-4.png"></image>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#DD834E" type="right" size="18"></uni-icons>
			</view>
			@@ -183,16 +203,45 @@
			</view>
			</view>
			</view>

			<view class="user-utils kf-container m-20 flex" v-if="selftype==='customer'\|\|!selftype"
			@click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
			<view class="">
			<image src="/static/common/icon-kf.png" class="icon-kf m-r-15 img100 icon"></image>
			</view>
			<view class="flex1" >
			<view class="icon-view" style="font-weight: 600;">
			我的客服
			</view>
			<view class="flex m-t-12">
			<view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
			<image src="/static/common/icon-call.png" class="icon icon-call m-r-10 img100"></image>
			{{tel}}
			</view>
			<view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
			<image src="/static/common/icon-wx.png" class="icon icon-call m-t-2 m-r-10 img100"></image>

			<button open-type="contact" class="component-button-contact" @handleContact="handleContact">
			在线客服
			</button>
			</view>


			</view>
			</view>
			</view>

			<view class="user-utils m-20" v-if="selftype==='customer'\|\|!selftype">
			<view class="user-util m-t-12 user-customer-service-infos">
			<view class="title flex">
			<view>我的服务</view>
			</view>
			<view class="flex service-icons-container">
			<view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">
			<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
			<view class="service-icons" @click="goto('/sub_pages/customer/self/sign',true)">
			<image src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7e/7ec5bba5748d4414befb413f38c0f674icon-sign-home.png" class="service-icon ">
			</image>
			<view>关注店铺</view>
			<view>签到</view>
			<view v-if="!signToday" class="dot"></view>
			</view>
			<view class="service-icons" @click="goto('/sub_pages/customer/self/collect',true)">
			<image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">
			@@ -244,13 +293,39 @@
			</view>
			<!-- #endif -->
			</view>

			<!-- #ifdef PUB_CUSTOMER -->
			<view class="flex service-icons-container">
			<view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">
			<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
			</image>
			<view>关注店铺</view>
			</view>
			<view class="service-icons">

			</view>
			<view class="service-icons">

			</view>
			<view class="service-icons">

			</view>
			</view>
			<!-- #endif -->
			</view>
			</view>
			<!-- #endif -->
			<view class="user-utils m-20">
			<view class="user-util m-t-12 flex" v-if="selftype==='customer'\|\|!selftype"
			<!-- <view class="user-util m-t-12 flex" v-if="selftype==='customer'\|\|!selftype"
			@click="goto('/sub_pages/customer/customer-info/customer-info',true)">
			<view class="title">个人信息</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view> -->
			<view class="user-util m-t-12 flex" v-if="selftype==='partner'\|\|!selftype"
			@click="goto('/sub_pages/partner/partner-info/partner-info-personal',true)">
			<view class="title">个人资料</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			@@ -304,8 +379,17 @@
			<uni-icons type="right"></uni-icons>
			</view>
			</view>
			<!-- <view class="user-util m-t-12 flex" v-if="selftype==='supplier'\|\|selftype==='partner'"
			@click="goto('/sub_pages/customer/setup/account-self',true)">
			<view class="title">账户安全</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view> -->

			<view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)">
			<view class="user-util m-t-12 flex"
			v-if="selftype==='supplier'\|\|selftype==='partner'"
			@click="goto('/pages/user/user-pwd/user-pwd',true)">
			<view class="title">修改密码</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			@@ -318,7 +402,7 @@
			<uni-icons type="right"></uni-icons>
			</view>
			</view> -->
			<view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id"
			<view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id &&(selftype==='supplier'\|\|selftype==='partner') "
			@click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
			<view class="title">绑定当前微信</view>
			<view class="right-icon">
			@@ -333,22 +417,32 @@
			</view> -->

			<!-- v-if="selftype==='customer'" -->
			<view class="user-util m-t-12 flex" @click="clearlogout">
			<view class="user-util m-t-12 flex"
			v-if="selftype==='supplier'\|\|selftype==='partner'"
			@click="clearlogout">
			<view class="title">退出登录</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view>

			<!-- <view class="user-util m-t-12 flex"
			v-if="selftype==='supplier'\|\|selftype==='customer' \|\| !selftype"
			@click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
			<view class="title">我的客服</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view> -->




			<view class="user-util m-t-12 " v-if="selftype==='supplier'\|\|selftype==='customer' \|\| !selftype">
			<!-- <view class="user-util m-t-12 " v-if="selftype==='supplier'\|\|selftype==='customer' \|\| !selftype">
			<view class="title">我的客服</view>
			<view class="flex flex-wrap-normal">
			<image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
			<!-- @click="callTel" -->

			<button open-type="contact" class="component-button-contact" @handleContact="handleContact">
			<view class="name">
			客服电话 :    <span class="topic-gray">{{ tel }}</span>
			@@ -359,7 +453,7 @@
			</button>

			</view>
			</view>
			</view> -->
			<!-- <view class="user-util m-t-12 " @click="callTel" v-if="selftype==='partner'">
			<view class="name">
			账号: <span class="topic-gray">{{tel}}</span>
			@@ -454,10 +548,11 @@
			tcode: '',
			inviterName: '',
			// StatusBar:0,
			tel: '15974805814',
			tel: '19288780072',
			tj: {},
			tj_order: {},
			cacheUserId: '',
			signToday: false
			// order_pendding_num: 0,

			};
			@@ -513,6 +608,8 @@
			onShow() {
			this.cacheUserId = ''
			this.getTj()


			},
			onLoad(options) {
			// const url = options.q ? decodeURIComponent(options.q) : '';
			@@ -609,7 +706,10 @@
			var url = ''
			if (this.currentInfo.id) {
			// #ifdef PUB_CUSTOMER
			url = '/sub_pages/customer/customer-info/customer-info'
			// url = '/sub_pages/customer/customer-info/customer-info'

			url = '/sub_pages/customer/setup/setup'

			// #endif
			// #ifdef PUB_PARTNER
			url = '/sub_pages/partner/partner-info/partner-info'
			@@ -631,6 +731,9 @@
			this.cacheUserId = this.currentInfo.id
			let that = this
			setTimeout(() => {



			// #ifdef PUB_CUSTOMER
			this.$http.request('get', '/api/customer/center/tj', {}).then(res => {
			if (res.code === 0) {
			@@ -649,7 +752,13 @@
			console.log('tj_order', that.tj_order)
			}
			})

			//判断有没有签到
			let that = this
			this.$http.request('get', '/api/customer/point/sign/sign/today', {}).then(res => {
			if (res.data) {
			that.signToday = true
			}
			})

			// #endif
			}, 200)