feat: 修改提示文字

guzijian
1 parent 23b65fba
Showing 6 changed files with 63 additions and 114 deletions
garbage-removal/src/apis/order.js
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/order/detail/index.vue
garbage-removal/src/pages/order/swiper-list-item/index.vue
garbage-removal/src/pages/order/upload/index.vue
garbage-removal/src/uview-plus/components/u-empty/u-empty.vue
 import { request } from "@/utils/request";
  
 /**
- * @method 保存订单
+ * @method 保存派单
  */
-export async function saveOrder( params,config) {
-   return await request.post(
-     `/order/add`,
-     params,
-     config
-  );
+export async function saveOrder(params, config) {
+  return await request.post(`/order/add`, params, config);
 }
  
 /**
- * @method 订单详情
+ * @method 派单详情
  */
 export async function queryOrderDetail(id) {
-   return await request.get(
-     `/order/detail/${id}`
-  );
+  return await request.get(`/order/detail/${id}`);
 }
  
-
-
 /**
- * @method 订单列表
+ * @method 派单列表
  */
 export async function queryOrderList(data) {
-   return await request.get(
-     `/order/query/list?type=${data.type}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`,
+  return await request.get(
+    `/order/query/list?type=${data.type}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`
   );
 }
  
-
 /**
- * @method 修改订单状态
+ * @method 修改派单状态
  */
-export async function updateOrder(params,config) {
-   return await request.put(
-     `/order/update`,
-     params,
-     config
-  );
+export async function updateOrder(params, config) {
+  return await request.put(`/order/update`, params, config);
 }
  
 /**
  * @method 上传图片
  */
-export async function uploadImageUrlByType(params,config) {
-   return await request.post(
-     `/order/upload/imageUrl`,
-     params,
-     config
-  );
+export async function uploadImageUrlByType(params, config) {
+  return await request.post(`/order/upload/imageUrl`, params, config);
 }
  
-
 /**
  * @method 提交评价
  */
-export async function uploadEvaluate(params,config) {
-   return await request.post(
-     `/order/evaluate`,
-     params,
-     config
-  );
+export async function uploadEvaluate(params, config) {
+  return await request.post(`/order/evaluate`, params, config);
 }
@@ -212,17 +212,17 @@ const handleCarInfo = () =&gt; {
 const handleOderSure = () => {
   let params = {
     /**
-     * 订单地址
+     * 派单地址
      */
     garOrderAddress: userAddress.value.garUserAddress,
  
     /**
-     * 订单详细地址
+     * 派单详细地址
      */
     garOrderAddressDetails: userAddress.value.garRemark,
  
     /**
-     * 订单姓名
+     * 派单姓名
      */
     garOrderContactName: userAddress.value.garUserContactName,
     garOrderCarNumber: paramFrom.value.carNumber,
@@ -234,7 +234,7 @@ const handleOderSure = () =&gt; {
     garOrderTrashType: paramFrom.value.garbageType,
  
     /**
-     * 订单人电话
+     * 派单人电话
      */
     garOrderContactTel: userAddress.value.garUserContactTel,
  
@@ -270,7 +270,7 @@ const handleOderSure = () =&gt; {
     return;
   }
   saveOrder(params).then(res => {
-    // TODO 订单详情
+    // TODO 派单详情
     if (res.data.success) {
       uni.$u.route({
         type: "redirect",
@@ -17,7 +17,7 @@
         <text v-if="dataGram.garCancelFlag == 0" style="color: red;">请于交易完成后线下支付！！</text>
         <view v-else style="display: flex; color:red;">
           <u-icon name="close-circle" color="red"></u-icon>
-          <text> &nbsp;&nbsp;订单已被取消！原因：{{ dataGram.garReason }}</text>
+          <text> &nbsp;&nbsp;派单已被取消！原因：{{ dataGram.garReason }}</text>
         </view>
       </view>
       <!-- 派单信息 -->
@@ -147,11 +147,11 @@
       <view class="order-detail-bottom-box">
         <view class=" order-detail-bottom-left">
           <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '管理负责人'" @click="handleOderCancelClick()"
-            shape="circle" color="#a9e08f" text="取消订单"></u-button>
+            shape="circle" color="#a9e08f" text="取消派单"></u-button>
         </view>
         <view class="order-detail-bottom-right">
           <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '居民用户'" @click="handleOderCancelClick()"
-            shape="circle" color="#a9e08f" text="取消订单"></u-button>
+            shape="circle" color="#a9e08f" text="取消派单"></u-button>
           <u-button @click="handleOrder(orderId)"
             v-if="dataGram.garOrderHandlerStatus === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0"
             shape="circle" color="#a9e08f" text="处理派单"></u-button>
@@ -201,7 +201,7 @@ const list = ref([
     name: '长时间无人接单',
   },
   {
-    name: '订单信息填写有误',
+    name: '派单信息填写有误',
   },
   {
     name: '线下协商有问题',
@@ -259,7 +259,7 @@ const handleOderCancelClick = () =&gt; {
 }
  
 /**
- * 提交取消订单
+ * 提交取消派单
  */
 const submitFunction = (otherReason) => {
   let reason = otherReason
@@ -316,11 +316,11 @@ const handleEvaluate = (orderId, userType) =&gt; [
   uni.$u.route(`pages/order/evaluate/index?orderId=${orderId}&userType=${userType}`)
 ]
  
-// 接收订单
+// 接收派单
 const handleOrder = (orderId) => {
   updateOrder({ garOrderId: orderId, handleType: 0 }).then(res => {
     if (res.data.success) {
-      if (res.data.data === "订单已经被别人接受啦") {
+      if (res.data.data === "派单已经被别人接受啦") {
         uni.$u.toast(res.data.data)
         uni.$u.route({
           type: "reLaunch",
@@ -88,7 +88,7 @@ const list = ref([
     name: '长时间无人接单',
   },
   {
-    name: '订单信息填写有误',
+    name: '派单信息填写有误',
   },
   {
     name: '线下协商有问题',
@@ -107,7 +107,7 @@ const dataList = ref([]);
 const paging = ref(null);
 const firstLoaded = ref(false)
 /**
- * 取消订单
+ * 取消派单
  * @param {string} orderId
  */
 const handleCancelOrder = (orderId) => {
@@ -122,7 +122,7 @@ const selectClick = (index) =&gt; {
   currentCancelName.value = index.name;
 }
 /**
- * 提交取消订单
+ * 提交取消派单
  */
 const submitFunction = (otherReason) => {
   let reason = otherReason
@@ -156,7 +156,7 @@ const handleClick = (orderId) =&gt; {
 }
  
 /**
- * 订单评价
+ * 派单评价
  * @param {*} orderId
  */
 const handleUserEvaluate = (orderId, userType) => {
@@ -86,25 +86,12 @@ const handleSubmit = (id, type) =&gt; {
 }
  
 const validateImage = () => {
-
   for (let index = 0; index < fileList.value.length; index++) {
     const str = fileList.value[index].url;
-    // #ifdef H5
-    if (str.startsWith("blob")) {
-      return false;
-    }
-    // #endif
-
-    // #ifdef MP-WEIXIN
-    if (uni.$u.test.contains(str, "/tmp/")) {
+    if (!str.startsWith("/profile/upload")) {
       return false;
     }
-    // #endif
-
   }
-  //
-  // #ifdef
-
   return true;
 }
  
 <template>
-	<view
-	    class="u-empty"
-	    :style="[emptyStyle]"
-	    v-if="show"
-	>
-		<u-icon
-		    v-if="!isSrc"
-		    :name="mode === 'message' ? 'chat' : `empty-${mode}`"
-		    :size="iconSize"
-		    :color="iconColor"
-		    margin-top="14"
-		></u-icon>
-		<image
-		    v-else
-		    :style="{
-				width: $u.addUnit(width),
-				height: $u.addUnit(height),
-			}"
-		    :src="icon"
-		    mode="widthFix"
-		></image>
-		<text
-		    class="u-empty__text"
-		    :style="[textStyle]"
-		>{{text ? text : icons[mode]}}</text>
+	<view class="u-empty" :style="[emptyStyle]" v-if="show">
+		<u-icon v-if="!isSrc" :name="mode === 'message' ? 'chat' : `empty-${mode}`" :size="iconSize" :color="iconColor"
+			margin-top="14"></u-icon>
+		<image v-else :style="{
+						width: $u.addUnit(width),
+						height: $u.addUnit(height),
+					}" :src="icon" mode="widthFix"></image>
+		<text class="u-empty__text" :style="[textStyle]">{{text ? text : icons[mode]}}</text>
 		<view class="u-empty__wrap" v-if="$slots.default || $slots.$default">
 			<slot />
 		</view>
@@ -31,9 +14,9 @@
 </template>
  
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
 	import mixin from '../../libs/mixin/mixin.js';
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import props from './props.js';
 	/**
 	 * empty 内容为空
 	 * @description 该组件用于需要加载内容，但是加载的第一页数据就为空，提示一个"没有内容"的场景， 我们精心挑选了十几个场景的图标，方便您使用。
@@ -50,7 +33,7 @@
 	 * @property {Boolean}			show		是否显示组件 （默认 true ）
 	 * @property {String | Number}	marginTop	组件距离上一个元素之间的距离，默认px单位 （默认 0 ）
 	 * @property {Object}			customStyle	定义需要用到的外部样式
-	 * 
+	 *
 	 * @event {Function} click 点击组件时触发
 	 * @event {Function} close 点击关闭按钮时触发
 	 * @example <u-empty text="所谓伊人，在水一方" mode="list"></u-empty>
@@ -66,7 +49,7 @@
 					search: '没有搜索结果',
 					address: '没有收货地址',
 					wifi: '没有WiFi',
-					order: '订单为空',
+					order: '派单为空',
 					coupon: '没有优惠券',
 					favor: '暂无收藏',
 					permission: '无权限',
@@ -103,27 +86,28 @@
 </script>
  
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
-	$u-empty-text-margin-top:20rpx !default;
-	$u-empty-slot-margin-top:20rpx !default;
+@import '../../libs/css/components.scss';
+$u-empty-text-margin-top: 20rpx !default;
+$u-empty-slot-margin-top: 20rpx !default;
  
-	.u-empty {
+.u-empty {
+	@include flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+
+	&__text {
 		@include flex;
-		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-
-		&__text {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-			margin-top: $u-empty-text-margin-top;
-		}
+		margin-top: $u-empty-text-margin-top;
 	}
-		.u-slot-wrap {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-			margin-top:$u-empty-slot-margin-top;
-		}
+}
+
+.u-slot-wrap {
+	@include flex;
+	justify-content: center;
+	align-items: center;
+	margin-top: $u-empty-slot-margin-top;
+}
 </style>