1

App.vue

@@ -37,8 +37,6 @@
 	export default {
 
 		globalData: {
-			GaoDeAppKey: '', // 高德ios、android key
-			GaoDeKey_amapkey: '', //app上填写高德web key、小程序上填写小程序的 key
 			// #ifdef H5
 			// mainurl: "/api/?s=",
 			// #endif

components/print/index.js

@@ -158,7 +158,7 @@
 			            printerJobs.setSize(1, 1).print(this.delNode(data1.goodsList[i].specs));
 			        }
 					printerJobs.setSize(2, 2);
-			        printerJobs.setAlign('lt').text('￥ ',data1.goodsList[i].price);
+			        printerJobs.setAlign('lt').text('￥'+data1.goodsList[i].price);
 			        
 			        printerJobs.text("   ");
 			        
@@ -175,7 +175,7 @@
 			    
 			    printerJobs.setSize(1, 1).print(printerUtil.fillLine('-', 1, 32));
 			    
-			    printerJobs.setAlign('lt').print('商品取到后，如有任何商品问题，请及时联系商家和平台，客服将为您服务，客服电话 15533910775，谢谢您的惠顾');
+			    printerJobs.setAlign('lt').print('商品取到后，如有任何商品问题，请及时联系商家和平台，客服将为您服务，谢谢您的惠顾');
 			    
 			    printerJobs.lineFeed(3);
 			    

components/tab-bar/delivery.vue

@@ -39,6 +39,7 @@
 				<view class="order-head">
 					<view class="order-main">
 						<view class="order-code" v-if="item.numberCode">{{'#' + item.numberCode}}</view>
+						<view class="seckill-order-tag" v-if="isSeckillOrder(item)">秒杀</view>
 						<view class="order-time">{{item.createTime | formatISOTime}}</view>
 					</view>
 					<view class="order-status">
@@ -289,6 +290,9 @@
 			isFaceDeliveryOrder(item) {
 				return !!item && item.deliveryType == 1 && item.orderType == 3
 			},
+			isSeckillOrder(item) {
+				return !!item && item.seckillOrder == 1
+			},
 			handleStartDateChange(e) {
 				const value = e.detail.value
 				if (this.searchForm.endDate && value > this.searchForm.endDate) {
@@ -930,6 +934,19 @@
 		padding-bottom: 16rpx;
 		border-bottom: 1px solid #eef2ef;
 	}
+	.seckill-order-tag {
+		display: inline-block;
+		height: 42rpx;
+		line-height: 42rpx;
+		padding: 0 16rpx;
+		margin: 0 0 8rpx 10rpx;
+		border-radius: 999rpx;
+		background: linear-gradient(90deg, #ff3d2e, #ff9d2f);
+		color: #fff;
+		font-size: 24rpx;
+		font-weight: 800;
+	}
+	
 	.group-order-code {
 		flex: 1;
 		color: #00231C;

components/tab-bar/myCenter.vue

@@ -122,20 +122,20 @@
 			},
 			logOut() {
 				uni.clearStorage()
-				// this.getRegistrationID()
+				this.getRegistrationID()
 				getApp().globalData.userinfo = ''
 				uni.reLaunch({
 					url: '../login/login'
 				})
 			},
-			// getRegistrationID() { //获取registerID
+			getRegistrationID() { //获取registerID
-			// 	jpushModule.getRegistrationID(result => {
+				jpushModule.getRegistrationID(result => {
-			// 		let registerID = result.registerID
+					let registerID = result.registerID
 					
-			// 		uni.setStorageSync("registerID", registerID)
+					uni.setStorageSync("registerID", registerID)
 					
-			// 	})
+				})
-			// },
+			},
 			navigatorTo(e){
 				let url = ""
 				if(e=='addgoods'){

manifest.json

@@ -153,10 +153,10 @@
         },
         "nativePlugins" : {
             "JG-JCore" : {
-                "JPUSH_APPKEY_ANDROID" : "9158867ba95e511877dfbf1d",
+                "JPUSH_APPKEY_ANDROID" : "130f556e8473c9b558777fe3",
-                "JPUSH_APPKEY_IOS" : "9158867ba95e511877dfbf1d",
+                "JPUSH_APPKEY_IOS" : "130f556e8473c9b558777fe3",
-                "JPUSH_CHANNEL_ANDROID" : "9158867ba95e511877dfbf1d",
+                "JPUSH_CHANNEL_ANDROID" : "130f556e8473c9b558777fe3",
-                "JPUSH_CHANNEL_IOS" : "9158867ba95e511877dfbf1d",
+                "JPUSH_CHANNEL_IOS" : "130f556e8473c9b558777fe3",
                 "__plugin_info__" : {
                     "name" : "极光推送 JCore 官方 SDK",
                     "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
@@ -190,6 +190,135 @@
                         }
                     }
                 }
+            },
+            "JG-JPush" : {
+                "JPUSH_ADVERTISINGID_IOS" : "130f556e8473c9b558777fe3",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "130f556e8473c9b558777fe3",
+                "JPUSH_GOOGLE_API_KEY" : "130f556e8473c9b558777fe3",
+                "JPUSH_GOOGLE_APP_ID" : "130f556e8473c9b558777fe3",
+                "JPUSH_GOOGLE_PROJECT_ID" : "130f556e8473c9b558777fe3",
+                "JPUSH_GOOGLE_PROJECT_NUMBER" : "130f556e8473c9b558777fe3",
+                "JPUSH_GOOGLE_STORAGE_BUCKET" : "130f556e8473c9b558777fe3",
+                "JPUSH_HONOR_APPID" : "130f556e8473c9b558777fe3",
+                "JPUSH_HUAWEI_APPID" : "130f556e8473c9b558777fe3",
+                "JPUSH_ISPRODUCTION_IOS" : "130f556e8473c9b558777fe3",
+                "JPUSH_MEIZU_APPID" : "130f556e8473c9b558777fe3",
+                "JPUSH_MEIZU_APPKEY" : "130f556e8473c9b558777fe3",
+                "JPUSH_OPPO_APPID" : "130f556e8473c9b558777fe3",
+                "JPUSH_OPPO_APPKEY" : "130f556e8473c9b558777fe3",
+                "JPUSH_OPPO_APPSECRET" : "130f556e8473c9b558777fe3",
+                "JPUSH_VIVO_APPID" : "130f556e8473c9b558777fe3",
+                "JPUSH_VIVO_APPKEY" : "130f556e8473c9b558777fe3",
+                "JPUSH_XIAOMI_APPID" : "130f556e8473c9b558777fe3",
+                "JPUSH_XIAOMI_APPKEY" : "130f556e8473c9b558777fe3",
+                "__plugin_info__" : {
+                    "name" : "极光推送 JPush 官方 SDK",
+                    "description" : "极光推送JPush官方SDK HBuilder插件版本",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=4035",
+                    "android_package_name" : "com.peisong",
+                    "ios_bundle_id" : "com.xenjoyou.banjingli",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "4035",
+                    "parameters" : {
+                        "JPUSH_ADVERTISINGID_IOS" : {
+                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+                            "key" : "JPush:ADVERTISINGID",
+                            "value" : ""
+                        },
+                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
+                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+                            "key" : "JPush:DEFAULTINITJPUSH",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_API_KEY" : {
+                            "des" : "厂商google api_key,示例:g-12346578",
+                            "key" : "google_api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_APP_ID" : {
+                            "des" : "厂商google mobilesdk_app_id,示例：g-12346578",
+                            "key" : "google_app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_PROJECT_ID" : {
+                            "des" : "厂商google project_id ,示例：g-12346578",
+                            "key" : "project_id",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_PROJECT_NUMBER" : {
+                            "des" : "厂商google project_number,示例：g-12346578",
+                            "key" : "gcm_defaultSenderId",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_STORAGE_BUCKET" : {
+                            "des" : "厂商google storage_bucket,示例：g-12346578",
+                            "key" : "google_storage_bucket",
+                            "value" : ""
+                        },
+                        "JPUSH_HONOR_APPID" : {
+                            "des" : "厂商HONOR-appId,示例：12346578",
+                            "key" : "com.hihonor.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_HUAWEI_APPID" : {
+                            "des" : "厂商HUAWEI-appId,示例：appid=12346578",
+                            "key" : "com.huawei.hms.client.appid",
+                            "value" : ""
+                        },
+                        "JPUSH_ISPRODUCTION_IOS" : {
+                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+                            "key" : "JPush:ISPRODUCTION",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPID" : {
+                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+                            "key" : "MEIZU_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPKEY" : {
+                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+                            "key" : "MEIZU_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPID" : {
+                            "des" : "厂商OPPO-appId,示例：OP-12345678",
+                            "key" : "OPPO_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPKEY" : {
+                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
+                            "key" : "OPPO_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPSECRET" : {
+                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+                            "key" : "OPPO_APPSECRET",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-appId,示例：12345678",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-appkey,示例：12345678",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPID" : {
+                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+                            "key" : "XIAOMI_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPKEY" : {
+                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+                            "key" : "XIAOMI_APPKEY",
+                            "value" : ""
+                        }
+                    }
+                }
             }
         }
     },

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;