1

pages/index/index.vue

@@ -401,9 +401,6 @@
 					case 'dy':
 						url = '/pages/myCenter/setPrint'
 						break;
-					case 'db':
-						url = '/pages/shop/shopOrderList?index=' + index
-						break;
 					case 'sp':
 						url = '/pages/shop/goodsList'
 						break;
@@ -419,9 +416,6 @@
 					case 'transferDelivery':
 						url = '/pages/shop/transferDeliveryOrderList'
 						break;
-					case 'dd':
-						url = '/pages/shop/shopOrderList'
-						break;
 					case 'tui':
 						url = '/pages/shop/shopReturnOrder?type=shop'
 						break;

pages/shop/addGoods.vue

@@ -12,7 +12,7 @@
 			</view>
 		</view>
 		<view class="formBox">
-			<uni-forms ref="form" :modelValue="formData" :rules="rules" labelWidth="170rpx">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules">
 				<uni-forms-item label="商品名称" name="productName" required>
 					<uni-easyinput type="text" v-model="formData.productName" placeholder="请输入商品名称" trim="all" />
 				</uni-forms-item>
@@ -420,6 +420,15 @@
 			checkisMoreBuy(type){
 				this.formData.isMoreBuy = type;
 			},
+			focusFormField(fieldId){
+				this.scrollTarget = ''
+				this.$nextTick(() => {
+					this.scrollTarget = fieldId
+				})
+			},
+			blurFormField(){
+				this.scrollTarget = ''
+			},
 			checkSellTime(type){
 				this.formData.sellTime = type;
 			},

pages/shop/orderDetail.vue

@@ -779,6 +779,12 @@
 				let data = {
 					order_id: this.shopId,
 				}
+				uni.showLoading({
+					title: '发送数据成功，请稍候...'
+				});
+				setTimeout(() => {
+					uni.hideLoading();
+				}, 1000);
 				getApp().globalData.printData.push(data)
 				// 若当前未在打印，则启动队列处理
 				if (!getApp().globalData.isPrinting) {

pages/shop/shopOrderList.vue

@@ -27,6 +27,7 @@
 				<view>
 					{{'#' + item.numberCode}}
 				</view>
+				<view class="seckill-order-tag" v-if="isSeckillOrder(item)">秒杀</view>
 				<view style="flex: 1;display: flex;padding-left: 20rpx;">
 					{{item.createTime | formatISOTime}} 
 					<!-- <text>已退款</text> -->

pages/worker/index.vue

@@ -1065,7 +1065,6 @@
 				} catch (e) {
 					return false
 				}
-				return true
 			},
 			isHomeAdImageCacheValid(cacheItem) {
 				return !!(cacheItem

pages/worker/partTimeJobCenter.vue

@@ -39,23 +39,6 @@
 			</view>
 			<view class="order2">
 				<view class="order22">
-
-					<!-- <view class="order33" @tap="goDetail('db',4)">
-						<view class="order44">
-							{{daiquCount}}
-						</view>
-						<view class="order55">
-							待取货
-						</view>
-					</view>
-					<view class="order33" @tap="goDetail('db',5)">
-						<view class="order44">
-							{{daisongCount}}
-						</view>
-						<view class="order55">
-							待送达
-						</view>
-					</view> -->
 					<view class="order33" @tap="goDetail('tui',11)">
 						<view class="order44">
 							{{shouhouCount}}
@@ -252,9 +235,6 @@
 					case 'tj':
 						url = '/pages/worker/dataStatistics'
 						break;
-					case 'db':
-						url = '/pages/shop/shopOrderList?index=' + index
-						break;
 					case 'xx':
 						url = '/pages/worker/partTimeJobRegister'
 						break;