1

App.vue

@@ -44,9 +44,6 @@
 			mainurl: 'https://hbkuaishi.com/hiver',
 			// mainurl: 'http://192.168.100.32:8888/hiver',
 			// #endif
-			// weburl: 'https://taketest.sdwanyue.com/',
-			weburl: 'https://takeout.sdwanyue.com/',
-			// weburl: 'https://take.sdwanyue.com/',
 			userinfo: '',
 			safeAreaInsets: '',
 			statusBarHeight: 0, //状态栏高度

components/print/index.js

@@ -109,6 +109,7 @@ export default {
 		printerJobs.setAlign('ct').setSize(2, 2).setLineSpacing(60).print(
 			(data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1 && data1.status != 7 && data1
 				.status == 11) ? '预约单' :
+			(data1.deliveryInfo && data1.deliveryInfo.transferDelivery == 1) ? '取餐码（' + data1.deliveryInfo.transferPickupCode +'）' :
 			(data1.status == 7 || data1.status == 11) ? '申请退款' :
 			(data1.deliveryType == 1 && data1.orderType == 3) ? '面对面配送' :
 			(data1.status == 3 && data1.deliveryType == 2 && data1.userRequireMake != 1) ? '待消费' :

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__F1A1D03",
     "description" : "",
     "versionName" : "1.2.5",
-    "versionCode" : 1,
+    "versionCode" : 2,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/login/login.vue

@@ -217,18 +217,6 @@
 					this.agree = true;
 				}
 			},
-			gotoxieyi(ID) {
-				var url = getApp().globalData.weburl + 'appapi/page/detail?id=' + ID
-				uni.setStorage({
-					key: 'weburl',
-					data: url,
-					success() {
-						uni.navigateTo({
-							url: '../webview/index',
-						});
-					}
-				})
-			},
 			register() {
 				uni.navigateTo({
 					url: "../reg/reg"