From af10285e87d097e5e1dc84a378702256792ba94b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 7 May 2024 19:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goodPopup.vue            | 14 ++++++++++----
 pages.json                          |  3 ++-
 pagesOrder/order/component/good.vue |  2 +-
 pagesOrder/order/order.vue          | 17 ++++++++++++++++-
 pagesOrder/settle/settle.vue        | 10 +++++++---
 store/user.js                       |  3 ++-
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/components/goodPopup.vue b/components/goodPopup.vue
index 2d8f996..01bbadc 100644
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@@ -21,15 +21,15 @@
         <view style="color: #F55726;">¥ {{subtotal}}</view>
       </view>
       <view v-if="datas.is_bulk" class="row">
-        <view>商品重量<text style="color: #F55726;">*</text></view>
+        <view>购买重量<text style="color: #F55726;">*</text></view>
         <view style="flex: 1;">
-          <up-input v-model="datas.cart_num" type="number" border="none" placeholder="请输入数量" inputAlign="right"></up-input>
+          <up-input v-model="datas.cart_num" type="number" border="none" placeholder="请输入购买重量" inputAlign="right"></up-input>
         </view>
       </view>
       <view v-else class="row">
-        <view>商品数量<text style="color: #F55726;">*</text></view>
+        <view>购买数量<text style="color: #F55726;">*</text></view>
         <view style="flex: 1;">
-          <up-input v-model="datas.cart_num" type="number" border="none" placeholder="请输入数量" inputAlign="right"></up-input>
+          <up-input v-model="datas.cart_num" type="number" border="none" placeholder="请输入购买数量" inputAlign="right"></up-input>
         </view>
       </view>
       <view class="row" style="padding-top: 30px;padding-bottom: 30rpx;">
@@ -46,6 +46,7 @@
 
 <script setup>
   import { computed, ref } from "vue"
+import { toast } from "../uni_modules/uview-plus";
 
   const props = defineProps({
     show: {
@@ -67,6 +68,11 @@
   }
 
   const change = () => {
+    if(subtotal.value<=0) {
+      uni.$u.toast('金额不可小于等于0');
+      datas.value.cart_num = '';
+      return ;
+    }
     emit('change', datas.value);
   }
   
diff --git a/pages.json b/pages.json
index 5945435..016bea7 100644
--- a/pages.json
+++ b/pages.json
@@ -49,7 +49,8 @@
           "path": "order/order",
           "style": {
             "navigationBarTitleText": "我的订单",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom"
           }
         },
         {
diff --git a/pagesOrder/order/component/good.vue b/pagesOrder/order/component/good.vue
index 4de4a00..339ec91 100644
--- a/pagesOrder/order/component/good.vue
+++ b/pagesOrder/order/component/good.vue
@@ -6,7 +6,7 @@
         <text>待付款</text>
       </view>
       <view v-else>
-        <text v-if="datas.status==0">待发货</text>
+        <text v-if="datas.status==0">待收货</text>
         <text v-if="datas.status==1">待收货</text>
         <text v-if="datas.status==2||datas.status==3">已完成</text>
       </view>
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index 8cac453..f97cf7c 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -1,5 +1,10 @@
 <template>
   <view>
+    <up-navbar placeholder style="z-index: 10080;" @leftClick="navBack">
+    	<template #center>
+    		<view>订单</view>
+    	</template>
+    </up-navbar>
     <up-sticky bgColor="#fff">
       <view style="padding: 10rpx 20rpx 0 20rpx;">
         <up-search shape="round" v-model="keyword" @custom="searchOn" @search="searchOn" @clear="searchOn"
@@ -149,7 +154,7 @@
     orderListApi({
       page_no: where.value[type].page_no,
       page_size: where.value[type].page_size,
-      keyword: keyword.value,
+      number: keyword.value,
       status: status,
       paid: paid
     }).then(res => {
@@ -173,17 +178,26 @@
   const searchOn = () => {
     orderList.value[+swiperCurrent.value] = [];
     where.value[+swiperCurrent.value].page_no = 1;
+    where.value[+swiperCurrent.value].loadend = false;
     if (swiperCurrent.value == 0) getOrderList(0);
     if (swiperCurrent.value == 1) getOrderList(1, '', 0);
     if (swiperCurrent.value == 2) getOrderList(2, 0);
   }
 
+  let back = 0;
+  const navBack = ()=>{
+    uni.navigateBack({
+      delta: back ? +back : 0
+    })
+  }
+
   onLoad((options) => {
     if (options.type) {
       tabsActive.value = +options.type;
       swiperCurrent.value = +options.type;
       searchOn();
     }
+    if(options.back) back = options.back;
     // getOrderList(0);
     // getOrderList(1, '', 0);
     // getOrderList(2, 0);
@@ -195,6 +209,7 @@
       getOrderList(2, 0);
     });
   })
+  
 </script>
 
 <style lang="scss">
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index de880b5..a82f2da 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -213,7 +213,7 @@
 			}
 		})
 	}
-	getMerchantList('');
+	getMerchantList();
 	// 定位
 	const LoadAddress = () => {
 		uni.getLocation({
@@ -253,6 +253,10 @@
 
 	// 提交订单
 	const submitOrder = () => {
+    if (!shopInfo.value.mer_id) {
+      uni.$u.toast('请先选择提货点');
+      return shopListShow.value = true;
+    }
 		if (!isAddress.value) return toastAddressShow.value = true;
 		createOrder();
 	}
@@ -289,8 +293,8 @@
 							confirmText: '查看订单',
 							cancelText: '继续购买',
 							success: (e) => {
-								if (e.confirm) uni.navigateTo({
-									url: '/pagesOrder/order/order'
+								if (e.confirm) uni.redirectTo({
+									url: '/pagesOrder/order/order?back=-1&type=2'
 								})
 								else uni.navigateBack();
 							}
diff --git a/store/user.js b/store/user.js
index ac0093a..12aec61 100644
--- a/store/user.js
+++ b/store/user.js
@@ -24,7 +24,8 @@ const useUserStore = defineStore("user", () => {
 	}
 
 	// #ifdef H5
-	token.value = "95b24dd6d2dda836fe07854b08ba0944"
+	token.value = "0f680a9bc1cdccd7ce588a2a58029411"
+	// token.value = "95b24dd6d2dda836fe07854b08ba0944"
 	userInfo.value = {
 		avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png",
 		id: 9,