From 24115b68c35e1865143852b6b08afdace3dabbdb Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Tue, 6 Jun 2023 13:17:42 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=9C=AA=E5=8F=91=E8=B4=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                       |  5 ++++-
 config/order.js                    |  6 ++++++
 pages/commponent/user/my-order.vue | 15 +++++++++++++
 pages/login/index1.vue             | 34 ++++++++++++++++++++++++------
 pages/views/order/confirmOrder.vue |  9 +++++++-
 pages/views/order/orderList.vue    |  4 ++++
 pages/views/tabBar/user.vue        | 26 +++++++++++++++++++++--
 7 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/api/index.js b/api/index.js
index c775de1..43bba74 100644
--- a/api/index.js
+++ b/api/index.js
@@ -17,4 +17,7 @@ export const editAddr = (params) => request('/erp/addrManager/edit', params, 'po
 export const delAddr = (params) => request('/erp/addrManager/delete?id='+params, {} , 'delete')
 
 export const getCode = (params) => request('/sys/randomImage/' + params, {}, 'get')
-export const login = (params) => request('/sys/login', params, 'POST')
\ No newline at end of file
+export const login = (params) => request('/sys/login', params, 'POST')
+
+
+export const getStatusList = (params) => request('/erp/order/queryState', params, 'get')
\ No newline at end of file
diff --git a/config/order.js b/config/order.js
index cdc9801..aa11fca 100644
--- a/config/order.js
+++ b/config/order.js
@@ -27,6 +27,12 @@ export const ORDER_NAVS =  [
 	    url: '',
 	    id: 3
 	  },
+	  {
+	    name: '已取消',
+	    icon: 'icon-erji',
+	    url: '',
+	    id: 5
+	  },
 	  // {
 	  //   name: '退款/售后',
 	  //   icon: 'icon-shouhou',
diff --git a/pages/commponent/user/my-order.vue b/pages/commponent/user/my-order.vue
index 43cd8d2..f91f2f3 100644
--- a/pages/commponent/user/my-order.vue
+++ b/pages/commponent/user/my-order.vue
@@ -7,6 +7,7 @@
           <text :class="'iconfont ' + item.icon" :style="'color:' + colors"></text>
         </view>
         <view style="color:#666">{{item.name}}</view>
+		<view class="pos2" v-if="item._num > 0"> {{item._num}}</view>
       </view>
     </view>
   </view>
@@ -46,6 +47,19 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+	.pos2{ 
+		position: absolute;
+		right: 10upx;
+		top: 6upx;
+		background-color: #f94530;
+		color: #fff;
+		width: 40upx;
+		height: 40upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+	}
 .my_order{
   background-color: #fff;
   margin-bottom: 20upx;
@@ -55,6 +69,7 @@ export default {
   align-items: center;
 }
 .order_btns {
+	position: relative;
   text-align: center;
   display: flex;
   flex-direction: column;
diff --git a/pages/login/index1.vue b/pages/login/index1.vue
index cb5c4f6..1e46150 100644
--- a/pages/login/index1.vue
+++ b/pages/login/index1.vue
@@ -34,8 +34,9 @@
 	</view>
 </template>
 <script>
-		import { setUserInfo,setToken } from "@/utils/auth";
+		import { setUserInfo,setToken, getToken } from "@/utils/auth";
 		import { getCode, login} from '@/api/index.js'
+		const app = getApp()
 export default {
 
 	data() {
@@ -70,6 +71,12 @@ export default {
     // #endif
   },
   onShow: function () {
+	  if (getToken()) {
+		  uni.reLaunch({
+		  	url: '/pages/views/tabBar/category'
+		  })
+		  return
+	  }
     this.setbImg();  //动态切换背景
 	this.getImgCode()
   },
@@ -143,6 +150,7 @@ export default {
 		  });
 		},
 		onlogin(){ //登录 模拟存储token
+			
 			if (!this.tel || !this.password || !this.yzm) {
 				uni.showToast({
 					icon:'none',
@@ -162,15 +170,27 @@ export default {
 			})
 			login(params).then(res => {
 				const result = res.result
-				setToken(result.token)
-				setUserInfo(result.userInfo)
-				setTimeout(()=>{
-					uni.hideLoading()
+				if (result) {
+					setToken(result.token)
+					setUserInfo(result.userInfo)
 					uni.showToast({
 						title:'登陆成功'
 					})
-				}, 500)
-				uni.navigateBack(-1)
+					uni.navigateBack(-1)
+				} else {
+						uni.hideLoading()
+						uni.showToast({
+							title:res.message,
+							icon: 'none'
+						})
+				}
+				
+			}).catch((e) => {
+				uni.hideLoading()
+				uni.showToast({
+					title:e.message,
+					icon: 'none'
+				})
 			})
 			
 			
diff --git a/pages/views/order/confirmOrder.vue b/pages/views/order/confirmOrder.vue
index 47b5804..e904617 100644
--- a/pages/views/order/confirmOrder.vue
+++ b/pages/views/order/confirmOrder.vue
@@ -134,6 +134,7 @@ export default {
 	  sumprice: 0,
 	  address: null,
 	  remark: '',
+	  isConfirm: false,
 	  couponList: [ //优惠券列表
 	  	{
 	  		money: 30,
@@ -267,8 +268,14 @@ export default {
 			
 			  "userId": getUserInfo().id
 			}
-		console.log(params)
+		if (this.isConfirm) return
+		this.isConfirm = true
+		uni.showLoading({
+			mask: true
+		})
 		addOrder(params).then(res => {
+			uni.hideLoading()
+			this.isConfirm = false
 			if (res.result) {
 				uni.showToast({
 					icon: 'none',
diff --git a/pages/views/order/orderList.vue b/pages/views/order/orderList.vue
index fcd04b9..b98f80c 100644
--- a/pages/views/order/orderList.vue
+++ b/pages/views/order/orderList.vue
@@ -230,6 +230,10 @@ import { getUserInfo } from '@/utils/auth';
 			},
 
 			jumpDetails() { //模拟跳转商品详情
+				uni.showToast({
+					icon: "none",
+					title: "功能正在开发中，敬请期待"
+				})
 				return
 				uni.navigateTo({
 					url: '/pages/views/order/orderDetails?status=' + this.active
diff --git a/pages/views/tabBar/user.vue b/pages/views/tabBar/user.vue
index 51ba7a6..85260c0 100644
--- a/pages/views/tabBar/user.vue
+++ b/pages/views/tabBar/user.vue
@@ -65,7 +65,7 @@ import myOrder from "../../commponent/user/my-order";
 import myFootprint from "../../commponent/user/my-footprint";
 import myServer from "../../commponent/user/my-server";
 import { ORDER_NAVS } from '../../../config/order.js'
-
+import { getStatusList } from '@/api/index.js'
 export default {
   data() {
     return {
@@ -134,7 +134,9 @@ export default {
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {},
+  onLoad: function (options) {
+	  
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -154,6 +156,7 @@ export default {
     let colors = app.globalData.newColor;
     let oldcolor = this.colors;
     let userdata = getUserInfo() || {};
+	this.getOrderStatus()
     this.setData({
       colors: colors,
       userdata: userdata
@@ -203,6 +206,25 @@ export default {
    */
   onShareAppMessage: function () {},
   methods: {
+	  getOrderStatus() {
+		  getStatusList({userId: getUserInfo().id}).then(res => {
+			  const result = res.result
+			    const obj = {
+			  	  state0: result.unpaid,
+			  	  state1: result.notSend,
+			  	  state2: result.send,
+			  	  // state3: result.complete,
+			  	  // state4: result.other,
+			  	  // state5: result.cancel,
+			    }
+			    const navs = ORDER_NAVS.slice(1).map((v, index) => {
+			  	  v._num = obj['state' + v.id] || 0
+			  	  return v
+			    })
+			    this.orderText = navs
+		  })
+		  
+	  },
 	onLogin(){
 		let token = getToken()
 		if(getToken()){