From 499a94ded67a4c1e763dc6686afe5a2e99faf407 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 24 七月 2024 11:09:20 +0800
Subject: [PATCH] update 订单功能(花店端)

---
 pages/user/supplier-user.vue |  555 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 288 insertions(+), 267 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 3d59935..24e8762 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -1,299 +1,320 @@
 <template>
-	<view class="main-container user-container">
-		<!-- 		<view>
-			我的
-		</view> -->
-		<!-- 背景图 -->
-		<view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
-			<image class="component-bg"
-				src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/21/21c95c14e9504be69edff7785e3b44a9bg.png"
-				mode="scaleToFill" />
+  <view class="main-container user-container">
+    <!-- 		<view>
+      我的
+    </view> -->
+    <!-- 背景图 -->
+    <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
+      <image class="component-bg"
+             src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/21/21c95c14e9504be69edff7785e3b44a9bg.png"
+             mode="scaleToFill"/>
 
-			<view class="title" style="position: relative;">
-				个人中心
+      <view class="title" style="position: relative;">
+        个人中心
 
-			</view>
-			<!-- v-if="currentInfo&&(currentInfo.id)" -->
-			<view class="flex user-info">
-				<!-- 头像 -->
-				<image class="user-icon" v-if="!currentInfo.picture" src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
-					mode="aspectFit"></image>
-				<image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
+      </view>
+      <!-- v-if="currentInfo&&(currentInfo.id)" -->
+      <view class="flex user-info">
+        <!-- 头像 -->
+        <image class="user-icon" v-if="!currentInfo.picture"
+               src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
+               mode="aspectFit"></image>
+        <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
 
 
-
-				<view class="name" v-if="currentInfo.id">
-					<view class="t1" >
-						{{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}}<span
-							v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
-							({{currentInfo.supplierDTO?currentInfo.supplierDTO.statusStr:''}})</span>
-					</view>
-					<view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
-				</view>
-				<view class="name" v-if="!currentInfo.id" open-type="getUserInfo" @click.stop="getUserProfile" style="font-size: 48rpx;margin-top: 16rpx;">
-					{{'点击登陆'}}
-				</view>
-				<image class="icon-setting" src="../../static/common/icon-setting.png" mode="aspectFit"></image>
-			</view>
-			<!-- #ifdef PUB_CUSTOMER -->
-			<view class="customer-info-records">
-				<view class="item">
-					<view class="num">59</view>
-					<view class="name">我的收藏</view>
-				</view>
-				<view class="line"></view>
-				<view class="item">
-					<view class="num">5</view>
-					<view class="name">关注店铺</view>
-				</view>
-				<view class="line"></view>
-				<view class="item">
-					<view class="num">87</view>
-					<view class="name">浏览记录</view>
-				</view>
-			</view>
-			<!-- #endif -->
+        <view class="name" v-if="currentInfo.id">
+          <view class="t1">
+            {{
+              (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || currentInfo.nickName || currentInfo.loginName || '-'
+            }}<span
+              v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
+							({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
+          </view>
+          <view class="t2">{{ currentInfo.tel || '暂无电话' }}</view>
+        </view>
+        <view class="name" v-if="!currentInfo.id" open-type="getUserInfo" @click.stop="getUserProfile"
+              style="font-size: 48rpx;margin-top: 16rpx;">
+          {{ '点击登陆' }}
+        </view>
+        <image class="icon-setting" src="../../static/common/icon-setting.png" mode="aspectFit"></image>
+      </view>
+      <!-- #ifdef PUB_CUSTOMER -->
+      <view class="customer-info-records">
+        <view class="item">
+          <view class="num">{{ tj.collectNum || 0 }}</view>
+          <view class="name">我的收藏</view>
+        </view>
+        <view class="line"></view>
+        <view class="item">
+          <view class="num">{{ tj.followNum || 0 }}</view>
+          <view class="name">关注店铺</view>
+        </view>
+        <view class="line"></view>
+        <view class="item">
+          <view class="num">{{ tj.browseNum || 0 }}</view>
+          <view class="name">浏览记录</view>
+        </view>
+      </view>
+      <!-- #endif -->
 
 
-		</view>
-		<!-- #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">
-					<view class="flex1">我的订单</view>
-					<view class="m-r-a m-r-0 more">全部订单<uni-icons class="" type="right"
-							size="12"></uni-icons></view>
-				</view>
-				<view class="flex order-icons-container">
-					<view class="order-icons">
-						<image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"></image>
-						<view>待付款</view>
-					</view>
-					<view class="order-icons">
-						<image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh"></image>
-						<view>待发货</view>
-					</view>
-					<view class="order-icons">
-						<image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh"></image>
-						<view>待收货</view>
-					</view>
-					<view class="order-icons">
-						<image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"></image>
-						<view>待评价</view>
-					</view>
-					<view class="order-icons">
-						<image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh"></image>
-						<view>售后</view>
-					</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">
-						<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
-						</image>
-						<view>关注店铺</view>
-					</view>
-					<view class="service-icons">
-						<image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">
-						</image>
-						<view>我的收藏</view>
-					</view>
-					<view class="service-icons" @click="goto('/pages/user/address/address',true)">
-						<image src="../../static/images/customer/service/service-icon-3.png" class="service-icon ">
-						</image>
-						<view>地址管理</view>
-					</view>
-					<view class="service-icons">
-						<image src="../../static/images/customer/service/service-icon-4.png" class="service-icon ">
-						</image>
-						<view>售后规则</view>
-					</view>
-				</view>
-				<view class="flex service-icons-container">
-					<view class="service-icons">
-						<image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon ">
-						</image>
-						<view>新手帮助</view>
-					</view>
-					<view class="service-icons">
-						<image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
-						</image>
-						<view>运费详查</view>
-					</view>
-					<view class="service-icons"></view>
-					<view class="service-icons"></view>
-				</view>
-			</view>
-		</view>
-		<!-- #endif -->
-		<view class="user-utils m-20">
-			<view class="user-util m-t-12 flex"  @click="goto('/pages/user/user-info/user-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'"
-				@click="goto('/sub_pages/partner/partner-info/partner-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==='supplier'"
-				@click="goto('/sub_pages/supplier/supplier-info/supplier-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" @click="goto('/pages/user/user-pwd/user-pwd',true)">
-				<view class="title">修改密码</view>
-				<view class="right-icon">
-					<uni-icons type="right"></uni-icons>
-				</view>
-			</view>
-			<view class="user-util m-t-12 " @click="callTel"
-				v-if="selftype==='supplier'||selftype==='customer' || !selftype">
-				<view class="title">我的客服</view>
-				<view class="flex">
-					<image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
-					<view class="name">
-						客服电话 : &nbsp;&nbsp; <span class="topic-gray">{{tel}}</span>
-					</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>
-				</view>
-				<view class="name">
-					密码: <span class="topic-gray">{{tel}}</span>
-				</view>
-			</view> -->
-		</view>
+    </view>
+    <!-- #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">
+          <view class="flex1">我的订单</view>
+          <view class="m-r-a m-r-0 more">全部订单
+            <uni-icons class="" type="right"
+                       size="12"></uni-icons>
+          </view>
+        </view>
+        <view class="flex order-icons-container">
+          <view class="order-icons">
+            <image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"></image>
+            <view>待付款</view>
+          </view>
+          <view class="order-icons">
+            <image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh"></image>
+            <view>待发货</view>
+          </view>
+          <view class="order-icons">
+            <image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh"></image>
+            <view>待收货</view>
+          </view>
+          <view class="order-icons">
+            <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"></image>
+            <view>待评价</view>
+          </view>
+          <view class="order-icons">
+            <image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh"></image>
+            <view>售后</view>
+          </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/follow/follow',true)">
+            <image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
+            </image>
+            <view>关注店铺</view>
+          </view>
+          <view class="service-icons" @click="goto('/sub_pages/customer/collect/collect',true)">
+            <image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">
+            </image>
+            <view>我的收藏</view>
+          </view>
+          <view class="service-icons" @click="goto('/pages/user/address/address',true)">
+            <image src="../../static/images/customer/service/service-icon-3.png" class="service-icon ">
+            </image>
+            <view>地址管理</view>
+          </view>
+          <view class="service-icons">
+            <image src="../../static/images/customer/service/service-icon-4.png" class="service-icon ">
+            </image>
+            <view>售后规则</view>
+          </view>
+        </view>
+        <view class="flex service-icons-container">
+          <view class="service-icons">
+            <image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon ">
+            </image>
+            <view>新手帮助</view>
+          </view>
+          <view class="service-icons">
+            <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
+            </image>
+            <view>运费详查</view>
+          </view>
+          <view class="service-icons"></view>
+          <view class="service-icons"></view>
+        </view>
+      </view>
+    </view>
+    <!-- #endif -->
+    <view class="user-utils m-20">
+      <view class="user-util m-t-12 flex" @click="goto('/pages/user/user-info/user-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'"
+            @click="goto('/sub_pages/partner/partner-info/partner-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==='supplier'"
+            @click="goto('/sub_pages/supplier/supplier-info/supplier-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" @click="goto('/pages/user/user-pwd/user-pwd',true)">
+        <view class="title">修改密码</view>
+        <view class="right-icon">
+          <uni-icons type="right"></uni-icons>
+        </view>
+      </view>
+      <view class="user-util m-t-12 " @click="callTel"
+            v-if="selftype==='supplier'||selftype==='customer' || !selftype">
+        <view class="title">我的客服</view>
+        <view class="flex">
+          <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
+          <view class="name">
+            客服电话 : &nbsp;&nbsp; <span class="topic-gray">{{ tel }}</span>
+          </view>
+          <view class="right-icon"  @click="goto('/pages/help/help',false)">
+            <uni-icons type="right"></uni-icons>
+          </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>
+        </view>
+        <view class="name">
+          密码: <span class="topic-gray">{{tel}}</span>
+        </view>
+      </view> -->
+    </view>
 
 
+    <!-- #ifdef PUB_CUSTOMER -->
+    <view style="padding-bottom:200rpx">
+    </view>
+    <common-footer flg="3"></common-footer>
 
-		<!-- #ifdef PUB_CUSTOMER -->
-		<view style="padding-bottom:200rpx">
-		</view>
-		<common-footer flg="3"></common-footer>
-		
-		<uni-popup ref="popup_info" type="bottom">
-			<view class="popup-form">
-		
-				<view class="infocontainar">
-					<cu-custom bgColor="none" :isBack="false">
-						<block slot="content"><span style="color: #333;font-weight: 400;">获取用户头像、昵称</span></block>
-					</cu-custom>
-		
-		
-					<view class="avatarUrl">
-						<button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar">
-							<image :src="regAvatarUrl" class="refreshIcon"></image>
-						</button>
-					</view>
-					<view class="userName">
-						<text style="padding-bottom: 20rpx;">修改昵称:</text>
-						<input :clearable="false" type="nickname" class="weui-input" :value="regUserName" @blur="onBindblur"
-							placeholder="请输入昵称" @input="onBindinput" />
-					</view>
-		
-					<view style="width: 100%;height: 1px; background: #EEE;">
-		
-					</view>
-					<view style="width: 700rpx; height: 20px; font-size: 13px; margin: auto; margin-top: 40rpx;">
-						· 申请获取以下权限
-					</view>
-					<view
-						style="width: 700rpx; height: 20px; font-size: 13px; margin: auto; color: #cbcbcb; margin-top: 25rpx;">
-						· 获得你的信息(昵称、头像等)
-					</view>
-		
-					<view class="btn">
-						<view @click="onWxCheckSubmit" class="button-green">保存</view>
-					</view>
-		
-				</view>
-			</view>
-		</uni-popup>
-			
-			
-		<!-- #endif -->
-		<!-- #ifndef PUB_CUSTOMER -->
-		<view class="button-login-out topic-gray" @click="clearlogout">
-			退出登录
-		</view>
+    <uni-popup ref="popup_info" type="bottom">
+      <view class="popup-form">
 
-		<view style="padding-bottom:200rpx">
-		</view>
-		<common-footer flg="1"></common-footer>
-		<!-- #endif -->
+        <view class="infocontainar">
+          <cu-custom bgColor="none" :isBack="false">
+            <block slot="content"><span style="color: #333;font-weight: 400;">获取用户头像、昵称</span></block>
+          </cu-custom>
 
 
+          <view class="avatarUrl">
+            <button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar">
+              <image :src="regAvatarUrl" class="refreshIcon"></image>
+            </button>
+          </view>
+          <view class="userName">
+            <text style="padding-bottom: 20rpx;">修改昵称:</text>
+            <input :clearable="false" type="nickname" class="weui-input" :value="regUserName" @blur="onBindblur"
+                   placeholder="请输入昵称" @input="onBindinput"/>
+          </view>
 
-	</view>
+          <view style="width: 100%;height: 1px; background: #EEE;">
+
+          </view>
+          <view style="width: 700rpx; height: 20px; font-size: 13px; margin: auto; margin-top: 40rpx;">
+            · 申请获取以下权限
+          </view>
+          <view
+              style="width: 700rpx; height: 20px; font-size: 13px; margin: auto; color: #cbcbcb; margin-top: 25rpx;">
+            · 获得你的信息(昵称、头像等)
+          </view>
+
+          <view class="btn">
+            <view @click="onWxCheckSubmit" class="button-green">保存</view>
+          </view>
+
+        </view>
+      </view>
+    </uni-popup>
+
+
+    <!-- #endif -->
+    <!-- #ifndef PUB_CUSTOMER -->
+    <view class="button-login-out topic-gray" @click="clearlogout">
+      退出登录
+    </view>
+
+    <view style="padding-bottom:200rpx">
+    </view>
+    <common-footer flg="1"></common-footer>
+    <!-- #endif -->
+
+
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				CustomBar: uni.getStorageSync('CustomBar'),
-				StatusBar: uni.getStorageSync('StatusBar'),
-				tcode: '',
-				inviterName: '',
-				// StatusBar:0,
-				tel: '15974805814'
-			};
-		},
+export default {
+  data() {
+    return {
+      CustomBar: uni.getStorageSync('CustomBar'),
+      StatusBar: uni.getStorageSync('StatusBar'),
+      tcode: '',
+      inviterName: '',
+      // StatusBar:0,
+      tel: '15974805814',
+      tj: {},
+    };
+  },
 
-		onLoad(options) {
-			const url = options.q ? decodeURIComponent(options.q) : '';
-			const urlcode = options.url && decodeURIComponent(options.url) || ''
-		},
-		created() {
+  onLoad(options) {
+    // const url = options.q ? decodeURIComponent(options.q) : '';
+    // const urlcode = options.url && decodeURIComponent(options.url) || ''
 
-		},
-		async onPullDownRefresh() {
-			await this.$store.dispatch('getCurrentInfo')
-			uni.stopPullDownRefresh()
-		},
-		methods: {
+    // #ifdef PUB_CUSTOMER
+    if (this.currentInfo.id) {
+      let that = this
+      setTimeout(() => {
+        this.$http.request('get', '/api/customer/center/tj', {}).then(res => {
+          if (res.code === 0) {
+            that.tj = res.data || {}
+          }
+        })
+      }, 200)
+    }
+    // #endif
 
-			async clearlogout() {
-				await this.$message.confirm('是否退出登录?')
-				this.$store.commit('updateLogin', false)
+  },
+  created() {
 
-				uni.reLaunch({
-					url: '/pages/login/supplier-login'
-				})
-			},
-			async callTel() {
-				await this.$message.confirm('是否拨打客服电话')
-				uni.makePhoneCall({
-					phoneNumber: this.tel //仅为示例
-				});
-			}
+  },
+  async onPullDownRefresh() {
+    await this.$store.dispatch('getCurrentInfo')
+    uni.stopPullDownRefresh()
+  },
+  methods: {
+
+    async clearlogout() {
+      await this.$message.confirm('是否退出登录?')
+      this.$store.commit('updateLogin', false)
+
+      uni.reLaunch({
+        url: '/pages/login/supplier-login'
+      })
+    },
+    async callTel() {
+      await this.$message.confirm('是否拨打客服电话')
+      uni.makePhoneCall({
+        phoneNumber: this.tel //仅为示例
+      });
+    }
 
 
-		}
-	}
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	@import "./user.scss";
+@import "./user.scss";
 </style>
 <!-- #ifdef PUB_CUSTOMER -->
 <style lang="scss" scoped>
-	@import "./user-customer.scss";
+@import "./user-customer.scss";
 </style>
 <!-- #endif -->
 <style lang="scss" scoped>

--
Gitblit v1.9.3