feat: 【前台】修改扳手会工单编号、厂商编号名称及位置

src/components/order/detail.vue

@@ -2,43 +2,55 @@
   <view class="card base-item">
     <view class="top-item">
       <view class="left">
-				<view :class="['tag', {'active': order.orderServiceType == '安装'}]">{{ order.orderServiceType }}</view>
+        <view :class="['tag', { active: order.orderServiceType == '安装' }]">{{
+          order.orderServiceType
+        }}</view>
         <text class="title">{{ order.categoryName }}</text>
       </view>
       <view class="right">{{ order.orderBusinessTypeText }}</view>
     </view>
     <view class="order-cell">
-			<text>工单编号：</text>
-			<text @longpress="handleLongpress(order.orderNumber)">{{ order.orderNumber }}</text>
+      <text>订单编号：</text>
+      <text @longpress="handleLongpress(order.partnerSerialNumber)">{{
+        order.partnerSerialNumber
+      }}</text>
     </view>
     <view class="order-cell">
       <text>合作厂商：</text>
       <text>{{ order.partnerCompanyName }}</text>
     </view>
-		<view class="order-cell">
-			<text>厂商编号：</text>
-			<text>{{ order.partnerSerialNumber }}</text>
-		</view>
     <view class="order-cell between-cell">
       <view class="left">
         <text>客户信息：</text>
         <text>{{ order.contactName }}</text>
       </view>
-			<image v-if="showOperate" style="width: 84rpx;height: 56rpx;" :src="phoneIcon"
-				@click="phoneToCustomer(order.contactPhone)">
+      <image
+        v-if="showOperate"
+        style="width: 84rpx;height: 56rpx;"
+        :src="phoneIcon"
+        @click="phoneToCustomer(order.contactPhone)"
+      >
       </image>
     </view>
     <view class="order-cell">
       <text>联系方式：</text>
       <text>{{ order.contactPhone }}</text>
     </view>
+    <view class="order-cell">
+      <text>扳手会工单：</text>
+      <text>{{ order.orderNumber }}</text>
+    </view>
     <view class="between-cell address-cell">
       <view class="left-address">
         <u-icon name="map" size="28"></u-icon>
         <text class="address-txt">{{ formatAddress }}</text>
       </view>
-			<image v-if="showOperate" style="width: 84rpx;height: 56rpx;" :src="navigationIcon"
-				@click="openLocation(order.contactAddress)"></image>
+      <image
+        v-if="showOperate"
+        style="width: 84rpx;height: 56rpx;"
+        :src="navigationIcon"
+        @click="openLocation(order.contactAddress)"
+      ></image>
     </view>
     <view v-if="readMore" @click="handleClick(false)" class="read-more-toggle">
       <u-icon name="arrow-down"></u-icon>
@@ -67,31 +79,31 @@
 </template>
 
 <script>
-	export default {
+export default {
   props: {
     // 履约记录
     order: {
       type: Object,
-				default () {
+      default() {
         return {}
-				}
+      },
     },
     // true 显示「查看更多」按钮， false 显示「点击收起」按钮
     readMore: {
       type: Boolean,
-				default: true
+      default: true,
     },
     // 可以点击电话和地址
     operate: {
       type: Boolean,
-				default: true
+      default: true,
     },
 
     // 显示点击电话和地址
     showOperate: {
       type: Boolean,
-				default: true
-			}
+      default: true,
+    },
   },
   data() {
     return {}
@@ -99,13 +111,13 @@
   computed: {
     formatAddress() {
       let self = this
-				let address = ""
+      let address = ''
       if (self.order) {
-					address = self.order.contactProvinceText || ""
-					address += self.order.contactCityText || ""
-					address += self.order.contactCommunityText || ""
-					address += self.order.contactStreetText || ""
-					address += self.order.contactAddress || ""
+        address = self.order.contactProvinceText || ''
+        address += self.order.contactCityText || ''
+        address += self.order.contactCommunityText || ''
+        address += self.order.contactStreetText || ''
+        address += self.order.contactAddress || ''
       }
       return address
     },
@@ -131,30 +143,31 @@
       if (this.operate) {
         const latitude = this.order.contactAddressLatitud //res.latitude;
         const longitude = this.order.contactAddressLongitud //res.longitude;
-          			getApp().track("order_open_location", { address: address });
+        getApp().track('order_open_location', { address: address })
         uni.openLocation({
           latitude: Number(latitude),
           longitude: Number(longitude),
           success: function() {
-							console.log('success');
-						}
-					});
+            console.log('success')
+          },
+        })
       }
     },
