hmy_farmer-main.git

			@@ -39,6 +39,40 @@
			({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
			<span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
			({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>

			<!-- #ifdef PUB_CUSTOMER_DEV -->
			<span class="member-level" @click="goto('/sub_pages/customer/self/member-center',true)"
			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>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#7CC662" type="right" size="18"></uni-icons>

			</view>
			<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>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#7498E0" type="right" size="18"></uni-icons>

			</view>
			<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>
			{{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>
			{{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
			<uni-icons color="#DD834E" type="right" size="18"></uni-icons>
			</view>


			</span>
			<!-- #endif -->
			</view>
			<view class="t2">{{ currentInfo.tel \|\| '暂无电话' }}</view>
			</view>
			@@ -73,7 +107,22 @@


			</view>

			<!-- #ifdef PUB_CUSTOMER_DEV -->
			<view class="m-20 coupon-info-container" @click="goto( `/sub_pages/customer/coupon/good-all`,true)"
			v-if="selftype==='customer'\|\|!selftype">
			<view>
			<view class="title">积分商城</view>
			<view class="score m-t-8">拥有积分：{{currentInfo.currentPoint \|\| 0}}</view>
			</view>
			<view class="button m-l-a m-r-0 m-t-12">
			去兑换 <uni-icons color="#ffffff" type="right" size="16"></uni-icons>
			</view>
			</view>
			<!-- #endif -->
			<!-- #ifdef PUB_CUSTOMER -->


			<view class="user-utils m-20 user-customer-order-infos" v-if="selftype==='customer'\|\|!selftype">
			<view class="user-util m-t-12">
			<view class="title flex">
			@@ -81,48 +130,51 @@
			<view class="m-r-a m-r-0 more" @click="goto('/pages/order/order',true)">全部订单
			<uni-icons class="" type="right" size="12"></uni-icons>
			</view>
			</view>






			</view>

			<view class="flex order-icons-container">
			<view class="order-icons" style="position: relative;"
			@click="goto('/pages/order/order?status=PENDING',true)">
			<image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"
			style="position: relative;">
			<view class="image-shop-number" v-if="tj_order.pendingCount">{{tj_order.pendingCount\|\|''}}</view>
			<view class="image-shop-number" v-if="tj_order.pendingCount">{{tj_order.pendingCount\|\|''}}
			</view>
			</image>
			<view>待付款</view>
			</view>
			<view class="order-icons" @click="goto('/pages/order/order?status=SEND',true)">
			<image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh">
			<view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount\|\|''}}</view>

			<image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh"
			style="position: relative;">
			<view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount\|\|''}}</view>

			</image>
			<view>待发货</view>
			</view>
			<view class="order-icons" @click="goto('/pages/order/order?status=RECEIVE',true)">
			<image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh">
			<view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount\|\|''}}</view>

			<image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh"
			style="position: relative;">
			<view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount\|\|''}}
			</view>

			</image>
			<view>待收货</view>
			</view>
			<view class="order-icons" @click="goto('/pages/order/order?status=EVALUATE',true)">
			<image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj">
			<view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount\|\|''}}</view>

			<image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"
			style="position: relative;">
			<view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount\|\|''}}
			</view>

			</image>
			<view>待评价</view>
			</view>
			<view class="order-icons" @click="goto('/pages/order/order-sale/order-sale',true)">
			<image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh">
			<view class="image-shop-number" v-if="tj_order.salesPendingCount">{{tj_order.salesPendingCount\|\|''}}</view>

			<image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh"
			style="position: relative;">
			<view class="image-shop-number" v-if="tj_order.salesPendingCount">
			{{tj_order.salesPendingCount\|\|''}}
			</view>

			</image>
			<view>售后</view>
			</view>
			@@ -162,16 +214,33 @@
			</image>
			<view>新手帮助</view>
			</view>
			<!-- <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')">
			<image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
			<view class="service-icons" @click="goto('/sub_pages/customer/self/feedback',true)">
			<image src="../../static/images/customer/service/service-icon-7.png" class="t2 service-icon ">
			</image>
			<view>运费详查</view>
			</view> -->
			<view>投诉反馈</view>
			</view>
			<!-- #ifdef PUB_CUSTOMER_DEV -->
			<view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self',true)">
			<image src="../../static/images/customer/service/service-icon-8.png" class="t2 service-icon ">
			</image>
			<view>优惠券</view>
			</view>

			<view class="service-icons"></view>
			<view class="service-icons" @click="goto('/sub_pages/customer/coupon/good-self',true)">
			<image src="../../static/images/customer/service/service-icon-9.png" class="t2 service-icon ">
			</image>
			<view>兑换券</view>
			</view>
			<!-- #endif -->
			<!-- #ifndef PUB_CUSTOMER_DEV -->
			<view class="service-icons">

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

			<view class="service-icons">

			</view>
			<!-- #endif -->
			</view>
			</view>
			</view>
			@@ -240,6 +309,13 @@
			<uni-icons type="right"></uni-icons>
			</view>
			</view>

			<!-- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/partner/delivery/delivery-detail',true)">
			<view class="title">debug</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view> -->
			<view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id"
			@click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
			<view class="title">绑定当前微信</view>
			@@ -247,13 +323,24 @@
			<uni-icons type="right"></uni-icons>
			</view>
			</view>
			<!-- v-if="selftype==='customer'" -->
			<!-- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/self/feedback',true)">
			<view class="title">投诉反馈</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view> -->

			<!-- v-if="selftype==='customer'" -->
			<view class="user-util m-t-12 flex" @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 " v-if="selftype==='supplier'\|\|selftype==='customer' \|\| !selftype">
			<view class="title">我的客服</view>
			@@ -283,7 +370,7 @@


			<!-- #ifdef PUB_CUSTOMER -->
			<view style="padding-bottom:200rpx">
			<view style="padding-bottom:140rpx">
			</view>
			<common-footer flg="3"></common-footer>

			@@ -329,7 +416,7 @@

			<!-- #endif -->
			<!-- #ifndef PUB_CUSTOMER -->
			<!-- <view class="button-login-out topic-gray" @click="clearlogout">
			<!-- <view class="button-login-out topic-gray" @click="clearlogout">
			退出登录
			</view> -->

			@@ -352,8 +439,8 @@
			inviterName: '',
			// StatusBar:0,
			tel: '15974805814',
			tj: {},
			tj_order:{},
			tj: {},
			tj_order: {},
			cacheUserId: '',
			// order_pendding_num: 0,

			@@ -455,7 +542,7 @@
			success: async function(res) {
			console.log('条码内容：' + res.result);
			if (!res.result) {
			that.$message.showToast('未识别出合伙人信息，如果是微信小程序二维码，请微信扫码打开')
			that.$message.showToast('未识别出合伙人信息，请用微信扫码打开')
			return
			}
			var dto = undefined
			@@ -541,6 +628,8 @@
			if (res.code === 0) {
			// that.order_pendding_num = res.data \|\| 0
			that.tj_order = res.data \|\| {}
			// this.$forceUpdate()
			console.log('tj_order', that.tj_order)
			}
			})