-			phoneToCustomer(phone) { // 联系客户
+    phoneToCustomer(phone) {
+      // 联系客户
       if (this.operate) {
-					getApp().track("order_make_phone_call", { phone: phone });
+        getApp().track('order_make_phone_call', { phone: phone })
         uni.makePhoneCall({
           phoneNumber: phone, //仅为示例
-						complete() {}
-					});
+          complete() {},
+        })
         this.contactTime()
       }
     },
     contactTime() {
       let self = this
       var data = {}
-				if (this.submitType === "workerAppointment") {
+      if (this.submitType === 'workerAppointment') {
         self.$u.api.contactTime(data, this.order.orderId)
       }
     },
@@ -164,19 +177,19 @@
     handleLongpress(text) {
       uni.setClipboardData({
         data: text,
-				    success: function () {
-				        console.log('success');
-				    }
-				});
-			}
-		}
-	}
+        success: function() {
+          console.log('success')
+        },
+      })
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-	.base-item {
+.base-item {
   padding-bottom: 6rpx;
-		background-color: #FFFFFF;
+  background-color: #ffffff;
   margin-bottom: 20rpx;
   // padding: 30rpx 30rpx 0 30rpx;
   border-radius: 6px;
@@ -197,12 +210,12 @@
         border-radius: 8rpx;
         font-size: 22rpx;
         font-weight: 500;
-					color: #FFFFFF;
+        color: #ffffff;
         line-height: 40rpx;
-					background-image: linear-gradient(to right, #FF930D, #FFC174);
+        background-image: linear-gradient(to right, #ff930d, #ffc174);
 
         &.active {
-						background-image: linear-gradient(to right, #2272FF, #47ABFF);
+          background-image: linear-gradient(to right, #2272ff, #47abff);
         }
       }
 
@@ -220,7 +233,7 @@
       text-align: center;
       width: 100rpx;
       height: 40rpx;
-				background: #F4F5F7;
+      background: #f4f5f7;
       border-radius: 22rpx;
       font-size: 22rpx;
       font-weight: 400;
@@ -251,54 +264,52 @@
       }
     }
   }
-	}
+}
 
-	.read-more-toggle {
+.read-more-toggle {
   text-align: center;
-		color: #2272FF;
+  color: #2272ff;
   font-size: 26rpx;
   margin-top: 30rpx;
   padding-bottom: 30rpx;
-	}
+}
 
-	.read-more-text {
+.read-more-text {
   padding-left: 8rpx;
-	}
+}
 
-	.order-item-more {
+.order-item-more {
   font-size: 26rpx;
   color: #333333;
   text-align: right;
 
   .line-view {
-			background-color: #F4F5F7;
+    background-color: #f4f5f7;
     height: 2rpx;
     margin-bottom: 20rpx;
   }
+}
 
-	}
-
-	.order-cell {
+.order-cell {
   font-size: 26rpx;
   font-weight: 400;
   color: #333333;
   line-height: 48rpx;
   margin-bottom: 10rpx;
+}
 
-	}
-
-	.between-cell {
+.between-cell {
   display: flex;
   justify-content: space-between;
   align-items: center;
-	}
+}
 
-	.display-cell {
+.display-cell {
   display: flex;
-	}
+}
 
-	.cell-title {
+.cell-title {
   text-align: left;
   flex-shrink: 0;
-	}
+}
 </style>

src/components/order/index.vue

@@ -128,6 +128,7 @@ export default {
           auditResults: {}, // 审核结果
           orderBusinessType: 'R', // 业务类型 R 为抢单
           orderId: '0', // 订单id
+          partnerSerialNumber: '', // 上游单号
         }
       },
     },
@@ -209,16 +210,16 @@ export default {
     infoTexts() {
       return this.isSimple
         ? {
-            orderNumber: {
+            partnerSerialNumber: {
               symbol: true,
-              name: '工单编号',
+              name: '订单编号',
               style: 'font-weight: 450;font-size: 28rpx',
               icon: 'arrow-right',
             },
             contactName: { name: '客户信息', content: 'contactPhone' },
           }
         : {
-            orderNumber: { name: '工单编号' },
+            partnerSerialNumber: { name: '订单编号' },
             partnerCompanyName: { name: '合作厂商' },
             contactName: { name: '客户信息', content: 'contactPhone' },
           }
@@ -547,7 +548,7 @@ export default {
     },
     handleLongpress(key, text) {
       // 长按复制单号
-      if (key == 'orderNumber') {
+      if (key == 'partnerSerialNumber') {
         uni.setClipboardData({
           data: text,
           success: function() {

src/pages/order/search.vue

@@ -5,7 +5,7 @@
       <u-search
         v-model="search.keyword"
         bg-color="#FFFFFF"
-        placeholder="搜索：工单号·用户姓名·手机号·地址"
+        placeholder="扳手会工单·用户姓名·手机号·地址"
         search-icon-color="#999999"
         color="#333333"
         placeholder-color="#999999"